+
|
+
+
+ <% 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 %> + |
+
<%= pluralize(@comment.errors.count, "error") %> prohibited this comment from being saved:
+ +-
+ <% @comment.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
<%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:
+ +-
+ <% @site.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
+ <%= f.text_field :name %> +
+ <%= f.text_area :description , :rows => 4 %> +
+ <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> +
+ <%= f.text_field :image_url %> +
Editing comment
+ +<%= 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 %> +
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..62cebaa --- /dev/null +++ b/app/views/comments/index.html.erb @@ -0,0 +1,14 @@ +Comentarios de <%= @site.name %>
+ +Añada su comentario
+ <%= render 'form' %> +<% end %> + +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..88b9d58 --- /dev/null +++ b/app/views/comments/new.html.erb @@ -0,0 +1,28 @@ +New comment
+ +<%= 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 %> +
Añada su comentario
+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..b6fc999 --- /dev/null +++ b/app/views/comments/show.html.erb @@ -0,0 +1,21 @@ ++ Comment: + <%= @comment.comment %> +
+ ++ User: + <%= @comment.user.name %> +
+ ++ Site: + <%= @comment.site.name %> +
+ +<%= @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 %>
+ ++ <% 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.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.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 -%> +
Resend confirmation instructions
+ +<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> + ++ <%= f.email_field :email %>
Welcome <%= @resource.email %>!
+ +You can confirm your account email through the link below:
+ +<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 0000000..bef6fee --- /dev/null +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -0,0 +1,8 @@ +Hello <%= @resource.email %>!
+ +Someone has requested a link to change your password, and you can do this through the link below.
+ +<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
+ +If you didn't request this, please ignore this email.
+Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 0000000..f210fb2 --- /dev/null +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -0,0 +1,7 @@ +Hello <%= @resource.email %>!
+ +Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
+ +Click the link below to unlock your account:
+ +<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb new file mode 100644 index 0000000..ac4cc77 --- /dev/null +++ b/app/views/devise/passwords/edit.html.erb @@ -0,0 +1,16 @@ +Change your password
+ +<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :reset_password_token %> + ++ <%= f.password_field :password %>
+ <%= f.password_field :password_confirmation %>
Forgot your password?
+ +<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> + ++ <%= f.email_field :email %>
Edit <%= resource_name.to_s.humanize %>
+ +<%= 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.email_field :email %>
+ <%= f.password_field :password, :autocomplete => "off" %>
+ <%= f.password_field :password_confirmation %>
+ <%= f.password_field :current_password %>
Cancel my account
+ +Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.
+ +Sign up
+ +<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> + <%= devise_error_messages! %> + +<%= f.label :name %>
+ <%= f.text_field :name %>
+ <%= f.email_field :email %>
+ <%= f.password_field :password %>
+ <%= f.password_field :password_confirmation %>
Sign in
+ +<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> ++ <%= f.email_field :email %>
+ <%= f.password_field :password %>
Resend unlock instructions
+ +<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> + ++ <%= f.email_field :email %>
- <%= link_to "Tipos", types_path %>
- <%= link_to "Sitios", sites_path %>
- <%= link_to "Contact", planet_contact_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 "Documentación", "/doc/app/index.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) %>
++ <%= 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 "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) %> +
++ <%= 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 "Documentación", "/doc/app/index.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) %>
++ 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.
+ + \ No newline at end of file diff --git a/app/views/planet/author.html.erb~ b/app/views/planet/author.html.erb~ new file mode 100644 index 0000000..53eca04 --- /dev/null +++ b/app/views/planet/author.html.erb~ @@ -0,0 +1,28 @@ + + ++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') %> +-
+
- Dirección de correo: alberto.moreno.diaz@alumnos.upm.es +
- Dirección física: Calle Falsa 123 +
- Breve currículum: a rellenar +
Francisco José Gil García
+<%= image_tag('pizarro.jpg') %> +-
+
- Dirección de correo: fj.gil@alumnos.upm.es +
- Dirección física: 555 Evergreen Terrace +
- Breve currículum: a rellenar también +
Para cualquier duda o problema no dude en contactarnos.
+ + 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' %> ++ 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 abc9fec..9f27a0e 100644 --- a/app/views/sites/_form.html.erb +++ b/app/views/sites/_form.html.erb @@ -1,33 +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 %> -
- <%= f.text_field :name %> -
- <%= f.text_area :description , :rows => 4 %> -
- <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> -
- <%= f.text_field :image_url %> -
<%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:
+ +-
+ <% @site.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
+ <%= f.text_field :name %> +
+ <%= f.text_area :description , :rows => 4 %> +
+ <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> +
+ <%= f.file_field :image %> +
+ <%= f.text_field :latitud, id:'latitud' %> +
+ <%= f.text_field :longitud, id:'longitud' %> +
+ <%= f.select(:zoom, Array.new(21, 0).fill{|i| [(i.to_s), i]}) %> +
<%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:
+ +-
+ <% @site.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
+ <%= f.text_field :name %> +
+ <%= f.text_area :description , :rows => 4 %> +
+ <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> +
+ <%= f.text_field :image_url %> +
+ <%= f.text_field :longitud %> +
+ <%= f.text_field :latitud %> +
+ <%= f.text_field :zoom %> +
<%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:
+ +-
+ <% @site.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
+ <%= f.text_field :name %> +
+ <%= f.text_area :description , :rows => 4 %> +
+ <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> +
+ <%= f.text_field :image_url %> +
+ <%= f.number_field :zoom, :value => 15 %> +
<%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:
+ +-
+ <% @site.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
+ <%= f.text_field :name %> +
+ <%= f.text_area :description , :rows => 4 %> +
+ <%= f.collection_select(:type_id, Type.find(:all, :order => :name), :id, :name) %> +
+ <%= f.text_field :image_url %> +
+ <%= f.number_field :zoom, :value => 15 %> +
+
|
+
+
+ <% 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 %> + |
+
| + <%= link_to image_tag(site.image.url, :class => 'list_image'), site %> + | + +
+
+ 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 %> + |
+
Editing site
- -<%= render 'form' %> - -<%= link_to 'Show', @site %> | -<%= link_to 'Back', sites_path %> +Editing site
+ +<%= render 'form' %> + +Listing Sites
- -| - <%= link_to image_tag(site.image_url, :class => 'list_image'), site %> - | - -
-
|
-
-
- <%= link_to 'Show', site %> - <%= link_to 'Edit', edit_site_path(site) %> - <%= link_to 'Destroy', site, - :confirm => 'Are you sure?', - :method => :delete %> - |
-
- -<%= link_to 'New site', new_site_path %> \ No newline at end of file +
<%= @sites == Site.all ? "Todos los sitios" : Type.find(params[:type_id]).name %>
+ + <%= render 'sites' %> +<%= @sites == Site.all ? "Todos los sitios" : Type.find(params[:type_id]).name %>
+ +| + <%= link_to image_tag(site.image_url, :class => 'list_image'), 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/new.html.erb b/app/views/sites/new.html.erb index 2988bdc..8524f27 100644 --- a/app/views/sites/new.html.erb +++ b/app/views/sites/new.html.erb @@ -1,5 +1,7 @@ -
New site
- -<%= render 'form' %> - -<%= link_to 'Back', sites_path %> +New site
+ +<%= render 'newform' %> + +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 94dc17a..3a0ba19 100644 --- a/app/views/sites/show.html.erb +++ b/app/views/sites/show.html.erb @@ -1,15 +1,81 @@ -<%= @site.type.name if @site.type %>
- - <%= image_tag(@site.image_url, :class => 'site_image') %> - -<%= @site.name %>
- -<%=sanitize @site.description %>
- -<%= @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 %>
+Zoom: + <%= @site.zoom %>
+ +Viajes: <%= @site.trips.size %>
+Visitas: <%= @site.visitas %>
+Comentarios
+ <%= render(@site) %> +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 %> + +<%= @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.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' %> + +<%= pluralize(@trip.errors.count, "error") %> prohibited this trip from being saved:
+ +-
+ <% @trip.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
+ <%= f.text_field :name %> +
+ <%= f.text_area :description %> +
+ <%= f.date_select :date %> +
<%= pluralize(@trip.errors.count, "error") %> prohibited this trip from being saved:
+ +-
+ <% @trip.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
+ <%= f.text_field :name %> +
+ <%= f.text_area :description %> +
+ <%= f.date_select :date %> +
+ <%= f.number_field :user_id %> +
| + <%= link_to image_tag(visit.site.image.url, :class => 'list_image'), visit.site %> + | + +
+
|
+
+
+ <%= link_to 'Show', visit.site %> + <%= link_to 'Destroy', visit, + :confirm => 'Are you sure?', + :method => :delete if trip.user == current_user %> + + |
+
| + <%= link_to image_tag(visit.site.image_url, :class => 'list_image'), visit.site %> + | + +
+
|
+
+
+ <%= link_to 'Show', visit.site %> + <%= link_to 'Destroy', visit, + :confirm => 'Are you sure?', + :method => :delete if trip.user == current_user %> + + |
+
+
|
+
+
+ <%= 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 %> + |
+
Editing trip
+ +<%= render 'form' %> + +Viajes
<%= render 'trips' %>Viajes
+
+
|
+
+ <%= 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/new.html.erb b/app/views/trips/new.html.erb new file mode 100644 index 0000000..68b88f9 --- /dev/null +++ b/app/views/trips/new.html.erb @@ -0,0 +1,7 @@ +
New trip
+ +<%= render 'form' %> + +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 %> +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 %> + +
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/types/_form.html.erb b/app/views/types/_form.html.erb index 03447aa..02cc910 100644 --- a/app/views/types/_form.html.erb +++ b/app/views/types/_form.html.erb @@ -1,25 +1,25 @@ -<%= form_for(@type) do |f| %> - <% if @type.errors.any? %> -
<%= pluralize(@type.errors.count, "error") %> prohibited this type from being saved:
- --
- <% @type.errors.full_messages.each do |msg| %>
-
- <%= msg %> - <% end %> -
- <%= f.text_field :name %> -
- <%= f.text_area :description %> -
<%= pluralize(@type.errors.count, "error") %> prohibited this type from being saved:
+ +-
+ <% @type.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
+ <%= f.text_field :name %> +
+ <%= f.text_area :description, :rows => 4 %> +
Editing type
- -<%= render 'form' %> - -<%= link_to 'Show', @type %> | -<%= link_to 'Back', types_path %> +Editing type
+ +<%= render 'form' %> + +Listing Types
- -
-
|
-
-
- <%= 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 %> +
Listing Types
+ +
+
|
+
+
+ <%= link_to 'Show', type %> + <%= link_to 'Edit', edit_type_path(type) %> + <%= link_to 'Destroy', type, + :confirm => 'Are you sure?', + :method => :delete %> + |
+
Listing Types
+ +
+
|
+
+
+ <%= 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
+ +| Name | +Description | ++ | + | + | |
|---|---|---|---|---|---|
| <%= 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/new.html.erb b/app/views/types/new.html.erb index 0670946..4e138be 100644 --- a/app/views/types/new.html.erb +++ b/app/views/types/new.html.erb @@ -1,5 +1,7 @@ -
New type
- -<%= render 'form' %> - -<%= link_to 'Back', types_path %> +New type
+ +<%= render 'form' %> + +Listing Types
+ +
+
|
+
+
+ <%= link_to 'Show', type %> + <%= link_to 'Edit', edit_type_path(type) %> + <%= link_to 'Destroy', type, + :confirm => 'Are you sure?', + :method => :delete %> + |
+
Listing types
+ +| Name | +Description | ++ | + | + | |
|---|---|---|---|---|---|
| <%= 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..7202c4f 100644 --- a/app/views/types/show.html.erb +++ b/app/views/types/show.html.erb @@ -1,15 +1,16 @@ -
<%= notice %>
- -- Name: - <%= @type.name %> -
- -- Description: - <%= @type.description %> -
- - -<%= link_to 'Edit', edit_type_path(@type) %> | -<%= link_to 'Back', types_path %> +<%= notice %>
+ ++ Name: + <%= @type.name %> +
+ ++ Description: + <%= @type.description %> +
+ +<%= notice %>
+ ++ Name: + <%= @type.name %> +
+ ++ Description: + <%= @type.description %> +
+ ++ Updated at: + <%= @type.updated_at %> +
+ +<%= link_to 'Edit', edit_type_path(@type) %> | +<%= link_to 'Back', types_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 %> +
+ <%= f.number_field :trip_id %> +
+ <%= f.number_field :site_id %> +
+ <%= f.number_field :hour %> +
Editing visit
+ +<%= render 'form' %> + +Listing visits
+ +| Trip | +Site | +Hour | ++ | + | + |
|---|---|---|---|---|---|
| <%= 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 %> | +
New visit
+ +<%= render 'form' %> + +<%= notice %>
+ ++ Trip: + <%= @visit.trip_id %> +
+ ++ Site: + <%= @visit.site_id %> +
+ ++ Hour: + <%= @visit.hour %> +
+ +class ApplicationController
+ +module ApplicationHelper
+ +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.
+ +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
+ + +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+
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+
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+
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+
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+
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+
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+
module CommentsHelper
+ +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 URL se define así email
+ -
+
o así Pepe Rubio
+
Un número o letra seguido de punto genera una lista númerada
+-
+
+ permite generar negrita, igual que con +HTML
+ -
+
_ permite generar cursiva, igual que con HTML
+ -
+
permite generar letra de
+teletipo, igual quecon +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
+ + + + + +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+
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+
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+
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+
module PlanetHelper
+ +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.
+ +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
+ + +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+
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+
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+
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+
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+
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+
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+
module SitesHelper
+ +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).
+ +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
+ + +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+
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+
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+
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+
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+
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+
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+
module TripsHelper
+ +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.
+ +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
+ + +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+
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+
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+
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+
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+
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+
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+
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+
module TypesHelper
+ +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.
+ +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.
+ +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
+ + +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+
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+
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+
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+
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+
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+
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+
module VisitsHelper
+ +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.
+ +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 @@ + + + +
+ + +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 You may have mistyped the address or the page may have moved. You may have mistyped the address or the page may have moved. Maybe you tried to change something you didn't have access to. Maybe you tried to change something you didn't have access to. 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. 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. Método que crea el nuevo comentario. Rutas: POST /comments POST /comments.js POST /comments.json Método que permite eliminar un comentario. Rutas: DELETE /comments/:id DELETE /comments/:id.json Método que permite editar el comentario seleccionado. Ruta: GET /comments/:id/edit Método que muestra los comentarios asociados al sitio seleccionado. Rutas: GET /sites/:site_id/comments GET /sites/:site_id/comments.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 Método que muestra el comentario seleccionado. Rutas: GET /comments/:comment_id GET /comments/:comment_id.json Método que actualiza el comentario editado. Rutas: PUT /comments/:id PUT /comments/:id.json PlanetController ilustra el uso de
+RDoc. La documentación de un proyecto en genera en el
+directorio proy/doc en formato Web con 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í 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 o así Pepe Rubio Un número o letra seguido de punto genera una lista númerada + permite generar negrita, igual que con
+HTML _ permite generar cursiva, igual que con HTML permite generar letra de 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. Método que define una acción vacía del controlador. Ruta: GET /planet/contact Método que define una acción vacía del controlador. Ruta: GET /planet/ejemplo Método que define una acción vacía del controlador. Ruta: GET /planet/index Método que permite buscar por nombre y descripción sitios y viajes. Ruta: GET /planet/search 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. 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. Método que crea el nuevo sitio. Rutas: POST /sites POST /sites.json Método que permite eliminar un sitio. Rutas: DELETE /sites/:id DELETE /sites/:id.json Método que permite editar el sitio seleccionado. Ruta: GET /sites/:id/edit 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 Método que permite modificar un nuevo sitio. Rutas: GET /sites/new GET /sites/new.json Método que muestra el sitio seleccionado. Rutas: GET /sites/:id GET /sites/:id.json Método que actualiza el sitio editado. Rutas: PUT /sites/:id PUT /sites/:id.json 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). 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. Método que crea el nuevo viaje. Rutas: POST /trips POST /trips.json Método que permite eliminar un viaje. Rutas: DELETE /trips/:id DELETE /trips/:id.json Método que permite editar el viaje seleccionado. Ruta: GET /trips/:id/edit Método que muestra todos los viajes. Rutas: GET /trips GET /trips.json Método que permite modificar un nuevo viaje. Rutas: GET /trips/new GET /trips/new.json Método que muestra el viaje seleccionado. Rutas: GET /trips/:id GET /trips/:id.json Método que actualiza el viaje editado. Rutas: PUT /trips/:id PUT /trips/:id.json 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. 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. Método que crea el nuevo tipo. Rutas: POST /types POST /types.json Método que permite eliminar un tipo. Rutas: DELETE /types/:id DELETE /types/:id.json Método que permite editar el tipo seleccionado. Ruta: GET /types/:id/edit Método que muestra todos los tipos. Rutas: GET /types GET /types.json Método que permite modificar un nuevo tipo. Rutas: GET /types/new GET /types/new.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 Método que muestra el tipo seleccionado. Rutas: GET /types/:id GET /types/:id.json Método que actualiza el tipo editado. Rutas: PUT /types/:id PUT /types/:id.json 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. El modelo de visits define las visitas que componen cada viaje, es decir,
+los sitios que se desean visitar en dicho viaje. 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. Método que crea la nueva visita. Rutas: POST /visits POST /visits.js POST /visits.json Método que permite eliminar una visita. Rutas: DELETE /visits/1 DELETE /visits/1.json Método que permite editar la visita seleccionada. Ruta: GET /visits/1/edit Método que muestra todos las visitas. Rutas: GET /visits GET /visits.json Método que permite modificar una nueva visita. Rutas: GET /visits/new GET /visits/new.json Método que muestra la visita seleccionada. Rutas: GET /visits/1 GET /visits/1.json Método que actualiza la visita editada. Rutas: PUT /visits/1 PUT /visits/1.json 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. 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 Table of Contents - Rails Application Documentation
+
+Pages
+
+
+
+Classes/Modules
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Methods
+
+
+
+
+
+
+
diff --git a/public/404.html b/public/404.html
index 9a48320..a58079f 100644
--- a/public/404.html
+++ b/public/404.html
@@ -1,26 +1,26 @@
-
-
-
- The page you were looking for doesn't exist.
- The page you were looking for doesn't exist.
+ The change you wanted was rejected.
- The change you wanted was rejected.
+ We're sorry, but something went wrong.
- We're sorry, but something went wrong.
+ class ApplicationController
+
+ module ApplicationHelper
+
+ class Comment
+
+ Qué define este modelo
+
+class CommentsController
+
+ Qué hace este controlador
+
+Public Instance Methods
+
+
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # File app/controllers/comments_controller.rb, line 53
+def edit
+ @comment = current_user.comments.find(params[:id])
+ @site = @comment.site
+end
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+ module CommentsHelper
+
+ class PlanetController
+
+ $proy> rake doc:app
+
+Algunos comandos de formateo
+
+
+
+
+
+
+
+
+teletipo, igual que con
+HTMLQué hace este controlador
+
+Public Instance Methods
+
+
+
+
+
+
+
+
+
+ # File app/controllers/planet_controller.rb, line 34
+def contact
+end
+
+
+
+
+ # File app/controllers/planet_controller.rb, line 39
+def ejemplo
+end
+
+
+
+
+ # File app/controllers/planet_controller.rb, line 29
+def index
+end
+
+
+
+
+ # 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
+ module PlanetHelper
+
+ class Site
+
+ Qué define este modelo
+
+class SitesController
+
+ Qué hace este controlador
+
+
+
+ Public Instance Methods
+
+
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+ module SitesHelper
+
+ class Trip
+
+ Qué define este modelo
+
+class TripsController
+
+ Qué hace este controlador
+
+Public Instance Methods
+
+
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # File app/controllers/trips_controller.rb, line 50
+def edit
+ @trip = current_user.trips.find(params[:id])
+end
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+ module TripsHelper
+
+ class Type
+
+ Qué define este modelo
+
+class TypesController
+
+ Qué hace este controlador
+
+Public Instance Methods
+
+
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # File app/controllers/types_controller.rb, line 56
+def edit
+ @type = Type.find(params[:id])
+end
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+ module TypesHelper
+
+ class User
+
+ Qué define este modelo
+
+class Visit
+
+ Qué define este modelo
+
+class VisitsController
+
+ Qué hace este controlador
+
+Public Instance Methods
+
+
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # File app/controllers/visits_controller.rb, line 44
+def edit
+ @visit = Visit.find(params[:id])
+end
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+ module VisitsHelper
+
+ Table of Contents - Rails Application Documentation
+
+Pages
+
+
+
+Classes/Modules
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Methods
+
+
+
+
+
+
+
diff --git a/public/robots.txt b/public/robots.txt
index 085187f..caedd8e 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,5 +1,5 @@
-# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
-#
-# To ban all spiders from the entire site uncomment the next two lines:
-# User-Agent: *
-# Disallow: /
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-Agent: *
+# Disallow: /
diff --git a/script/rails b/script/rails
old mode 100755
new mode 100644
index f8da2cf..4276b36
--- a/script/rails
+++ b/script/rails
@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require File.expand_path('../../config/boot', __FILE__)
-require 'rails/commands'
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require File.expand_path('../../config/boot', __FILE__)
+require 'rails/commands'
diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml
new file mode 100644
index 0000000..72e0400
--- /dev/null
+++ b/test/fixtures/comments.yml
@@ -0,0 +1,13 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+ comment: MyString
+ user: one
+ site: one
+
+
+two:
+ comment: MyString2
+ user: two
+ site: one
+
diff --git a/test/fixtures/sites.yml b/test/fixtures/sites.yml
index 0b20b0a..4ee3df4 100644
--- a/test/fixtures/sites.yml
+++ b/test/fixtures/sites.yml
@@ -1,13 +1,16 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
-
-one:
- name: MyString
- description: MyText
- type_id: 1
- image_url: MyString
-
-two:
- name: MyString
- description: MyText
- type_id: 1
- image_url: MyString
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+ name: MyString
+ description: MyText
+ type: one
+ image_url: MyString
+ user: one
+
+two:
+ name: YourString
+ description: YourText
+ type: two
+ image_url: YourString
+ user: two
+
diff --git a/test/fixtures/trips.yml b/test/fixtures/trips.yml
new file mode 100644
index 0000000..bbe6c7a
--- /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-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 53b2c6a..49a7b4e 100644
--- a/test/fixtures/types.yml
+++ b/test/fixtures/types.yml
@@ -5,5 +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
new file mode 100644
index 0000000..fbfe998
--- /dev/null
+++ b/test/fixtures/users.yml
@@ -0,0 +1,17 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one:
+ name: Jose Perez
+ email: jose.perez@gmail.com
+ encrypted_password: perez22222
+# column: value
+#
+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
new file mode 100644
index 0000000..0cf5933
--- /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: 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
new file mode 100644
index 0000000..7b16a47
--- /dev/null
+++ b/test/functional/comments_controller_test.rb
@@ -0,0 +1,56 @@
+require 'test_helper'
+
+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, :site_id => @comment.to_param
+ assert_response :success
+ assert_not_nil assigns(:comments)
+ end
+
+ test "should get new" do
+ get :new, :site_id => @comment.to_param
+ assert_response :success
+ end
+
+ test "should create comment" do
+ assert_difference('Comment.count') do
+ post :create, comment: @update
+ end
+
+ assert_redirected_to @site
+ 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: @update
+ assert_redirected_to @site
+ end
+
+ test "should destroy comment" do
+ assert_difference('Comment.count', -1) do
+ delete :destroy, id: @comment
+ end
+
+ assert_redirected_to @site
+ end
+end
diff --git a/test/functional/planet_controller_test.rb b/test/functional/planet_controller_test.rb
index 88229e0..cdc5356 100644
--- a/test/functional/planet_controller_test.rb
+++ b/test/functional/planet_controller_test.rb
@@ -1,14 +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
-
-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
+
+ 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 beac6d1..aa5865c 100644
--- a/test/functional/sites_controller_test.rb
+++ b/test/functional/sites_controller_test.rb
@@ -1,49 +1,56 @@
-require 'test_helper'
-
-class SitesControllerTest < ActionController::TestCase
- setup do
- @site = sites(:one)
- end
-
- test "should get index" do
- get :index
- assert_response :success
- assert_not_nil assigns(:sites)
- end
-
- test "should get new" do
- get :new
- assert_response :success
- end
-
- test "should create site" do
- assert_difference('Site.count') do
- post :create, site: @site.attributes
- end
-
- assert_redirected_to site_path(assigns(:site))
- end
-
- test "should show site" do
- get :show, id: @site
- assert_response :success
- end
-
- test "should get edit" do
- get :edit, id: @site
- assert_response :success
- end
-
- test "should update site" do
- put :update, id: @site, site: @site.attributes
- assert_redirected_to site_path(assigns(:site))
- end
-
- test "should destroy site" do
- assert_difference('Site.count', -1) do
- delete :destroy, id: @site
- end
-
- assert_redirected_to sites_path
- end
-end
+require 'test_helper'
+
+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
+ get :index
+ assert_response :success
+ assert_not_nil assigns(:sites)
+ end
+
+ test "should get new" do
+ get :new
+ assert_response :success
+ end
+
+ test "should create site" do
+ assert_difference('Site.count') do
+ post :create, site: @update
+ end
+
+ assert_redirected_to site_path(assigns(:site))
+ end
+
+ test "should show site" do
+ get :show, id: @site
+ assert_response :success
+ end
+
+ test "should get edit" do
+ get :edit, id: @site
+ assert_response :success
+ end
+
+ test "should update site" do
+ put :update, id: @site, site: @update
+ assert_redirected_to site_path(assigns(:site))
+ end
+
+ test "should destroy site" do
+ assert_difference('Site.count', -1) do
+ delete :destroy, id: @site
+ end
+
+ assert_redirected_to sites_path
+ end
+end
diff --git a/test/functional/trips_controller_test.rb b/test/functional/trips_controller_test.rb
new file mode 100644
index 0000000..eb6f095
--- /dev/null
+++ b/test/functional/trips_controller_test.rb
@@ -0,0 +1,56 @@
+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 2e1931b..fa3eff6 100644
--- a/test/functional/types_controller_test.rb
+++ b/test/functional/types_controller_test.rb
@@ -1,49 +1,55 @@
-require 'test_helper'
-
-class TypesControllerTest < ActionController::TestCase
- setup do
- @type = types(:one)
- end
-
- test "should get index" do
- get :index
- assert_response :success
- assert_not_nil assigns(:types)
- end
-
- test "should get new" do
- get :new
- assert_response :success
- end
-
- test "should create type" do
- assert_difference('Type.count') do
- post :create, type: @type.attributes
- end
-
- assert_redirected_to type_path(assigns(:type))
- end
-
- test "should show type" do
- get :show, id: @type
- assert_response :success
- end
-
- test "should get edit" do
- get :edit, id: @type
- assert_response :success
- end
-
- test "should update type" do
- put :update, id: @type, type: @type.attributes
- assert_redirected_to type_path(assigns(:type))
- end
-
- test "should destroy type" do
- assert_difference('Type.count', -1) do
- delete :destroy, id: @type
- end
-
- assert_redirected_to types_path
- end
-end
+require 'test_helper'
+
+class TypesControllerTest < ActionController::TestCase
+ setup do
+ @type = types(:one)
+ @update = { # @update: parametros diferentes
+ :name => 'AnotherType',
+ :description => 'AnotherText',
+ }
+ @user = users(:one)
+ sign_in @user
+ end
+
+ test "should get index" do
+ get :index
+ assert_response :success
+ assert_not_nil assigns(:types)
+ end
+
+ test "should get new" do
+ get :new
+ assert_response :success
+ end
+
+ test "should create type" do
+ assert_difference('Type.count') do
+ post :create, type: @update
+ end
+
+ assert_redirected_to type_path(assigns(:type))
+ end
+
+ test "should show type" do
+ get :show, id: @type
+ assert_response :success
+ end
+
+ test "should get edit" do
+ get :edit, id: @type
+ assert_response :success
+ end
+
+ test "should update type" do
+ put :update, id: @type, type: @update
+ assert_redirected_to type_path(assigns(:type))
+ end
+
+ test "should destroy type" do
+ assert_difference('Type.count', -1) do
+ delete :destroy, id: @type
+ end
+
+ assert_redirected_to types_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..4453dcb
--- /dev/null
+++ b/test/functional/visits_controller_test.rb
@@ -0,0 +1,50 @@
+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/performance/browsing_test.rb b/test/performance/browsing_test.rb
index 3fea27b..d93cdda 100644
--- a/test/performance/browsing_test.rb
+++ b/test/performance/browsing_test.rb
@@ -1,12 +1,12 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class BrowsingTest < ActionDispatch::PerformanceTest
- # Refer to the documentation for all available options
- # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
- # :output => 'tmp/performance', :formats => [:flat] }
-
- def test_homepage
- get '/'
- end
-end
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class BrowsingTest < ActionDispatch::PerformanceTest
+ # Refer to the documentation for all available options
+ # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+ # :output => 'tmp/performance', :formats => [:flat] }
+
+ def test_homepage
+ get '/'
+ end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8bf1192..3bf88c0 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,13 +1,18 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
- # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
- #
- # Note: You'll currently still have to declare fixtures explicitly in integration tests
- # -- they do not yet inherit this setting
- fixtures :all
-
- # Add more helper methods to be used by all tests here...
-end
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+ # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+ #
+ # Note: You'll currently still have to declare fixtures explicitly in integration tests
+ # -- 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/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
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
diff --git a/test/unit/helpers/planet_helper_test.rb b/test/unit/helpers/planet_helper_test.rb
index b4082e5..930192d 100644
--- a/test/unit/helpers/planet_helper_test.rb
+++ b/test/unit/helpers/planet_helper_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
-
-class PlanetHelperTest < ActionView::TestCase
-end
+require 'test_helper'
+
+class PlanetHelperTest < ActionView::TestCase
+end
diff --git a/test/unit/helpers/sites_helper_test.rb b/test/unit/helpers/sites_helper_test.rb
index 0e92edf..73170b4 100644
--- a/test/unit/helpers/sites_helper_test.rb
+++ b/test/unit/helpers/sites_helper_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
-
-class SitesHelperTest < ActionView::TestCase
-end
+require 'test_helper'
+
+class SitesHelperTest < ActionView::TestCase
+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/types_helper_test.rb b/test/unit/helpers/types_helper_test.rb
index 5484466..1e0f758 100644
--- a/test/unit/helpers/types_helper_test.rb
+++ b/test/unit/helpers/types_helper_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
-
-class TypesHelperTest < ActionView::TestCase
-end
+require 'test_helper'
+
+class TypesHelperTest < 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/site_test.rb b/test/unit/site_test.rb
index 38c8dd0..e457320 100644
--- a/test/unit/site_test.rb
+++ b/test/unit/site_test.rb
@@ -1,7 +1,17 @@
-require 'test_helper'
-
-class SiteTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-end
+require 'test_helper'
+
+class SiteTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+
+ # site creado sin atributos es invalido y genera errores
+ test "Site attributes must not be empty" do
+ site = Site.new
+ assert site.invalid? # Test pasa si validación no pasa
+ assert site.errors[:name].any?
+ assert not(site.errors[:description].any?)
+ assert site.errors[:type_id].any?
+ # assert site.errors[:image_url].any? not used with paperclip
+ end
+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/type_test.rb b/test/unit/type_test.rb
index 0ce1172..c33e6ac 100644
--- a/test/unit/type_test.rb
+++ b/test/unit/type_test.rb
@@ -1,7 +1,15 @@
-require 'test_helper'
-
-class TypeTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-end
+require 'test_helper'
+
+class TypeTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+
+ # type creado sin atributos es invalido y genera errores
+ test "Type attributes must not be empty" do
+ type = Type.new
+ assert type.invalid? # Test pasa si validación no pasa
+ assert type.errors[:name].any?
+ assert type.errors[:description].any?
+ end
+end
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
new file mode 100644
index 0000000..543db34
--- /dev/null
+++ b/test/unit/user_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserTest < 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