plugins: only call default value if result is blank

Braulio Bhavamitra
1 parent 01024be2
Showing 3 changed files with 23 additions and 12 deletions Show diff stats
lib/noosfero/plugin/manager.rb
test/unit/plugin_manager_test.rb
test/unit/plugin_test.rb
@@ -33,26 +33,24 @@ class Noosfero::Plugin::Manager
  
   alias :dispatch_scopes :dispatch_without_flatten
  
+  def default_for event, *args
+    Noosfero::Plugin.new.send event, *args
+  end
+
   def dispatch_first(event, *args)
-    default = Noosfero::Plugin.new.send(event, *args)
-    result = default
     each do |plugin|
       result = plugin.send(event, *args)
-      break if result != default
+      return result if result.present?
     end
-    result
+    default_for event, *args
   end
  
   def fetch_first_plugin(event, *args)
-    default = Noosfero::Plugin.new.send(event, *args)
-    result = nil
     each do |plugin|
-      if plugin.send(event, *args) != default
-        result = plugin.class
-        break
-      end
+      result = plugin.send event, *args
+      return plugin.class if result.present?
     end
-    result
+    nil
   end
  
   def pipeline(event, *args)
@@ -291,4 +291,17 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     assert_equal [7,9], manager.filter(:invalid_numbers, [1,2,3,4,5,6,7,8,9,10])
   end
  
+  should 'only call default if value is blank' do
+    class Plugin1 < Noosfero::Plugin
+      def find_by_contents asset, scope, query, paginate_options={}, options={}
+        {results: [1,2,3]}
+      end
+    end
+    Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1'])
+    environment.enable_plugin(Plugin1)
+
+    Noosfero::Plugin.any_instance.expects(:find_by_contents).never
+    @manager.dispatch_first :find_by_contents, :products, environment.products, 'product'
+  end
+
 end
@@ -23,7 +23,7 @@ class PluginTest &lt; ActiveSupport::TestCase
   end
  
   should 'returns empty hash for class method extra_blocks by default if no blocks are defined on plugin' do
-    
+
     class SomePlugin1 < Noosfero::Plugin
     end
...	...	@@ -33,26 +33,24 @@ class Noosfero::Plugin::Manager
33	33
34	34	alias :dispatch_scopes :dispatch_without_flatten
35	35
	36	+ def default_for event, *args
	37	+ Noosfero::Plugin.new.send event, *args
	38	+ end
	39	+
36	40	def dispatch_first(event, *args)
37		- default = Noosfero::Plugin.new.send(event, *args)
38		- result = default
39	41	each do \|plugin\|
40	42	result = plugin.send(event, *args)
41		- break if result != default
	43	+ return result if result.present?
42	44	end
43		- result
	45	+ default_for event, *args
44	46	end
45	47
46	48	def fetch_first_plugin(event, *args)
47		- default = Noosfero::Plugin.new.send(event, *args)
48		- result = nil
49	49	each do \|plugin\|
50		- if plugin.send(event, *args) != default
51		- result = plugin.class
52		- break
53		- end
	50	+ result = plugin.send event, *args
	51	+ return plugin.class if result.present?
54	52	end
55		- result
	53	+ nil
56	54	end
57	55
58	56	def pipeline(event, *args)
...	...
...	...	@@ -291,4 +291,17 @@ class PluginManagerTest < ActiveSupport::TestCase
291	291	assert_equal [7,9], manager.filter(:invalid_numbers, [1,2,3,4,5,6,7,8,9,10])
292	292	end
293	293
	294	+ should 'only call default if value is blank' do
	295	+ class Plugin1 < Noosfero::Plugin
	296	+ def find_by_contents asset, scope, query, paginate_options={}, options={}
	297	+ {results: [1,2,3]}
	298	+ end
	299	+ end
	300	+ Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1'])
	301	+ environment.enable_plugin(Plugin1)
	302	+
	303	+ Noosfero::Plugin.any_instance.expects(:find_by_contents).never
	304	+ @manager.dispatch_first :find_by_contents, :products, environment.products, 'product'
	305	+ end
	306	+
294	307	end
...	...
...	...	@@ -23,7 +23,7 @@ class PluginTest < ActiveSupport::TestCase
23	23	end
24	24
25	25	should 'returns empty hash for class method extra_blocks by default if no blocks are defined on plugin' do
26		-
	26	+
27	27	class SomePlugin1 < Noosfero::Plugin
28	28	end
29	29
...	...