Merge remote-tracking branch 'origin/master'

Weblate
2 parents 77a0c45f c6f5b484
Showing 3 changed files with 23 additions and 14 deletions Show diff stats
lib/noosfero/plugin.rb
lib/noosfero/plugin/routes.rb
lib/noosfero/plugin/spammable.rb
@@ -24,11 +24,17 @@ class Noosfero::Plugin
     def initialize!
       return if !should_load
-      available_plugins.each do |plugin_dir|
+
+      klasses = available_plugins.map do |plugin_dir|
         plugin_name = File.basename(plugin_dir)
-        plugin = load_plugin(plugin_name)
-        load_plugin_extensions(plugin_dir)
-        load_plugin_filters(plugin)
+        load_plugin plugin_name
+      end
+      available_plugins.each do |plugin_dir|
+        load_plugin_extensions plugin_dir
+      end
+      # filters must be loaded after all extensions
+      klasses.each do |plugin|
+        load_plugin_filters plugin
       end
     end
@@ -88,7 +94,7 @@ class Noosfero::Plugin
     # This is a generic method that initialize any possible filter defined by a
     # plugin to a specific controller
     def load_plugin_filters(plugin)
-      Rails.configuration.to_prepare do
+      ActionDispatch::Reloader.to_prepare do
         filters = plugin.new.send 'application_controller_filters' rescue []
         Noosfero::Plugin.add_controller_filters ApplicationController, plugin, filters
@@ -116,7 +122,7 @@ class Noosfero::Plugin
     end
     def load_plugin_extensions(dir)
-      Rails.configuration.to_prepare do
+      ActionDispatch::Reloader.to_prepare do
         Dir[File.join(dir, 'lib', 'ext', '*.rb')].each {|file| require_dependency file }
       end
     end
 plugins_root = Rails.env.test? ? 'plugins' : '{baseplugins,config/plugins}'
+prefixes_by_folder = {public: 'plugin',
+                      profile: 'profile/:profile/plugin',
+                      myprofile: 'myprofile/:profile/plugin',
+                      admin: 'admin/plugin'}
 Dir.glob(Rails.root.join(plugins_root, '*', 'controllers')) do |controllers_dir|
-  prefixes_by_folder = {'public' => 'plugin',
-                        'profile' => 'profile/:profile/plugin',
-                        'myprofile' => 'myprofile/:profile/plugin',
-                        'admin' => 'admin/plugin'}
+  plugin_name = File.basename(File.dirname(controllers_dir))
   controllers_by_folder = prefixes_by_folder.keys.inject({}) do |hash, folder|
-    hash.merge!({folder => Dir.glob(File.join(controllers_dir, folder, '*')).map {|full_names| File.basename(full_names).gsub(/_controller.rb$/,'')}})
+    path = "#{controllers_dir}/#{folder}/"
+    hash[folder] = Dir.glob("#{path}{*.rb,#{plugin_name}_plugin/*.rb}").map do |filename|
+      filename.gsub(path, '').gsub(/_controller.rb$/, '')
+    end
+    hash
   end
-  plugin_name = File.basename(File.dirname(controllers_dir))
-
   controllers_by_folder.each do |folder, controllers|
     controllers.each do |controller|
       controller_name = controller.gsub("#{plugin_name}_plugin_",'')
-Rails.configuration.to_prepare do
+ActionDispatch::Reloader.to_prepare do
   Spammable.module_eval do
     def marked_as_spam
       plugins.dispatch(:marked_as_spam, self)
1	-Rails.configuration.to_prepare do	1	+ActionDispatch::Reloader.to_prepare do
2	Spammable.module_eval do	2	Spammable.module_eval do
3	def marked_as_spam	3	def marked_as_spam
4	plugins.dispatch(:marked_as_spam, self)	4	plugins.dispatch(:marked_as_spam, self)