2
Download as
Browse Code »

Commit da84575ee29154fa4f24c9acdfce9ec16a7acb5b

Authored by Braulio Bhavamitra
1 parent 8a3fb6f3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

plugins: only call event on plugin if it is defined 

This allow proper use of default values defined in Noosfero::Plugin
abstract class.
Showing 2 changed files with 39 additions and 7 deletions   Show diff stats
lib/noosfero/plugin/manager.rb
  Diff comments   View file @da84575
@@ -20,15 +20,15 @@ class Noosfero::Plugin::Manager @@ -20,15 +20,15 @@ class Noosfero::Plugin::Manager
20 # return [1,0,1,2,3] 20 # return [1,0,1,2,3]
21 # 21 #
22 def dispatch(event, *args) 22 def dispatch(event, *args)
23 - dispatch_without_flatten(event, *args).flatten 23 + flat_map{ |plugin| result_for plugin, event, *args }.compact
24 end 24 end
25 25
26 def fetch_plugins(event, *args) 26 def fetch_plugins(event, *args)
27 - map { |plugin| plugin.class if plugin.send(event, *args) }.compact.flatten 27 + map { |plugin| plugin.class if result_for plugin, event, *args }.compact.flatten
28 end 28 end
29 29
30 def dispatch_without_flatten(event, *args) 30 def dispatch_without_flatten(event, *args)
31 - map { |plugin| plugin.send(event, *args) }.compact 31 + map { |plugin| result_for plugin, event, *args }.compact
32 end 32 end
33 33
34 alias :dispatch_scopes :dispatch_without_flatten 34 alias :dispatch_scopes :dispatch_without_flatten
@@ -37,9 +37,14 @@ class Noosfero::Plugin::Manager @@ -37,9 +37,14 @@ class Noosfero::Plugin::Manager
37 Noosfero::Plugin.new.send event, *args 37 Noosfero::Plugin.new.send event, *args
38 end 38 end
39 39
  40 + def result_for plugin, event, *args
  41 + method = plugin.method event
  42 + method.call *args if method.owner != Noosfero::Plugin
  43 + end
  44 +
40 def dispatch_first(event, *args) 45 def dispatch_first(event, *args)
41 each do |plugin| 46 each do |plugin|
42 - result = plugin.send(event, *args) 47 + result = result_for plugin, event, *args
43 return result if result.present? 48 return result if result.present?
44 end 49 end
45 default_for event, *args 50 default_for event, *args
@@ -47,7 +52,7 @@ class Noosfero::Plugin::Manager @@ -47,7 +52,7 @@ class Noosfero::Plugin::Manager
47 52
48 def fetch_first_plugin(event, *args) 53 def fetch_first_plugin(event, *args)
49 each do |plugin| 54 each do |plugin|
50 - result = plugin.send event, *args 55 + result = result_for plugin, event, *args
51 return plugin.class if result.present? 56 return plugin.class if result.present?
52 end 57 end
53 nil 58 nil
@@ -55,7 +60,7 @@ class Noosfero::Plugin::Manager @@ -55,7 +60,7 @@ class Noosfero::Plugin::Manager
55 60
56 def pipeline(event, *args) 61 def pipeline(event, *args)
57 each do |plugin| 62 each do |plugin|
58 - result = plugin.send(event, *args) 63 + result = result_for plugin, event, *args
59 result = result.kind_of?(Array) ? result : [result] 64 result = result.kind_of?(Array) ? result : [result]
60 raise ArgumentError, "Pipeline broken by #{plugin.class.name} on #{event} with #{result.length} arguments instead of #{args.length}." if result.length != args.length 65 raise ArgumentError, "Pipeline broken by #{plugin.class.name} on #{event} with #{result.length} arguments instead of #{args.length}." if result.length != args.length
61 args = result 66 args = result
@@ -64,7 +69,7 @@ class Noosfero::Plugin::Manager @@ -64,7 +69,7 @@ class Noosfero::Plugin::Manager
64 end 69 end
65 70
66 def filter(property, data) 71 def filter(property, data)
67 - inject(data) {|data, plugin| data = plugin.send(property, data)} 72 + inject(data){ |data, plugin| data = plugin.send(property, data) }
68 end 73 end
69 74
70 def parse_macro(macro_name, macro, source = nil) 75 def parse_macro(macro_name, macro, source = nil)
test/unit/plugin_manager_test.rb
  Diff comments   View file @da84575
@@ -304,4 +304,31 @@ class PluginManagerTest < ActiveSupport::TestCase @@ -304,4 +304,31 @@ class PluginManagerTest < ActiveSupport::TestCase
304 @manager.dispatch_first :find_by_contents, :products, environment.products, 'product' 304 @manager.dispatch_first :find_by_contents, :products, environment.products, 'product'
305 end 305 end
306 306
  307 + should 'not event if it is not defined by plugin' do
  308 + class Noosfero::Plugin
  309 + def never_call
  310 + nil
  311 + end
  312 + end
  313 + class Plugin1 < Noosfero::Plugin
  314 + def never_call
  315 + 'defined'
  316 + end
  317 + end
  318 + class Plugin2 < Noosfero::Plugin
  319 + end
  320 + Noosfero::Plugin.stubs(:all).returns(['PluginManagerTest::Plugin1', 'PluginManagerTest::Plugin2'])
  321 + environment.enable_plugin(Plugin1)
  322 + environment.enable_plugin(Plugin2)
  323 + plugin1 = @manager.enabled_plugins.detect{ |p| p.is_a? Plugin1 }
  324 + plugin2 = @manager.enabled_plugins.detect{ |p| p.is_a? Plugin2 }
  325 +
  326 + assert_equal Plugin1, Plugin1.new.method(:never_call).owner
  327 + assert_equal Noosfero::Plugin, Plugin2.new.method(:never_call).owner
  328 + # expects never can't be used as it defines the method
  329 + @manager.expects(:result_for).with(plugin1, :never_call).returns(Plugin1.new.never_call)
  330 + @manager.expects(:result_for).with(plugin2, :never_call).returns(nil)
  331 + @manager.dispatch :never_call
  332 + end
  333 +
307 end 334 end