Permalink
Browse files

adding .gems

  • Loading branch information...
1 parent 886cd2f commit 693c8a47e06edd61fee3f1db2a574ba9636e2ac3 @ivanacostarubio committed Dec 11, 2009
View
4 .gems
@@ -1 +1,3 @@
-geokit
+geokit
+factory_girl
+cucumber
View
6 app/controllers/tiendas_controller.rb
@@ -1,12 +1,8 @@
class TiendasController < ApplicationController
before_filter :procesar_ciudades, :cuantos_churromanias
geocode_ip_address
-
- def buscar
- end
-
- # GET /tiendas
+ # GET /tiendas
# GET /tiendas.xml
def index
@tiendas = Tienda.find(:all)
View
7 app/views/buscar/show.erb
@@ -5,9 +5,4 @@
</div>
<% end %>
-
-
-<% if params[:admin] == "yes" %>
- <%= link_to 'Editar', edit_tienda_path(@tienda) %> |
- <%= link_to 'Borrar', @tienda ,:confirm => '¿Seguro?', :method => :delete %>
-<% end %>
+<%= render :partial => '/layouts/admin_bar' %>
View
4 app/views/layouts/_admin_bar.erb
@@ -0,0 +1,4 @@
+<% if params[:admin] == "yes" %>
+ <%= link_to 'Editar', edit_tienda_path(@tienda) %> |
+ <%= link_to 'Borrar', @tienda ,:confirm => '¿Seguro?', :method => :delete %>
+<% end %>
View
1 app/views/layouts/application.html.erb
@@ -15,6 +15,7 @@
<%= link_to image_tag('/images/logo.png'), '/' %>
<%= image_tag '/images/locations.png' %>
+ <% session[:geo_location] %>
<div class="ciudades">
Todas las Ciudades
View
6 app/views/tiendas/show.html.erb
@@ -9,8 +9,4 @@
<%=h @tienda.direccion %>
</div>
-
-<% if params[:admin] == "yes" %>
- <%= link_to 'Editar', edit_tienda_path(@tienda) %> |
- <%= link_to 'Borrar', @tienda ,:confirm => '¿Seguro?', :method => :delete %>
-<% end %>
+<%= render :partial => '/layouts/admin_bar' %>
View
3,673 log/cucumber.log
3,673 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
122 log/development.log
@@ -16480,3 +16480,125 @@ Rendering template within layouts/application
Rendering buscar/show
Rendered tiendas/_new (12.1ms)
Completed in 49ms (View: 23, DB: 3) | 200 OK [http://127.0.0.1/buscar/ORLANDO]
+ SQL (0.1ms) SET SQL_AUTO_IS_NULL=0
+
+
+Processing BuscarController#show (for 127.0.0.1 at 2009-12-11 10:39:07) [GET]
+ Parameters: {"id"=>"PEMBROKE PINES"}
+ Tienda Load (0.4ms) SELECT * FROM `tiendas` 
+ Tienda Columns (1.7ms) SHOW FIELDS FROM `tiendas`
+ SQL (0.2ms) SELECT count(*) AS count_all FROM `tiendas` 
+ Tienda Load (0.3ms) SELECT * FROM `tiendas` WHERE (`tiendas`.`ciudad` = 'PEMBROKE PINES') 
+Rendering template within layouts/application
+Rendering buscar/show
+Rendered tiendas/_new (11.7ms)
+Completed in 47ms (View: 23, DB: 3) | 200 OK [http://127.0.0.1/buscar/PEMBROKE%20PINES]
+ SQL (0.1ms) SET SQL_AUTO_IS_NULL=0
+
+
+Processing TiendasController#index (for 127.0.0.1 at 2009-12-11 10:39:09) [GET]
+ Tienda Load (0.5ms) SELECT * FROM `tiendas` 
+ Tienda Columns (2.1ms) SHOW FIELDS FROM `tiendas`
+ SQL (0.2ms) SELECT count(*) AS count_all FROM `tiendas` 
+ CACHE (0.0ms) SELECT * FROM `tiendas` 
+Rendering template within layouts/application
+Rendering tiendas/index
+Rendered tiendas/_new (9.9ms)
+Completed in 542ms (View: 42, DB: 3) | 200 OK [http://127.0.0.1/]
+ SQL (0.1ms) SET SQL_AUTO_IS_NULL=0
+
+
+Processing TiendasController#index (for 127.0.0.1 at 2009-12-11 10:39:19) [GET]
+ Tienda Load (1.4ms) SELECT * FROM `tiendas` 
+ Tienda Columns (1.7ms) SHOW FIELDS FROM `tiendas`
+ SQL (0.3ms) SELECT count(*) AS count_all FROM `tiendas` 
+ CACHE (0.0ms) SELECT * FROM `tiendas` 
+Rendering template within layouts/application
+Rendering tiendas/index
+Rendered tiendas/_new (9.8ms)
+Completed in 512ms (View: 40, DB: 3) | 200 OK [http://127.0.0.1/]
+ SQL (0.2ms) SET SQL_AUTO_IS_NULL=0
+
+
+Processing TiendasController#index (for 127.0.0.1 at 2009-12-11 11:00:19) [GET]
+ Tienda Load (0.5ms) SELECT * FROM `tiendas` 
+ Tienda Columns (2.0ms) SHOW FIELDS FROM `tiendas`
+ SQL (0.3ms) SELECT count(*) AS count_all FROM `tiendas` 
+ CACHE (0.0ms) SELECT * FROM `tiendas` 
+Rendering template within layouts/application
+Rendering tiendas/index
+Rendered tiendas/_new (9.9ms)
+Completed in 571ms (View: 41, DB: 3) | 200 OK [http://127.0.0.1/]
+ SQL (0.1ms) SET SQL_AUTO_IS_NULL=0
+
+
+Processing BuscarController#show (for 127.0.0.1 at 2009-12-11 11:01:52) [GET]
+ Parameters: {"id"=>"CIUDADBOLIVAR"}
+ Tienda Load (0.5ms) SELECT * FROM `tiendas` 
+ Tienda Columns (1.9ms) SHOW FIELDS FROM `tiendas`
+ SQL (0.2ms) SELECT count(*) AS count_all FROM `tiendas` 
+ Tienda Load (0.3ms) SELECT * FROM `tiendas` WHERE (`tiendas`.`ciudad` = 'CIUDADBOLIVAR') 
+Rendering template within layouts/application
+Rendering buscar/show
+Rendered tiendas/_new (12.4ms)
+Completed in 54ms (View: 24, DB: 3) | 200 OK [http://127.0.0.1/buscar/CIUDADBOLIVAR]
+ SQL (0.1ms) SET SQL_AUTO_IS_NULL=0
+
+
+Processing TiendasController#index (for 127.0.0.1 at 2009-12-11 11:02:23) [GET]
+ Tienda Load (0.6ms) SELECT * FROM `tiendas` 
+ Tienda Columns (2.2ms) SHOW FIELDS FROM `tiendas`
+ SQL (0.2ms) SELECT count(*) AS count_all FROM `tiendas` 
+ CACHE (0.0ms) SELECT * FROM `tiendas` 
+Rendering template within layouts/application
+Rendering tiendas/index
+Rendered tiendas/_new (10.3ms)
+Completed in 439ms (View: 41, DB: 3) | 200 OK [http://127.0.0.1/]
+ SQL (0.1ms) SET SQL_AUTO_IS_NULL=0
+
+
+Processing TiendasController#index (for 127.0.0.1 at 2009-12-11 11:08:41) [GET]
+ Tienda Load (0.5ms) SELECT * FROM `tiendas` 
+ Tienda Columns (1.5ms) SHOW FIELDS FROM `tiendas`
+ SQL (0.4ms) SELECT count(*) AS count_all FROM `tiendas` 
+ CACHE (0.0ms) SELECT * FROM `tiendas` 
+Rendering template within layouts/application
+Rendering tiendas/index
+
+ActionView::TemplateError (undefined local variable or method `sessions' for #<ActionView::Base:0x10305e688>) on line #18 of app/views/layouts/application.html.erb:
+15: <%= link_to image_tag('/images/logo.png'), '/' %>
+16: <%= image_tag '/images/locations.png' %>
+17:
+18: <% sessions[:geo_location] %>
+19:
+20: <div class="ciudades">
+21: Todas las Ciudades
+
+ app/views/layouts/application.html.erb:18
+ app/controllers/tiendas_controller.rb:14:in `index'
+ /usr/local/lib/ruby/1.8/webrick/httpserver.rb:104:in `service'
+ /usr/local/lib/ruby/1.8/webrick/httpserver.rb:65:in `run'
+ /usr/local/lib/ruby/1.8/webrick/server.rb:173:in `start_thread'
+ /usr/local/lib/ruby/1.8/webrick/server.rb:162:in `start'
+ /usr/local/lib/ruby/1.8/webrick/server.rb:162:in `start_thread'
+ /usr/local/lib/ruby/1.8/webrick/server.rb:95:in `start'
+ /usr/local/lib/ruby/1.8/webrick/server.rb:92:in `each'
+ /usr/local/lib/ruby/1.8/webrick/server.rb:92:in `start'
+ /usr/local/lib/ruby/1.8/webrick/server.rb:23:in `start'
+ /usr/local/lib/ruby/1.8/webrick/server.rb:82:in `start'
+
+Rendered rescues/_trace (91.8ms)
+Rendered rescues/_request_and_response (0.5ms)
+Rendering rescues/layout (internal_server_error)
+ SQL (0.1ms) SET SQL_AUTO_IS_NULL=0
+
+
+Processing TiendasController#index (for 127.0.0.1 at 2009-12-11 11:08:47) [GET]
+ Tienda Load (0.5ms) SELECT * FROM `tiendas` 
+ Tienda Columns (1.6ms) SHOW FIELDS FROM `tiendas`
+ SQL (0.2ms) SELECT count(*) AS count_all FROM `tiendas` 
+ CACHE (0.0ms) SELECT * FROM `tiendas` 
+Rendering template within layouts/application
+Rendering tiendas/index
+Rendered tiendas/_new (10.1ms)
+Completed in 452ms (View: 52, DB: 2) | 200 OK [http://127.0.0.1/]

0 comments on commit 693c8a4

Please sign in to comment.