Finish the new implementation of hotspot behaviour

Undo some things, fix some tests, etc

Finish the new implementation of hotspot behaviour
Undo some things, fix some tests, etc
Antonio Terceiro
1 parent d3836bc2
Showing 9 changed files with 29 additions and 70 deletions Show diff stats
app/models/person.rb
app/models/profile.rb
config/initializers/plugins.rb
lib/noosfero/plugin/acts_as_having_hotspots.rb
lib/noosfero/plugin/manager.rb
test/functional/content_viewer_controller_test.rb
test/unit/content_viewer_helper_test.rb
test/unit/plugin_manager_test.rb
test/unit/profile_test.rb
@@ -22,8 +22,6 @@ class Person &lt; Profile
     super
   end
-  acts_as_having_hotspots
-
   named_scope :members_of, lambda { |resources|
     resources = [resources] if !resources.kind_of?(Array)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
@@ -32,7 +30,7 @@ class Person &lt; Profile
   def has_permission_with_plugins?(permission, profile)
     permissions = [has_permission_without_plugins?(permission, profile)]
-    permissions += enabled_plugins.map do |plugin|
+    permissions += plugins.map do |plugin|
       plugin.has_permission?(self, permission, profile)
     end
     permissions.include?(true)
@@ -60,7 +60,8 @@ class Profile &lt; ActiveRecord::Base
   }
   acts_as_accessible
-  acts_as_having_hotspots
+
+  include Noosfero::Plugin::HotSpot
   named_scope :memberships_of, lambda { |person| { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.accessor_type = ? AND role_assignments.accessor_id = ?', person.class.base_class.name, person.id ] } }
   #FIXME: these will work only if the subclass is already loaded
@@ -69,7 +70,7 @@ class Profile &lt; ActiveRecord::Base
   named_scope :templates, :conditions => {:is_template => true}
   def members
-    scopes = dispatch_scopes(:organization_members, self)
+    scopes = plugins.dispatch_scopes(:organization_members, self)
     scopes << Person.members_of(self)
     scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
   end
 require 'noosfero/plugin'
-require 'noosfero/plugin/acts_as_having_hotspots'
+require 'noosfero/plugin/hot_spot'
 require 'noosfero/plugin/manager'
 require 'noosfero/plugin/active_record'
 require 'noosfero/plugin/mailer_base'
@@ -1,44 +0,0 @@
-module ActsAsHavingHotspots
-  module ClassMethods
-    # Adding this feature to a class demands that it defines an instance method
-    # 'environment' that returns the environment associated with the instance.
-    def acts_as_having_hotspots
-      send :include, InstanceMethods
-    end
-
-    module InstanceMethods
-      # Dispatches +event+ to each enabled plugin and collect the results.
-      #
-      # Returns an Array containing the objects returned by the event method in
-      # each plugin. This array is compacted (i.e. nils are removed) and flattened
-      # (i.e. elements of arrays are added to the resulting array). For example, if
-      # the enabled plugins return 1, 0, nil, and [1,2,3], then this method will
-      # return [1,0,1,2,3]
-      #
-      def dispatch(event, *args)
-        enabled_plugins.map { |plugin| plugin.send(event, *args) }.compact.flatten
-      end
-
-      # Dispatch without flatten since scopes are executed if you run flatten on them
-      def dispatch_scopes(event, *args)
-        enabled_plugins.map { |plugin| plugin.send(event, *args) }.compact
-      end
-
-      def enabled_plugins
-        Thread.current[:enabled_plugins] ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin_name|
-          plugin = plugin_name.constantize.new
-          plugin.context = context
-          plugin
-        end
-      end
-
-      if !method_defined?(:context)
-        define_method(:context) do
-          Noosfero::Plugin::Context.new
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:extend, ActsAsHavingHotspots::ClassMethods)
@@ -8,7 +8,6 @@ class Noosfero::Plugin::Manager
     @constantize = context
   end
-  delegate :environment, :to => :context
   delegate :each, :to => :enabled_plugins
   include Enumerable
@@ -21,9 +20,15 @@ class Noosfero::Plugin::Manager
   # return [1,0,1,2,3]
   #
   def dispatch(event, *args)
-    map { |plugin| plugin.send(event, *args) }.compact.flatten
+    dispatch_without_flatten(event, *args).flatten
   end
+  def dispatch_without_flatten(event, *args)
+    map { |plugin| plugin.send(event, *args) }.compact
+  end
+
+  alias :dispatch_scopes :dispatch_without_flatten
+
   def enabled_plugins
     @enabled_plugins ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin|
       p = plugin.constantize.new
@@ -1410,8 +1410,8 @@ end
   should 'not display comments marked as spam' do
     article = fast_create(Article, :profile_id => profile.id)
-    ham = fast_create(Comment, :source_id => article.id)
-    spam = fast_create(Comment, :source_id => article.id, :spam => true)
+    ham = fast_create(Comment, :source_id => article.id, :source_type => 'Article')
+    spam = fast_create(Comment, :source_id => article.id, :source_type => 'Article', :spam => true)
     get 'view_page', :profile => profile.identifier, :page => article.path.split('/')
     assert_equal 1, assigns(:comments_count)
@@ -1420,7 +1420,7 @@ end
   should 'be able to mark comments as spam' do
     login_as profile.identifier
     article = fast_create(Article, :profile_id => profile.id)
-    spam = fast_create(Comment, :name => 'foo', :email => 'foo@example.com', :source_id => article.id)
+    spam = fast_create(Comment, :name => 'foo', :email => 'foo@example.com', :source_id => article.id, :source_type => 'Article')
     post 'view_page', :profile => profile.identifier, :page => article.path.split('/'), :mark_comment_as_spam => spam.id
@@ -61,9 +61,9 @@ class ContentViewerHelperTest &lt; ActiveSupport::TestCase
   end
   should 'count total of comments from post' do
-    article = TextileArticle.new(:name => 'first post for test', :body => 'first post for test', :profile => profile)
+    article = fast_create(TextileArticle)
     article.stubs(:url).returns({})
-    article.stubs(:comments).returns([Comment.new(:author => profile, :title => 'test', :body => 'test')])
+    article.comments.create!(:author => profile, :title => 'test', :body => 'test')
     result = link_to_comments(article)
     assert_match /One comment/, result
   end
@@ -12,6 +12,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     @manager = Noosfero::Plugin::Manager.new(@environment, @controller)
   end
   attr_reader :environment
+  attr_reader :manager
   should 'return the intersection between environment\'s enabled plugins and system available plugins' do
     class Plugin1 < Noosfero::Plugin; end;
@@ -20,7 +21,6 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     class Plugin4 < Noosfero::Plugin; end;
     environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s, Plugin4.to_s])
     Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin3.to_s, Plugin4.to_s])
-    manager = Noosfero::Plugin::Manager.new(@controller)
     plugins = manager.enabled_plugins.map { |instance| instance.class.to_s }
     assert_equal [Plugin1.to_s, Plugin4.to_s], plugins
   end
@@ -49,7 +49,6 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     p1 = Plugin1.new
     p2 = Plugin2.new
-    manager = Noosfero::Plugin::Manager.new(@controller)
     assert_equal [p1.random_event, p2.random_event], manager.dispatch(:random_event)
   end
@@ -1834,16 +1834,6 @@ class ProfileTest &lt; ActiveSupport::TestCase
   end
   should 'merge members of plugins to original members' do
-    original_community = fast_create(Community)
-    community1 = fast_create(Community, :identifier => 'community1')
-    community2 = fast_create(Community, :identifier => 'community2')
-    original_member = fast_create(Person)
-    plugin1_member = fast_create(Person)
-    plugin2_member = fast_create(Person)
-    original_community.add_member(original_member)
-    community1.add_member(plugin1_member)
-    community2.add_member(plugin2_member)
-
     class Plugin1 < Noosfero::Plugin
       def organization_members(profile)
         Person.members_of(Community.find_by_identifier('community1'))
@@ -1855,8 +1845,18 @@ class ProfileTest &lt; ActiveSupport::TestCase
         Person.members_of(Community.find_by_identifier('community2'))
       end
     end
+    Environment.default.enable_plugin(Plugin1)
+    Environment.default.enable_plugin(Plugin2)
-    original_community.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
+    original_community = fast_create(Community)
+    community1 = fast_create(Community, :identifier => 'community1')
+    community2 = fast_create(Community, :identifier => 'community2')
+    original_member = fast_create(Person)
+    plugin1_member = fast_create(Person)
+    plugin2_member = fast_create(Person)
+    original_community.add_member(original_member)
+    community1.add_member(plugin1_member)
+    community2.add_member(plugin2_member)
     assert_includes original_community.members, original_member
     assert_includes original_community.members, plugin1_member
1	require 'noosfero/plugin'	1	require 'noosfero/plugin'
2	-require 'noosfero/plugin/acts_as_having_hotspots'	2	+require 'noosfero/plugin/hot_spot'
3	require 'noosfero/plugin/manager'	3	require 'noosfero/plugin/manager'
4	require 'noosfero/plugin/active_record'	4	require 'noosfero/plugin/active_record'
5	require 'noosfero/plugin/mailer_base'	5	require 'noosfero/plugin/mailer_base'
	@@ -1,44 +0,0 @@	@@ -1,44 +0,0 @@
1	-module ActsAsHavingHotspots
2	- module ClassMethods
3	- # Adding this feature to a class demands that it defines an instance method
4	- # 'environment' that returns the environment associated with the instance.
5	- def acts_as_having_hotspots
6	- send :include, InstanceMethods
7	- end
8	-
9	- module InstanceMethods
10	- # Dispatches +event+ to each enabled plugin and collect the results.
11	- #
12	- # Returns an Array containing the objects returned by the event method in
13	- # each plugin. This array is compacted (i.e. nils are removed) and flattened
14	- # (i.e. elements of arrays are added to the resulting array). For example, if
15	- # the enabled plugins return 1, 0, nil, and [1,2,3], then this method will
16	- # return [1,0,1,2,3]
17	- #
18	- def dispatch(event, *args)
19	- enabled_plugins.map { \|plugin\| plugin.send(event, *args) }.compact.flatten
20	- end
21	-
22	- # Dispatch without flatten since scopes are executed if you run flatten on them
23	- def dispatch_scopes(event, *args)
24	- enabled_plugins.map { \|plugin\| plugin.send(event, *args) }.compact
25	- end
26	-
27	- def enabled_plugins
28	- Thread.current[:enabled_plugins] \|\|= (Noosfero::Plugin.all & environment.enabled_plugins).map do \|plugin_name\|
29	- plugin = plugin_name.constantize.new
30	- plugin.context = context
31	- plugin
32	- end
33	- end
34	-
35	- if !method_defined?(:context)
36	- define_method(:context) do
37	- Noosfero::Plugin::Context.new
38	- end
39	- end
40	- end
41	- end
42	-end
43	-
44	-ActiveRecord::Base.send(:extend, ActsAsHavingHotspots::ClassMethods)
	@@ -61,9 +61,9 @@ class ContentViewerHelperTest < ActiveSupport::TestCase		@@ -61,9 +61,9 @@ class ContentViewerHelperTest < ActiveSupport::TestCase
61	end	61	end
62		62
63	should 'count total of comments from post' do	63	should 'count total of comments from post' do
64	- article = TextileArticle.new(:name => 'first post for test', :body => 'first post for test', :profile => profile)	64	+ article = fast_create(TextileArticle)
65	article.stubs(:url).returns({})	65	article.stubs(:url).returns({})
66	- article.stubs(:comments).returns([Comment.new(:author => profile, :title => 'test', :body => 'test')])	66	+ article.comments.create!(:author => profile, :title => 'test', :body => 'test')
67	result = link_to_comments(article)	67	result = link_to_comments(article)
68	assert_match /One comment/, result	68	assert_match /One comment/, result
69	end	69	end