Download as
Browse Code »

Commit aae9aa42fe4e2e2f4ff5c1a034b5a285abbf08b2

Authored by Rodrigo Souto
1 parent 28ff2c57
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

anti-spam-plugin-wrapper: ensure to load concrete wrappers

Showing 1 changed file with 10 additions and 7 deletions   Show diff stats
plugins/anti_spam/lib/anti_spam_plugin/wrapper.rb
  Diff comments   View file @aae9aa4
1 class AntiSpamPlugin::Wrapper < SimpleDelegator 1 class AntiSpamPlugin::Wrapper < SimpleDelegator
2 include Rakismet::Model 2 include Rakismet::Model
3 3
4 - @@wrappers = [AntiSpamPlugin::CommentWrapper, AntiSpamPlugin::SuggestArticleWrapper] 4 + @@wrappers = []
  5 + cattr_accessor :wrappers
5 6
6 def self.wrap(object) 7 def self.wrap(object)
7 - wrapper = @@wrappers.find { |wrapper| wrapper.wraps?(object) } 8 + wrapper = wrappers.find { |wrapper| wrapper.wraps?(object) }
8 wrapper ? wrapper.new(object) : object 9 wrapper ? wrapper.new(object) : object
9 end 10 end
10 11
@@ -12,9 +13,11 @@ class AntiSpamPlugin::Wrapper &lt; SimpleDelegator @@ -12,9 +13,11 @@ class AntiSpamPlugin::Wrapper &lt; SimpleDelegator
12 false 13 false
13 end 14 end
14 15
15 -# FIXME You can't take for granted that the wrappers will be loaded and, therefore,  
16 -# included in the @@wrappers variable.  
17 -# def self.inherited(child)  
18 -# @@wrappers << child  
19 -# end 16 + def self.inherited(child)
  17 + wrappers << child
  18 + end
  19 +end
  20 +
  21 +Dir.glob(File.join(AntiSpamPlugin.root_path, 'lib', 'anti_spam_plugin', '*_wrapper.rb')) do |file|
  22 + load(file)
20 end 23 end