Merge commit 'refs/merge-requests/233' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/233 Conflicts: test/integration/routing_test.rb

Merge commit 'refs/merge-requests/233' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/233 Conflicts: test/integration/routing_test.rb
Daniela Feitosa
2 parents 39a99d9d 90c996e4
Showing 19 changed files with 109 additions and 75 deletions Show diff stats
app/controllers/public/not_found_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public/search_controller.rb
app/helpers/boxes_helper.rb
app/models/article.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/person.rb
app/models/profile.rb
app/models/profile_list_block.rb
app/models/recent_documents_block.rb
app/views/profile/_person_profile.rhtml
config/routes.rb
lib/acts_as_having_boxes.rb
test/functional/profile_design_controller_test.rb
test/integration/routing_test.rb
test/unit/boxes_helper_test.rb
test/unit/enterprise_test.rb
vendor/plugins/access_control/lib/acts_as_accessor.rb
@@ -2,4 +2,8 @@ class NotFoundController &lt; ApplicationController
   def index
     render_not_found
   end
+
+  def nothing
+    render :nothing => true, :status => 404
+  end
 end
@@ -49,36 +49,36 @@ class ProfileController &lt; PublicController
   def communities
     if is_cache_expired?(profile.communities_cache_key(params))
-      @communities = profile.communities.paginate(:per_page => per_page, :page => params[:npage])
+      @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
     end
   end
   def enterprises
-    @enterprises = profile.enterprises
+    @enterprises = profile.enterprises.includes(relations_to_include)
   end
   def friends
     if is_cache_expired?(profile.friends_cache_key(params))
-      @friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage])
+      @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage])
     end
   end
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members.paginate(:per_page => members_per_page, :page => params[:npage])
+      @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
     end
   end
   def fans
-    @fans = profile.fans
+    @fans = profile.fans.includes(relations_to_include)
   end
   def favorite_enterprises
-    @favorite_enterprises = profile.favorite_enterprises
+    @favorite_enterprises = profile.favorite_enterprises.includes(relations_to_include)
   end
   def sitemap
-    @articles = profile.top_level_articles
+    @articles = profile.top_level_articles.includes([:profile, :parent])
   end
   def join
@@ -264,7 +264,7 @@ class ProfileController &lt; PublicController
   def profile_info
     begin
-      @block = profile.blocks.find(params[:block_id])
+      @block = profile.blocks.find(params[:block_id]).includes(:box)
     rescue
       render :text => _('Profile information could not be loaded')
     end
@@ -378,4 +378,8 @@ class ProfileController &lt; PublicController
     @can_edit_profile ||= user && user.has_permission?('edit_profile', profile)
   end
   helper_method :can_edit_profile
+
+  def relations_to_include
+    [:image, :domains, :preferred_domain, :environment]
+  end
 end
@@ -46,7 +46,7 @@ class SearchController &lt; PublicController
     if !@empty_query
       full_text_search ['public:true']
     else
-      @results[@asset] = @environment.people.visible.send(@filter).paginate(paginate_options)
+      @results[@asset] = visible_profiles(Person).send(@filter).paginate(paginate_options)
     end
   end
@@ -76,7 +76,7 @@ class SearchController &lt; PublicController
       full_text_search ['public:true']
     else
       @filter_title = _('Enterprises from network')
-      @results[@asset] = @environment.enterprises.visible.paginate(paginate_options)
+      @results[@asset] = visible_profiles(Enterprise, [{:products => :product_category}]).paginate(paginate_options)
     end
   end
@@ -84,7 +84,7 @@ class SearchController &lt; PublicController
     if !@empty_query
       full_text_search ['public:true']
     else
-      @results[@asset] = @environment.communities.visible.send(@filter).paginate(paginate_options)
+      @results[@asset] = visible_profiles(Community).send(@filter).paginate(paginate_options)
     end
   end
@@ -310,4 +310,12 @@ class SearchController &lt; PublicController
     @all_facets = ret[:all_facets]
   end
+  private
+
+  def visible_profiles(klass, *extra_relations)
+    relations = [:image, :domains, :environment, :preferred_domain]
+    relations += extra_relations
+    @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
+  end
+
 end
@@ -66,7 +66,7 @@ module BoxesHelper
   def display_box_content(box, main_content)
     context = { :article => @page, :request_path => request.path, :locale => locale }
-    box_decorator.select_blocks(box.blocks, context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
+    box_decorator.select_blocks(box.blocks.includes(:box), context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
   end
   def select_blocks(arr, context)
@@ -179,37 +179,23 @@ class Article &lt; ActiveRecord::Base
   end
   named_scope :more_popular, :order => 'hits DESC'
-
-  # retrieves the latest +limit+ articles, sorted from the most recent to the
-  # oldest.
-  #
-  # Only includes articles where advertise == true
-  def self.recent(limit = nil, extra_conditions = {})
-    # FIXME this method is a horrible hack
-    options = { :page => 1, :per_page => limit,
-                :conditions => [
-                  "advertise = ? AND
-                  published = ? AND
-                  profiles.visible = ? AND
-                  profiles.public_profile = ? AND
-                  ((articles.type != ? and articles.type != ? and articles.type != ?) OR articles.type is NULL)", true, true, true, true, 'UploadedFile', 'RssFeed', 'Blog'
-                ],
-                :include => 'profile',
-                :order => 'articles.published_at desc, articles.id desc'
-              }
-    if ( scoped_methods && scoped_methods.last &&
-         scoped_methods.last[:find] &&
-         scoped_methods.last[:find][:joins] &&
-         scoped_methods.last[:find][:joins].index('profiles') )
-      options.delete(:include)
-    end
-    if extra_conditions == {}
-      self.paginate(options)
-    else
-      with_scope :find => {:conditions => extra_conditions} do
-        self.paginate(options)
-      end
+  named_scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]
+
+  def self.recent(limit = nil, extra_conditions = {}, pagination = true)
+    result = scoped({:conditions => extra_conditions}).
+      public.
+      relevant_as_recent.
+      limit(limit).
+      order(['articles.published_at desc', 'articles.id desc'])
+
+    if !( scoped_methods && scoped_methods.last &&
+        scoped_methods.last[:find] &&
+        scoped_methods.last[:find][:joins] &&
+        scoped_methods.last[:find][:joins].index('profiles') )
+      result = result.includes(:profile)
     end
+
+    pagination ? result.paginate({:page => 1, :per_page => limit}) : result
   end
   # produces the HTML code that is to be displayed as this article's contents.
@@ -17,7 +17,7 @@ class Enterprise &lt; Organization
   after_save_reindex [:products], :with => :delayed_job
   extra_data_for_index :product_categories
   def product_categories
-    products.map{|p| p.category_full_name}.compact
+    products.includes(:product_category).map{|p| p.category_full_name}.compact
   end
   N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
@@ -591,8 +591,8 @@ class Environment &lt; ActiveRecord::Base
   end
   has_many :articles, :through => :profiles
-  def recent_documents(limit = 10)
-    self.articles.recent(limit)
+  def recent_documents(limit = 10, options = {}, pagination = true)
+    self.articles.recent(limit, options, pagination)
   end
   has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event'
@@ -248,7 +248,7 @@ class Person &lt; Profile
   def is_admin?(environment = nil)
     environment ||= self.environment
-    role_assignments.select { |ra| ra.resource == environment }.map{|ra|ra.role.permissions}.any? do |ps|
+    role_assignments.includes([:role, :resource]).select { |ra| ra.resource == environment }.map{|ra|ra.role.permissions}.any? do |ps|
       ps.any? do |p|
         ActiveRecord::Base::PERMISSIONS['Environment'].keys.include?(p)
       end
@@ -398,8 +398,8 @@ class Profile &lt; ActiveRecord::Base
   #
   # +limit+ is the maximum number of documents to be returned. It defaults to
   # 10.
-  def recent_documents(limit = 10, options = {})
-    self.articles.recent(limit, options)
+  def recent_documents(limit = 10, options = {}, pagination = true)
+    self.articles.recent(limit, options, pagination)
   end
   def last_articles(limit = 10, options = {})
@@ -14,12 +14,13 @@ class ProfileListBlock &lt; Block
   def profile_list
     result = nil
+    visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])
     if !prioritize_profiles_with_image
-      result = profiles.visible.all(:limit => limit, :order => 'updated_at DESC').sort_by{ rand }
-    elsif profiles.visible.with_image.count >= limit
-      result = profiles.visible.with_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
+      result = visible_profiles.all(:limit => limit, :order => 'updated_at DESC').sort_by{ rand }
+    elsif visible_profiles.with_image.count >= limit
+      result = visible_profiles.with_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
     else
-      result = profiles.visible.with_image.sort_by{ rand } + profiles.visible.without_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
+      result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
     end
     result.slice(0..limit-1)
   end
@@ -16,11 +16,9 @@ class RecentDocumentsBlock &lt; Block
   include ActionController::UrlWriter
   def content(args={})
-    docs = self.limit.nil? ? owner.recent_documents : owner.recent_documents(self.limit)
-
+    docs = self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.limit, {}, false)
     block_title(title) +
     content_tag('ul', docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
-
   end
   def footer
@@ -37,7 +37,7 @@
       <tr>
         <th colspan='2'><%= __('Enterprises') %></th>
       </tr>
-      <% profile.enterprises.each do |item| %>
+      <% profile.enterprises.includes(:environment,:domains, :preferred_domain).each do |item| %>
         <tr>
           <td></td>
           <td><%= button 'menu-enterprise', item.name, item.url %></td>
@@ -23,13 +23,13 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '', :controller => "home", :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
   map.home 'site/:action', :controller => 'home'
-  map.connect 'images/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'stylesheets/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'designs/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'articles/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'javascripts/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'thumbnails/*stuff', :controller => 'not_found', :action => 'index'
-  map.connect 'user_themes/*stuff', :controller => 'not_found', :action => 'index'
+  map.connect 'images/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'stylesheets/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'designs/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'articles/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'javascripts/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'thumbnails/*stuff', :controller => 'not_found', :action => 'nothing'
+  map.connect 'user_themes/*stuff', :controller => 'not_found', :action => 'nothing'
   # online documentation
   map.doc         'doc', :controller => 'doc', :action => 'index'
@@ -18,7 +18,7 @@ module ActsAsHavingBoxes
       @blocks = nil
     end
     if @blocks.nil?
-      @blocks = boxes.inject([]) do |acc,obj|
+      @blocks = boxes.includes(:blocks).inject([]) do |acc,obj|
         acc.concat(obj.blocks)
       end
       @blocks.send(:extend, BlockArray)
@@ -322,11 +322,14 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
   should 'be able to save FeedReaderBlock configurations' do
     @box1.blocks << FeedReaderBlock.new(:address => 'feed address')
     holder.blocks(true)
+    block = @box1.blocks.last
-    post :save, :profile => 'designtestuser', :id => @box1.blocks[-1].id, :block => {:address => 'new feed address', :limit => '20'}
+    post :save, :profile => 'designtestuser', :id => block.id, :block => {:address => 'new feed address', :limit => '20'}
-    assert_equal 'new feed address', @box1.blocks[-1].address
-    assert_equal 20, @box1.blocks[-1].limit
+    block.reload
+
+    assert_equal 'new feed address', block.address
+    assert_equal 20, block.limit
   end
   should 'require login' do
@@ -228,4 +228,32 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_routing('/admin/plugin/foo/admin_bar/play/1', {:controller => 'foo_plugin_admin_bar', :action => 'play', :id => '1'})
   end
+  def test_not_found_images_on_nothing
+    assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/images/aksdhf')
+  end
+
+  def test_not_found_stylesheets_on_nothing
+    assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/stylesheets/aksdhf')
+  end
+
+  def test_not_found_designs_on_nothing
+    assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/designs/aksdhf')
+  end
+
+  def test_not_found_articles_on_nothing
+    assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/articles/aksdhf')
+  end
+
+  def test_not_found_javascripts_on_nothing
+    assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/javascripts/aksdhf')
+  end
+
+  def test_not_found_thumbnails_on_nothing
+    assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/thumbnails/aksdhf')
+  end
+
+  def test_not_found_user_themes_on_nothing
+    assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/user_themes/aksdhf')
+  end
+
 end
@@ -46,7 +46,8 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
     b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
     b.display = 'never'; b.save!
     box = b.box
-    box.expects(:blocks).returns([b])
+    box.blocks = [b]
+    box.save!
     expects(:display_block).with(b, '')
     expects(:request).returns(request)
     stubs(:block_target).returns('')
@@ -64,7 +65,8 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
     b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
     b.display = 'never'; b.save!
     box = b.box
-    box.expects(:blocks).returns([b])
+    box.blocks = [b]
+    box.save!
     expects(:display_block).with(b, '').never
     expects(:request).returns(request)
     stubs(:block_target).returns('')
@@ -106,9 +108,7 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
   should 'fill context with the article, request_path and locale' do
     request = mock()
-    box = mock()
-
-    box.expects(:blocks).returns([])
+    box = Box.create!(:owner => fast_create(Profile))
     request.expects(:path).returns('/')
     expects(:request).returns(request)
     expects(:locale).returns('en')
@@ -482,9 +482,11 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
   should 'reindex products with full category name after save' do
     product = mock
+    products = mock
     product.expects(:category_full_name)
-    Enterprise.any_instance.stubs(:products).returns([product])
-    Enterprise.expects(:solr_batch_add).with(includes(product))
+    products.stubs(:includes).returns([product])
+    Enterprise.any_instance.stubs(:products).returns(products)
+    Enterprise.expects(:solr_batch_add).with([products])
     ent = fast_create(Enterprise)
     ent.save!
   end
@@ -4,7 +4,7 @@ class ActiveRecord::Base
     def has_permission?(permission, resource = nil)
       return true if resource == self
-      role_assignments.any? {|ra| ra.has_permission?(permission, resource)}
+      role_assignments.includes([:resource,:role]).any? {|ra| ra.has_permission?(permission, resource)}
     end
     def define_roles(roles, resource)
	@@ -2,4 +2,8 @@ class NotFoundController < ApplicationController		@@ -2,4 +2,8 @@ class NotFoundController < ApplicationController
2	def index	2	def index
3	render_not_found	3	render_not_found
4	end	4	end
		5	+
		6	+ def nothing
		7	+ render :nothing => true, :status => 404
		8	+ end
5	end	9	end
	@@ -66,7 +66,7 @@ module BoxesHelper		@@ -66,7 +66,7 @@ module BoxesHelper
66		66
67	def display_box_content(box, main_content)	67	def display_box_content(box, main_content)
68	context = { :article => @page, :request_path => request.path, :locale => locale }	68	context = { :article => @page, :request_path => request.path, :locale => locale }
69	- box_decorator.select_blocks(box.blocks, context).map { \|item\| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)	69	+ box_decorator.select_blocks(box.blocks.includes(:box), context).map { \|item\| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
70	end	70	end
71		71
72	def select_blocks(arr, context)	72	def select_blocks(arr, context)
	@@ -179,37 +179,23 @@ class Article < ActiveRecord::Base		@@ -179,37 +179,23 @@ class Article < ActiveRecord::Base
179	end	179	end
180		180
181	named_scope :more_popular, :order => 'hits DESC'	181	named_scope :more_popular, :order => 'hits DESC'
182	-
183	- # retrieves the latest +limit+ articles, sorted from the most recent to the
184	- # oldest.
185	- #
186	- # Only includes articles where advertise == true
187	- def self.recent(limit = nil, extra_conditions = {})
188	- # FIXME this method is a horrible hack
189	- options = { :page => 1, :per_page => limit,
190	- :conditions => [
191	- "advertise = ? AND
192	- published = ? AND
193	- profiles.visible = ? AND
194	- profiles.public_profile = ? AND
195	- ((articles.type != ? and articles.type != ? and articles.type != ?) OR articles.type is NULL)", true, true, true, true, 'UploadedFile', 'RssFeed', 'Blog'
196	- ],
197	- :include => 'profile',
198	- :order => 'articles.published_at desc, articles.id desc'
199	- }
200	- if ( scoped_methods && scoped_methods.last &&
201	- scoped_methods.last[:find] &&
202	- scoped_methods.last[:find][:joins] &&
203	- scoped_methods.last[:find][:joins].index('profiles') )
204	- options.delete(:include)
205	- end
206	- if extra_conditions == {}
207	- self.paginate(options)
208	- else
209	- with_scope :find => {:conditions => extra_conditions} do
210	- self.paginate(options)
211	- end	182	+ named_scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]
		183	+
		184	+ def self.recent(limit = nil, extra_conditions = {}, pagination = true)
		185	+ result = scoped({:conditions => extra_conditions}).
		186	+ public.
		187	+ relevant_as_recent.
		188	+ limit(limit).
		189	+ order(['articles.published_at desc', 'articles.id desc'])
		190	+
		191	+ if !( scoped_methods && scoped_methods.last &&
		192	+ scoped_methods.last[:find] &&
		193	+ scoped_methods.last[:find][:joins] &&
		194	+ scoped_methods.last[:find][:joins].index('profiles') )
		195	+ result = result.includes(:profile)
212	end	196	end
		197	+
		198	+ pagination ? result.paginate({:page => 1, :per_page => limit}) : result
213	end	199	end
214		200
215	# produces the HTML code that is to be displayed as this article's contents.	201	# produces the HTML code that is to be displayed as this article's contents.
	@@ -17,7 +17,7 @@ class Enterprise < Organization		@@ -17,7 +17,7 @@ class Enterprise < Organization
17	after_save_reindex [:products], :with => :delayed_job	17	after_save_reindex [:products], :with => :delayed_job
18	extra_data_for_index :product_categories	18	extra_data_for_index :product_categories
19	def product_categories	19	def product_categories
20	- products.map{\|p\| p.category_full_name}.compact	20	+ products.includes(:product_category).map{\|p\| p.category_full_name}.compact
21	end	21	end
22		22
23	N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')	23	N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
	@@ -248,7 +248,7 @@ class Person < Profile		@@ -248,7 +248,7 @@ class Person < Profile
248		248
249	def is_admin?(environment = nil)	249	def is_admin?(environment = nil)
250	environment \|\|= self.environment	250	environment \|\|= self.environment
251	- role_assignments.select { \|ra\| ra.resource == environment }.map{\|ra\|ra.role.permissions}.any? do \|ps\|	251	+ role_assignments.includes([:role, :resource]).select { \|ra\| ra.resource == environment }.map{\|ra\|ra.role.permissions}.any? do \|ps\|
252	ps.any? do \|p\|	252	ps.any? do \|p\|
253	ActiveRecord::Base::PERMISSIONS['Environment'].keys.include?(p)	253	ActiveRecord::Base::PERMISSIONS['Environment'].keys.include?(p)
254	end	254	end
	@@ -37,7 +37,7 @@		@@ -37,7 +37,7 @@
37	<tr>	37	<tr>
38	<th colspan='2'><%= __('Enterprises') %></th>	38	<th colspan='2'><%= __('Enterprises') %></th>
39	</tr>	39	</tr>
40	- <% profile.enterprises.each do \|item\| %>	40	+ <% profile.enterprises.includes(:environment,:domains, :preferred_domain).each do \|item\| %>
41	<tr>	41	<tr>
42	<td></td>	42	<td></td>
43	<td><%= button 'menu-enterprise', item.name, item.url %></td>	43	<td><%= button 'menu-enterprise', item.name, item.url %></td>
	@@ -18,7 +18,7 @@ module ActsAsHavingBoxes		@@ -18,7 +18,7 @@ module ActsAsHavingBoxes
18	@blocks = nil	18	@blocks = nil
19	end	19	end
20	if @blocks.nil?	20	if @blocks.nil?
21	- @blocks = boxes.inject([]) do \|acc,obj\|	21	+ @blocks = boxes.includes(:blocks).inject([]) do \|acc,obj\|
22	acc.concat(obj.blocks)	22	acc.concat(obj.blocks)
23	end	23	end
24	@blocks.send(:extend, BlockArray)	24	@blocks.send(:extend, BlockArray)
	@@ -228,4 +228,32 @@ class RoutingTest < ActionController::IntegrationTest		@@ -228,4 +228,32 @@ class RoutingTest < ActionController::IntegrationTest
228	assert_routing('/admin/plugin/foo/admin_bar/play/1', {:controller => 'foo_plugin_admin_bar', :action => 'play', :id => '1'})	228	assert_routing('/admin/plugin/foo/admin_bar/play/1', {:controller => 'foo_plugin_admin_bar', :action => 'play', :id => '1'})
229	end	229	end
230		230
		231	+ def test_not_found_images_on_nothing
		232	+ assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/images/aksdhf')
		233	+ end
		234	+
		235	+ def test_not_found_stylesheets_on_nothing
		236	+ assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/stylesheets/aksdhf')
		237	+ end
		238	+
		239	+ def test_not_found_designs_on_nothing
		240	+ assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/designs/aksdhf')
		241	+ end
		242	+
		243	+ def test_not_found_articles_on_nothing
		244	+ assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/articles/aksdhf')
		245	+ end
		246	+
		247	+ def test_not_found_javascripts_on_nothing
		248	+ assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/javascripts/aksdhf')
		249	+ end
		250	+
		251	+ def test_not_found_thumbnails_on_nothing
		252	+ assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/thumbnails/aksdhf')
		253	+ end
		254	+
		255	+ def test_not_found_user_themes_on_nothing
		256	+ assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/user_themes/aksdhf')
		257	+ end
		258	+
231	end	259	end
	@@ -4,7 +4,7 @@ class ActiveRecord::Base		@@ -4,7 +4,7 @@ class ActiveRecord::Base
4		4
5	def has_permission?(permission, resource = nil)	5	def has_permission?(permission, resource = nil)
6	return true if resource == self	6	return true if resource == self
7	- role_assignments.any? {\|ra\| ra.has_permission?(permission, resource)}	7	+ role_assignments.includes([:resource,:role]).any? {\|ra\| ra.has_permission?(permission, resource)}
8	end	8	end
9		9
10	def define_roles(roles, resource)	10	def define_roles(roles, resource)