Entrega 6

Gemfile

@@ -5,14 +5,7 @@ gem 'rails', '3.2.2'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-group :development do
-  gem 'sqlite3'
-end
-
-group :production do
-  gem 'pg'
-end
-
+gem 'sqlite3'
 
 gem 'devise'
 

Gemfile.lock

@@ -62,12 +62,12 @@ GEM
     mime-types (1.17.2)
     multi_json (1.1.0)
     orm_adapter (0.0.7)
-    paperclip (2.4.5)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
+    paperclip (3.0.2)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
       cocaine (>= 0.0.2)
       mime-types
-    pg (0.13.2)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -125,7 +125,6 @@ DEPENDENCIES
   devise
   jquery-rails
   paperclip
-  pg
   rails (= 3.2.2)
   sass-rails (~> 3.2.3)
   sqlite3

app/assets/javascripts/comentarios.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,12 @@
  *= require cleditor
  *= require_tree .
 */
+
+
+#container{}
+#enla1{}
+#enla1 a{color:blue;}
+#cuerpo{}
+
+
+

app/assets/stylesheets/author.css.scss

@@ -0,0 +1,4 @@
+#espa{background-color:green;color:green;}
+.autor1{}
+#espacio{background-color:blue;color:blue;}
+.autor2{}

app/assets/stylesheets/comentarios.css.scss

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

app/assets/stylesheets/planet.css

@@ -161,9 +161,3 @@
   font-weight: bold;
   margin-right: 2em;
 }
-
-
-#main .visitas {
-  text-indent:   70%;
-}
-

app/assets/stylesheets/sites.css.scss

@@ -1,3 +1,6 @@
 // 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/
+
+#comentarios a{font-weight:bold;color:red;}
+

app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# Controlador de la aplicacion.
+#
 class ApplicationController < ActionController::Base
   protect_from_forgery
 end

app/controllers/comentarios_controller.rb

@@ -0,0 +1,87 @@
+# Controlador de los comentarios donde se definen sus metodos
+#
+class ComentariosController < ApplicationController
+
+before_filter :authenticate_user!
+
+  # GET /comentarios
+  # GET /comentarios.json
+  def index
+    @comentarios = Comentario.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @comentarios }
+    end
+  end
+
+  # GET /comentarios/1
+  # GET /comentarios/1.json
+  def show
+    @comentario = Comentario.find(params[:id])
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @comentario }
+    end
+  end
+
+  # GET /comentarios/new
+  # GET /comentarios/new.json
+  def new
+    @comentario = Comentario.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @comentario }
+    end
+  end
+
+  # GET /comentarios/1/edit
+  def edit
+    @comentario = Comentario.find(params[:id])
+  end
+
+  # POST /comentarios
+  # POST /comentarios.json
+  def create
+    @comentario = Comentario.new(params[:comentario])
+
+    respond_to do |format|
+      if @comentario.save
+        format.html { redirect_to @comentario, notice: 'Comentario was successfully created.' }
+        format.json { render json: @comentario, status: :created, location: @comentario }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @comentario.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /comentarios/1
+  # PUT /comentarios/1.json
+  def update
+    @comentario = Comentario.find(params[:id])
+
+    respond_to do |format|
+      if @comentario.update_attributes(params[:comentario])
+        format.html { redirect_to @comentario, notice: 'Comentario was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @comentario.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /comentarios/1
+  # DELETE /comentarios/1.json
+  def destroy
+    @comentario = Comentario.find(params[:id])
+    @comentario.destroy
+
+    respond_to do |format|
+      format.html { redirect_to comentarios_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
-
+  # Método que define una acción vacía del controlador
+  def author
+  end
+  # Método que realiza la busqueda de sitios y viajes
+  def search
+    if params[:q].length >= 3
+    @sites = Site.where("name like ? OR description like ?", "%#{params[:q]}%", "%#{params[:q]}%")
+    @trips = Trip.where("name like ? OR description like ?", "%#{params[:q]}%", "%#{params[:q]}%")
+   else
+      render action: "busquedaincorrecta"
+    end
+  end
+
 end

app/controllers/sites_controller.rb

@@ -1,9 +1,12 @@
+# Controlador de los sitios donde se definen sus metodos
+#
 class SitesController < ApplicationController
 
   # authenticate_user! ejecuta acción solo si sesión existe
   before_filter :authenticate_user!, :except => [ :index, :show ]
-  after_filter :count_visita, :only => :show
-
+  after_filter :count_visita, :only => :show 
+
+
   # GET /sites
   # GET /sites.json
   def index
@@ -17,12 +20,21 @@ def index
       format.json { render json: @sites }
     end
   end
+  # GET 
+  # GET /sites.json
+  def id
+      @sites = Visit.find(params[:user_id]).sites  # path: /types/id/sites
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @sites }
+    end
+  end
 
   # GET /sites/1
   # GET /sites/1.json
   def show
     @site = Site.find(params[:id])
-
+    @comentarios = @site.comentarios
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @site }
@@ -88,8 +100,8 @@ def destroy
       format.json { head :no_content }
     end
   end
-  
-  private
+private
+  #Incrementa visita cuando se accede al sitio
   def count_visita
     @site.increment!(:visitas)
   end

app/controllers/trips_controller.rb

@@ -1,3 +1,5 @@
+# Controlador de los viajes donde se definen sus metodos
+#
 class TripsController < ApplicationController
 
   # authenticate_user! ejecuta acción solo si sesión existe

app/controllers/types_controller.rb

@@ -1,4 +1,17 @@
+# Controlador de los tipos donde se definen sus metodos
+#
 class TypesController < ApplicationController
+
+ # GET /types/ordered_index
+  # GET /types.json
+  def ordered_index
+    @types = Type.find(:all, :order => :name) 
+    respond_to do |format|
+      format.html # ordered_index.html.erb
+      format.json { render json: @types }
+   end
+  end
+
   # GET /types
   # GET /types.json
   def index

app/controllers/visits_controller.rb

@@ -1,3 +1,5 @@
+# Controlador de las visitas donde se definen sus metodos
+#
 class VisitsController < ApplicationController
   # GET /visits
   # GET /visits.json
@@ -45,7 +47,6 @@ def create
     respond_to do |format|
       if @visit.save
         format.html { redirect_to @visit.trip, notice: 'Visit was successfully created.' }
-        format.js
         format.json { render json: @visit, status: :created, location: @visit }
       else
         format.html { render action: "new" }

app/helpers/application_helper.rb

@@ -1,2 +1,4 @@
+# Helper de la clase Application
+#
 module ApplicationHelper
 end

app/helpers/comentarios_helper.rb

@@ -0,0 +1,4 @@
+# Helper de la clase Comentarios
+#
+module ComentariosHelper
+end

app/helpers/planet_helper.rb

@@ -1,2 +1,4 @@
+# Helper de la clase Planet
+#
 module PlanetHelper
 end

app/helpers/sites_helper.rb

@@ -1,2 +1,3 @@
+# Helper de la clase Sites
 module SitesHelper
 end

app/helpers/trips_helper.rb

@@ -1,2 +1,4 @@
+# Helper de la clase Trips
+#
 module TripsHelper
 end

app/helpers/types_helper.rb

@@ -1,2 +1,4 @@
+# Helper de la clase Types
+#
 module TypesHelper
 end

app/helpers/visits_helper.rb

@@ -1,2 +1,4 @@
+# Helper de la clase Visit
+#
 module VisitsHelper
 end

app/models/comentario.rb

@@ -0,0 +1,11 @@
+# Se definen las  relaciones de la clase Comentario
+#
+class Comentario < ActiveRecord::Base
+belongs_to :user
+belongs_to :site
+
+validates :coment, :site_id, :user_id, :length => {:maximum => 240},  :presence => true
+# Debe estar protegido para evitar accesos indeseados
+  #attr_protected :user_id    
+
+end

app/models/site.rb

@@ -1,14 +1,17 @@
+# Se definen las  relaciones de la clase Site
+#
 class Site < ActiveRecord::Base
   belongs_to :type
   belongs_to :user
   has_many   :visits
-  has_many   :trips,   :through  =>  :visits
+  has_many   :trips,   :through  =>  :visits 
+  has_many   :comentarios
   has_attached_file    :image
 
 
   # Debe estar protegido para evitar accesos indeseados
   attr_protected :user_id    
 
   # Se añaden estas definiciones 
-  validates :name, :type_id,    :presence => true   # campo obligatorio
+  validates :name, :type_id,   :presence => true   # campo obligatorio
 end

app/models/trip.rb

@@ -1,3 +1,5 @@
+# Se definen las  relaciones de la clase Trip
+#
 class Trip < ActiveRecord::Base
   belongs_to :user
   has_many   :visits

app/models/type.rb

@@ -1,3 +1,5 @@
+# Se definen las  relaciones de la clase Type
+#
 class Type < ActiveRecord::Base
   has_many :sites
 

app/models/user.rb

@@ -1,7 +1,17 @@
+# Se definen las  relaciones de la clase User
+#
 class User < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation, :remember_me
 
   has_many :sites
   has_many :trips
+  has_many :comentarios
 
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable

app/models/visit.rb

@@ -1,3 +1,5 @@
+# Se definen las  relaciones de la clase Visit
+#
 class Visit < ActiveRecord::Base
   belongs_to :trip
   belongs_to :site