ActionItem155: refactoring: moving functionality from category_controller to sea…

…rch_controller, and removing the former. git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1624 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem155: refactoring: moving functionality from category_controller to sea…
…rch_controller, and removing the former. git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1624 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 1d955bbb
Showing 23 changed files with 195 additions and 226 deletions Show diff stats
app/controllers/public/category_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/views/category/_article.rhtml
app/views/category/_category.rhtml
app/views/category/_product_category.rhtml
app/views/category/_region.rhtml
app/views/category/view.rhtml
app/views/search/_article.rhtml
app/views/search/_category.rhtml
app/views/search/_comment.rhtml
app/views/search/_product.rhtml
app/views/search/_product_category.rhtml
app/views/search/_profile.rhtml
app/views/search/_region.rhtml
app/views/search/category_index.rhtml
app/views/search/index.rhtml
app/views/shared/categories_menu.rhtml
config/routes.rb
test/functional/category_controller_test.rb
@@ -1,27 +0,0 @@
-class CategoryController < PublicController
-
-  # view the summary of one category
-  def view
-    send('action_' + @category.class.name.underscore) 
-  end
-
-  attr_reader :category
-
-  before_filter :load_category, :only => [ :view ]
-  private
-
-  def action_product_category
-    @products = category.products
-    @enterprises = category.products.map{|p| p.enterprise}.flatten.uniq
-    @users = category.consumers
-  end
-
-  def action_category
-    # TODO: load articles, documents, etc so the view can list them.
-    @recent_articles = category.recent_articles
-    @recent_comments = category.recent_comments
-    @most_commented_articles = category.most_commented_articles
-  end
-  alias :action_region :action_category
-
-end
@@ -24,6 +24,19 @@ class SearchController &lt; ApplicationController
     end
   end
+  def action_product_category
+    @products = category.products
+    @enterprises = category.products.map{|p| p.enterprise}.flatten.uniq
+    @users = category.consumers
+  end
+
+  def action_category
+    @recent_articles = category.recent_articles
+    @recent_comments = category.recent_comments
+    @most_commented_articles = category.most_commented_articles
+  end
+  alias :action_region :action_category
+
   public
   include SearchHelper
@@ -53,6 +66,12 @@ class SearchController &lt; ApplicationController
   #######################################################
+  # view the summary of one category
+  def category_index
+    send('action_' + @category.class.name.underscore) 
+  end
+  attr_reader :category
+
   def tags
     @tags = Tag.find(:all).inject({}) do |memo,tag|
       memo[tag.name] = tag.taggings.count
@@ -309,7 +309,7 @@ module ApplicationHelper
   def link_to_category(category, full = true)
     return _('Uncategorized product') unless category
     name = full ? category.full_name : category.name
-    link_to name, :controller => 'category', :action => 'view', :category_path => category.path.split('/')
+    link_to name, :controller => 'search', :action => 'category_index', :category_path => category.path.split('/')
   end
   def link_to_product(product)
@@ -1,9 +0,0 @@
-<li>
-  <strong><%= link_to(article.title, article.url) %></strong>
-  <div class="item_meta">
-    <span class="cat_item_by"><%=
-      _('by %s') % link_to(article.last_changed_by.name, article.last_changed_by.url)
-    %></span>
-    <span class="cat_item_update"><%= _('Last update: %s.') % show_date(article.updated_on) %></span>
-  </div>
-</li>
@@ -1,24 +0,0 @@
-<h2><%= _('Recent articles') %></h2>
-<ul class="recent_on_cat recent_articles">
-  <%= render :partial => 'article', :collection => @recent_articles %>
-</ul>
-
-<h2><%= _('Recent Comments') %></h2>
-<ul class="recent_on_cat recent_comments">
-<% @recent_comments.each do |comment| %>
-  <li>
-    <strong><%= link_to(comment.title, comment.url) %></strong>
-    <div class="item_meta">
-      <%= _('by %{author} on "%{article}"') % {
-                :comment => link_to(comment.title, comment.url),
-                :article => link_to(comment.article.title, comment.article.url),
-                :author => comment.author_name } %>
-    </div>
-  </li>
-<% end %>
-</ul>
-
-<h2><%= _('Most commented articles') %></h2>
-<ul class="most_commented">
-  <%= render :partial => 'article', :collection => @most_commented_articles %>
-</ul>
@@ -1,29 +0,0 @@
-<%= link_to(_('I consume this'), {:profile => current_user.login, :controller => 'consumed_products', :action => 'new', 'consumption[product_category_id]' => @category.id }, :method => :post) if logged_in? %>
-<ul>
-  <li><%= n_("One product in this category.", "%{num} products in this category.", @products.size) % { :num => @products.size } %></li>
-  <li><%= n_("One enterprise sells products in this category.", "%{num} enterprises sells products in this category.", @enterprises.size) % { :num => @enterprises.size} %></li>
-  <li><%= n_("One user consumes this product.", "%{num} users consumes this product", @users.size) % {:num => @users.size} %></li>
-</ul>
-
-<h3> <%= _('Products under this category:') %> </h3>
-<ul>
-  <% @products.each do |p| %>
-    <li>
-    <%= image_tag p.image.public_filename(:thumb) if p.image%>
-    <%= link_to_product(p) %> <br/>
-    <% if p.price %>
-      <%= _('Price: %d') % p.price %> <br/>
-    <% end %>
-    <%= _('Enterprise:') %> <%= link_to_homepage p.enterprise.name, p.enterprise.identifier %> <br/><br/>
-    </li>
-  <% end %>
-</ul>
-
-<h3><%= _('Users that consumes products in this category:') %></h3>
-
-<% @users.each do |u| %>
-  <p>
-  <%= image_tag u.image.public_filename(:thumb) if  u.image %> <br> 
-  <%= link_to_homepage(u.name, u.identifier) %>
-  </p>
-<% end %>
@@ -1 +0,0 @@
-_category.rhtml
 \ No newline at end of file
@@ -1,29 +0,0 @@
-<div id="view-category">
-
-  <div id="category-ancestors">
-    <%= @category.ancestors.reverse.map { |a| link_to_category(a, false) }.join(' &rarr; ') %>
-  </div><!-- end id="category-ancestors" -->
-
-  <h1 id="categiry-name"><%= _('Category: %s') % @category.name %></h1>
-
-  <div class="category_itens">
-  <%= render :partial => @category.class.name.underscore %>
-  </div><!-- end class="category_itens" -->
-
-  <div id="category-childs">
-    <h2> <%= _('Sub-categories')  %> </h2>
-
-    <% if @category.children.empty? %>
-      <strong id="cat-no-child"><%= _('No sub-categories') %></strong>
-    <% else %>
-      <ul>
-        <% @category.children.each do |c| %>
-          <li> <%= link_to_category(c) %> </li>
-        <% end %>
-      </ul>
-    <% end %>
-
-  </div><!-- end id="child-categories" -->
-
-</div><!-- end id="view-category" -->
-
-  <div class='search-result-text'>
-    <div>
-      <strong>
-        <%= link_to_document(hit) %>
-      </strong>
-    </div>
-    <div>
-      <%= strip_tags(hit.abstract) %>
-    </div>
+<li>
+  <strong><%= link_to(hit.title, hit.url) %></strong>
+  <div class="item_meta">
+    <% if hit.last_changed_by %>
+      <span class="cat_item_by">
+      <%= _('by %s') % link_to(hit.last_changed_by.name, hit.last_changed_by.url) %>
+      </span>
+    <% end %>
+    <span class="cat_item_update"><%= _('Last update: %s.') % show_date(hit.updated_on) %></span>
   </div>
+</li>
@@ -0,0 +1,24 @@
+<h2><%= _('Recent articles') %></h2>
+<ul class="recent_on_cat recent_articles">
+  <%= render :partial => 'article', :collection => @recent_articles %>
+</ul>
+
+<h2><%= _('Recent Comments') %></h2>
+<ul class="recent_on_cat recent_comments">
+<% @recent_comments.each do |comment| %>
+  <li>
+    <strong><%= link_to(comment.title, comment.url) %></strong>
+    <div class="item_meta">
+      <%= _('by %{author} on "%{article}"') % {
+                :comment => link_to(comment.title, comment.url),
+                :article => link_to(comment.article.title, comment.article.url),
+                :author => comment.author_name } %>
+    </div>
+  </li>
+<% end %>
+</ul>
+
+<h2><%= _('Most commented articles') %></h2>
+<ul class="most_commented">
+  <%= render :partial => 'article', :collection => @most_commented_articles %>
+</ul>
-  <div class='search-result-text'>
-    <div>
-      <strong>
-        <%= link_to(hit.title, hit.url) %>
-      </strong>
-    </div>
-    <div>
-      <%= strip_tags(hit.body) %>
-    </div>
+<li>
+  <strong><%= link_to(hit.title, hit.url)%></strong>
+  <div class="item_meta">
+    <span class="cat_item_by"><%= _('by %s, on "%s"') % [hit.author_name, link_to(hit.article.name, hit.article.url)] %></span>
   </div>
+</li>
+
+
 <%# FIXME add more information %>
+<li>
   <div class='search-result-text'>
     <%= image_tag(hit.image.public_filename(:minor)) if hit.image %>
     <strong>
@@ -13,3 +14,4 @@
       <li> <%= _('Category: %s') % link_to_category(hit.product_category) %> </li>
     </ul>
   </div>
+</li>
@@ -0,0 +1,29 @@
+<%= link_to(_('I consume this'), {:profile => current_user.login, :controller => 'consumed_products', :action => 'new', 'consumption[product_category_id]' => @category.id }, :method => :post) if logged_in? %>
+<ul>
+  <li><%= n_("One product in this category.", "%{num} products in this category.", @products.size) % { :num => @products.size } %></li>
+  <li><%= n_("One enterprise sells products in this category.", "%{num} enterprises sells products in this category.", @enterprises.size) % { :num => @enterprises.size} %></li>
+  <li><%= n_("One user consumes this product.", "%{num} users consumes this product", @users.size) % {:num => @users.size} %></li>
+</ul>
+
+<h3> <%= _('Products under this category:') %> </h3>
+<ul>
+  <% @products.each do |p| %>
+    <li>
+    <%= image_tag p.image.public_filename(:thumb) if p.image%>
+    <%= link_to_product(p) %> <br/>
+    <% if p.price %>
+      <%= _('Price: %d') % p.price %> <br/>
+    <% end %>
+    <%= _('Enterprise:') %> <%= link_to_homepage p.enterprise.name, p.enterprise.identifier %> <br/><br/>
+    </li>
+  <% end %>
+</ul>
+
+<h3><%= _('Users that consumes products in this category:') %></h3>
+
+<% @users.each do |u| %>
+  <p>
+  <%= image_tag u.image.public_filename(:thumb) if  u.image %> <br> 
+  <%= link_to_homepage(u.name, u.identifier) %>
+  </p>
+<% end %>
 <%# FIXME add more information %>
-
-<div class='search-result-text'>
-  <%= image_tag(hit.image.public_filename(:minor)) if hit.image %>
-  <strong>
-    <%= link_to_homepage(hit.name, hit.identifier) %>
-  </strong>
-</div>
+<li>
+  <div class='search-result-text'>
+    <%= image_tag(hit.image.public_filename(:minor)) if hit.image %>
+    <strong>
+      <%= link_to_homepage(hit.name, hit.identifier) %>
+    </strong>
+  </div>
+</li>
@@ -0,0 +1 @@
+_category.rhtml
 \ No newline at end of file
@@ -0,0 +1,29 @@
+<div id="view-category">
+
+  <div id="category-ancestors">
+    <%= @category.ancestors.reverse.map { |a| link_to_category(a, false) }.join(' &rarr; ') %>
+  </div><!-- end id="category-ancestors" -->
+
+  <h1 id="categiry-name"><%= _('Category: %s') % @category.name %></h1>
+
+  <div class="category_itens">
+  <%= render :partial => @category.class.name.underscore %>
+  </div><!-- end class="category_itens" -->
+
+  <div id="category-childs">
+    <h2> <%= _('Sub-categories')  %> </h2>
+
+    <% if @category.children.empty? %>
+      <strong id="cat-no-child"><%= _('No sub-categories') %></strong>
+    <% else %>
+      <ul>
+        <% @category.children.each do |c| %>
+          <li> <%= link_to_category(c) %> </li>
+        <% end %>
+      </ul>
+    <% end %>
+
+  </div><!-- end id="child-categories" -->
+
+</div><!-- end id="view-category" -->
+
@@ -4,9 +4,11 @@
   <% if !results.nil? and !results.empty? %>
     <div id="search-results-<%= name %>">
       <h3><%= @names[name] %></h3>
+      <ul>
       <% results.each do |hit| %>
         <%= render :partial => partial_for_class(hit.class), :locals => { :hit => hit } %>
       <% end %>
+      </ul>
     </div>
   <% end %>
 <% end %>
@@ -5,7 +5,7 @@
       <%= item.name %>
       <ul>
         <% item.children.each do |child| %>
-          <li><%= link_to(content_tag('span', child.name), :controller => 'category', :action => 'view', :category_path => child.explode_path) %></li>
+          <li><%= link_to(content_tag('span', child.name), :controller => 'search', :action => 'category_index', :category_path => child.explode_path) %></li>
         <% end %>
       </ul>
     </li>
@@ -29,13 +29,12 @@ ActionController::Routing::Routes.draw do |map|
   # tags
   map.tag 'tag', :controller => 'search', :action => 'tags'
   map.tag 'tag/:tag', :controller => 'search', :action => 'tag'
-
+  # categories index
+  map.category 'cat/*category_path', :controller => 'search', :action => 'category_index'
+  map.assets 'assets/:asset/*category_path', :controller => 'search', :action => 'assets'
   # search
   map.connect 'search/:action/*category_path', :controller => 'search'
-  # categories controller
-  map.connect 'cat', :controller => 'category', :action => 'index'
-  map.category 'cat/*category_path', :controller => 'category', :action => 'view'
   # public profile information
   map.profile 'profile/:profile/:action/:id', :controller => 'profile', :action => 'index'
@@ -1,61 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'category_controller'
-
-# Re-raise errors caught by the controller.
-class CategoryController; def rescue_action(e) raise e end; end
-
-class CategoryControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = CategoryController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    @category = Category.create!(:name => 'my category', :environment => Environment.default)
-  end
-
-  def test_should_display_a_given_category
-    get :view, :category_path => [ 'my-category' ]
-    assert_equal @category, assigns(:category)
-  end
-
-  should 'expose category in a method' do
-    get :view, :category_path => [ 'my-category' ]
-    assert_same assigns(:category), @controller.category
-  end
-
-  should 'list recent articles in the category' do
-    @controller.expects(:category).returns(@category).at_least_once
-    recent = []
-    @category.expects(:recent_articles).returns(recent)
-
-    get :view, :category_path => [ 'my-category' ]
-    assert_same recent, assigns(:recent_articles)
-  end
-
-  should 'list recent comments in the category' do
-    @controller.expects(:category).returns(@category).at_least_once
-    recent = []
-    @category.expects(:recent_comments).returns(recent)
-
-    get :view, :category_path => [ 'my-category' ]
-    assert_same recent, assigns(:recent_comments)
-  end
-
-  should 'list most commented articles in the category' do
-    @controller.expects(:category).returns(@category).at_least_once
-    most_commented = []
-    @category.expects(:most_commented_articles).returns(most_commented)
-
-    get :view, :category_path => [ 'my-category' ]
-    assert_same most_commented, assigns(:most_commented_articles)
-  end
-
-  should 'display category of products' do
-    cat = ProductCategory.create!(:name => 'Food', :environment => Environment.default)
-    ent = Enterprise.create!(:name => 'Enterprise test', :identifier => 'enterprise_test')
-    p = cat.products.create!(:name => 'product test', :enterprise => ent)
-    get :view, :category_path => cat.path.split('/')
-    assert_includes assigns(:products), p
-  end
-
-end
@@ -9,6 +9,8 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     @controller = SearchController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+
+    @category = Category.create!(:name => 'my category', :environment => Environment.default)
   end
   should 'filter stop words' do
@@ -52,11 +54,10 @@ class SearchControllerTest &lt; Test::Unit::TestCase
   should 'search for articles in a specific category' do
     person = create_user('teste').person
-    category = Category.create!(:name => 'my category', :environment => Environment.default)
     # in category
     art1 = person.articles.build(:name => 'an article to be found')
-    art1.categories << category
+    art1.categories << @category
     art1.save!
     # not in category
@@ -83,11 +84,10 @@ class SearchControllerTest &lt; Test::Unit::TestCase
   should 'search in comments in a specific category' do
     person = create_user('teste').person
-    category = Category.create!(:name => 'my category', :environment => Environment.default)
     # in category
     art1 = person.articles.build(:name => 'an article to be found')
-    art1.categories << category
+    art1.categories << @category
     art1.save!
     comment1 = art1.comments.build(:title => 'comment to be found', :body => 'hfyfyh', :author => person); comment1.save!
@@ -108,10 +108,9 @@ class SearchControllerTest &lt; Test::Unit::TestCase
   end
   should 'find enterprises in a specified category' do
-    category = Category.create!(:name => 'my category', :environment => Environment.default)
     # in category
-    ent1 = Enterprise.create!(:name => 'testing enterprise 1', :identifier => 'test1', :categories => [category])
+    ent1 = Enterprise.create!(:name => 'testing enterprise 1', :identifier => 'test1', :categories => [@category])
     # not in category
     ent2 = Enterprise.create!(:name => 'testing enterprise 2', :identifier => 'test2')
@@ -132,8 +131,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase
   end
   should 'find people in a specific category' do
-    c = Category.create!(:name => 'my category', :environment => Environment.default)
-    p1 = create_user('people_1').person; p1.name = 'a beautiful person'; p1.categories << c; p1.save!
+    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!
     get :index, :category_path => [ 'my-category' ], :query => 'beautiful', :find_in => [ 'people' ]
     assert_includes assigns(:results)[:people], p1
@@ -150,10 +148,9 @@ class SearchControllerTest &lt; Test::Unit::TestCase
   end
   should 'find communities in a specified category' do
-    c = Category.create!(:name => 'my category', :environment => Environment.default)
     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 << c; c1.save!
+    c1.categories << @category; c1.save!
     get :index, :category_path => [ 'my-category' ], :query => 'beautiful', :find_in => [ 'communities' ]
     assert_includes assigns(:results)[:communities], c1
     assert_not_includes assigns(:results)[:communities], c2
@@ -169,8 +166,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase
   end
   should 'find products in a specific category' do
-    c = Category.create!(:name => 'my category', :environment => Environment.default)
-    ent1 = Enterprise.create!(:name => 'teste1', :identifier => 'teste1'); ent1.categories << c
+    ent1 = Enterprise.create!(:name => 'teste1', :identifier => 'teste1'); ent1.categories << @category
     ent2 = Enterprise.create!(:name => 'teste2', :identifier => 'teste2')
     prod1 = ent1.products.create!(:name => 'a beautiful product')
     prod2 = ent2.products.create!(:name => 'another beautiful product')
@@ -261,4 +257,49 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'form' , :attributes => { :method => 'get' }
   end
+  def test_should_display_a_given_category
+    get :category_index, :category_path => [ 'my-category' ]
+    assert_equal @category, assigns(:category)
+  end
+
+  should 'expose category in a method' do
+    get :category_index, :category_path => [ 'my-category' ]
+    assert_same assigns(:category), @controller.category
+  end
+
+  should 'list recent articles in the category' do
+    @controller.expects(:category).returns(@category).at_least_once
+    recent = []
+    @category.expects(:recent_articles).returns(recent)
+
+    get :category_index, :category_path => [ 'my-category' ]
+    assert_same recent, assigns(:recent_articles)
+  end
+
+  should 'list recent comments in the category' do
+    @controller.expects(:category).returns(@category).at_least_once
+    recent = []
+    @category.expects(:recent_comments).returns(recent)
+
+    get :category_index, :category_path => [ 'my-category' ]
+    assert_same recent, assigns(:recent_comments)
+  end
+
+  should 'list most commented articles in the category' do
+    @controller.expects(:category).returns(@category).at_least_once
+    most_commented = []
+    @category.expects(:most_commented_articles).returns(most_commented)
+
+    get :category_index, :category_path => [ 'my-category' ]
+    assert_same most_commented, assigns(:most_commented_articles)
+  end
+
+  should 'display category of products' do
+    cat = ProductCategory.create!(:name => 'Food', :environment => Environment.default)
+    ent = Enterprise.create!(:name => 'Enterprise test', :identifier => 'enterprise_test')
+    p = cat.products.create!(:name => 'product test', :enterprise => ent)
+    get :category_index, :category_path => cat.path.split('/')
+    assert_includes assigns(:products), p
+  end
+
 end
@@ -69,8 +69,7 @@ class RoutingTest &lt; ActionController::IntegrationTest
   end
   def test_category_browser
-    assert_routing('/cat/products/eletronics', :controller => 'category', :action => 'view', :category_path => [ 'products', 'eletronics'])
-    assert_routing('/cat', :controller => 'category', :action => 'index')
+    assert_routing('/cat/products/eletronics', :controller => 'search', :action => 'category_index', :category_path => [ 'products', 'eletronics'])
   end
   #FIXME remove this if design_blocks is not going to be used; or uncomment otherwise;
@@ -99,4 +98,8 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_routing('/search/filter/a/b', :controller => 'search', :action => 'filter', :category_path => ['a','b'])
   end
+  def test_assets_routing
+    assert_routing('/assets/my-asset/a/b/c', :controller => 'search', :action => 'assets', :asset => 'my-asset', :category_path => ['a', 'b', 'c'])
+  end
+
 end
@@ -67,7 +67,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     cat.expects(:full_name).returns('category name')
     result = "/cat/my-category/my-subcatagory"
-    expects(:link_to).with('category name', :controller => 'category', :action => 'view', :category_path => ['my-category', 'my-subcatagory']).returns(result)
+    expects(:link_to).with('category name', :controller => 'search', :action => 'category_index', :category_path => ['my-category', 'my-subcatagory']).returns(result)
     assert_same result, link_to_category(cat)
   end
	@@ -1,27 +0,0 @@	@@ -1,27 +0,0 @@
1	-class CategoryController < PublicController
2	-
3	- # view the summary of one category
4	- def view
5	- send('action_' + @category.class.name.underscore)
6	- end
7	-
8	- attr_reader :category
9	-
10	- before_filter :load_category, :only => [ :view ]
11	- private
12	-
13	- def action_product_category
14	- @products = category.products
15	- @enterprises = category.products.map{\|p\| p.enterprise}.flatten.uniq
16	- @users = category.consumers
17	- end
18	-
19	- def action_category
20	- # TODO: load articles, documents, etc so the view can list them.
21	- @recent_articles = category.recent_articles
22	- @recent_comments = category.recent_comments
23	- @most_commented_articles = category.most_commented_articles
24	- end
25	- alias :action_region :action_category
26	-
27	-end
	@@ -24,6 +24,19 @@ class SearchController < ApplicationController		@@ -24,6 +24,19 @@ class SearchController < ApplicationController
24	end	24	end
25	end	25	end
26		26
		27	+ def action_product_category
		28	+ @products = category.products
		29	+ @enterprises = category.products.map{\|p\| p.enterprise}.flatten.uniq
		30	+ @users = category.consumers
		31	+ end
		32	+
		33	+ def action_category
		34	+ @recent_articles = category.recent_articles
		35	+ @recent_comments = category.recent_comments
		36	+ @most_commented_articles = category.most_commented_articles
		37	+ end
		38	+ alias :action_region :action_category
		39	+
27	public	40	public
28		41
29	include SearchHelper	42	include SearchHelper
	@@ -53,6 +66,12 @@ class SearchController < ApplicationController		@@ -53,6 +66,12 @@ class SearchController < ApplicationController
53		66
54	#######################################################	67	#######################################################
55		68
		69	+ # view the summary of one category
		70	+ def category_index
		71	+ send('action_' + @category.class.name.underscore)
		72	+ end
		73	+ attr_reader :category
		74	+
56	def tags	75	def tags
57	@tags = Tag.find(:all).inject({}) do \|memo,tag\|	76	@tags = Tag.find(:all).inject({}) do \|memo,tag\|
58	memo[tag.name] = tag.taggings.count	77	memo[tag.name] = tag.taggings.count
	@@ -309,7 +309,7 @@ module ApplicationHelper		@@ -309,7 +309,7 @@ module ApplicationHelper
309	def link_to_category(category, full = true)	309	def link_to_category(category, full = true)
310	return _('Uncategorized product') unless category	310	return _('Uncategorized product') unless category
311	name = full ? category.full_name : category.name	311	name = full ? category.full_name : category.name
312	- link_to name, :controller => 'category', :action => 'view', :category_path => category.path.split('/')	312	+ link_to name, :controller => 'search', :action => 'category_index', :category_path => category.path.split('/')
313	end	313	end
314		314
315	def link_to_product(product)	315	def link_to_product(product)
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-<li>
2	- <strong><%= link_to(article.title, article.url) %></strong>
3	- <div class="item_meta">
4	- <span class="cat_item_by"><%=
5	- _('by %s') % link_to(article.last_changed_by.name, article.last_changed_by.url)
6	- %></span>
7	- <span class="cat_item_update"><%= _('Last update: %s.') % show_date(article.updated_on) %></span>
8	- </div>
9	-</li>
	@@ -1,24 +0,0 @@	@@ -1,24 +0,0 @@
1	-<h2><%= _('Recent articles') %></h2>
2	-<ul class="recent_on_cat recent_articles">
3	- <%= render :partial => 'article', :collection => @recent_articles %>
4	-</ul>
5	-
6	-<h2><%= _('Recent Comments') %></h2>
7	-<ul class="recent_on_cat recent_comments">
8	-<% @recent_comments.each do \|comment\| %>
9	- <li>
10	- <strong><%= link_to(comment.title, comment.url) %></strong>
11	- <div class="item_meta">
12	- <%= _('by %{author} on "%{article}"') % {
13	- :comment => link_to(comment.title, comment.url),
14	- :article => link_to(comment.article.title, comment.article.url),
15	- :author => comment.author_name } %>
16	- </div>
17	- </li>
18	-<% end %>
19	-</ul>
20	-
21	-<h2><%= _('Most commented articles') %></h2>
22	-<ul class="most_commented">
23	- <%= render :partial => 'article', :collection => @most_commented_articles %>
24	-</ul>
	@@ -1,29 +0,0 @@	@@ -1,29 +0,0 @@
1	-<%= link_to(_('I consume this'), {:profile => current_user.login, :controller => 'consumed_products', :action => 'new', 'consumption[product_category_id]' => @category.id }, :method => :post) if logged_in? %>
2	-<ul>
3	- <li><%= n_("One product in this category.", "%{num} products in this category.", @products.size) % { :num => @products.size } %></li>
4	- <li><%= n_("One enterprise sells products in this category.", "%{num} enterprises sells products in this category.", @enterprises.size) % { :num => @enterprises.size} %></li>
5	- <li><%= n_("One user consumes this product.", "%{num} users consumes this product", @users.size) % {:num => @users.size} %></li>
6	-</ul>
7	-
8	-<h3> <%= _('Products under this category:') %> </h3>
9	-<ul>
10	- <% @products.each do \|p\| %>
11	- <li>
12	- <%= image_tag p.image.public_filename(:thumb) if p.image%>
13	- <%= link_to_product(p) %> <br/>
14	- <% if p.price %>
15	- <%= _('Price: %d') % p.price %> <br/>
16	- <% end %>
17	- <%= _('Enterprise:') %> <%= link_to_homepage p.enterprise.name, p.enterprise.identifier %> <br/><br/>
18	- </li>
19	- <% end %>
20	-</ul>
21	-
22	-<h3><%= _('Users that consumes products in this category:') %></h3>
23	-
24	-<% @users.each do \|u\| %>
25	- <p>
26	- <%= image_tag u.image.public_filename(:thumb) if u.image %> <br>
27	- <%= link_to_homepage(u.name, u.identifier) %>
28	- </p>
29	-<% end %>
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-_category.rhtml
2	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,29 +0,0 @@	@@ -1,29 +0,0 @@
1	-<div id="view-category">
2	-
3	- <div id="category-ancestors">
4	- <%= @category.ancestors.reverse.map { \|a\| link_to_category(a, false) }.join(' → ') %>
5	- </div><!-- end id="category-ancestors" -->
6	-
7	- <h1 id="categiry-name"><%= _('Category: %s') % @category.name %></h1>
8	-
9	- <div class="category_itens">
10	- <%= render :partial => @category.class.name.underscore %>
11	- </div><!-- end class="category_itens" -->
12	-
13	- <div id="category-childs">
14	- <h2> <%= _('Sub-categories') %> </h2>
15	-
16	- <% if @category.children.empty? %>
17	- <strong id="cat-no-child"><%= _('No sub-categories') %></strong>
18	- <% else %>
19	- <ul>
20	- <% @category.children.each do \|c\| %>
21	- <li> <%= link_to_category(c) %> </li>
22	- <% end %>
23	- </ul>
24	- <% end %>
25	-
26	- </div><!-- end id="child-categories" -->
27	-
28	-</div><!-- end id="view-category" -->
29	-
1	- <div class='search-result-text'>
2	- <div>
3	- <strong>
4	- <%= link_to_document(hit) %>
5	- </strong>
6	- </div>
7	- <div>
8	- <%= strip_tags(hit.abstract) %>
9	- </div>	1	+<li>
		2	+ <strong><%= link_to(hit.title, hit.url) %></strong>
		3	+ <div class="item_meta">
		4	+ <% if hit.last_changed_by %>
		5	+ <span class="cat_item_by">
		6	+ <%= _('by %s') % link_to(hit.last_changed_by.name, hit.last_changed_by.url) %>
		7	+ </span>
		8	+ <% end %>
		9	+ <span class="cat_item_update"><%= _('Last update: %s.') % show_date(hit.updated_on) %></span>
10	</div>	10	</div>
		11	+</li>
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+<h2><%= _('Recent articles') %></h2>
	2	+<ul class="recent_on_cat recent_articles">
	3	+ <%= render :partial => 'article', :collection => @recent_articles %>
	4	+</ul>
	5	+
	6	+<h2><%= _('Recent Comments') %></h2>
	7	+<ul class="recent_on_cat recent_comments">
	8	+<% @recent_comments.each do \|comment\| %>
	9	+ <li>
	10	+ <strong><%= link_to(comment.title, comment.url) %></strong>
	11	+ <div class="item_meta">
	12	+ <%= _('by %{author} on "%{article}"') % {
	13	+ :comment => link_to(comment.title, comment.url),
	14	+ :article => link_to(comment.article.title, comment.article.url),
	15	+ :author => comment.author_name } %>
	16	+ </div>
	17	+ </li>
	18	+<% end %>
	19	+</ul>
	20	+
	21	+<h2><%= _('Most commented articles') %></h2>
	22	+<ul class="most_commented">
	23	+ <%= render :partial => 'article', :collection => @most_commented_articles %>
	24	+</ul>