ActionItem501: fixed some bugs in teser

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2190 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem501: fixed some bugs in teser
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2190 3f533792-8f58-4932-b0fe-aaf55b0a4547
MoisesMachado
1 parent 1c0d419c
Showing 8 changed files with 70 additions and 68 deletions Show diff stats
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/views/search/index.rhtml
app/views/search/people.rhtml
app/views/search/products.rhtml
lib/sqlite_extension.rb
script/fbes_populate_helper.rb
test/functional/search_controller_test.rb
@@ -158,8 +158,7 @@ class SearchController &lt; ApplicationController
     @filtered_query = remove_stop_words(@query)
     @product_category = ProductCategory.find(params[:product_category]) if params[:product_category]
-    # FIXME name is not unique
-    @region = City.find_by_id(params[:city]) if params[:city]
+    @region = City.find_by_id(params[:city]) if !params[:city].blank? && params[:city] =~ /^\d+$/
     # how many assets we are searching for?
     number_of_result_assets = @searching.values.select{|v| v}.size
@@ -622,4 +622,13 @@ module ApplicationHelper
     form_for(name, object, { :builder => NoosferoFormBuilder }.merge(options), &proc)
   end
+  def search_page_title(title, options={})
+    title = "<h1>" + title + "</h1>"
+    title += "<h2 align='center'>" + _("Searched for '%s'") % options[:query] + "</h2>" if !options[:query].blank?
+    title += "<h2 align='center'>" + _("In category %s") % options[:category] + "</h2>" if !options[:category].blank?
+    title += "<h2 align='center'>" + _("within %d from %s") % [options[:distance], options[:region]] + "</h2>" if !options[:distance].blank? && !options[:region].blank?
+    title += "<h2 align='center'>" + _("%d results found") % options[:total_results] + "</h2>" if !options[:total_results].blank?
+    title
+  end
+
 end
 <div id="search-page">
-<h1> <%=h @category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query) %> </h1>
+<%= search_page_title('', :query => @query, :category => @category ? @category.name : nil, :total_results => @total_results) %>
 <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
-<% if @query.blank? %>
-  <h1>
-    <% if @category %>
-      <%= @category.name %>:<br/>
-    <% end %>
-
-    <%= @asset_name %>
-    <% if params[:initial] %>
-      <%= '(%s)' % params[:initial].upcase %>
-    <% else %>
-      <%= _('(recently added)') %>
-    <% end %>
-  </h1>
-<% else %>
-  <h1> <%= @asset_name %>: <%= h(@category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query)) %> </h1>
-  <div style='text-align: center'>
-    <%= link_to _('Browse by name'), :action => 'assets', :asset => @results.keys.first %>
-  </div>
-<% end %>
+<%= search_page_title( _('People'), { :query => @query, 
+                                      :category => @category, 
+                                      :total_results => @total_results, 
+                                      :region => @region ? @region.name : nil, 
+                                      :distance => @radius } ) %>
 <%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %>
-<h1> 
-  <% if !@query.blank? %>
-      <%=h @category ? (_('Products and Services results for "%{query}" of enterprises in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Products and Services results for "%s"') % @query) %> 
-  <% else %>
-    <%=h @category ? (_('Products and Services of enterprises in "%s"') % @category.name) : _('Products and Services') %>
-  <% end %>
-</h1>
-
-<% if @radius && @region %>
-  <h2><%=h (_('Within %s km from %s') % [@radius, @region.name]) %><h2>
-<% end %>
+<%= search_page_title( _('Products and Services'), { :query => @query, 
+                                                     :category => @category, 
+                                                     :total_results => @total_results, 
+                                                     :region => @region ? @region.name : nil, 
+                                                     :distance => @radius } ) %>
 <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
-if ActiveRecord::Base.connection.adapter_name =~ /^sqlite$/i
+if ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
   database = ActiveRecord::Base.connection.raw_connection
@@ -2,33 +2,33 @@ require File.dirname(__FILE__) + &#39;/../config/environment&#39;
 require 'console_with_helpers'
 STATES = {
-  12 => Region.find_by_name('Acre'),
-  27 => Region.find_by_name('Alagoas'),
-  13 => Region.find_by_name('Amazonas'),
-  16 => Region.find_by_name('Amapá'),
-  29 => Region.find_by_name('Bahia'),
-  23 => Region.find_by_name('Ceará'),
-  53 => Region.find_by_name('Distrito Federal'),
-  32 => Region.find_by_name('Espírito Santo'),
-  52 => Region.find_by_name('Goiás'),
-  21 => Region.find_by_name('Maranhão'),
-  31 => Region.find_by_name('Minas Gerais'),
-  50 => Region.find_by_name('Mato Grosso do Sul'),
-  51 => Region.find_by_name('Mato Grosso'),
-  15 => Region.find_by_name('Pará'),
-  25 => Region.find_by_name('Paraíba'),
-  26 => Region.find_by_name('Pernambuco'),
-  22 => Region.find_by_name('Piauí'),
-  41 => Region.find_by_name('Paraná'),
-  33 => Region.find_by_name('Rio de Janeiro'),
-  24 => Region.find_by_name('Rio Grande do Norte'),
-  11 => Region.find_by_name('Rondônia'),
-  14 => Region.find_by_name('Roraima'),
-  43 => Region.find_by_name('Rio Grande do Sul'),
-  42 => Region.find_by_name('Santa Catarina'),
-  28 => Region.find_by_name('Sergipe'),
-  35 => Region.find_by_name('São Paulo'),
-  17 => Region.find_by_name('Tocantins'),
+  12 => State.find_by_name('Acre'),
+  27 => State.find_by_name('Alagoas'),
+  13 => State.find_by_name('Amazonas'),
+  16 => State.find_by_name('Amapá'),
+  29 => State.find_by_name('Bahia'),
+  23 => State.find_by_name('Ceará'),
+  53 => State.find_by_name('Distrito Federal'),
+  32 => State.find_by_name('Espírito Santo'),
+  52 => State.find_by_name('Goiás'),
+  21 => State.find_by_name('Maranhão'),
+  31 => State.find_by_name('Minas Gerais'),
+  50 => State.find_by_name('Mato Grosso do Sul'),
+  51 => State.find_by_name('Mato Grosso'),
+  15 => State.find_by_name('Pará'),
+  25 => State.find_by_name('Paraíba'),
+  26 => State.find_by_name('Pernambuco'),
+  22 => State.find_by_name('Piauí'),
+  41 => State.find_by_name('Paraná'),
+  33 => State.find_by_name('Rio de Janeiro'),
+  24 => State.find_by_name('Rio Grande do Norte'),
+  11 => State.find_by_name('Rondônia'),
+  14 => State.find_by_name('Roraima'),
+  43 => State.find_by_name('Rio Grande do Sul'),
+  42 => State.find_by_name('Santa Catarina'),
+  28 => State.find_by_name('Sergipe'),
+  35 => State.find_by_name('São Paulo'),
+  17 => State.find_by_name('Tocantins'),
 }
 COUNT = {
@@ -53,8 +53,8 @@ end
   def new_region(name, parent, lat, lng)
     path = (parent ? parent.path + '/' : '') + name.to_slug
-    region = Region.find_by_path(path) 
-    region = Region.create!(:name => name, :parent => parent, :lat => lat, :lng => lng, :environment => $default_env) unless region
+    region = City.find_by_path(path) 
+    region = City.create!(:name => name, :parent => parent, :lat => lat, :lng => lng, :environment => $default_env) unless region
     step(:regions)
     region
   end
@@ -62,8 +62,8 @@ end
   def new_ent(data, products, consumptions)
     count = 2
     ident = data[:identifier]
-    idents = Enterprise.find(:all, :conditons => ['identifier like ?', ident + '%']).map(&:identifier)
-    while idents.includes?(ident)
+    idents = Enterprise.find(:all, :conditions => ['identifier like ?', ident + '%']).map(&:identifier)
+    while idents.include?(ident)
       ident = data[:identifier] + "-#{count}"
       count += 1
     end
@@ -354,8 +354,9 @@ class SearchControllerTest &lt; Test::Unit::TestCase
   should 'display option to search within a given point and distance' do
     get :popup
-    assert_tag :tag => 'input', :attributes => {:type => 'text', :name => 'radius'}
-    assert_tag :tag => 'input', :attributes => {:type => 'text', :name => 'region[name]'}
+    assert_tag :tag => 'select', :attributes => {:name => 'radius'}
+    assert_tag :tag => 'select', :attributes => {:name => 'state'}
+    assert_tag :tag => 'select', :attributes => {:name => 'city'}
   end
   should 'search in whole site when told so' do
@@ -489,7 +490,8 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     child = Category.create!(:name => "Child Category", :environment => Environment.default, :parent => parent)
     get :index, :category_path => [ 'parent-category', 'child-category' ], :query => 'a sample search'
-    assert_tag :tag => 'h1', :content => /Search results for &quot;a sample search&quot; in &quot;Child Category&quot;/
+    assert_tag :tag => 'h2', :content => /Searched for 'a sample search'/
+    assert_tag :tag => 'h2', :content => /In category Child Category/
   end
   should 'search in category hierachy' do
@@ -885,6 +887,18 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => "form", :attributes => { :class => 'search_form', :action => '/search' }
   end
+  should 'treat blank input for the city id' do
+    get :index, :city => ''
+
+    assert_equal nil, assigns(:region)
+  end
+  
+  should 'treat non-numeric input for the city id' do
+    get :index, :city => 'bla'
+
+    assert_equal nil, assigns(:region)
+  end
+
   ##################################################################
   ##################################################################
	@@ -158,8 +158,7 @@ class SearchController < ApplicationController		@@ -158,8 +158,7 @@ class SearchController < ApplicationController
158	@filtered_query = remove_stop_words(@query)	158	@filtered_query = remove_stop_words(@query)
159	@product_category = ProductCategory.find(params[:product_category]) if params[:product_category]	159	@product_category = ProductCategory.find(params[:product_category]) if params[:product_category]
160		160
161	- # FIXME name is not unique
162	- @region = City.find_by_id(params[:city]) if params[:city]	161	+ @region = City.find_by_id(params[:city]) if !params[:city].blank? && params[:city] =~ /^\d+$/
163		162
164	# how many assets we are searching for?	163	# how many assets we are searching for?
165	number_of_result_assets = @searching.values.select{\|v\| v}.size	164	number_of_result_assets = @searching.values.select{\|v\| v}.size
	@@ -622,4 +622,13 @@ module ApplicationHelper		@@ -622,4 +622,13 @@ module ApplicationHelper
622	form_for(name, object, { :builder => NoosferoFormBuilder }.merge(options), &proc)	622	form_for(name, object, { :builder => NoosferoFormBuilder }.merge(options), &proc)
623	end	623	end
624		624
		625	+ def search_page_title(title, options={})
		626	+ title = "<h1>" + title + "</h1>"
		627	+ title += "<h2 align='center'>" + _("Searched for '%s'") % options[:query] + "</h2>" if !options[:query].blank?
		628	+ title += "<h2 align='center'>" + _("In category %s") % options[:category] + "</h2>" if !options[:category].blank?
		629	+ title += "<h2 align='center'>" + _("within %d from %s") % [options[:distance], options[:region]] + "</h2>" if !options[:distance].blank? && !options[:region].blank?
		630	+ title += "<h2 align='center'>" + _("%d results found") % options[:total_results] + "</h2>" if !options[:total_results].blank?
		631	+ title
		632	+ end
		633	+
625	end	634	end
1	<div id="search-page">	1	<div id="search-page">
2		2
3	-<h1> <%=h @category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query) %> </h1>	3	+<%= search_page_title('', :query => @query, :category => @category ? @category.name : nil, :total_results => @total_results) %>
4		4
5	<%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>	5	<%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
6		6
1	-<% if @query.blank? %>
2	- <h1>
3	- <% if @category %>
4	- <%= @category.name %>:<br/>
5	- <% end %>
6	-
7	- <%= @asset_name %>
8	- <% if params[:initial] %>
9	- <%= '(%s)' % params[:initial].upcase %>
10	- <% else %>
11	- <%= _('(recently added)') %>
12	- <% end %>
13	- </h1>
14	-<% else %>
15	- <h1> <%= @asset_name %>: <%= h(@category ? (_('Search results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Search results for "%s"') % @query)) %> </h1>
16	- <div style='text-align: center'>
17	- <%= link_to _('Browse by name'), :action => 'assets', :asset => @results.keys.first %>
18	- </div>
19	-<% end %>	1	+<%= search_page_title( _('People'), { :query => @query,
		2	+ :category => @category,
		3	+ :total_results => @total_results,
		4	+ :region => @region ? @region.name : nil,
		5	+ :distance => @radius } ) %>
20		6
21	<%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %>	7	<%= render :partial => 'search_form', :locals => { :form_title => @query.blank? ? _('Search') : _("Refine your search"), :simple_search => true } %>
22		8
1	-<h1>
2	- <% if !@query.blank? %>
3	- <%=h @category ? (_('Products and Services results for "%{query}" of enterprises in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Products and Services results for "%s"') % @query) %>
4	- <% else %>
5	- <%=h @category ? (_('Products and Services of enterprises in "%s"') % @category.name) : _('Products and Services') %>
6	- <% end %>
7	-</h1>
8	-
9	-<% if @radius && @region %>
10	- <h2><%=h (_('Within %s km from %s') % [@radius, @region.name]) %><h2>
11	-<% end %>	1	+<%= search_page_title( _('Products and Services'), { :query => @query,
		2	+ :category => @category,
		3	+ :total_results => @total_results,
		4	+ :region => @region ? @region.name : nil,
		5	+ :distance => @radius } ) %>
12		6
13	<%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>	7	<%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
14		8
1	-if ActiveRecord::Base.connection.adapter_name =~ /^sqlite$/i	1	+if ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
2		2
3	database = ActiveRecord::Base.connection.raw_connection	3	database = ActiveRecord::Base.connection.raw_connection
4		4
	@@ -2,33 +2,33 @@ require File.dirname(__FILE__) + '/../config/environment'		@@ -2,33 +2,33 @@ require File.dirname(__FILE__) + '/../config/environment'
2	require 'console_with_helpers'	2	require 'console_with_helpers'
3		3
4	STATES = {	4	STATES = {
5	- 12 => Region.find_by_name('Acre'),
6	- 27 => Region.find_by_name('Alagoas'),
7	- 13 => Region.find_by_name('Amazonas'),
8	- 16 => Region.find_by_name('Amapá'),
9	- 29 => Region.find_by_name('Bahia'),
10	- 23 => Region.find_by_name('Ceará'),
11	- 53 => Region.find_by_name('Distrito Federal'),
12	- 32 => Region.find_by_name('Espírito Santo'),
13	- 52 => Region.find_by_name('Goiás'),
14	- 21 => Region.find_by_name('Maranhão'),
15	- 31 => Region.find_by_name('Minas Gerais'),
16	- 50 => Region.find_by_name('Mato Grosso do Sul'),
17	- 51 => Region.find_by_name('Mato Grosso'),
18	- 15 => Region.find_by_name('Pará'),
19	- 25 => Region.find_by_name('Paraíba'),
20	- 26 => Region.find_by_name('Pernambuco'),
21	- 22 => Region.find_by_name('Piauí'),
22	- 41 => Region.find_by_name('Paraná'),
23	- 33 => Region.find_by_name('Rio de Janeiro'),
24	- 24 => Region.find_by_name('Rio Grande do Norte'),
25	- 11 => Region.find_by_name('Rondônia'),
26	- 14 => Region.find_by_name('Roraima'),
27	- 43 => Region.find_by_name('Rio Grande do Sul'),
28	- 42 => Region.find_by_name('Santa Catarina'),
29	- 28 => Region.find_by_name('Sergipe'),
30	- 35 => Region.find_by_name('São Paulo'),
31	- 17 => Region.find_by_name('Tocantins'),	5	+ 12 => State.find_by_name('Acre'),
		6	+ 27 => State.find_by_name('Alagoas'),
		7	+ 13 => State.find_by_name('Amazonas'),
		8	+ 16 => State.find_by_name('Amapá'),
		9	+ 29 => State.find_by_name('Bahia'),
		10	+ 23 => State.find_by_name('Ceará'),
		11	+ 53 => State.find_by_name('Distrito Federal'),
		12	+ 32 => State.find_by_name('Espírito Santo'),
		13	+ 52 => State.find_by_name('Goiás'),
		14	+ 21 => State.find_by_name('Maranhão'),
		15	+ 31 => State.find_by_name('Minas Gerais'),
		16	+ 50 => State.find_by_name('Mato Grosso do Sul'),
		17	+ 51 => State.find_by_name('Mato Grosso'),
		18	+ 15 => State.find_by_name('Pará'),
		19	+ 25 => State.find_by_name('Paraíba'),
		20	+ 26 => State.find_by_name('Pernambuco'),
		21	+ 22 => State.find_by_name('Piauí'),
		22	+ 41 => State.find_by_name('Paraná'),
		23	+ 33 => State.find_by_name('Rio de Janeiro'),
		24	+ 24 => State.find_by_name('Rio Grande do Norte'),
		25	+ 11 => State.find_by_name('Rondônia'),
		26	+ 14 => State.find_by_name('Roraima'),
		27	+ 43 => State.find_by_name('Rio Grande do Sul'),
		28	+ 42 => State.find_by_name('Santa Catarina'),
		29	+ 28 => State.find_by_name('Sergipe'),
		30	+ 35 => State.find_by_name('São Paulo'),
		31	+ 17 => State.find_by_name('Tocantins'),
32	}	32	}
33		33
34	COUNT = {	34	COUNT = {
	@@ -53,8 +53,8 @@ end		@@ -53,8 +53,8 @@ end
53		53
54	def new_region(name, parent, lat, lng)	54	def new_region(name, parent, lat, lng)
55	path = (parent ? parent.path + '/' : '') + name.to_slug	55	path = (parent ? parent.path + '/' : '') + name.to_slug
56	- region = Region.find_by_path(path)
57	- region = Region.create!(:name => name, :parent => parent, :lat => lat, :lng => lng, :environment => $default_env) unless region	56	+ region = City.find_by_path(path)
		57	+ region = City.create!(:name => name, :parent => parent, :lat => lat, :lng => lng, :environment => $default_env) unless region
58	step(:regions)	58	step(:regions)
59	region	59	region
60	end	60	end
	@@ -62,8 +62,8 @@ end		@@ -62,8 +62,8 @@ end
62	def new_ent(data, products, consumptions)	62	def new_ent(data, products, consumptions)
63	count = 2	63	count = 2
64	ident = data[:identifier]	64	ident = data[:identifier]
65	- idents = Enterprise.find(:all, :conditons => ['identifier like ?', ident + '%']).map(&:identifier)
66	- while idents.includes?(ident)	65	+ idents = Enterprise.find(:all, :conditions => ['identifier like ?', ident + '%']).map(&:identifier)
		66	+ while idents.include?(ident)
67	ident = data[:identifier] + "-#{count}"	67	ident = data[:identifier] + "-#{count}"
68	count += 1	68	count += 1
69	end	69	end