ActionItem280: PostgreSQL porting

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

ActionItem280: PostgreSQL porting
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1749 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent a03718fe
Showing 11 changed files with 71 additions and 90 deletions Show diff stats
app/controllers/public/search_controller.rb
app/models/article.rb
app/models/category_finder.rb
app/models/comment.rb
app/models/environment_finder.rb
app/models/product.rb
app/models/profile.rb
test/functional/search_controller_test.rb
test/unit/category_finder_test.rb
test/unit/environment_finder_test.rb
test/unit/sqlite_extension_test.rb
@@ -67,7 +67,7 @@ class SearchController &lt; ApplicationController
     @results = {}
     @names = {}
     SEARCH_IN.each do |key, description|
-      @results[key] = @finder.send(key, @filtered_query) if @searching[key]
+      @results[key] = @finder.find(key, @filtered_query) if @searching[key]
       @names[key] = gettext(description)
     end
   end
@@ -113,7 +113,7 @@ class Article &lt; ActiveRecord::Base
   end
   def self.find_by_initial(initial)
-    self.find(:all, :order => 'articles.name', :conditions => [ 'articles.name like (?)', initial + '%'])
+    self.find(:all, :order => 'articles.name', :conditions => [ 'articles.name like (?) or articles.name like (?)', initial + '%', initial.upcase + '%'])
   end
   private
@@ -7,28 +7,8 @@ class CategoryFinder
   attr_reader :category_ids
-  def articles(query='*', options={})
-    find_in_categorized(Article, query, options)
-  end
-
-  def people(query='*', options={})
-    find_in_categorized(Person, query, options)
-  end
-
-  def communities(query='*', options={})
-    find_in_categorized(Community, query, options)
-  end
-
-  def enterprises(query='*', options={})
-    find_in_categorized(Enterprise, query, options)
-  end
-
-  def products(query='*', options={})
-    find_in_categorized(Product, query, options)
-  end
-
-  def comments(query='*', options={})
-    find_in_categorized(Comment, query, options)
+  def find(asset, query)
+    find_in_categorized(asset.to_s.singularize.camelize.constantize, query)
   end
   def recent(asset, limit = 10)
@@ -70,11 +50,11 @@ class CategoryFinder
     # FIXME copy/pasted from options_for_find above !!!
     case klass.name
     when 'Comment'
-      {:select => 'distinct comments.*', :joins => 'inner join articles_categories on articles_categories.article_id = comments.article_id', :conditions => ['articles_categories.category_id in (?) and comments.title like (?)', category_ids, initial + '%']}
+      {:select => 'distinct comments.*', :joins => 'inner join articles_categories on articles_categories.article_id = comments.article_id', :conditions => ['articles_categories.category_id in (?) and (comments.title like (?) or comments.title like (?))', category_ids, initial + '%', initial.upcase + '%']}
     when 'Product'
-      {:select => 'distinct products.*', :joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id in (?) and products.name like (?)', category_ids, initial + '%']}
+      {:select => 'distinct products.*', :joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id in (?) and (products.name like (?) or products.name like (?))', category_ids, initial + '%', initial.upcase + '%']}
     when 'Article', 'Person', 'Community', 'Enterprise'
-      {:include => 'categories', :conditions => ['categories.id IN (?) and %s.name like (?)' % klass.table_name, category_ids, initial + '%']}
+      {:include => 'categories', :conditions => ['categories.id IN (?) and (%s.name like (?) or %s.name like (?))' % [klass.table_name, klass.table_name], category_ids, initial + '%', initial.upcase + '%']}
     else
       raise "unreconized class #{klass.name}"
     end
@@ -42,7 +42,7 @@ class Comment &lt; ActiveRecord::Base
   end
   def self.find_by_initial(initial)
-    self.find(:all, :order => 'comments.title', :conditions => ['comments.title like (?)', initial + '%'])
+    self.find(:all, :order => 'comments.title', :conditions => ['comments.title like (?) or comments.title like (?)', initial + '%', initial.upcase + '%'])
   end
 end
@@ -4,33 +4,13 @@ class EnvironmentFinder
     @environment = env
   end
-  def articles(query='*', options = {})
-    @environment.articles.find_by_contents(query, {}, options)
-  end
-  
-  def people(query='*', options = {})
-    @environment.people.find_by_contents(query, {}, options)
-  end
-  
-  def communities(query='*', options = {})
-    @environment.communities.find_by_contents(query, {}, options)
-  end
-  
-  def products(query='*', options = {})
-    @environment.products.find_by_contents(query, {}, options)
-  end
-  
-  def enterprises(query='*', options = {})
-    @environment.enterprises.find_by_contents(query, {}, options)
-  end
-  
-  def comments(query='*', options = {})
-    @environment.comments.find_by_contents(query, {}, options)
+  def find(asset, query)
+    @environment.send(asset).find_by_contents(query)
   end
   def recent(asset, limit = 10)
     with_options :limit => limit, :order => 'created_at desc, id desc' do |finder|
-      finder.send(asset, '*', {})
+      @environment.send(asset).recent(limit)
     end
   end
@@ -39,7 +39,7 @@ class Product &lt; ActiveRecord::Base
   end
   def self.find_by_initial(initial)
-    self.find(:all, :order => 'products.name', :conditions => [ 'products.name like (?)', initial + '%'])
+    self.find(:all, :order => 'products.name', :conditions => [ 'products.name like (?) or products.name like (?)', initial + '%', initial.upcase + '%'])
   end
 end
@@ -290,7 +290,7 @@ class Profile &lt; ActiveRecord::Base
   end
   def self.find_by_initial(initial)
-    self.find(:all, :order => 'profiles.name', :conditions => [ 'profiles.name like (?)', (initial + '%') ])
+    self.find(:all, :order => 'profiles.name', :conditions => [ 'profiles.name like (?) or profiles.name like (?)', (initial + '%'), (initial.upcase + '%') ])
   end
 end
@@ -236,7 +236,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     get :assets, :asset => 'people'
-    assert_equal [p2,p1], assigns(:results)[:people].instance_variable_get('@results')
+    assert_equivalent [p2,p1], assigns(:results)[:people]
   end
   # 'assets' menu inside a category
@@ -274,7 +274,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     c2 = Community.create!(:name => 'another beautiful community', :identifier => 'an_bea_comm', :environment => Environment.default)
     get :assets, :asset => 'communities'
-    assert_equal [c2, c1], assigns(:results)[:communities].instance_variable_get('@results')
+    assert_equivalent [c2, c1], assigns(:results)[:communities]
   end
   # 'assets' menu
@@ -19,8 +19,9 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase
     art2 = person.articles.build(:name => 'another article to be found')
     art2.save!
-    assert_includes @finder.articles, art1
-    assert_not_includes @finder.articles, art2
+    list = @finder.find(:articles, 'found')
+    assert_includes list, art1
+    assert_not_includes list, art2
   end
   should 'search for comments in a specific category' do
@@ -37,35 +38,41 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase
     art2.save! 
     comment2 = art2.comments.build(:title => 'comment to be found', :body => 'hfyfyh', :author => person); comment2.save!
-    assert_includes @finder.comments, comment1
-    assert_not_includes @finder.comments, comment2
+    list = @finder.find(:comments, 'found')
+    assert_includes list, comment1
+    assert_not_includes list, comment2
   end
   should 'search for enterprises in a specific category' do
     # in category
-    ent1 = Enterprise.create!(:name => 'testing enterprise 1', :identifier => 'test1', :categories => [@category])
+    ent1 = Enterprise.create!(:name => 'beautiful enterprise 1', :identifier => 'test1', :categories => [@category])
     # not in category
-    ent2 = Enterprise.create!(:name => 'testing enterprise 2', :identifier => 'test2')
+    ent2 = Enterprise.create!(:name => 'beautiful enterprise 2', :identifier => 'test2')
-    assert_includes @finder.enterprises, ent1
-    assert_not_includes @finder.enterprises, ent2
+    list = @finder.find(:enterprises, 'beautiful')
+    assert_includes list, ent1
+    assert_not_includes list, ent2
   end
   should 'search for people in a specific category' do
     p1 = create_user('people_1').person; p1.name = 'a beautiful person'; p1.categories << @category; p1.save!
     p2 = create_user('people_2').person; p2.name = 'another beautiful person'; p2.save!
-    assert_includes @finder.people, p1
-    assert_not_includes @finder.people, p2
+
+    list = @finder.find(:people, 'beautiful')
+    assert_includes list, p1
+    assert_not_includes list, p2
   end
   should 'search for communities in a specific category' do
     c1 = Community.create!(:name => 'a beautiful community', :identifier => 'bea_comm', :environment => Environment.default)
     c2 = Community.create!(:name => 'another beautiful community', :identifier => 'an_bea_comm', :environment => Environment.default)
     c1.categories << @category; c1.save!
-    assert_includes @finder.communities, c1
-    assert_not_includes @finder.communities, c2
+
+    list = @finder.find(:communities, 'beautiful')
+    assert_includes list, c1
+    assert_not_includes list, c2
   end
   should 'search for products in a specific category' do
@@ -73,8 +80,10 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase
     ent2 = Enterprise.create!(:name => 'teste2', :identifier => 'teste2')
     prod1 = ent1.products.create!(:name => 'a beautiful product')
     prod2 = ent2.products.create!(:name => 'another beautiful product')
-    assert_includes @finder.products, prod1
-    assert_not_includes @finder.products, prod2
+
+    list = @finder.find(:products, 'beautiful')
+    assert_includes list, prod1
+    assert_not_includes list, prod2
   end
   should 'load ids for category full hierarchy' do
@@ -93,7 +102,7 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase
     p1 = create_user('people_1').person; p1.name = 'a beautiful person'; p1.categories << child; p1.save!
     f = CategoryFinder.new(parent)
-    assert_includes f.people, p1
+    assert_includes f.find(:people, 'beautiful'), p1
   end
   should 'list recent enterprises' do
@@ -141,7 +150,9 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase
     p1.categories << parent; p1.save!
     f = CategoryFinder.new(parent)
-    result = f.people
+    result = f.find(:people, 'beautiful')
+
+    assert_equivalent [p1], result
     assert_equal 1, result.size
   end
@@ -8,39 +8,39 @@ class EnvironmentFinderTest &lt; ActiveSupport::TestCase
     person = create_user('teste').person
     art = person.articles.build(:name => 'an article to be found'); art.save!
     finder = EnvironmentFinder.new(Environment.default)
-    assert_includes finder.articles, art
+    assert_includes finder.find(:articles, 'found'), art
   end
   should 'find people' do
     p1 = create_user('people_1').person; p1.name = 'a beautiful person'; p1.save!
     finder = EnvironmentFinder.new(Environment.default)
-    assert_includes finder.people, p1
+    assert_includes finder.find(:people, 'beautiful'), p1
   end
   should 'find communities' do
     c1 = Community.create!(:name => 'a beautiful community', :identifier => 'bea_comm', :environment => Environment.default)
     finder = EnvironmentFinder.new(Environment.default)
-    assert_includes finder.communities, c1
+    assert_includes finder.find(:communities, 'beautiful'), c1
   end
   should 'find comments' do
     person = create_user('teste').person
     art = person.articles.build(:name => 'an article to be found'); art.save!
     comment = art.comments.build(:title => 'comment to be found', :body => 'some sample text', :author => person); comment.save!
-    assert_includes EnvironmentFinder.new(Environment.default).comments('found'), comment
+    assert_includes EnvironmentFinder.new(Environment.default).find(:comments, 'found'), comment
   end
   should 'find products' do
     finder = EnvironmentFinder.new(Environment.default)
     ent = Enterprise.create!(:name => 'teste', :identifier => 'teste')
     prod = ent.products.create!(:name => 'a beautiful product')
-    assert_includes finder.products, prod
+    assert_includes finder.find(:products, 'beautiful'), prod
   end
   should 'find enterprises' do
     finder = EnvironmentFinder.new(Environment.default)
-    ent = Enterprise.create!(:name => 'teste', :identifier => 'teste')
-    assert_includes finder.enterprises, ent
+    ent = Enterprise.create!(:name => 'a beautiful enterprise', :identifier => 'teste')
+    assert_includes finder.find(:enterprises, 'beautiful'), ent
   end
   should 'list recent enterprises' do
@@ -4,21 +4,31 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 # will just pass. The idea is to test our local extensions to SQLite.
 class SQliteExtensionTest < Test::Unit::TestCase
-  should 'have power function' do
-    assert_in_delta 8.0, ActiveRecord::Base.connection.execute('select pow(2.0, 3.0) as result').first['result'], 0.0001
-  end
+  if ActiveRecord::Base.connection.adapter_name =~ /^sqlite$/i
-  should 'have radians function' do
-    assert_in_delta Math::PI/2, ActiveRecord::Base.connection.execute('select radians(90) as rad').first['rad'], 0.0001
-  end
+    should 'have power function' do
+      assert_in_delta 8.0, ActiveRecord::Base.connection.execute('select pow(2.0, 3.0) as result').first['result'], 0.0001
+    end
-  should 'have square root function' do
-    assert_in_delta 1.4142, ActiveRecord::Base.connection.execute('select sqrt(2) as sqrt').first['sqrt'], 0.0001
-  end
+    should 'have radians function' do
+      assert_in_delta Math::PI/2, ActiveRecord::Base.connection.execute('select radians(90) as rad').first['rad'], 0.0001
+    end
+
+    should 'have square root function' do
+      assert_in_delta 1.4142, ActiveRecord::Base.connection.execute('select sqrt(2) as sqrt').first['sqrt'], 0.0001
+    end
+
+    should 'have a distance function' do
+      args = [32.918593, -96.958444, 32.951613, -96.958444].map{|l|l * Math::PI/180}
+      assert_in_delta 2.28402, ActiveRecord::Base.connection.execute("select spheric_distance(#{args.inspect[1..-2]}, 3963.19) as dist").first['dist'], 0.0001
+    end
+
+  else
+
+    should 'just pass (not using SQLite)' do
+      assert true
+    end
-  should 'have a distance function' do
-    args = [32.918593, -96.958444, 32.951613, -96.958444].map{|l|l * Math::PI/180}
-    assert_in_delta 2.28402, ActiveRecord::Base.connection.execute("select spheric_distance(#{args.inspect[1..-2]}, 3963.19) as dist").first['dist'], 0.0001
   end
 end
	@@ -67,7 +67,7 @@ class SearchController < ApplicationController		@@ -67,7 +67,7 @@ class SearchController < ApplicationController
67	@results = {}	67	@results = {}
68	@names = {}	68	@names = {}
69	SEARCH_IN.each do \|key, description\|	69	SEARCH_IN.each do \|key, description\|
70	- @results[key] = @finder.send(key, @filtered_query) if @searching[key]	70	+ @results[key] = @finder.find(key, @filtered_query) if @searching[key]
71	@names[key] = gettext(description)	71	@names[key] = gettext(description)
72	end	72	end
73	end	73	end
	@@ -113,7 +113,7 @@ class Article < ActiveRecord::Base		@@ -113,7 +113,7 @@ class Article < ActiveRecord::Base
113	end	113	end
114		114
115	def self.find_by_initial(initial)	115	def self.find_by_initial(initial)
116	- self.find(:all, :order => 'articles.name', :conditions => [ 'articles.name like (?)', initial + '%'])	116	+ self.find(:all, :order => 'articles.name', :conditions => [ 'articles.name like (?) or articles.name like (?)', initial + '%', initial.upcase + '%'])
117	end	117	end
118		118
119	private	119	private
	@@ -7,28 +7,8 @@ class CategoryFinder		@@ -7,28 +7,8 @@ class CategoryFinder
7		7
8	attr_reader :category_ids	8	attr_reader :category_ids
9		9
10	- def articles(query='*', options={})
11	- find_in_categorized(Article, query, options)
12	- end
13	-
14	- def people(query='*', options={})
15	- find_in_categorized(Person, query, options)
16	- end
17	-
18	- def communities(query='*', options={})
19	- find_in_categorized(Community, query, options)
20	- end
21	-
22	- def enterprises(query='*', options={})
23	- find_in_categorized(Enterprise, query, options)
24	- end
25	-
26	- def products(query='*', options={})
27	- find_in_categorized(Product, query, options)
28	- end
29	-
30	- def comments(query='*', options={})
31	- find_in_categorized(Comment, query, options)	10	+ def find(asset, query)
		11	+ find_in_categorized(asset.to_s.singularize.camelize.constantize, query)
32	end	12	end
33		13
34	def recent(asset, limit = 10)	14	def recent(asset, limit = 10)
	@@ -70,11 +50,11 @@ class CategoryFinder		@@ -70,11 +50,11 @@ class CategoryFinder
70	# FIXME copy/pasted from options_for_find above !!!	50	# FIXME copy/pasted from options_for_find above !!!
71	case klass.name	51	case klass.name
72	when 'Comment'	52	when 'Comment'
73	- {:select => 'distinct comments.*', :joins => 'inner join articles_categories on articles_categories.article_id = comments.article_id', :conditions => ['articles_categories.category_id in (?) and comments.title like (?)', category_ids, initial + '%']}	53	+ {:select => 'distinct comments.*', :joins => 'inner join articles_categories on articles_categories.article_id = comments.article_id', :conditions => ['articles_categories.category_id in (?) and (comments.title like (?) or comments.title like (?))', category_ids, initial + '%', initial.upcase + '%']}
74	when 'Product'	54	when 'Product'
75	- {:select => 'distinct products.*', :joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id in (?) and products.name like (?)', category_ids, initial + '%']}	55	+ {:select => 'distinct products.*', :joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id in (?) and (products.name like (?) or products.name like (?))', category_ids, initial + '%', initial.upcase + '%']}
76	when 'Article', 'Person', 'Community', 'Enterprise'	56	when 'Article', 'Person', 'Community', 'Enterprise'
77	- {:include => 'categories', :conditions => ['categories.id IN (?) and %s.name like (?)' % klass.table_name, category_ids, initial + '%']}	57	+ {:include => 'categories', :conditions => ['categories.id IN (?) and (%s.name like (?) or %s.name like (?))' % [klass.table_name, klass.table_name], category_ids, initial + '%', initial.upcase + '%']}
78	else	58	else
79	raise "unreconized class #{klass.name}"	59	raise "unreconized class #{klass.name}"
80	end	60	end
	@@ -42,7 +42,7 @@ class Comment < ActiveRecord::Base		@@ -42,7 +42,7 @@ class Comment < ActiveRecord::Base
42	end	42	end
43		43
44	def self.find_by_initial(initial)	44	def self.find_by_initial(initial)
45	- self.find(:all, :order => 'comments.title', :conditions => ['comments.title like (?)', initial + '%'])	45	+ self.find(:all, :order => 'comments.title', :conditions => ['comments.title like (?) or comments.title like (?)', initial + '%', initial.upcase + '%'])
46	end	46	end
47		47
48	end	48	end
	@@ -4,33 +4,13 @@ class EnvironmentFinder		@@ -4,33 +4,13 @@ class EnvironmentFinder
4	@environment = env	4	@environment = env
5	end	5	end
6		6
7	- def articles(query='*', options = {})
8	- @environment.articles.find_by_contents(query, {}, options)
9	- end
10	-
11	- def people(query='*', options = {})
12	- @environment.people.find_by_contents(query, {}, options)
13	- end
14	-
15	- def communities(query='*', options = {})
16	- @environment.communities.find_by_contents(query, {}, options)
17	- end
18	-
19	- def products(query='*', options = {})
20	- @environment.products.find_by_contents(query, {}, options)
21	- end
22	-
23	- def enterprises(query='*', options = {})
24	- @environment.enterprises.find_by_contents(query, {}, options)
25	- end
26	-
27	- def comments(query='*', options = {})
28	- @environment.comments.find_by_contents(query, {}, options)	7	+ def find(asset, query)
		8	+ @environment.send(asset).find_by_contents(query)
29	end	9	end
30		10
31	def recent(asset, limit = 10)	11	def recent(asset, limit = 10)
32	with_options :limit => limit, :order => 'created_at desc, id desc' do \|finder\|	12	with_options :limit => limit, :order => 'created_at desc, id desc' do \|finder\|
33	- finder.send(asset, '*', {})	13	+ @environment.send(asset).recent(limit)
34	end	14	end
35	end	15	end
36		16
	@@ -39,7 +39,7 @@ class Product < ActiveRecord::Base		@@ -39,7 +39,7 @@ class Product < ActiveRecord::Base
39	end	39	end
40		40
41	def self.find_by_initial(initial)	41	def self.find_by_initial(initial)
42	- self.find(:all, :order => 'products.name', :conditions => [ 'products.name like (?)', initial + '%'])	42	+ self.find(:all, :order => 'products.name', :conditions => [ 'products.name like (?) or products.name like (?)', initial + '%', initial.upcase + '%'])
43	end	43	end
44		44
45	end	45	end
	@@ -290,7 +290,7 @@ class Profile < ActiveRecord::Base		@@ -290,7 +290,7 @@ class Profile < ActiveRecord::Base
290	end	290	end
291		291
292	def self.find_by_initial(initial)	292	def self.find_by_initial(initial)
293	- self.find(:all, :order => 'profiles.name', :conditions => [ 'profiles.name like (?)', (initial + '%') ])	293	+ self.find(:all, :order => 'profiles.name', :conditions => [ 'profiles.name like (?) or profiles.name like (?)', (initial + '%'), (initial.upcase + '%') ])
294	end	294	end
295		295
296	end	296	end
	@@ -236,7 +236,7 @@ class SearchControllerTest < Test::Unit::TestCase		@@ -236,7 +236,7 @@ class SearchControllerTest < Test::Unit::TestCase
236		236
237	get :assets, :asset => 'people'	237	get :assets, :asset => 'people'
238		238
239	- assert_equal [p2,p1], assigns(:results)[:people].instance_variable_get('@results')	239	+ assert_equivalent [p2,p1], assigns(:results)[:people]
240	end	240	end
241		241
242	# 'assets' menu inside a category	242	# 'assets' menu inside a category
	@@ -274,7 +274,7 @@ class SearchControllerTest < Test::Unit::TestCase		@@ -274,7 +274,7 @@ class SearchControllerTest < Test::Unit::TestCase
274	c2 = Community.create!(:name => 'another beautiful community', :identifier => 'an_bea_comm', :environment => Environment.default)	274	c2 = Community.create!(:name => 'another beautiful community', :identifier => 'an_bea_comm', :environment => Environment.default)
275		275
276	get :assets, :asset => 'communities'	276	get :assets, :asset => 'communities'
277	- assert_equal [c2, c1], assigns(:results)[:communities].instance_variable_get('@results')	277	+ assert_equivalent [c2, c1], assigns(:results)[:communities]
278	end	278	end
279		279
280	# 'assets' menu	280	# 'assets' menu