Entrega 8

.gitignore

@@ -16,7 +16,11 @@
 
 # ignore al .DS_store files of MAC OSX
 .DS_Store
+<<<<<<< HEAD
+*~
+=======
 
 # ignore paperclip installation files
 public/system
-.project
+.project
+>>>>>>> upstream/master

Gemfile

@@ -47,5 +47,7 @@ gem 'paperclip'
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
 
-gem 'json', '1.6.5'
 
+gem 'execjs'
+gem 'therubyracer'
+gem 'json', '1.6.5'

Gemfile.lock

@@ -55,12 +55,13 @@ GEM
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.6.5)
+    libv8 (3.3.10.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
-    multi_json (1.3.1)
+    multi_json (1.3.2)
     orm_adapter (0.0.7)
     paperclip (3.0.2)
       activemodel (>= 3.0.0)
@@ -104,7 +105,9 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
+    therubyracer (0.10.1)
+      libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -124,11 +127,13 @@ DEPENDENCIES
   cleditor_rails
   coffee-rails (~> 3.2.1)
   devise
+  execjs
   jquery-rails
   json (= 1.6.5)
   paperclip
   pg
   rails (= 3.2.2)
   sass-rails (~> 3.2.3)
   sqlite3
+  therubyracer
   uglifier (>= 1.0.3)

README

@@ -0,0 +1 @@
+All that's missing is the fork. Heh.

app/assets/javascripts/comments.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/application.css

@@ -12,3 +12,10 @@
  *= require cleditor
  *= require_tree .
 */
+
+html, body {
+width: 100%; height: 100%; 
+}
+#imagen{
+	max-width: 70%;
+}

app/assets/stylesheets/comments.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the Comments controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/sites.css.scss

@@ -1,3 +1,4 @@
 // Place all the styles related to the sites controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+

app/controllers/application_controller.rb

@@ -1,3 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  def doc
+  end
 end

app/controllers/comments_controller.rb

@@ -0,0 +1,87 @@
+class CommentsController < ApplicationController
+  # GET /comments
+  # GET /comments.json
+  def index
+  	if params[:site_id].nil? or params[:site_id].empty?
+    	@comments = Comment.all
+		else
+			@comments = Site.find(params[:site_id]).comments
+		end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @comments }
+    end
+  end
+
+  # GET /comments/1
+  # GET /comments/1.json
+  def show
+    @comment = Comment.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @comment }
+    end
+  end
+
+  # GET /comments/new
+  # GET /comments/new.json
+  def new
+    @comment = Comment.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @comment }
+    end
+  end
+
+  # GET /comments/1/edit
+  def edit
+    @comment = Comment.find(params[:id])
+  end
+
+  # POST /comments
+  # POST /comments.json
+  def create
+    @comment = Comment.new(params[:comment])
+
+    respond_to do |format|
+      if @comment.save
+        format.html { redirect_to @comment, notice: 'Comment was successfully created.' }
+        format.json { render json: @comment, status: :created, location: @comment }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @comment.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /comments/1
+  # PUT /comments/1.json
+  def update
+    @comment = Comment.find(params[:id])
+
+    respond_to do |format|
+      if @comment.update_attributes(params[:comment])
+        format.html { redirect_to @comment, notice: 'Comment was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @comment.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /comments/1
+  # DELETE /comments/1.json
+  def destroy
+    @comment = Comment.find(params[:id])
+    @comment.destroy
+
+    respond_to do |format|
+      format.html { redirect_to comments_url }
+      format.json { head :no_content }
+    end
+  end
+end

app/controllers/planet_controller.rb

@@ -29,5 +29,17 @@ def contact
   # Método que define una acción vacía del controlador
   def ejemplo
   end
-
+
+  def author
+  end
+  # Método que define la acción búsqueda del controlador
+  def search
+  	if params[:buscar].length >= 3
+  		@sites = Site.where("name like ? OR description like ?", "%#{params[:buscar]}%", "%#{params[:buscar]}%")
+    	@trips = Trip.where("name like ? OR description like ?", "%#{params[:buscar]}%", "%#{params[:buscar]}%")
+		else
+			render action: "menosdetres"
+		end
+  end
+
 end

app/controllers/sites_controller.rb

@@ -22,9 +22,11 @@ def index
   # GET /sites/1.json
   def show
     @site = Site.find(params[:id])
-
+		@comments = @site.comments.build
+
     respond_to do |format|
       format.html # show.html.erb
+      format.js
       format.json { render json: @site }
     end
   end

app/controllers/types_controller.rb

@@ -80,4 +80,13 @@ def destroy
       format.json { head :no_content }
     end
   end
+
+  def ordered_index
+  	@types = Type.order(:name)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @types }
+    end
+  end
 end

app/helpers/comments_helper.rb

@@ -0,0 +1,2 @@
+module CommentsHelper
+end

app/models/comment.rb

@@ -0,0 +1,7 @@
+class Comment < ActiveRecord::Base
+	belongs_to :user
+	belongs_to :site
+
+	validates :user_id, :presence => true
+	#attr_protected :user_id
+end

app/models/site.rb

@@ -3,8 +3,13 @@ class Site < ActiveRecord::Base
   belongs_to :user
   has_many   :visits
   has_many   :trips,   :through  =>  :visits
-  has_attached_file    :image
-
+  has_attached_file    :image,
+  	:styles => {
+      :thumb => "50x50",
+      :small  => "150x150",
+      :medium => "200x200"
+  }
+	has_many		:comments
 
   # Debe estar protegido para evitar accesos indeseados
   attr_protected :user_id    

app/models/user.rb

@@ -2,7 +2,7 @@ class User < ActiveRecord::Base
 
   has_many :sites
   has_many :trips
-
+  has_many :comments
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,

app/views/comments/_comment.html.erb

@@ -0,0 +1,22 @@
+<div id="site_list"> 
+
+  <table>  
+      <td class="list_description"> 
+        <dl> 
+          <dt><%= comment.user_id %></dt>
+          <dd></p><%= truncate(strip_tags(comment.coment),
+                 :length => 240) %></dd>
+        </dl> 
+      </td>
+
+      <td class="list_actions"> 
+        <% if comment.user == current_user %>
+          <%= link_to 'Edit',  edit_site_comment_path(comment.site, comment)  %><br/>
+          <%= link_to 'Destroy', [comment.site, comment], 
+                    :confirm => 'Are you sure?',
+                    :method => :delete %>
+      </td> 
+    </tr> 
+  <% end %>
+  </table> 
+</div> 

app/views/comments/_form.html.erb

@@ -0,0 +1,29 @@
+<%= form_for(@comment) do |f| %>
+  <% if @comment.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@comment.errors.count, "error") %> prohibited this comment from being saved:</h2>
+
+      <ul>
+      <% @comment.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :coment %><br />
+    <%= f.text_field :coment %>
+  </div>
+  <div class="field">
+    <%= f.label :user_id, :hidden => true %>
+    <%= f.number_field :user_id, :value => current_user.id, :hidden => true %>
+  </div>
+  <div class="field">
+    <%= f.label :site_id, :hidden => true %>
+    <%= f.number_field :site_id, :hidden => true %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

app/views/comments/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing comment</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @comment %> |
+<%= link_to 'Back', site_path(@comment.site) %>

app/views/comments/index.html.erb

@@ -0,0 +1,29 @@
+<h1>Listing comments</h1>
+
+<table>
+  <tr>
+    <th>Coment</th>
+    <th>User</th>
+    <th>Site</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @comments.each do |comment| %>
+  <tr>
+    <td><%= comment.coment %></td>
+    <td><%= comment.user_id %></td>
+    <td><%= comment.site_id %></td>
+    <td><%= link_to 'Show', comment %></td>
+    <% if comment.user == current_user %>
+    	<td><%= link_to 'Edit', edit_comment_path(comment) %></td>
+    	<td><%= link_to 'Destroy', comment, confirm: 'Are you sure?', method: :delete %></td>
+  	<% end %>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+

app/views/comments/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New comment</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', comments_path %>

app/views/comments/show.html.erb

@@ -0,0 +1,20 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Coment:</b>
+  <%= @comment.coment %>
+</p>
+
+<p>
+  <b>User:</b>
+  <%= @comment.user_id %>
+</p>
+
+<p>
+  <b>Site:</b>
+  <%= @comment.site_id %>
+</p>
+
+
+<%= link_to 'Edit', edit_comment_path(@comment) %> |
+<%= link_to 'Back', site_path(@comment.site) %>