Download as
Browse Code »

Commit 5b05e58255d362086f1177b1a13f25343c74fc17

Authored by Braulio Bhavamitra
1 parent d1926f54
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

Support application controller filters

Showing 1 changed file with 20 additions and 12 deletions   Show diff stats
lib/noosfero/plugin.rb
  Diff comments   View file @5b05e58
@@ -88,18 +88,26 @@ class Noosfero::Plugin @@ -88,18 +88,26 @@ class Noosfero::Plugin
88 # This is a generic method that initialize any possible filter defined by a 88 # This is a generic method that initialize any possible filter defined by a
89 # plugin to a specific controller 89 # plugin to a specific controller
90 def load_plugin_filters(plugin) 90 def load_plugin_filters(plugin)
91 - plugin_methods = plugin.instance_methods.select {|m| m.to_s.end_with?('_filters')}  
92 - plugin_methods.each do |plugin_method|  
93 - controller_class = plugin_method.to_s.gsub('_filters', '').camelize.constantize  
94 - filters = plugin.new.send(plugin_method)  
95 - filters = [filters] if !filters.kind_of?(Array)  
96 -  
97 - filters.each do |plugin_filter|  
98 - filter_method = (plugin.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]).to_sym  
99 - controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))  
100 - controller_class.send(:define_method, filter_method) do  
101 - instance_eval(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)  
102 - end 91 + Rails.configuration.to_prepare do
  92 + filters = plugin.new.send 'application_controller_filters' rescue []
  93 + Noosfero::Plugin.add_controller_filters ApplicationController, plugin, filters
  94 +
  95 + plugin_methods = plugin.instance_methods.select {|m| m.to_s.end_with?('_filters')}
  96 + plugin_methods.each do |plugin_method|
  97 + controller_class = plugin_method.to_s.gsub('_filters', '').camelize.constantize
  98 +
  99 + filters = plugin.new.send(plugin_method)
  100 + Noosfero::Plugin.add_controller_filters controller_class, plugin, filters
  101 + end
  102 + end
  103 + end
  104 +
  105 + def add_controller_filters controller_class, plugin, filters
  106 + Array(filters).each do |plugin_filter|
  107 + filter_method = (plugin.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]).to_sym
  108 + controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
  109 + controller_class.send(:define_method, filter_method) do
  110 + instance_exec(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)
103 end 111 end
104 end 112 end
105 end 113 end