From 967bebe58a6f68193e09c7c9fd657cdf74c093b5 Mon Sep 17 00:00:00 2001 From: Fran Gil Date: Thu, 22 Mar 2012 13:45:08 +0100 Subject: [PATCH 1/8] Primer intento de entrega 4 --- app/assets/images/alberto_contador.jpg | Bin 0 -> 24487 bytes app/assets/images/pizarro.jpg | Bin 0 -> 18156 bytes app/controllers/planet_controller.rb | 3 + app/controllers/planet_controller.rb~ | 11 +++ app/controllers/types_controller.rb | 11 +++ app/controllers/types_controller.rb~ | 96 +++++++++++++++++++ app/views/layouts/application.html.erb | 4 +- app/views/layouts/application.html.erb~ | 14 +++ app/views/planet/author.html.erb | 28 ++++++ app/views/planet/author.html.erb~ | 25 +++++ app/views/types/index.html.erb | 1 + app/views/types/index.html.erb~ | 26 +++++ app/views/types/index_ordenado.html.erb | 26 +++++ app/views/types/show.html.erb | 4 + app/views/types/show.html.erb~ | 15 +++ config/routes.rb | 4 + config/routes.rb~ | 70 ++++++++++++++ test/unit/helpers/planet_controller_test.rb | 17 ++++ test/unit/helpers/planet_controller_test.rb~ | 17 ++++ 19 files changed, 370 insertions(+), 2 deletions(-) create mode 100644 app/assets/images/alberto_contador.jpg create mode 100644 app/assets/images/pizarro.jpg create mode 100644 app/controllers/planet_controller.rb~ create mode 100644 app/controllers/types_controller.rb~ create mode 100644 app/views/layouts/application.html.erb~ create mode 100644 app/views/planet/author.html.erb create mode 100644 app/views/planet/author.html.erb~ create mode 100644 app/views/types/index.html.erb~ create mode 100644 app/views/types/index_ordenado.html.erb create mode 100644 app/views/types/show.html.erb~ create mode 100644 config/routes.rb~ create mode 100644 test/unit/helpers/planet_controller_test.rb create mode 100644 test/unit/helpers/planet_controller_test.rb~ diff --git a/app/assets/images/alberto_contador.jpg b/app/assets/images/alberto_contador.jpg new file mode 100644 index 0000000000000000000000000000000000000000..cb6d270d886e9ef6460a40c6ec38a8d9c45ecac3 GIT binary patch literal 24487 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%0D=h4ug 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 S(O&d&N{uITmE#h7AOG3wgiy8s literal 0 HcmV?d00001 diff --git a/app/assets/images/pizarro.jpg b/app/assets/images/pizarro.jpg new file mode 100644 index 0000000000000000000000000000000000000000..77b4915edc85ac422f2e52ccbe15ebf4aafb0712 GIT binary patch literal 18156 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 rvD@` :name) + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @types } + end + end + # GET /types/new # GET /types/new.json def new diff --git a/app/controllers/types_controller.rb~ b/app/controllers/types_controller.rb~ new file mode 100644 index 0000000..baaf537 --- /dev/null +++ b/app/controllers/types_controller.rb~ @@ -0,0 +1,96 @@ +class TypesController < ApplicationController + # GET /types + # GET /types.json + def index + @types = Type.all + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @types } + end + end + + # GET /types/1 + # GET /types/1.json + def index_ordenado + @types = Type.find(:all, :order => :name) + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @types } + end + end + + # GET /types/1 + # GET /types/1.json + def show + @type = Type.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @type } + end + end + + + + # GET /types/new + # GET /types/new.json + def new + @type = Type.new + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @type } + end + end + + # GET /types/1/edit + def edit + @type = Type.find(params[:id]) + end + + # POST /types + # POST /types.json + def create + @type = Type.new(params[:type]) + + respond_to do |format| + if @type.save + format.html { redirect_to @type, notice: 'Type was successfully created.' } + format.json { render json: @type, status: :created, location: @type } + else + format.html { render action: "new" } + format.json { render json: @type.errors, status: :unprocessable_entity } + end + end + end + + # PUT /types/1 + # PUT /types/1.json + def update + @type = Type.find(params[:id]) + + respond_to do |format| + if @type.update_attributes(params[:type]) + format.html { redirect_to @type, notice: 'Type was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @type.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /types/1 + # DELETE /types/1.json + def destroy + @type = Type.find(params[:id]) + @type.destroy + + respond_to do |format| + format.html { redirect_to types_url } + format.json { head :no_content } + end + end +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 062c0a4..9415fcb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,8 +7,8 @@ <%= csrf_meta_tags %> - +<%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Index', types_path)+ "|" + link_to('Index ordenado', types_index_ordenado_path) %> <%= yield %> - +<%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Index', types_path)+ "|" + link_to('Index ordenado', types_index_ordenado_path) %> diff --git a/app/views/layouts/application.html.erb~ b/app/views/layouts/application.html.erb~ new file mode 100644 index 0000000..16910ff --- /dev/null +++ b/app/views/layouts/application.html.erb~ @@ -0,0 +1,14 @@ + + + + Planet + <%= stylesheet_link_tag "application", :media => "all" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + + +<%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Index', types_path)+ "|" + link_to('Index ordenado', types_index_ordenado_path) %> +<%= yield %> +<%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Index', types_path)+ "|" + link_to('Index ordenado', types_index_ordenado_path) %> + + diff --git a/app/views/planet/author.html.erb b/app/views/planet/author.html.erb new file mode 100644 index 0000000..1ac8727 --- /dev/null +++ b/app/views/planet/author.html.erb @@ -0,0 +1,28 @@ + + +Autores + + +

+Información sobre los creadores +

+ +

En esta página podrá encontrar varios datos sobre los creadores +

+

Alberto Moreno Díaz

+<%= image_tag('alberto_contador.jpg') %> + +

Francisco José Gil García

+<%= image_tag('pizarro.jpg') %> +
    +
  • Dirección de correo: fj.gil@alumnos.upm.es
    • +
  • Dirección física: C/Con nombre 2, Bajo Derecha, Villatempujo de arriba
    • +
  • Breve currículum: a rellenar también
    • +
+

Para cualquier duda o problema no dude en contactarnos.

+ + diff --git a/app/views/planet/author.html.erb~ b/app/views/planet/author.html.erb~ new file mode 100644 index 0000000..95dd94e --- /dev/null +++ b/app/views/planet/author.html.erb~ @@ -0,0 +1,25 @@ + + +Autores + + +

+Información sobre los creadores +

+ +

En esta página podrá encontrar varios datos sobre los creadores +

+

Alberto Moreno Díaz

+<%= image_tag('alberto_contador.jpg') %> + +<%= image_tag('pedriza2-m.png') %> +

Francisco José Gil García

+ +

Feel free to use it for your +convenience and pleasure.

+ + diff --git a/app/views/types/index.html.erb b/app/views/types/index.html.erb index 50bda49..26b15a3 100644 --- a/app/views/types/index.html.erb +++ b/app/views/types/index.html.erb @@ -13,6 +13,7 @@ <%= type.name %> <%= type.description %> + <%= type.updated_at %> <%= link_to 'Show', type %> <%= link_to 'Edit', edit_type_path(type) %> <%= link_to 'Destroy', type, confirm: 'Are you sure?', method: :delete %> diff --git a/app/views/types/index.html.erb~ b/app/views/types/index.html.erb~ new file mode 100644 index 0000000..26b15a3 --- /dev/null +++ b/app/views/types/index.html.erb~ @@ -0,0 +1,26 @@ +

Listing types

+ + + + + + + + + + +<% @types.each do |type| %> + + + + + + + + +<% end %> +
NameDescription
<%= type.name %><%= type.description %><%= type.updated_at %><%= link_to 'Show', type %><%= link_to 'Edit', edit_type_path(type) %><%= link_to 'Destroy', type, confirm: 'Are you sure?', method: :delete %>
+ +
+ +<%= link_to 'New Type', new_type_path %> diff --git a/app/views/types/index_ordenado.html.erb b/app/views/types/index_ordenado.html.erb new file mode 100644 index 0000000..26b15a3 --- /dev/null +++ b/app/views/types/index_ordenado.html.erb @@ -0,0 +1,26 @@ +

Listing types

+ + + + + + + + + + +<% @types.each do |type| %> + + + + + + + + +<% end %> +
NameDescription
<%= type.name %><%= type.description %><%= type.updated_at %><%= link_to 'Show', type %><%= link_to 'Edit', edit_type_path(type) %><%= link_to 'Destroy', type, confirm: 'Are you sure?', method: :delete %>
+ +
+ +<%= link_to 'New Type', new_type_path %> diff --git a/app/views/types/show.html.erb b/app/views/types/show.html.erb index 98b32e7..4400a61 100644 --- a/app/views/types/show.html.erb +++ b/app/views/types/show.html.erb @@ -10,6 +10,10 @@ <%= @type.description %>

+

+ Updated at: + <%= @type.updated_at %> +

<%= link_to 'Edit', edit_type_path(@type) %> | <%= link_to 'Back', types_path %> diff --git a/app/views/types/show.html.erb~ b/app/views/types/show.html.erb~ new file mode 100644 index 0000000..98b32e7 --- /dev/null +++ b/app/views/types/show.html.erb~ @@ -0,0 +1,15 @@ +

<%= notice %>

+ +

+ Name: + <%= @type.name %> +

+ +

+ Description: + <%= @type.description %> +

+ + +<%= link_to 'Edit', edit_type_path(@type) %> | +<%= link_to 'Back', types_path %> diff --git a/config/routes.rb b/config/routes.rb index 4cd1976..0572b25 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,6 +7,10 @@ get "planet/ejemplo" + get "planet/author" + + get "types/index_ordenado" + # The priority is based upon order of creation: # first created -> highest priority. diff --git a/config/routes.rb~ b/config/routes.rb~ new file mode 100644 index 0000000..9e0930a --- /dev/null +++ b/config/routes.rb~ @@ -0,0 +1,70 @@ +Planet::Application.routes.draw do + resources :types + + get "planet/index" + + get "planet/contact" + + get "planet/ejemplo" + + get "planet/author" + + # The priority is based upon order of creation: + # first created -> highest priority. + + # Sample of regular route: + # match 'products/:id' => 'catalog#view' + # Keep in mind you can assign values other than :controller and :action + + # Sample of named route: + # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase + # This route can be invoked with purchase_url(:id => product.id) + + # Sample resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Sample resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end + + # Sample resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Sample resource route with more complex sub-resources + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', :on => :collection + # end + # end + + # Sample resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end + + # You can have the root of your site routed with "root" + # just remember to delete public/index.html. + # root :to => 'welcome#index' + + root :to => "planet#index" + + # See how all your routes lay out with "rake routes" + + # This is a legacy wild controller route that's not recommended for RESTful applications. + # Note: This route will make all actions in every controller accessible via GET requests. + # match ':controller(/:action(/:id(.:format)))' +end diff --git a/test/unit/helpers/planet_controller_test.rb b/test/unit/helpers/planet_controller_test.rb new file mode 100644 index 0000000..8ca34e8 --- /dev/null +++ b/test/unit/helpers/planet_controller_test.rb @@ -0,0 +1,17 @@ +require 'test_helper' +# Rails genera estos tests automaticamente. +# +# Prueban que devuelve correctamente las páginas index y contact +# +class PlanetControllerTest < ActionController::TestCase +test "should get author" do +get :author +# Invoca “get” en acción “author” +assert_response :success # código HTTP: “200 OK” +end +test "should get ejemplo" do +get :ejemplo +# Invoca “get” en acción “ejemplo” +assert_response :success # código HTTP: “200 OK” +end +end diff --git a/test/unit/helpers/planet_controller_test.rb~ b/test/unit/helpers/planet_controller_test.rb~ new file mode 100644 index 0000000..2d2d3ba --- /dev/null +++ b/test/unit/helpers/planet_controller_test.rb~ @@ -0,0 +1,17 @@ +require 'test_helper' +# Rails genera estos tests automaticamente. +# +# Prueban que devuelve correctamente las páginas index y contact +# +class PlanetControllerTest < ActionController::TestCase +test "should get index" do +get :index +# Invoca “get” en acción “index” +assert_response :success # código HTTP: “200 OK” +end +test "should get contact" do +get :contact +# Invoca “get” en acción “contact” +assert_response :success # código HTTP: “200 OK” +end +end From fad30f165c6274fc233112ecb64ffdb0a280c92c Mon Sep 17 00:00:00 2001 From: Fran Gil Date: Tue, 27 Mar 2012 19:10:04 +0200 Subject: [PATCH 2/8] cambios entrega 1 --- app/controllers/types_controller.rb | 188 +++++++++++----------- app/views/layouts/application.html.erb | 30 ++-- app/views/types/ordered_index.html.erb | 26 +++ test/functional/planet_controller_test.rb | 40 +++-- 4 files changed, 162 insertions(+), 122 deletions(-) create mode 100644 app/views/types/ordered_index.html.erb diff --git a/app/controllers/types_controller.rb b/app/controllers/types_controller.rb index 7d15db4..c11eb7f 100644 --- a/app/controllers/types_controller.rb +++ b/app/controllers/types_controller.rb @@ -1,94 +1,94 @@ -class TypesController < ApplicationController - # GET /types - # GET /types.json - def index - @types = Type.all - - respond_to do |format| - format.html # index.html.erb - format.json { render json: @types } - end - end - - # GET /types/1 - # GET /types/1.json - def show - @type = Type.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.json { render json: @type } - end - end - - # GET /types - # GET /types.json - def index_ordenado - @types = Type.find(:all, :order => :name) - - respond_to do |format| - format.html # index.html.erb - format.json { render json: @types } - end - end - - # GET /types/new - # GET /types/new.json - def new - @type = Type.new - - respond_to do |format| - format.html # new.html.erb - format.json { render json: @type } - end - end - - # GET /types/1/edit - def edit - @type = Type.find(params[:id]) - end - - # POST /types - # POST /types.json - def create - @type = Type.new(params[:type]) - - respond_to do |format| - if @type.save - format.html { redirect_to @type, notice: 'Type was successfully created.' } - format.json { render json: @type, status: :created, location: @type } - else - format.html { render action: "new" } - format.json { render json: @type.errors, status: :unprocessable_entity } - end - end - end - - # PUT /types/1 - # PUT /types/1.json - def update - @type = Type.find(params[:id]) - - respond_to do |format| - if @type.update_attributes(params[:type]) - format.html { redirect_to @type, notice: 'Type was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: "edit" } - format.json { render json: @type.errors, status: :unprocessable_entity } - end - end - end - - # DELETE /types/1 - # DELETE /types/1.json - def destroy - @type = Type.find(params[:id]) - @type.destroy - - respond_to do |format| - format.html { redirect_to types_url } - format.json { head :no_content } - end - end -end +class TypesController < ApplicationController + # GET /types + # GET /types.json + def index + @types = Type.all + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @types } + end + end + + # GET /types/1 + # GET /types/1.json + def show + @type = Type.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @type } + end + end + + # GET /types/ordered_index + # GET /types/ordered_index.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/new + # GET /types/new.json + def new + @type = Type.new + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @type } + end + end + + # GET /types/1/edit + def edit + @type = Type.find(params[:id]) + end + + # POST /types + # POST /types.json + def create + @type = Type.new(params[:type]) + + respond_to do |format| + if @type.save + format.html { redirect_to @type, notice: 'Type was successfully created.' } + format.json { render json: @type, status: :created, location: @type } + else + format.html { render action: "new" } + format.json { render json: @type.errors, status: :unprocessable_entity } + end + end + end + + # PUT /types/1 + # PUT /types/1.json + def update + @type = Type.find(params[:id]) + + respond_to do |format| + if @type.update_attributes(params[:type]) + format.html { redirect_to @type, notice: 'Type was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @type.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /types/1 + # DELETE /types/1.json + def destroy + @type = Type.find(params[:id]) + @type.destroy + + respond_to do |format| + format.html { redirect_to types_url } + format.json { head :no_content } + end + end +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9415fcb..f910914 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,16 @@ - - - - Planet - <%= stylesheet_link_tag "application", :media => "all" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - - -<%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Index', types_path)+ "|" + link_to('Index ordenado', types_index_ordenado_path) %> -<%= yield %> -<%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Index', types_path)+ "|" + link_to('Index ordenado', types_index_ordenado_path) %> - - + + + + Planet + <%= stylesheet_link_tag "application", :media => "all" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + + +<%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %> +<%= yield %> +

+<%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %> +

+ + \ No newline at end of file diff --git a/app/views/types/ordered_index.html.erb b/app/views/types/ordered_index.html.erb new file mode 100644 index 0000000..a090046 --- /dev/null +++ b/app/views/types/ordered_index.html.erb @@ -0,0 +1,26 @@ +

Listing types

+ + + + + + + + + + +<% @types.each do |type| %> + + + + + + + + +<% end %> +
NameDescription
<%= type.name %><%= type.description %><%= type.updated_at %><%= link_to 'Show', type %><%= link_to 'Edit', edit_type_path(type) %><%= link_to 'Destroy', type, confirm: 'Are you sure?', method: :delete %>
+ +
+ +<%= link_to 'New Type', new_type_path %> diff --git a/test/functional/planet_controller_test.rb b/test/functional/planet_controller_test.rb index 88229e0..84d5ebb 100644 --- a/test/functional/planet_controller_test.rb +++ b/test/functional/planet_controller_test.rb @@ -1,14 +1,26 @@ -require 'test_helper' - -class PlanetControllerTest < ActionController::TestCase - test "should get index" do - get :index - assert_response :success - end - - test "should get contact" do - get :contact - assert_response :success - end - -end +require 'test_helper' + +class PlanetControllerTest < ActionController::TestCase + test "should get index" do + get :index + assert_response :success + end + + test "should get contact" do + get :contact + assert_response :success + end + + test "should get author" do + get :author + # Invoca “get” en acción “author” + assert_response :success # código HTTP: “200 OK” + end + + test "should get ejemplo" do + get :ejemplo + # Invoca “get” en acción “ejemplo” + assert_response :success # código HTTP: “200 OK” + end + +end From 322753c1db80ef9e57d6067d7c86b5ab4171729c Mon Sep 17 00:00:00 2001 From: Fran Gil Date: Tue, 10 Apr 2012 22:08:48 +0200 Subject: [PATCH 3/8] version alberto --- Gemfile | 77 ++++---- Gemfile.lock | 235 ++++++++++++----------- Gemfile~ | 38 ++++ README.rdoc | 522 +++++++++++++++++++++++++-------------------------- Rakefile | 14 +- config.ru | 8 +- 6 files changed, 473 insertions(+), 421 deletions(-) create mode 100644 Gemfile~ diff --git a/Gemfile b/Gemfile index 7764763..f408439 100644 --- a/Gemfile +++ b/Gemfile @@ -1,38 +1,39 @@ -source 'https://rubygems.org' - -gem 'rails', '3.2.2' - -# Bundle edge Rails instead: -# gem 'rails', :git => 'git://github.com/rails/rails.git' - -gem 'sqlite3' - - -# Gems used only for assets and not required -# in production environments by default. -group :assets do - gem 'sass-rails', '~> 3.2.3' - gem 'coffee-rails', '~> 3.2.1' - - # See https://github.com/sstephenson/execjs#readme for more supported runtimes - # gem 'therubyracer' - - gem 'uglifier', '>= 1.0.3' -end - -gem 'jquery-rails' - -# To use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.0.0' - -# To use Jbuilder templates for JSON -# gem 'jbuilder' - -# Use unicorn as the app server -# gem 'unicorn' - -# Deploy with Capistrano -# gem 'capistrano' - -# To use debugger -# gem 'ruby-debug19', :require => 'ruby-debug' +source 'https://rubygems.org' + +gem 'rails', '3.2.2' + +# Bundle edge Rails instead: +# gem 'rails', :git => 'git://github.com/rails/rails.git' + +gem 'sqlite3' + +gem 'devise' + +# Gems used only for assets and not required +# in production environments by default. +group :assets do + gem 'sass-rails', '~> 3.2.3' + gem 'coffee-rails', '~> 3.2.1' + + # See https://github.com/sstephenson/execjs#readme for more supported runtimes + # gem 'therubyracer' + + gem 'uglifier', '>= 1.0.3' +end + +gem 'jquery-rails' + +# To use ActiveModel has_secure_password +# gem 'bcrypt-ruby', '~> 3.0.0' + +# To use Jbuilder templates for JSON +# gem 'jbuilder' + +# Use unicorn as the app server +# gem 'unicorn' + +# Deploy with Capistrano +# gem 'capistrano' + +# To use debugger +# gem 'ruby-debug19', :require => 'ruby-debug' diff --git a/Gemfile.lock b/Gemfile.lock index 81a3ba7..6405e84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,111 +1,124 @@ -GEM - remote: https://rubygems.org/ - specs: - actionmailer (3.2.2) - actionpack (= 3.2.2) - mail (~> 2.4.0) - actionpack (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) - rack-cache (~> 1.1) - rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.2) - activesupport (= 3.2.2) - builder (~> 3.0.0) - activerecord (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) - activesupport (3.2.2) - i18n (~> 0.6) - multi_json (~> 1.0) - arel (3.0.2) - builder (3.0.0) - coffee-rails (3.2.2) - coffee-script (>= 2.2.0) - railties (~> 3.2.0) - coffee-script (2.2.0) - coffee-script-source - execjs - coffee-script-source (1.2.0) - erubis (2.7.0) - execjs (1.3.0) - multi_json (~> 1.0) - hike (1.2.1) - i18n (0.6.0) - journey (1.0.3) - jquery-rails (2.0.1) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.6.5) - mail (2.4.4) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.17.2) - multi_json (1.1.0) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) - rack (>= 1.0) - rails (3.2.2) - actionmailer (= 3.2.2) - actionpack (= 3.2.2) - activerecord (= 3.2.2) - activeresource (= 3.2.2) - activesupport (= 3.2.2) - bundler (~> 1.0) - railties (= 3.2.2) - railties (3.2.2) - actionpack (= 3.2.2) - activesupport (= 3.2.2) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - sass (3.1.15) - sass-rails (3.2.4) - railties (~> 3.2.0) - sass (>= 3.1.10) - tilt (~> 1.3) - sprockets (2.1.2) - hike (~> 1.2) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.5) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.32) - uglifier (1.2.3) - execjs (>= 0.3.0) - multi_json (>= 1.0.2) - -PLATFORMS - ruby - -DEPENDENCIES - coffee-rails (~> 3.2.1) - jquery-rails - rails (= 3.2.2) - sass-rails (~> 3.2.3) - sqlite3 - uglifier (>= 1.0.3) +GEM + remote: https://rubygems.org/ + specs: + actionmailer (3.2.2) + actionpack (= 3.2.2) + mail (~> 2.4.0) + actionpack (3.2.2) + activemodel (= 3.2.2) + activesupport (= 3.2.2) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.1) + rack (~> 1.4.0) + rack-cache (~> 1.1) + rack-test (~> 0.6.1) + sprockets (~> 2.1.2) + activemodel (3.2.2) + activesupport (= 3.2.2) + builder (~> 3.0.0) + activerecord (3.2.2) + activemodel (= 3.2.2) + activesupport (= 3.2.2) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.2) + activemodel (= 3.2.2) + activesupport (= 3.2.2) + activesupport (3.2.2) + i18n (~> 0.6) + multi_json (~> 1.0) + arel (3.0.2) + bcrypt-ruby (3.0.1) + bcrypt-ruby (3.0.1-x86-mingw32) + builder (3.0.0) + coffee-rails (3.2.2) + coffee-script (>= 2.2.0) + railties (~> 3.2.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.2.0) + devise (2.0.4) + bcrypt-ruby (~> 3.0) + orm_adapter (~> 0.0.3) + railties (~> 3.1) + warden (~> 1.1.1) + erubis (2.7.0) + execjs (1.3.0) + multi_json (~> 1.0) + hike (1.2.1) + i18n (0.6.0) + journey (1.0.3) + jquery-rails (2.0.1) + railties (>= 3.2.0, < 5.0) + thor (~> 0.14) + json (1.6.5) + mail (2.4.4) + i18n (>= 0.4.0) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.17.2) + multi_json (1.1.0) + orm_adapter (0.0.7) + polyglot (0.3.3) + rack (1.4.1) + rack-cache (1.2) + rack (>= 0.4) + rack-ssl (1.3.2) + rack + rack-test (0.6.1) + rack (>= 1.0) + rails (3.2.2) + actionmailer (= 3.2.2) + actionpack (= 3.2.2) + activerecord (= 3.2.2) + activeresource (= 3.2.2) + activesupport (= 3.2.2) + bundler (~> 1.0) + railties (= 3.2.2) + railties (3.2.2) + actionpack (= 3.2.2) + activesupport (= 3.2.2) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (~> 0.14.6) + rake (0.9.2.2) + rdoc (3.12) + json (~> 1.4) + sass (3.1.15) + sass-rails (3.2.4) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + sprockets (2.1.2) + hike (~> 1.2) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.5) + sqlite3 (1.3.5-x86-mingw32) + thor (0.14.6) + tilt (1.3.3) + treetop (1.4.10) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.32) + uglifier (1.2.3) + execjs (>= 0.3.0) + multi_json (>= 1.0.2) + warden (1.1.1) + rack (>= 1.0) + +PLATFORMS + ruby + x86-mingw32 + +DEPENDENCIES + coffee-rails (~> 3.2.1) + devise + jquery-rails + rails (= 3.2.2) + sass-rails (~> 3.2.3) + sqlite3 + uglifier (>= 1.0.3) diff --git a/Gemfile~ b/Gemfile~ new file mode 100644 index 0000000..7764763 --- /dev/null +++ b/Gemfile~ @@ -0,0 +1,38 @@ +source 'https://rubygems.org' + +gem 'rails', '3.2.2' + +# Bundle edge Rails instead: +# gem 'rails', :git => 'git://github.com/rails/rails.git' + +gem 'sqlite3' + + +# Gems used only for assets and not required +# in production environments by default. +group :assets do + gem 'sass-rails', '~> 3.2.3' + gem 'coffee-rails', '~> 3.2.1' + + # See https://github.com/sstephenson/execjs#readme for more supported runtimes + # gem 'therubyracer' + + gem 'uglifier', '>= 1.0.3' +end + +gem 'jquery-rails' + +# To use ActiveModel has_secure_password +# gem 'bcrypt-ruby', '~> 3.0.0' + +# To use Jbuilder templates for JSON +# gem 'jbuilder' + +# Use unicorn as the app server +# gem 'unicorn' + +# Deploy with Capistrano +# gem 'capistrano' + +# To use debugger +# gem 'ruby-debug19', :require => 'ruby-debug' diff --git a/README.rdoc b/README.rdoc index 7c36f23..0f00a42 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,261 +1,261 @@ -== Welcome to Rails - -Rails is a web-application framework that includes everything needed to create -database-backed web applications according to the Model-View-Control pattern. - -This pattern splits the view (also called the presentation) into "dumb" -templates that are primarily responsible for inserting pre-built data in between -HTML tags. The model contains the "smart" domain objects (such as Account, -Product, Person, Post) that holds all the business logic and knows how to -persist themselves to a database. The controller handles the incoming requests -(such as Save New Account, Update Product, Show Post) by manipulating the model -and directing data to the view. - -In Rails, the model is handled by what's called an object-relational mapping -layer entitled Active Record. This layer allows you to present the data from -database rows as objects and embellish these data objects with business logic -methods. You can read more about Active Record in -link:files/vendor/rails/activerecord/README.html. - -The controller and view are handled by the Action Pack, which handles both -layers by its two parts: Action View and Action Controller. These two layers -are bundled in a single package due to their heavy interdependence. This is -unlike the relationship between the Active Record and Action Pack that is much -more separate. Each of these packages can be used independently outside of -Rails. You can read more about Action Pack in -link:files/vendor/rails/actionpack/README.html. - - -== Getting Started - -1. At the command prompt, create a new Rails application: - rails new myapp (where myapp is the application name) - -2. Change directory to myapp and start the web server: - cd myapp; rails server (run with --help for options) - -3. Go to http://localhost:3000/ and you'll see: - "Welcome aboard: You're riding Ruby on Rails!" - -4. Follow the guidelines to start developing your application. You can find -the following resources handy: - -* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html -* Ruby on Rails Tutorial Book: http://www.railstutorial.org/ - - -== Debugging Rails - -Sometimes your application goes wrong. Fortunately there are a lot of tools that -will help you debug it and get it back on the rails. - -First area to check is the application log files. Have "tail -f" commands -running on the server.log and development.log. Rails will automatically display -debugging and runtime information to these files. Debugging info will also be -shown in the browser on requests from 127.0.0.1. - -You can also log your own messages directly into the log file from your code -using the Ruby logger class from inside your controllers. Example: - - class WeblogController < ActionController::Base - def destroy - @weblog = Weblog.find(params[:id]) - @weblog.destroy - logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!") - end - end - -The result will be a message in your log file along the lines of: - - Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1! - -More information on how to use the logger is at http://www.ruby-doc.org/core/ - -Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are -several books available online as well: - -* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe) -* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide) - -These two books will bring you up to speed on the Ruby language and also on -programming in general. - - -== Debugger - -Debugger support is available through the debugger command when you start your -Mongrel or WEBrick server with --debugger. This means that you can break out of -execution at any point in the code, investigate and change the model, and then, -resume execution! You need to install ruby-debug to run the server in debugging -mode. With gems, use sudo gem install ruby-debug. Example: - - class WeblogController < ActionController::Base - def index - @posts = Post.all - debugger - end - end - -So the controller will accept the action, run the first line, then present you -with a IRB prompt in the server window. Here you can do things like: - - >> @posts.inspect - => "[#nil, "body"=>nil, "id"=>"1"}>, - #"Rails", "body"=>"Only ten..", "id"=>"2"}>]" - >> @posts.first.title = "hello from a debugger" - => "hello from a debugger" - -...and even better, you can examine how your runtime objects actually work: - - >> f = @posts.first - => #nil, "body"=>nil, "id"=>"1"}> - >> f. - Display all 152 possibilities? (y or n) - -Finally, when you're ready to resume execution, you can enter "cont". - - -== Console - -The console is a Ruby shell, which allows you to interact with your -application's domain model. Here you'll have all parts of the application -configured, just like it is when the application is running. You can inspect -domain models, change values, and save to the database. Starting the script -without arguments will launch it in the development environment. - -To start the console, run rails console from the application -directory. - -Options: - -* Passing the -s, --sandbox argument will rollback any modifications - made to the database. -* Passing an environment name as an argument will load the corresponding - environment. Example: rails console production. - -To reload your controllers and models after launching the console run -reload! - -More information about irb can be found at: -link:http://www.rubycentral.org/pickaxe/irb.html - - -== dbconsole - -You can go to the command line of your database directly through rails -dbconsole. You would be connected to the database with the credentials -defined in database.yml. Starting the script without arguments will connect you -to the development database. Passing an argument will connect you to a different -database, like rails dbconsole production. Currently works for MySQL, -PostgreSQL and SQLite 3. - -== Description of Contents - -The default directory structure of a generated Ruby on Rails application: - - |-- app - | |-- assets - | |-- images - | |-- javascripts - | `-- stylesheets - | |-- controllers - | |-- helpers - | |-- mailers - | |-- models - | `-- views - | `-- layouts - |-- config - | |-- environments - | |-- initializers - | `-- locales - |-- db - |-- doc - |-- lib - | `-- tasks - |-- log - |-- public - |-- script - |-- test - | |-- fixtures - | |-- functional - | |-- integration - | |-- performance - | `-- unit - |-- tmp - | |-- cache - | |-- pids - | |-- sessions - | `-- sockets - `-- vendor - |-- assets - `-- stylesheets - `-- plugins - -app - Holds all the code that's specific to this particular application. - -app/assets - Contains subdirectories for images, stylesheets, and JavaScript files. - -app/controllers - Holds controllers that should be named like weblogs_controller.rb for - automated URL mapping. All controllers should descend from - ApplicationController which itself descends from ActionController::Base. - -app/models - Holds models that should be named like post.rb. Models descend from - ActiveRecord::Base by default. - -app/views - Holds the template files for the view that should be named like - weblogs/index.html.erb for the WeblogsController#index action. All views use - eRuby syntax by default. - -app/views/layouts - Holds the template files for layouts to be used with views. This models the - common header/footer method of wrapping views. In your views, define a layout - using the layout :default and create a file named default.html.erb. - Inside default.html.erb, call <% yield %> to render the view using this - layout. - -app/helpers - Holds view helpers that should be named like weblogs_helper.rb. These are - generated for you automatically when using generators for controllers. - Helpers can be used to wrap functionality for your views into methods. - -config - Configuration files for the Rails environment, the routing map, the database, - and other dependencies. - -db - Contains the database schema in schema.rb. db/migrate contains all the - sequence of Migrations for your schema. - -doc - This directory is where your application documentation will be stored when - generated using rake doc:app - -lib - Application specific libraries. Basically, any kind of custom code that - doesn't belong under controllers, models, or helpers. This directory is in - the load path. - -public - The directory available for the web server. Also contains the dispatchers and the - default HTML files. This should be set as the DOCUMENT_ROOT of your web - server. - -script - Helper scripts for automation and generation. - -test - Unit and functional tests along with fixtures. When using the rails generate - command, template test files will be generated for you and placed in this - directory. - -vendor - External libraries that the application depends on. Also includes the plugins - subdirectory. If the app has frozen rails, those gems also go here, under - vendor/rails/. This directory is in the load path. +== Welcome to Rails + +Rails is a web-application framework that includes everything needed to create +database-backed web applications according to the Model-View-Control pattern. + +This pattern splits the view (also called the presentation) into "dumb" +templates that are primarily responsible for inserting pre-built data in between +HTML tags. The model contains the "smart" domain objects (such as Account, +Product, Person, Post) that holds all the business logic and knows how to +persist themselves to a database. The controller handles the incoming requests +(such as Save New Account, Update Product, Show Post) by manipulating the model +and directing data to the view. + +In Rails, the model is handled by what's called an object-relational mapping +layer entitled Active Record. This layer allows you to present the data from +database rows as objects and embellish these data objects with business logic +methods. You can read more about Active Record in +link:files/vendor/rails/activerecord/README.html. + +The controller and view are handled by the Action Pack, which handles both +layers by its two parts: Action View and Action Controller. These two layers +are bundled in a single package due to their heavy interdependence. This is +unlike the relationship between the Active Record and Action Pack that is much +more separate. Each of these packages can be used independently outside of +Rails. You can read more about Action Pack in +link:files/vendor/rails/actionpack/README.html. + + +== Getting Started + +1. At the command prompt, create a new Rails application: + rails new myapp (where myapp is the application name) + +2. Change directory to myapp and start the web server: + cd myapp; rails server (run with --help for options) + +3. Go to http://localhost:3000/ and you'll see: + "Welcome aboard: You're riding Ruby on Rails!" + +4. Follow the guidelines to start developing your application. You can find +the following resources handy: + +* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html +* Ruby on Rails Tutorial Book: http://www.railstutorial.org/ + + +== Debugging Rails + +Sometimes your application goes wrong. Fortunately there are a lot of tools that +will help you debug it and get it back on the rails. + +First area to check is the application log files. Have "tail -f" commands +running on the server.log and development.log. Rails will automatically display +debugging and runtime information to these files. Debugging info will also be +shown in the browser on requests from 127.0.0.1. + +You can also log your own messages directly into the log file from your code +using the Ruby logger class from inside your controllers. Example: + + class WeblogController < ActionController::Base + def destroy + @weblog = Weblog.find(params[:id]) + @weblog.destroy + logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!") + end + end + +The result will be a message in your log file along the lines of: + + Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1! + +More information on how to use the logger is at http://www.ruby-doc.org/core/ + +Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are +several books available online as well: + +* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe) +* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide) + +These two books will bring you up to speed on the Ruby language and also on +programming in general. + + +== Debugger + +Debugger support is available through the debugger command when you start your +Mongrel or WEBrick server with --debugger. This means that you can break out of +execution at any point in the code, investigate and change the model, and then, +resume execution! You need to install ruby-debug to run the server in debugging +mode. With gems, use sudo gem install ruby-debug. Example: + + class WeblogController < ActionController::Base + def index + @posts = Post.all + debugger + end + end + +So the controller will accept the action, run the first line, then present you +with a IRB prompt in the server window. Here you can do things like: + + >> @posts.inspect + => "[#nil, "body"=>nil, "id"=>"1"}>, + #"Rails", "body"=>"Only ten..", "id"=>"2"}>]" + >> @posts.first.title = "hello from a debugger" + => "hello from a debugger" + +...and even better, you can examine how your runtime objects actually work: + + >> f = @posts.first + => #nil, "body"=>nil, "id"=>"1"}> + >> f. + Display all 152 possibilities? (y or n) + +Finally, when you're ready to resume execution, you can enter "cont". + + +== Console + +The console is a Ruby shell, which allows you to interact with your +application's domain model. Here you'll have all parts of the application +configured, just like it is when the application is running. You can inspect +domain models, change values, and save to the database. Starting the script +without arguments will launch it in the development environment. + +To start the console, run rails console from the application +directory. + +Options: + +* Passing the -s, --sandbox argument will rollback any modifications + made to the database. +* Passing an environment name as an argument will load the corresponding + environment. Example: rails console production. + +To reload your controllers and models after launching the console run +reload! + +More information about irb can be found at: +link:http://www.rubycentral.org/pickaxe/irb.html + + +== dbconsole + +You can go to the command line of your database directly through rails +dbconsole. You would be connected to the database with the credentials +defined in database.yml. Starting the script without arguments will connect you +to the development database. Passing an argument will connect you to a different +database, like rails dbconsole production. Currently works for MySQL, +PostgreSQL and SQLite 3. + +== Description of Contents + +The default directory structure of a generated Ruby on Rails application: + + |-- app + | |-- assets + | |-- images + | |-- javascripts + | `-- stylesheets + | |-- controllers + | |-- helpers + | |-- mailers + | |-- models + | `-- views + | `-- layouts + |-- config + | |-- environments + | |-- initializers + | `-- locales + |-- db + |-- doc + |-- lib + | `-- tasks + |-- log + |-- public + |-- script + |-- test + | |-- fixtures + | |-- functional + | |-- integration + | |-- performance + | `-- unit + |-- tmp + | |-- cache + | |-- pids + | |-- sessions + | `-- sockets + `-- vendor + |-- assets + `-- stylesheets + `-- plugins + +app + Holds all the code that's specific to this particular application. + +app/assets + Contains subdirectories for images, stylesheets, and JavaScript files. + +app/controllers + Holds controllers that should be named like weblogs_controller.rb for + automated URL mapping. All controllers should descend from + ApplicationController which itself descends from ActionController::Base. + +app/models + Holds models that should be named like post.rb. Models descend from + ActiveRecord::Base by default. + +app/views + Holds the template files for the view that should be named like + weblogs/index.html.erb for the WeblogsController#index action. All views use + eRuby syntax by default. + +app/views/layouts + Holds the template files for layouts to be used with views. This models the + common header/footer method of wrapping views. In your views, define a layout + using the layout :default and create a file named default.html.erb. + Inside default.html.erb, call <% yield %> to render the view using this + layout. + +app/helpers + Holds view helpers that should be named like weblogs_helper.rb. These are + generated for you automatically when using generators for controllers. + Helpers can be used to wrap functionality for your views into methods. + +config + Configuration files for the Rails environment, the routing map, the database, + and other dependencies. + +db + Contains the database schema in schema.rb. db/migrate contains all the + sequence of Migrations for your schema. + +doc + This directory is where your application documentation will be stored when + generated using rake doc:app + +lib + Application specific libraries. Basically, any kind of custom code that + doesn't belong under controllers, models, or helpers. This directory is in + the load path. + +public + The directory available for the web server. Also contains the dispatchers and the + default HTML files. This should be set as the DOCUMENT_ROOT of your web + server. + +script + Helper scripts for automation and generation. + +test + Unit and functional tests along with fixtures. When using the rails generate + command, template test files will be generated for you and placed in this + directory. + +vendor + External libraries that the application depends on. Also includes the plugins + subdirectory. If the app has frozen rails, those gems also go here, under + vendor/rails/. This directory is in the load path. diff --git a/Rakefile b/Rakefile index 8d9611e..adc01ca 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,7 @@ -#!/usr/bin/env rake -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - -require File.expand_path('../config/application', __FILE__) - -Planet::Application.load_tasks +#!/usr/bin/env rake +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require File.expand_path('../config/application', __FILE__) + +Planet::Application.load_tasks diff --git a/config.ru b/config.ru index 0a9abb6..1ec20e0 100644 --- a/config.ru +++ b/config.ru @@ -1,4 +1,4 @@ -# This file is used by Rack-based servers to start the application. - -require ::File.expand_path('../config/environment', __FILE__) -run Planet::Application +# This file is used by Rack-based servers to start the application. + +require ::File.expand_path('../config/environment', __FILE__) +run Planet::Application From 996eee2949f79ef7244536b6ebbec0e0f8e17941 Mon Sep 17 00:00:00 2001 From: Fran Gil Date: Tue, 17 Apr 2012 19:00:55 +0200 Subject: [PATCH 4/8] Entrega comentarios --- app/assets/javascripts/comments.js.coffee | 3 + app/assets/stylesheets/comments.css.scss | 3 + app/controllers/comments_controller.rb | 91 +++++++++++ app/controllers/comments_controller.rb~ | 91 +++++++++++ app/controllers/sites_controller.rb | 1 + app/controllers/sites_controller.rb~ | 90 +++++++++++ app/helpers/comments_helper.rb | 2 + app/models/comment.rb | 12 ++ app/models/comment.rb~ | 4 + app/models/site.rb | 2 + app/models/site.rb~ | 10 ++ app/models/user.rb | 1 + app/models/user.rb~ | 15 ++ app/views/comments/_comment.html.erb | 28 ++++ app/views/comments/_form.html.erb | 23 +++ app/views/comments/_form.html.erb~ | 33 ++++ app/views/comments/edit.html.erb | 6 + app/views/comments/edit.html.erb~ | 6 + app/views/comments/index.html.erb | 7 + app/views/comments/index.html.erb~ | 7 + app/views/comments/new.html.erb | 5 + app/views/comments/new.html.erb~ | 5 + app/views/comments/show.html.erb | 21 +++ app/views/comments/show.html.erb~ | 21 +++ app/views/sites/index.html.erb | 3 + app/views/sites/index.html.erb~ | 39 +++++ app/views/sites/show.html.erb | 10 +- config/routes.rb | 6 +- config/routes.rb~ | 159 ++++++++++--------- db/migrate/20120410171102_create_comments.rb | 11 ++ db/migrate/20120410202832_create_comments.rb | 11 ++ db/schema.rb | 10 +- test/fixtures/comments.yml | 11 ++ test/functional/comments_controller_test.rb | 49 ++++++ test/unit/comment_test.rb | 7 + test/unit/helpers/comments_helper_test.rb | 4 + 36 files changed, 726 insertions(+), 81 deletions(-) create mode 100644 app/assets/javascripts/comments.js.coffee create mode 100644 app/assets/stylesheets/comments.css.scss create mode 100644 app/controllers/comments_controller.rb create mode 100644 app/controllers/comments_controller.rb~ create mode 100644 app/controllers/sites_controller.rb~ create mode 100644 app/helpers/comments_helper.rb create mode 100644 app/models/comment.rb create mode 100644 app/models/comment.rb~ create mode 100644 app/models/site.rb~ create mode 100644 app/models/user.rb~ create mode 100644 app/views/comments/_comment.html.erb create mode 100644 app/views/comments/_form.html.erb create mode 100644 app/views/comments/_form.html.erb~ create mode 100644 app/views/comments/edit.html.erb create mode 100644 app/views/comments/edit.html.erb~ create mode 100644 app/views/comments/index.html.erb create mode 100644 app/views/comments/index.html.erb~ create mode 100644 app/views/comments/new.html.erb create mode 100644 app/views/comments/new.html.erb~ create mode 100644 app/views/comments/show.html.erb create mode 100644 app/views/comments/show.html.erb~ create mode 100644 app/views/sites/index.html.erb~ create mode 100644 db/migrate/20120410171102_create_comments.rb create mode 100644 db/migrate/20120410202832_create_comments.rb create mode 100644 test/fixtures/comments.yml create mode 100644 test/functional/comments_controller_test.rb create mode 100644 test/unit/comment_test.rb create mode 100644 test/unit/helpers/comments_helper_test.rb diff --git a/app/assets/javascripts/comments.js.coffee b/app/assets/javascripts/comments.js.coffee new file mode 100644 index 0000000..7615679 --- /dev/null +++ b/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/ diff --git a/app/assets/stylesheets/comments.css.scss b/app/assets/stylesheets/comments.css.scss new file mode 100644 index 0000000..3722c12 --- /dev/null +++ b/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/ diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb new file mode 100644 index 0000000..eda8d8a --- /dev/null +++ b/app/controllers/comments_controller.rb @@ -0,0 +1,91 @@ +class CommentsController < ApplicationController + + # authenticate_user! ejecuta acción solo si sesión existe + before_filter :authenticate_user!, :except => [ :index, :show ] + + # GET /comments + # GET /comments.json + def index + @site = Site.find(params[:site_id]) + @comments = @site.comments + @comment = current_user.comments.build + + 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 = current_user.comments.build + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @comment } + end + end + + # GET /comments/1/edit + def edit + @comment = current_user.comments.find(params[:id]) + @site = @comment.site + end + + # POST /comments + # POST /comments.json + def create + @comment = current_user.comments.build(params[:comment]) + + respond_to do |format| + if @comment.save + format.html { redirect_to site_path(@comment.site), 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 = current_user.comments.find(params[:id]) + + respond_to do |format| + if @comment.update_attributes(params[:comment]) + format.html { redirect_to site_path(@comment.site), 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 = current_user.comments.find(params[:id]) + site = @comment.site + @comment.destroy + + respond_to do |format| + format.html { redirect_to site_path(site) } + format.json { head :no_content } + end + end +end diff --git a/app/controllers/comments_controller.rb~ b/app/controllers/comments_controller.rb~ new file mode 100644 index 0000000..86a4240 --- /dev/null +++ b/app/controllers/comments_controller.rb~ @@ -0,0 +1,91 @@ +class CommentsController < ApplicationController + + # authenticate_user! ejecuta acción solo si sesión existe + before_filter :authenticate_user!, :except => [ :index, :show ] + + # GET /comments + # GET /comments.json + def index + @site = Site.find(params[:site_id]) + @comments = @site.comments + # @comment = current_user.comments.build + + 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 = current_user.comments.build + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @comment } + end + end + + # GET /comments/1/edit + def edit + @comment = current_user.comments.find(params[:id]) + @site = @comment.site + end + + # POST /comments + # POST /comments.json + def create + @comment = current_user.comments.build(params[:comment]) + + respond_to do |format| + if @comment.save + format.html { redirect_to site_path(@comment.site), 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 = current_user.comments.find(params[:id]) + + respond_to do |format| + if @comment.update_attributes(params[:comment]) + format.html { redirect_to site_path(@comment.site), 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 = current_user.comments.find(params[:id]) + site = @comment.site + @comment.destroy + + respond_to do |format| + format.html { redirect_to site_path(site) } + format.json { head :no_content } + end + end +end diff --git a/app/controllers/sites_controller.rb b/app/controllers/sites_controller.rb index 90390bb..8d44a66 100644 --- a/app/controllers/sites_controller.rb +++ b/app/controllers/sites_controller.rb @@ -21,6 +21,7 @@ def index # GET /sites/1.json def show @site = Site.find(params[:id]) + @comment = current_user.comments.build respond_to do |format| format.html # show.html.erb diff --git a/app/controllers/sites_controller.rb~ b/app/controllers/sites_controller.rb~ new file mode 100644 index 0000000..90390bb --- /dev/null +++ b/app/controllers/sites_controller.rb~ @@ -0,0 +1,90 @@ +class SitesController < ApplicationController + + # authenticate_user! ejecuta acción solo si sesión existe + before_filter :authenticate_user!, :except => [ :index, :show ] + + # GET /sites + # GET /sites.json + def index + if params[:type_id].nil? or params[:type_id].empty? + @sites = Site.all # path: /types + else + @sites = Type.find(params[:type_id]).sites # path: /types/id/sites + end + 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]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @site } + end + end + + # GET /sites/new + # GET /sites/new.json + def new + @site = current_user.sites.build # crea sitio vacio asociado a current_user + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @site } + end + end + + # GET /sites/1/edit + def edit + @site = current_user.sites.find(params[:id]) # busca solo en sitios asociados a current_user + end + + # POST /sites + # POST /sites.json + def create + @site = current_user.sites.build(params[:site]) # Asigna solo si sitio asociado a current_user + + respond_to do |format| + if @site.save + format.html { redirect_to @site, notice: 'Site was successfully created.' } + format.json { render json: @site, status: :created, location: @site } + else + format.html { render action: "new" } + format.json { render json: @site.errors, status: :unprocessable_entity } + end + end + end + + # PUT /sites/1 + # PUT /sites/1.json + def update + @site = current_user.sites.find(params[:id]) # busca solo en sitios asociados a current_user + + respond_to do |format| + if @site.update_attributes(params[:site]) + format.html { redirect_to @site, notice: 'Site was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @site.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /sites/1 + # DELETE /sites/1.json + def destroy + @site = current_user.sites.find(params[:id]) # busca solo en sitios asociados a current_user + @site.destroy + + respond_to do |format| + format.html { redirect_to sites_url } + format.json { head :no_content } + end + end +end diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb new file mode 100644 index 0000000..0ec9ca5 --- /dev/null +++ b/app/helpers/comments_helper.rb @@ -0,0 +1,2 @@ +module CommentsHelper +end diff --git a/app/models/comment.rb b/app/models/comment.rb new file mode 100644 index 0000000..8b7c248 --- /dev/null +++ b/app/models/comment.rb @@ -0,0 +1,12 @@ +class Comment < ActiveRecord::Base + belongs_to :site + belongs_to :user + + # Debe estar protegido para evitar accesos indeseados + #attr_protected :user_id + + # Se añaden estas definiciones + validates :comment, :user_id, :site_id, :presence => true # campo obligatorio + validates :comment, :length => { :maximum => 240 } + +end diff --git a/app/models/comment.rb~ b/app/models/comment.rb~ new file mode 100644 index 0000000..c7ec0ca --- /dev/null +++ b/app/models/comment.rb~ @@ -0,0 +1,4 @@ +class Comment < ActiveRecord::Base +belongs_to :user +belongs_to :site +end diff --git a/app/models/site.rb b/app/models/site.rb index ec39f92..ab32f25 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -1,6 +1,8 @@ class Site < ActiveRecord::Base belongs_to :type belongs_to :user + + has_many :comments # Debe estar protegido para evitar accesos indeseados attr_protected :user_id diff --git a/app/models/site.rb~ b/app/models/site.rb~ new file mode 100644 index 0000000..ec39f92 --- /dev/null +++ b/app/models/site.rb~ @@ -0,0 +1,10 @@ +class Site < ActiveRecord::Base + belongs_to :type + belongs_to :user + + # Debe estar protegido para evitar accesos indeseados + attr_protected :user_id + + # Se añaden estas definiciones + validates :name, :type_id, :image_url, :presence => true # campo obligatorio +end diff --git a/app/models/user.rb b/app/models/user.rb index a3684f5..0925503 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,7 @@ class User < ActiveRecord::Base has_many :sites + has_many :comments # Include default devise modules. Others available are: # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable diff --git a/app/models/user.rb~ b/app/models/user.rb~ new file mode 100644 index 0000000..0925503 --- /dev/null +++ b/app/models/user.rb~ @@ -0,0 +1,15 @@ +class User < ActiveRecord::Base + + has_many :sites + has_many :comments + + # Include default devise modules. Others available are: + # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable + + validates_presence_of :name + + # Setup accessible (or protected) attributes for your model + attr_accessible :name, :email, :password, :password_confirmation, :remember_me +end diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb new file mode 100644 index 0000000..ec80a87 --- /dev/null +++ b/app/views/comments/_comment.html.erb @@ -0,0 +1,28 @@ +
+ + <% @comments.each do |comment| %> + + + + + + + <% end %> +
+
+ <% if comment.user == current_user %> +
<%= link_to comment.user.name + ":", edit_user_registration_path %>
+ <% else %> +
<%= comment.user.name + ":" %>
+ <% end %> +
<%= strip_tags(comment.comment) %>
+
+ 		+ <% if comment.user == current_user %> + <%= link_to 'Edit', edit_comment_path(comment) %>
+ <%= link_to 'Destroy', comment, + :confirm => 'Are you sure?', + :method => :delete if comment.user == current_user %> + <% end %> +
+
\ No newline at end of file diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb new file mode 100644 index 0000000..8701bb3 --- /dev/null +++ b/app/views/comments/_form.html.erb @@ -0,0 +1,23 @@ +<%= form_for(@comment) do |f| %> + <% if @comment.errors.any? %> +
+

<%= pluralize(@comment.errors.count, "error") %> prohibited this comment from being saved:

+ +
    + <% @comment.errors.full_messages.each do |msg| %> +
  • <%= msg %>
    • + <% end %> +
+
+ <% end %> + +

Añada su comentario

+
+ <%= f.text_area :comment, :maxlength => 240, :rows => 6 %> +
+ <%= f.number_field :user_id, :value => current_user.id, :hidden => true %> + <%= f.number_field :site_id, :value => @site.id, :hidden => true %> +
+ <%= f.submit %> +
+<% end %> diff --git a/app/views/comments/_form.html.erb~ b/app/views/comments/_form.html.erb~ new file mode 100644 index 0000000..ab5f21a --- /dev/null +++ b/app/views/comments/_form.html.erb~ @@ -0,0 +1,33 @@ +<%= form_for(@site) do |f| %> + <% if @site.errors.any? %> +
+

<%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:

+ +
    + <% @site.errors.full_messages.each do |msg| %> +
  • <%= msg %>
    • + <% end %> +
+
+ <% end %> + +
+ <%= f.label :name %>
+ <%= f.text_field :name %> +
+
+ <%= f.label :description %>
+ <%= f.text_area :description , :rows => 4 %> +
+
+ <%= f.label :type_id %>
+ <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> +
+
+ <%= f.label :image_url %>
+ <%= f.text_field :image_url %> +
+
+ <%= f.submit %> +
+<% end %> diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb new file mode 100644 index 0000000..09acee5 --- /dev/null +++ b/app/views/comments/edit.html.erb @@ -0,0 +1,6 @@ +

Editing comment

+ +<%= render 'form' %> + +<%= link_to 'Back', site_path(@comment.site) %> + diff --git a/app/views/comments/edit.html.erb~ b/app/views/comments/edit.html.erb~ new file mode 100644 index 0000000..af18cc3 --- /dev/null +++ b/app/views/comments/edit.html.erb~ @@ -0,0 +1,6 @@ +

Editing site

+ +<%= render 'form' %> + +<%= link_to 'Show', @site %> | +<%= link_to 'Back', sites_path %> diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb new file mode 100644 index 0000000..51288d3 --- /dev/null +++ b/app/views/comments/index.html.erb @@ -0,0 +1,7 @@ +

Comentarios de <%= @site.name %>

+ +<%= render 'comment' %> + +<%= render 'form' %> + +<%= link_to 'Back', sites_path %> diff --git a/app/views/comments/index.html.erb~ b/app/views/comments/index.html.erb~ new file mode 100644 index 0000000..684f636 --- /dev/null +++ b/app/views/comments/index.html.erb~ @@ -0,0 +1,7 @@ +

Comentarios de <%= @site.name %>

+ +<%= render'comment' %> + +<%= render 'form' %> + +<%= link_to 'Back', sites_path %> diff --git a/app/views/comments/new.html.erb b/app/views/comments/new.html.erb new file mode 100644 index 0000000..07a754a --- /dev/null +++ b/app/views/comments/new.html.erb @@ -0,0 +1,5 @@ +

New comment

+ +<%= render 'form' %> + +<%= link_to 'Back', comments_path %> diff --git a/app/views/comments/new.html.erb~ b/app/views/comments/new.html.erb~ new file mode 100644 index 0000000..37340dc --- /dev/null +++ b/app/views/comments/new.html.erb~ @@ -0,0 +1,5 @@ +

New site

+ +<%= render 'form' %> + +<%= link_to 'Back', sites_path %> diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb new file mode 100644 index 0000000..ba05818 --- /dev/null +++ b/app/views/comments/show.html.erb @@ -0,0 +1,21 @@ +

<%= notice %>

+ +

+ Comment: + <%= @comment.comment %> +

+ +

+ User: + <%= @comment.user.name %> +

+ +

+ Site: + <%= @comment.site.name %> +

+ +<% if @comment.user == current_user %> + <%= link_to 'Edit', edit_comment_path(@comment) %> | +<% end %> +<%= link_to 'Back', site_path(@comment.site) %> diff --git a/app/views/comments/show.html.erb~ b/app/views/comments/show.html.erb~ new file mode 100644 index 0000000..904b6d4 --- /dev/null +++ b/app/views/comments/show.html.erb~ @@ -0,0 +1,21 @@ +
+ +

<%= @site.type.name if @site.type %>

+ + <%= image_tag(@site.image_url, :class => 'site_image') %> + +

<%= @site.name %>

+ +

<%=sanitize @site.description %>

+ +

Autor: + <%= @site.user.name if @site.user %>

+ +
+ +

+ +<% if @site.user == current_user %> + <%= link_to 'Edit', edit_site_path(@site) %> | +<% end %> +<%= link_to 'Back', sites_path %> diff --git a/app/views/sites/index.html.erb b/app/views/sites/index.html.erb index 547fb29..1ecde21 100644 --- a/app/views/sites/index.html.erb +++ b/app/views/sites/index.html.erb @@ -14,6 +14,9 @@

<%= link_to site.name, site %>
<%= truncate(strip_tags(site.description), :length => 80) %>
+ <% unless site.comments.empty? %> +
<%= link_to 'Comentarios', site_comments_path(site) %>
+ <% end %> diff --git a/app/views/sites/index.html.erb~ b/app/views/sites/index.html.erb~ new file mode 100644 index 0000000..9cac379 --- /dev/null +++ b/app/views/sites/index.html.erb~ @@ -0,0 +1,39 @@ +
+

<%= @sites == Site.all ? "Todos los sitios" : Type.find(params[:type_id]).name %>

+ + + <% @sites.each do |site| %> + + + + + + + + + <% end %> +
+ <%= link_to image_tag(site.image_url, :class => 'list_image'), site %> + +
+
<%= link_to site.name, site %>
+
<%= truncate(strip_tags(site.description), + :length => 80) %>
+ <% if site.comments %> + <%= link_to 'comentarios', comments_path(site) %>
+ <% end %> +
+ 		+ <%= link_to 'Show', site %>
+ <% if site.user == current_user %> + <%= link_to 'Edit', edit_site_path(site) %>
+ <%= link_to 'Destroy', site, + :confirm => 'Are you sure?', + :method => :delete %> + <% end %> +
+
+ +
+ +<%= link_to 'New site', new_site_path %> diff --git a/app/views/sites/show.html.erb b/app/views/sites/show.html.erb index 904b6d4..a658b4a 100644 --- a/app/views/sites/show.html.erb +++ b/app/views/sites/show.html.erb @@ -9,7 +9,15 @@

<%=sanitize @site.description %>

Autor: - <%= @site.user.name if @site.user %>

+ <%= @site.user.name if @site.user %>

+ + <% unless @site.comments.empty? %> +

Comentarios:

+ <% @comments = @site.comments %> + <%= render(@comment) %> + <% end %> + + <%= render 'comments/form' %> diff --git a/config/routes.rb b/config/routes.rb index 26ce331..ff5a379 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,12 @@ Planet::Application.routes.draw do + resources :comments, :except => [ :new, :index ] + devise_for :users - resources :sites + resources :sites do + resources :comments, :only => [ :index ] + end resources :types do get 'ordered_index', :on => :collection diff --git a/config/routes.rb~ b/config/routes.rb~ index 10dd011..833f19c 100644 --- a/config/routes.rb~ +++ b/config/routes.rb~ @@ -1,78 +1,81 @@ -Planet::Application.routes.draw do - - resources :sites - get "types/ordered_index" - resources :types do # Rutas anidadas /types/id/sites..., - get 'ordered_index', :on => :collection - resources :sites, :only => [ :index ] # Restringe a acción “index” - end - - get "planet/index" - - get "planet/contact" - - get "planet/ejemplo" - - get "planet/author" - - get "types/index_ordenado" - - # The priority is based upon order of creation: - # first created -> highest priority. - - # Sample of regular route: - # match 'products/:id' => 'catalog#view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Sample resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Sample resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Sample resource route with more complex sub-resources - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', :on => :collection - # end - # end - - # Sample resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end - - # You can have the root of your site routed with "root" - # just remember to delete public/index.html. - # root :to => 'welcome#index' - - root :to => "planet#index" - - # See how all your routes lay out with "rake routes" - - # This is a legacy wild controller route that's not recommended for RESTful applications. - # Note: This route will make all actions in every controller accessible via GET requests. - # match ':controller(/:action(/:id(.:format)))' -end +Planet::Application.routes.draw do + + resources :comments, :except => [ :new, :index ] + devise_for :users + + resources :sites do + resources :comments, :only => [ :index ] + end + + resources :types do + get 'ordered_index', :on => :collection + resources :sites, :only => [ :index ] # Rutas anidadas /types/id/sites. Restringe a acción “index” + end + + get "planet/index" + + get "planet/contact" + + get "planet/ejemplo" + + get "planet/author" + + # The priority is based upon order of creation: + # first created -> highest priority. + + # Sample of regular route: + # match 'products/:id' => 'catalog#view' + # Keep in mind you can assign values other than :controller and :action + + # Sample of named route: + # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase + # This route can be invoked with purchase_url(:id => product.id) + + # Sample resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Sample resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end + + # Sample resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Sample resource route with more complex sub-resources + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', :on => :collection + # end + # end + + # Sample resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end + + # You can have the root of your site routed with "root" + # just remember to delete public/index.html. + # root :to => 'welcome#index' + + root :to => "planet#index" + + # See how all your routes lay out with "rake routes" + + # This is a legacy wild controller route that's not recommended for RESTful applications. + # Note: This route will make all actions in every controller accessible via GET requests. + # match ':controller(/:action(/:id(.:format)))' +end diff --git a/db/migrate/20120410171102_create_comments.rb b/db/migrate/20120410171102_create_comments.rb new file mode 100644 index 0000000..36d0b14 --- /dev/null +++ b/db/migrate/20120410171102_create_comments.rb @@ -0,0 +1,11 @@ +class CreateComments < ActiveRecord::Migration + def change + create_table :comments do |t| + t.string :comment + t.integer :user_id + t.integer :site_id + + t.timestamps + end + end +end diff --git a/db/migrate/20120410202832_create_comments.rb b/db/migrate/20120410202832_create_comments.rb new file mode 100644 index 0000000..36d0b14 --- /dev/null +++ b/db/migrate/20120410202832_create_comments.rb @@ -0,0 +1,11 @@ +class CreateComments < ActiveRecord::Migration + def change + create_table :comments do |t| + t.string :comment + t.integer :user_id + t.integer :site_id + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 75278a9..7cf564d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,15 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20120329080433) do +ActiveRecord::Schema.define(:version => 20120410171102) do + + create_table "comments", :force => true do |t| + t.string "comment" + t.integer "user_id" + t.integer "site_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end create_table "sites", :force => true do |t| t.string "name" diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml new file mode 100644 index 0000000..29c9999 --- /dev/null +++ b/test/fixtures/comments.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +one: + comment: MyString + user_id: 1 + site_id: 1 + +two: + comment: MyString + user_id: 1 + site_id: 1 diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb new file mode 100644 index 0000000..b2b500c --- /dev/null +++ b/test/functional/comments_controller_test.rb @@ -0,0 +1,49 @@ +require 'test_helper' + +class CommentsControllerTest < ActionController::TestCase + setup do + @comment = comments(:one) + end + + test "should get index" do + get :index + assert_response :success + assert_not_nil assigns(:comments) + end + + test "should get new" do + get :new + assert_response :success + end + + test "should create comment" do + assert_difference('Comment.count') do + post :create, comment: @comment.attributes + end + + assert_redirected_to comment_path(assigns(:comment)) + end + + test "should show comment" do + get :show, id: @comment + assert_response :success + end + + test "should get edit" do + get :edit, id: @comment + assert_response :success + end + + test "should update comment" do + put :update, id: @comment, comment: @comment.attributes + assert_redirected_to comment_path(assigns(:comment)) + end + + test "should destroy comment" do + assert_difference('Comment.count', -1) do + delete :destroy, id: @comment + end + + assert_redirected_to comments_path + end +end diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb new file mode 100644 index 0000000..b6d6131 --- /dev/null +++ b/test/unit/comment_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CommentTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/helpers/comments_helper_test.rb b/test/unit/helpers/comments_helper_test.rb new file mode 100644 index 0000000..2518c16 --- /dev/null +++ b/test/unit/helpers/comments_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class CommentsHelperTest < ActionView::TestCase +end From 2e29504d090c2c7f73e39e49ee72a1231938a781 Mon Sep 17 00:00:00 2001 From: Fran Gil Date: Tue, 17 Apr 2012 19:53:25 +0200 Subject: [PATCH 5/8] planet con visits y trips --- Gemfile | 1 + Gemfile.lock | 2 + Gemfile~ | 78 ++++++------ app/assets/javascripts/application.js | 1 + app/assets/javascripts/application.js~ | 15 +++ app/assets/javascripts/trips.js.coffee | 3 + app/assets/javascripts/visits.js.coffee | 3 + app/assets/stylesheets/application.css | 1 + app/assets/stylesheets/application.css~ | 13 ++ app/assets/stylesheets/trips.css.scss | 3 + app/assets/stylesheets/visits.css.scss | 3 + app/controllers/trips_controller.rb | 86 +++++++++++++ app/controllers/trips_controller.rb~ | 85 +++++++++++++ app/controllers/visits_controller.rb | 84 +++++++++++++ app/controllers/visits_controller.rb~ | 83 +++++++++++++ app/helpers/trips_helper.rb | 2 + app/helpers/visits_helper.rb | 2 + app/models/site.rb | 3 +- app/models/site.rb~ | 2 + app/models/trip.rb | 9 ++ app/models/trip.rb~ | 9 ++ app/models/user.rb | 1 + app/models/visit.rb | 4 + app/models/visit.rb~ | 2 + app/views/layouts/application.html.erb | 3 +- app/views/layouts/application.html.erb~ | 91 ++++++++------ app/views/trips/_form.html.erb | 29 +++++ app/views/trips/_form.html.erb~ | 33 +++++ app/views/trips/_trip.html.erb | 30 +++++ app/views/trips/edit.html.erb | 6 + app/views/trips/index.html.erb | 28 +++++ app/views/trips/index.html.erb~ | 29 +++++ app/views/trips/new.html.erb | 5 + app/views/trips/show.html.erb | 22 ++++ app/views/trips/show.html.erb~ | 22 ++++ app/views/visits/_form.html.erb | 29 +++++ app/views/visits/create.js.erb | 5 + app/views/visits/edit.html.erb | 6 + app/views/visits/index.html.erb | 27 ++++ app/views/visits/new.html.erb | 5 + app/views/visits/show.html.erb | 20 +++ config/routes.rb | 4 + db/migrate/20120417170638_create_trips.rb | 12 ++ db/migrate/20120417172936_create_visits.rb | 11 ++ db/schema.rb | 137 ++++++++++++--------- test/fixtures/trips.yml | 13 ++ test/fixtures/visits.yml | 11 ++ test/functional/trips_controller_test.rb | 49 ++++++++ test/functional/visits_controller_test.rb | 49 ++++++++ test/unit/helpers/trips_helper_test.rb | 4 + test/unit/helpers/visits_helper_test.rb | 4 + test/unit/trip_test.rb | 7 ++ test/unit/visit_test.rb | 7 ++ 53 files changed, 1057 insertions(+), 136 deletions(-) create mode 100644 app/assets/javascripts/application.js~ create mode 100644 app/assets/javascripts/trips.js.coffee create mode 100644 app/assets/javascripts/visits.js.coffee create mode 100644 app/assets/stylesheets/application.css~ create mode 100644 app/assets/stylesheets/trips.css.scss create mode 100644 app/assets/stylesheets/visits.css.scss create mode 100644 app/controllers/trips_controller.rb create mode 100644 app/controllers/trips_controller.rb~ create mode 100644 app/controllers/visits_controller.rb create mode 100644 app/controllers/visits_controller.rb~ create mode 100644 app/helpers/trips_helper.rb create mode 100644 app/helpers/visits_helper.rb create mode 100644 app/models/trip.rb create mode 100644 app/models/trip.rb~ create mode 100644 app/models/visit.rb create mode 100644 app/models/visit.rb~ create mode 100644 app/views/trips/_form.html.erb create mode 100644 app/views/trips/_form.html.erb~ create mode 100644 app/views/trips/_trip.html.erb create mode 100644 app/views/trips/edit.html.erb create mode 100644 app/views/trips/index.html.erb create mode 100644 app/views/trips/index.html.erb~ create mode 100644 app/views/trips/new.html.erb create mode 100644 app/views/trips/show.html.erb create mode 100644 app/views/trips/show.html.erb~ create mode 100644 app/views/visits/_form.html.erb create mode 100644 app/views/visits/create.js.erb create mode 100644 app/views/visits/edit.html.erb create mode 100644 app/views/visits/index.html.erb create mode 100644 app/views/visits/new.html.erb create mode 100644 app/views/visits/show.html.erb create mode 100644 db/migrate/20120417170638_create_trips.rb create mode 100644 db/migrate/20120417172936_create_visits.rb create mode 100644 test/fixtures/trips.yml create mode 100644 test/fixtures/visits.yml create mode 100644 test/functional/trips_controller_test.rb create mode 100644 test/functional/visits_controller_test.rb create mode 100644 test/unit/helpers/trips_helper_test.rb create mode 100644 test/unit/helpers/visits_helper_test.rb create mode 100644 test/unit/trip_test.rb create mode 100644 test/unit/visit_test.rb diff --git a/Gemfile b/Gemfile index f408439..91af3d8 100644 --- a/Gemfile +++ b/Gemfile @@ -22,6 +22,7 @@ group :assets do end gem 'jquery-rails' +gem 'cleditor_rails' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 6405e84..c002e49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,6 +32,7 @@ GEM bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-x86-mingw32) builder (3.0.0) + cleditor_rails (0.0.3) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -115,6 +116,7 @@ PLATFORMS x86-mingw32 DEPENDENCIES + cleditor_rails coffee-rails (~> 3.2.1) devise jquery-rails diff --git a/Gemfile~ b/Gemfile~ index 7764763..3626fa1 100644 --- a/Gemfile~ +++ b/Gemfile~ @@ -1,38 +1,40 @@ -source 'https://rubygems.org' - -gem 'rails', '3.2.2' - -# Bundle edge Rails instead: -# gem 'rails', :git => 'git://github.com/rails/rails.git' - -gem 'sqlite3' - - -# Gems used only for assets and not required -# in production environments by default. -group :assets do - gem 'sass-rails', '~> 3.2.3' - gem 'coffee-rails', '~> 3.2.1' - - # See https://github.com/sstephenson/execjs#readme for more supported runtimes - # gem 'therubyracer' - - gem 'uglifier', '>= 1.0.3' -end - -gem 'jquery-rails' - -# To use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.0.0' - -# To use Jbuilder templates for JSON -# gem 'jbuilder' - -# Use unicorn as the app server -# gem 'unicorn' - -# Deploy with Capistrano -# gem 'capistrano' - -# To use debugger -# gem 'ruby-debug19', :require => 'ruby-debug' +source 'https://rubygems.org' + +gem 'rails', '3.2.2' + +# Bundle edge Rails instead: +# gem 'rails', :git => 'git://github.com/rails/rails.git' + +gem 'sqlite3' + +gem 'devise' + +# Gems used only for assets and not required +# in production environments by default. +group :assets do + gem 'sass-rails', '~> 3.2.3' + gem 'coffee-rails', '~> 3.2.1' + + # See https://github.com/sstephenson/execjs#readme for more supported runtimes + # gem 'therubyracer' + + gem 'uglifier', '>= 1.0.3' +end + +gem 'jquery-rails' +gem 'cleditor-rails' + +# To use ActiveModel has_secure_password +# gem 'bcrypt-ruby', '~> 3.0.0' + +# To use Jbuilder templates for JSON +# gem 'jbuilder' + +# Use unicorn as the app server +# gem 'unicorn' + +# Deploy with Capistrano +# gem 'capistrano' + +# To use debugger +# gem 'ruby-debug19', :require => 'ruby-debug' diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index c690d2a..1d4dbd6 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,3 +13,4 @@ //= require jquery //= require jquery_ujs //= require_tree . +//= require cleditor diff --git a/app/assets/javascripts/application.js~ b/app/assets/javascripts/application.js~ new file mode 100644 index 0000000..c690d2a --- /dev/null +++ b/app/assets/javascripts/application.js~ @@ -0,0 +1,15 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// the compiled file. +// +// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD +// GO AFTER THE REQUIRES BELOW. +// +//= require jquery +//= require jquery_ujs +//= require_tree . diff --git a/app/assets/javascripts/trips.js.coffee b/app/assets/javascripts/trips.js.coffee new file mode 100644 index 0000000..7615679 --- /dev/null +++ b/app/assets/javascripts/trips.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/ diff --git a/app/assets/javascripts/visits.js.coffee b/app/assets/javascripts/visits.js.coffee new file mode 100644 index 0000000..7615679 --- /dev/null +++ b/app/assets/javascripts/visits.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/ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 4561cc1..ce0584f 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,5 +9,6 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self + *= require cleditor *= require_tree . */ diff --git a/app/assets/stylesheets/application.css~ b/app/assets/stylesheets/application.css~ new file mode 100644 index 0000000..4561cc1 --- /dev/null +++ b/app/assets/stylesheets/application.css~ @@ -0,0 +1,13 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the top of the + * compiled file, but it's generally better to create a new file per style scope. + * + *= require_self + *= require_tree . +*/ diff --git a/app/assets/stylesheets/trips.css.scss b/app/assets/stylesheets/trips.css.scss new file mode 100644 index 0000000..473cbc3 --- /dev/null +++ b/app/assets/stylesheets/trips.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the trips controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/visits.css.scss b/app/assets/stylesheets/visits.css.scss new file mode 100644 index 0000000..99b00b9 --- /dev/null +++ b/app/assets/stylesheets/visits.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the visits controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb new file mode 100644 index 0000000..7232e00 --- /dev/null +++ b/app/controllers/trips_controller.rb @@ -0,0 +1,86 @@ +class TripsController < ApplicationController +before_filter :authenticate_user!, :except => [ :index, :show ] + + # GET /trips + # GET /trips.json + def index + @trips = Trip.all + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @trips } + end + end + + # GET /trips/1 + # GET /trips/1.json + def show + @trip = Trip.find(params[:id]) + @visit = @trip.visits.build + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @trip } + end + end + + # GET /trips/new + # GET /trips/new.json + def new + @trip = current_user.trips.build + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @trip } + end + end + + # GET /trips/1/edit + def edit + @trip = current_user.trips.find(params[:id]) + end + + # POST /trips + # POST /trips.json + def create + @trip = current_user.trips.build(params[:trip]) + + respond_to do |format| + if @trip.save + format.html { redirect_to @trip, notice: 'Trip was successfully created.' } + format.json { render json: @trip, status: :created, location: @trip } + else + format.html { render action: "new" } + format.json { render json: @trip.errors, status: :unprocessable_entity } + end + end + end + + # PUT /trips/1 + # PUT /trips/1.json + def update + @trip = current_user.trips.find(params[:id]) + + respond_to do |format| + if @trip.update_attributes(params[:trip]) + format.html { redirect_to @trip, notice: 'Trip was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @trip.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /trips/1 + # DELETE /trips/1.json + def destroy + @trip = current_user.trips.find(params[:id]) + @trip.destroy + + respond_to do |format| + format.html { redirect_to trips_url } + format.json { head :no_content } + end + end +end diff --git a/app/controllers/trips_controller.rb~ b/app/controllers/trips_controller.rb~ new file mode 100644 index 0000000..7d256ff --- /dev/null +++ b/app/controllers/trips_controller.rb~ @@ -0,0 +1,85 @@ +class TripsController < ApplicationController +before_filter :authenticate_user!, :except => [ :index, :show ] + + # GET /trips + # GET /trips.json + def index + @trips = Trip.all + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @trips } + end + end + + # GET /trips/1 + # GET /trips/1.json + def show + @trip = Trip.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @trip } + end + end + + # GET /trips/new + # GET /trips/new.json + def new + @trip = current_user.trips.build + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @trip } + end + end + + # GET /trips/1/edit + def edit + @trip = current_user.trips.find(params[:id]) + end + + # POST /trips + # POST /trips.json + def create + @trip = current_user.trips.build(params[:trip]) + + respond_to do |format| + if @trip.save + format.html { redirect_to @trip, notice: 'Trip was successfully created.' } + format.json { render json: @trip, status: :created, location: @trip } + else + format.html { render action: "new" } + format.json { render json: @trip.errors, status: :unprocessable_entity } + end + end + end + + # PUT /trips/1 + # PUT /trips/1.json + def update + @trip = current_user.trips.find(params[:id]) + + respond_to do |format| + if @trip.update_attributes(params[:trip]) + format.html { redirect_to @trip, notice: 'Trip was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @trip.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /trips/1 + # DELETE /trips/1.json + def destroy + @trip = current_user.trips.find(params[:id]) + @trip.destroy + + respond_to do |format| + format.html { redirect_to trips_url } + format.json { head :no_content } + end + end +end diff --git a/app/controllers/visits_controller.rb b/app/controllers/visits_controller.rb new file mode 100644 index 0000000..52d83b1 --- /dev/null +++ b/app/controllers/visits_controller.rb @@ -0,0 +1,84 @@ +class VisitsController < ApplicationController + # GET /visits + # GET /visits.json + def index + @visits = Visit.all + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @visits } + end + end + + # GET /visits/1 + # GET /visits/1.json + def show + @visit = Visit.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @visit } + end + end + + # GET /visits/new + # GET /visits/new.json + def new + @visit = Visit.new + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @visit } + end + end + + # GET /visits/1/edit + def edit + @visit = Visit.find(params[:id]) + end + + # POST /visits + # POST /visits.json + def create + @visit = Visit.new(params[:visit]) + + 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" } + format.json { render json: @visit.errors, status: :unprocessable_entity } + end + end + end + + # PUT /visits/1 + # PUT /visits/1.json + def update + @visit = Visit.find(params[:id]) + + respond_to do |format| + if @visit.update_attributes(params[:visit]) + format.html { redirect_to @visit.trip, notice: 'Visit was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @visit.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /visits/1 + # DELETE /visits/1.json + def destroy + @visit = Visit.find(params[:id]) + @visit.destroy + + respond_to do |format| + format.html { redirect_to @visits.trip } + format.json { head :no_content } + end + end +end diff --git a/app/controllers/visits_controller.rb~ b/app/controllers/visits_controller.rb~ new file mode 100644 index 0000000..4d9ff9d --- /dev/null +++ b/app/controllers/visits_controller.rb~ @@ -0,0 +1,83 @@ +class VisitsController < ApplicationController + # GET /visits + # GET /visits.json + def index + @visits = Visit.all + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @visits } + end + end + + # GET /visits/1 + # GET /visits/1.json + def show + @visit = Visit.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @visit } + end + end + + # GET /visits/new + # GET /visits/new.json + def new + @visit = Visit.new + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @visit } + end + end + + # GET /visits/1/edit + def edit + @visit = Visit.find(params[:id]) + end + + # POST /visits + # POST /visits.json + def create + @visit = Visit.new(params[:visit]) + + respond_to do |format| + if @visit.save + format.html { redirect_to @visit.trip, notice: 'Visit was successfully created.' } + format.json { render json: @visit, status: :created, location: @visit } + else + format.html { render action: "new" } + format.json { render json: @visit.errors, status: :unprocessable_entity } + end + end + end + + # PUT /visits/1 + # PUT /visits/1.json + def update + @visit = Visit.find(params[:id]) + + respond_to do |format| + if @visit.update_attributes(params[:visit]) + format.html { redirect_to @visit.trip, notice: 'Visit was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @visit.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /visits/1 + # DELETE /visits/1.json + def destroy + @visit = Visit.find(params[:id]) + @visit.destroy + + respond_to do |format| + format.html { redirect_to @visits.trip } + format.json { head :no_content } + end + end +end diff --git a/app/helpers/trips_helper.rb b/app/helpers/trips_helper.rb new file mode 100644 index 0000000..04f333d --- /dev/null +++ b/app/helpers/trips_helper.rb @@ -0,0 +1,2 @@ +module TripsHelper +end diff --git a/app/helpers/visits_helper.rb b/app/helpers/visits_helper.rb new file mode 100644 index 0000000..8ce5f83 --- /dev/null +++ b/app/helpers/visits_helper.rb @@ -0,0 +1,2 @@ +module VisitsHelper +end diff --git a/app/models/site.rb b/app/models/site.rb index ab32f25..fe27311 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -1,7 +1,8 @@ class Site < ActiveRecord::Base belongs_to :type belongs_to :user - + has_many :visits + has_many :trips, :through => :visits has_many :comments # Debe estar protegido para evitar accesos indeseados diff --git a/app/models/site.rb~ b/app/models/site.rb~ index ec39f92..ab32f25 100644 --- a/app/models/site.rb~ +++ b/app/models/site.rb~ @@ -1,6 +1,8 @@ class Site < ActiveRecord::Base belongs_to :type belongs_to :user + + has_many :comments # Debe estar protegido para evitar accesos indeseados attr_protected :user_id diff --git a/app/models/trip.rb b/app/models/trip.rb new file mode 100644 index 0000000..dfb6c60 --- /dev/null +++ b/app/models/trip.rb @@ -0,0 +1,9 @@ +# Modelo de Trip y User con relación uno-a-muchos: +# -> belongs_to :user referencia un objeto User +class Trip < ActiveRecord::Base +belongs_to :user +has_many :visits +has_many :sites, :through => :visits +# Se añade relacion +attr_protected :user_id # Por seguridad +end diff --git a/app/models/trip.rb~ b/app/models/trip.rb~ new file mode 100644 index 0000000..dfb6c60 --- /dev/null +++ b/app/models/trip.rb~ @@ -0,0 +1,9 @@ +# Modelo de Trip y User con relación uno-a-muchos: +# -> belongs_to :user referencia un objeto User +class Trip < ActiveRecord::Base +belongs_to :user +has_many :visits +has_many :sites, :through => :visits +# Se añade relacion +attr_protected :user_id # Por seguridad +end diff --git a/app/models/user.rb b/app/models/user.rb index 0925503..b3643df 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,6 +2,7 @@ class User < ActiveRecord::Base has_many :sites has_many :comments + has_many :trips # Include default devise modules. Others available are: # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable diff --git a/app/models/visit.rb b/app/models/visit.rb new file mode 100644 index 0000000..6ae1de6 --- /dev/null +++ b/app/models/visit.rb @@ -0,0 +1,4 @@ +class Visit < ActiveRecord::Base +belongs_to :trip +belongs_to :site +end diff --git a/app/models/visit.rb~ b/app/models/visit.rb~ new file mode 100644 index 0000000..a950b2a --- /dev/null +++ b/app/models/visit.rb~ @@ -0,0 +1,2 @@ +class Visit < ActiveRecord::Base +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e674df2..879f9bb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -39,6 +39,7 @@
  • <%= link_to type.name, type_sites_path(type) %>
    • <% end %> + <%= link_to "Viajes", trips_path %>
    <%= link_to "Contact", planet_contact_path %>
    <%= link_to "Sign up", new_user_registration_path if !current_user %> @@ -52,4 +53,4 @@ - \ No newline at end of file + diff --git a/app/views/layouts/application.html.erb~ b/app/views/layouts/application.html.erb~ index 235508a..e674df2 100644 --- a/app/views/layouts/application.html.erb~ +++ b/app/views/layouts/application.html.erb~ @@ -1,36 +1,55 @@ - - - - Planet - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - - - - - - -
    -
    - <%= link_to "Home", planet_index_path %>
    - <%= link_to "Tipos", types_path %>
    - <%= link_to "Sitios", sites_path %>
    - <%= link_to "Contact", planet_contact_path %> -
    -
    -<%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_path) %> - <%= yield %> -<%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_path) %> -
    -
    - - - + + + + Planet + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + + + + + + + +
    + <% if current_user %> + <%= link_to current_user.name, + edit_user_registration_path %> | + <%= link_to "Sign out", destroy_user_session_path, :method => :delete %> + <% else %> + <%= link_to "Sign in", new_user_session_path %> + <% end %> +
    + +
    +
    + <%= link_to "Home", planet_index_path %>
    + <%= link_to "Tipos", types_path %>
    + <%= link_to "Sitios", sites_path %>
    +
      + <% Type.all.each do |type| %> +
    • <%= link_to type.name, type_sites_path(type) %>
      • + <% end %> +
    + <%= link_to "Contact", planet_contact_path %>
    + <%= link_to "Sign up", new_user_registration_path if !current_user %> +
    +
    +

    <%= notice %>

    <%= alert %>

    + <%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %> + <%= yield %> +

    + <%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %> +

    +
    +
    + + \ No newline at end of file diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb new file mode 100644 index 0000000..34b1a6f --- /dev/null +++ b/app/views/trips/_form.html.erb @@ -0,0 +1,29 @@ +<%= form_for(@trip) do |f| %> + <% if @trip.errors.any? %> +
    +

    <%= pluralize(@trip.errors.count, "error") %> prohibited this trip from being saved:

    + +
      + <% @trip.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %> +
    +
    + <% end %> + +
    + <%= f.label :name %>
    + <%= f.text_field :name %> +
    +
    + <%= f.label :description %>
    + <%= f.text_area :description %> +
    +
    + <%= f.label :date %>
    + <%= f.date_select :date %> +
    +
    + <%= f.submit %> +
    +<% end %> diff --git a/app/views/trips/_form.html.erb~ b/app/views/trips/_form.html.erb~ new file mode 100644 index 0000000..3f1ef01 --- /dev/null +++ b/app/views/trips/_form.html.erb~ @@ -0,0 +1,33 @@ +<%= form_for(@trip) do |f| %> + <% if @trip.errors.any? %> +
    +

    <%= pluralize(@trip.errors.count, "error") %> prohibited this trip from being saved:

    + +
      + <% @trip.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %> +
    +
    + <% end %> + +
    + <%= f.label :name %>
    + <%= f.text_field :name %> +
    +
    + <%= f.label :description %>
    + <%= f.text_area :description %> +
    +
    + <%= f.label :date %>
    + <%= f.date_select :date %> +
    +
    + <%= f.label :user_id %>
    + <%= f.number_field :user_id %> +
    +
    + <%= f.submit %> +
    +<% end %> diff --git a/app/views/trips/_trip.html.erb b/app/views/trips/_trip.html.erb new file mode 100644 index 0000000..fd146f2 --- /dev/null +++ b/app/views/trips/_trip.html.erb @@ -0,0 +1,30 @@ +
    + + <% trip.visits.order(:hour).each do |visit| %> + + + + + + + + <% end %> +
    + <%= link_to image_tag(visit.site.image.url, :class => 'list_image'), visit.site %> + +
    +
    <%= visit.hour.to_s + 'h: ' %> + <%=link_to(visit.site.name, visit.site) %>
    +
    <%= truncate(strip_tags(visit.site.description), + :length => 80) %>
    +
    +     		+ <%= link_to 'Show', visit.site %>
    + <%= link_to 'Destroy', visit, + :confirm => 'Are you sure?', + :method => :delete if trip.user == current_user %> + +
    +
    + + diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb new file mode 100644 index 0000000..71287a4 --- /dev/null +++ b/app/views/trips/edit.html.erb @@ -0,0 +1,6 @@ +

    Editing trip

    + +<%= render 'form' %> + +<%= link_to 'Show', @trip %> | +<%= link_to 'Back', trips_path %> diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb new file mode 100644 index 0000000..61a904c --- /dev/null +++ b/app/views/trips/index.html.erb @@ -0,0 +1,28 @@ +
    +

    Viajes

    + + <% @trips.each do |trip| %> + + + + +<% end %> +
    +
    +
    <%= link_to trip.name, trip_path(trip) %>
    +
    <%= truncate(strip_tags(trip.description), + :length => 80) + ', ' + trip.date.to_s %>
    +
    +    		 + <%= link_to 'Show', trip %>
    + <% if site.user == current_user %> + <%= link_to 'Edit', edit_trip_path(trip) %>
    + <%= link_to 'Destroy', trip, + :confirm => 'Are you sure?', + :method => :delete %> + <% end %> +
    +

    + +<%= link_to 'New Trip', new_trip_path %> + diff --git a/app/views/trips/index.html.erb~ b/app/views/trips/index.html.erb~ new file mode 100644 index 0000000..47f649b --- /dev/null +++ b/app/views/trips/index.html.erb~ @@ -0,0 +1,29 @@ +

    Listing trips

    + + + + + + + + + + + + +<% @trips.each do |trip| %> + + + + + + + + + +<% end %> +
    NameDescriptionDateUser
    <%= trip.name %><%= trip.description %><%= trip.date %><%= trip.user_id %><%= link_to 'Show', trip %><%= link_to 'Edit', edit_trip_path(trip) %><%= link_to 'Destroy', trip, confirm: 'Are you sure?', method: :delete %>
    + +
    + +<%= link_to 'New Trip', new_trip_path %> diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb new file mode 100644 index 0000000..dd3e49d --- /dev/null +++ b/app/views/trips/new.html.erb @@ -0,0 +1,5 @@ +

    New trip

    + +<%= render 'form' %> + +<%= link_to 'Back', trips_path %> diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb new file mode 100644 index 0000000..98fa460 --- /dev/null +++ b/app/views/trips/show.html.erb @@ -0,0 +1,22 @@ +

    Name: <%= @trip.name %>

    +

    Date: <%= @trip.date %>

    +

    Autor: <%= @trip.user.name if @trip.user %>

    +

    Description: <%= simple_format @trip.description %>

    +
    +

    Sitios a visitar

    + <%= render(@trip) %> + <% if @trip.user == current_user %> + <%= form_for(@visit, :remote => true) do |f| %> + <%= f.number_field :trip_id, :value => @trip.id,:hidden => true %> + <%= f.collection_select(:site_id,Site.all, :id, :name) %> + <%= f.select(:hour, Array.new(24, 0).fill{|i| [(i.to_s + 'H'), i]}) %> + <%= f.submit "Añadir sitio" %> + <% end %> +<% end %> +

    + +<% if @trip.user == current_user %> +<%= link_to 'Edit', edit_trip_path(@trip) %> | +<% end %> +<%= link_to 'Back', trips_path %> + diff --git a/app/views/trips/show.html.erb~ b/app/views/trips/show.html.erb~ new file mode 100644 index 0000000..f164547 --- /dev/null +++ b/app/views/trips/show.html.erb~ @@ -0,0 +1,22 @@ +

    Name: <%= @trip.name %>

    +

    Date: <%= @trip.date %>

    +

    Autor: <%= @trip.user.name if @trip.user %>

    +

    Description: <%= simple_format @trip.description %>

    +
    +

    Sitios a visitar

    + <%= render(@trip) %> + <% if @trip.user == current_user %> + <%= form_for(@visit) do |f| %> + <%= f.number_field :trip_id, :value => @trip.id,:hidden => true %> + <%= f.collection_select(:site_id,Site.all, :id, :name) %> + <%= f.select(:hour, Array.new(24, 0).fill{|i| [(i.to_s + 'H'), i]}) %> + <%= f.submit "Añadir sitio" %> + <% end %> +<% end %> +

    + +<% if @trip.user == current_user %> +<%= link_to 'Edit', edit_trip_path(@trip) %> | +<% end %> +<%= link_to 'Back', trips_path %> + diff --git a/app/views/visits/_form.html.erb b/app/views/visits/_form.html.erb new file mode 100644 index 0000000..12ab912 --- /dev/null +++ b/app/views/visits/_form.html.erb @@ -0,0 +1,29 @@ +<%= form_for(@visit) do |f| %> + <% if @visit.errors.any? %> +
    +

    <%= pluralize(@visit.errors.count, "error") %> prohibited this visit from being saved:

    + +
      + <% @visit.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %> +
    +
    + <% end %> + +
    + <%= f.label :trip_id %>
    + <%= f.number_field :trip_id %> +
    +
    + <%= f.label :site_id %>
    + <%= f.number_field :site_id %> +
    +
    + <%= f.label :hour %>
    + <%= f.number_field :hour %> +
    +
    + <%= f.submit %> +
    +<% end %> diff --git a/app/views/visits/create.js.erb b/app/views/visits/create.js.erb new file mode 100644 index 0000000..4619ec3 --- /dev/null +++ b/app/views/visits/create.js.erb @@ -0,0 +1,5 @@ +// Programa jQuery/Javascript +// -> sustituye la lista de visitas de un viaje en DOM +// -> HTML se genera en servidor con ERb +$('#visit').html("<%= j render @visit.trip %>"); + diff --git a/app/views/visits/edit.html.erb b/app/views/visits/edit.html.erb new file mode 100644 index 0000000..66d34d9 --- /dev/null +++ b/app/views/visits/edit.html.erb @@ -0,0 +1,6 @@ +

    Editing visit

    + +<%= render 'form' %> + +<%= link_to 'Show', @visit %> | +<%= link_to 'Back', visits_path %> diff --git a/app/views/visits/index.html.erb b/app/views/visits/index.html.erb new file mode 100644 index 0000000..c7bea46 --- /dev/null +++ b/app/views/visits/index.html.erb @@ -0,0 +1,27 @@ +

    Listing visits

    + + + + + + + + + + + +<% @visits.each do |visit| %> + + + + + + + + +<% end %> +
    TripSiteHour
    <%= visit.trip_id %><%= visit.site_id %><%= visit.hour %><%= link_to 'Show', visit %><%= link_to 'Edit', edit_visit_path(visit) %><%= link_to 'Destroy', visit, confirm: 'Are you sure?', method: :delete %>
    + +
    + +<%= link_to 'New Visit', new_visit_path %> diff --git a/app/views/visits/new.html.erb b/app/views/visits/new.html.erb new file mode 100644 index 0000000..1be1930 --- /dev/null +++ b/app/views/visits/new.html.erb @@ -0,0 +1,5 @@ +

    New visit

    + +<%= render 'form' %> + +<%= link_to 'Back', visits_path %> diff --git a/app/views/visits/show.html.erb b/app/views/visits/show.html.erb new file mode 100644 index 0000000..2bf41f5 --- /dev/null +++ b/app/views/visits/show.html.erb @@ -0,0 +1,20 @@ +

    <%= notice %>

    + +

    + Trip: + <%= @visit.trip_id %> +

    + +

    + Site: + <%= @visit.site_id %> +

    + +

    + Hour: + <%= @visit.hour %> +

    + + +<%= link_to 'Edit', edit_visit_path(@visit) %> | +<%= link_to 'Back', visits_path %> diff --git a/config/routes.rb b/config/routes.rb index ff5a379..73e0ef0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,9 @@ Planet::Application.routes.draw do + resources :visits + + resources :trips + resources :comments, :except => [ :new, :index ] devise_for :users diff --git a/db/migrate/20120417170638_create_trips.rb b/db/migrate/20120417170638_create_trips.rb new file mode 100644 index 0000000..9acf33c --- /dev/null +++ b/db/migrate/20120417170638_create_trips.rb @@ -0,0 +1,12 @@ +class CreateTrips < ActiveRecord::Migration + def change + create_table :trips do |t| + t.string :name + t.text :description + t.date :date + t.integer :user_id + + t.timestamps + end + end +end diff --git a/db/migrate/20120417172936_create_visits.rb b/db/migrate/20120417172936_create_visits.rb new file mode 100644 index 0000000..248b6be --- /dev/null +++ b/db/migrate/20120417172936_create_visits.rb @@ -0,0 +1,11 @@ +class CreateVisits < ActiveRecord::Migration + def change + create_table :visits do |t| + t.integer :trip_id + t.integer :site_id + t.integer :hour + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 7cf564d..b20a373 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,60 +1,77 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20120410171102) do - - create_table "comments", :force => true do |t| - t.string "comment" - t.integer "user_id" - t.integer "site_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "sites", :force => true do |t| - t.string "name" - t.text "description" - t.integer "type_id" - t.string "image_url" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "user_id" - end - - create_table "types", :force => true do |t| - t.string "name" - t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "users", :force => true do |t| - t.string "email", :default => "", :null => false - t.string "encrypted_password", :default => "", :null => false - t.string "reset_password_token" - t.datetime "reset_password_sent_at" - t.datetime "remember_created_at" - t.integer "sign_in_count", :default => 0 - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.string "current_sign_in_ip" - t.string "last_sign_in_ip" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "name" - end - - add_index "users", ["email"], :name => "index_users_on_email", :unique => true - add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true - -end +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. + +ActiveRecord::Schema.define(:version => 20120417172936) do + + create_table "comments", :force => true do |t| + t.string "comment" + t.integer "user_id" + t.integer "site_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "sites", :force => true do |t| + t.string "name" + t.text "description" + t.integer "type_id" + t.string "image_url" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "user_id" + end + + create_table "trips", :force => true do |t| + t.string "name" + t.text "description" + t.date "date" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "types", :force => true do |t| + t.string "name" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "users", :force => true do |t| + t.string "email", :default => "", :null => false + t.string "encrypted_password", :default => "", :null => false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", :default => 0 + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "name" + end + + add_index "users", ["email"], :name => "index_users_on_email", :unique => true + add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true + + create_table "visits", :force => true do |t| + t.integer "trip_id" + t.integer "site_id" + t.integer "hour" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + +end diff --git a/test/fixtures/trips.yml b/test/fixtures/trips.yml new file mode 100644 index 0000000..4afcf18 --- /dev/null +++ b/test/fixtures/trips.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +one: + name: MyString + description: MyText + date: 2012-04-17 + user_id: 1 + +two: + name: MyString + description: MyText + date: 2012-04-17 + user_id: 1 diff --git a/test/fixtures/visits.yml b/test/fixtures/visits.yml new file mode 100644 index 0000000..6a15000 --- /dev/null +++ b/test/fixtures/visits.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +one: + trip_id: 1 + site_id: 1 + hour: 1 + +two: + trip_id: 1 + site_id: 1 + hour: 1 diff --git a/test/functional/trips_controller_test.rb b/test/functional/trips_controller_test.rb new file mode 100644 index 0000000..b09dce2 --- /dev/null +++ b/test/functional/trips_controller_test.rb @@ -0,0 +1,49 @@ +require 'test_helper' + +class TripsControllerTest < ActionController::TestCase + setup do + @trip = trips(:one) + end + + test "should get index" do + get :index + assert_response :success + assert_not_nil assigns(:trips) + end + + test "should get new" do + get :new + assert_response :success + end + + test "should create trip" do + assert_difference('Trip.count') do + post :create, trip: @trip.attributes + end + + assert_redirected_to trip_path(assigns(:trip)) + end + + test "should show trip" do + get :show, id: @trip + assert_response :success + end + + test "should get edit" do + get :edit, id: @trip + assert_response :success + end + + test "should update trip" do + put :update, id: @trip, trip: @trip.attributes + assert_redirected_to trip_path(assigns(:trip)) + end + + test "should destroy trip" do + assert_difference('Trip.count', -1) do + delete :destroy, id: @trip + end + + assert_redirected_to trips_path + end +end diff --git a/test/functional/visits_controller_test.rb b/test/functional/visits_controller_test.rb new file mode 100644 index 0000000..45397e3 --- /dev/null +++ b/test/functional/visits_controller_test.rb @@ -0,0 +1,49 @@ +require 'test_helper' + +class VisitsControllerTest < ActionController::TestCase + setup do + @visit = visits(:one) + end + + test "should get index" do + get :index + assert_response :success + assert_not_nil assigns(:visits) + end + + test "should get new" do + get :new + assert_response :success + end + + test "should create visit" do + assert_difference('Visit.count') do + post :create, visit: @visit.attributes + end + + assert_redirected_to visit_path(assigns(:visit)) + end + + test "should show visit" do + get :show, id: @visit + assert_response :success + end + + test "should get edit" do + get :edit, id: @visit + assert_response :success + end + + test "should update visit" do + put :update, id: @visit, visit: @visit.attributes + assert_redirected_to visit_path(assigns(:visit)) + end + + test "should destroy visit" do + assert_difference('Visit.count', -1) do + delete :destroy, id: @visit + end + + assert_redirected_to visits_path + end +end diff --git a/test/unit/helpers/trips_helper_test.rb b/test/unit/helpers/trips_helper_test.rb new file mode 100644 index 0000000..dcfddff --- /dev/null +++ b/test/unit/helpers/trips_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class TripsHelperTest < ActionView::TestCase +end diff --git a/test/unit/helpers/visits_helper_test.rb b/test/unit/helpers/visits_helper_test.rb new file mode 100644 index 0000000..6f1596c --- /dev/null +++ b/test/unit/helpers/visits_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class VisitsHelperTest < ActionView::TestCase +end diff --git a/test/unit/trip_test.rb b/test/unit/trip_test.rb new file mode 100644 index 0000000..1ed8ca6 --- /dev/null +++ b/test/unit/trip_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TripTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/visit_test.rb b/test/unit/visit_test.rb new file mode 100644 index 0000000..a34aa33 --- /dev/null +++ b/test/unit/visit_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class VisitTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From cdf44eca4fd362b91d693cddf3012a9488d78325 Mon Sep 17 00:00:00 2001 From: Fran Gil Date: Tue, 17 Apr 2012 22:28:05 +0200 Subject: [PATCH 6/8] Visits funcionando --- app/models/site.rb | 2 +- app/models/site.rb~ | 3 +- app/views/trips/_trip.html.erb | 2 +- app/views/trips/_trip.html.erb~ | 30 +++++++++++++++++ app/views/trips/index.html.erb | 2 +- app/views/trips/index.html.erb~ | 49 ++++++++++++++-------------- app/views/trips/show.html.erb | 55 +++++++++++++++++++++---------- app/views/trips/show.html.erb~ | 58 ++++++++++++++++++++++++--------- 8 files changed, 139 insertions(+), 62 deletions(-) create mode 100644 app/views/trips/_trip.html.erb~ diff --git a/app/models/site.rb b/app/models/site.rb index fe27311..c1145b7 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -2,7 +2,7 @@ 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 :comments # Debe estar protegido para evitar accesos indeseados diff --git a/app/models/site.rb~ b/app/models/site.rb~ index ab32f25..c1145b7 100644 --- a/app/models/site.rb~ +++ b/app/models/site.rb~ @@ -1,7 +1,8 @@ class Site < ActiveRecord::Base belongs_to :type belongs_to :user - + has_many :visits + has_many :trips, :through => :visits has_many :comments # Debe estar protegido para evitar accesos indeseados diff --git a/app/views/trips/_trip.html.erb b/app/views/trips/_trip.html.erb index fd146f2..779594c 100644 --- a/app/views/trips/_trip.html.erb +++ b/app/views/trips/_trip.html.erb @@ -3,7 +3,7 @@ <% trip.visits.order(:hour).each do |visit| %> - <%= link_to image_tag(visit.site.image.url, :class => 'list_image'), visit.site %> + <%= link_to image_tag(visit.site.image_url, :class => 'list_image'), visit.site %> diff --git a/app/views/trips/_trip.html.erb~ b/app/views/trips/_trip.html.erb~ new file mode 100644 index 0000000..779594c --- /dev/null +++ b/app/views/trips/_trip.html.erb~ @@ -0,0 +1,30 @@ +
    + + <% trip.visits.order(:hour).each do |visit| %> + + + + + + + + <% end %> +
    + <%= link_to image_tag(visit.site.image_url, :class => 'list_image'), visit.site %> + +
    +
    <%= visit.hour.to_s + 'h: ' %> + <%=link_to(visit.site.name, visit.site) %>
    +
    <%= truncate(strip_tags(visit.site.description), + :length => 80) %>
    +
    +     		+ <%= link_to 'Show', visit.site %>
    + <%= link_to 'Destroy', visit, + :confirm => 'Are you sure?', + :method => :delete if trip.user == current_user %> + +
    +
    + + diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index 61a904c..dbab91f 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -12,7 +12,7 @@ <%= link_to 'Show', trip %>
    - <% if site.user == current_user %> + <% if trip.user == current_user %> <%= link_to 'Edit', edit_trip_path(trip) %>
    <%= link_to 'Destroy', trip, :confirm => 'Are you sure?', diff --git a/app/views/trips/index.html.erb~ b/app/views/trips/index.html.erb~ index 47f649b..61a904c 100644 --- a/app/views/trips/index.html.erb~ +++ b/app/views/trips/index.html.erb~ @@ -1,29 +1,28 @@ -

    Listing trips

    - - - - - - - - - - - - -<% @trips.each do |trip| %> - - - - - - - - - +
    +

    Viajes

    +
    NameDescriptionDateUser
    <%= trip.name %><%= trip.description %><%= trip.date %><%= trip.user_id %><%= link_to 'Show', trip %><%= link_to 'Edit', edit_trip_path(trip) %><%= link_to 'Destroy', trip, confirm: 'Are you sure?', method: :delete %>
    + <% @trips.each do |trip| %> + + + + <% end %>
    +
    +
    <%= link_to trip.name, trip_path(trip) %>
    +
    <%= truncate(strip_tags(trip.description), + :length => 80) + ', ' + trip.date.to_s %>
    +
    +    		 + <%= link_to 'Show', trip %>
    + <% if site.user == current_user %> + <%= link_to 'Edit', edit_trip_path(trip) %>
    + <%= link_to 'Destroy', trip, + :confirm => 'Are you sure?', + :method => :delete %> + <% end %> +
    - -
    +
    <%= link_to 'New Trip', new_trip_path %> + diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 98fa460..ec0e077 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -1,22 +1,43 @@ -

    Name: <%= @trip.name %>

    -

    Date: <%= @trip.date %>

    -

    Autor: <%= @trip.user.name if @trip.user %>

    -

    Description: <%= simple_format @trip.description %>

    +

    Name: <%= @trip.name %>

    Date: <%= @trip.date %>

    +

    Autor: <%= @trip.user.name if @trip.user %>

    + +

    Description: <%= simple_format @trip.description %>

    +
    + + +

    Sitios a visitar

    + + + <%= render(@trip) %> + + + <% if @trip.user == current_user %> - <%= form_for(@visit, :remote => true) do |f| %> - <%= f.number_field :trip_id, :value => @trip.id,:hidden => true %> - <%= f.collection_select(:site_id,Site.all, :id, :name) %> - <%= f.select(:hour, Array.new(24, 0).fill{|i| [(i.to_s + 'H'), i]}) %> - <%= f.submit "Añadir sitio" %> - <% end %> -<% end %> -

    - -<% if @trip.user == current_user %> -<%= link_to 'Edit', edit_trip_path(@trip) %> | -<% end %> -<%= link_to 'Back', trips_path %> + + <%= form_for(@visit) do |f| %> + + + + <%= f.number_field :trip_id, :value => @trip.id, :hidden => true %> + + <%= f.collection_select(:site_id, Site.all,:id,:name) %> + + <%= f.select(:hour, Array.new(24, 0).fill{|i| [(i.to_s + 'H'), i]}) %> + + + <%= f.submit "Añadir sitio" %> + + <% end %> + + <% end %> + + + + +
    + <% if @trip.user == current_user %> <%= link_to 'Edit', edit_trip_path(@trip) %> | <% end %> <%= link_to 'Back', trips_path %> + diff --git a/app/views/trips/show.html.erb~ b/app/views/trips/show.html.erb~ index f164547..8ea0050 100644 --- a/app/views/trips/show.html.erb~ +++ b/app/views/trips/show.html.erb~ @@ -1,22 +1,48 @@ -

    Name: <%= @trip.name %>

    -

    Date: <%= @trip.date %>

    -

    Autor: <%= @trip.user.name if @trip.user %>

    -

    Description: <%= simple_format @trip.description %>

    +

    Name: <%= @trip.name %>

    Date: <%= @trip.date %>

    +

    Autor: <%= @trip.user.name if @trip.user %>

    + +

    Description: <%= simple_format @trip.description %>

    +
    + + +

    Sitios a visitar

    + + + <%= render(@trip) %> + + + <% if @trip.user == current_user %> + <%= form_for(@visit) do |f| %> - <%= f.number_field :trip_id, :value => @trip.id,:hidden => true %> - <%= f.collection_select(:site_id,Site.all, :id, :name) %> - <%= f.select(:hour, Array.new(24, 0).fill{|i| [(i.to_s + 'H'), i]}) %> - <%= f.submit "Añadir sitio" %> - <% end %> -<% end %> -

    - -<% if @trip.user == current_user %> -<%= link_to 'Edit', edit_trip_path(@trip) %> | -<% end %> -<%= link_to 'Back', trips_path %> + + + + <%= f.number_field :trip_id, :value => @trip.id, :hidden => true %> + + <%= f.collection_select(:site_id, + + Site.all, + + :id, + + :name) %> + + <%= f.select(:hour, Array.new(24, 0).fill {|i| [(i.to_s 'H'), i]}) %> + + <%= f.submit "Añadir sitio" %> + + <% end %> + + <% end %> + + + + +
    + <% if @trip.user == current_user %> <%= link_to 'Edit', edit_trip_path(@trip) %> | <% end %> <%= link_to 'Back', trips_path %> + From cfd921fc013f2294dabe972e77df0779a643020e Mon Sep 17 00:00:00 2001 From: Fran Gil Date: Fri, 20 Apr 2012 17:50:58 +0200 Subject: [PATCH 7/8] Entrega 7 --- app/assets/stylesheets/planet.css | 9 ++ app/controllers/comments_controller.rb | 8 +- app/controllers/sites_controller.rb | 7 +- app/models/comment.rb | 2 +- app/views/comments/_form.html.erb | 7 +- app/views/comments/edit.html.erb | 4 +- app/views/comments/index.html.erb | 4 +- app/views/comments/new.html.erb | 2 + app/views/comments/show.html.erb | 2 - app/views/sites/_form.html.erb | 12 ++ app/views/sites/_form.html.erb~ | 45 ++++++ app/views/sites/_newform.html.erb | 69 +++++++++ app/views/sites/_newform.html.erb~ | 65 +++++++++ app/views/sites/_newformantiguo.html.erb | 65 +++++++++ app/views/sites/index.html.erb | 4 +- app/views/sites/new.html.erb | 3 +- app/views/sites/new.html.erb~ | 5 + app/views/sites/show.html.erb | 80 ++++++++--- app/views/sites/show.html.erb~ | 62 ++++++++ app/views/sites/showantiguo.html.erb | 61 ++++++++ app/views/trips/show.html.erb | 96 +++++++------ app/views/trips/show.html.erb~ | 64 +++++---- config/routes.rb | 10 +- db/migrate/20120320100145_create_sites.rb | 3 +- db/migrate/20120320100145_create_sites.rb~ | 14 ++ db/migrate/20120329080433_user_sites.rb | 2 + db/migrate/20120329080433_user_sites.rb~ | 19 +++ db/migrate/20120417205239_coords.rb | 18 +++ db/migrate/20120417205239_coords.rb~ | 7 + db/schema.rb | 157 +++++++++++---------- 30 files changed, 720 insertions(+), 186 deletions(-) create mode 100644 app/views/sites/_form.html.erb~ create mode 100644 app/views/sites/_newform.html.erb create mode 100644 app/views/sites/_newform.html.erb~ create mode 100644 app/views/sites/_newformantiguo.html.erb create mode 100644 app/views/sites/new.html.erb~ create mode 100644 app/views/sites/show.html.erb~ create mode 100644 app/views/sites/showantiguo.html.erb create mode 100644 db/migrate/20120320100145_create_sites.rb~ create mode 100644 db/migrate/20120329080433_user_sites.rb~ create mode 100644 db/migrate/20120417205239_coords.rb create mode 100644 db/migrate/20120417205239_coords.rb~ diff --git a/app/assets/stylesheets/planet.css b/app/assets/stylesheets/planet.css index fc22479..1154389 100644 --- a/app/assets/stylesheets/planet.css +++ b/app/assets/stylesheets/planet.css @@ -100,6 +100,11 @@ background: white; } +#map_canvas { + width: 100%; + height: 600px; +} + #side { float: left; padding-top: 1em; @@ -113,6 +118,10 @@ color: #bfb; font-size: small; } + +#site .visitas { + text-indent: 70%; +} /* END:mainlayout */ /* An entry in the store catalog (no utilizados de momento) */ diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index eda8d8a..57fb033 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -8,7 +8,7 @@ class CommentsController < ApplicationController def index @site = Site.find(params[:site_id]) @comments = @site.comments - @comment = current_user.comments.build + @comment = current_user.comments.build if current_user respond_to do |format| format.html # index.html.erb @@ -48,10 +48,11 @@ def edit # POST /comments.json def create @comment = current_user.comments.build(params[:comment]) + @site = @comment.site respond_to do |format| if @comment.save - format.html { redirect_to site_path(@comment.site), notice: 'Comment was successfully created.' } + format.html { redirect_to site_path(@site), notice: 'Comment was successfully created.' } format.json { render json: @comment, status: :created, location: @comment } else format.html { render action: "new" } @@ -64,10 +65,11 @@ def create # PUT /comments/1.json def update @comment = current_user.comments.find(params[:id]) + @site = @comment.site respond_to do |format| if @comment.update_attributes(params[:comment]) - format.html { redirect_to site_path(@comment.site), notice: 'Comment was successfully updated.' } + format.html { redirect_to site_path(@site), notice: 'Comment was successfully updated.' } format.json { head :no_content } else format.html { render action: "edit" } diff --git a/app/controllers/sites_controller.rb b/app/controllers/sites_controller.rb index 8d44a66..a0f1717 100644 --- a/app/controllers/sites_controller.rb +++ b/app/controllers/sites_controller.rb @@ -7,10 +7,11 @@ class SitesController < ApplicationController # GET /sites.json def index if params[:type_id].nil? or params[:type_id].empty? - @sites = Site.all # path: /types - else + @sites = Site.all # path: /sites + else @sites = Type.find(params[:type_id]).sites # path: /types/id/sites end + respond_to do |format| format.html # index.html.erb format.json { render json: @sites } @@ -21,7 +22,7 @@ def index # GET /sites/1.json def show @site = Site.find(params[:id]) - @comment = current_user.comments.build + @comment = current_user.comments.build if current_user respond_to do |format| format.html # show.html.erb diff --git a/app/models/comment.rb b/app/models/comment.rb index 8b7c248..04b8b8b 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -3,7 +3,7 @@ class Comment < ActiveRecord::Base belongs_to :user # Debe estar protegido para evitar accesos indeseados - #attr_protected :user_id + attr_protected :user_id # Se añaden estas definiciones validates :comment, :user_id, :site_id, :presence => true # campo obligatorio diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb index 8701bb3..2716990 100644 --- a/app/views/comments/_form.html.erb +++ b/app/views/comments/_form.html.erb @@ -4,9 +4,9 @@

    <%= pluralize(@comment.errors.count, "error") %> prohibited this comment from being saved:

      - <% @comment.errors.full_messages.each do |msg| %> -
    • <%= msg %>
      • - <% end %> + <% @comment.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %>
    <% end %> @@ -15,7 +15,6 @@
    <%= f.text_area :comment, :maxlength => 240, :rows => 6 %>
    - <%= f.number_field :user_id, :value => current_user.id, :hidden => true %> <%= f.number_field :site_id, :value => @site.id, :hidden => true %>
    <%= f.submit %> diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb index 09acee5..63612d9 100644 --- a/app/views/comments/edit.html.erb +++ b/app/views/comments/edit.html.erb @@ -2,5 +2,7 @@ <%= render 'form' %> -<%= link_to 'Back', site_path(@comment.site) %> +

    + +<%= link_to 'Back', site_path(@site) %> diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb index 51288d3..62a085a 100644 --- a/app/views/comments/index.html.erb +++ b/app/views/comments/index.html.erb @@ -2,6 +2,8 @@ <%= render 'comment' %> -<%= render 'form' %> +

    + +<%= render 'form' if current_user %> <%= link_to 'Back', sites_path %> diff --git a/app/views/comments/new.html.erb b/app/views/comments/new.html.erb index 07a754a..61c92f4 100644 --- a/app/views/comments/new.html.erb +++ b/app/views/comments/new.html.erb @@ -2,4 +2,6 @@ <%= render 'form' %> +

    + <%= link_to 'Back', comments_path %> diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb index ba05818..21b60e6 100644 --- a/app/views/comments/show.html.erb +++ b/app/views/comments/show.html.erb @@ -1,5 +1,3 @@ -

    <%= notice %>

    -

    Comment: <%= @comment.comment %> diff --git a/app/views/sites/_form.html.erb b/app/views/sites/_form.html.erb index ab5f21a..68b318d 100644 --- a/app/views/sites/_form.html.erb +++ b/app/views/sites/_form.html.erb @@ -27,6 +27,18 @@ <%= f.label :image_url %>
    <%= f.text_field :image_url %>

    +
    + <%= f.label :latitud %>
    + <%= f.text_field :latitud, id:'latitud' %> +
    +
    + <%= f.label :longitud %>
    + <%= f.text_field :longitud, id:'longitud' %> +
    +
    + <%= f.label :zoom %>
    + <%= f.number_field :zoom %> +
    <%= f.submit %>
    diff --git a/app/views/sites/_form.html.erb~ b/app/views/sites/_form.html.erb~ new file mode 100644 index 0000000..7fdb626 --- /dev/null +++ b/app/views/sites/_form.html.erb~ @@ -0,0 +1,45 @@ +<%= form_for(@site) do |f| %> + <% if @site.errors.any? %> +
    +

    <%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:

    + +
      + <% @site.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %> +
    +
    + <% end %> + +
    + <%= f.label :name %>
    + <%= f.text_field :name %> +
    +
    + <%= f.label :description %>
    + <%= f.text_area :description , :rows => 4 %> +
    +
    + <%= f.label :type_id %>
    + <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> +
    +
    + <%= f.label :image_url %>
    + <%= f.text_field :image_url %> +
    +
    + <%= f.label :longitud %>
    + <%= f.text_field :longitud %> +
    +
    + <%= f.label :latitud %>
    + <%= f.text_field :latitud %> +
    +
    + <%= f.label :zoom %>
    + <%= f.text_field :zoom %> +
    +
    + <%= f.submit %> +
    +<% end %> diff --git a/app/views/sites/_newform.html.erb b/app/views/sites/_newform.html.erb new file mode 100644 index 0000000..f8875aa --- /dev/null +++ b/app/views/sites/_newform.html.erb @@ -0,0 +1,69 @@ + + + + + + + + + <%= form_for(@site) do |f| %> + <% if @site.errors.any? %> +
    +

    <%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:

    +
      + <% @site.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %> +
    +
    + <% end %> + +
    + <%= f.label :name %>
    + <%= f.text_field :name %> +
    +
    + <%= f.label :description %>
    + <%= f.text_area :description , :rows => 4 %> +
    +
    + <%= f.label :type_id %>
    + <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> +
    +
    + <%= f.label :image_url %>
    + <%= f.text_field :image_url %> +
    +
    + <%= f.label :latitud %>
    + <%= f.text_field :latitud, id:'latitud' %> +
    +
    + <%= f.label :longitud %>
    + <%= f.text_field :longitud, id:'longitud' %> +
    +
    + <%= f.label :zoom %>
    + <%= f.number_field :zoom, :value => 15 %> +
    + +
    + <%= f.submit %> +
    + + <% end %> + + diff --git a/app/views/sites/_newform.html.erb~ b/app/views/sites/_newform.html.erb~ new file mode 100644 index 0000000..8a6cd87 --- /dev/null +++ b/app/views/sites/_newform.html.erb~ @@ -0,0 +1,65 @@ + + + + + + + + + +<%= form_for(@site) do |f| %> + <% if @site.errors.any? %> +
    +

    <%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:

    + +
      + <% @site.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %> +
    +
    + <% end %> + +
    + <%= f.label :name %>
    + <%= f.text_field :name %> +
    +
    + <%= f.label :description %>
    + <%= f.text_area :description , :rows => 4 %> +
    +
    + <%= f.label :type_id %>
    + <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> +
    +
    + <%= f.label :image_url %>
    + <%= f.text_field :image_url %> +
    + <%= f.number_field :latitud, :value => @site.latitud, :hidden => true, :id => "latitud" %> + <%= f.number_field :longitud, :value => @site.longitud, :hidden => true, :id => "longitud" %> +
    + <%= f.label :zoom %>
    + <%= f.number_field :zoom, :value => 15 %> +
    +
    + <%= f.submit %> +
    +<% end %> + + diff --git a/app/views/sites/_newformantiguo.html.erb b/app/views/sites/_newformantiguo.html.erb new file mode 100644 index 0000000..374efc6 --- /dev/null +++ b/app/views/sites/_newformantiguo.html.erb @@ -0,0 +1,65 @@ + + + + + + + + + +<%= form_for(@site) do |f| %> + <% if @site.errors.any? %> +
    +

    <%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:

    + +
      + <% @site.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %> +
    +
    + <% end %> + +
    + <%= f.label :name %>
    + <%= f.text_field :name %> +
    +
    + <%= f.label :description %>
    + <%= f.text_area :description , :rows => 4 %> +
    +
    + <%= f.label :type_id %>
    + <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> +
    +
    + <%= f.label :image_url %>
    + <%= f.text_field :image_url %> +
    + <%= f.number_field :latitud, :value => @site.latitud, :hidden => true, :id => "latitud" %> + <%= f.number_field :longitud, :value => @site.longitud, :hidden => true, :id => "longitud" %> +
    + <%= f.label :zoom %>
    + <%= f.number_field :zoom, :value => 15 %> +
    +
    + <%= f.submit %> +
    +<% end %> + + diff --git a/app/views/sites/index.html.erb b/app/views/sites/index.html.erb index 1ecde21..12aa4d1 100644 --- a/app/views/sites/index.html.erb +++ b/app/views/sites/index.html.erb @@ -14,8 +14,10 @@
    <%= link_to site.name, site %>
    <%= truncate(strip_tags(site.description), :length => 80) %>
    +
    + Viajes: <%= site.trips.size %>
    <% unless site.comments.empty? %> -
    <%= link_to 'Comentarios', site_comments_path(site) %>
    + <%= link_to 'Comentarios', site_comments_path(site) %> <% end %> diff --git a/app/views/sites/new.html.erb b/app/views/sites/new.html.erb index 37340dc..c85a1cc 100644 --- a/app/views/sites/new.html.erb +++ b/app/views/sites/new.html.erb @@ -1,5 +1,6 @@

    New site

    -<%= render 'form' %> +<%= render 'newform' %> <%= link_to 'Back', sites_path %> + \ No newline at end of file diff --git a/app/views/sites/new.html.erb~ b/app/views/sites/new.html.erb~ new file mode 100644 index 0000000..37340dc --- /dev/null +++ b/app/views/sites/new.html.erb~ @@ -0,0 +1,5 @@ +

    New site

    + +<%= render 'form' %> + +<%= link_to 'Back', sites_path %> diff --git a/app/views/sites/show.html.erb b/app/views/sites/show.html.erb index a658b4a..970cabf 100644 --- a/app/views/sites/show.html.erb +++ b/app/views/sites/show.html.erb @@ -1,29 +1,71 @@ -
    + + + + + + + + + + +
    -

    <%= @site.type.name if @site.type %>

    +

    <%= @site.type.name if @site.type %>

    + + <%= image_tag(@site.image_url, :class => 'site_image') %> - <%= image_tag(@site.image_url, :class => 'site_image') %> +

    <%= @site.name %>

    +

    <%=sanitize @site.description %>

    +

    Autor: + <%= @site.user.name if @site.user %>

    +

    Latitud: + <%= @site.latitud %>

    +

    Longitud: + <%= @site.longitud %>

    +

    Zoom: + <%= @site.zoom %>

    -

    <%= @site.name %>

    +
    +

    Viajes: + <%= @site.trips.size %>

    +
    -

    <%=sanitize @site.description %>

    + <% unless @site.comments.empty? %> +

    Comentarios:

    + <% @comments = @site.comments %> + <%= render 'comments/comment' %> + <% end %> -

    Autor: - <%= @site.user.name if @site.user %>

    +

    - <% unless @site.comments.empty? %> -

    Comentarios:

    - <% @comments = @site.comments %> - <%= render(@comment) %> - <% end %> + <%= render 'comments/form' if current_user%> - <%= render 'comments/form' %> +
    -
    + <% if (@site.latitud && @site.longitud && @site.zoom) %> +

    + <% end %> -

    + <% if @site.user == current_user %> + <%= link_to 'Edit', edit_site_path(@site) %> | + <% end %> + <%= link_to 'Back', sites_path %> + + + -<% if @site.user == current_user %> - <%= link_to 'Edit', edit_site_path(@site) %> | -<% end %> -<%= link_to 'Back', sites_path %> diff --git a/app/views/sites/show.html.erb~ b/app/views/sites/show.html.erb~ new file mode 100644 index 0000000..825412c --- /dev/null +++ b/app/views/sites/show.html.erb~ @@ -0,0 +1,62 @@ + + + + + + + + +

    + +

    <%= @site.type.name if @site.type %>

    + + <%= image_tag(@site.image_url, :class => 'site_image') %> + +

    <%= @site.name %>

    + +

    <%=sanitize @site.description %>

    + +

    Autor: + <%= @site.user.name if @site.user %>

    +

    Latitud: + <%= @site.latitud %>

    +

    Longitud: + <%= @site.longitud %>

    + + <% unless @site.comments.empty? %> +

    Comentarios:

    + <% @comments = @site.comments %> + <%= render(@comment) %> + <% end %> + + <%= render 'comments/form' %> + +
    + +
    +

    +<%= @site.image_url %> +<% if @site.user == current_user %> + <%= link_to 'Edit', edit_site_path(@site) %> | +<% end %> +<%= link_to 'Back', sites_path %> + + + diff --git a/app/views/sites/showantiguo.html.erb b/app/views/sites/showantiguo.html.erb new file mode 100644 index 0000000..415e1ef --- /dev/null +++ b/app/views/sites/showantiguo.html.erb @@ -0,0 +1,61 @@ + + + + + + + + + + +

    + +

    <%= @site.type.name if @site.type %>

    + + <%= image_tag(@site.image_url, :class => 'site_image') %> + +

    <%= @site.name %>

    + +

    <%=sanitize @site.description %>

    + +

    Autor: + <%= @site.user.name if @site.user %>

    +

    Latitud: + <%= @site.latitud %>

    +

    Longitud: + <%= @site.longitud %>

    + + <% unless @site.comments.empty? %> +

    Comentarios:

    + <% @comments = @site.comments %> + <%= render(@comment) %> + <% end %> + + <%= render 'comments/form' %> + +
    + +

    +

    +<% if @site.user == current_user %> + <%= link_to 'Edit', edit_site_path(@site) %> | +<% end %> +<%= link_to 'Back', sites_path %> + + + diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index ec0e077..c0575d1 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -1,43 +1,55 @@ -

    Name: <%= @trip.name %>

    Date: <%= @trip.date %>

    -

    Autor: <%= @trip.user.name if @trip.user %>

    - -

    Description: <%= simple_format @trip.description %>

    - -
    - - - -

    Sitios a visitar

    - - - - <%= render(@trip) %> - - - - <% if @trip.user == current_user %> - - <%= form_for(@visit) do |f| %> - + + + + + + + + +

    Name: <%= @trip.name %>

    +

    Date: <%= @trip.date %>

    +

    Autor: <%= @trip.user.name if @trip.user %>

    +

    Description: <%= simple_format @trip.description %>

    + +
    +

    Sitios a visitar

    + <%= render(@trip) %> + <% if @trip.user == current_user %> + <%= form_for(@visit) do |f| %> + <%= f.number_field :trip_id, :value => @trip.id, :hidden => true %> + <%= f.collection_select(:site_id, Site.all,:id,:name) %> + <%= f.select(:hour, Array.new(24, 0).fill{|i| [(i.to_s + 'H'), i]}) %> + <%= f.submit "Añadir sitio" %> + <% end %> + <% end %> +
    + +

    + + <% if @trip.user == current_user %> + <%= link_to 'Edit', edit_trip_path(@trip) %> | + <% end %> + <%= link_to 'Back', trips_path %> + + + diff --git a/app/views/trips/show.html.erb~ b/app/views/trips/show.html.erb~ index 8ea0050..b39b11d 100644 --- a/app/views/trips/show.html.erb~ +++ b/app/views/trips/show.html.erb~ @@ -1,37 +1,51 @@ + + + + + + + +

    Name: <%= @trip.name %>

    Date: <%= @trip.date %>

    Autor: <%= @trip.user.name if @trip.user %>

    -

    Description: <%= simple_format @trip.description %>

    - - -

    Sitios a visitar

    - - - <%= render(@trip) %> - - - <% if @trip.user == current_user %> - - <%= form_for(@visit) do |f| %> - - + <%= form_for(@visit) do |f| %> <%= f.number_field :trip_id, :value => @trip.id, :hidden => true %> - <%= f.collection_select(:site_id, + <%= f.collection_select(:site_id, Site.all,:id,:name) %> - Site.all, + <%= f.select(:hour, Array.new(24, 0).fill{|i| [(i.to_s + 'H'), i]}) %> - :id, - - :name) %> - - <%= f.select(:hour, Array.new(24, 0).fill {|i| [(i.to_s 'H'), i]}) %> <%= f.submit "Añadir sitio" %> @@ -42,7 +56,9 @@ -
    - <% if @trip.user == current_user %> <%= link_to 'Edit', edit_trip_path(@trip) %> | <% end %> <%= link_to 'Back', trips_path %> - +
    +
    +<% if @trip.user == current_user %> <%= link_to 'Edit', edit_trip_path(@trip) %> | <% end %> <%= link_to 'Back', trips_path %> + + diff --git a/config/routes.rb b/config/routes.rb index 73e0ef0..f587c30 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,10 +1,10 @@ Planet::Application.routes.draw do - resources :visits - - resources :trips - - resources :comments, :except => [ :new, :index ] + resources :visits + + resources :trips + + resources :comments, :except => [ :new, :index, :show ] devise_for :users diff --git a/db/migrate/20120320100145_create_sites.rb b/db/migrate/20120320100145_create_sites.rb index 4e9415c..c7da1e7 100644 --- a/db/migrate/20120320100145_create_sites.rb +++ b/db/migrate/20120320100145_create_sites.rb @@ -4,8 +4,7 @@ def change t.string :name t.text :description t.integer :type_id - t.string :image_url - + t.string :image_url t.timestamps end end diff --git a/db/migrate/20120320100145_create_sites.rb~ b/db/migrate/20120320100145_create_sites.rb~ new file mode 100644 index 0000000..9f009f1 --- /dev/null +++ b/db/migrate/20120320100145_create_sites.rb~ @@ -0,0 +1,14 @@ +class CreateSites < ActiveRecord::Migration + def change + create_table :sites do |t| + t.string :name + t.text :description + t.integer :type_id + t.string :image_url + t.float :longitud + t.float :latitud + t.integer :zoom + t.timestamps + end + end +end diff --git a/db/migrate/20120329080433_user_sites.rb b/db/migrate/20120329080433_user_sites.rb index eb56ace..5831683 100644 --- a/db/migrate/20120329080433_user_sites.rb +++ b/db/migrate/20120329080433_user_sites.rb @@ -2,12 +2,14 @@ class UserSites < ActiveRecord::Migration def up change_table :sites do |t| # añade la columna user_id a la tabla sites t.column :user_id, :integer + end end def down change_table :sites do |t| t.remove :user_id + end end end diff --git a/db/migrate/20120329080433_user_sites.rb~ b/db/migrate/20120329080433_user_sites.rb~ new file mode 100644 index 0000000..6ac9682 --- /dev/null +++ b/db/migrate/20120329080433_user_sites.rb~ @@ -0,0 +1,19 @@ +class UserSites < ActiveRecord::Migration + def up + change_table :sites do |t| # añade la columna user_id a la tabla sites + t.column :user_id, :integer + t.column :longitud, :float + t.column :latitud, :float + t.column :zoom, :integer + end + end + + def down + change_table :sites do |t| + t.remove :user_id + t.remove :longitud + t.remove :latitud + t.remove :zoom + end + end +end diff --git a/db/migrate/20120417205239_coords.rb b/db/migrate/20120417205239_coords.rb new file mode 100644 index 0000000..d126511 --- /dev/null +++ b/db/migrate/20120417205239_coords.rb @@ -0,0 +1,18 @@ +class Coords < ActiveRecord::Migration + def up + change_table :sites do |t| + t.column :longitud,:float + t.column :latitud, :float + t.column :zoom, :integer + end + end + + def down + change_table :sites do |t| + t.remove :longitud + t.remove :latitud + t.remove :zoom + end + + end +end diff --git a/db/migrate/20120417205239_coords.rb~ b/db/migrate/20120417205239_coords.rb~ new file mode 100644 index 0000000..9d96f17 --- /dev/null +++ b/db/migrate/20120417205239_coords.rb~ @@ -0,0 +1,7 @@ +class Coords < ActiveRecord::Migration + def up + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index b20a373..883f0c7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,77 +1,80 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20120417172936) do - - create_table "comments", :force => true do |t| - t.string "comment" - t.integer "user_id" - t.integer "site_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "sites", :force => true do |t| - t.string "name" - t.text "description" - t.integer "type_id" - t.string "image_url" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "user_id" - end - - create_table "trips", :force => true do |t| - t.string "name" - t.text "description" - t.date "date" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "types", :force => true do |t| - t.string "name" - t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "users", :force => true do |t| - t.string "email", :default => "", :null => false - t.string "encrypted_password", :default => "", :null => false - t.string "reset_password_token" - t.datetime "reset_password_sent_at" - t.datetime "remember_created_at" - t.integer "sign_in_count", :default => 0 - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.string "current_sign_in_ip" - t.string "last_sign_in_ip" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "name" - end - - add_index "users", ["email"], :name => "index_users_on_email", :unique => true - add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true - - create_table "visits", :force => true do |t| - t.integer "trip_id" - t.integer "site_id" - t.integer "hour" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - -end +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. + +ActiveRecord::Schema.define(:version => 20120417205239) do + + create_table "comments", :force => true do |t| + t.string "comment" + t.integer "user_id" + t.integer "site_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "sites", :force => true do |t| + t.string "name" + t.text "description" + t.integer "type_id" + t.string "image_url" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "user_id" + t.float "longitud" + t.float "latitud" + t.float "zoom" + end + + create_table "trips", :force => true do |t| + t.string "name" + t.text "description" + t.date "date" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "types", :force => true do |t| + t.string "name" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "users", :force => true do |t| + t.string "email", :default => "", :null => false + t.string "encrypted_password", :default => "", :null => false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", :default => 0 + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "name" + end + + add_index "users", ["email"], :name => "index_users_on_email", :unique => true + add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true + + create_table "visits", :force => true do |t| + t.integer "trip_id" + t.integer "site_id" + t.integer "hour" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + +end From d1f0326cfa67f54c12a11ee61d6d4192fbec3fe1 Mon Sep 17 00:00:00 2001 From: Fran Gil Date: Wed, 25 Apr 2012 21:43:56 +0200 Subject: [PATCH 8/8] Entrega final sin Heroku --- .gitignore | 4 + .gitignore~ | 18 + Gemfile | 13 +- Gemfile.lock | 10 + app/assets/stylesheets/planet.css | 37 +- app/controllers/comments_controller.rb | 42 +- app/controllers/comments_controller.rb~ | 11 +- app/controllers/planet_controller.rb | 48 +- app/controllers/planet_controller.rb~ | 57 +- app/controllers/sites_controller.rb | 48 +- app/controllers/sites_controller.rb~ | 18 +- app/controllers/trips_controller.rb | 42 +- app/controllers/trips_controller.rb~ | 9 +- app/controllers/types_controller.rb | 42 +- app/controllers/types_controller.rb~ | 192 +++---- app/controllers/visits_controller.rb | 40 +- app/controllers/visits_controller.rb~ | 5 +- app/models/comment.rb | 12 +- app/models/comment.rb~ | 14 +- app/models/site.rb | 21 +- app/models/site.rb~ | 18 +- app/models/trip.rb | 17 +- app/models/trip.rb~ | 11 +- app/models/type.rb | 7 +- app/models/type.rb~ | 7 + app/models/user.rb | 5 +- app/models/user.rb~ | 2 +- app/models/visit.rb | 6 +- app/models/visit.rb~ | 2 + app/views/comments/_form.html.erb | 5 +- app/views/comments/create.js.erb | 4 + app/views/comments/create.js.erb~ | 4 + app/views/comments/edit.html.erb | 27 +- app/views/comments/index.html.erb | 19 +- app/views/comments/new.html.erb | 27 +- app/views/comments/show.html.erb | 10 +- app/views/devise/_links.erb | 40 +- app/views/devise/registrations/edit.html.erb | 9 +- app/views/devise/registrations/new.html.erb | 4 +- app/views/layouts/application.html.erb | 119 ++-- app/views/layouts/application.html.erb~ | 36 +- .../layouts/application_mozilla.html.erb | 77 +++ app/views/planet/index.html.erb | 2 +- app/views/planet/search.html.erb | 11 + app/views/planet/search.html.erb~ | 32 ++ app/views/sites/_form.html.erb | 6 +- app/views/sites/_newform.html.erb | 55 +- app/views/sites/_site.html.erb | 28 + app/views/sites/_sites.html.erb | 33 ++ app/views/sites/edit.html.erb | 6 +- app/views/sites/index.html.erb | 42 +- app/views/sites/new.html.erb | 5 +- app/views/sites/show.html.erb | 48 +- app/views/trips/_trip.html.erb | 36 +- app/views/trips/_trips.html.erb | 27 + app/views/trips/edit.html.erb | 6 +- app/views/trips/index.html.erb | 29 +- app/views/trips/new.html.erb | 4 +- app/views/trips/show.html.erb | 63 +- app/views/types/edit.html.erb | 6 +- app/views/types/index.html.erb | 6 +- app/views/types/new.html.erb | 4 +- app/views/types/ordered_index.html.erb | 6 +- app/views/types/show.html.erb | 7 +- app/views/visits/edit.html.erb | 6 +- app/views/visits/index.html.erb | 6 +- app/views/visits/new.html.erb | 4 +- app/views/visits/show.html.erb | 7 +- config/application.rb | 4 + config/routes.rb | 8 +- config/routes.rb~ | 9 +- .../20120411095828_add_paperclip_to_sites.rb | 19 + db/migrate/20120411160519_site_visitas.rb | 13 + db/schema.rb | 165 +++--- db/seeds.rb | 99 +++- doc/app/ApplicationController.html | 163 ++++++ doc/app/ApplicationHelper.html | 157 +++++ doc/app/Comment.html | 170 ++++++ doc/app/CommentsController.html | 494 ++++++++++++++++ doc/app/CommentsHelper.html | 157 +++++ doc/app/PlanetController.html | 399 +++++++++++++ doc/app/PlanetHelper.html | 157 +++++ doc/app/Site.html | 173 ++++++ doc/app/SitesController.html | 494 ++++++++++++++++ doc/app/SitesHelper.html | 157 +++++ doc/app/Trip.html | 169 ++++++ doc/app/TripsController.html | 484 ++++++++++++++++ doc/app/TripsHelper.html | 157 +++++ doc/app/Type.html | 172 ++++++ doc/app/TypesController.html | 524 +++++++++++++++++ doc/app/TypesHelper.html | 157 +++++ doc/app/User.html | 172 ++++++ doc/app/Visit.html | 168 ++++++ doc/app/VisitsController.html | 484 ++++++++++++++++ doc/app/VisitsHelper.html | 157 +++++ doc/app/created.rid | 22 + doc/app/doc/README_FOR_APP.html | 123 ++++ doc/app/images/add.png | Bin 0 -> 733 bytes doc/app/images/brick.png | Bin 0 -> 452 bytes doc/app/images/brick_link.png | Bin 0 -> 764 bytes doc/app/images/bug.png | Bin 0 -> 774 bytes doc/app/images/bullet_black.png | Bin 0 -> 211 bytes doc/app/images/bullet_toggle_minus.png | Bin 0 -> 207 bytes doc/app/images/bullet_toggle_plus.png | Bin 0 -> 209 bytes doc/app/images/date.png | Bin 0 -> 626 bytes doc/app/images/delete.png | Bin 0 -> 715 bytes doc/app/images/find.png | Bin 0 -> 659 bytes doc/app/images/loadingAnimation.gif | Bin 0 -> 5886 bytes doc/app/images/macFFBgHack.png | Bin 0 -> 207 bytes doc/app/images/package.png | Bin 0 -> 853 bytes doc/app/images/page_green.png | Bin 0 -> 621 bytes doc/app/images/page_white_text.png | Bin 0 -> 342 bytes doc/app/images/page_white_width.png | Bin 0 -> 309 bytes doc/app/images/plugin.png | Bin 0 -> 591 bytes doc/app/images/ruby.png | Bin 0 -> 592 bytes doc/app/images/tag_blue.png | Bin 0 -> 1880 bytes doc/app/images/tag_green.png | Bin 0 -> 613 bytes doc/app/images/transparent.png | Bin 0 -> 97 bytes doc/app/images/wrench.png | Bin 0 -> 610 bytes doc/app/images/wrench_orange.png | Bin 0 -> 584 bytes doc/app/images/zoom.png | Bin 0 -> 692 bytes doc/app/index.html | 116 ++++ doc/app/index.html~ | 116 ++++ doc/app/js/darkfish.js | 153 +++++ doc/app/js/jquery.js | 18 + doc/app/js/navigation.js | 142 +++++ doc/app/js/search.js | 94 +++ doc/app/js/search_index.js | 1 + doc/app/js/searcher.js | 228 ++++++++ doc/app/rdoc.css | 543 ++++++++++++++++++ doc/app/table_of_contents.html | 253 ++++++++ public/doc/README_FOR_APP | 2 + public/doc/app/ApplicationController.html | 163 ++++++ public/doc/app/ApplicationHelper.html | 157 +++++ public/doc/app/Comment.html | 170 ++++++ public/doc/app/CommentsController.html | 494 ++++++++++++++++ public/doc/app/CommentsHelper.html | 157 +++++ public/doc/app/PlanetController.html | 399 +++++++++++++ public/doc/app/PlanetHelper.html | 157 +++++ public/doc/app/Site.html | 173 ++++++ public/doc/app/SitesController.html | 494 ++++++++++++++++ public/doc/app/SitesHelper.html | 157 +++++ public/doc/app/Trip.html | 169 ++++++ public/doc/app/TripsController.html | 484 ++++++++++++++++ public/doc/app/TripsHelper.html | 157 +++++ public/doc/app/Type.html | 172 ++++++ public/doc/app/TypesController.html | 524 +++++++++++++++++ public/doc/app/TypesHelper.html | 157 +++++ public/doc/app/User.html | 172 ++++++ public/doc/app/Visit.html | 168 ++++++ public/doc/app/VisitsController.html | 484 ++++++++++++++++ public/doc/app/VisitsHelper.html | 157 +++++ public/doc/app/created.rid | 22 + public/doc/app/doc/README_FOR_APP.html | 123 ++++ public/doc/app/images/add.png | Bin 0 -> 733 bytes public/doc/app/images/brick.png | Bin 0 -> 452 bytes public/doc/app/images/brick_link.png | Bin 0 -> 764 bytes public/doc/app/images/bug.png | Bin 0 -> 774 bytes public/doc/app/images/bullet_black.png | Bin 0 -> 211 bytes public/doc/app/images/bullet_toggle_minus.png | Bin 0 -> 207 bytes public/doc/app/images/bullet_toggle_plus.png | Bin 0 -> 209 bytes public/doc/app/images/date.png | Bin 0 -> 626 bytes public/doc/app/images/delete.png | Bin 0 -> 715 bytes public/doc/app/images/find.png | Bin 0 -> 659 bytes public/doc/app/images/loadingAnimation.gif | Bin 0 -> 5886 bytes public/doc/app/images/macFFBgHack.png | Bin 0 -> 207 bytes public/doc/app/images/package.png | Bin 0 -> 853 bytes public/doc/app/images/page_green.png | Bin 0 -> 621 bytes public/doc/app/images/page_white_text.png | Bin 0 -> 342 bytes public/doc/app/images/page_white_width.png | Bin 0 -> 309 bytes public/doc/app/images/plugin.png | Bin 0 -> 591 bytes public/doc/app/images/ruby.png | Bin 0 -> 592 bytes public/doc/app/images/tag_blue.png | Bin 0 -> 1880 bytes public/doc/app/images/tag_green.png | Bin 0 -> 613 bytes public/doc/app/images/transparent.png | Bin 0 -> 97 bytes public/doc/app/images/wrench.png | Bin 0 -> 610 bytes public/doc/app/images/wrench_orange.png | Bin 0 -> 584 bytes public/doc/app/images/zoom.png | Bin 0 -> 692 bytes public/doc/app/index.html | 116 ++++ public/doc/app/js/darkfish.js | 153 +++++ public/doc/app/js/jquery.js | 18 + public/doc/app/js/navigation.js | 142 +++++ public/doc/app/js/search.js | 94 +++ public/doc/app/js/search_index.js | 1 + public/doc/app/js/searcher.js | 228 ++++++++ public/doc/app/rdoc.css | 543 ++++++++++++++++++ public/doc/app/table_of_contents.html | 253 ++++++++ test/fixtures/comments.yml | 12 +- test/fixtures/sites.yml | 13 +- test/fixtures/trips.yml | 26 +- test/fixtures/types.yml | 4 +- test/fixtures/users.yml | 10 +- test/fixtures/visits.yml | 22 +- test/functional/comments_controller_test.rb | 21 +- test/functional/planet_controller_test.rb | 22 +- test/functional/planet_controller_test.rb~ | 36 ++ test/functional/sites_controller_test.rb | 11 +- test/functional/trips_controller_test.rb | 105 ++-- test/functional/types_controller_test.rb | 2 + test/functional/visits_controller_test.rb | 99 ++-- test/test_helper.rb | 5 + test/unit/site_test.rb | 2 +- 202 files changed, 15383 insertions(+), 782 deletions(-) create mode 100644 .gitignore~ create mode 100644 app/models/type.rb~ create mode 100644 app/views/comments/create.js.erb create mode 100644 app/views/comments/create.js.erb~ create mode 100644 app/views/layouts/application_mozilla.html.erb create mode 100644 app/views/planet/search.html.erb create mode 100644 app/views/planet/search.html.erb~ create mode 100644 app/views/sites/_site.html.erb create mode 100644 app/views/sites/_sites.html.erb create mode 100644 app/views/trips/_trips.html.erb create mode 100644 db/migrate/20120411095828_add_paperclip_to_sites.rb create mode 100644 db/migrate/20120411160519_site_visitas.rb create mode 100644 doc/app/ApplicationController.html create mode 100644 doc/app/ApplicationHelper.html create mode 100644 doc/app/Comment.html create mode 100644 doc/app/CommentsController.html create mode 100644 doc/app/CommentsHelper.html create mode 100644 doc/app/PlanetController.html create mode 100644 doc/app/PlanetHelper.html create mode 100644 doc/app/Site.html create mode 100644 doc/app/SitesController.html create mode 100644 doc/app/SitesHelper.html create mode 100644 doc/app/Trip.html create mode 100644 doc/app/TripsController.html create mode 100644 doc/app/TripsHelper.html create mode 100644 doc/app/Type.html create mode 100644 doc/app/TypesController.html create mode 100644 doc/app/TypesHelper.html create mode 100644 doc/app/User.html create mode 100644 doc/app/Visit.html create mode 100644 doc/app/VisitsController.html create mode 100644 doc/app/VisitsHelper.html create mode 100644 doc/app/created.rid create mode 100644 doc/app/doc/README_FOR_APP.html create mode 100644 doc/app/images/add.png create mode 100644 doc/app/images/brick.png create mode 100644 doc/app/images/brick_link.png create mode 100644 doc/app/images/bug.png create mode 100644 doc/app/images/bullet_black.png create mode 100644 doc/app/images/bullet_toggle_minus.png create mode 100644 doc/app/images/bullet_toggle_plus.png create mode 100644 doc/app/images/date.png create mode 100644 doc/app/images/delete.png create mode 100644 doc/app/images/find.png create mode 100644 doc/app/images/loadingAnimation.gif create mode 100644 doc/app/images/macFFBgHack.png create mode 100644 doc/app/images/package.png create mode 100644 doc/app/images/page_green.png create mode 100644 doc/app/images/page_white_text.png create mode 100644 doc/app/images/page_white_width.png create mode 100644 doc/app/images/plugin.png create mode 100644 doc/app/images/ruby.png create mode 100644 doc/app/images/tag_blue.png create mode 100644 doc/app/images/tag_green.png create mode 100644 doc/app/images/transparent.png create mode 100644 doc/app/images/wrench.png create mode 100644 doc/app/images/wrench_orange.png create mode 100644 doc/app/images/zoom.png create mode 100644 doc/app/index.html create mode 100644 doc/app/index.html~ create mode 100644 doc/app/js/darkfish.js create mode 100644 doc/app/js/jquery.js create mode 100644 doc/app/js/navigation.js create mode 100644 doc/app/js/search.js create mode 100644 doc/app/js/search_index.js create mode 100644 doc/app/js/searcher.js create mode 100644 doc/app/rdoc.css create mode 100644 doc/app/table_of_contents.html create mode 100644 public/doc/README_FOR_APP create mode 100644 public/doc/app/ApplicationController.html create mode 100644 public/doc/app/ApplicationHelper.html create mode 100644 public/doc/app/Comment.html create mode 100644 public/doc/app/CommentsController.html create mode 100644 public/doc/app/CommentsHelper.html create mode 100644 public/doc/app/PlanetController.html create mode 100644 public/doc/app/PlanetHelper.html create mode 100644 public/doc/app/Site.html create mode 100644 public/doc/app/SitesController.html create mode 100644 public/doc/app/SitesHelper.html create mode 100644 public/doc/app/Trip.html create mode 100644 public/doc/app/TripsController.html create mode 100644 public/doc/app/TripsHelper.html create mode 100644 public/doc/app/Type.html create mode 100644 public/doc/app/TypesController.html create mode 100644 public/doc/app/TypesHelper.html create mode 100644 public/doc/app/User.html create mode 100644 public/doc/app/Visit.html create mode 100644 public/doc/app/VisitsController.html create mode 100644 public/doc/app/VisitsHelper.html create mode 100644 public/doc/app/created.rid create mode 100644 public/doc/app/doc/README_FOR_APP.html create mode 100644 public/doc/app/images/add.png create mode 100644 public/doc/app/images/brick.png create mode 100644 public/doc/app/images/brick_link.png create mode 100644 public/doc/app/images/bug.png create mode 100644 public/doc/app/images/bullet_black.png create mode 100644 public/doc/app/images/bullet_toggle_minus.png create mode 100644 public/doc/app/images/bullet_toggle_plus.png create mode 100644 public/doc/app/images/date.png create mode 100644 public/doc/app/images/delete.png create mode 100644 public/doc/app/images/find.png create mode 100644 public/doc/app/images/loadingAnimation.gif create mode 100644 public/doc/app/images/macFFBgHack.png create mode 100644 public/doc/app/images/package.png create mode 100644 public/doc/app/images/page_green.png create mode 100644 public/doc/app/images/page_white_text.png create mode 100644 public/doc/app/images/page_white_width.png create mode 100644 public/doc/app/images/plugin.png create mode 100644 public/doc/app/images/ruby.png create mode 100644 public/doc/app/images/tag_blue.png create mode 100644 public/doc/app/images/tag_green.png create mode 100644 public/doc/app/images/transparent.png create mode 100644 public/doc/app/images/wrench.png create mode 100644 public/doc/app/images/wrench_orange.png create mode 100644 public/doc/app/images/zoom.png create mode 100644 public/doc/app/index.html create mode 100644 public/doc/app/js/darkfish.js create mode 100644 public/doc/app/js/jquery.js create mode 100644 public/doc/app/js/navigation.js create mode 100644 public/doc/app/js/search.js create mode 100644 public/doc/app/js/search_index.js create mode 100644 public/doc/app/js/searcher.js create mode 100644 public/doc/app/rdoc.css create mode 100644 public/doc/app/table_of_contents.html create mode 100644 test/functional/planet_controller_test.rb~ diff --git a/.gitignore b/.gitignore index 28a4c21..1842f10 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,7 @@ # ignore al .DS_store files of MAC OSX .DS_Store +# ignore paperclip installation files +public/system +.project + diff --git a/.gitignore~ b/.gitignore~ new file mode 100644 index 0000000..28a4c21 --- /dev/null +++ b/.gitignore~ @@ -0,0 +1,18 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile ~/.gitignore_global + +# Ignore bundler config +/.bundle + +# Ignore the default SQLite database. +/db/*.sqlite3 + +# Ignore all logfiles and tempfiles. +/log/*.log +/tmp + +# ignore al .DS_store files of MAC OSX +.DS_Store diff --git a/Gemfile b/Gemfile index 91af3d8..6d784e8 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,14 @@ gem 'rails', '3.2.2' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'sqlite3' +group :development, :test do + gem 'sqlite3' +end + +group :production do + gem 'pg' +end + gem 'devise' @@ -23,6 +30,7 @@ end gem 'jquery-rails' gem 'cleditor_rails' +gem 'paperclip' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' @@ -38,3 +46,6 @@ gem 'cleditor_rails' # To use debugger # gem 'ruby-debug19', :require => 'ruby-debug' + +gem 'json', '1.6.5' + diff --git a/Gemfile.lock b/Gemfile.lock index c002e49..46ce106 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,6 +33,7 @@ GEM bcrypt-ruby (3.0.1-x86-mingw32) builder (3.0.0) cleditor_rails (0.0.3) + cocaine (0.2.1) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -62,6 +63,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) + cocaine (>= 0.0.2) + mime-types + pg (0.13.2-x86-mingw32) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -120,6 +127,9 @@ DEPENDENCIES coffee-rails (~> 3.2.1) devise jquery-rails + json (= 1.6.5) + paperclip + pg rails (= 3.2.2) sass-rails (~> 3.2.3) sqlite3 diff --git a/app/assets/stylesheets/planet.css b/app/assets/stylesheets/planet.css index 1154389..0169dae 100644 --- a/app/assets/stylesheets/planet.css +++ b/app/assets/stylesheets/planet.css @@ -14,12 +14,15 @@ font: 150% sans-serif; color: #226; border-bottom: 3px dotted #77d; + margin-top: 30px; } /* Styles for products/index */ #site_list table { border-collapse: collapse; + margin-bottom: 1em; + margin-top: 1em; } #site_list table tr td { @@ -83,12 +86,6 @@ padding-left: 10px; } -#planet .user { - float: right; - color: #bfb; - font-size: small; -} - #columns { background: #446; } @@ -100,11 +97,39 @@ background: white; } +#main .links_down{ + margin-top: 2em; +} + +#main .links_up{ + margin-bottom: 2em; +} + #map_canvas { width: 100%; height: 600px; } +#options { + margin-top: 30px; +} + +#planet .user { + float: right; + color: #bfb; + font-size: small; +} + +#search_form .long_min{ + margin-top: 2em; + margin-bottom: 1em; +} + +#search_form { + margin-top: 2em; + margin-bottom: 2em; +} + #side { float: left; padding-top: 1em; diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 57fb033..aedaf41 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -1,10 +1,17 @@ +# == Qué hace este controlador +# El controlador de comments gestiona todo lo relacionado con la creación, +# edición y eliminación de comentarios. Trabaja con Devise para identificar +# cada comentario con el usuario que lo creó. +# Tiene un filtro para ejecutar las acciones sólo si se ha iniciado sesión. +# Este filtro no afecta a las acciones index y show. class CommentsController < ApplicationController # authenticate_user! ejecuta acción solo si sesión existe before_filter :authenticate_user!, :except => [ :index, :show ] - # GET /comments - # GET /comments.json + # Método que muestra los comentarios asociados al sitio seleccionado. Rutas: + # * GET /sites/:site_id/comments + # * GET /sites/:site_id/comments.json def index @site = Site.find(params[:site_id]) @comments = @site.comments @@ -16,8 +23,9 @@ def index end end - # GET /comments/1 - # GET /comments/1.json + # Método que muestra el comentario seleccionado. Rutas: + # * GET /comments/:comment_id + # * GET /comments/:comment_id.json def show @comment = Comment.find(params[:id]) @@ -27,10 +35,12 @@ def show end end - # GET /comments/new - # GET /comments/new.json + # Método que permite modificar un nuevo comentario asociado a un sitio. Rutas: + # * GET /sites/:site_id/comments/new + # * GET /sites/:site_id/comments/new.json def new @comment = current_user.comments.build + @site = Site.find(params[:site_id]) respond_to do |format| format.html # new.html.erb @@ -38,14 +48,17 @@ def new end end - # GET /comments/1/edit + # Método que permite editar el comentario seleccionado. Ruta: + # * GET /comments/:id/edit def edit @comment = current_user.comments.find(params[:id]) @site = @comment.site end - # POST /comments - # POST /comments.json + # Método que crea el nuevo comentario. Rutas: + # * POST /comments + # * POST /comments.js + # * POST /comments.json def create @comment = current_user.comments.build(params[:comment]) @site = @comment.site @@ -53,6 +66,7 @@ def create respond_to do |format| if @comment.save format.html { redirect_to site_path(@site), notice: 'Comment was successfully created.' } + format.js format.json { render json: @comment, status: :created, location: @comment } else format.html { render action: "new" } @@ -61,8 +75,9 @@ def create end end - # PUT /comments/1 - # PUT /comments/1.json + # Método que actualiza el comentario editado. Rutas: + # * PUT /comments/:id + # * PUT /comments/:id.json def update @comment = current_user.comments.find(params[:id]) @site = @comment.site @@ -78,8 +93,9 @@ def update end end - # DELETE /comments/1 - # DELETE /comments/1.json + # Método que permite eliminar un comentario. Rutas: + # * DELETE /comments/:id + # * DELETE /comments/:id.json def destroy @comment = current_user.comments.find(params[:id]) site = @comment.site diff --git a/app/controllers/comments_controller.rb~ b/app/controllers/comments_controller.rb~ index 86a4240..83be975 100644 --- a/app/controllers/comments_controller.rb~ +++ b/app/controllers/comments_controller.rb~ @@ -1,3 +1,5 @@ +# == Qué hace este controlador +# El controlador de comments gestiona todo lo relacionado con la creación, edición y eliminación de comentarios. Trabaja con Devise para identificar cada comentario con el usuario que lo creó. class CommentsController < ApplicationController # authenticate_user! ejecuta acción solo si sesión existe @@ -8,7 +10,7 @@ class CommentsController < ApplicationController def index @site = Site.find(params[:site_id]) @comments = @site.comments - # @comment = current_user.comments.build + @comment = current_user.comments.build if current_user respond_to do |format| format.html # index.html.erb @@ -48,10 +50,12 @@ class CommentsController < ApplicationController # POST /comments.json def create @comment = current_user.comments.build(params[:comment]) + @site = @comment.site respond_to do |format| if @comment.save - format.html { redirect_to site_path(@comment.site), notice: 'Comment was successfully created.' } + format.html { redirect_to site_path(@site), notice: 'Comment was successfully created.' } + format.js format.json { render json: @comment, status: :created, location: @comment } else format.html { render action: "new" } @@ -64,10 +68,11 @@ class CommentsController < ApplicationController # PUT /comments/1.json def update @comment = current_user.comments.find(params[:id]) + @site = @comment.site respond_to do |format| if @comment.update_attributes(params[:comment]) - format.html { redirect_to site_path(@comment.site), notice: 'Comment was successfully updated.' } + format.html { redirect_to site_path(@site), notice: 'Comment was successfully updated.' } format.json { head :no_content } else format.html { render action: "edit" } diff --git a/app/controllers/planet_controller.rb b/app/controllers/planet_controller.rb index 3a801ef..21ecd2a 100644 --- a/app/controllers/planet_controller.rb +++ b/app/controllers/planet_controller.rb @@ -1,14 +1,60 @@ +# PlanetController ilustra el uso de *RDoc*. La documentación de un proyecto en +# genera en el directorio *proy/doc* en formato Web con +# $proy> rake doc:app +# +# == Algunos comandos de formateo +# +# Tal y como muestra el subitulo anterior, este se define empezando la +# línea con ==. En los títulos debe empezar por =. +# +# Un [ ... ] seguido de texto define una lista titulada, como aquí +# [Clases, Módulos o Métodos] Se documentan con comentarios justo encima de sus definición, como aquí. +# +# Un * o - definen las entradas de una lista itemizada +# * Un URL se define así email[mailto:pepe@ejemplo.com] +# * o así {Pepe Rubio}[mailto:pepe@ejemplo.com] +# +# Un número o letra seguido de punto genera una lista númerada +# 1. + permite generar *negrita*, igual que con HTML +# 2. _ permite generar _cursiva_, igual que con HTML +# 3. * permite generar letra de +teletipo+, igual que con HTML +# +# == Qué hace este controlador +# El controlador de planet es en gran parte un controlador de prueba con acciones vacías. Sólo hay un método con una acción +# completa, search. Esta acción busca los sitios o viajes que tengan en su nombre o en su descripción la cadena de texto introducida. class PlanetController < ApplicationController + + # Método que define una acción vacía del controlador. Ruta: + # * GET /planet/index def index end + # Método que define una acción vacía del controlador. Ruta: + # * GET /planet/contact def contact end + # Método que define una acción vacía del controlador. Ruta: + # * GET /planet/ejemplo def ejemplo end + # Método que define una acción vacía del controlador. Ruta: + # * GET /planet/author def author end - + + # Método que permite buscar por nombre y descripción sitios y viajes. Ruta: + # * GET /planet/search + def search + search = "%#{params[:search]}%" + @sites = Site.find(:all, :conditions => ['name LIKE ? or description LIKE ?', search, search]) + @trips = Trip.find(:all, :conditions => ['name LIKE ? or description LIKE ?', search, search]) + + respond_to do |format| + format.html + format.json { render json: @sites } + format.json { render json: @trips } + end + end end diff --git a/app/controllers/planet_controller.rb~ b/app/controllers/planet_controller.rb~ index be7ac0a..ccdbb70 100644 --- a/app/controllers/planet_controller.rb~ +++ b/app/controllers/planet_controller.rb~ @@ -1,11 +1,46 @@ -class PlanetController < ApplicationController - def index - end - - def contact - end - - def ejemplo - end - -end +# PlanetController ilustra el uso de *RDoc*. La documentación de un proyecto en +# genera en el directorio *proy/doc* en formato Web con +# $proy> rake doc:app +# +# == Algunos comandos de formateo +# +# Tal y como muestra el subitulo anterior, este se define empezando la +# línea con ==. En los títulos debe empezar por =. +# +# Un [ ... ] seguido de texto define una lista titulada, como aquí +# [Clases, Módulos o Métodos] Se documentan con comentarios justo encima de sus definición, como aquí. +# +# Un * o - definen las entradas de una lista itemizada +# * Un URL se define así email[mailto:pepe@ejemplo.com] +# * o así {Pepe Rubio}[mailto:pepe@ejemplo.com] +# +# Un número o letra seguido de punto genera una lista númerada +# 1. + permite generar *negrita*, igual que con HTML +# 2. _ permite generar _cursiva_, igual que con HTML +# 3. * permite generar letra de +teletipo+, igual que con HTML +# +class PlanetController < ApplicationController + # Método que define una acción vacía del controlador + def index + end + # Método que define una acción vacía del controlador + def contact + end + # 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 permite buscar por nombre sitios y viajes + def search + @sites = Site.find(:all, :conditions => ['name LIKE ? or description LIKE ?', "%#{params[:search]}%", "%#{params[:search]}%"]) + @trips = Trip.find(:all, :conditions => ['name LIKE ? or description LIKE ?', "%#{params[:search]}%", "%#{params[:search]}%"]) + + respond_to do |format| + format.html + format.json { render json: @sites } + format.json { render json: @trips } + end + end +end diff --git a/app/controllers/sites_controller.rb b/app/controllers/sites_controller.rb index a0f1717..e1b0ea2 100644 --- a/app/controllers/sites_controller.rb +++ b/app/controllers/sites_controller.rb @@ -1,15 +1,23 @@ +# == Qué hace este controlador +# El controlador de sites gestiona todo lo relacionado con la creación, edición y eliminación de sitios. +# Trabaja con Devise para identificar cada sitio con el usuario que lo creó. +# Tiene dos filtros: +# * Uno para ejecutar las acciones sólo si antes se ha iniciado sesión. Este filtro no afecta a las acciones index y show. +# * Otro para ejecutar el método que define la acción count_visita después de la carga de la página. 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 - # GET /sites - # GET /sites.json + # Este método muestra todos los sitios si no se ha especificado un tipo o los sitios de un tipo determinado. Rutas: + # * GET /sites + # * GET /sites.json def index if params[:type_id].nil? or params[:type_id].empty? @sites = Site.all # path: /sites else - @sites = Type.find(params[:type_id]).sites # path: /types/id/sites + @sites = Type.find(params[:type_id]).sites # path: /types/:type_id/sites end respond_to do |format| @@ -18,8 +26,9 @@ def index end end - # GET /sites/1 - # GET /sites/1.json + # Método que muestra el sitio seleccionado. Rutas: + # * GET /sites/:id + # * GET /sites/:id.json def show @site = Site.find(params[:id]) @comment = current_user.comments.build if current_user @@ -30,8 +39,9 @@ def show end end - # GET /sites/new - # GET /sites/new.json + # Método que permite modificar un nuevo sitio. Rutas: + # * GET /sites/new + # * GET /sites/new.json def new @site = current_user.sites.build # crea sitio vacio asociado a current_user @@ -41,13 +51,15 @@ def new end end - # GET /sites/1/edit + # Método que permite editar el sitio seleccionado. Ruta: + # * GET /sites/:id/edit def edit @site = current_user.sites.find(params[:id]) # busca solo en sitios asociados a current_user end - # POST /sites - # POST /sites.json + # Método que crea el nuevo sitio. Rutas: + # * POST /sites + # * POST /sites.json def create @site = current_user.sites.build(params[:site]) # Asigna solo si sitio asociado a current_user @@ -62,8 +74,9 @@ def create end end - # PUT /sites/1 - # PUT /sites/1.json + # Método que actualiza el sitio editado. Rutas: + # * PUT /sites/:id + # * PUT /sites/:id.json def update @site = current_user.sites.find(params[:id]) # busca solo en sitios asociados a current_user @@ -78,8 +91,9 @@ def update end end - # DELETE /sites/1 - # DELETE /sites/1.json + # Método que permite eliminar un sitio. Rutas: + # * DELETE /sites/:id + # * DELETE /sites/:id.json def destroy @site = current_user.sites.find(params[:id]) # busca solo en sitios asociados a current_user @site.destroy @@ -89,4 +103,10 @@ def destroy format.json { head :no_content } end end + + # Este método define una acción que incrementa el parámetro visitas del sitio actual. + private + def count_visita + @site.increment!(:visitas) + end end diff --git a/app/controllers/sites_controller.rb~ b/app/controllers/sites_controller.rb~ index 90390bb..70bb48f 100644 --- a/app/controllers/sites_controller.rb~ +++ b/app/controllers/sites_controller.rb~ @@ -1,16 +1,24 @@ +# == Qué hace este controlador +# El controlador de sites gestiona todo lo relacionado con la creación, edición y eliminación de sitios. Trabaja con Devise para identificar cada sitio con el usuario que lo creó. +# Tiene dos filtros: +# * Uno para ejecutar las acciones sólo si antes se ha iniciado sesión. Este filtro no afecta a las acciones index y show. +# * Otro para ejecutar el método que define la acción count_visita después de la carga de la página. 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 # GET /sites # GET /sites.json + # Esta método muestra todos los sitios si no se ha especificado un tipo ó los sitios de un tipo determinado def index if params[:type_id].nil? or params[:type_id].empty? - @sites = Site.all # path: /types - else + @sites = Site.all # path: /sites + else @sites = Type.find(params[:type_id]).sites # path: /types/id/sites end + respond_to do |format| format.html # index.html.erb format.json { render json: @sites } @@ -21,6 +29,7 @@ class SitesController < ApplicationController # GET /sites/1.json def show @site = Site.find(params[:id]) + @comment = current_user.comments.build if current_user respond_to do |format| format.html # show.html.erb @@ -87,4 +96,9 @@ class SitesController < ApplicationController format.json { head :no_content } end end + # Este método define una acción que incrementa el parámetro visitas del sitio actual. + private + def count_visita + @site.increment!(:visitas) + end end diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 7232e00..b82c8b1 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,8 +1,16 @@ +# == Qué hace este controlador +# El controlador de trips gestiona todo lo relacionado con la creación, edición y eliminación de viajes. +# Trabaja con Devise para identificar cada viaje con el usuario que lo creó y con visits, que componen un viaje. +# Tiene un filtro para ejecutar las acciones sólo si antes se ha iniciado sesión. Este filtro no afecta a las acciones index y show. + class TripsController < ApplicationController -before_filter :authenticate_user!, :except => [ :index, :show ] - # GET /trips - # GET /trips.json + # authenticate_user! ejecuta acción solo si sesión existe + before_filter :authenticate_user!, :except => [ :index, :show ] + + # Método que muestra todos los viajes. Rutas: + # * GET /trips + # * GET /trips.json def index @trips = Trip.all @@ -12,8 +20,9 @@ def index end end - # GET /trips/1 - # GET /trips/1.json + # Método que muestra el viaje seleccionado. Rutas: + # * GET /trips/:id + # * GET /trips/:id.json def show @trip = Trip.find(params[:id]) @visit = @trip.visits.build @@ -24,8 +33,9 @@ def show end end - # GET /trips/new - # GET /trips/new.json + # Método que permite modificar un nuevo viaje. Rutas: + # * GET /trips/new + # * GET /trips/new.json def new @trip = current_user.trips.build @@ -35,13 +45,15 @@ def new end end - # GET /trips/1/edit + # Método que permite editar el viaje seleccionado. Ruta: + # * GET /trips/:id/edit def edit @trip = current_user.trips.find(params[:id]) end - # POST /trips - # POST /trips.json + # Método que crea el nuevo viaje. Rutas: + # * POST /trips + # * POST /trips.json def create @trip = current_user.trips.build(params[:trip]) @@ -56,8 +68,9 @@ def create end end - # PUT /trips/1 - # PUT /trips/1.json + # Método que actualiza el viaje editado. Rutas: + # * PUT /trips/:id + # * PUT /trips/:id.json def update @trip = current_user.trips.find(params[:id]) @@ -72,8 +85,9 @@ def update end end - # DELETE /trips/1 - # DELETE /trips/1.json + # Método que permite eliminar un viaje. Rutas: + # * DELETE /trips/:id + # * DELETE /trips/:id.json def destroy @trip = current_user.trips.find(params[:id]) @trip.destroy diff --git a/app/controllers/trips_controller.rb~ b/app/controllers/trips_controller.rb~ index 7d256ff..57e3402 100644 --- a/app/controllers/trips_controller.rb~ +++ b/app/controllers/trips_controller.rb~ @@ -1,5 +1,11 @@ +# == Qué hace este controlador +# El controlador de trips gestiona todo lo relacionado con la creación, edición y eliminación de viajes. Trabaja con Devise para identificar cada viaje con el usuario que lo creó. +# Tiene un filtro para ejecutar las acciones sólo si antes se ha iniciado sesión. Este filtro no afecta a las acciones index y show. + class TripsController < ApplicationController -before_filter :authenticate_user!, :except => [ :index, :show ] + + # authenticate_user! ejecuta acción solo si sesión existe + before_filter :authenticate_user!, :except => [ :index, :show ] # GET /trips # GET /trips.json @@ -16,6 +22,7 @@ before_filter :authenticate_user!, :except => [ :index, :show ] # GET /trips/1.json def show @trip = Trip.find(params[:id]) + @visit = @trip.visits.build respond_to do |format| format.html # show.html.erb diff --git a/app/controllers/types_controller.rb b/app/controllers/types_controller.rb index c11eb7f..48cd1b3 100644 --- a/app/controllers/types_controller.rb +++ b/app/controllers/types_controller.rb @@ -1,6 +1,11 @@ +# == Qué hace este controlador +# El controlador de tipos gestiona todo lo relacionado con la creación, edición y eliminación de tipos. +# Cualquier usuario puede realizar acciones sobre los tipos. class TypesController < ApplicationController - # GET /types - # GET /types.json + + # Método que muestra todos los tipos. Rutas: + # * GET /types + # * GET /types.json def index @types = Type.all @@ -10,8 +15,9 @@ def index end end - # GET /types/1 - # GET /types/1.json + # Método que muestra el tipo seleccionado. Rutas: + # * GET /types/:id + # * GET /types/:id.json def show @type = Type.find(params[:id]) @@ -21,8 +27,9 @@ def show end end - # GET /types/ordered_index - # GET /types/ordered_index.json + # Este método define una acción que muestra todos los tipos por orden alfabético. Rutas: + # * GET /types/ordered_index + # * GET /types/ordered_index.json def ordered_index @types = Type.find(:all, :order => :name) @@ -32,8 +39,9 @@ def ordered_index end end - # GET /types/new - # GET /types/new.json + # Método que permite modificar un nuevo tipo. Rutas: + # * GET /types/new + # * GET /types/new.json def new @type = Type.new @@ -43,13 +51,15 @@ def new end end - # GET /types/1/edit + # Método que permite editar el tipo seleccionado. Ruta: + # * GET /types/:id/edit def edit @type = Type.find(params[:id]) end - # POST /types - # POST /types.json + # Método que crea el nuevo tipo. Rutas: + # * POST /types + # * POST /types.json def create @type = Type.new(params[:type]) @@ -64,8 +74,9 @@ def create end end - # PUT /types/1 - # PUT /types/1.json + # Método que actualiza el tipo editado. Rutas: + # * PUT /types/:id + # * PUT /types/:id.json def update @type = Type.find(params[:id]) @@ -80,8 +91,9 @@ def update end end - # DELETE /types/1 - # DELETE /types/1.json + # Método que permite eliminar un tipo. Rutas: + # * DELETE /types/:id + # * DELETE /types/:id.json def destroy @type = Type.find(params[:id]) @type.destroy diff --git a/app/controllers/types_controller.rb~ b/app/controllers/types_controller.rb~ index baaf537..cb92b41 100644 --- a/app/controllers/types_controller.rb~ +++ b/app/controllers/types_controller.rb~ @@ -1,96 +1,96 @@ -class TypesController < ApplicationController - # GET /types - # GET /types.json - def index - @types = Type.all - - respond_to do |format| - format.html # index.html.erb - format.json { render json: @types } - end - end - - # GET /types/1 - # GET /types/1.json - def index_ordenado - @types = Type.find(:all, :order => :name) - - respond_to do |format| - format.html # index.html.erb - format.json { render json: @types } - end - end - - # GET /types/1 - # GET /types/1.json - def show - @type = Type.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.json { render json: @type } - end - end - - - - # GET /types/new - # GET /types/new.json - def new - @type = Type.new - - respond_to do |format| - format.html # new.html.erb - format.json { render json: @type } - end - end - - # GET /types/1/edit - def edit - @type = Type.find(params[:id]) - end - - # POST /types - # POST /types.json - def create - @type = Type.new(params[:type]) - - respond_to do |format| - if @type.save - format.html { redirect_to @type, notice: 'Type was successfully created.' } - format.json { render json: @type, status: :created, location: @type } - else - format.html { render action: "new" } - format.json { render json: @type.errors, status: :unprocessable_entity } - end - end - end - - # PUT /types/1 - # PUT /types/1.json - def update - @type = Type.find(params[:id]) - - respond_to do |format| - if @type.update_attributes(params[:type]) - format.html { redirect_to @type, notice: 'Type was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: "edit" } - format.json { render json: @type.errors, status: :unprocessable_entity } - end - end - end - - # DELETE /types/1 - # DELETE /types/1.json - def destroy - @type = Type.find(params[:id]) - @type.destroy - - respond_to do |format| - format.html { redirect_to types_url } - format.json { head :no_content } - end - end -end +# == Qué hace este controlador +# El controlador de tipos gestiona todo lo relacionado con la creación, edición y eliminación de tipos. Cualquier usuario puede realizar acciones sobre los tipos. +class TypesController < ApplicationController + # GET /types + # GET /types.json + def index + @types = Type.all + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @types } + end + end + + # GET /types/1 + # GET /types/1.json + def show + @type = Type.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @type } + end + end + + # GET /types/ordered_index + # GET /types/ordered_index.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/new + # GET /types/new.json + def new + @type = Type.new + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @type } + end + end + + # GET /types/1/edit + def edit + @type = Type.find(params[:id]) + end + + # POST /types + # POST /types.json + def create + @type = Type.new(params[:type]) + + respond_to do |format| + if @type.save + format.html { redirect_to @type, notice: 'Type was successfully created.' } + format.json { render json: @type, status: :created, location: @type } + else + format.html { render action: "new" } + format.json { render json: @type.errors, status: :unprocessable_entity } + end + end + end + + # PUT /types/1 + # PUT /types/1.json + def update + @type = Type.find(params[:id]) + + respond_to do |format| + if @type.update_attributes(params[:type]) + format.html { redirect_to @type, notice: 'Type was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @type.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /types/1 + # DELETE /types/1.json + def destroy + @type = Type.find(params[:id]) + @type.destroy + + respond_to do |format| + format.html { redirect_to types_url } + format.json { head :no_content } + end + end +end diff --git a/app/controllers/visits_controller.rb b/app/controllers/visits_controller.rb index 52d83b1..299a9d6 100644 --- a/app/controllers/visits_controller.rb +++ b/app/controllers/visits_controller.rb @@ -1,6 +1,11 @@ +# == Qué hace este controlador +# El controlador de tipos gestiona todo lo relacionado con la creación, edición y eliminación de tipos. +# Como las visitas se renderizan con los viajes, se controla indirectamente qué usuario realiza estas acciones. class VisitsController < ApplicationController - # GET /visits - # GET /visits.json + + # Método que muestra todos las visitas. Rutas: + # * GET /visits + # * GET /visits.json def index @visits = Visit.all @@ -10,8 +15,9 @@ def index end end - # GET /visits/1 - # GET /visits/1.json + # Método que muestra la visita seleccionada. Rutas: + # * GET /visits/1 + # * GET /visits/1.json def show @visit = Visit.find(params[:id]) @@ -21,8 +27,9 @@ def show end end - # GET /visits/new - # GET /visits/new.json + # Método que permite modificar una nueva visita. Rutas: + # * GET /visits/new + # * GET /visits/new.json def new @visit = Visit.new @@ -32,13 +39,16 @@ def new end end - # GET /visits/1/edit + # Método que permite editar la visita seleccionada. Ruta: + # * GET /visits/1/edit def edit @visit = Visit.find(params[:id]) end - # POST /visits - # POST /visits.json + # Método que crea la nueva visita. Rutas: + # * POST /visits + # * POST /visits.js + # * POST /visits.json def create @visit = Visit.new(params[:visit]) @@ -54,8 +64,9 @@ def create end end - # PUT /visits/1 - # PUT /visits/1.json + # Método que actualiza la visita editada. Rutas: + # * PUT /visits/1 + # * PUT /visits/1.json def update @visit = Visit.find(params[:id]) @@ -70,14 +81,15 @@ def update end end - # DELETE /visits/1 - # DELETE /visits/1.json + # Método que permite eliminar una visita. Rutas: + # * DELETE /visits/1 + # * DELETE /visits/1.json def destroy @visit = Visit.find(params[:id]) @visit.destroy respond_to do |format| - format.html { redirect_to @visits.trip } + format.html { redirect_to @visit.trip } format.json { head :no_content } end end diff --git a/app/controllers/visits_controller.rb~ b/app/controllers/visits_controller.rb~ index 4d9ff9d..f63b1ea 100644 --- a/app/controllers/visits_controller.rb~ +++ b/app/controllers/visits_controller.rb~ @@ -1,3 +1,5 @@ +# == Qué hace este controlador +# El controlador de tipos gestiona todo lo relacionado con la creación, edición y eliminación de tipos. Como las visitas se renderizan con los viajes, se controla quién realiza estas acciones. class VisitsController < ApplicationController # GET /visits # GET /visits.json @@ -45,6 +47,7 @@ class VisitsController < ApplicationController 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" } @@ -76,7 +79,7 @@ class VisitsController < ApplicationController @visit.destroy respond_to do |format| - format.html { redirect_to @visits.trip } + format.html { redirect_to @visit.trip } format.json { head :no_content } end end diff --git a/app/models/comment.rb b/app/models/comment.rb index 04b8b8b..084af3d 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -1,12 +1,14 @@ +# == Qué define este modelo +# El modelo de comments define los comentarios que los usuarios hagan sobre los sitios. Cada comentario pertenece +# a un usuario y a un sitio determinado. Por defecto se ha establecido un máximo de 240 caracteres para cada comentario. class Comment < ActiveRecord::Base belongs_to :site belongs_to :user - # Debe estar protegido para evitar accesos indeseados - attr_protected :user_id + # Debe estar protegido para evitar accesos indeseados + attr_protected :user_id # Se añaden estas definiciones - validates :comment, :user_id, :site_id, :presence => true # campo obligatorio - validates :comment, :length => { :maximum => 240 } - + validates :comment, :presence => true, :length => { :maximum => 240 } # campo obligatorio + end diff --git a/app/models/comment.rb~ b/app/models/comment.rb~ index c7ec0ca..a78f161 100644 --- a/app/models/comment.rb~ +++ b/app/models/comment.rb~ @@ -1,4 +1,14 @@ +# == Qué define este modelo +# El modelo de comments define los comentarios que los ususarios hagan sobre los sitios. Cada comentario pertenece +# a un usuario y a un sitio determinado. Por defecto se ha establecido un máximo de 240 caracteres para cada comentario. class Comment < ActiveRecord::Base -belongs_to :user -belongs_to :site + belongs_to :site + belongs_to :user + + # Debe estar protegido para evitar accesos indeseados + attr_protected :user_id + + # Se añaden estas definiciones + validates :comment, :presence => true, :length => { :maximum => 240 } # campo obligatorio + end diff --git a/app/models/site.rb b/app/models/site.rb index c1145b7..39c5dea 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -1,13 +1,28 @@ +# == Qué define este modelo +# El modelo de site define un sitio, un emplazamiento en alguna parte del mundo que se añade +# por su interés turístico, especificando su tipo. Un sitio pertenece al usuario que lo ha creado +# y al tipo en el que se enmarca. Sólo el usuario que lo ha creado podrá editarlo o borrarlo. +# Un sitio puede ser parte de muchos viajes definido como una visita. Además puede tener comentarios +# que añadan los usuarios y una imagen que lo identifique. +# Obligatoriamente un sitio tiene que tener un nombre y un tipo. + class Site < ActiveRecord::Base belongs_to :type belongs_to :user - has_many :visits + + has_many :visits has_many :trips, :through => :visits - has_many :comments + has_many :comments + + has_attached_file :image # Debe estar protegido para evitar accesos indeseados attr_protected :user_id # Se añaden estas definiciones - validates :name, :type_id, :image_url, :presence => true # campo obligatorio + validates :name, :type_id, :presence => true # campo obligatorio + #validates_numericality_of :latitud, :less_than => 90, :greater_than => -90 + #validates_numericality_of :longitud, :less_than_or_equal_to => 180, :greater_than_or_equal_to => -180 + #validates_numericality_of :zoom, :less_than => 20, :greater_than_or_equal_to => 0 + end diff --git a/app/models/site.rb~ b/app/models/site.rb~ index c1145b7..ae22f06 100644 --- a/app/models/site.rb~ +++ b/app/models/site.rb~ @@ -1,13 +1,25 @@ +# == Qué define este modelo +# El modelo de site define un sitio, un emplazamiento en alguna parte del mundo que se añade +# por su interés turístico, especificando su tipo. Un sitio pertenece al usuario que lo ha creado +# y al tipo en el que se enmarca. Sólo el usuario que lo ha creado podrá editarlo o borrarlo. +# Un sitio puede ser parte de muchos viajes definido como una visita. Además puede tener comentarios +# que añadan los usuarios y una imagen que lo identifique. + +# Obligatoriamente un sitio tiene que tener un nombre y un tipo. + class Site < ActiveRecord::Base belongs_to :type belongs_to :user - has_many :visits + + has_many :visits has_many :trips, :through => :visits - has_many :comments + has_many :comments + + has_attached_file :image # Debe estar protegido para evitar accesos indeseados attr_protected :user_id # Se añaden estas definiciones - validates :name, :type_id, :image_url, :presence => true # campo obligatorio + validates :name, :type_id, :presence => true # campo obligatorio end diff --git a/app/models/trip.rb b/app/models/trip.rb index dfb6c60..c28583a 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,9 +1,12 @@ -# Modelo de Trip y User con relación uno-a-muchos: -# -> belongs_to :user referencia un objeto User +# == Qué define este modelo +# El modelo de trips define los viajes que se pueden hacer. Cada viaje pertenece a un usuario determinado +# e incluye una serie de visitas (una serie de sitios a los que se pretende ir a una hora determinada). + class Trip < ActiveRecord::Base -belongs_to :user -has_many :visits -has_many :sites, :through => :visits -# Se añade relacion -attr_protected :user_id # Por seguridad + belongs_to :user + has_many :visits + has_many :sites, :through => :visits + + # Se añade relacion + attr_protected :user_id # Por seguridad end diff --git a/app/models/trip.rb~ b/app/models/trip.rb~ index dfb6c60..8f58b97 100644 --- a/app/models/trip.rb~ +++ b/app/models/trip.rb~ @@ -1,9 +1,10 @@ # Modelo de Trip y User con relación uno-a-muchos: # -> belongs_to :user referencia un objeto User class Trip < ActiveRecord::Base -belongs_to :user -has_many :visits -has_many :sites, :through => :visits -# Se añade relacion -attr_protected :user_id # Por seguridad + belongs_to :user + has_many :visits + has_many :sites, :through => :visits + + # Se añade relacion + attr_protected :user_id # Por seguridad end diff --git a/app/models/type.rb b/app/models/type.rb index c2c5a49..d9e353d 100644 --- a/app/models/type.rb +++ b/app/models/type.rb @@ -1,8 +1,11 @@ +# == Qué define este modelo +# El modelo de types define los tipos o categorías en los que se puede clasificar cada sitio. Un tipo agrupa a varios sitios +# que comparten unas caracterícas determinadas (como por ejemplo estar en medio de la naturaleza o ser un edificio histórico). +# Un tipo tiene que tener obligatoriamente un nombre y una descripción, pero no pueden existir dos sitios con el mismo nombre. class Type < ActiveRecord::Base has_many :sites - - # Se añade esta definición de recurso + # Se añade esta definición de recurso validates :name, :description, :presence => true # campo obligatorio validates :name, :uniqueness => true # Campo único (no repetido) end diff --git a/app/models/type.rb~ b/app/models/type.rb~ new file mode 100644 index 0000000..f41fa00 --- /dev/null +++ b/app/models/type.rb~ @@ -0,0 +1,7 @@ +class Type < ActiveRecord::Base + has_many :sites + + # Se añade esta definición de recurso + validates :name, :description, :presence => true # campo obligatorio + validates :name, :uniqueness => true # Campo único (no repetido) +end diff --git a/app/models/user.rb b/app/models/user.rb index b3643df..27c22df 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,8 @@ +# == Qué define este modelo +# El modelo de users define los usuarios de esta página web. Cada persona debe crearse un usario que le identifique dentro +# de la página web, especificando un nombre, una contraseña para evitar accesos indeseados y la suplantación de su identidad y un correo para recibir avisos y recuperar la contraseña. +# Un usuario es dueño de todos los sitios, comentarios y viajes que haya creado, y como tal sólo él podrá editarlos o borrarlos. class User < ActiveRecord::Base - has_many :sites has_many :comments has_many :trips diff --git a/app/models/user.rb~ b/app/models/user.rb~ index 0925503..671f708 100644 --- a/app/models/user.rb~ +++ b/app/models/user.rb~ @@ -1,7 +1,7 @@ class User < ActiveRecord::Base - has_many :sites has_many :comments + has_many :trips # Include default devise modules. Others available are: # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable diff --git a/app/models/visit.rb b/app/models/visit.rb index 6ae1de6..e4853ba 100644 --- a/app/models/visit.rb +++ b/app/models/visit.rb @@ -1,4 +1,6 @@ +# == Qué define este modelo +# El modelo de visits define las visitas que componen cada viaje, es decir, los sitios que se desean visitar en dicho viaje. class Visit < ActiveRecord::Base -belongs_to :trip -belongs_to :site + belongs_to :trip + belongs_to :site end diff --git a/app/models/visit.rb~ b/app/models/visit.rb~ index a950b2a..ca23b73 100644 --- a/app/models/visit.rb~ +++ b/app/models/visit.rb~ @@ -1,2 +1,4 @@ class Visit < ActiveRecord::Base + belongs_to :trip + belongs_to :site end diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb index 2716990..d440de7 100644 --- a/app/views/comments/_form.html.erb +++ b/app/views/comments/_form.html.erb @@ -1,4 +1,4 @@ -<%= form_for(@comment) do |f| %> +<%= form_for(@comment, :remote => true) do |f| %> <% if @comment.errors.any? %>

    <%= pluralize(@comment.errors.count, "error") %> prohibited this comment from being saved:

    @@ -11,12 +11,11 @@
    <% end %> -

    Añada su comentario

    <%= f.text_area :comment, :maxlength => 240, :rows => 6 %>
    <%= f.number_field :site_id, :value => @site.id, :hidden => true %>
    - <%= f.submit %> + <%= f.submit 'Nuevo comentario' %>
    <% end %> diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb new file mode 100644 index 0000000..8e8985e --- /dev/null +++ b/app/views/comments/create.js.erb @@ -0,0 +1,4 @@ +// Programa jQuery/Javascript +// -> sustituye la lista de comentarios de un sitio en DOM +// -> HTML se genera en servidor con ERb +$('#comment').html("<%= j render @comment.site %>"); diff --git a/app/views/comments/create.js.erb~ b/app/views/comments/create.js.erb~ new file mode 100644 index 0000000..ce68903 --- /dev/null +++ b/app/views/comments/create.js.erb~ @@ -0,0 +1,4 @@ +// Programa jQuery/Javascript +// -> sustituye la lista de visitas de un viaje en DOM +// -> HTML se genera en servidor con ERb +$('#comment').html("<%= j render @comment.site %>"); diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb index 63612d9..154e914 100644 --- a/app/views/comments/edit.html.erb +++ b/app/views/comments/edit.html.erb @@ -1,8 +1,27 @@

    Editing comment

    -<%= render 'form' %> +<%= form_for(@comment) do |f| %> + <% if @comment.errors.any? %> +
    +

    <%= pluralize(@comment.errors.count, "error") %> prohibited this comment from being saved:

    -

    - -<%= link_to 'Back', site_path(@site) %> +

      + <% @comment.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %> +
    +
    + <% end %> + +
    + <%= f.text_area :comment, :maxlength => 240, :rows => 6 %> +
    + <%= f.number_field :site_id, :value => @site.id, :hidden => true %> +
    + <%= f.submit %> +
    +<% end %> +
    + <%= link_to 'Back', site_path(@site) %> +
    diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb index 62a085a..62cebaa 100644 --- a/app/views/comments/index.html.erb +++ b/app/views/comments/index.html.erb @@ -1,9 +1,14 @@

    Comentarios de <%= @site.name %>

    -<%= render 'comment' %> - -

    - -<%= render 'form' if current_user %> - -<%= link_to 'Back', sites_path %> +

    + <%= render(@site) %> +
    + +<% if current_user %> +

    Añada su comentario

    + <%= render 'form' %> +<% end %> + +
    + <%= link_to 'Back', sites_path %> +
    \ No newline at end of file diff --git a/app/views/comments/new.html.erb b/app/views/comments/new.html.erb index 61c92f4..88b9d58 100644 --- a/app/views/comments/new.html.erb +++ b/app/views/comments/new.html.erb @@ -1,7 +1,28 @@

    New comment

    -<%= render 'form' %> +<%= form_for(@comment) do |f| %> + <% if @comment.errors.any? %> +
    +

    <%= pluralize(@comment.errors.count, "error") %> prohibited this comment from being saved:

    -

    +

      + <% @comment.errors.full_messages.each do |msg| %> +
    • <%= msg %>
      • + <% end %> +
    +
    + <% end %> + +

    Añada su comentario

    +
    + <%= f.text_area :comment, :maxlength => 240, :rows => 6 %> +
    + <%= f.number_field :site_id, :value => @site.id, :hidden => true %> +
    + <%= f.submit 'Nuevo comentario' %> +
    +<% end %> -<%= link_to 'Back', comments_path %> +
    + <%= link_to 'Back', site_path(@site) %> +
    diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb index 21b60e6..b6fc999 100644 --- a/app/views/comments/show.html.erb +++ b/app/views/comments/show.html.erb @@ -13,7 +13,9 @@ <%= @comment.site.name %>

    -<% if @comment.user == current_user %> - <%= link_to 'Edit', edit_comment_path(@comment) %> | -<% end %> -<%= link_to 'Back', site_path(@comment.site) %> +
    + <% if @comment.user == current_user %> + <%= link_to 'Edit', edit_comment_path(@comment) %> | + <% end %> + <%= link_to 'Back', site_path(@comment.site) %> +
    diff --git a/app/views/devise/_links.erb b/app/views/devise/_links.erb index 712ea44..da22c88 100644 --- a/app/views/devise/_links.erb +++ b/app/views/devise/_links.erb @@ -1,25 +1,27 @@ -<%- if controller_name != 'sessions' %> - <%= link_to "Sign in", new_session_path(resource_name) %>
    -<% end -%> +
    + <%- if controller_name != 'sessions' %> + <%= link_to "Sign in", new_session_path(resource_name) %>
    + <% end -%> -<%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
    -<% end -%> + <%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name) %>
    + <% end -%> -<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
    -<% end -%> + <%- if devise_mapping.recoverable? && controller_name != 'passwords' %> + <%= link_to "Forgot your password?", new_password_path(resource_name) %>
    + <% end -%> -<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
    -<% end -%> + <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
    + <% end -%> -<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
    -<% end -%> + <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
    + <% end -%> -<%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
    + <%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
    + <% end -%> <% end -%> -<% end -%> \ No newline at end of file +
    \ No newline at end of file diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 3d2a882..7e9f8e0 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -3,7 +3,10 @@ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> <%= devise_error_messages! %> -

    <%= f.label :name %>
    <%= f.text_field :name %>

    <%= f.label :email %>
    +

    <%= f.label :name %>
    + <%= f.text_field :name %>

    + +
    <%= f.label :email %>
    <%= f.email_field :email %>
    <%= f.label :password %> (leave blank if you don't want to change it)
    @@ -22,4 +25,6 @@

    Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.

    -<%= link_to "Back", :back %> +
    + <%= link_to "Back", :back %> +
    \ No newline at end of file diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 79a8c31..8c9c8e7 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -3,7 +3,9 @@ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> <%= devise_error_messages! %> -

    <%= f.label :name %>
    <%= f.text_field :name %>

    +

    <%= f.label :name %>
    + <%= f.text_field :name %>

    +
    <%= f.label :email %>
    <%= f.email_field :email %>
    diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 879f9bb..9044507 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,56 +1,77 @@ - - Planet - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> + + Planet + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> - + + - - - + + +
    + <% if current_user %> + <%= link_to current_user.name, edit_user_registration_path %> | + <%= link_to "Sign out", destroy_user_session_path, :method => :delete %> + <% else %> + <%= link_to "Sign in", new_user_session_path %> + <% end %> +
    -
    - <% if current_user %> - <%= link_to current_user.name, - edit_user_registration_path %> | - <%= link_to "Sign out", destroy_user_session_path, :method => :delete %> - <% else %> - <%= link_to "Sign in", new_user_session_path %> - <% end %> -
    - -
    -
    - <%= link_to "Home", planet_index_path %>
    - <%= link_to "Tipos", types_path %>
    - <%= link_to "Sitios", sites_path %>
    -
      - <% Type.all.each do |type| %> -
    • <%= link_to type.name, type_sites_path(type) %>
      • - <% end %> -
    - <%= link_to "Viajes", trips_path %>
    - <%= link_to "Contact", planet_contact_path %>
    - <%= link_to "Sign up", new_user_registration_path if !current_user %> -
    -
    -

    <%= notice %>

    <%= alert %>

    - <%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %> - <%= yield %> -

    - <%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %> -

    +
    +
    + <%= link_to "Home", planet_index_path %>
    + <%= link_to "Tipos", types_path %>
    + <%= link_to "Sitios", sites_path %>
    +
      + <% Type.all.each do |type| %> +
    • <%= link_to type.name, type_sites_path(type) %>
      • + <% end %> +
    + <%= link_to "Viajes", trips_path %>
    + <%= link_to "Contact", planet_contact_path %>
    + <%= link_to "Documentación", "/doc/app/index.html" %>
    + <%= link_to "Sign up", new_user_registration_path unless current_user %> +
    + +
    +

    <%= notice %>

    <%= alert %>

    +
    +

    + <%= form_tag planet_search_path, :method => 'get' do %> + <%= text_field_tag :search, params[:search], id:'search' %> + <%= submit_tag "Search", :name => nil, id:'search_button' %> + <% end %> +
    + +

    <%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %>

    + + <%= yield %> + +

    <%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %>

    +
    -
    - + diff --git a/app/views/layouts/application.html.erb~ b/app/views/layouts/application.html.erb~ index e674df2..d7f82b3 100644 --- a/app/views/layouts/application.html.erb~ +++ b/app/views/layouts/application.html.erb~ @@ -9,6 +9,16 @@ @@ -18,17 +28,16 @@ <%= image_tag("logo3.png") %> <%= @page_title || "Planet Travel Site" %>
    -
    <% if current_user %> <%= link_to current_user.name, - edit_user_registration_path %> | + edit_user_registration_path %> | <%= link_to "Sign out", destroy_user_session_path, :method => :delete %> <% else %> <%= link_to "Sign in", new_user_session_path %> <% end %> -
    - +
    +
    <%= link_to "Home", planet_index_path %>
    @@ -39,17 +48,32 @@
  • <%= link_to type.name, type_sites_path(type) %>
    • <% end %> + <%= link_to "Viajes", trips_path %>
    <%= link_to "Contact", planet_contact_path %>
    - <%= link_to "Sign up", new_user_registration_path if !current_user %> + <%= link_to "Documentación", root_path/doc/appindex.html %>
    + <%= link_to "Sign up", new_user_registration_path unless current_user %> +
    + +

    <%= notice %>

    <%= alert %>

    <%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %> <%= yield %> +

    <%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %>

    - \ No newline at end of file + diff --git a/app/views/layouts/application_mozilla.html.erb b/app/views/layouts/application_mozilla.html.erb new file mode 100644 index 0000000..8b0fa46 --- /dev/null +++ b/app/views/layouts/application_mozilla.html.erb @@ -0,0 +1,77 @@ + + + + Planet + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + + + + + + +
    + <% if current_user %> + <%= link_to current_user.name, edit_user_registration_path %> | + <%= link_to "Sign out", destroy_user_session_path, :method => :delete %> + <% else %> + <%= link_to "Sign in", new_user_session_path %> + <% end %> +
    + +
    +
    + <%= link_to "Home", planet_index_path %>
    + <%= link_to "Tipos", types_path %>
    + <%= link_to "Sitios", sites_path %>
    +
      + <% Type.all.each do |type| %> +
    • <%= link_to type.name, type_sites_path(type) %>
      • + <% end %> +
    + <%= link_to "Viajes", trips_path %>
    + <%= link_to "Contact", planet_contact_path %>
    + <%= link_to "Documentación", "/doc/app/index.html" %>
    + <%= link_to "Sign up", new_user_registration_path unless current_user %> +
    + +
    +

    <%= notice %>

    <%= alert %>

    +
    +

    + <%= form_tag planet_search_path, :method => 'get' do %> + <%= text_field_tag :search, params[:search], id:'search' %> + <%= submit_tag "Search", :name => nil, :disabled => true, id:'search_button' %> + <% end %> +
    + +

    <%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %>

    + + <%= yield %> + +

    <%= link_to('Index', planet_index_path) + "|" + link_to('Contact', planet_contact_path) + "|" + link_to('Ejemplo', planet_ejemplo_path)+ "|" + link_to('Autores', planet_author_path)+ "|" + link_to('Tipos', types_path) + "|" + link_to('Tipos_ordenados', ordered_index_types_path) %>

    +
    +
    + + \ No newline at end of file diff --git a/app/views/planet/index.html.erb b/app/views/planet/index.html.erb index bbee722..743d57a 100644 --- a/app/views/planet/index.html.erb +++ b/app/views/planet/index.html.erb @@ -1 +1 @@ -

    Wecome to the Planet Travel Site

    This site gathers information of touristic sites from all over the world and should help you to organize your trips and your holidays.

    <%= image_tag('pedriza2-m.png') %>

    Feel free to use it for your convenience and pleasure.

    \ No newline at end of file +

    Welcome to the Planet Travel Site

    This site gathers information of touristic sites from all over the world and should help you to organize your trips and your holidays.

    <%= image_tag('pedriza2-m.png') %>

    Feel free to use it for your convenience and pleasure.

    \ No newline at end of file diff --git a/app/views/planet/search.html.erb b/app/views/planet/search.html.erb new file mode 100644 index 0000000..22b9622 --- /dev/null +++ b/app/views/planet/search.html.erb @@ -0,0 +1,11 @@ +
    +

    Resultados en sitios

    + + <%= render 'sites/sites' %> +
    + +
    +

    Resultados en viajes

    + + <%= render 'trips/trips' %> +
    diff --git a/app/views/planet/search.html.erb~ b/app/views/planet/search.html.erb~ new file mode 100644 index 0000000..677e130 --- /dev/null +++ b/app/views/planet/search.html.erb~ @@ -0,0 +1,32 @@ + + + Autores + + + +

    + Información sobre los creadores +

    + +

    En esta página podrá encontrar varios datos sobre los creadores +

    + +

    Alberto Moreno Díaz

    + <%= image_tag('alberto.jpg') %> +
      +
    • Dirección de correo: alberto.moreno.diaz@alumnos.upm.es
      • +
    • Dirección física: C/Sin nombre 7, 9ºB, Madrid
      • +
    • Breve currículum: estudiante de 4º curso de Ingeniería de Telecomunicación en la ETSIT.
      • +
    + +

    Francisco José Gil García

    + <%= image_tag('francisco.jpg') %> +
      +
    • Dirección de correo: fj.gil@alumnos.upm.es
      • +
    • Dirección física: C/Con nombre 2, Bajo Derecha, Villatempujo de arriba
      • +
    • Breve currículum: a rellenar
      • +
    + +

    Para cualquier duda o problema no dude en contactarnos.

    + + diff --git a/app/views/sites/_form.html.erb b/app/views/sites/_form.html.erb index 68b318d..9f27a0e 100644 --- a/app/views/sites/_form.html.erb +++ b/app/views/sites/_form.html.erb @@ -24,8 +24,8 @@ <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %>
    - <%= f.label :image_url %>
    - <%= f.text_field :image_url %> + <%= f.label :image %>
    + <%= f.file_field :image %>
    <%= f.label :latitud %>
    @@ -37,7 +37,7 @@
    <%= f.label :zoom %>
    - <%= f.number_field :zoom %> + <%= f.select(:zoom, Array.new(21, 0).fill{|i| [(i.to_s), i]}) %>
    <%= f.submit %> diff --git a/app/views/sites/_newform.html.erb b/app/views/sites/_newform.html.erb index f8875aa..4e3f9a9 100644 --- a/app/views/sites/_newform.html.erb +++ b/app/views/sites/_newform.html.erb @@ -8,10 +8,10 @@ } else { alert('Geolocation is not supported in this browser.'); } function displayPosition(position){ - lat = position.coords.latitude; - lon = position.coords.longitude; - $("#latitud").val(lat); - $("#longitud").val(lon); + latitud = position.coords.latitude; + longitud = position.coords.longitude; + $("#latitud").val(latitud); + $("#longitud").val(longitud); } function errorFunction(position) { alert('Error!'); } @@ -19,51 +19,6 @@ - <%= form_for(@site) do |f| %> - <% if @site.errors.any? %> -
    -

    <%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:

    -
      - <% @site.errors.full_messages.each do |msg| %> -
    • <%= msg %>
      • - <% end %> -
    -
    - <% end %> - -
    - <%= f.label :name %>
    - <%= f.text_field :name %> -
    -
    - <%= f.label :description %>
    - <%= f.text_area :description , :rows => 4 %> -
    -
    - <%= f.label :type_id %>
    - <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> -
    -
    - <%= f.label :image_url %>
    - <%= f.text_field :image_url %> -
    -
    - <%= f.label :latitud %>
    - <%= f.text_field :latitud, id:'latitud' %> -
    -
    - <%= f.label :longitud %>
    - <%= f.text_field :longitud, id:'longitud' %> -
    -
    - <%= f.label :zoom %>
    - <%= f.number_field :zoom, :value => 15 %> -
    - -
    - <%= f.submit %> -
    - - <% end %> + <%= render 'form' %> diff --git a/app/views/sites/_site.html.erb b/app/views/sites/_site.html.erb new file mode 100644 index 0000000..d63cc53 --- /dev/null +++ b/app/views/sites/_site.html.erb @@ -0,0 +1,28 @@ +
    + + <% site.comments.each do |comment| %> + + + + + + + <% end %> +
    +
    + <% if comment.user == current_user %> +
    <%= link_to comment.user.name + ":", edit_user_registration_path %>
    + <% else %> +
    <%= comment.user.name + ":" %>
    + <% end %> +
    <%= strip_tags(comment.comment) %>
    +
    +     		+ <% if comment.user == current_user %> + <%= link_to 'Edit', edit_comment_path(comment) %>
    + <%= link_to 'Destroy', comment, + :confirm => 'Are you sure?', + :method => :delete if comment.user == current_user %> + <% end %> +
    +
    \ No newline at end of file diff --git a/app/views/sites/_sites.html.erb b/app/views/sites/_sites.html.erb new file mode 100644 index 0000000..cc31b61 --- /dev/null +++ b/app/views/sites/_sites.html.erb @@ -0,0 +1,33 @@ +
    + + <% @sites.each do |site| %> + + + + + + + + <% end %> +
    + <%= link_to image_tag(site.image.url, :class => 'list_image'), site %> + +
    +
    <%= link_to site.name, site %>
    +
    <%= truncate(strip_tags(site.description), :length => 80) %>
    +
    + Viajes: <%= site.trips.size %>
    + <% unless site.comments.empty? %> + <%= link_to 'Comentarios', site_comments_path(site) %> + <% end %> +
    +     		+ <%= link_to 'Show', site %>
    + <% if site.user == current_user %> + <%= link_to 'Edit', edit_site_path(site) %>
    + <%= link_to 'Destroy', site, + :confirm => 'Are you sure?', + :method => :delete %> + <% end %> +
    +
    \ No newline at end of file diff --git a/app/views/sites/edit.html.erb b/app/views/sites/edit.html.erb index af18cc3..ef68a5c 100644 --- a/app/views/sites/edit.html.erb +++ b/app/views/sites/edit.html.erb @@ -2,5 +2,7 @@ <%= render 'form' %> -<%= link_to 'Show', @site %> | -<%= link_to 'Back', sites_path %> +
    + <%= link_to 'Show', @site %> | + <%= link_to 'Back', sites_path %> +
    \ No newline at end of file diff --git a/app/views/sites/index.html.erb b/app/views/sites/index.html.erb index 12aa4d1..0fba005 100644 --- a/app/views/sites/index.html.erb +++ b/app/views/sites/index.html.erb @@ -1,41 +1,9 @@

    <%= @sites == Site.all ? "Todos los sitios" : Type.find(params[:type_id]).name %>

    - - <% @sites.each do |site| %> - - - - - - - - - <% end %> -
    - <%= link_to image_tag(site.image_url, :class => 'list_image'), site %> - -
    -
    <%= link_to site.name, site %>
    -
    <%= truncate(strip_tags(site.description), - :length => 80) %>
    -
    - Viajes: <%= site.trips.size %>
    - <% unless site.comments.empty? %> - <%= link_to 'Comentarios', site_comments_path(site) %> - <% end %> -
    -     		- <%= link_to 'Show', site %>
    - <% if site.user == current_user %> - <%= link_to 'Edit', edit_site_path(site) %>
    - <%= link_to 'Destroy', site, - :confirm => 'Are you sure?', - :method => :delete %> - <% end %> -
    + <%= render 'sites' %>
    - -
    - -<%= link_to 'New site', new_site_path %> \ No newline at end of file + +
    + <%= link_to 'New site', new_site_path %> +
    \ No newline at end of file diff --git a/app/views/sites/new.html.erb b/app/views/sites/new.html.erb index c85a1cc..8524f27 100644 --- a/app/views/sites/new.html.erb +++ b/app/views/sites/new.html.erb @@ -2,5 +2,6 @@ <%= render 'newform' %> -<%= link_to 'Back', sites_path %> - \ No newline at end of file +
    + <%= link_to 'Back', sites_path %> +
    \ No newline at end of file diff --git a/app/views/sites/show.html.erb b/app/views/sites/show.html.erb index 970cabf..3a0ba19 100644 --- a/app/views/sites/show.html.erb +++ b/app/views/sites/show.html.erb @@ -27,7 +27,7 @@

    <%= @site.type.name if @site.type %>

    - <%= image_tag(@site.image_url, :class => 'site_image') %> + <%= image_tag(@site.image.url, :class => 'site_image') %>

    <%= @site.name %>

    <%=sanitize @site.description %>

    @@ -41,31 +41,41 @@ <%= @site.zoom %>

    -

    Viajes: - <%= @site.trips.size %>

    +

    Viajes: <%= @site.trips.size %>

    - <% unless @site.comments.empty? %> -

    Comentarios:

    - <% @comments = @site.comments %> - <%= render 'comments/comment' %> - <% end %> - -

    - - <%= render 'comments/form' if current_user%> +

    +

    Visitas: <%= @site.visitas %>

    +
    -
    +
    +

    Comentarios

    + <%= render(@site) %> +
    + + <% if current_user %> +

    Añada su comentario

    + <%= render 'comments/form' %> + <% end %> +

    Posición geográfica

    <% if (@site.latitud && @site.longitud && @site.zoom) %> -

    + <% if (@site.latitud > -90 && @site.latitud < 90) %> +

    + <% else %> +

    <%= @site.name %>: Latitud no válida (debe ser mayor que -90 y menor que 90) + <% end %> + <% else %> +

    No se disponen de datos suficientes para mostrar la ubicación de <%= @site.name %>

    <% end %> - <% if @site.user == current_user %> - <%= link_to 'Edit', edit_site_path(@site) %> | - <% end %> - <%= link_to 'Back', sites_path %> - +
    + <% if @site.user == current_user %> + <%= link_to 'Edit', edit_site_path(@site) %> | + <% end %> + <%= link_to 'Back', sites_path %> +
    + diff --git a/app/views/trips/_trip.html.erb b/app/views/trips/_trip.html.erb index 779594c..f37f644 100644 --- a/app/views/trips/_trip.html.erb +++ b/app/views/trips/_trip.html.erb @@ -1,29 +1,29 @@
    - <% trip.visits.order(:hour).each do |visit| %> - - + <% trip.visits.order(:hour).each do |visit| %> + + - + + - - - <% end %> + + + <% end %>
    - <%= link_to image_tag(visit.site.image_url, :class => 'list_image'), visit.site %> -
    + <%= link_to image_tag(visit.site.image.url, :class => 'list_image'), visit.site %> + -
    -
    <%= visit.hour.to_s + 'h: ' %> - <%=link_to(visit.site.name, visit.site) %>
    -
    <%= truncate(strip_tags(visit.site.description), +
    		+
    +
    <%= visit.hour.to_s + 'h: ' %> + <%=link_to(visit.site.name, visit.site) %>
    +
    <%= truncate(strip_tags(visit.site.description), :length => 80) %>
    -
    -     		- <%= link_to 'Show', visit.site %>
    - <%= link_to 'Destroy', visit, +     		+ <%= link_to 'Show', visit.site %>
    + <%= link_to 'Destroy', visit, :confirm => 'Are you sure?', :method => :delete if trip.user == current_user %> -
    diff --git a/app/views/trips/_trips.html.erb b/app/views/trips/_trips.html.erb new file mode 100644 index 0000000..08bc858 --- /dev/null +++ b/app/views/trips/_trips.html.erb @@ -0,0 +1,27 @@ +
    + + <% @trips.each do |trip| %> + + + + + + + <% end %> +
    +
    +
    <%= link_to trip.name, trip_path(trip) %>
    +
    <%= truncate(strip_tags(trip.description), + :length => 80) + ', ' + trip.date.to_s %>
    +
    +     		+ <%= link_to 'Show', trip %>
    + <% if trip.user == current_user %> + <%= link_to 'Edit', edit_trip_path(trip) %>
    + <%= link_to 'Destroy', trip, + :confirm => 'Are you sure?', + :method => :delete, + :remote => true %> + <% end %> +
    +
    \ No newline at end of file diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb index 71287a4..90ad682 100644 --- a/app/views/trips/edit.html.erb +++ b/app/views/trips/edit.html.erb @@ -2,5 +2,7 @@ <%= render 'form' %> -<%= link_to 'Show', @trip %> | -<%= link_to 'Back', trips_path %> +
    + <%= link_to 'Show', @trip %> | + <%= link_to 'Back', trips_path %> +
    \ No newline at end of file diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index dbab91f..aa0df41 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -1,28 +1 @@ -
    -

    Viajes

    - - <% @trips.each do |trip| %> - - - - -<% end %> -
    -
    -
    <%= link_to trip.name, trip_path(trip) %>
    -
    <%= truncate(strip_tags(trip.description), - :length => 80) + ', ' + trip.date.to_s %>
    -
    -    		 - <%= link_to 'Show', trip %>
    - <% if trip.user == current_user %> - <%= link_to 'Edit', edit_trip_path(trip) %>
    - <%= link_to 'Destroy', trip, - :confirm => 'Are you sure?', - :method => :delete %> - <% end %> -
    -

    - -<%= link_to 'New Trip', new_trip_path %> - +

    Viajes

    <%= render 'trips' %>
    <%= link_to 'New Trip', new_trip_path %>
    \ No newline at end of file diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb index dd3e49d..68b88f9 100644 --- a/app/views/trips/new.html.erb +++ b/app/views/trips/new.html.erb @@ -2,4 +2,6 @@ <%= render 'form' %> -<%= link_to 'Back', trips_path %> +
    + <%= link_to 'Back', trips_path %> +
    \ No newline at end of file diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index c0575d1..2049b58 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -3,29 +3,41 @@ - +

    Name: <%= @trip.name %>

    Date: <%= @trip.date %>

    Autor: <%= @trip.user.name if @trip.user %>

    @@ -35,7 +47,7 @@

    Sitios a visitar

    <%= render(@trip) %> <% if @trip.user == current_user %> - <%= form_for(@visit) do |f| %> + <%= form_for(@visit, :remote => true) do |f| %> <%= f.number_field :trip_id, :value => @trip.id, :hidden => true %> <%= f.collection_select(:site_id, Site.all,:id,:name) %> <%= f.select(:hour, Array.new(24, 0).fill{|i| [(i.to_s + 'H'), i]}) %> @@ -44,12 +56,29 @@ <% end %>
    -

    +

    Posición geográfica

    + <% mapa = false %> + <% @trip.sites.each do |site| %> + <% if site.latitud && site.longitud %> + <% if site.latitud > -90 && site.latitud < 90 %> + <% mapa = true if !mapa %> + <% else %> +

    <%= site.name %>: Latitud no válida (debe ser mayor que -90 y menor que 90) + <% end %> + <% else %> +

    No se disponen de datos suficientes para mostrar la ubicación de <%= site.name %> + <% end %> + <% end %> + <% if mapa %> +

    + <% end %> - <% if @trip.user == current_user %> - <%= link_to 'Edit', edit_trip_path(@trip) %> | - <% end %> - <%= link_to 'Back', trips_path %> +

    + <% if @trip.user == current_user %> + <%= link_to 'Edit', edit_trip_path(@trip) %> | + <% end %> + <%= link_to 'Back', trips_path %> +
    diff --git a/app/views/types/edit.html.erb b/app/views/types/edit.html.erb index cdc4b34..3965ab7 100644 --- a/app/views/types/edit.html.erb +++ b/app/views/types/edit.html.erb @@ -2,5 +2,7 @@ <%= render 'form' %> -<%= link_to 'Show', @type %> | -<%= link_to 'Back', types_path %> +
    + <%= link_to 'Show', @type %> | + <%= link_to 'Back', types_path %> +
    \ No newline at end of file diff --git a/app/views/types/index.html.erb b/app/views/types/index.html.erb index 6b26830..d187b57 100644 --- a/app/views/types/index.html.erb +++ b/app/views/types/index.html.erb @@ -25,6 +25,6 @@
    -
    - -<%= link_to 'New Type', new_type_path %> +
    + <%= link_to 'New Type', new_type_path %> +
    \ No newline at end of file diff --git a/app/views/types/new.html.erb b/app/views/types/new.html.erb index c7179ac..4e138be 100644 --- a/app/views/types/new.html.erb +++ b/app/views/types/new.html.erb @@ -2,4 +2,6 @@ <%= render 'form' %> -<%= link_to 'Back', types_path %> +
    + <%= link_to 'Back', types_path %> +
    \ No newline at end of file diff --git a/app/views/types/ordered_index.html.erb b/app/views/types/ordered_index.html.erb index 6b26830..d187b57 100644 --- a/app/views/types/ordered_index.html.erb +++ b/app/views/types/ordered_index.html.erb @@ -25,6 +25,6 @@ -
    - -<%= link_to 'New Type', new_type_path %> +
    + <%= link_to 'New Type', new_type_path %> +
    \ No newline at end of file diff --git a/app/views/types/show.html.erb b/app/views/types/show.html.erb index 0a8083a..7202c4f 100644 --- a/app/views/types/show.html.erb +++ b/app/views/types/show.html.erb @@ -10,6 +10,7 @@ <%= @type.description %>

    - -<%= link_to 'Edit', edit_type_path(@type) %> | -<%= link_to 'Back', types_path %> +
    + <%= link_to 'Edit', edit_type_path(@type) %> | + <%= link_to 'Back', types_path %> +
    \ No newline at end of file diff --git a/app/views/visits/edit.html.erb b/app/views/visits/edit.html.erb index 66d34d9..f000918 100644 --- a/app/views/visits/edit.html.erb +++ b/app/views/visits/edit.html.erb @@ -2,5 +2,7 @@ <%= render 'form' %> -<%= link_to 'Show', @visit %> | -<%= link_to 'Back', visits_path %> +
    + <%= link_to 'Show', @visit %> | + <%= link_to 'Back', visits_path %> +
    \ No newline at end of file diff --git a/app/views/visits/index.html.erb b/app/views/visits/index.html.erb index c7bea46..6527e5c 100644 --- a/app/views/visits/index.html.erb +++ b/app/views/visits/index.html.erb @@ -22,6 +22,6 @@ <% end %> -
    - -<%= link_to 'New Visit', new_visit_path %> +
    + <%= link_to 'New Visit', new_visit_path %> +
    \ No newline at end of file diff --git a/app/views/visits/new.html.erb b/app/views/visits/new.html.erb index 1be1930..0490ab9 100644 --- a/app/views/visits/new.html.erb +++ b/app/views/visits/new.html.erb @@ -2,4 +2,6 @@ <%= render 'form' %> -<%= link_to 'Back', visits_path %> +
    + <%= link_to 'Back', visits_path %> +
    \ No newline at end of file diff --git a/app/views/visits/show.html.erb b/app/views/visits/show.html.erb index 2bf41f5..281cd84 100644 --- a/app/views/visits/show.html.erb +++ b/app/views/visits/show.html.erb @@ -15,6 +15,7 @@ <%= @visit.hour %>

    - -<%= link_to 'Edit', edit_visit_path(@visit) %> | -<%= link_to 'Back', visits_path %> +
    + <%= link_to 'Edit', edit_visit_path(@visit) %> | + <%= link_to 'Back', visits_path %> +
    \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index 6357c19..5853707 100644 --- a/config/application.rb +++ b/config/application.rb @@ -55,5 +55,9 @@ class Application < Rails::Application # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' + + # Avoid problem when deploying to Heroku + # https://devcenter.heroku.com/articles/rails3x-asset-pipeline-cedar#troubleshooting + config.assets.initialize_on_precompile = false end end diff --git a/config/routes.rb b/config/routes.rb index f587c30..b841de4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,19 +4,19 @@ resources :trips - resources :comments, :except => [ :new, :index, :show ] + resources :comments, :except => [ :index, :new ] devise_for :users resources :sites do - resources :comments, :only => [ :index ] + resources :comments, :only => [ :index, :new ] end resources :types do get 'ordered_index', :on => :collection resources :sites, :only => [ :index ] # Rutas anidadas /types/id/sites. Restringe a acción “index” end - + get "planet/index" get "planet/contact" @@ -25,6 +25,8 @@ get "planet/author" + get "planet/search" + # The priority is based upon order of creation: # first created -> highest priority. diff --git a/config/routes.rb~ b/config/routes.rb~ index 833f19c..f587c30 100644 --- a/config/routes.rb~ +++ b/config/routes.rb~ @@ -1,7 +1,12 @@ Planet::Application.routes.draw do - resources :comments, :except => [ :new, :index ] - devise_for :users + resources :visits + + resources :trips + + resources :comments, :except => [ :new, :index, :show ] + + devise_for :users resources :sites do resources :comments, :only => [ :index ] diff --git a/db/migrate/20120411095828_add_paperclip_to_sites.rb b/db/migrate/20120411095828_add_paperclip_to_sites.rb new file mode 100644 index 0000000..3139184 --- /dev/null +++ b/db/migrate/20120411095828_add_paperclip_to_sites.rb @@ -0,0 +1,19 @@ +class AddPaperclipToSites < ActiveRecord::Migration + def up + change_table :sites do |t| + t.column :image_file_name, :string + t.column :image_content_type, :string + t.column :image_file_size, :string + t.column :image_updated_at, :datetime + end + end + + def down + change_table :sites do |t| + t.remove :image_file_name, :string + t.remove :image_content_type, :string + t.remove :image_file_size, :string + t.remove :image_updated_at, :datetime + end + end +end diff --git a/db/migrate/20120411160519_site_visitas.rb b/db/migrate/20120411160519_site_visitas.rb new file mode 100644 index 0000000..9adc908 --- /dev/null +++ b/db/migrate/20120411160519_site_visitas.rb @@ -0,0 +1,13 @@ +class SiteVisitas < ActiveRecord::Migration + def up + change_table :sites do |t| + t.column :visitas, :integer, :default => 0 + end + end + + def down + change_table :sites do |t| + t.remove :visitas + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 883f0c7..67fd723 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,80 +1,85 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20120417205239) do - - create_table "comments", :force => true do |t| - t.string "comment" - t.integer "user_id" - t.integer "site_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "sites", :force => true do |t| - t.string "name" - t.text "description" - t.integer "type_id" - t.string "image_url" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "user_id" - t.float "longitud" - t.float "latitud" - t.float "zoom" - end - - create_table "trips", :force => true do |t| - t.string "name" - t.text "description" - t.date "date" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "types", :force => true do |t| - t.string "name" - t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "users", :force => true do |t| - t.string "email", :default => "", :null => false - t.string "encrypted_password", :default => "", :null => false - t.string "reset_password_token" - t.datetime "reset_password_sent_at" - t.datetime "remember_created_at" - t.integer "sign_in_count", :default => 0 - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.string "current_sign_in_ip" - t.string "last_sign_in_ip" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "name" - end - - add_index "users", ["email"], :name => "index_users_on_email", :unique => true - add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true - - create_table "visits", :force => true do |t| - t.integer "trip_id" - t.integer "site_id" - t.integer "hour" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - -end +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. + +ActiveRecord::Schema.define(:version => 20120417205239) do + + create_table "comments", :force => true do |t| + t.string "comment" + t.integer "user_id" + t.integer "site_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "sites", :force => true do |t| + t.string "name" + t.text "description" + t.integer "type_id" + t.string "image_url" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "user_id" + t.string "image_file_name" + t.string "image_content_type" + t.string "image_file_size" + t.datetime "image_updated_at" + t.integer "visitas", :default => 0 + t.float "longitud" + t.float "latitud" + t.integer "zoom" + end + + create_table "trips", :force => true do |t| + t.string "name" + t.text "description" + t.date "date" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "types", :force => true do |t| + t.string "name" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "users", :force => true do |t| + t.string "email", :default => "", :null => false + t.string "encrypted_password", :default => "", :null => false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", :default => 0 + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "name" + end + + add_index "users", ["email"], :name => "index_users_on_email", :unique => true + add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true + + create_table "visits", :force => true do |t| + t.integer "trip_id" + t.integer "site_id" + t.integer "hour" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index de2aded..7cecf8e 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -9,56 +9,109 @@ Type.delete_all -tm = Type.create( +type1 = Type.create!( name: 'Monumento', description: 'Edificio de interes turistico o artistico') -tn = Type.create( +type2 = Type.create!( name: 'Naturaleza', description: 'Lugar al aire libre de interes natural o de recreo') -tr = Type.create( +type3 = Type.create!( name: 'Ruina', description: 'Lugar o resto de interes arquelogico') -Site.delete_all +User.delete_all + +user1 = User.create!( + name: 'Jose Perez', + email: 'jose.perez@gmail.com', + password: 'perez22', + password_confirmation: 'perez22') +user2 = User.create!( + name: 'Javier Sedano', + email: 'javier.sedano@me.com', + password: 'sedano22', + password_confirmation: 'sedano22') -Site.create( + +Site.delete_all + +site1= Site.create!( name: 'Pedriza', description: 'Magnifico valle al norte de Madrid en el Macizo Central', - type_id: tn.id, - image_url: 'pedriza.png') + type_id: type2.id, + image_url: 'pedriza.png', + image: File.open(File.join(Rails.root, 'app', 'assets','images', 'pedriza.png'), "r")) +site1.user_id = user1.id ; site1.save -Site.create( +site2 = Site.create!( name: 'Catedral de Florencia', description: 'Catedral de la ciudad de Florencia con la que se inicia el Renacimiento', - type_id: tm.id, - image_url: 'florencia.png') + type_id: type1.id, + image_url: 'florencia.png', + image: File.open(File.join(Rails.root, 'app', 'assets','images', 'florencia.png'), "r")) +site2.user_id = user1.id ; site2.save -Site.create( +site3 = Site.create!( name: 'Jardin de Lineo', - description: 'Jardin de la ciudad sueca de Uppsala donde el famoso naturalista enia su coleccion de plantas', - type_id: tn.id, - image_url: 'arbol1.png') + description: 'Jardin de la ciudad sueca de Uppsala donde el famoso naturalista tenia su coleccion de plantas', + type_id: type1.id, + image_url: 'arbol1.png', + image: File.open(File.join(Rails.root, 'app', 'assets','images', 'arbol1.png'), "r")) +site3.user_id = user2.id ; site3.save -Site.create( +site4 = Site.create!( name: 'Reichstag', description: 'Parlamento aleman en la ciudad de Berlin', - type_id: tm.id, - image_url: 'reichstag.png') + type_id: type2.id, + image_url: 'reichstag.png', + image: File.open(File.join(Rails.root, 'app', 'assets','images', 'reichstag.png'), "r")) +site4.user_id = user2.id ; site4.save -Site.create( +site5 = Site.create!( name: 'Pergamo', description: 'Puerta del mercado de la antigua ciudad griega de Pergamo del museo arquelogico de Berlin', - type_id: tr.id, - image_url: 'pergamo.png') + type_id: type3.id, + image_url: 'pergamo.png', + image: File.open(File.join(Rails.root, 'app', 'assets','images', 'pergamo.png'), "r")) +site5.user_id = user1.id ; site5.save + + + +Trip.delete_all + +trip1 = Trip.create!( + name: 'Viaje por Europa', + description: 'Viaje por capitales europeas', + date: '2012-04-12') +trip1.user_id = user1.id ; trip1.save + +trip2 = Trip.create!( + name: 'Sierra de Madrid', + description: 'Sua al Yelmo en la Pedriza', + date: '2012-05-18') +trip2.user_id = user2.id ; trip2.save + + +Visit.delete_all + +visit1 = Visit.create!( + hour: '10') +visit1.trip_id = trip2.id +visit1.site_id = site1.id ; visit1.save -# user_id esta protegido con "attr_protected" y debe inicializarse asi, -# Site.create(....) levantaria una excepcipón al intentar inicializarlo -Site.all.each { |obj| obj.user_id = 1 ; obj.save } +visit2 = Visit.create!( + hour: '9') +visit2.trip_id = trip1.id +visit2.site_id = site5.id ; visit2.save +visit3 = Visit.create!( + hour: '16') +visit3.trip_id = trip1.id +visit3.site_id = site4.id ; visit3.save diff --git a/doc/app/ApplicationController.html b/doc/app/ApplicationController.html new file mode 100644 index 0000000..fd3724e --- /dev/null +++ b/doc/app/ApplicationController.html @@ -0,0 +1,163 @@ + + + + + + +class ApplicationController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class ApplicationController

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/ApplicationHelper.html b/doc/app/ApplicationHelper.html new file mode 100644 index 0000000..2592c04 --- /dev/null +++ b/doc/app/ApplicationHelper.html @@ -0,0 +1,157 @@ + + + + + + +module ApplicationHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module ApplicationHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/Comment.html b/doc/app/Comment.html new file mode 100644 index 0000000..ebe03b1 --- /dev/null +++ b/doc/app/Comment.html @@ -0,0 +1,170 @@ + + + + + + +class Comment - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class Comment

    + +
    + +

    Qué define este modelo

    + +

    El modelo de comments define los comentarios que los usuarios hagan sobre +los sitios. Cada comentario pertenece a un usuario y a un sitio +determinado. Por defecto se ha establecido un máximo de 240 caracteres para +cada comentario.

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/CommentsController.html b/doc/app/CommentsController.html new file mode 100644 index 0000000..d35dc81 --- /dev/null +++ b/doc/app/CommentsController.html @@ -0,0 +1,494 @@ + + + + + + +class CommentsController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class CommentsController

    + +
    + +

    Qué hace este controlador

    + +

    El controlador de comments gestiona todo lo relacionado con la creación, +edición y eliminación de comentarios. Trabaja con Devise para identificar +cada comentario con el usuario que lo creó. Tiene un filtro para ejecutar +las acciones sólo si se ha iniciado sesión. Este filtro no afecta a las +acciones index y show.

    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + create() + click to toggle source +
    + + +
    + +

    Método que crea el nuevo comentario. Rutas:

    +
    • +

      POST /comments

      +
    • +

      POST /comments.js

      +
    • +

      POST /comments.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 62
+def create
+  @comment = current_user.comments.build(params[:comment])
+  @site = @comment.site
+
+  respond_to do |format|
+    if @comment.save
+      format.html { redirect_to site_path(@site), notice: 'Comment was successfully created.' }
+      format.js
+      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
    +
    + +
    + + + + +
    + + +
    + +
    + destroy() + click to toggle source +
    + + +
    + +

    Método que permite eliminar un comentario. Rutas:

    +
    • +

      DELETE /comments/:id

      +
    • +

      DELETE /comments/:id.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 99
+def destroy
+  @comment = current_user.comments.find(params[:id])
+  site = @comment.site
+  @comment.destroy
+
+  respond_to do |format|
+    format.html { redirect_to site_path(site) }
+    format.json { head :no_content }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + edit() + click to toggle source +
    + + +
    + +

    Método que permite editar el comentario seleccionado. Ruta:

    +
    • +

      GET /comments/:id/edit

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 53
+def edit
+  @comment = current_user.comments.find(params[:id])
+  @site = @comment.site
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Método que muestra los comentarios asociados al sitio seleccionado. Rutas:

    +
    • +

      GET /sites/:site_id/comments

      +
    • +

      GET /sites/:site_id/comments.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 15
+def index
+  @site = Site.find(params[:site_id])
+  @comments = @site.comments
+  @comment = current_user.comments.build if current_user
+
+  respond_to do |format|
+    format.html # index.html.erb
+    format.json { render json: @comments }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + new() + click to toggle source +
    + + +
    + +

    Método que permite modificar un nuevo comentario asociado a un sitio. +Rutas:

    +
    • +

      GET /sites/:site_id/comments/new

      +
    • +

      GET /sites/:site_id/comments/new.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 41
+def new
+  @comment = current_user.comments.build
+  @site = Site.find(params[:site_id])
+
+  respond_to do |format|
+    format.html # new.html.erb
+    format.json { render json: @comment }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + show() + click to toggle source +
    + + +
    + +

    Método que muestra el comentario seleccionado. Rutas:

    +
    • +

      GET /comments/:comment_id

      +
    • +

      GET /comments/:comment_id.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 29
+def show
+  @comment = Comment.find(params[:id])
+
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @comment }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + update() + click to toggle source +
    + + +
    + +

    Método que actualiza el comentario editado. Rutas:

    +
    • +

      PUT /comments/:id

      +
    • +

      PUT /comments/:id.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 81
+def update
+  @comment = current_user.comments.find(params[:id])
+  @site = @comment.site
+
+  respond_to do |format|
+    if @comment.update_attributes(params[:comment])
+      format.html { redirect_to site_path(@site), 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
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/doc/app/CommentsHelper.html b/doc/app/CommentsHelper.html new file mode 100644 index 0000000..bfebd8f --- /dev/null +++ b/doc/app/CommentsHelper.html @@ -0,0 +1,157 @@ + + + + + + +module CommentsHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module CommentsHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/PlanetController.html b/doc/app/PlanetController.html new file mode 100644 index 0000000..c3d8e96 --- /dev/null +++ b/doc/app/PlanetController.html @@ -0,0 +1,399 @@ + + + + + + +class PlanetController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class PlanetController

    + +
    + +

    PlanetController ilustra el uso de +RDoc. La documentación de un proyecto en genera en el +directorio proy/doc en formato Web con

    + +
    $proy> rake doc:app
    + +

    Algunos comandos de formateo

    + +

    Tal y como muestra el subitulo anterior, este se define empezando la línea +con ==. En los títulos debe empezar por =.

    + +

    Un [ … ] seguido de texto define una lista titulada, como aquí

    +
    Clases, Módulos o Métodos +
    +

    Se documentan con comentarios justo encima de sus definición, como aquí.

    +
    + +

    Un * o - definen las entradas de una lista itemizada

    + + +

    Un número o letra seguido de punto genera una lista númerada

    +
    1. +

      + permite generar negrita, igual que con +HTML

      +
    2. +

      _ permite generar cursiva, igual que con HTML

      +
      • +

        permite generar letra de teletipo, igual que con +HTML

        +
      +
    + +

    Qué hace este controlador

    + +

    El controlador de planet es en gran parte un controlador de prueba con +acciones vacías. Sólo hay un método con una acción completa, search. Esta +acción busca los sitios o viajes que tengan en su nombre o en su +descripción la cadena de texto introducida.

    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + author() + click to toggle source +
    + + +
    + +

    Método que define una acción vacía del controlador. Ruta:

    +
    • +

      GET /planet/author

      +
    + + + +
    + 
    # File app/controllers/planet_controller.rb, line 44
+def author
+end
    +
    + +
    + + + + +
    + + +
    + +
    + contact() + click to toggle source +
    + + +
    + +

    Método que define una acción vacía del controlador. Ruta:

    +
    • +

      GET /planet/contact

      +
    + + + +
    + 
    # File app/controllers/planet_controller.rb, line 34
+def contact
+end
    +
    + +
    + + + + +
    + + +
    + +
    + ejemplo() + click to toggle source +
    + + +
    + +

    Método que define una acción vacía del controlador. Ruta:

    +
    • +

      GET /planet/ejemplo

      +
    + + + +
    + 
    # File app/controllers/planet_controller.rb, line 39
+def ejemplo
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Método que define una acción vacía del controlador. Ruta:

    +
    • +

      GET /planet/index

      +
    + + + +
    + 
    # File app/controllers/planet_controller.rb, line 29
+def index
+end
    +
    + +
    + + + + +
    + + +
    + +
    + search() + click to toggle source +
    + + +
    + +

    Método que permite buscar por nombre y descripción sitios y viajes. Ruta:

    +
    • +

      GET /planet/search

      +
    + + + +
    + 
    # File app/controllers/planet_controller.rb, line 49
+def search
+  search = "%#{params[:search]}%"
+  @sites = Site.find(:all, :conditions => ['name LIKE ? or description LIKE ?', search, search])
+  @trips = Trip.find(:all, :conditions => ['name LIKE ? or description LIKE ?', search, search])
+
+  respond_to do |format|
+    format.html
+    format.json { render json: @sites }
+    format.json { render json: @trips }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/doc/app/PlanetHelper.html b/doc/app/PlanetHelper.html new file mode 100644 index 0000000..4f02ec7 --- /dev/null +++ b/doc/app/PlanetHelper.html @@ -0,0 +1,157 @@ + + + + + + +module PlanetHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module PlanetHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/Site.html b/doc/app/Site.html new file mode 100644 index 0000000..b55d708 --- /dev/null +++ b/doc/app/Site.html @@ -0,0 +1,173 @@ + + + + + + +class Site - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class Site

    + +
    + +

    Qué define este modelo

    + +

    El modelo de site define un sitio, un emplazamiento en alguna parte del +mundo que se añade por su interés turístico, especificando su tipo. Un +sitio pertenece al usuario que lo ha creado y al tipo en el que se enmarca. +Sólo el usuario que lo ha creado podrá editarlo o borrarlo. Un sitio puede +ser parte de muchos viajes definido como una visita. Además puede tener +comentarios que añadan los usuarios y una imagen que lo identifique. +Obligatoriamente un sitio tiene que tener un nombre y un tipo.

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/SitesController.html b/doc/app/SitesController.html new file mode 100644 index 0000000..b17f3a8 --- /dev/null +++ b/doc/app/SitesController.html @@ -0,0 +1,494 @@ + + + + + + +class SitesController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class SitesController

    + +
    + +

    Qué hace este controlador

    + +

    El controlador de sites gestiona todo lo relacionado con la creación, +edición y eliminación de sitios. Trabaja con Devise para identificar cada +sitio con el usuario que lo creó. Tiene dos filtros:

    +
    • +

      Uno para ejecutar las acciones sólo si antes se ha iniciado sesión. Este +filtro no afecta a las acciones index y show.

      +
    • +

      Otro para ejecutar el método que define la acción count_visita después de +la carga de la página.

      +
    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + create() + click to toggle source +
    + + +
    + +

    Método que crea el nuevo sitio. Rutas:

    +
    • +

      POST /sites

      +
    • +

      POST /sites.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 63
+def create
+  @site = current_user.sites.build(params[:site]) # Asigna solo si sitio asociado a current_user
+  
+  respond_to do |format|
+    if @site.save
+      format.html { redirect_to @site, notice: 'Site was successfully created.' }
+      format.json { render json: @site, status: :created, location: @site }
+    else
+      format.html { render action: "new" }
+      format.json { render json: @site.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + destroy() + click to toggle source +
    + + +
    + +

    Método que permite eliminar un sitio. Rutas:

    +
    • +

      DELETE /sites/:id

      +
    • +

      DELETE /sites/:id.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 97
+def destroy
+  @site = current_user.sites.find(params[:id])  # busca solo en sitios asociados a current_user
+  @site.destroy
+
+  respond_to do |format|
+    format.html { redirect_to sites_url }
+    format.json { head :no_content }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + edit() + click to toggle source +
    + + +
    + +

    Método que permite editar el sitio seleccionado. Ruta:

    +
    • +

      GET /sites/:id/edit

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 56
+def edit
+  @site = current_user.sites.find(params[:id])  # busca solo en sitios asociados a current_user
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Este método muestra todos los sitios si no se ha especificado un tipo o los +sitios de un tipo determinado. Rutas:

    +
    • +

      GET /sites

      +
    • +

      GET /sites.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 16
+def index
+  if params[:type_id].nil? or params[:type_id].empty?
+    @sites = Site.all            # path: /sites
+  else
+    @sites = Type.find(params[:type_id]).sites  # path: /types/:type_id/sites
+  end
+  
+  respond_to do |format|
+    format.html # index.html.erb
+    format.json { render json: @sites }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + new() + click to toggle source +
    + + +
    + +

    Método que permite modificar un nuevo sitio. Rutas:

    +
    • +

      GET /sites/new

      +
    • +

      GET /sites/new.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 45
+def new
+  @site = current_user.sites.build # crea sitio vacio asociado a current_user
+  
+  respond_to do |format|
+    format.html # new.html.erb
+    format.json { render json: @site }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + show() + click to toggle source +
    + + +
    + +

    Método que muestra el sitio seleccionado. Rutas:

    +
    • +

      GET /sites/:id

      +
    • +

      GET /sites/:id.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 32
+def show
+  @site = Site.find(params[:id])
+  @comment = current_user.comments.build if current_user
+
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @site }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + update() + click to toggle source +
    + + +
    + +

    Método que actualiza el sitio editado. Rutas:

    +
    • +

      PUT /sites/:id

      +
    • +

      PUT /sites/:id.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 80
+def update
+  @site = current_user.sites.find(params[:id])  # busca solo en sitios asociados a current_user 
+  
+  respond_to do |format|
+    if @site.update_attributes(params[:site])
+      format.html { redirect_to @site, notice: 'Site was successfully updated.' }
+      format.json { head :no_content }
+    else
+      format.html { render action: "edit" }
+      format.json { render json: @site.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/doc/app/SitesHelper.html b/doc/app/SitesHelper.html new file mode 100644 index 0000000..4e08fe9 --- /dev/null +++ b/doc/app/SitesHelper.html @@ -0,0 +1,157 @@ + + + + + + +module SitesHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module SitesHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/Trip.html b/doc/app/Trip.html new file mode 100644 index 0000000..f73b43d --- /dev/null +++ b/doc/app/Trip.html @@ -0,0 +1,169 @@ + + + + + + +class Trip - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class Trip

    + +
    + +

    Qué define este modelo

    + +

    El modelo de trips define los viajes que se pueden hacer. Cada viaje +pertenece a un usuario determinado e incluye una serie de visitas (una +serie de sitios a los que se pretende ir a una hora determinada).

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/TripsController.html b/doc/app/TripsController.html new file mode 100644 index 0000000..07a83a7 --- /dev/null +++ b/doc/app/TripsController.html @@ -0,0 +1,484 @@ + + + + + + +class TripsController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class TripsController

    + +
    + +

    Qué hace este controlador

    + +

    El controlador de trips gestiona todo lo relacionado con la creación, +edición y eliminación de viajes. Trabaja con Devise para identificar cada +viaje con el usuario que lo creó y con visits, que componen un viaje. Tiene +un filtro para ejecutar las acciones sólo si antes se ha iniciado sesión. +Este filtro no afecta a las acciones index y show.

    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + create() + click to toggle source +
    + + +
    + +

    Método que crea el nuevo viaje. Rutas:

    +
    • +

      POST /trips

      +
    • +

      POST /trips.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 57
+def create
+  @trip = current_user.trips.build(params[:trip])
+
+  respond_to do |format|
+    if @trip.save
+      format.html { redirect_to @trip, notice: 'Trip was successfully created.' }
+      format.json { render json: @trip, status: :created, location: @trip }
+    else
+      format.html { render action: "new" }
+      format.json { render json: @trip.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + destroy() + click to toggle source +
    + + +
    + +

    Método que permite eliminar un viaje. Rutas:

    +
    • +

      DELETE /trips/:id

      +
    • +

      DELETE /trips/:id.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 91
+def destroy
+  @trip = current_user.trips.find(params[:id])
+  @trip.destroy
+
+  respond_to do |format|
+    format.html { redirect_to trips_url }
+    format.json { head :no_content }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + edit() + click to toggle source +
    + + +
    + +

    Método que permite editar el viaje seleccionado. Ruta:

    +
    • +

      GET /trips/:id/edit

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 50
+def edit
+  @trip = current_user.trips.find(params[:id])
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Método que muestra todos los viajes. Rutas:

    +
    • +

      GET /trips

      +
    • +

      GET /trips.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 14
+def index
+  @trips = Trip.all
+
+  respond_to do |format|
+    format.html # index.html.erb
+    format.json { render json: @trips }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + new() + click to toggle source +
    + + +
    + +

    Método que permite modificar un nuevo viaje. Rutas:

    +
    • +

      GET /trips/new

      +
    • +

      GET /trips/new.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 39
+def new
+  @trip = current_user.trips.build
+
+  respond_to do |format|
+    format.html # new.html.erb
+    format.json { render json: @trip }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + show() + click to toggle source +
    + + +
    + +

    Método que muestra el viaje seleccionado. Rutas:

    +
    • +

      GET /trips/:id

      +
    • +

      GET /trips/:id.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 26
+def show
+  @trip = Trip.find(params[:id])
+  @visit = @trip.visits.build
+
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @trip }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + update() + click to toggle source +
    + + +
    + +

    Método que actualiza el viaje editado. Rutas:

    +
    • +

      PUT /trips/:id

      +
    • +

      PUT /trips/:id.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 74
+def update
+  @trip = current_user.trips.find(params[:id])
+
+  respond_to do |format|
+    if @trip.update_attributes(params[:trip])
+      format.html { redirect_to @trip, notice: 'Trip was successfully updated.' }
+      format.json { head :no_content }
+    else
+      format.html { render action: "edit" }
+      format.json { render json: @trip.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/doc/app/TripsHelper.html b/doc/app/TripsHelper.html new file mode 100644 index 0000000..12597fd --- /dev/null +++ b/doc/app/TripsHelper.html @@ -0,0 +1,157 @@ + + + + + + +module TripsHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module TripsHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/Type.html b/doc/app/Type.html new file mode 100644 index 0000000..cefcd8c --- /dev/null +++ b/doc/app/Type.html @@ -0,0 +1,172 @@ + + + + + + +class Type - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class Type

    + +
    + +

    Qué define este modelo

    + +

    El modelo de types define los tipos o categorías en los que se puede +clasificar cada sitio. Un tipo agrupa a varios sitios que comparten unas +caracterícas determinadas (como por ejemplo estar en medio de la naturaleza +o ser un edificio histórico). Un tipo tiene que tener obligatoriamente un +nombre y una descripción, pero no pueden existir dos sitios con el mismo +nombre.

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/TypesController.html b/doc/app/TypesController.html new file mode 100644 index 0000000..70b9971 --- /dev/null +++ b/doc/app/TypesController.html @@ -0,0 +1,524 @@ + + + + + + +class TypesController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class TypesController

    + +
    + +

    Qué hace este controlador

    + +

    El controlador de tipos gestiona todo lo relacionado con la creación, +edición y eliminación de tipos. Cualquier usuario puede realizar acciones +sobre los tipos.

    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + create() + click to toggle source +
    + + +
    + +

    Método que crea el nuevo tipo. Rutas:

    +
    • +

      POST /types

      +
    • +

      POST /types.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 63
+def create
+  @type = Type.new(params[:type])
+
+  respond_to do |format|
+    if @type.save
+      format.html { redirect_to @type, notice: 'Type was successfully created.' }
+      format.json { render json: @type, status: :created, location: @type }
+    else
+      format.html { render action: "new" }
+      format.json { render json: @type.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + destroy() + click to toggle source +
    + + +
    + +

    Método que permite eliminar un tipo. Rutas:

    +
    • +

      DELETE /types/:id

      +
    • +

      DELETE /types/:id.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 97
+def destroy
+  @type = Type.find(params[:id])
+  @type.destroy
+
+  respond_to do |format|
+    format.html { redirect_to types_url }
+    format.json { head :no_content }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + edit() + click to toggle source +
    + + +
    + +

    Método que permite editar el tipo seleccionado. Ruta:

    +
    • +

      GET /types/:id/edit

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 56
+def edit
+  @type = Type.find(params[:id])
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Método que muestra todos los tipos. Rutas:

    +
    • +

      GET /types

      +
    • +

      GET /types.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 9
+def index
+  @types = Type.all
+
+  respond_to do |format|
+    format.html # index.html.erb
+    format.json { render json: @types }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + new() + click to toggle source +
    + + +
    + +

    Método que permite modificar un nuevo tipo. Rutas:

    +
    • +

      GET /types/new

      +
    • +

      GET /types/new.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 45
+def new
+  @type = Type.new
+
+  respond_to do |format|
+    format.html # new.html.erb
+    format.json { render json: @type }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + ordered_index() + click to toggle source +
    + + +
    + +

    Este método define una acción que muestra todos los tipos por orden +alfabético. Rutas:

    +
    • +

      GET /types/ordered_index

      +
    • +

      GET /types/ordered_index.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 33
+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
    +
    + +
    + + + + +
    + + +
    + +
    + show() + click to toggle source +
    + + +
    + +

    Método que muestra el tipo seleccionado. Rutas:

    +
    • +

      GET /types/:id

      +
    • +

      GET /types/:id.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 21
+def show
+  @type = Type.find(params[:id])
+
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @type }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + update() + click to toggle source +
    + + +
    + +

    Método que actualiza el tipo editado. Rutas:

    +
    • +

      PUT /types/:id

      +
    • +

      PUT /types/:id.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 80
+def update
+  @type = Type.find(params[:id])
+
+  respond_to do |format|
+    if @type.update_attributes(params[:type])
+      format.html { redirect_to @type, notice: 'Type was successfully updated.' }
+      format.json { head :no_content }
+    else
+      format.html { render action: "edit" }
+      format.json { render json: @type.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/doc/app/TypesHelper.html b/doc/app/TypesHelper.html new file mode 100644 index 0000000..3ea694b --- /dev/null +++ b/doc/app/TypesHelper.html @@ -0,0 +1,157 @@ + + + + + + +module TypesHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module TypesHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/User.html b/doc/app/User.html new file mode 100644 index 0000000..5ed07e6 --- /dev/null +++ b/doc/app/User.html @@ -0,0 +1,172 @@ + + + + + + +class User - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class User

    + +
    + +

    Qué define este modelo

    + +

    El modelo de users define los usuarios de esta página web. Cada persona +debe crearse un usario que le identifique dentro de la página web, +especificando un nombre, una contraseña para evitar accesos indeseados y la +suplantación de su identidad y un correo para recibir avisos y recuperar la +contraseña. Un usuario es dueño de todos los sitios, comentarios y viajes +que haya creado, y como tal sólo él podrá editarlos o borrarlos.

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/Visit.html b/doc/app/Visit.html new file mode 100644 index 0000000..faac23b --- /dev/null +++ b/doc/app/Visit.html @@ -0,0 +1,168 @@ + + + + + + +class Visit - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class Visit

    + +
    + +

    Qué define este modelo

    + +

    El modelo de visits define las visitas que componen cada viaje, es decir, +los sitios que se desean visitar en dicho viaje.

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/VisitsController.html b/doc/app/VisitsController.html new file mode 100644 index 0000000..978bd52 --- /dev/null +++ b/doc/app/VisitsController.html @@ -0,0 +1,484 @@ + + + + + + +class VisitsController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class VisitsController

    + +
    + +

    Qué hace este controlador

    + +

    El controlador de tipos gestiona todo lo relacionado con la creación, +edición y eliminación de tipos. Como las visitas se renderizan con los +viajes, se controla indirectamente qué usuario realiza estas acciones.

    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + create() + click to toggle source +
    + + +
    + +

    Método que crea la nueva visita. Rutas:

    +
    • +

      POST /visits

      +
    • +

      POST /visits.js

      +
    • +

      POST /visits.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 52
+def create
+  @visit = Visit.new(params[:visit])
+
+  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" }
+      format.json { render json: @visit.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + destroy() + click to toggle source +
    + + +
    + +

    Método que permite eliminar una visita. Rutas:

    +
    • +

      DELETE /visits/1

      +
    • +

      DELETE /visits/1.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 87
+def destroy
+  @visit = Visit.find(params[:id])
+  @visit.destroy
+
+  respond_to do |format|
+    format.html { redirect_to @visit.trip }
+    format.json { head :no_content }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + edit() + click to toggle source +
    + + +
    + +

    Método que permite editar la visita seleccionada. Ruta:

    +
    • +

      GET /visits/1/edit

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 44
+def edit
+  @visit = Visit.find(params[:id])
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Método que muestra todos las visitas. Rutas:

    +
    • +

      GET /visits

      +
    • +

      GET /visits.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 9
+def index
+  @visits = Visit.all
+
+  respond_to do |format|
+    format.html # index.html.erb
+    format.json { render json: @visits }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + new() + click to toggle source +
    + + +
    + +

    Método que permite modificar una nueva visita. Rutas:

    +
    • +

      GET /visits/new

      +
    • +

      GET /visits/new.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 33
+def new
+  @visit = Visit.new
+
+  respond_to do |format|
+    format.html # new.html.erb
+    format.json { render json: @visit }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + show() + click to toggle source +
    + + +
    + +

    Método que muestra la visita seleccionada. Rutas:

    +
    • +

      GET /visits/1

      +
    • +

      GET /visits/1.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 21
+def show
+  @visit = Visit.find(params[:id])
+
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @visit }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + update() + click to toggle source +
    + + +
    + +

    Método que actualiza la visita editada. Rutas:

    +
    • +

      PUT /visits/1

      +
    • +

      PUT /visits/1.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 70
+def update
+  @visit = Visit.find(params[:id])
+
+  respond_to do |format|
+    if @visit.update_attributes(params[:visit])
+      format.html { redirect_to @visit.trip, notice: 'Visit was successfully updated.' }
+      format.json { head :no_content }
+    else
+      format.html { render action: "edit" }
+      format.json { render json: @visit.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/doc/app/VisitsHelper.html b/doc/app/VisitsHelper.html new file mode 100644 index 0000000..83b4cf3 --- /dev/null +++ b/doc/app/VisitsHelper.html @@ -0,0 +1,157 @@ + + + + + + +module VisitsHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module VisitsHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/doc/app/created.rid b/doc/app/created.rid new file mode 100644 index 0000000..399944d --- /dev/null +++ b/doc/app/created.rid @@ -0,0 +1,22 @@ +Wed, 25 Apr 2012 15:19:33 +0200 +doc/README_FOR_APP Sat, 31 Mar 2012 14:34:22 +0200 +app/controllers/application_controller.rb Sat, 31 Mar 2012 14:34:22 +0200 +app/controllers/comments_controller.rb Wed, 25 Apr 2012 13:03:23 +0200 +app/controllers/planet_controller.rb Tue, 24 Apr 2012 18:27:26 +0200 +app/controllers/sites_controller.rb Tue, 24 Apr 2012 18:29:50 +0200 +app/controllers/trips_controller.rb Wed, 25 Apr 2012 13:49:49 +0200 +app/controllers/types_controller.rb Tue, 24 Apr 2012 18:32:24 +0200 +app/controllers/visits_controller.rb Tue, 24 Apr 2012 18:34:10 +0200 +app/helpers/application_helper.rb Sat, 31 Mar 2012 14:34:22 +0200 +app/helpers/comments_helper.rb Tue, 10 Apr 2012 19:11:02 +0200 +app/helpers/planet_helper.rb Sat, 31 Mar 2012 14:34:22 +0200 +app/helpers/sites_helper.rb Sat, 31 Mar 2012 14:34:22 +0200 +app/helpers/trips_helper.rb Tue, 17 Apr 2012 19:06:38 +0200 +app/helpers/types_helper.rb Sat, 31 Mar 2012 14:34:22 +0200 +app/helpers/visits_helper.rb Tue, 17 Apr 2012 19:29:36 +0200 +app/models/comment.rb Tue, 24 Apr 2012 18:14:16 +0200 +app/models/site.rb Wed, 25 Apr 2012 14:31:32 +0200 +app/models/trip.rb Sat, 21 Apr 2012 14:53:58 +0200 +app/models/type.rb Sat, 21 Apr 2012 14:56:32 +0200 +app/models/user.rb Sat, 21 Apr 2012 14:59:36 +0200 +app/models/visit.rb Sat, 21 Apr 2012 15:01:30 +0200 diff --git a/doc/app/doc/README_FOR_APP.html b/doc/app/doc/README_FOR_APP.html new file mode 100644 index 0000000..a6bb752 --- /dev/null +++ b/doc/app/doc/README_FOR_APP.html @@ -0,0 +1,123 @@ + + + + + + +README_FOR_APP - Rails Application Documentation + + + + + + + + + + + + + + + + +
    + +

    Use this README file to introduce your application and point to useful +places in the API for learning more. Run “rake doc:app” to generate API +documentation for your models, controllers, helpers, and libraries.

    + +
    + + + + + diff --git a/doc/app/images/add.png b/doc/app/images/add.png new file mode 100644 index 0000000000000000000000000000000000000000..6332fefea4be19eeadf211b0b202b272e8564898 GIT binary patch literal 733 zcmV<30wVp1P)9VHk(~TedF+gQSL8D5xnVSSWAVY>J9b+m>@{iq7_KE}go~11+5s4;8hc+i0Xa zI1j@EX5!S+Me6HNqKzU5YQwL;-W5$p%ZMKMeR<%zp69-~?<4?8|C8S?bklXr4v&Ov zb&06v2|-x?qB`90yn>Qi%Sh2^G4n)$ZdyvTPf9}1)_buUT7>`e2G&2VU@~Bb(o+Mz zi4)>IxlSY${Dj4k={-9RzU^W5g9|2V5RZ2ZulL9s2xQbZ@r6eP9Ra5u(s|C0Nj#&4>wTSkb?%#=9?@ z^oxDy-O@tyN{L@by(WWvQ3%CyEu8x{+#Jb4-h&K9Owi)2pgg+heWDyked|3R$$kL@A z#sp1v-r+=G4B8D6DqsDH0@7OztA7aT9qc1Py{()w`m``?Y0&gi2=ROcc-9+nU^I6< zT=e_Y=vSnG@?3Ue{BW5ONFttcE!R-R_W4O01|0-|K-YNXLo2`4Qv z`r1LxR6#yf3FB%T95gJnaKKivA~Z}S9A(ZxEDK}O3T04USJ P00000NkvXXu0mjf^IS-S literal 0 HcmV?d00001 diff --git a/doc/app/images/brick.png b/doc/app/images/brick.png new file mode 100644 index 0000000000000000000000000000000000000000..7851cf34c946e5667221e3478668503eb1cd733f GIT binary patch literal 452 zcmV;#0XzPQP)Pdwe5?6tW?r-ok|b$oDQj8FV%kZPq;(MWOV8?8;<)(iP}>hNMU> z7fbz%jjlr7h8uuoQ~J6}n}@Y@PdTk=)PxO{%7zmL?dchpZX*~n;I{!C>*(8cU;q(~ zAS%Po_@naEU!xidrBXD?;hN|x^%W|Ij)0y*r5vi|?W&Fub(NqJ@z0o=O&SR3v>A``^efOSo-hEdApp;^Jd;9y!%1UfzX6Bh- z%-mbG|0Na{7Ruai_Y+DEb1s+b!*9k%Q!whMxjtZKA*?o;i1g&jy0@( zaU=-@d-h+o%gal6JRXEXA&L3`d2 z%jIxzZ~*p9O-;EJp_Ds0If38rM<5W8ic~K>FOK&2_p!CLg^i63OioVb6k$)zWHLx3 z5;!|M!}<9+#QSi1dRlbEcxPt^;cysUuU8@%3}RwpLRIGG<|IKnoyP6$Eh3SKw7a*r zSDXP=IYc&YZf;7@?fCe($^l9ORaJ3wbAx0uiC8QqRr$2t-Cfy8%XCI3B%pxJW>XdM zw~zPt_s}#A@pxQ5Ly)4szaMtH9lgE1SXx@b+S(fW`ub$fYPE8J7#bSNDzme*Ub07{ zQKV8SjEs!%0@v5ql8ggm!@$6Rbi^E8vBqpRM-}l+@5OSMrl+TWj*gC^qoV@>u{fQb zov5v?g~?>X@bEC&+uLPaQ&Ypn-y~^mZA}+f(&2EFH8eE%dU|@ENpN*_1-)L6_4Rc* zFuq@`IjX9vp1QiaK9ZojyZhnQURP99d=u;%37VRkpwsD4U0sd3x;hEQB&e^i|3QN0 z=H|Os1fRqaw!?#igLmS4HE!G3*ce(`TF} zlgUq0Q544c8(ae&UR$8ps&snq6^bPY3v3xAmMW74Di$h~GCH6E3TaYs2#6A<7K*gC z777H71_Wa;(dfp+g-drPCSWu)#PInZi72LJ;o?i~$-U=y&UbQ89Dul3%3P+Axkzc* zbH-y;QF=hR{qLItf%ci2_&e5wNo0gnVatG?ul6Zw=o$I9Ljfn*ic3`U?>IfEim3g{ zujU&$-hy6wn;w(xme|zJm;lWJxtTFfM)q0`kX!Vu0+d${$}LCddK1<^htTe-fUYL3 zB`SdNsZD>RgvLj1<^@h6_+cDRK2Brcr2~>%$*5S)hyV33PV^teac3%|4lz@8p4?)5 z?t5o^?q+%^%)Yygo~I^U4VR!bTnWuE35hcWrfCDR3q+sxJ79e7Fg`&)RCqLA^2^y^ z0laVfadW90_Fz8Brm|r47sB^u1VgI>kanj)Z4`zMSfHlm8>CwXa$JVM`$2RrmZB-3 zN10m-!;BvH*Br3V8t`DH7m`jf#2upVDXl{5ff18_pzCPK1Zu$$CKKvd8FGeFf)+K<|x33pc7P&S#3GZT4mEw;nr(Ze*F z3&*?-4U-lm*#tber5 z%S_ceqB`b3ko6r~BbvDwdohTvP(3a(pq{x#T$yQsu#OKwEe}KuH^Mh@nxg_(Nw136 zq#a^3xNBke)In+!?qk3%4wB69{pF`Tzg`07*qoM6N<$ Eg55P&8UO$Q literal 0 HcmV?d00001 diff --git a/doc/app/images/bullet_black.png b/doc/app/images/bullet_black.png new file mode 100644 index 0000000000000000000000000000000000000000..57619706d10d9736b1849a83f2c5694fbe09c53b GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-$h^>lFz(Kw&{<9vg>5sw~gS5O!4 zr|{HuUFIBKiQyL}eBJ-L{`UVT|6_O~L{G%N{Wbre{kQtZ_0LvEhC#5QQ<|d}62BjvZR2H60wE-$h^mK6y(Kw&{<9vg>(S^W+6Zii9 z|Nhthr~iNb*Z!}6uiN$Dz5neG3a-`baBX8yz1H+_;eX)`ni0%X8XBDc-`=Ph(Uan2 zYsR{H!kvIN--9isvHznRsC#5QQ<|d}62BjvZR2H60wE-$h_H=O!(Kw&{<9vg>(S^W+6Zii9 z|Nhthr~iNb*Z!}6uiN$Dz5neG3a-`baBX8yz4q@v|B?28{s)#N@CGn3@%_y|zAV9T z66e<&B4?b6oF&azg|C(V&1ZbI_D}pL`}(^FT2yXwG1Ph~$Q@h8mJYOz!PC{xWt~$( F699+YQR)By literal 0 HcmV?d00001 diff --git a/doc/app/images/date.png b/doc/app/images/date.png new file mode 100644 index 0000000000000000000000000000000000000000..783c83357fdf90a1c7c024358e1d768b5c09c135 GIT binary patch literal 626 zcmV-&0*(ENP)5OC%H;f`~O(q$Q#t2<^v$A>fbmv%e#dKTwK=Ku{5lS|}<-`a#7b zzTCOnnT>at)D}AMFuOZ5&%EqFN(lyumd$2ASF6=;nM~%2?gqc@U=#|4PqkX@EBo-9 z7pD#bO_RUa>*faM`8;MYfVi$JnB-zcBFc6gjl$d!bF98Q!!!(Z1_R~P?e!pt#6CHJ9S&n_n&@=9 z%GP;!@Co4c*at+6vNz7o(6en^Q1%qHrc;1)9IRaz-$@S$Z-qdC^ds3X0NvQH;KS)D z-dh&rW&@X;1cS(45z)J&BVt+tv&GMVJ%!EiW) zLBGZW)#Z+gl-Lih&?>X3SS-S#ujQ;9JRXmIB7X)8`d6ETj)D#Q2+$s|<_b7-B9Xvq zwNfqlEp%y3$uY`h{Y$(Gn5@}sqEsq95lpAkFO5dyBmP6^H-51G4J|rN2Ujt<`2YX_ M07*qoM6N<$fC4}Mrzlg<+1Y8PEBfUp0jJpx4B>@E+cy3`^(Gw`Mf+2&yxZm<$to~Vpgvg&QKNR z_f#1(r6svZt%iF?s+n<8X?B&!h3g9Dbb8_=MX}!;HiQSAh`bp^WMl~Z-44teO7W_Y zV4thSL{h;rJY7!l3%5J4H1!tIzB`Dv+YxO(haWeausGZYkI8^hWj6mzo=L0{%;yxzh{5!Htr?51 zvG|W62MzC8BZ76hRpCyO2zOn<%e)K>NHge!-~)Ap33OdWw6hsLYbCxGNt0%wk_2z7 zfyYvXheSG)5HRK1VB~%mq7Dmurw#bi@hEcOr3&G1ZiF*$M=&9nB#VNf&Q^r$4G5kp zTURh&s)E0%5&hyVD}sp<72~zmAY`Y(9aqO6CXF%=zFHGzO-A&I(pE}v70YQxCPJ{Y z4L+?5-crdLn3ZRPEs!A4ehEY3ZRpL~w9>@aMN+{F4dI@v&>(QDHQum!mG~E^$OS8l z!7?%Uwib*ROP67Hw`ika)gX-(8Ia`-u_IEhxG7U<13kSsMW+$lbb2dUMm5p6pa}cjgA+U$^mJ^AjD?&bdi)8~y+Q002ovPDHLkV1g8IMc@Dc literal 0 HcmV?d00001 diff --git a/doc/app/images/find.png b/doc/app/images/find.png new file mode 100644 index 0000000000000000000000000000000000000000..1547479646722bda4647df52cf3e8bc9b77428c6 GIT binary patch literal 659 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 Dl)1NK literal 0 HcmV?d00001 diff --git a/doc/app/images/macFFBgHack.png b/doc/app/images/macFFBgHack.png new file mode 100644 index 0000000000000000000000000000000000000000..c6473b324ee1dae1faaacc0826639833f551116c GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIEX7WqAsj$Z!;#Vf4nJ za0`Jjl>Qs8<JF;+Fd5q0wCR k?u=~bH}2*0f`J3~k>FVdQ&MBb@0BAfpf&c&j literal 0 HcmV?d00001 diff --git a/doc/app/images/package.png b/doc/app/images/package.png new file mode 100644 index 0000000000000000000000000000000000000000..da3c2a2d74bab159ba0f65d7db601768258afcb2 GIT binary patch literal 853 zcmV-b1FHOqP)5TQ^(M5v$(QKVE?W+9X! z*o}&~6c?_FreF)9NJB7b5Nbn{G0n4+%uJhR9(V5R|NFTpb|HgjefT!tIhLx@DR+N) zV+fHiR5Yt19}k|KnCsND{tH-`IMJ)3AE?OtyZ4>Un|6(d%h#JK`i&a7^xW9>`yBy` zS4SOHeOpC7$?hH5-#7Rswiue_8Ju*2N@$58=a#2OTA3png`w3v->gWif7t%e$ z$NLVS!tFT#8WL|Wa&K~+{%4P2cRfwesYV1_!F=3OaRVHl(>=`%&{x*s30c}#CNE@&;ItrAv!f!)Oy$Q9t$uS=(sD$-J{T*^(8Eez1E-l3}} zPrfHZ1`qsIFe&gipuL8-IZbo2Yg{lFGKs?ZZWcOaOdk*3`5T;$?AjbG1#`B510Er^h2)2r3Y{!8_2Gj=$KzuN5 zaErtW8W_Y2iJJjY)5pmTVJoPJYpanPOEuYHclM^C1F>${hFRpdi8a<2H|Xudf78bm(zwJ9`K%6I?q*Ua~ fW9JvIbn5*B+_J)rUMBs>00000NkvXXu0mjfH&TkY literal 0 HcmV?d00001 diff --git a/doc/app/images/page_green.png b/doc/app/images/page_green.png new file mode 100644 index 0000000000000000000000000000000000000000..de8e003f9fb8752c09e7f3655d5d8664b5c62fc3 GIT binary patch literal 621 zcmV-z0+RiSP)QqUjAtB;_Vvt6}AS_5YgM`Uqu`yva+H8^=4U$e4gHb}u zAQ2N{V3A%pO|?Pv?tb6z=jC}SiRa$G^v3q?*6XcYz$p|cq{uLj@#~Fi`J(>5{@&&N zy%T^+;>8cXx%|o77anP?&W1?1A(>-T49z9pyeCl@7YI+Si zKti7=B~``}TImz(G{0PnlQA3P#MAd}sorMjkP!50B7$nAkU^%#nl{Q9lW0@}9fE-> zN(q7tRuiC_T1r|BBtVBTlQ2+70$Rf;eF`Z;lx46Cpu-rEgb)EBKq(b^W8l<^We(`D z43?0=01z<3G6+UUv6`CsWCk6^93!#+<;ws7007{zS3k2k9-zZKFO~(k`>s0y006+1 zgF_jyIhsL-`FMf~JL~C=cV75(CrJ|q;MVO961G=O zm9d)YpJg5g(4i_HKL75eSE}mq$Y}r}hyVdcV~p>6a}oXr80q`oj%+s700000NkvXX Hu0mjfPs|!l literal 0 HcmV?d00001 diff --git a/doc/app/images/page_white_text.png b/doc/app/images/page_white_text.png new file mode 100644 index 0000000000000000000000000000000000000000..813f712f726c935f9adf8d2f2dd0d7683791ef11 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-%6;pyTSA|c6o&@eC9QG)Hj&ExYL zO&oVL^)+cM^qd@ApywS>pwx0H@RDN}hq;7mU-SKczYQ-hnrr=;iDAQMZQ+*g=YOM= z!QlMQEn7FbaD->uKAYgo_j9)W&$$zS*W9}m(ey0q$&7l-XEWO0Y(9M=SnhLbwy;d>@~SY$Ku*0xPvIOQeV1x7u_z-2-X>_74(yfh7C znXL|3GZ+d2`3re2hs?MKC#5QQ<|d}62BjvZR2H60wE-$R?&;zfqH(@;q9b3Efq-lM(nr^( z=EYR73-9e)UYMWsXy%?aZsD68Yyv^2$~6QgEcljw%kx>O(f-gQ?@fOOx3A-0+Qw?O zRx~W)kn~Qe2d6f9nMG#g9Q04Mk==M~N!Dglvxk!fgVh#w@ZV$IY1+Xc`d{d2UcaP~ zfWp)_Ivqj}l2SPy^9ZWy6rG9Yx4v67_uA&&9|XA~5-#3)W3%em1peD8RWH^#O%XoM zxMPud%}GTj#~*+7JMxTd!`{^Q+>(D3*|@KV`*G2;{QnANOxu1$r2xIe;OXk;vd$@? F2>@zac~<}c literal 0 HcmV?d00001 diff --git a/doc/app/images/plugin.png b/doc/app/images/plugin.png new file mode 100644 index 0000000000000000000000000000000000000000..6187b15aec001b7080b51a5f944f07591f26cc15 GIT binary patch literal 591 zcmV-V0eEcNHZMNv|IbJ-M`( zKwWL~opzjJe^WpCmV9E;(0&ut2;4va_(#>M8)>9$R5viQnf(Nkh~VM$y>J(jqb$cj z+nL1Nm|mV)Gm|9MnHf*7Ja4OEAQz__^LRKOLEwqpiGV^^A*T=#&inGm-62Xs;dnSp zKj&H9T*boh2i)W+(n27l!C)>fq|L%VB1i ziC4p;NwV_}ZjW7$LRW#(_bKF#hp=!IqNO26Z*w2+LEwx{PVnZ&Sn}T;mtzb$;qA*nT@@+ zV5uQ@iXDTPoTbV#FRr~z04|PPh`wXTNoCm9*tG&?e3+fYl>K6+&3|Cc$KOpL`ER+_ dcRl5U#9zn6ZO}GFk7R5;7c zlif>`Q5?tj7Yw@ZCMtTF^Q|ZedeJhM%QPCR*bs8V79p$QTo7e94yQNXRs-{0?hOn_-8n0AMO@u1Ts zNl8QzJs1#rz%RBt?ux>l+amAvh+J!{$lkaqv}+Erb-6j2xp>K4GLQnNB*W`hFg*?P z^AL@~(h~Z+wfcWEXHqV^Tq-#z$7Y#o0;yFxA!00F}F2dX# zjE$iOgT#G4*1TR6kB1Gnn@>$meCh2a>c5YuIvFn-R2W@>4@M*m@-|jiDV?b)bccgA zyPfsMM!rjy>+1O2)5Eg29Z_*2p&qGnmS!OH?vZ(4>QB01d>j%9n4QINxkyT(Dos?I zjaWF$*IQmh`SF-?xU%xMEfjq1=6qY*g&lgG_cXv$BGoIWyfO5 zp>pdV*O+y=&6@N2WWFo(%RtT`Q(H^6zn^a%epE~Kx^mEJ{c8`luC$nc*z9j|4Ms8aJK-ladKLpnAK z!yd|CC&>l1b7`m$MH$ScEIP@XgT41O>|DzL{-38CH68OyX#u=G?d7;y&_o&o)f@3U z2(tr%Ok88caOL`xiQA8o;Vzr-$A$SOu6o|$&0DQAJ1Z7?OACaeoy+)PWu&~aueW<| z*KW^(^2}#30u*~<_mXScFNd6U&sxh5*GGMNytZGxkIGqL%v6329^u`FD6T?b?K!4B z@Hzh?O2Au=((Gu;rvgLMt^pS|u1rEkBgC8$oH%zgT`TvZiK#VDrVG?-i~6a_+WZb> zc1>>lb)xcuo^Cl8k%q3c_d*It_Vtj>RSovF&w;hS=6uYrT2e@-@l@P~uBN`zu!v>e zTm(is&jcQ6vuP?|;!e+(n8w)-Xjd!hwk@r2D0i00ygdKo2Xvs?&w_lajj5DHS@9I! z;_&ji2e{!uusGnVn};Pu|dl5x-FhQyC8^-4Uo_;BLiOXzcE z&4PS2TBWSC=hsw0og;z#(mly@Ed2E1E$_VDaM?kloE4ob2XK&K;OS~-nhIGlA4~UZrJu6*|}wi#TT?|yWUH+_&n($t0xta zBwTzSfE)uAw*L0>+`pTps}L-$jIP5Q_E$Am+l|{XfsKr0Vi~`Em?SJQ#0y)8vsxb1 zMdxJl^){_CDwI^}>)Pw${G?Ajc@P}x{Fvhoi0jbY^427?KPmoA_G)sqK}u$2(79Xg zC%}xm5JDcrsm5^vQEQpGEdJDc^yfuNAlqV1pZQVkOSceV<|{=|=@?=o4i_1RFUZth zC7cu<6%V3dVCI}P6DL4iUgTc@&(nXY)ox}HZ z(a#EgiNj%{kjRLL2t?{m_aKN`{5-&u+HAtQ-Qq#@!I@<(M+B3i@|g=LY6 z90tpW!JuMn_Lcy1q7g&LUSuLE3XS}K#P^nHVUmL`L)dbP| z0bt(+Cp#M-bH!LM*DzJ0Lfn;eTBV@|JvGSgpdoc1RhhV>(G-2(vE|>MrVgA9+?+0m4OzUqbT>-U-jg|v zLZMntq`r?fy1UCMh>z2Koi1SL-~N2ZrIf+dZW|;SWszsde}Dl!HOMc1Fa>K9)e&RI z)A?aK zcviCdKDUg_%#u7YAE`A`Y3$(P4&m^@fEWAvjAwVmRWeUnmkrxA;E!fKoc{9Vi=lvFL}KmoS;g* zdjL?Y!VHUFq63aLj6VZE+tHts?Z1pFkiO9^k*5pGpFpU&5#5G4ATd{t>a&9zKBVB9=Ns^HFU|DTGH8C+Xr2UqOU`Zxe)!|%j4=-QojGePq)pRGe;!f)Czk!u3vP_Jxu8(e6 zf4Q`F$Qio2Jw@N*E@k?c`+Sw}AYQjkT+x)OAe6eq(AT!iRuksKQn%Ao_Ac1T-p#Js I_CnHs0qX}mlmGw# literal 0 HcmV?d00001 diff --git a/doc/app/images/tag_green.png b/doc/app/images/tag_green.png new file mode 100644 index 0000000000000000000000000000000000000000..83ec984bd73364134da0f98d27a800c5d3264180 GIT binary patch literal 613 zcmV-r0-F7aP)^5T)AZ%#@G{_P{NCN^P z(J0zvSn~SSm(Ur);-M~8^*;61*VRI`T1BN&LAhK;sZ>I-SVW;vfUfJv=ko^ugnc0x zhJodBxe>iyk3%w<%wC8holUJ4(iv>tL{`DQt zPOsyUbO_Cmc&*iHkqbm3ku`|GcC^OhF>jj9W*GkH;^g!iUVpib_h*=@udp4h(P+e*zL_~ZmJjh(y^BxULwq>9zXoYE8sq{#pN~U0C6!8vY)5N2 z9P*}mw}7X$O^qTtJef1ACWvJT9^wt-)Zh0r~j#0bT`f;-zv6 z^Tmw22!%rMcs!TaUX<-8s;X-B`+Xbo+_uWuFa z1yIPc?DTrQ7KvRhmt*TG|L=EYQ=LqFX;=Lp`4}jx6BE-@00000NkvXXu0mjf=s_29 literal 0 HcmV?d00001 diff --git a/doc/app/images/transparent.png b/doc/app/images/transparent.png new file mode 100644 index 0000000000000000000000000000000000000000..d665e179efd797451084235f105425247fea0a14 GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5X>;M1%mmiTn0pv241o;Is pI6S+N2ITN~x;Tb#$R;N!@B(=T42&&nK2`x)44$rjF6*2UngG277DE64 literal 0 HcmV?d00001 diff --git a/doc/app/images/wrench.png b/doc/app/images/wrench.png new file mode 100644 index 0000000000000000000000000000000000000000..5c8213fef5ab969f03189d4367e32e597e38bd7f GIT binary patch literal 610 zcmV-o0-gPdP)^jb z4`0v}DG1te)wmeb(>p90leRz?_mO+^JKy=v&2<29Od6?F%9%(c8los#f*@G`-%W&* z$)uBj2i@u-@SgX}gtyWPe6d*|w6h%R? zScK2#Yn%$sum0cy>90DmY*i{1XqpClEtktsRTZ)lCUe z<FogV^*tm>8*AlX za4oiR!&85LrobG57qUHUX#{>Vz(RHpB5|@>9O6N$jqB8>%($0wxE5R3)b>Y~xtCo$ zCgEk&A?_#IxHdN)9tqre^o{ho4{?hmPuf@^@I3-wncaRd%|~O3xbrKY=&TiwPYkJroM{;WUQTuMY8vpg}f4o)2%U3C;eEDoiEh?94d(rV57VIF#8VqzW$HrDC|#U`x@QDbgi zVl)t9GGz&YY#D?gc%>hISA+_EBpnXt#pnC`p6@xw0$8TCbULjhlgVx(kuc)%xbgqq zR5+DNDFRN0!y)7Gm}oT0i39}h4h928qY?Rho^UvPGJ#kuW|-Amtrn`Pmd&+bFo@sp z$LI4IQw7BG?|#2ewOS<<3VjL$0=lMY^m;wqZujv5kx1l%Sl;V&Iy4#$ip3&@LV2!7vhhN=PCz%^9v24`qb(+m4W?!q-&~=?ssf5GfnAmJKV;3bvpDm0(NhahZ=&^sqo6Odj6>)Dq_3p~4~ zvb`d3Mydwjt&Df^hVmLtI2x=U&h9(JVYX-!y~z3zi;1>=LY;o(bL$(Yf$lf)dMf0-u^0HrpTG Wk@)HE*94aU0000m+BBgry{~j2fHLegbHP( zrgXNbr0}2;^nywdjLjZe?uxtrd3D(pZH@fFFc0{BW_~jxoO1w7-VX;6vK@ROA$$R6 zEmo;Ht-Mj|>5jUy{bQ^V5@53LRI8AgLpUm|m+15sqcz@QtVSo|oz7ArM8?pIn+>gN z0b=4_b5O|4A*;Q+vc9Vqr~%3V155*NV~@gTz}KSUiKB-uJzjMZ>5%Q#n24H!V{ zTY(LLAE*NAHZ}C#wnj%Bw5OFIkRhkkAW#kDC3j9Wm0YXRaXlyyp>#mVfYG)eC;@ab zDb=T-BCAY4LI(Z@GOTr2V_A{pRwSmz+8Be>CjAw(=gnbVWAeguvZa93JmL(EDxv1m z0OP4q=fpAK1Mq!C2`OkEn37o;m#wF#(t(8Pu#S?2f#x<~4EO{@fmm`p9veD6RZ_jp z@Au4};q&`XuKEYgIiB4((kgxOs#YdqJw0fY>9^K_agEu5+$#k;w#%I2N>n_?)YIqu z`tq&#_^p?-%K*U0^}|7+9U(&k0?s;=r=uCZ%)H9_edH8wK}gB(nUB1FFk+2Ol%BXV zHoFY`D~2x|2 + + + + + +Documentacion de Planet + + + + + + + + + + + + + + + + +

    Esta es la documentación generada para Planet. + + +

    + diff --git a/doc/app/index.html~ b/doc/app/index.html~ new file mode 100644 index 0000000..d1b7d1a --- /dev/null +++ b/doc/app/index.html~ @@ -0,0 +1,116 @@ + + + + + + +Documentacion de Planet + + + + + + + + + + + + + + + + +

    This is the API documentation for Rails Application Documentation. + + +

    + diff --git a/doc/app/js/darkfish.js b/doc/app/js/darkfish.js new file mode 100644 index 0000000..4be722f --- /dev/null +++ b/doc/app/js/darkfish.js @@ -0,0 +1,153 @@ +/** + * + * Darkfish Page Functions + * $Id: darkfish.js 53 2009-01-07 02:52:03Z deveiant $ + * + * Author: Michael Granger + * + */ + +/* Provide console simulation for firebug-less environments */ +if (!("console" in window) || !("firebug" in console)) { + var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", + "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; + + window.console = {}; + for (var i = 0; i < names.length; ++i) + window.console[names[i]] = function() {}; +}; + + +/** + * Unwrap the first element that matches the given @expr@ from the targets and return them. + */ +$.fn.unwrap = function( expr ) { + return this.each( function() { + $(this).parents( expr ).eq( 0 ).after( this ).remove(); + }); +}; + + +function showSource( e ) { + var target = e.target; + var codeSections = $(target). + parents('.method-detail'). + find('.method-source-code'); + + $(target). + parents('.method-detail'). + find('.method-source-code'). + slideToggle(); +}; + +function hookSourceViews() { + $('.method-heading').click( showSource ); +}; + +function toggleDebuggingSection() { + $('.debugging-section').slideToggle(); +}; + +function hookDebuggingToggle() { + $('#debugging-toggle img').click( toggleDebuggingSection ); +}; + +function hookTableOfContentsToggle() { + $('.indexpage li .toc-toggle').each( function() { + $(this).click( function() { + $(this).toggleClass('open'); + }); + + var section = $(this).next(); + + $(this).click( function() { + section.slideToggle(); + }); + }); +} + +function hookSearch() { + var input = $('#search-field').eq(0); + var result = $('#search-results').eq(0); + $(result).show(); + + var search_section = $('#search-section').get(0); + $(search_section).show(); + + var search = new Search(search_data, input, result); + + search.renderItem = function(result) { + var li = document.createElement('li'); + var html = ''; + + // TODO add relative path to + + + + + + + + + + +

    Table of Contents - Rails Application Documentation

    + +

    Pages

    + + +

    Classes/Modules

    + + +

    Methods

    + + + + + diff --git a/public/doc/README_FOR_APP b/public/doc/README_FOR_APP new file mode 100644 index 0000000..ab562a4 --- /dev/null +++ b/public/doc/README_FOR_APP @@ -0,0 +1,2 @@ +Use this README file to introduce your application and point to useful places in the API for learning more. +Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries. diff --git a/public/doc/app/ApplicationController.html b/public/doc/app/ApplicationController.html new file mode 100644 index 0000000..fd3724e --- /dev/null +++ b/public/doc/app/ApplicationController.html @@ -0,0 +1,163 @@ + + + + + + +class ApplicationController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class ApplicationController

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/ApplicationHelper.html b/public/doc/app/ApplicationHelper.html new file mode 100644 index 0000000..2592c04 --- /dev/null +++ b/public/doc/app/ApplicationHelper.html @@ -0,0 +1,157 @@ + + + + + + +module ApplicationHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module ApplicationHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/Comment.html b/public/doc/app/Comment.html new file mode 100644 index 0000000..ebe03b1 --- /dev/null +++ b/public/doc/app/Comment.html @@ -0,0 +1,170 @@ + + + + + + +class Comment - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class Comment

    + +
    + +

    Qué define este modelo

    + +

    El modelo de comments define los comentarios que los usuarios hagan sobre +los sitios. Cada comentario pertenece a un usuario y a un sitio +determinado. Por defecto se ha establecido un máximo de 240 caracteres para +cada comentario.

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/CommentsController.html b/public/doc/app/CommentsController.html new file mode 100644 index 0000000..d35dc81 --- /dev/null +++ b/public/doc/app/CommentsController.html @@ -0,0 +1,494 @@ + + + + + + +class CommentsController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class CommentsController

    + +
    + +

    Qué hace este controlador

    + +

    El controlador de comments gestiona todo lo relacionado con la creación, +edición y eliminación de comentarios. Trabaja con Devise para identificar +cada comentario con el usuario que lo creó. Tiene un filtro para ejecutar +las acciones sólo si se ha iniciado sesión. Este filtro no afecta a las +acciones index y show.

    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + create() + click to toggle source +
    + + +
    + +

    Método que crea el nuevo comentario. Rutas:

    +
    • +

      POST /comments

      +
    • +

      POST /comments.js

      +
    • +

      POST /comments.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 62
+def create
+  @comment = current_user.comments.build(params[:comment])
+  @site = @comment.site
+
+  respond_to do |format|
+    if @comment.save
+      format.html { redirect_to site_path(@site), notice: 'Comment was successfully created.' }
+      format.js
+      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
    +
    + +
    + + + + +
    + + +
    + +
    + destroy() + click to toggle source +
    + + +
    + +

    Método que permite eliminar un comentario. Rutas:

    +
    • +

      DELETE /comments/:id

      +
    • +

      DELETE /comments/:id.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 99
+def destroy
+  @comment = current_user.comments.find(params[:id])
+  site = @comment.site
+  @comment.destroy
+
+  respond_to do |format|
+    format.html { redirect_to site_path(site) }
+    format.json { head :no_content }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + edit() + click to toggle source +
    + + +
    + +

    Método que permite editar el comentario seleccionado. Ruta:

    +
    • +

      GET /comments/:id/edit

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 53
+def edit
+  @comment = current_user.comments.find(params[:id])
+  @site = @comment.site
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Método que muestra los comentarios asociados al sitio seleccionado. Rutas:

    +
    • +

      GET /sites/:site_id/comments

      +
    • +

      GET /sites/:site_id/comments.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 15
+def index
+  @site = Site.find(params[:site_id])
+  @comments = @site.comments
+  @comment = current_user.comments.build if current_user
+
+  respond_to do |format|
+    format.html # index.html.erb
+    format.json { render json: @comments }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + new() + click to toggle source +
    + + +
    + +

    Método que permite modificar un nuevo comentario asociado a un sitio. +Rutas:

    +
    • +

      GET /sites/:site_id/comments/new

      +
    • +

      GET /sites/:site_id/comments/new.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 41
+def new
+  @comment = current_user.comments.build
+  @site = Site.find(params[:site_id])
+
+  respond_to do |format|
+    format.html # new.html.erb
+    format.json { render json: @comment }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + show() + click to toggle source +
    + + +
    + +

    Método que muestra el comentario seleccionado. Rutas:

    +
    • +

      GET /comments/:comment_id

      +
    • +

      GET /comments/:comment_id.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 29
+def show
+  @comment = Comment.find(params[:id])
+
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @comment }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + update() + click to toggle source +
    + + +
    + +

    Método que actualiza el comentario editado. Rutas:

    +
    • +

      PUT /comments/:id

      +
    • +

      PUT /comments/:id.json

      +
    + + + +
    + 
    # File app/controllers/comments_controller.rb, line 81
+def update
+  @comment = current_user.comments.find(params[:id])
+  @site = @comment.site
+
+  respond_to do |format|
+    if @comment.update_attributes(params[:comment])
+      format.html { redirect_to site_path(@site), 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
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/public/doc/app/CommentsHelper.html b/public/doc/app/CommentsHelper.html new file mode 100644 index 0000000..bfebd8f --- /dev/null +++ b/public/doc/app/CommentsHelper.html @@ -0,0 +1,157 @@ + + + + + + +module CommentsHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module CommentsHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/PlanetController.html b/public/doc/app/PlanetController.html new file mode 100644 index 0000000..c3d8e96 --- /dev/null +++ b/public/doc/app/PlanetController.html @@ -0,0 +1,399 @@ + + + + + + +class PlanetController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class PlanetController

    + +
    + +

    PlanetController ilustra el uso de +RDoc. La documentación de un proyecto en genera en el +directorio proy/doc en formato Web con

    + +
    $proy> rake doc:app
    + +

    Algunos comandos de formateo

    + +

    Tal y como muestra el subitulo anterior, este se define empezando la línea +con ==. En los títulos debe empezar por =.

    + +

    Un [ … ] seguido de texto define una lista titulada, como aquí

    +
    Clases, Módulos o Métodos +
    +

    Se documentan con comentarios justo encima de sus definición, como aquí.

    +
    + +

    Un * o - definen las entradas de una lista itemizada

    + + +

    Un número o letra seguido de punto genera una lista númerada

    +
    1. +

      + permite generar negrita, igual que con +HTML

      +
    2. +

      _ permite generar cursiva, igual que con HTML

      +
      • +

        permite generar letra de teletipo, igual que con +HTML

        +
      +
    + +

    Qué hace este controlador

    + +

    El controlador de planet es en gran parte un controlador de prueba con +acciones vacías. Sólo hay un método con una acción completa, search. Esta +acción busca los sitios o viajes que tengan en su nombre o en su +descripción la cadena de texto introducida.

    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + author() + click to toggle source +
    + + +
    + +

    Método que define una acción vacía del controlador. Ruta:

    +
    • +

      GET /planet/author

      +
    + + + +
    + 
    # File app/controllers/planet_controller.rb, line 44
+def author
+end
    +
    + +
    + + + + +
    + + +
    + +
    + contact() + click to toggle source +
    + + +
    + +

    Método que define una acción vacía del controlador. Ruta:

    +
    • +

      GET /planet/contact

      +
    + + + +
    + 
    # File app/controllers/planet_controller.rb, line 34
+def contact
+end
    +
    + +
    + + + + +
    + + +
    + +
    + ejemplo() + click to toggle source +
    + + +
    + +

    Método que define una acción vacía del controlador. Ruta:

    +
    • +

      GET /planet/ejemplo

      +
    + + + +
    + 
    # File app/controllers/planet_controller.rb, line 39
+def ejemplo
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Método que define una acción vacía del controlador. Ruta:

    +
    • +

      GET /planet/index

      +
    + + + +
    + 
    # File app/controllers/planet_controller.rb, line 29
+def index
+end
    +
    + +
    + + + + +
    + + +
    + +
    + search() + click to toggle source +
    + + +
    + +

    Método que permite buscar por nombre y descripción sitios y viajes. Ruta:

    +
    • +

      GET /planet/search

      +
    + + + +
    + 
    # File app/controllers/planet_controller.rb, line 49
+def search
+  search = "%#{params[:search]}%"
+  @sites = Site.find(:all, :conditions => ['name LIKE ? or description LIKE ?', search, search])
+  @trips = Trip.find(:all, :conditions => ['name LIKE ? or description LIKE ?', search, search])
+
+  respond_to do |format|
+    format.html
+    format.json { render json: @sites }
+    format.json { render json: @trips }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/public/doc/app/PlanetHelper.html b/public/doc/app/PlanetHelper.html new file mode 100644 index 0000000..4f02ec7 --- /dev/null +++ b/public/doc/app/PlanetHelper.html @@ -0,0 +1,157 @@ + + + + + + +module PlanetHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module PlanetHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/Site.html b/public/doc/app/Site.html new file mode 100644 index 0000000..b55d708 --- /dev/null +++ b/public/doc/app/Site.html @@ -0,0 +1,173 @@ + + + + + + +class Site - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class Site

    + +
    + +

    Qué define este modelo

    + +

    El modelo de site define un sitio, un emplazamiento en alguna parte del +mundo que se añade por su interés turístico, especificando su tipo. Un +sitio pertenece al usuario que lo ha creado y al tipo en el que se enmarca. +Sólo el usuario que lo ha creado podrá editarlo o borrarlo. Un sitio puede +ser parte de muchos viajes definido como una visita. Además puede tener +comentarios que añadan los usuarios y una imagen que lo identifique. +Obligatoriamente un sitio tiene que tener un nombre y un tipo.

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/SitesController.html b/public/doc/app/SitesController.html new file mode 100644 index 0000000..b17f3a8 --- /dev/null +++ b/public/doc/app/SitesController.html @@ -0,0 +1,494 @@ + + + + + + +class SitesController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class SitesController

    + +
    + +

    Qué hace este controlador

    + +

    El controlador de sites gestiona todo lo relacionado con la creación, +edición y eliminación de sitios. Trabaja con Devise para identificar cada +sitio con el usuario que lo creó. Tiene dos filtros:

    +
    • +

      Uno para ejecutar las acciones sólo si antes se ha iniciado sesión. Este +filtro no afecta a las acciones index y show.

      +
    • +

      Otro para ejecutar el método que define la acción count_visita después de +la carga de la página.

      +
    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + create() + click to toggle source +
    + + +
    + +

    Método que crea el nuevo sitio. Rutas:

    +
    • +

      POST /sites

      +
    • +

      POST /sites.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 63
+def create
+  @site = current_user.sites.build(params[:site]) # Asigna solo si sitio asociado a current_user
+  
+  respond_to do |format|
+    if @site.save
+      format.html { redirect_to @site, notice: 'Site was successfully created.' }
+      format.json { render json: @site, status: :created, location: @site }
+    else
+      format.html { render action: "new" }
+      format.json { render json: @site.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + destroy() + click to toggle source +
    + + +
    + +

    Método que permite eliminar un sitio. Rutas:

    +
    • +

      DELETE /sites/:id

      +
    • +

      DELETE /sites/:id.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 97
+def destroy
+  @site = current_user.sites.find(params[:id])  # busca solo en sitios asociados a current_user
+  @site.destroy
+
+  respond_to do |format|
+    format.html { redirect_to sites_url }
+    format.json { head :no_content }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + edit() + click to toggle source +
    + + +
    + +

    Método que permite editar el sitio seleccionado. Ruta:

    +
    • +

      GET /sites/:id/edit

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 56
+def edit
+  @site = current_user.sites.find(params[:id])  # busca solo en sitios asociados a current_user
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Este método muestra todos los sitios si no se ha especificado un tipo o los +sitios de un tipo determinado. Rutas:

    +
    • +

      GET /sites

      +
    • +

      GET /sites.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 16
+def index
+  if params[:type_id].nil? or params[:type_id].empty?
+    @sites = Site.all            # path: /sites
+  else
+    @sites = Type.find(params[:type_id]).sites  # path: /types/:type_id/sites
+  end
+  
+  respond_to do |format|
+    format.html # index.html.erb
+    format.json { render json: @sites }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + new() + click to toggle source +
    + + +
    + +

    Método que permite modificar un nuevo sitio. Rutas:

    +
    • +

      GET /sites/new

      +
    • +

      GET /sites/new.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 45
+def new
+  @site = current_user.sites.build # crea sitio vacio asociado a current_user
+  
+  respond_to do |format|
+    format.html # new.html.erb
+    format.json { render json: @site }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + show() + click to toggle source +
    + + +
    + +

    Método que muestra el sitio seleccionado. Rutas:

    +
    • +

      GET /sites/:id

      +
    • +

      GET /sites/:id.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 32
+def show
+  @site = Site.find(params[:id])
+  @comment = current_user.comments.build if current_user
+
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @site }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + update() + click to toggle source +
    + + +
    + +

    Método que actualiza el sitio editado. Rutas:

    +
    • +

      PUT /sites/:id

      +
    • +

      PUT /sites/:id.json

      +
    + + + +
    + 
    # File app/controllers/sites_controller.rb, line 80
+def update
+  @site = current_user.sites.find(params[:id])  # busca solo en sitios asociados a current_user 
+  
+  respond_to do |format|
+    if @site.update_attributes(params[:site])
+      format.html { redirect_to @site, notice: 'Site was successfully updated.' }
+      format.json { head :no_content }
+    else
+      format.html { render action: "edit" }
+      format.json { render json: @site.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/public/doc/app/SitesHelper.html b/public/doc/app/SitesHelper.html new file mode 100644 index 0000000..4e08fe9 --- /dev/null +++ b/public/doc/app/SitesHelper.html @@ -0,0 +1,157 @@ + + + + + + +module SitesHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module SitesHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/Trip.html b/public/doc/app/Trip.html new file mode 100644 index 0000000..f73b43d --- /dev/null +++ b/public/doc/app/Trip.html @@ -0,0 +1,169 @@ + + + + + + +class Trip - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class Trip

    + +
    + +

    Qué define este modelo

    + +

    El modelo de trips define los viajes que se pueden hacer. Cada viaje +pertenece a un usuario determinado e incluye una serie de visitas (una +serie de sitios a los que se pretende ir a una hora determinada).

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/TripsController.html b/public/doc/app/TripsController.html new file mode 100644 index 0000000..07a83a7 --- /dev/null +++ b/public/doc/app/TripsController.html @@ -0,0 +1,484 @@ + + + + + + +class TripsController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class TripsController

    + +
    + +

    Qué hace este controlador

    + +

    El controlador de trips gestiona todo lo relacionado con la creación, +edición y eliminación de viajes. Trabaja con Devise para identificar cada +viaje con el usuario que lo creó y con visits, que componen un viaje. Tiene +un filtro para ejecutar las acciones sólo si antes se ha iniciado sesión. +Este filtro no afecta a las acciones index y show.

    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + create() + click to toggle source +
    + + +
    + +

    Método que crea el nuevo viaje. Rutas:

    +
    • +

      POST /trips

      +
    • +

      POST /trips.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 57
+def create
+  @trip = current_user.trips.build(params[:trip])
+
+  respond_to do |format|
+    if @trip.save
+      format.html { redirect_to @trip, notice: 'Trip was successfully created.' }
+      format.json { render json: @trip, status: :created, location: @trip }
+    else
+      format.html { render action: "new" }
+      format.json { render json: @trip.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + destroy() + click to toggle source +
    + + +
    + +

    Método que permite eliminar un viaje. Rutas:

    +
    • +

      DELETE /trips/:id

      +
    • +

      DELETE /trips/:id.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 91
+def destroy
+  @trip = current_user.trips.find(params[:id])
+  @trip.destroy
+
+  respond_to do |format|
+    format.html { redirect_to trips_url }
+    format.json { head :no_content }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + edit() + click to toggle source +
    + + +
    + +

    Método que permite editar el viaje seleccionado. Ruta:

    +
    • +

      GET /trips/:id/edit

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 50
+def edit
+  @trip = current_user.trips.find(params[:id])
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Método que muestra todos los viajes. Rutas:

    +
    • +

      GET /trips

      +
    • +

      GET /trips.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 14
+def index
+  @trips = Trip.all
+
+  respond_to do |format|
+    format.html # index.html.erb
+    format.json { render json: @trips }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + new() + click to toggle source +
    + + +
    + +

    Método que permite modificar un nuevo viaje. Rutas:

    +
    • +

      GET /trips/new

      +
    • +

      GET /trips/new.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 39
+def new
+  @trip = current_user.trips.build
+
+  respond_to do |format|
+    format.html # new.html.erb
+    format.json { render json: @trip }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + show() + click to toggle source +
    + + +
    + +

    Método que muestra el viaje seleccionado. Rutas:

    +
    • +

      GET /trips/:id

      +
    • +

      GET /trips/:id.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 26
+def show
+  @trip = Trip.find(params[:id])
+  @visit = @trip.visits.build
+
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @trip }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + update() + click to toggle source +
    + + +
    + +

    Método que actualiza el viaje editado. Rutas:

    +
    • +

      PUT /trips/:id

      +
    • +

      PUT /trips/:id.json

      +
    + + + +
    + 
    # File app/controllers/trips_controller.rb, line 74
+def update
+  @trip = current_user.trips.find(params[:id])
+
+  respond_to do |format|
+    if @trip.update_attributes(params[:trip])
+      format.html { redirect_to @trip, notice: 'Trip was successfully updated.' }
+      format.json { head :no_content }
+    else
+      format.html { render action: "edit" }
+      format.json { render json: @trip.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/public/doc/app/TripsHelper.html b/public/doc/app/TripsHelper.html new file mode 100644 index 0000000..12597fd --- /dev/null +++ b/public/doc/app/TripsHelper.html @@ -0,0 +1,157 @@ + + + + + + +module TripsHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module TripsHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/Type.html b/public/doc/app/Type.html new file mode 100644 index 0000000..cefcd8c --- /dev/null +++ b/public/doc/app/Type.html @@ -0,0 +1,172 @@ + + + + + + +class Type - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class Type

    + +
    + +

    Qué define este modelo

    + +

    El modelo de types define los tipos o categorías en los que se puede +clasificar cada sitio. Un tipo agrupa a varios sitios que comparten unas +caracterícas determinadas (como por ejemplo estar en medio de la naturaleza +o ser un edificio histórico). Un tipo tiene que tener obligatoriamente un +nombre y una descripción, pero no pueden existir dos sitios con el mismo +nombre.

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/TypesController.html b/public/doc/app/TypesController.html new file mode 100644 index 0000000..70b9971 --- /dev/null +++ b/public/doc/app/TypesController.html @@ -0,0 +1,524 @@ + + + + + + +class TypesController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class TypesController

    + +
    + +

    Qué hace este controlador

    + +

    El controlador de tipos gestiona todo lo relacionado con la creación, +edición y eliminación de tipos. Cualquier usuario puede realizar acciones +sobre los tipos.

    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + create() + click to toggle source +
    + + +
    + +

    Método que crea el nuevo tipo. Rutas:

    +
    • +

      POST /types

      +
    • +

      POST /types.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 63
+def create
+  @type = Type.new(params[:type])
+
+  respond_to do |format|
+    if @type.save
+      format.html { redirect_to @type, notice: 'Type was successfully created.' }
+      format.json { render json: @type, status: :created, location: @type }
+    else
+      format.html { render action: "new" }
+      format.json { render json: @type.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + destroy() + click to toggle source +
    + + +
    + +

    Método que permite eliminar un tipo. Rutas:

    +
    • +

      DELETE /types/:id

      +
    • +

      DELETE /types/:id.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 97
+def destroy
+  @type = Type.find(params[:id])
+  @type.destroy
+
+  respond_to do |format|
+    format.html { redirect_to types_url }
+    format.json { head :no_content }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + edit() + click to toggle source +
    + + +
    + +

    Método que permite editar el tipo seleccionado. Ruta:

    +
    • +

      GET /types/:id/edit

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 56
+def edit
+  @type = Type.find(params[:id])
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Método que muestra todos los tipos. Rutas:

    +
    • +

      GET /types

      +
    • +

      GET /types.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 9
+def index
+  @types = Type.all
+
+  respond_to do |format|
+    format.html # index.html.erb
+    format.json { render json: @types }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + new() + click to toggle source +
    + + +
    + +

    Método que permite modificar un nuevo tipo. Rutas:

    +
    • +

      GET /types/new

      +
    • +

      GET /types/new.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 45
+def new
+  @type = Type.new
+
+  respond_to do |format|
+    format.html # new.html.erb
+    format.json { render json: @type }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + ordered_index() + click to toggle source +
    + + +
    + +

    Este método define una acción que muestra todos los tipos por orden +alfabético. Rutas:

    +
    • +

      GET /types/ordered_index

      +
    • +

      GET /types/ordered_index.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 33
+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
    +
    + +
    + + + + +
    + + +
    + +
    + show() + click to toggle source +
    + + +
    + +

    Método que muestra el tipo seleccionado. Rutas:

    +
    • +

      GET /types/:id

      +
    • +

      GET /types/:id.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 21
+def show
+  @type = Type.find(params[:id])
+
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @type }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + update() + click to toggle source +
    + + +
    + +

    Método que actualiza el tipo editado. Rutas:

    +
    • +

      PUT /types/:id

      +
    • +

      PUT /types/:id.json

      +
    + + + +
    + 
    # File app/controllers/types_controller.rb, line 80
+def update
+  @type = Type.find(params[:id])
+
+  respond_to do |format|
+    if @type.update_attributes(params[:type])
+      format.html { redirect_to @type, notice: 'Type was successfully updated.' }
+      format.json { head :no_content }
+    else
+      format.html { render action: "edit" }
+      format.json { render json: @type.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/public/doc/app/TypesHelper.html b/public/doc/app/TypesHelper.html new file mode 100644 index 0000000..3ea694b --- /dev/null +++ b/public/doc/app/TypesHelper.html @@ -0,0 +1,157 @@ + + + + + + +module TypesHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module TypesHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/User.html b/public/doc/app/User.html new file mode 100644 index 0000000..5ed07e6 --- /dev/null +++ b/public/doc/app/User.html @@ -0,0 +1,172 @@ + + + + + + +class User - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class User

    + +
    + +

    Qué define este modelo

    + +

    El modelo de users define los usuarios de esta página web. Cada persona +debe crearse un usario que le identifique dentro de la página web, +especificando un nombre, una contraseña para evitar accesos indeseados y la +suplantación de su identidad y un correo para recibir avisos y recuperar la +contraseña. Un usuario es dueño de todos los sitios, comentarios y viajes +que haya creado, y como tal sólo él podrá editarlos o borrarlos.

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/Visit.html b/public/doc/app/Visit.html new file mode 100644 index 0000000..faac23b --- /dev/null +++ b/public/doc/app/Visit.html @@ -0,0 +1,168 @@ + + + + + + +class Visit - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class Visit

    + +
    + +

    Qué define este modelo

    + +

    El modelo de visits define las visitas que componen cada viaje, es decir, +los sitios que se desean visitar en dicho viaje.

    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/VisitsController.html b/public/doc/app/VisitsController.html new file mode 100644 index 0000000..978bd52 --- /dev/null +++ b/public/doc/app/VisitsController.html @@ -0,0 +1,484 @@ + + + + + + +class VisitsController - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    class VisitsController

    + +
    + +

    Qué hace este controlador

    + +

    El controlador de tipos gestiona todo lo relacionado con la creación, +edición y eliminación de tipos. Como las visitas se renderizan con los +viajes, se controla indirectamente qué usuario realiza estas acciones.

    + +
    + + + + +
    + + + + + + + + + + +
    +

    Public Instance Methods

    + + +
    + +
    + create() + click to toggle source +
    + + +
    + +

    Método que crea la nueva visita. Rutas:

    +
    • +

      POST /visits

      +
    • +

      POST /visits.js

      +
    • +

      POST /visits.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 52
+def create
+  @visit = Visit.new(params[:visit])
+
+  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" }
+      format.json { render json: @visit.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + destroy() + click to toggle source +
    + + +
    + +

    Método que permite eliminar una visita. Rutas:

    +
    • +

      DELETE /visits/1

      +
    • +

      DELETE /visits/1.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 87
+def destroy
+  @visit = Visit.find(params[:id])
+  @visit.destroy
+
+  respond_to do |format|
+    format.html { redirect_to @visit.trip }
+    format.json { head :no_content }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + edit() + click to toggle source +
    + + +
    + +

    Método que permite editar la visita seleccionada. Ruta:

    +
    • +

      GET /visits/1/edit

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 44
+def edit
+  @visit = Visit.find(params[:id])
+end
    +
    + +
    + + + + +
    + + +
    + +
    + index() + click to toggle source +
    + + +
    + +

    Método que muestra todos las visitas. Rutas:

    +
    • +

      GET /visits

      +
    • +

      GET /visits.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 9
+def index
+  @visits = Visit.all
+
+  respond_to do |format|
+    format.html # index.html.erb
+    format.json { render json: @visits }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + new() + click to toggle source +
    + + +
    + +

    Método que permite modificar una nueva visita. Rutas:

    +
    • +

      GET /visits/new

      +
    • +

      GET /visits/new.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 33
+def new
+  @visit = Visit.new
+
+  respond_to do |format|
+    format.html # new.html.erb
+    format.json { render json: @visit }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + show() + click to toggle source +
    + + +
    + +

    Método que muestra la visita seleccionada. Rutas:

    +
    • +

      GET /visits/1

      +
    • +

      GET /visits/1.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 21
+def show
+  @visit = Visit.find(params[:id])
+
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @visit }
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + update() + click to toggle source +
    + + +
    + +

    Método que actualiza la visita editada. Rutas:

    +
    • +

      PUT /visits/1

      +
    • +

      PUT /visits/1.json

      +
    + + + +
    + 
    # File app/controllers/visits_controller.rb, line 70
+def update
+  @visit = Visit.find(params[:id])
+
+  respond_to do |format|
+    if @visit.update_attributes(params[:visit])
+      format.html { redirect_to @visit.trip, notice: 'Visit was successfully updated.' }
+      format.json { head :no_content }
+    else
+      format.html { render action: "edit" }
+      format.json { render json: @visit.errors, status: :unprocessable_entity }
+    end
+  end
+end
    +
    + +
    + + + + +
    + + +
    + +
    + +
    + + + + diff --git a/public/doc/app/VisitsHelper.html b/public/doc/app/VisitsHelper.html new file mode 100644 index 0000000..83b4cf3 --- /dev/null +++ b/public/doc/app/VisitsHelper.html @@ -0,0 +1,157 @@ + + + + + + +module VisitsHelper - Rails Application Documentation + + + + + + + + + + + + + + + + +
    +

    module VisitsHelper

    + +
    + +
    + + + + +
    + + + + + + + + + + +
    + +
    + + + + diff --git a/public/doc/app/created.rid b/public/doc/app/created.rid new file mode 100644 index 0000000..399944d --- /dev/null +++ b/public/doc/app/created.rid @@ -0,0 +1,22 @@ +Wed, 25 Apr 2012 15:19:33 +0200 +doc/README_FOR_APP Sat, 31 Mar 2012 14:34:22 +0200 +app/controllers/application_controller.rb Sat, 31 Mar 2012 14:34:22 +0200 +app/controllers/comments_controller.rb Wed, 25 Apr 2012 13:03:23 +0200 +app/controllers/planet_controller.rb Tue, 24 Apr 2012 18:27:26 +0200 +app/controllers/sites_controller.rb Tue, 24 Apr 2012 18:29:50 +0200 +app/controllers/trips_controller.rb Wed, 25 Apr 2012 13:49:49 +0200 +app/controllers/types_controller.rb Tue, 24 Apr 2012 18:32:24 +0200 +app/controllers/visits_controller.rb Tue, 24 Apr 2012 18:34:10 +0200 +app/helpers/application_helper.rb Sat, 31 Mar 2012 14:34:22 +0200 +app/helpers/comments_helper.rb Tue, 10 Apr 2012 19:11:02 +0200 +app/helpers/planet_helper.rb Sat, 31 Mar 2012 14:34:22 +0200 +app/helpers/sites_helper.rb Sat, 31 Mar 2012 14:34:22 +0200 +app/helpers/trips_helper.rb Tue, 17 Apr 2012 19:06:38 +0200 +app/helpers/types_helper.rb Sat, 31 Mar 2012 14:34:22 +0200 +app/helpers/visits_helper.rb Tue, 17 Apr 2012 19:29:36 +0200 +app/models/comment.rb Tue, 24 Apr 2012 18:14:16 +0200 +app/models/site.rb Wed, 25 Apr 2012 14:31:32 +0200 +app/models/trip.rb Sat, 21 Apr 2012 14:53:58 +0200 +app/models/type.rb Sat, 21 Apr 2012 14:56:32 +0200 +app/models/user.rb Sat, 21 Apr 2012 14:59:36 +0200 +app/models/visit.rb Sat, 21 Apr 2012 15:01:30 +0200 diff --git a/public/doc/app/doc/README_FOR_APP.html b/public/doc/app/doc/README_FOR_APP.html new file mode 100644 index 0000000..a6bb752 --- /dev/null +++ b/public/doc/app/doc/README_FOR_APP.html @@ -0,0 +1,123 @@ + + + + + + +README_FOR_APP - Rails Application Documentation + + + + + + + + + + + + + + + + +
    + +

    Use this README file to introduce your application and point to useful +places in the API for learning more. Run “rake doc:app” to generate API +documentation for your models, controllers, helpers, and libraries.

    + +
    + + + + + diff --git a/public/doc/app/images/add.png b/public/doc/app/images/add.png new file mode 100644 index 0000000000000000000000000000000000000000..6332fefea4be19eeadf211b0b202b272e8564898 GIT binary patch literal 733 zcmV<30wVp1P)9VHk(~TedF+gQSL8D5xnVSSWAVY>J9b+m>@{iq7_KE}go~11+5s4;8hc+i0Xa zI1j@EX5!S+Me6HNqKzU5YQwL;-W5$p%ZMKMeR<%zp69-~?<4?8|C8S?bklXr4v&Ov zb&06v2|-x?qB`90yn>Qi%Sh2^G4n)$ZdyvTPf9}1)_buUT7>`e2G&2VU@~Bb(o+Mz zi4)>IxlSY${Dj4k={-9RzU^W5g9|2V5RZ2ZulL9s2xQbZ@r6eP9Ra5u(s|C0Nj#&4>wTSkb?%#=9?@ z^oxDy-O@tyN{L@by(WWvQ3%CyEu8x{+#Jb4-h&K9Owi)2pgg+heWDyked|3R$$kL@A z#sp1v-r+=G4B8D6DqsDH0@7OztA7aT9qc1Py{()w`m``?Y0&gi2=ROcc-9+nU^I6< zT=e_Y=vSnG@?3Ue{BW5ONFttcE!R-R_W4O01|0-|K-YNXLo2`4Qv z`r1LxR6#yf3FB%T95gJnaKKivA~Z}S9A(ZxEDK}O3T04USJ P00000NkvXXu0mjf^IS-S literal 0 HcmV?d00001 diff --git a/public/doc/app/images/brick.png b/public/doc/app/images/brick.png new file mode 100644 index 0000000000000000000000000000000000000000..7851cf34c946e5667221e3478668503eb1cd733f GIT binary patch literal 452 zcmV;#0XzPQP)Pdwe5?6tW?r-ok|b$oDQj8FV%kZPq;(MWOV8?8;<)(iP}>hNMU> z7fbz%jjlr7h8uuoQ~J6}n}@Y@PdTk=)PxO{%7zmL?dchpZX*~n;I{!C>*(8cU;q(~ zAS%Po_@naEU!xidrBXD?;hN|x^%W|Ij)0y*r5vi|?W&Fub(NqJ@z0o=O&SR3v>A``^efOSo-hEdApp;^Jd;9y!%1UfzX6Bh- z%-mbG|0Na{7Ruai_Y+DEb1s+b!*9k%Q!whMxjtZKA*?o;i1g&jy0@( zaU=-@d-h+o%gal6JRXEXA&L3`d2 z%jIxzZ~*p9O-;EJp_Ds0If38rM<5W8ic~K>FOK&2_p!CLg^i63OioVb6k$)zWHLx3 z5;!|M!}<9+#QSi1dRlbEcxPt^;cysUuU8@%3}RwpLRIGG<|IKnoyP6$Eh3SKw7a*r zSDXP=IYc&YZf;7@?fCe($^l9ORaJ3wbAx0uiC8QqRr$2t-Cfy8%XCI3B%pxJW>XdM zw~zPt_s}#A@pxQ5Ly)4szaMtH9lgE1SXx@b+S(fW`ub$fYPE8J7#bSNDzme*Ub07{ zQKV8SjEs!%0@v5ql8ggm!@$6Rbi^E8vBqpRM-}l+@5OSMrl+TWj*gC^qoV@>u{fQb zov5v?g~?>X@bEC&+uLPaQ&Ypn-y~^mZA}+f(&2EFH8eE%dU|@ENpN*_1-)L6_4Rc* zFuq@`IjX9vp1QiaK9ZojyZhnQURP99d=u;%37VRkpwsD4U0sd3x;hEQB&e^i|3QN0 z=H|Os1fRqaw!?#igLmS4HE!G3*ce(`TF} zlgUq0Q544c8(ae&UR$8ps&snq6^bPY3v3xAmMW74Di$h~GCH6E3TaYs2#6A<7K*gC z777H71_Wa;(dfp+g-drPCSWu)#PInZi72LJ;o?i~$-U=y&UbQ89Dul3%3P+Axkzc* zbH-y;QF=hR{qLItf%ci2_&e5wNo0gnVatG?ul6Zw=o$I9Ljfn*ic3`U?>IfEim3g{ zujU&$-hy6wn;w(xme|zJm;lWJxtTFfM)q0`kX!Vu0+d${$}LCddK1<^htTe-fUYL3 zB`SdNsZD>RgvLj1<^@h6_+cDRK2Brcr2~>%$*5S)hyV33PV^teac3%|4lz@8p4?)5 z?t5o^?q+%^%)Yygo~I^U4VR!bTnWuE35hcWrfCDR3q+sxJ79e7Fg`&)RCqLA^2^y^ z0laVfadW90_Fz8Brm|r47sB^u1VgI>kanj)Z4`zMSfHlm8>CwXa$JVM`$2RrmZB-3 zN10m-!;BvH*Br3V8t`DH7m`jf#2upVDXl{5ff18_pzCPK1Zu$$CKKvd8FGeFf)+K<|x33pc7P&S#3GZT4mEw;nr(Ze*F z3&*?-4U-lm*#tber5 z%S_ceqB`b3ko6r~BbvDwdohTvP(3a(pq{x#T$yQsu#OKwEe}KuH^Mh@nxg_(Nw136 zq#a^3xNBke)In+!?qk3%4wB69{pF`Tzg`07*qoM6N<$ Eg55P&8UO$Q literal 0 HcmV?d00001 diff --git a/public/doc/app/images/bullet_black.png b/public/doc/app/images/bullet_black.png new file mode 100644 index 0000000000000000000000000000000000000000..57619706d10d9736b1849a83f2c5694fbe09c53b GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-$h^>lFz(Kw&{<9vg>5sw~gS5O!4 zr|{HuUFIBKiQyL}eBJ-L{`UVT|6_O~L{G%N{Wbre{kQtZ_0LvEhC#5QQ<|d}62BjvZR2H60wE-$h^mK6y(Kw&{<9vg>(S^W+6Zii9 z|Nhthr~iNb*Z!}6uiN$Dz5neG3a-`baBX8yz1H+_;eX)`ni0%X8XBDc-`=Ph(Uan2 zYsR{H!kvIN--9isvHznRsC#5QQ<|d}62BjvZR2H60wE-$h_H=O!(Kw&{<9vg>(S^W+6Zii9 z|Nhthr~iNb*Z!}6uiN$Dz5neG3a-`baBX8yz4q@v|B?28{s)#N@CGn3@%_y|zAV9T z66e<&B4?b6oF&azg|C(V&1ZbI_D}pL`}(^FT2yXwG1Ph~$Q@h8mJYOz!PC{xWt~$( F699+YQR)By literal 0 HcmV?d00001 diff --git a/public/doc/app/images/date.png b/public/doc/app/images/date.png new file mode 100644 index 0000000000000000000000000000000000000000..783c83357fdf90a1c7c024358e1d768b5c09c135 GIT binary patch literal 626 zcmV-&0*(ENP)5OC%H;f`~O(q$Q#t2<^v$A>fbmv%e#dKTwK=Ku{5lS|}<-`a#7b zzTCOnnT>at)D}AMFuOZ5&%EqFN(lyumd$2ASF6=;nM~%2?gqc@U=#|4PqkX@EBo-9 z7pD#bO_RUa>*faM`8;MYfVi$JnB-zcBFc6gjl$d!bF98Q!!!(Z1_R~P?e!pt#6CHJ9S&n_n&@=9 z%GP;!@Co4c*at+6vNz7o(6en^Q1%qHrc;1)9IRaz-$@S$Z-qdC^ds3X0NvQH;KS)D z-dh&rW&@X;1cS(45z)J&BVt+tv&GMVJ%!EiW) zLBGZW)#Z+gl-Lih&?>X3SS-S#ujQ;9JRXmIB7X)8`d6ETj)D#Q2+$s|<_b7-B9Xvq zwNfqlEp%y3$uY`h{Y$(Gn5@}sqEsq95lpAkFO5dyBmP6^H-51G4J|rN2Ujt<`2YX_ M07*qoM6N<$fC4}Mrzlg<+1Y8PEBfUp0jJpx4B>@E+cy3`^(Gw`Mf+2&yxZm<$to~Vpgvg&QKNR z_f#1(r6svZt%iF?s+n<8X?B&!h3g9Dbb8_=MX}!;HiQSAh`bp^WMl~Z-44teO7W_Y zV4thSL{h;rJY7!l3%5J4H1!tIzB`Dv+YxO(haWeausGZYkI8^hWj6mzo=L0{%;yxzh{5!Htr?51 zvG|W62MzC8BZ76hRpCyO2zOn<%e)K>NHge!-~)Ap33OdWw6hsLYbCxGNt0%wk_2z7 zfyYvXheSG)5HRK1VB~%mq7Dmurw#bi@hEcOr3&G1ZiF*$M=&9nB#VNf&Q^r$4G5kp zTURh&s)E0%5&hyVD}sp<72~zmAY`Y(9aqO6CXF%=zFHGzO-A&I(pE}v70YQxCPJ{Y z4L+?5-crdLn3ZRPEs!A4ehEY3ZRpL~w9>@aMN+{F4dI@v&>(QDHQum!mG~E^$OS8l z!7?%Uwib*ROP67Hw`ika)gX-(8Ia`-u_IEhxG7U<13kSsMW+$lbb2dUMm5p6pa}cjgA+U$^mJ^AjD?&bdi)8~y+Q002ovPDHLkV1g8IMc@Dc literal 0 HcmV?d00001 diff --git a/public/doc/app/images/find.png b/public/doc/app/images/find.png new file mode 100644 index 0000000000000000000000000000000000000000..1547479646722bda4647df52cf3e8bc9b77428c6 GIT binary patch literal 659 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 Dl)1NK literal 0 HcmV?d00001 diff --git a/public/doc/app/images/macFFBgHack.png b/public/doc/app/images/macFFBgHack.png new file mode 100644 index 0000000000000000000000000000000000000000..c6473b324ee1dae1faaacc0826639833f551116c GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIEX7WqAsj$Z!;#Vf4nJ za0`Jjl>Qs8<JF;+Fd5q0wCR k?u=~bH}2*0f`J3~k>FVdQ&MBb@0BAfpf&c&j literal 0 HcmV?d00001 diff --git a/public/doc/app/images/package.png b/public/doc/app/images/package.png new file mode 100644 index 0000000000000000000000000000000000000000..da3c2a2d74bab159ba0f65d7db601768258afcb2 GIT binary patch literal 853 zcmV-b1FHOqP)5TQ^(M5v$(QKVE?W+9X! z*o}&~6c?_FreF)9NJB7b5Nbn{G0n4+%uJhR9(V5R|NFTpb|HgjefT!tIhLx@DR+N) zV+fHiR5Yt19}k|KnCsND{tH-`IMJ)3AE?OtyZ4>Un|6(d%h#JK`i&a7^xW9>`yBy` zS4SOHeOpC7$?hH5-#7Rswiue_8Ju*2N@$58=a#2OTA3png`w3v->gWif7t%e$ z$NLVS!tFT#8WL|Wa&K~+{%4P2cRfwesYV1_!F=3OaRVHl(>=`%&{x*s30c}#CNE@&;ItrAv!f!)Oy$Q9t$uS=(sD$-J{T*^(8Eez1E-l3}} zPrfHZ1`qsIFe&gipuL8-IZbo2Yg{lFGKs?ZZWcOaOdk*3`5T;$?AjbG1#`B510Er^h2)2r3Y{!8_2Gj=$KzuN5 zaErtW8W_Y2iJJjY)5pmTVJoPJYpanPOEuYHclM^C1F>${hFRpdi8a<2H|Xudf78bm(zwJ9`K%6I?q*Ua~ fW9JvIbn5*B+_J)rUMBs>00000NkvXXu0mjfH&TkY literal 0 HcmV?d00001 diff --git a/public/doc/app/images/page_green.png b/public/doc/app/images/page_green.png new file mode 100644 index 0000000000000000000000000000000000000000..de8e003f9fb8752c09e7f3655d5d8664b5c62fc3 GIT binary patch literal 621 zcmV-z0+RiSP)QqUjAtB;_Vvt6}AS_5YgM`Uqu`yva+H8^=4U$e4gHb}u zAQ2N{V3A%pO|?Pv?tb6z=jC}SiRa$G^v3q?*6XcYz$p|cq{uLj@#~Fi`J(>5{@&&N zy%T^+;>8cXx%|o77anP?&W1?1A(>-T49z9pyeCl@7YI+Si zKti7=B~``}TImz(G{0PnlQA3P#MAd}sorMjkP!50B7$nAkU^%#nl{Q9lW0@}9fE-> zN(q7tRuiC_T1r|BBtVBTlQ2+70$Rf;eF`Z;lx46Cpu-rEgb)EBKq(b^W8l<^We(`D z43?0=01z<3G6+UUv6`CsWCk6^93!#+<;ws7007{zS3k2k9-zZKFO~(k`>s0y006+1 zgF_jyIhsL-`FMf~JL~C=cV75(CrJ|q;MVO961G=O zm9d)YpJg5g(4i_HKL75eSE}mq$Y}r}hyVdcV~p>6a}oXr80q`oj%+s700000NkvXX Hu0mjfPs|!l literal 0 HcmV?d00001 diff --git a/public/doc/app/images/page_white_text.png b/public/doc/app/images/page_white_text.png new file mode 100644 index 0000000000000000000000000000000000000000..813f712f726c935f9adf8d2f2dd0d7683791ef11 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-%6;pyTSA|c6o&@eC9QG)Hj&ExYL zO&oVL^)+cM^qd@ApywS>pwx0H@RDN}hq;7mU-SKczYQ-hnrr=;iDAQMZQ+*g=YOM= z!QlMQEn7FbaD->uKAYgo_j9)W&$$zS*W9}m(ey0q$&7l-XEWO0Y(9M=SnhLbwy;d>@~SY$Ku*0xPvIOQeV1x7u_z-2-X>_74(yfh7C znXL|3GZ+d2`3re2hs?MKC#5QQ<|d}62BjvZR2H60wE-$R?&;zfqH(@;q9b3Efq-lM(nr^( z=EYR73-9e)UYMWsXy%?aZsD68Yyv^2$~6QgEcljw%kx>O(f-gQ?@fOOx3A-0+Qw?O zRx~W)kn~Qe2d6f9nMG#g9Q04Mk==M~N!Dglvxk!fgVh#w@ZV$IY1+Xc`d{d2UcaP~ zfWp)_Ivqj}l2SPy^9ZWy6rG9Yx4v67_uA&&9|XA~5-#3)W3%em1peD8RWH^#O%XoM zxMPud%}GTj#~*+7JMxTd!`{^Q+>(D3*|@KV`*G2;{QnANOxu1$r2xIe;OXk;vd$@? F2>@zac~<}c literal 0 HcmV?d00001 diff --git a/public/doc/app/images/plugin.png b/public/doc/app/images/plugin.png new file mode 100644 index 0000000000000000000000000000000000000000..6187b15aec001b7080b51a5f944f07591f26cc15 GIT binary patch literal 591 zcmV-V0eEcNHZMNv|IbJ-M`( zKwWL~opzjJe^WpCmV9E;(0&ut2;4va_(#>M8)>9$R5viQnf(Nkh~VM$y>J(jqb$cj z+nL1Nm|mV)Gm|9MnHf*7Ja4OEAQz__^LRKOLEwqpiGV^^A*T=#&inGm-62Xs;dnSp zKj&H9T*boh2i)W+(n27l!C)>fq|L%VB1i ziC4p;NwV_}ZjW7$LRW#(_bKF#hp=!IqNO26Z*w2+LEwx{PVnZ&Sn}T;mtzb$;qA*nT@@+ zV5uQ@iXDTPoTbV#FRr~z04|PPh`wXTNoCm9*tG&?e3+fYl>K6+&3|Cc$KOpL`ER+_ dcRl5U#9zn6ZO}GFk7R5;7c zlif>`Q5?tj7Yw@ZCMtTF^Q|ZedeJhM%QPCR*bs8V79p$QTo7e94yQNXRs-{0?hOn_-8n0AMO@u1Ts zNl8QzJs1#rz%RBt?ux>l+amAvh+J!{$lkaqv}+Erb-6j2xp>K4GLQnNB*W`hFg*?P z^AL@~(h~Z+wfcWEXHqV^Tq-#z$7Y#o0;yFxA!00F}F2dX# zjE$iOgT#G4*1TR6kB1Gnn@>$meCh2a>c5YuIvFn-R2W@>4@M*m@-|jiDV?b)bccgA zyPfsMM!rjy>+1O2)5Eg29Z_*2p&qGnmS!OH?vZ(4>QB01d>j%9n4QINxkyT(Dos?I zjaWF$*IQmh`SF-?xU%xMEfjq1=6qY*g&lgG_cXv$BGoIWyfO5 zp>pdV*O+y=&6@N2WWFo(%RtT`Q(H^6zn^a%epE~Kx^mEJ{c8`luC$nc*z9j|4Ms8aJK-ladKLpnAK z!yd|CC&>l1b7`m$MH$ScEIP@XgT41O>|DzL{-38CH68OyX#u=G?d7;y&_o&o)f@3U z2(tr%Ok88caOL`xiQA8o;Vzr-$A$SOu6o|$&0DQAJ1Z7?OACaeoy+)PWu&~aueW<| z*KW^(^2}#30u*~<_mXScFNd6U&sxh5*GGMNytZGxkIGqL%v6329^u`FD6T?b?K!4B z@Hzh?O2Au=((Gu;rvgLMt^pS|u1rEkBgC8$oH%zgT`TvZiK#VDrVG?-i~6a_+WZb> zc1>>lb)xcuo^Cl8k%q3c_d*It_Vtj>RSovF&w;hS=6uYrT2e@-@l@P~uBN`zu!v>e zTm(is&jcQ6vuP?|;!e+(n8w)-Xjd!hwk@r2D0i00ygdKo2Xvs?&w_lajj5DHS@9I! z;_&ji2e{!uusGnVn};Pu|dl5x-FhQyC8^-4Uo_;BLiOXzcE z&4PS2TBWSC=hsw0og;z#(mly@Ed2E1E$_VDaM?kloE4ob2XK&K;OS~-nhIGlA4~UZrJu6*|}wi#TT?|yWUH+_&n($t0xta zBwTzSfE)uAw*L0>+`pTps}L-$jIP5Q_E$Am+l|{XfsKr0Vi~`Em?SJQ#0y)8vsxb1 zMdxJl^){_CDwI^}>)Pw${G?Ajc@P}x{Fvhoi0jbY^427?KPmoA_G)sqK}u$2(79Xg zC%}xm5JDcrsm5^vQEQpGEdJDc^yfuNAlqV1pZQVkOSceV<|{=|=@?=o4i_1RFUZth zC7cu<6%V3dVCI}P6DL4iUgTc@&(nXY)ox}HZ z(a#EgiNj%{kjRLL2t?{m_aKN`{5-&u+HAtQ-Qq#@!I@<(M+B3i@|g=LY6 z90tpW!JuMn_Lcy1q7g&LUSuLE3XS}K#P^nHVUmL`L)dbP| z0bt(+Cp#M-bH!LM*DzJ0Lfn;eTBV@|JvGSgpdoc1RhhV>(G-2(vE|>MrVgA9+?+0m4OzUqbT>-U-jg|v zLZMntq`r?fy1UCMh>z2Koi1SL-~N2ZrIf+dZW|;SWszsde}Dl!HOMc1Fa>K9)e&RI z)A?aK zcviCdKDUg_%#u7YAE`A`Y3$(P4&m^@fEWAvjAwVmRWeUnmkrxA;E!fKoc{9Vi=lvFL}KmoS;g* zdjL?Y!VHUFq63aLj6VZE+tHts?Z1pFkiO9^k*5pGpFpU&5#5G4ATd{t>a&9zKBVB9=Ns^HFU|DTGH8C+Xr2UqOU`Zxe)!|%j4=-QojGePq)pRGe;!f)Czk!u3vP_Jxu8(e6 zf4Q`F$Qio2Jw@N*E@k?c`+Sw}AYQjkT+x)OAe6eq(AT!iRuksKQn%Ao_Ac1T-p#Js I_CnHs0qX}mlmGw# literal 0 HcmV?d00001 diff --git a/public/doc/app/images/tag_green.png b/public/doc/app/images/tag_green.png new file mode 100644 index 0000000000000000000000000000000000000000..83ec984bd73364134da0f98d27a800c5d3264180 GIT binary patch literal 613 zcmV-r0-F7aP)^5T)AZ%#@G{_P{NCN^P z(J0zvSn~SSm(Ur);-M~8^*;61*VRI`T1BN&LAhK;sZ>I-SVW;vfUfJv=ko^ugnc0x zhJodBxe>iyk3%w<%wC8holUJ4(iv>tL{`DQt zPOsyUbO_Cmc&*iHkqbm3ku`|GcC^OhF>jj9W*GkH;^g!iUVpib_h*=@udp4h(P+e*zL_~ZmJjh(y^BxULwq>9zXoYE8sq{#pN~U0C6!8vY)5N2 z9P*}mw}7X$O^qTtJef1ACWvJT9^wt-)Zh0r~j#0bT`f;-zv6 z^Tmw22!%rMcs!TaUX<-8s;X-B`+Xbo+_uWuFa z1yIPc?DTrQ7KvRhmt*TG|L=EYQ=LqFX;=Lp`4}jx6BE-@00000NkvXXu0mjf=s_29 literal 0 HcmV?d00001 diff --git a/public/doc/app/images/transparent.png b/public/doc/app/images/transparent.png new file mode 100644 index 0000000000000000000000000000000000000000..d665e179efd797451084235f105425247fea0a14 GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5X>;M1%mmiTn0pv241o;Is pI6S+N2ITN~x;Tb#$R;N!@B(=T42&&nK2`x)44$rjF6*2UngG277DE64 literal 0 HcmV?d00001 diff --git a/public/doc/app/images/wrench.png b/public/doc/app/images/wrench.png new file mode 100644 index 0000000000000000000000000000000000000000..5c8213fef5ab969f03189d4367e32e597e38bd7f GIT binary patch literal 610 zcmV-o0-gPdP)^jb z4`0v}DG1te)wmeb(>p90leRz?_mO+^JKy=v&2<29Od6?F%9%(c8los#f*@G`-%W&* z$)uBj2i@u-@SgX}gtyWPe6d*|w6h%R? zScK2#Yn%$sum0cy>90DmY*i{1XqpClEtktsRTZ)lCUe z<FogV^*tm>8*AlX za4oiR!&85LrobG57qUHUX#{>Vz(RHpB5|@>9O6N$jqB8>%($0wxE5R3)b>Y~xtCo$ zCgEk&A?_#IxHdN)9tqre^o{ho4{?hmPuf@^@I3-wncaRd%|~O3xbrKY=&TiwPYkJroM{;WUQTuMY8vpg}f4o)2%U3C;eEDoiEh?94d(rV57VIF#8VqzW$HrDC|#U`x@QDbgi zVl)t9GGz&YY#D?gc%>hISA+_EBpnXt#pnC`p6@xw0$8TCbULjhlgVx(kuc)%xbgqq zR5+DNDFRN0!y)7Gm}oT0i39}h4h928qY?Rho^UvPGJ#kuW|-Amtrn`Pmd&+bFo@sp z$LI4IQw7BG?|#2ewOS<<3VjL$0=lMY^m;wqZujv5kx1l%Sl;V&Iy4#$ip3&@LV2!7vhhN=PCz%^9v24`qb(+m4W?!q-&~=?ssf5GfnAmJKV;3bvpDm0(NhahZ=&^sqo6Odj6>)Dq_3p~4~ zvb`d3Mydwjt&Df^hVmLtI2x=U&h9(JVYX-!y~z3zi;1>=LY;o(bL$(Yf$lf)dMf0-u^0HrpTG Wk@)HE*94aU0000m+BBgry{~j2fHLegbHP( zrgXNbr0}2;^nywdjLjZe?uxtrd3D(pZH@fFFc0{BW_~jxoO1w7-VX;6vK@ROA$$R6 zEmo;Ht-Mj|>5jUy{bQ^V5@53LRI8AgLpUm|m+15sqcz@QtVSo|oz7ArM8?pIn+>gN z0b=4_b5O|4A*;Q+vc9Vqr~%3V155*NV~@gTz}KSUiKB-uJzjMZ>5%Q#n24H!V{ zTY(LLAE*NAHZ}C#wnj%Bw5OFIkRhkkAW#kDC3j9Wm0YXRaXlyyp>#mVfYG)eC;@ab zDb=T-BCAY4LI(Z@GOTr2V_A{pRwSmz+8Be>CjAw(=gnbVWAeguvZa93JmL(EDxv1m z0OP4q=fpAK1Mq!C2`OkEn37o;m#wF#(t(8Pu#S?2f#x<~4EO{@fmm`p9veD6RZ_jp z@Au4};q&`XuKEYgIiB4((kgxOs#YdqJw0fY>9^K_agEu5+$#k;w#%I2N>n_?)YIqu z`tq&#_^p?-%K*U0^}|7+9U(&k0?s;=r=uCZ%)H9_edH8wK}gB(nUB1FFk+2Ol%BXV zHoFY`D~2x|2 + + + + + +Rails Application Documentation + + + + + + + + + + + + + + + + +

    This is the API documentation for Rails Application Documentation. + + +

    + diff --git a/public/doc/app/js/darkfish.js b/public/doc/app/js/darkfish.js new file mode 100644 index 0000000..4be722f --- /dev/null +++ b/public/doc/app/js/darkfish.js @@ -0,0 +1,153 @@ +/** + * + * Darkfish Page Functions + * $Id: darkfish.js 53 2009-01-07 02:52:03Z deveiant $ + * + * Author: Michael Granger + * + */ + +/* Provide console simulation for firebug-less environments */ +if (!("console" in window) || !("firebug" in console)) { + var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", + "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; + + window.console = {}; + for (var i = 0; i < names.length; ++i) + window.console[names[i]] = function() {}; +}; + + +/** + * Unwrap the first element that matches the given @expr@ from the targets and return them. + */ +$.fn.unwrap = function( expr ) { + return this.each( function() { + $(this).parents( expr ).eq( 0 ).after( this ).remove(); + }); +}; + + +function showSource( e ) { + var target = e.target; + var codeSections = $(target). + parents('.method-detail'). + find('.method-source-code'); + + $(target). + parents('.method-detail'). + find('.method-source-code'). + slideToggle(); +}; + +function hookSourceViews() { + $('.method-heading').click( showSource ); +}; + +function toggleDebuggingSection() { + $('.debugging-section').slideToggle(); +}; + +function hookDebuggingToggle() { + $('#debugging-toggle img').click( toggleDebuggingSection ); +}; + +function hookTableOfContentsToggle() { + $('.indexpage li .toc-toggle').each( function() { + $(this).click( function() { + $(this).toggleClass('open'); + }); + + var section = $(this).next(); + + $(this).click( function() { + section.slideToggle(); + }); + }); +} + +function hookSearch() { + var input = $('#search-field').eq(0); + var result = $('#search-results').eq(0); + $(result).show(); + + var search_section = $('#search-section').get(0); + $(search_section).show(); + + var search = new Search(search_data, input, result); + + search.renderItem = function(result) { + var li = document.createElement('li'); + var html = ''; + + // TODO add relative path to + + + + + + + + + + +

    Table of Contents - Rails Application Documentation

    + +

    Pages

    + + +

    Classes/Modules

    + + +

    Methods

    + + + + + diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml index 29c9999..72e0400 100644 --- a/test/fixtures/comments.yml +++ b/test/fixtures/comments.yml @@ -2,10 +2,12 @@ one: comment: MyString - user_id: 1 - site_id: 1 + user: one + site: one + two: - comment: MyString - user_id: 1 - site_id: 1 + comment: MyString2 + user: two + site: one + diff --git a/test/fixtures/sites.yml b/test/fixtures/sites.yml index 946ec2e..4ee3df4 100644 --- a/test/fixtures/sites.yml +++ b/test/fixtures/sites.yml @@ -3,11 +3,14 @@ one: name: MyString description: MyText - type_id: 1 + type: one image_url: MyString + user: one two: - name: MyString - description: MyText - type_id: 1 - image_url: MyString + name: YourString + description: YourText + type: two + image_url: YourString + user: two + diff --git a/test/fixtures/trips.yml b/test/fixtures/trips.yml index 4afcf18..bbe6c7a 100644 --- a/test/fixtures/trips.yml +++ b/test/fixtures/trips.yml @@ -1,13 +1,13 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html - -one: - name: MyString - description: MyText - date: 2012-04-17 - user_id: 1 - -two: - name: MyString - description: MyText - date: 2012-04-17 - user_id: 1 +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +one: + name: MyString + description: MyText + date: 2012-04-09 + user: one + +two: + name: YourString + description: YourText + date: 2012-04-09 + user: two diff --git a/test/fixtures/types.yml b/test/fixtures/types.yml index 8683ea9..49a7b4e 100644 --- a/test/fixtures/types.yml +++ b/test/fixtures/types.yml @@ -5,8 +5,8 @@ one: description: MyText two: - name: MyString - description: MyText + name: YourString + description: YourText # Podriamos añadir nuevos datos de inicialización, que se referencian como # -> types(:monumento) types(:naturaleza) monumento: name: Monumento description: “Edificio o construcción de valor historico” naturaleza: name: Naturaleza description: “Lugar al aire libre de interés natural” \ No newline at end of file diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 8ca7647..fbfe998 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -4,8 +4,14 @@ # model remove the '{}' from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} +one: + name: Jose Perez + email: jose.perez@gmail.com + encrypted_password: perez22222 # column: value # -two: {} +two: + name: Jose Perez + email: jose.perez@me.com + encrypted_password: perez33333 # column: value diff --git a/test/fixtures/visits.yml b/test/fixtures/visits.yml index 6a15000..0cf5933 100644 --- a/test/fixtures/visits.yml +++ b/test/fixtures/visits.yml @@ -1,11 +1,11 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html - -one: - trip_id: 1 - site_id: 1 - hour: 1 - -two: - trip_id: 1 - site_id: 1 - hour: 1 +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +one: + trip: one + site: one + hour: 9 + +two: + trip: two + site: two + hour: 9 diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb index b2b500c..7b16a47 100644 --- a/test/functional/comments_controller_test.rb +++ b/test/functional/comments_controller_test.rb @@ -3,25 +3,32 @@ class CommentsControllerTest < ActionController::TestCase setup do @comment = comments(:one) + @update = { # @update: parametros diferentes + :comment => 'AnotherComment', + :site_id => sites(:one).id + } + @site = @comment.site + @user = @comment.user + sign_in @user end test "should get index" do - get :index + get :index, :site_id => @comment.to_param assert_response :success assert_not_nil assigns(:comments) end test "should get new" do - get :new + get :new, :site_id => @comment.to_param assert_response :success end test "should create comment" do assert_difference('Comment.count') do - post :create, comment: @comment.attributes + post :create, comment: @update end - assert_redirected_to comment_path(assigns(:comment)) + assert_redirected_to @site end test "should show comment" do @@ -35,8 +42,8 @@ class CommentsControllerTest < ActionController::TestCase end test "should update comment" do - put :update, id: @comment, comment: @comment.attributes - assert_redirected_to comment_path(assigns(:comment)) + put :update, id: @comment, comment: @update + assert_redirected_to @site end test "should destroy comment" do @@ -44,6 +51,6 @@ class CommentsControllerTest < ActionController::TestCase delete :destroy, id: @comment end - assert_redirected_to comments_path + assert_redirected_to @site end end diff --git a/test/functional/planet_controller_test.rb b/test/functional/planet_controller_test.rb index 84d5ebb..cdc5356 100644 --- a/test/functional/planet_controller_test.rb +++ b/test/functional/planet_controller_test.rb @@ -1,14 +1,15 @@ require 'test_helper' -class PlanetControllerTest < ActionController::TestCase +class PlanetControllerTest < ActionController::TestCase + test "should get index" do - get :index - assert_response :success + get :index + assert_response :success end test "should get contact" do - get :contact - assert_response :success + get :contact + assert_response :success end test "should get author" do @@ -22,5 +23,14 @@ class PlanetControllerTest < ActionController::TestCase # Invoca “get” en acción “ejemplo” assert_response :success # código HTTP: “200 OK” end - + + test "should get search" do + get :search, :search => 'X' + # Invoca “get” en acción “ejemplo” con búsqueda errónea + assert_response :success # código HTTP: “200 OK” + + get :search, :search => 'Correcta' + # Invoca “get” en acción “ejemplo” con búsqueda correcta + assert_response :success # código HTTP: “200 OK” + end end diff --git a/test/functional/planet_controller_test.rb~ b/test/functional/planet_controller_test.rb~ new file mode 100644 index 0000000..31a0509 --- /dev/null +++ b/test/functional/planet_controller_test.rb~ @@ -0,0 +1,36 @@ +require 'test_helper' + +class PlanetControllerTest < ActionController::TestCase + + test "should get index" do + get :index + assert_response :success + end + + test "should get contact" do + get :contact + assert_response :success + end + + test "should get author" do + get :author + # Invoca “get” en acción “author” + assert_response :success # código HTTP: “200 OK” + end + + test "should get ejemplo" do + get :ejemplo + # Invoca “get” en acción “ejemplo” + assert_response :success # código HTTP: “200 OK” + end + + test "should get search" do + get :search, :search => 'X'.to_param + # Invoca “get” en acción “ejemplo” con búsqueda errónea + assert_response :success # código HTTP: “200 OK” + + get :search, :search => 'Correcta'.to_param + # Invoca “get” en acción “ejemplo” con búsqueda correcta + assert_response :success # código HTTP: “200 OK” + end +end diff --git a/test/functional/sites_controller_test.rb b/test/functional/sites_controller_test.rb index 82688ba..aa5865c 100644 --- a/test/functional/sites_controller_test.rb +++ b/test/functional/sites_controller_test.rb @@ -3,6 +3,13 @@ class SitesControllerTest < ActionController::TestCase setup do @site = sites(:one) + @update = { # @update: parametros diferentes + :name => 'AnotherType', + :description => 'AnotherText', + :type_id => types(:one).id + } + @user = @site.user + sign_in @user end test "should get index" do @@ -18,7 +25,7 @@ class SitesControllerTest < ActionController::TestCase test "should create site" do assert_difference('Site.count') do - post :create, site: @site.attributes + post :create, site: @update end assert_redirected_to site_path(assigns(:site)) @@ -35,7 +42,7 @@ class SitesControllerTest < ActionController::TestCase end test "should update site" do - put :update, id: @site, site: @site.attributes + put :update, id: @site, site: @update assert_redirected_to site_path(assigns(:site)) end diff --git a/test/functional/trips_controller_test.rb b/test/functional/trips_controller_test.rb index b09dce2..eb6f095 100644 --- a/test/functional/trips_controller_test.rb +++ b/test/functional/trips_controller_test.rb @@ -1,49 +1,56 @@ -require 'test_helper' - -class TripsControllerTest < ActionController::TestCase - setup do - @trip = trips(:one) - end - - test "should get index" do - get :index - assert_response :success - assert_not_nil assigns(:trips) - end - - test "should get new" do - get :new - assert_response :success - end - - test "should create trip" do - assert_difference('Trip.count') do - post :create, trip: @trip.attributes - end - - assert_redirected_to trip_path(assigns(:trip)) - end - - test "should show trip" do - get :show, id: @trip - assert_response :success - end - - test "should get edit" do - get :edit, id: @trip - assert_response :success - end - - test "should update trip" do - put :update, id: @trip, trip: @trip.attributes - assert_redirected_to trip_path(assigns(:trip)) - end - - test "should destroy trip" do - assert_difference('Trip.count', -1) do - delete :destroy, id: @trip - end - - assert_redirected_to trips_path - end -end +require 'test_helper' + +class TripsControllerTest < ActionController::TestCase + setup do + @trip = trips(:one) + @update = { # @update: parametros diferentes + :name => 'AnotherType', + :description => 'AnotherText', + :date => '2012-04-09' + } + @user = @trip.user + sign_in @user + end + + test "should get index" do + get :index + assert_response :success + assert_not_nil assigns(:trips) + end + + test "should get new" do + get :new + assert_response :success + end + + test "should create trip" do + assert_difference('Trip.count') do + post :create, trip: @update + end + + assert_redirected_to trip_path(assigns(:trip)) + end + + test "should show trip" do + get :show, id: @trip + assert_response :success + end + + test "should get edit" do + get :edit, id: @trip + assert_response :success + end + + test "should update trip" do + put :update, id: @trip, trip: @update + assert_redirected_to trip_path(assigns(:trip)) + end + + test "should destroy trip" do + assert_difference('Trip.count', -1) do + delete :destroy, id: @trip + end + + assert_redirected_to trips_path + end +end diff --git a/test/functional/types_controller_test.rb b/test/functional/types_controller_test.rb index cf68df1..fa3eff6 100644 --- a/test/functional/types_controller_test.rb +++ b/test/functional/types_controller_test.rb @@ -7,6 +7,8 @@ class TypesControllerTest < ActionController::TestCase :name => 'AnotherType', :description => 'AnotherText', } + @user = users(:one) + sign_in @user end test "should get index" do diff --git a/test/functional/visits_controller_test.rb b/test/functional/visits_controller_test.rb index 45397e3..4453dcb 100644 --- a/test/functional/visits_controller_test.rb +++ b/test/functional/visits_controller_test.rb @@ -1,49 +1,50 @@ -require 'test_helper' - -class VisitsControllerTest < ActionController::TestCase - setup do - @visit = visits(:one) - end - - test "should get index" do - get :index - assert_response :success - assert_not_nil assigns(:visits) - end - - test "should get new" do - get :new - assert_response :success - end - - test "should create visit" do - assert_difference('Visit.count') do - post :create, visit: @visit.attributes - end - - assert_redirected_to visit_path(assigns(:visit)) - end - - test "should show visit" do - get :show, id: @visit - assert_response :success - end - - test "should get edit" do - get :edit, id: @visit - assert_response :success - end - - test "should update visit" do - put :update, id: @visit, visit: @visit.attributes - assert_redirected_to visit_path(assigns(:visit)) - end - - test "should destroy visit" do - assert_difference('Visit.count', -1) do - delete :destroy, id: @visit - end - - assert_redirected_to visits_path - end -end +require 'test_helper' + +class VisitsControllerTest < ActionController::TestCase + setup do + @visit = visits(:one) + @trip = @visit.trip + end + + test "should get index" do + get :index + assert_response :success + assert_not_nil assigns(:visits) + end + + test "should get new" do + get :new + assert_response :success + end + + test "should create visit" do + assert_difference('Visit.count') do + post :create, visit: @visit.attributes + end + + assert_redirected_to @trip + end + + test "should show visit" do + get :show, id: @visit + assert_response :success + end + + test "should get edit" do + get :edit, id: @visit + assert_response :success + end + + test "should update visit" do + put :update, id: @visit, visit: @visit.attributes + assert_redirected_to @trip + end + + test "should destroy visit" do + assert_difference('Visit.count', -1) do + delete :destroy, id: @visit + end + + assert_redirected_to @trip + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb index abf331b..3bf88c0 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -9,5 +9,10 @@ class ActiveSupport::TestCase # -- they do not yet inherit this setting fixtures :all + # Add more helper methods to be used by all tests here... end + +ActionController::TestCase.class_eval do + include Devise::TestHelpers +end diff --git a/test/unit/site_test.rb b/test/unit/site_test.rb index 1bd2cb8..e457320 100644 --- a/test/unit/site_test.rb +++ b/test/unit/site_test.rb @@ -12,6 +12,6 @@ class SiteTest < ActiveSupport::TestCase assert site.errors[:name].any? assert not(site.errors[:description].any?) assert site.errors[:type_id].any? - assert site.errors[:image_url].any? + # assert site.errors[:image_url].any? not used with paperclip end end