Accept proc in user_data_extras from plugins

Victor Costa
1 parent 5de43a78
Showing 2 changed files with 8 additions and 2 deletions Show diff stats
app/controllers/public/account_controller.rb
test/functional/account_controller_test.rb
@@ -315,7 +315,11 @@ class AccountController &lt; ApplicationController
       session[:notice] = nil # consume the notice
     end
-    @plugins.each { |plugin| user_data.merge!(plugin.user_data_extras) }
+    @plugins.each do |plugin|
+      user_data_extras = plugin.user_data_extras
+      user_data_extras = instance_exec(&user_data_extras) if user_data_extras.kind_of?(Proc)
+      user_data.merge!(user_data_extras)
+    end
     render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
   end
@@ -712,7 +712,9 @@ class AccountControllerTest &lt; ActionController::TestCase
     class Plugin2 < Noosfero::Plugin
       def user_data_extras
-        {:test => 5}
+        proc do
+          {:test => 5}
+        end
       end
     end
     Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])