Merge branch 'stable'

Conflicts: debian/changelog lib/noosfero.rb lib/noosfero/plugin.rb

Merge branch 'stable'
Conflicts: debian/changelog lib/noosfero.rb lib/noosfero/plugin.rb
Daniela Feitosa
2 parents a56214cf 988453ca
Showing 6 changed files with 37 additions and 1 deletions Show diff stats
app/controllers/public/account_controller.rb
debian/changelog
lib/noosfero.rb
lib/noosfero/plugin.rb
public/javascripts/application.js
test/functional/account_controller_test.rb
@@ -224,6 +224,8 @@ class AccountController &lt; ApplicationController
       session[:notice] = nil # consume the notice
     end
+    @plugins.enabled_plugins.each { |plugin| user_data.merge!(plugin.user_data_extras) }
+
     render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
   end
+noosfero (0.31.5) unstable; urgency=low
+
+  * Bugfix version release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Mon, 15 Aug 2011 18:20:13 -0300
+
 noosfero (0.31.4) unstable; urgency=low
   * Bugfix Version release
  -- Rodrigo Souto <rodrigo@colivre.coop.br>  Fri, 15 Jul 2011 16:40:05 -0300
+
 noosfero (0.31.3) unstable; urgency=low
   * Bugfix Version release.
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.31.4'
+  VERSION = '0.31.5'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -128,6 +128,12 @@ class Noosfero::Plugin
     []
   end
+  # -> Adds stuff in user data hash
+  # returns = { :some_data => some_value, :another_data => another_value }
+  def user_data_extras
+    {}
+  end
+
   # -> Parse and possibly make changes of content (article, block, etc) during HTML rendering
   # returns = content as string after parser and changes
   def parse_content(raw_content)
@@ -475,6 +475,8 @@ jQuery(function($) {
     if (data.notice) {
       display_notice(data.notice);
     }
+    // Bind this event to do more actions with the user data (for example, inside plugins)
+    $(window).trigger("userDataLoaded", data);
   });
   function loggedInDataCallBack(data) {
@@ -670,6 +670,25 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     assert_equal 'unavailable', assigns(:status_class)
   end
+  should 'merge user data with extra stuff from plugins' do
+    plugin1 = mock()
+    plugin1.stubs(:user_data_extras).returns({ :foo => 'bar' })
+
+    plugin2 = mock()
+    plugin2.stubs(:user_data_extras).returns({ :test => 5 })
+
+    enabled_plugins = [plugin1, plugin2]
+
+    plugins = mock()
+    plugins.stubs(:enabled_plugins).returns(enabled_plugins)
+    Noosfero::Plugin::Manager.stubs(:new).returns(plugins)
+
+    login_as 'ze'
+
+    xhr :get, :user_data
+    assert_equal User.find_by_login('ze').data_hash.merge({ 'foo' => 'bar', 'test' => 5 }), ActiveSupport::JSON.decode(@response.body)
+  end
+
   protected
     def new_user(options = {}, extra_options ={})
       data = {:profile_data => person_data}
	@@ -224,6 +224,8 @@ class AccountController < ApplicationController		@@ -224,6 +224,8 @@ class AccountController < ApplicationController
224	session[:notice] = nil # consume the notice	224	session[:notice] = nil # consume the notice
225	end	225	end
226		226
		227	+ @plugins.enabled_plugins.each { \|plugin\| user_data.merge!(plugin.user_data_extras) }
		228	+
227	render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"	229	render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
228	end	230	end
229		231
1	module Noosfero	1	module Noosfero
2	PROJECT = 'noosfero'	2	PROJECT = 'noosfero'
3	- VERSION = '0.31.4'	3	+ VERSION = '0.31.5'
4		4
5	def self.pattern_for_controllers_in_directory(dir)	5	def self.pattern_for_controllers_in_directory(dir)
6	disjunction = controllers_in_directory(dir).join('\|')	6	disjunction = controllers_in_directory(dir).join('\|')
	@@ -128,6 +128,12 @@ class Noosfero::Plugin		@@ -128,6 +128,12 @@ class Noosfero::Plugin
128	[]	128	[]
129	end	129	end
130		130
		131	+ # -> Adds stuff in user data hash
		132	+ # returns = { :some_data => some_value, :another_data => another_value }
		133	+ def user_data_extras
		134	+ {}
		135	+ end
		136	+
131	# -> Parse and possibly make changes of content (article, block, etc) during HTML rendering	137	# -> Parse and possibly make changes of content (article, block, etc) during HTML rendering
132	# returns = content as string after parser and changes	138	# returns = content as string after parser and changes
133	def parse_content(raw_content)	139	def parse_content(raw_content)
	@@ -670,6 +670,25 @@ class AccountControllerTest < Test::Unit::TestCase		@@ -670,6 +670,25 @@ class AccountControllerTest < Test::Unit::TestCase
670	assert_equal 'unavailable', assigns(:status_class)	670	assert_equal 'unavailable', assigns(:status_class)
671	end	671	end
672		672
		673	+ should 'merge user data with extra stuff from plugins' do
		674	+ plugin1 = mock()
		675	+ plugin1.stubs(:user_data_extras).returns({ :foo => 'bar' })
		676	+
		677	+ plugin2 = mock()
		678	+ plugin2.stubs(:user_data_extras).returns({ :test => 5 })
		679	+
		680	+ enabled_plugins = [plugin1, plugin2]
		681	+
		682	+ plugins = mock()
		683	+ plugins.stubs(:enabled_plugins).returns(enabled_plugins)
		684	+ Noosfero::Plugin::Manager.stubs(:new).returns(plugins)
		685	+
		686	+ login_as 'ze'
		687	+
		688	+ xhr :get, :user_data
		689	+ assert_equal User.find_by_login('ze').data_hash.merge({ 'foo' => 'bar', 'test' => 5 }), ActiveSupport::JSON.decode(@response.body)
		690	+ end
		691	+
673	protected	692	protected
674	def new_user(options = {}, extra_options ={})	693	def new_user(options = {}, extra_options ={})
675	data = {:profile_data => person_data}	694	data = {:profile_data => person_data}