Refactoring article extra toolbar buttons

Leandro Santos · Victor Costa
1 parent a79d01ab
Showing 6 changed files with 84 additions and 8 deletions Show diff stats
app/helpers/plugins_helper.rb
app/views/content_viewer/_article_toolbar.html.erb
lib/noosfero/plugin.rb
test/functional/content_viewer_controller_test.rb
test/unit/plugin_test.rb
test/unit/plugins_helper_test.rb
@@ -6,4 +6,11 @@ module PluginsHelper
     end
   end
+  def plugins_toolbar_actions_for_article(article)
+    toolbar_actions = Array.wrap(@plugins.dispatch(:article_extra_toolbar_buttons, article))
+    toolbar_actions.each do |action|
+      [:title, :url, :icon].each { |param| raise "No #{param} was passed as parameter for #{action}" unless action.has_key?(param) }
+    end
+  end
+
 end
@@ -46,11 +46,10 @@
       <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
     <% end %>
-    <% @plugins.dispatch(:article_extra_toolbar_buttons, @page).each do |plugin_button| %>
+    <% plugins_toolbar_actions_for_article(@page).each do |plugin_button| %>
       <%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url], plugin_button[:html_options] %>
     <% end %>
-
     <%= report_abuse(profile, :link, @page) %>
   </div>
@@ -687,6 +687,8 @@ class Noosfero::Plugin
     # returns = string with reason of expiration
     elsif method.to_s =~ /^content_expire_(#{content_actions.join('|')})$/
       nil
+    elsif context.respond_to?(method)
+      context.send(method)
     else
       super
     end
@@ -1479,7 +1479,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'add icon attribute in extra toolbar actions on article from plugins' do
     class Plugin1 < Noosfero::Plugin
       def article_extra_toolbar_buttons(article)
-        {:title => 'some_title1', :icon => 'some_icon1', :url => {}}
+        {:title => 'some_title', :icon => 'some_icon', :url => {}}
       end
     end
     Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
@@ -1489,13 +1489,33 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
     get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
-    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :class => /some_icon1/ }}
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :class => /some_icon/ }}
   end
   should 'add url attribute in extra toolbar actions on article from plugins' do
     class Plugin1 < Noosfero::Plugin
       def article_extra_toolbar_buttons(article)
-        {:title => 'some_title1', :icon => 'some_icon1', :url => '/bli'}
+        {:title => 'some_title', :icon => 'some_icon', :url => '/someurl'}
+      end
+    end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
+
+    Environment.default.enable_plugin(Plugin1.name)
+
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/someurl" }}
+  end
+
+  should 'use context method in extra toolbar actions on article from plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def article_extra_toolbar_buttons(article)
+        if current_person.public?
+          {:title => 'some_title', :icon => 'some_icon', :url => '/someurl'}
+        else
+          {:title => 'another_title', :icon => 'another_icon', :url => '/anotherurl'}
+        end
       end
     end
     Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
@@ -1504,8 +1524,11 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+    profile.public_profile = false
+    profile.save
+    login_as(profile.identifier)
     get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
-    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/bli" }}
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/anotherurl" }}
   end
 end
@@ -561,8 +561,6 @@ class PluginTest &lt; ActiveSupport::TestCase
   end
   should 'article_extra_toolbar_buttons return an empty array by default' do
-    class CustomBlock1 < Block; end;
-
     class Plugin1 < Noosfero::Plugin
     end
     p = Plugin1.new
@@ -0,0 +1,47 @@
+require_relative "../test_helper"
+
+class PluginsHelperTest < ActionView::TestCase
+
+  def setup
+    @environment = Environment.default
+    @plugins = mock
+  end
+
+  attr_accessor :environment, :plugins
+
+  should 'plugins_toolbar_actions_for_article return an array if the plugin return a single hash' do
+    hash = {:title => 'some title', :url => 'some_url', :icon => 'some icon'}
+    plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns(hash)
+    assert_equal [hash], plugins_toolbar_actions_for_article(nil)
+  end
+
+  should 'plugins_toolbar_actions_for_article return an empty array if an array is passed as parameter' do
+    plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns([])
+    assert_equal [], plugins_toolbar_actions_for_article(nil)
+  end
+
+  should 'plugins_toolbar_actions_for_article throw raise if no title is passed as parameter' do
+    plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns({:url => 'some_url', :icon => 'some icon'})
+
+    assert_raise(RuntimeError) do
+      plugins_toolbar_actions_for_article(nil)
+    end
+  end
+
+  should 'plugins_toolbar_actions_for_article throw raise if no icon is passed as parameter' do
+    plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns({:title => 'some title', :url => 'some_url'})
+
+    assert_raise(RuntimeError) do
+      plugins_toolbar_actions_for_article(nil)
+    end
+  end
+
+  should 'plugins_toolbar_actions_for_article throw raise if no url is passed as parameter' do
+    plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns({:title => 'some title', :icon => 'some icon'})
+
+    assert_raise(RuntimeError) do
+      plugins_toolbar_actions_for_article(nil)
+    end
+  end
+
+end
	@@ -6,4 +6,11 @@ module PluginsHelper		@@ -6,4 +6,11 @@ module PluginsHelper
6	end	6	end
7	end	7	end
8		8
		9	+ def plugins_toolbar_actions_for_article(article)
		10	+ toolbar_actions = Array.wrap(@plugins.dispatch(:article_extra_toolbar_buttons, article))
		11	+ toolbar_actions.each do \|action\|
		12	+ [:title, :url, :icon].each { \|param\| raise "No #{param} was passed as parameter for #{action}" unless action.has_key?(param) }
		13	+ end
		14	+ end
		15	+
9	end	16	end
@@ -0,0 +1,47 @@		@@ -0,0 +1,47 @@
	1	+require_relative "../test_helper"
	2	+
	3	+class PluginsHelperTest < ActionView::TestCase
	4	+
	5	+ def setup
	6	+ @environment = Environment.default
	7	+ @plugins = mock
	8	+ end
	9	+
	10	+ attr_accessor :environment, :plugins
	11	+
	12	+ should 'plugins_toolbar_actions_for_article return an array if the plugin return a single hash' do
	13	+ hash = {:title => 'some title', :url => 'some_url', :icon => 'some icon'}
	14	+ plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns(hash)
	15	+ assert_equal [hash], plugins_toolbar_actions_for_article(nil)
	16	+ end
	17	+
	18	+ should 'plugins_toolbar_actions_for_article return an empty array if an array is passed as parameter' do
	19	+ plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns([])
	20	+ assert_equal [], plugins_toolbar_actions_for_article(nil)
	21	+ end
	22	+
	23	+ should 'plugins_toolbar_actions_for_article throw raise if no title is passed as parameter' do
	24	+ plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns({:url => 'some_url', :icon => 'some icon'})
	25	+
	26	+ assert_raise(RuntimeError) do
	27	+ plugins_toolbar_actions_for_article(nil)
	28	+ end
	29	+ end
	30	+
	31	+ should 'plugins_toolbar_actions_for_article throw raise if no icon is passed as parameter' do
	32	+ plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns({:title => 'some title', :url => 'some_url'})
	33	+
	34	+ assert_raise(RuntimeError) do
	35	+ plugins_toolbar_actions_for_article(nil)
	36	+ end
	37	+ end
	38	+
	39	+ should 'plugins_toolbar_actions_for_article throw raise if no url is passed as parameter' do
	40	+ plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns({:title => 'some title', :icon => 'some icon'})
	41	+
	42	+ assert_raise(RuntimeError) do
	43	+ plugins_toolbar_actions_for_article(nil)
	44	+ end
	45	+ end
	46	+
	47	+end