ActionItem501: removing filtering by initial

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

ActionItem501: removing filtering by initial
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2145 3f533792-8f58-4932-b0fe-aaf55b0a4547
MoisesMachado
1 parent e66e4541
Showing 16 changed files with 1 additions and 386 deletions Show diff stats
app/controllers/public/search_controller.rb
app/models/article.rb
app/models/category_finder.rb
app/models/environment_finder.rb
app/models/product.rb
app/models/profile.rb
app/views/search/_directory.rhtml
app/views/search/people.rhtml
public/designs/themes/zen3/stylesheets/controller_search.css
public/stylesheets/controller_search.css
test/functional/search_controller_test.rb
test/unit/article_test.rb
test/unit/category_finder_test.rb
test/unit/environment_finder_test.rb
test/unit/product_test.rb
test/unit/profile_test.rb
@@ -6,7 +6,7 @@ class SearchController &lt; ApplicationController
   before_filter :prepare_filter
   before_filter :check_search_whole_site
   before_filter :load_search_assets
-  before_filter :check_valid_assets, :only => [ :assets, :directory ]
+  before_filter :check_valid_assets, :only => [ :assets ]
   no_design_blocks
@@ -191,14 +191,6 @@ class SearchController &lt; ApplicationController
   end
   attr_reader :category
-  def directory
-    @results = { @asset => @finder.find_by_initial(@asset, params[:initial]) }
-    @asset_name = gettext(SEARCH_IN.find { |entry| entry.first == @asset }[1])
-    @names = { @asset => @asset_name }
-
-    render :action => @asset
-  end
-
   def tags
     @tags = Tag.find(:all).inject({}) do |memo,tag|
       memo[tag.name] = tag.taggings.count
@@ -211,25 +203,6 @@ class SearchController &lt; ApplicationController
     @tagged = @tag.taggings.map(&:taggable)
   end
-  def sellers
-    # FIXME use a better select for category
-    @categories = ProductCategory.find(:all)
-    @regions = Region.find(:all).select{|r|r.lat && r.lng}
-    @product_category = ProductCategory.find(params[:category]) if params[:category]
-    @region = Region.find(params[:region]) if params[:region]
-    
-    options = {}
-    options.merge! :origin => [params[:lat].to_f, params[:long].to_f], :within => params[:radius] if !params[:lat].blank? && !params[:long].blank? && !params[:radius].blank?
-    options.merge! :origin => [@region.lat, @region.lng], :within => params[:radius] if !params[:region].blank? && !params[:radius].blank?
-    if @product_category
-      finder = CategoryFinder.new(@product_category)
-      product_ids = finder.find('products',nil)
-      options.merge! :include => :products, :conditions => ['products.id IN ?', product_ids ]
-    end
-
-    @enterprises = Enterprise.find(:all, options)
-  end
-
   #######################################################
   def popup
@@ -136,10 +136,6 @@ class Article &lt; ActiveRecord::Base
     false
   end
-  def self.find_by_initial(initial)
-    self.find(:all, :order => 'articles.name', :conditions => [ 'articles.name like (?) or articles.name like (?)', initial + '%', initial.upcase + '%'])
-  end
-
   def display_to?(user)
     if self.profile.public_content
       true
@@ -28,10 +28,6 @@ class CategoryFinder
     find(asset, nil, :limit => limit)
   end
-  def find_by_initial(asset, initial)
-    asset_class(asset).find(:all, options_for_find_by_initial(asset_class(asset), initial))
-  end
-
   def count(asset, query='', options={})
     # because will_paginate needs a page
     options = {:page => 1}.merge(options)
@@ -81,20 +77,6 @@ class CategoryFinder
     end
   end
-  def options_for_find_by_initial(klass, initial)
-    # FIXME copy/pasted from options_for_find above !!!
-    case klass.name
-    when 'Product'
-      {:select => 'distinct products.*', :joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id = (?) and (products.name like (?) or products.name like (?))', category_id, initial + '%', initial.upcase + '%']}
-    when 'Article'
-      {:joins => 'inner join articles_categories on (articles_categories.article_id = articles.id)', :conditions => ['articles_categories.category_id = (?) and (%s.name like (?) or %s.name like (?))' % [klass.table_name, klass.table_name], category_id, initial + '%', initial.upcase + '%']}
-    when 'Person', 'Community', 'Enterprise'
-      {:joins => 'inner join categories_profiles on (categories_profiles.profile_id = profiles.id)', :conditions => ['categories_profiles.category_id = (?) and (%s.name like (?) or %s.name like (?))' % [klass.table_name, klass.table_name], category_id, initial + '%', initial.upcase + '%']}
-    else
-      raise "unreconized class #{klass.name}"
-    end
-  end
-
   def asset_class(asset)
     asset.to_s.singularize.camelize.constantize
   end
@@ -42,10 +42,6 @@ class EnvironmentFinder
     find(asset, nil, :limit => limit)
   end
-  def find_by_initial(asset, initial)
-    @environment.send(asset).find_by_initial(initial)
-  end
-
   def count(asset, query = '', options = {})
     # because will_paginate needs a page
     options = {:page => 1}.merge(options)
@@ -43,10 +43,6 @@ class Product &lt; ActiveRecord::Base
     self.find(:all, :order => 'id desc', :limit => limit)
   end
-  def self.find_by_initial(initial)
-    self.find(:all, :order => 'products.name', :conditions => [ 'products.name like (?) or products.name like (?)', initial + '%', initial.upcase + '%'])
-  end
-
   def enterprise_updated(e)
     self.lat = e.lat
     self.lng = e.lng
@@ -342,10 +342,6 @@ class Profile &lt; ActiveRecord::Base
     self.find(:all, :order => 'id desc', :limit => limit)
   end
-  def self.find_by_initial(initial)
-    self.find(:all, :order => 'profiles.name', :conditions => [ 'profiles.name like (?) or profiles.name like (?)', (initial + '%'), (initial.upcase + '%') ])
-  end
-
   # returns +true+ if the given +user+ can see profile information about this
   # +profile+, and +false+ otherwise.
   def display_info_to?(user)
@@ -1,6 +0,0 @@
-<div class="search-index">
-  <%= link_to_unless(params[:initial].blank?, _('Recent'), params.merge(:action => 'assets', :initial => nil)) %>
-  &nbsp;
-    <%= ('a'..'z').map { |initial| link_to_unless(params[:initial] == initial, initial.upcase, params.merge(:action => 'directory', :asset => @asset, :initial => initial)) }.join(' &nbsp; ') %>
-</div>
-<br style='clear:both'/>
@@ -11,7 +11,6 @@
       <%= _('(recently added)') %>
     <% end %>
   </h1>
-  <%= render :partial => 'directory' %>
 <% 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'>
-
-.search-index {
-  color: #EA5;
-}
-
 #view-category,
 #search-results {
   padding: 0% 2%;
@@ -2,17 +2,6 @@
   position: relative; /* to the text appear on MSIE 6 */
 }
-.search-index {
-  text-align: center;
-  position: relative;
-  font-weight: bold;
-}
-
-.search-index a {
-  text-decoration: none;
-  font-weight: normal;
-}
-
 #search-results {
   margin-top: 10px;
   /* none by default, but... Who knows the future?  :-) */
@@ -514,138 +514,6 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'input', :attributes =>  { :name => 'find_in[]', :value => 'products', :checked => 'checked' }
   end
-  ############## directory ####################
-  should 'link to people directory in index' do
-    get :assets, :asset => 'people'
-    assert_tag :tag => 'a', :attributes => { :href => '/directory/people/a'}, :content => 'A'
-    assert_tag :tag => 'a', :attributes => { :href => '/directory/people/b'}, :content => 'B'
-  end
-
-  should 'display link in people directory to other initials but not to the same' do
-    get :directory, :asset => 'people', :initial => 'r'
-    assert_tag :tag => 'a', :attributes => { :href => '/directory/people/a' }
-    assert_no_tag :tag => 'a', :attributes => { :href => '/directory/people/r' }
-  end
-
-  should 'display link to recent people while in directory' do
-    get :directory, :asset => 'people', :initial => 'a'
-    assert_tag :tag => 'a', :attributes => { :href => '/assets/people' }, :content => 'Recent'
-  end
-
-  should 'not leave category in link to other char in directory' do
-    cat = Category.create!(:name => 'just_a_category', :environment => Environment.default)
-    get :directory, :asset => 'people', :initial => 'r', :category_path => cat.path.split('/')
-    assert_tag :tag => 'a', :attributes => { :href => "/directory/people/k/#{cat.path}" }
-  end
-
-  ############### directory for every kind of asset #################
-  should 'display people with a given initial' do
-    included = create_user('fergunson').person
-    not_included = create_user('yanerson').person
-
-    get :directory, :asset => 'people', :initial => 'f'
-    assert_includes assigns(:results)[:people], included
-    assert_not_includes assigns(:results)[:people], not_included
-  end
-
-  should 'display communities with a given initial' do
-    c1 = Community.create!(:name => 'a beautiful community', :identifier => 'bea_comm', :environment => Environment.default)
-    c2 = Community.create!(:name => 'beautiful community (another)', :identifier => 'an_bea_comm', :environment => Environment.default)
-
-    get :directory, :asset => 'communities', :initial => 'a'
-
-    assert_includes assigns(:results)[:communities], c1
-    assert_not_includes assigns(:results)[:communities], c2
-  end
-
-  should 'display enterprises with a given initial' do
-    ent1 = Enterprise.create!(:name => 'aaaaa', :identifier => 'teste1')
-    ent2 = Enterprise.create!(:name => 'bbbbb', :identifier => 'teste2')
-
-    get :directory, :asset => 'enterprises', :initial => 'a'
-
-    assert_includes assigns(:results)[:enterprises], ent1
-    assert_not_includes assigns(:results)[:enterprises], ent2
-  end
-
-  should 'display articles with a given initial' do
-    person = create_user('teste').person
-    art1 = person.articles.build(:name => 'an article to be found'); art1.save!
-    art2 = person.articles.build(:name => 'better article'); art2.save!
-
-    get :directory, :asset => 'articles', :initial => 'a'
-
-    assert_includes assigns(:results)[:articles], art1
-    assert_not_includes assigns(:results)[:articles], art2
-  end
-
-  should 'display people with a given initial, under a specific category' do
-
-    in_category_and_with_initial = create_user('fergunson').person
-    in_category_and_with_initial.add_category @category
-
-    in_category_but_without_initial = create_user('yanerson').person
-    in_category_but_without_initial.add_category  @category
-
-    not_in_category_but_with_initial = create_user('fergy').person
-    not_in_category_and_without_initial = create_user('xalanxalan').person
-
-    get :directory, :asset => 'people', :initial => 'f', :category_path => [ 'my-category' ]
-
-    assert_includes assigns(:results)[:people], in_category_and_with_initial
-    assert_not_includes assigns(:results)[:people], in_category_but_without_initial
-    assert_not_includes assigns(:results)[:people], not_in_category_but_with_initial
-    assert_not_includes assigns(:results)[:people], not_in_category_and_without_initial
-  end
-
-  should 'display communities with a given initial, under a specific category' do
-    c1 = Community.create!(:name => 'a beautiful community', :identifier => 'bea_comm', :environment => Environment.default); c1.add_category @category
-    c2 = Community.create!(:name => 'beautiful community (another)', :identifier => 'an_bea_comm', :environment => Environment.default); c2.add_category @category
-
-    c3 = Community.create!(:name => 'another beautiful community', :identifier => 'lalala', :environment => Environment.default);
-    c4 = Community.create!(:name => 'damn beautiful community (another)', :identifier => 'lelele', :environment => Environment.default)
-
-    get :directory, :asset => 'communities', :initial => 'a', :category_path => [ 'my-category' ]
-
-    assert_includes assigns(:results)[:communities], c1
-    assert_not_includes assigns(:results)[:communities], c2
-    assert_not_includes assigns(:results)[:communities], c3
-    assert_not_includes assigns(:results)[:communities], c4
-  end
-
-  should 'display enterprises with a given initial, under a specific category' do
-    ent1 = Enterprise.create!(:name => 'aaaaa', :identifier => 'teste1'); ent1.add_category @category
-    ent2 = Enterprise.create!(:name => 'bbbbb', :identifier => 'teste2'); ent1.add_category @category
-    ent3 = Enterprise.create!(:name => 'aaaa1111', :identifier => 'teste1111')
-    ent4 = Enterprise.create!(:name => 'ddddd', :identifier => 'teste2222')
-
-    get :directory, :asset => 'enterprises', :initial => 'a', :category_path => [ 'my-category' ]
-
-    assert_includes assigns(:results)[:enterprises], ent1
-    assert_not_includes assigns(:results)[:enterprises], ent2
-    assert_not_includes assigns(:results)[:enterprises], ent3
-    assert_not_includes assigns(:results)[:enterprises], ent4
-  end
-
-  should 'display articles with a given initial, under a specific category' do
-    person = create_user('teste').person
-    art1 = person.articles.build(:name => 'an article to be found'); art1.save!
-    art1.add_category @category
-    art2 = person.articles.build(:name => 'better article'); art2.save!
-    art2.add_category @category
-
-    art3 = person.articles.build(:name => 'another article to be found'); art3.save!
-    art4 = person.articles.build(:name => 'damn article'); art4.save!
-
-
-    get :directory, :asset => 'articles', :initial => 'a', :category_path => [ 'my-category' ]
-
-    assert_includes assigns(:results)[:articles], art1
-    assert_not_includes assigns(:results)[:articles], art2
-    assert_not_includes assigns(:results)[:articles], art3
-    assert_not_includes assigns(:results)[:articles], art4
-  end
-
   should 'find enterprise by product category' do
     ent1 = Enterprise.create!(:name => 'test1', :identifier => 'test1')
     prod_cat = ProductCategory.create!(:name => 'pctest', :environment => Environment.default)
@@ -211,18 +211,6 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_equal [articles[1], articles[0]], person.articles.most_commented(2)
   end
-  should 'find by initial' do
-    person = create_user('testuser').person
-
-    a1 = person.articles.create!(:name => 'An nice article')
-    a2 = person.articles.create!(:name => 'Better stay off here')
-
-    list = Article.find_by_initial('a')
-
-    assert_includes list, a1
-    assert_not_includes list, a2
-  end
-
   should 'identify itself as a non-folder' do
     assert !Article.new.folder?, 'should identify itself as non-folder'
   end
@@ -111,34 +111,6 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase
     assert_includes f.find(:articles, 'beautiful'), article
   end
-  should 'find communites by initial in category hierarchy' do
-    parent = Category.create!(:name => 'parent category', :environment => Environment.default)
-    child  = Category.create!(:name => 'child category', :environment => Environment.default, :parent => parent)
-    p1 = create_user('people_1').person
-    p1.name = 'person with inner beaity'
-    p1.add_category(child)
-    p1.save!
-
-    parent.reload
-
-    f = CategoryFinder.new(parent)
-    assert_includes f.find_by_initial(:people, 'p'), p1
-  end
-
-  should 'find articles by initial in category hierarchy' do
-    parent = Category.create!(:name => 'parent category', :environment => Environment.default)
-    child  = Category.create!(:name => 'child category', :environment => Environment.default, :parent => parent)
-
-    p1 = create_user('people_1').person
-
-    article = p1.articles.create!(:name => 'fucking beautiful article', :category_ids => [child.id])
-
-    parent.reload
-
-    f = CategoryFinder.new(parent)
-    assert_includes f.find_by_initial(:articles, 'f'), article
-  end
-
   should 'list recent enterprises' do
     ent = Enterprise.create!(:name => 'teste', :identifier => 'teste', :category_ids => [@category.id])
     assert_includes @finder.recent('enterprises'), ent
@@ -276,60 +248,6 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase
     assert_equal [articles[1], articles[0]], @finder.most_commented_articles(2)
   end
-  should 'find people by initial' do
-    p1 = create_user('aaaa').person; p1.add_category(@category)
-    p2 = create_user('bbbb').person; p2.add_category(@category)
-
-    list = CategoryFinder.new(@category).find_by_initial(:people, 'a')
-
-    assert_includes list, p1
-    assert_not_includes list, p2
-  end
-
-  should 'find enterprises by initial' do
-    ent1 = Enterprise.create!(:name => 'aaaa', :identifier => 'aaaa'); ent1.add_category(@category)
-    ent2 = Enterprise.create!(:name => 'bbbb', :identifier => 'bbbb'); ent2.add_category(@category)
-
-    list = CategoryFinder.new(@category).find_by_initial(:enterprises, 'a')
-
-    assert_includes list, ent1
-    assert_not_includes list, ent2
-  end
-
-  should 'find communities by initial' do
-    comm1 = Community.create!(:name => 'aaaa', :identifier => 'aaaa'); comm1.add_category(@category)
-    comm2 = Community.create!(:name => 'bbbb', :identifier => 'bbbb'); comm2.add_category(@category)
-
-    list = CategoryFinder.new(@category).find_by_initial(:communities, 'a')
-
-    assert_includes list, comm1
-    assert_not_includes list, comm2
-  end
-
-  should 'find products by initial' do
-    ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent')
-    ent.add_category(@category)
-
-    p1 = ent.products.create!(:name => 'A product')
-    p2 = ent.products.create!(:name => 'Better product')
-
-    list = CategoryFinder.new(@category).find_by_initial(:products, 'a')
-
-    assert_includes list, p1
-    assert_not_includes list, p2
-  end
-
-  should 'find articles by initial' do
-    person = create_user('testuser').person
-    a1 = person.articles.create!(:name => 'aaaa', :body => '...', :category_ids => [@category.id])
-    a2 = person.articles.create!(:name => 'bbbb', :body => '...', :category_ids => [@category.id])
-
-    list = CategoryFinder.new(@category).find_by_initial(:articles, 'a')
-
-    assert_includes list, a1
-    assert_not_includes list, a2
-  end
-
   should 'find person and enterprise by radius and region' do
     finder = CategoryFinder.new(@category)
@@ -125,59 +125,6 @@ class EnvironmentFinderTest &lt; ActiveSupport::TestCase
     assert_equal 99, finder.count('people', 'my query', {})
   end
-  should 'find articles by initial' do
-    person = create_user('teste').person
-    art1 = person.articles.create!(:name => 'an article to be found')
-    art2 = person.articles.create!(:name => 'blah: an article that cannot be found')
-    found = EnvironmentFinder.new(Environment.default).find_by_initial(:articles, 'a')
-
-    assert_includes found, art1
-    assert_not_includes found, art2
-  end
-
-  should 'find people by initial' do
-    finder = EnvironmentFinder.new(Environment.default)
-    p1 = create_user('alalala').person
-    p2 = create_user('blablabla').person
-
-    found = finder.find_by_initial(:people, 'a')
-    assert_includes found, p1
-    assert_not_includes found, p2
-  end
-
-  should 'find communities by initial' do
-    c1 = Community.create!(:name => 'a beautiful community', :identifier => 'bea_comm', :environment => Environment.default)
-    c2 = Community.create!(:name => 'b: another beautiful community', :identifier => 'bbbbb', :environment => Environment.default)
-
-    found = EnvironmentFinder.new(Environment.default).find_by_initial(:communities, 'a')
-
-    assert_includes found, c1
-    assert_not_includes found, c2
-  end
-
-  should 'find products by initial' do
-    finder = EnvironmentFinder.new(Environment.default)
-    ent = Enterprise.create!(:name => 'teste', :identifier => 'teste')
-    prod1 = ent.products.create!(:name => 'a beautiful product')
-    prod2 = ent.products.create!(:name => 'b: a beautiful product')
-
-    found = finder.find_by_initial(:products, 'a')
-
-    assert_includes found, prod1
-    assert_not_includes found, prod2
-  end
-
-  should 'find enterprises by initial' do
-    finder = EnvironmentFinder.new(Environment.default)
-    ent1 = Enterprise.create!(:name => 'aaaa', :identifier => 'aaaa')
-    ent2 = Enterprise.create!(:name => 'bbbb', :identifier => 'bbbb')
-
-    found = finder.find_by_initial(:enterprises, 'a')
-
-    assert_includes found, ent1
-    assert_not_includes found, ent2
-  end
-
   should 'find person and enterprise by radius and region' do
     finder = EnvironmentFinder.new(Environment.default)
@@ -55,18 +55,6 @@ class ProductTest &lt; Test::Unit::TestCase
     end    
   end
-  should 'find by initial' do
-    p1 = Product.create!(:name => 'a test product')
-    p2 = Product.create!(:name => 'A Capitalize Product')
-    p3 = Product.create!(:name => 'b-class test product')
-
-    list = Product.find_by_initial('a')
-
-    assert_includes list, p1
-    assert_includes list, p2
-    assert_not_includes list, p3
-  end
-
   should 'calculate catagory full name' do
     cat = mock
     cat.expects(:full_name).returns('A/B/C')
@@ -437,16 +437,6 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert profile.articles.find_by_path('feed').advertise?
   end
-  should 'find by initial' do
-    inside = Profile.create!(:name => 'A person', :identifier => 'aperson')
-    outside = Profile.create!(:name => 'B Movie', :identifier => 'bmovie')
-
-    list = Profile.find_by_initial('a')
-
-    assert_includes list, inside
-    assert_not_includes list, outside
-  end
-
   should 'have latitude and longitude' do
     e = Enterprise.create!(:name => 'test1', :identifier => 'test1')
     e.lat, e.lng = 45, 45 ; e.save!
	@@ -6,7 +6,7 @@ class SearchController < ApplicationController		@@ -6,7 +6,7 @@ class SearchController < ApplicationController
6	before_filter :prepare_filter	6	before_filter :prepare_filter
7	before_filter :check_search_whole_site	7	before_filter :check_search_whole_site
8	before_filter :load_search_assets	8	before_filter :load_search_assets
9	- before_filter :check_valid_assets, :only => [ :assets, :directory ]	9	+ before_filter :check_valid_assets, :only => [ :assets ]
10		10
11	no_design_blocks	11	no_design_blocks
12		12
	@@ -191,14 +191,6 @@ class SearchController < ApplicationController		@@ -191,14 +191,6 @@ class SearchController < ApplicationController
191	end	191	end
192	attr_reader :category	192	attr_reader :category
193		193
194	- def directory
195	- @results = { @asset => @finder.find_by_initial(@asset, params[:initial]) }
196	- @asset_name = gettext(SEARCH_IN.find { \|entry\| entry.first == @asset }[1])
197	- @names = { @asset => @asset_name }
198	-
199	- render :action => @asset
200	- end
201	-
202	def tags	194	def tags
203	@tags = Tag.find(:all).inject({}) do \|memo,tag\|	195	@tags = Tag.find(:all).inject({}) do \|memo,tag\|
204	memo[tag.name] = tag.taggings.count	196	memo[tag.name] = tag.taggings.count
	@@ -211,25 +203,6 @@ class SearchController < ApplicationController		@@ -211,25 +203,6 @@ class SearchController < ApplicationController
211	@tagged = @tag.taggings.map(&:taggable)	203	@tagged = @tag.taggings.map(&:taggable)
212	end	204	end
213		205
214	- def sellers
215	- # FIXME use a better select for category
216	- @categories = ProductCategory.find(:all)
217	- @regions = Region.find(:all).select{\|r\|r.lat && r.lng}
218	- @product_category = ProductCategory.find(params[:category]) if params[:category]
219	- @region = Region.find(params[:region]) if params[:region]
220	-
221	- options = {}
222	- options.merge! :origin => [params[:lat].to_f, params[:long].to_f], :within => params[:radius] if !params[:lat].blank? && !params[:long].blank? && !params[:radius].blank?
223	- options.merge! :origin => [@region.lat, @region.lng], :within => params[:radius] if !params[:region].blank? && !params[:radius].blank?
224	- if @product_category
225	- finder = CategoryFinder.new(@product_category)
226	- product_ids = finder.find('products',nil)
227	- options.merge! :include => :products, :conditions => ['products.id IN ?', product_ids ]
228	- end
229	-
230	- @enterprises = Enterprise.find(:all, options)
231	- end
232	-
233	#######################################################	206	#######################################################
234		207
235	def popup	208	def popup
	@@ -28,10 +28,6 @@ class CategoryFinder		@@ -28,10 +28,6 @@ class CategoryFinder
28	find(asset, nil, :limit => limit)	28	find(asset, nil, :limit => limit)
29	end	29	end
30		30
31	- def find_by_initial(asset, initial)
32	- asset_class(asset).find(:all, options_for_find_by_initial(asset_class(asset), initial))
33	- end
34	-
35	def count(asset, query='', options={})	31	def count(asset, query='', options={})
36	# because will_paginate needs a page	32	# because will_paginate needs a page
37	options = {:page => 1}.merge(options)	33	options = {:page => 1}.merge(options)
	@@ -81,20 +77,6 @@ class CategoryFinder		@@ -81,20 +77,6 @@ class CategoryFinder
81	end	77	end
82	end	78	end
83		79
84	- def options_for_find_by_initial(klass, initial)
85	- # FIXME copy/pasted from options_for_find above !!!
86	- case klass.name
87	- when 'Product'
88	- {:select => 'distinct products.*', :joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id = (?) and (products.name like (?) or products.name like (?))', category_id, initial + '%', initial.upcase + '%']}
89	- when 'Article'
90	- {:joins => 'inner join articles_categories on (articles_categories.article_id = articles.id)', :conditions => ['articles_categories.category_id = (?) and (%s.name like (?) or %s.name like (?))' % [klass.table_name, klass.table_name], category_id, initial + '%', initial.upcase + '%']}
91	- when 'Person', 'Community', 'Enterprise'
92	- {:joins => 'inner join categories_profiles on (categories_profiles.profile_id = profiles.id)', :conditions => ['categories_profiles.category_id = (?) and (%s.name like (?) or %s.name like (?))' % [klass.table_name, klass.table_name], category_id, initial + '%', initial.upcase + '%']}
93	- else
94	- raise "unreconized class #{klass.name}"
95	- end
96	- end
97	-
98	def asset_class(asset)	80	def asset_class(asset)
99	asset.to_s.singularize.camelize.constantize	81	asset.to_s.singularize.camelize.constantize
100	end	82	end
	@@ -1,6 +0,0 @@	@@ -1,6 +0,0 @@
1	-<div class="search-index">
2	- <%= link_to_unless(params[:initial].blank?, _('Recent'), params.merge(:action => 'assets', :initial => nil)) %>
3	-
4	- <%= ('a'..'z').map { \|initial\| link_to_unless(params[:initial] == initial, initial.upcase, params.merge(:action => 'directory', :asset => @asset, :initial => initial)) }.join('   ') %>
5	-</div>
6	-<br style='clear:both'/>
1	-
2	-.search-index {
3	- color: #EA5;
4	-}
5	-
6	#view-category,	1	#view-category,
7	#search-results {	2	#search-results {
8	padding: 0% 2%;	3	padding: 0% 2%;
	@@ -2,17 +2,6 @@		@@ -2,17 +2,6 @@
2	position: relative; /* to the text appear on MSIE 6 */	2	position: relative; /* to the text appear on MSIE 6 */
3	}	3	}
4		4
5	-.search-index {
6	- text-align: center;
7	- position: relative;
8	- font-weight: bold;
9	-}
10	-
11	-.search-index a {
12	- text-decoration: none;
13	- font-weight: normal;
14	-}
15	-
16	#search-results {	5	#search-results {
17	margin-top: 10px;	6	margin-top: 10px;
18	/* none by default, but... Who knows the future? :-) */	7	/* none by default, but... Who knows the future? :-) */
	@@ -514,138 +514,6 @@ class SearchControllerTest < Test::Unit::TestCase		@@ -514,138 +514,6 @@ class SearchControllerTest < Test::Unit::TestCase
514	assert_no_tag :tag => 'input', :attributes => { :name => 'find_in[]', :value => 'products', :checked => 'checked' }	514	assert_no_tag :tag => 'input', :attributes => { :name => 'find_in[]', :value => 'products', :checked => 'checked' }
515	end	515	end
516		516
517	- ############## directory ####################
518	- should 'link to people directory in index' do
519	- get :assets, :asset => 'people'
520	- assert_tag :tag => 'a', :attributes => { :href => '/directory/people/a'}, :content => 'A'
521	- assert_tag :tag => 'a', :attributes => { :href => '/directory/people/b'}, :content => 'B'
522	- end
523	-
524	- should 'display link in people directory to other initials but not to the same' do
525	- get :directory, :asset => 'people', :initial => 'r'
526	- assert_tag :tag => 'a', :attributes => { :href => '/directory/people/a' }
527	- assert_no_tag :tag => 'a', :attributes => { :href => '/directory/people/r' }
528	- end
529	-
530	- should 'display link to recent people while in directory' do
531	- get :directory, :asset => 'people', :initial => 'a'
532	- assert_tag :tag => 'a', :attributes => { :href => '/assets/people' }, :content => 'Recent'
533	- end
534	-
535	- should 'not leave category in link to other char in directory' do
536	- cat = Category.create!(:name => 'just_a_category', :environment => Environment.default)
537	- get :directory, :asset => 'people', :initial => 'r', :category_path => cat.path.split('/')
538	- assert_tag :tag => 'a', :attributes => { :href => "/directory/people/k/#{cat.path}" }
539	- end
540	-
541	- ############### directory for every kind of asset #################
542	- should 'display people with a given initial' do
543	- included = create_user('fergunson').person
544	- not_included = create_user('yanerson').person
545	-
546	- get :directory, :asset => 'people', :initial => 'f'
547	- assert_includes assigns(:results)[:people], included
548	- assert_not_includes assigns(:results)[:people], not_included
549	- end
550	-
551	- should 'display communities with a given initial' do
552	- c1 = Community.create!(:name => 'a beautiful community', :identifier => 'bea_comm', :environment => Environment.default)
553	- c2 = Community.create!(:name => 'beautiful community (another)', :identifier => 'an_bea_comm', :environment => Environment.default)
554	-
555	- get :directory, :asset => 'communities', :initial => 'a'
556	-
557	- assert_includes assigns(:results)[:communities], c1
558	- assert_not_includes assigns(:results)[:communities], c2
559	- end
560	-
561	- should 'display enterprises with a given initial' do
562	- ent1 = Enterprise.create!(:name => 'aaaaa', :identifier => 'teste1')
563	- ent2 = Enterprise.create!(:name => 'bbbbb', :identifier => 'teste2')
564	-
565	- get :directory, :asset => 'enterprises', :initial => 'a'
566	-
567	- assert_includes assigns(:results)[:enterprises], ent1
568	- assert_not_includes assigns(:results)[:enterprises], ent2
569	- end
570	-
571	- should 'display articles with a given initial' do
572	- person = create_user('teste').person
573	- art1 = person.articles.build(:name => 'an article to be found'); art1.save!
574	- art2 = person.articles.build(:name => 'better article'); art2.save!
575	-
576	- get :directory, :asset => 'articles', :initial => 'a'
577	-
578	- assert_includes assigns(:results)[:articles], art1
579	- assert_not_includes assigns(:results)[:articles], art2
580	- end
581	-
582	- should 'display people with a given initial, under a specific category' do
583	-
584	- in_category_and_with_initial = create_user('fergunson').person
585	- in_category_and_with_initial.add_category @category
586	-
587	- in_category_but_without_initial = create_user('yanerson').person
588	- in_category_but_without_initial.add_category @category
589	-
590	- not_in_category_but_with_initial = create_user('fergy').person
591	- not_in_category_and_without_initial = create_user('xalanxalan').person
592	-
593	- get :directory, :asset => 'people', :initial => 'f', :category_path => [ 'my-category' ]
594	-
595	- assert_includes assigns(:results)[:people], in_category_and_with_initial
596	- assert_not_includes assigns(:results)[:people], in_category_but_without_initial
597	- assert_not_includes assigns(:results)[:people], not_in_category_but_with_initial
598	- assert_not_includes assigns(:results)[:people], not_in_category_and_without_initial
599	- end
600	-
601	- should 'display communities with a given initial, under a specific category' do
602	- c1 = Community.create!(:name => 'a beautiful community', :identifier => 'bea_comm', :environment => Environment.default); c1.add_category @category
603	- c2 = Community.create!(:name => 'beautiful community (another)', :identifier => 'an_bea_comm', :environment => Environment.default); c2.add_category @category
604	-
605	- c3 = Community.create!(:name => 'another beautiful community', :identifier => 'lalala', :environment => Environment.default);
606	- c4 = Community.create!(:name => 'damn beautiful community (another)', :identifier => 'lelele', :environment => Environment.default)
607	-
608	- get :directory, :asset => 'communities', :initial => 'a', :category_path => [ 'my-category' ]
609	-
610	- assert_includes assigns(:results)[:communities], c1
611	- assert_not_includes assigns(:results)[:communities], c2
612	- assert_not_includes assigns(:results)[:communities], c3
613	- assert_not_includes assigns(:results)[:communities], c4
614	- end
615	-
616	- should 'display enterprises with a given initial, under a specific category' do
617	- ent1 = Enterprise.create!(:name => 'aaaaa', :identifier => 'teste1'); ent1.add_category @category
618	- ent2 = Enterprise.create!(:name => 'bbbbb', :identifier => 'teste2'); ent1.add_category @category
619	- ent3 = Enterprise.create!(:name => 'aaaa1111', :identifier => 'teste1111')
620	- ent4 = Enterprise.create!(:name => 'ddddd', :identifier => 'teste2222')
621	-
622	- get :directory, :asset => 'enterprises', :initial => 'a', :category_path => [ 'my-category' ]
623	-
624	- assert_includes assigns(:results)[:enterprises], ent1
625	- assert_not_includes assigns(:results)[:enterprises], ent2
626	- assert_not_includes assigns(:results)[:enterprises], ent3
627	- assert_not_includes assigns(:results)[:enterprises], ent4
628	- end
629	-
630	- should 'display articles with a given initial, under a specific category' do
631	- person = create_user('teste').person
632	- art1 = person.articles.build(:name => 'an article to be found'); art1.save!
633	- art1.add_category @category
634	- art2 = person.articles.build(:name => 'better article'); art2.save!
635	- art2.add_category @category
636	-
637	- art3 = person.articles.build(:name => 'another article to be found'); art3.save!
638	- art4 = person.articles.build(:name => 'damn article'); art4.save!
639	-
640	-
641	- get :directory, :asset => 'articles', :initial => 'a', :category_path => [ 'my-category' ]
642	-
643	- assert_includes assigns(:results)[:articles], art1
644	- assert_not_includes assigns(:results)[:articles], art2
645	- assert_not_includes assigns(:results)[:articles], art3
646	- assert_not_includes assigns(:results)[:articles], art4
647	- end
648	-
649	should 'find enterprise by product category' do	517	should 'find enterprise by product category' do
650	ent1 = Enterprise.create!(:name => 'test1', :identifier => 'test1')	518	ent1 = Enterprise.create!(:name => 'test1', :identifier => 'test1')
651	prod_cat = ProductCategory.create!(:name => 'pctest', :environment => Environment.default)	519	prod_cat = ProductCategory.create!(:name => 'pctest', :environment => Environment.default)
	@@ -211,18 +211,6 @@ class ArticleTest < Test::Unit::TestCase		@@ -211,18 +211,6 @@ class ArticleTest < Test::Unit::TestCase
211	assert_equal [articles[1], articles[0]], person.articles.most_commented(2)	211	assert_equal [articles[1], articles[0]], person.articles.most_commented(2)
212	end	212	end
213		213
214	- should 'find by initial' do
215	- person = create_user('testuser').person
216	-
217	- a1 = person.articles.create!(:name => 'An nice article')
218	- a2 = person.articles.create!(:name => 'Better stay off here')
219	-
220	- list = Article.find_by_initial('a')
221	-
222	- assert_includes list, a1
223	- assert_not_includes list, a2
224	- end
225	-
226	should 'identify itself as a non-folder' do	214	should 'identify itself as a non-folder' do
227	assert !Article.new.folder?, 'should identify itself as non-folder'	215	assert !Article.new.folder?, 'should identify itself as non-folder'
228	end	216	end
	@@ -111,34 +111,6 @@ class CategoryFinderTest < ActiveSupport::TestCase		@@ -111,34 +111,6 @@ class CategoryFinderTest < ActiveSupport::TestCase
111	assert_includes f.find(:articles, 'beautiful'), article	111	assert_includes f.find(:articles, 'beautiful'), article
112	end	112	end
113		113
114	- should 'find communites by initial in category hierarchy' do
115	- parent = Category.create!(:name => 'parent category', :environment => Environment.default)
116	- child = Category.create!(:name => 'child category', :environment => Environment.default, :parent => parent)
117	- p1 = create_user('people_1').person
118	- p1.name = 'person with inner beaity'
119	- p1.add_category(child)
120	- p1.save!
121	-
122	- parent.reload
123	-
124	- f = CategoryFinder.new(parent)
125	- assert_includes f.find_by_initial(:people, 'p'), p1
126	- end
127	-
128	- should 'find articles by initial in category hierarchy' do
129	- parent = Category.create!(:name => 'parent category', :environment => Environment.default)
130	- child = Category.create!(:name => 'child category', :environment => Environment.default, :parent => parent)
131	-
132	- p1 = create_user('people_1').person
133	-
134	- article = p1.articles.create!(:name => 'fucking beautiful article', :category_ids => [child.id])
135	-
136	- parent.reload
137	-
138	- f = CategoryFinder.new(parent)
139	- assert_includes f.find_by_initial(:articles, 'f'), article
140	- end
141	-
142	should 'list recent enterprises' do	114	should 'list recent enterprises' do
143	ent = Enterprise.create!(:name => 'teste', :identifier => 'teste', :category_ids => [@category.id])	115	ent = Enterprise.create!(:name => 'teste', :identifier => 'teste', :category_ids => [@category.id])
144	assert_includes @finder.recent('enterprises'), ent	116	assert_includes @finder.recent('enterprises'), ent
	@@ -276,60 +248,6 @@ class CategoryFinderTest < ActiveSupport::TestCase		@@ -276,60 +248,6 @@ class CategoryFinderTest < ActiveSupport::TestCase
276	assert_equal [articles[1], articles[0]], @finder.most_commented_articles(2)	248	assert_equal [articles[1], articles[0]], @finder.most_commented_articles(2)
277	end	249	end
278		250
279	- should 'find people by initial' do
280	- p1 = create_user('aaaa').person; p1.add_category(@category)
281	- p2 = create_user('bbbb').person; p2.add_category(@category)
282	-
283	- list = CategoryFinder.new(@category).find_by_initial(:people, 'a')
284	-
285	- assert_includes list, p1
286	- assert_not_includes list, p2
287	- end
288	-
289	- should 'find enterprises by initial' do
290	- ent1 = Enterprise.create!(:name => 'aaaa', :identifier => 'aaaa'); ent1.add_category(@category)
291	- ent2 = Enterprise.create!(:name => 'bbbb', :identifier => 'bbbb'); ent2.add_category(@category)
292	-
293	- list = CategoryFinder.new(@category).find_by_initial(:enterprises, 'a')
294	-
295	- assert_includes list, ent1
296	- assert_not_includes list, ent2
297	- end
298	-
299	- should 'find communities by initial' do
300	- comm1 = Community.create!(:name => 'aaaa', :identifier => 'aaaa'); comm1.add_category(@category)
301	- comm2 = Community.create!(:name => 'bbbb', :identifier => 'bbbb'); comm2.add_category(@category)
302	-
303	- list = CategoryFinder.new(@category).find_by_initial(:communities, 'a')
304	-
305	- assert_includes list, comm1
306	- assert_not_includes list, comm2
307	- end
308	-
309	- should 'find products by initial' do
310	- ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent')
311	- ent.add_category(@category)
312	-
313	- p1 = ent.products.create!(:name => 'A product')
314	- p2 = ent.products.create!(:name => 'Better product')
315	-
316	- list = CategoryFinder.new(@category).find_by_initial(:products, 'a')
317	-
318	- assert_includes list, p1
319	- assert_not_includes list, p2
320	- end
321	-
322	- should 'find articles by initial' do
323	- person = create_user('testuser').person
324	- a1 = person.articles.create!(:name => 'aaaa', :body => '...', :category_ids => [@category.id])
325	- a2 = person.articles.create!(:name => 'bbbb', :body => '...', :category_ids => [@category.id])
326	-
327	- list = CategoryFinder.new(@category).find_by_initial(:articles, 'a')
328	-
329	- assert_includes list, a1
330	- assert_not_includes list, a2
331	- end
332	-
333	should 'find person and enterprise by radius and region' do	251	should 'find person and enterprise by radius and region' do
334	finder = CategoryFinder.new(@category)	252	finder = CategoryFinder.new(@category)
335		253
	@@ -125,59 +125,6 @@ class EnvironmentFinderTest < ActiveSupport::TestCase		@@ -125,59 +125,6 @@ class EnvironmentFinderTest < ActiveSupport::TestCase
125	assert_equal 99, finder.count('people', 'my query', {})	125	assert_equal 99, finder.count('people', 'my query', {})
126	end	126	end
127		127
128	- should 'find articles by initial' do
129	- person = create_user('teste').person
130	- art1 = person.articles.create!(:name => 'an article to be found')
131	- art2 = person.articles.create!(:name => 'blah: an article that cannot be found')
132	- found = EnvironmentFinder.new(Environment.default).find_by_initial(:articles, 'a')
133	-
134	- assert_includes found, art1
135	- assert_not_includes found, art2
136	- end
137	-
138	- should 'find people by initial' do
139	- finder = EnvironmentFinder.new(Environment.default)
140	- p1 = create_user('alalala').person
141	- p2 = create_user('blablabla').person
142	-
143	- found = finder.find_by_initial(:people, 'a')
144	- assert_includes found, p1
145	- assert_not_includes found, p2
146	- end
147	-
148	- should 'find communities by initial' do
149	- c1 = Community.create!(:name => 'a beautiful community', :identifier => 'bea_comm', :environment => Environment.default)
150	- c2 = Community.create!(:name => 'b: another beautiful community', :identifier => 'bbbbb', :environment => Environment.default)
151	-
152	- found = EnvironmentFinder.new(Environment.default).find_by_initial(:communities, 'a')
153	-
154	- assert_includes found, c1
155	- assert_not_includes found, c2
156	- end
157	-
158	- should 'find products by initial' do
159	- finder = EnvironmentFinder.new(Environment.default)
160	- ent = Enterprise.create!(:name => 'teste', :identifier => 'teste')
161	- prod1 = ent.products.create!(:name => 'a beautiful product')
162	- prod2 = ent.products.create!(:name => 'b: a beautiful product')
163	-
164	- found = finder.find_by_initial(:products, 'a')
165	-
166	- assert_includes found, prod1
167	- assert_not_includes found, prod2
168	- end
169	-
170	- should 'find enterprises by initial' do
171	- finder = EnvironmentFinder.new(Environment.default)
172	- ent1 = Enterprise.create!(:name => 'aaaa', :identifier => 'aaaa')
173	- ent2 = Enterprise.create!(:name => 'bbbb', :identifier => 'bbbb')
174	-
175	- found = finder.find_by_initial(:enterprises, 'a')
176	-
177	- assert_includes found, ent1
178	- assert_not_includes found, ent2
179	- end
180	-
181	should 'find person and enterprise by radius and region' do	128	should 'find person and enterprise by radius and region' do
182	finder = EnvironmentFinder.new(Environment.default)	129	finder = EnvironmentFinder.new(Environment.default)
183		130
	@@ -55,18 +55,6 @@ class ProductTest < Test::Unit::TestCase		@@ -55,18 +55,6 @@ class ProductTest < Test::Unit::TestCase
55	end	55	end
56	end	56	end
57		57
58	- should 'find by initial' do
59	- p1 = Product.create!(:name => 'a test product')
60	- p2 = Product.create!(:name => 'A Capitalize Product')
61	- p3 = Product.create!(:name => 'b-class test product')
62	-
63	- list = Product.find_by_initial('a')
64	-
65	- assert_includes list, p1
66	- assert_includes list, p2
67	- assert_not_includes list, p3
68	- end
69	-
70	should 'calculate catagory full name' do	58	should 'calculate catagory full name' do
71	cat = mock	59	cat = mock
72	cat.expects(:full_name).returns('A/B/C')	60	cat.expects(:full_name).returns('A/B/C')