Adding Plugin hotspot 'parse_content'

also: - fix noosfero/i18n: error_messages_for should works as documented in Rails API (accept param :header_message => '...') - new helper method to display errors in a dialog box - now Plugins knows what is URL to admin itself - defining paths to cucumber steps and setup files in config/cucumber.yml - allow plugins to have documentation in same way as Noosfero core (ActionItem2056)

Adding Plugin hotspot 'parse_content'
also: - fix noosfero/i18n: error_messages_for should works as documented in Rails API (accept param :header_message => '...') - new helper method to display errors in a dialog box - now Plugins knows what is URL to admin itself - defining paths to cucumber steps and setup files in config/cucumber.yml - allow plugins to have documentation in same way as Noosfero core (ActionItem2056)
Joenio Costa
1 parent 498e40b7
Showing 16 changed files with 61 additions and 20 deletions Show diff stats
app/controllers/application.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/helpers/application_helper.rb
app/helpers/boxes_helper.rb
app/views/manage_products/_edit_image.rhtml
app/views/manage_products/_edit_info.rhtml
app/views/manage_products/_edit_name.rhtml
app/views/plugins/index.rhtml
config/cucumber.yml
doc/noosfero/plugins/index.textile
features/plugins.feature
lib/noosfero/i18n.rb
lib/noosfero/plugin.rb
lib/tasks/doc.rake
test/unit/plugin_test.rb
@@ -25,11 +25,6 @@ class ApplicationController &lt; ActionController::Base
   helper :document
   helper :language
-  def boxes_editor?
-    false
-  end
-  protected :boxes_editor?
-
   def self.no_design_blocks
     @no_design_blocks = true
   end
@@ -106,6 +101,14 @@ class ApplicationController &lt; ActionController::Base
   protected
+  def boxes_editor?
+    false
+  end
+
+  def content_editor?
+    false
+  end
+
   def user
     current_user.person if logged_in?
   end
@@ -383,5 +383,9 @@ class CmsController &lt; MyProfileController
     @selected_locale = @article.language || FastGettext.locale
   end
+  def content_editor?
+    true
+  end
+
 end
@@ -50,7 +50,7 @@ class ManageProductsController &lt; ApplicationController
         render :partial => 'shared/redirect_via_javascript',
           :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
       else
-        render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' }
+        render_dialog_error_messages 'product'
       end
     end
   end
@@ -81,7 +81,7 @@ class ManageProductsController &lt; ApplicationController
         render :partial => 'shared/redirect_via_javascript',
           :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
       else
-        render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' }
+        render_dialog_error_messages 'product'
       end
     end
   end
@@ -96,7 +96,7 @@ class ManageProductsController &lt; ApplicationController
         @inputs = @product.inputs
         render :partial => 'display_inputs'
       else
-        render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' }
+        render_dialog_error_messages 'product'
       end
     else
       render :partial => 'add_input'
@@ -147,7 +147,7 @@ class ManageProductsController &lt; ApplicationController
         @inputs = @product.inputs
         render :partial => 'display_inputs'
       else
-        render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'input' }
+        render_dialog_error_messages 'input'
       end
     end
   end
@@ -980,7 +980,10 @@ module ApplicationHelper
   def article_to_html(article, options = {})
     options.merge!(:page => params[:npage])
     content = article.to_html(options)
-    return self.instance_eval(&content) if content.kind_of?(Proc)
+    content = content.kind_of?(Proc) ? self.instance_eval(&content) : content
+    @plugins && @plugins.enabled_plugins.each do |plugin|
+      content = plugin.parse_content(content)
+    end
     content
   end
@@ -1221,4 +1224,8 @@ module ApplicationHelper
     end
   end
+  def render_dialog_error_messages(instance_name)
+    render :partial => 'shared/dialog_error_messages', :locals => { :object_name => instance_name }
+  end
+
 end
@@ -99,7 +99,9 @@ module BoxesHelper
     unless block.visible?
       options[:title] = _("This block is invisible. Your visitors will not see it.")
     end
-
+    @controller.send(:content_editor?) || @plugins.enabled_plugins.each do |plugin|
+      result = plugin.parse_content(result)
+    end
     box_decorator.block_target(block.box, block) +
       content_tag('div',
        content_tag('div',
@@ -22,5 +22,5 @@
 </script>
 <% if errors %>
-  <%= render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' } %>
+  <%= render_dialog_error_messages 'product' %>
 <% end %>
 <% if errors %>
-  <%= render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' } %>
+  <%= render_dialog_error_messages 'product' %>
 <% end %>
 <% remote_form_for(@product,
@@ -17,5 +17,5 @@
 </script>
 <% if errors %>
-  <%= render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' } %>
+  <%= render_dialog_error_messages 'product' %>
 <% end %>
@@ -12,7 +12,7 @@
   <%= hidden_field_tag('environment[enabled_plugins][]', '') %>
   <% @active_plugins.each do |plugin|   %>
     <tr>
-      <td><%= plugin.plugin_name %></td>
+      <td><%= plugin.has_admin_url? ? link_to(plugin.plugin_name, plugin.admin_url) : plugin.plugin_name %></td>
       <td><%= plugin.plugin_description %></td>
       <td><%= check_box_tag "environment[enabled_plugins][]", plugin, @environment.enabled_plugins.include?(plugin.to_s), :id => plugin.plugin_name %></td>
     </tr>
-default: --tags ~@selenium,~@wip --exclude features/support/selenium.rb --exclude features/step_definitions/selenium_steps.rb
-selenium: --tags @selenium,~@wip
+default: --tags ~@selenium,~@wip --exclude features/support/selenium.rb --exclude features/step_definitions/selenium_steps.rb -r features/support -r features/step_definitions
+selenium: --tags @selenium,~@wip -r features/support -r features/step_definitions
@@ -0,0 +1,2 @@
+h1. Plugins
+
@@ -56,4 +56,3 @@ Feature: plugins
     Then I should not see "Test plugin button"
     When I go to the profile
     Then I should not see "Test plugin tab"
-
@@ -71,7 +71,9 @@ module ActionView::Helpers::ActiveRecordHelper
         end
       end
-      if options[:message_title]
+      if options[:header_message]
+        header_message = options[:header_message]
+      elsif options[:message_title]
         header_message = instance.error_message(options[:message_title], count) % {:num => count, :record => record}
       else
         header_message = ((count == 1) ? _(@error_message_title[0]) : _(@error_message_title[1])) % {:num => count, :record => record}
@@ -52,6 +52,13 @@ class Noosfero::Plugin
       _("No description informed.")
     end
+    def admin_url
+      {:controller => "#{name.underscore}_admin", :action => 'index'}
+    end
+
+    def has_admin_url?
+      File.exists?(File.join(root_path, 'controllers', "#{name.underscore}_admin_controller.rb"))
+    end
   end
   def expanded_template(file_path, locals = {})
@@ -121,4 +128,10 @@ class Noosfero::Plugin
     []
   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)
+    raw_content
+  end
+
 end
 namespace :noosfero do
   namespace :doc do
+    Dir.glob('plugins/**/doc/*.textile').each do |file|
+      ln_sf File.join(RAILS_ROOT, file), 'doc/noosfero/plugins/'
+    end
     input = Dir.glob('doc/noosfero/**/*.textile')
     topics_xhtml = input.map { |item| item.sub('.textile', '.en.xhtml') }
     sections = Dir.glob('doc/noosfero/*').select {|item| File.directory?(item) }
@@ -18,6 +18,12 @@ class PluginTest &lt; Test::Unit::TestCase
     assert_includes  Noosfero::Plugin.all, Plugin1.to_s
   end
-end
+  should 'returns url to plugin management if plugin has admin_controller' do
+    class Plugin1 < Noosfero::Plugin
+    end
+    File.stubs(:exists?).with(anything).returns(true)
+    assert_equal({:controller => 'plugin_test/plugin1_admin', :action => 'index'}, Plugin1.admin_url)
+  end
+end
	@@ -50,7 +50,7 @@ class ManageProductsController < ApplicationController		@@ -50,7 +50,7 @@ class ManageProductsController < ApplicationController
50	render :partial => 'shared/redirect_via_javascript',	50	render :partial => 'shared/redirect_via_javascript',
51	:locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }	51	:locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
52	else	52	else
53	- render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' }	53	+ render_dialog_error_messages 'product'
54	end	54	end
55	end	55	end
56	end	56	end
	@@ -81,7 +81,7 @@ class ManageProductsController < ApplicationController		@@ -81,7 +81,7 @@ class ManageProductsController < ApplicationController
81	render :partial => 'shared/redirect_via_javascript',	81	render :partial => 'shared/redirect_via_javascript',
82	:locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }	82	:locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
83	else	83	else
84	- render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' }	84	+ render_dialog_error_messages 'product'
85	end	85	end
86	end	86	end
87	end	87	end
	@@ -96,7 +96,7 @@ class ManageProductsController < ApplicationController		@@ -96,7 +96,7 @@ class ManageProductsController < ApplicationController
96	@inputs = @product.inputs	96	@inputs = @product.inputs
97	render :partial => 'display_inputs'	97	render :partial => 'display_inputs'
98	else	98	else
99	- render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' }	99	+ render_dialog_error_messages 'product'
100	end	100	end
101	else	101	else
102	render :partial => 'add_input'	102	render :partial => 'add_input'
	@@ -147,7 +147,7 @@ class ManageProductsController < ApplicationController		@@ -147,7 +147,7 @@ class ManageProductsController < ApplicationController
147	@inputs = @product.inputs	147	@inputs = @product.inputs
148	render :partial => 'display_inputs'	148	render :partial => 'display_inputs'
149	else	149	else
150	- render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'input' }	150	+ render_dialog_error_messages 'input'
151	end	151	end
152	end	152	end
153	end	153	end
	@@ -22,5 +22,5 @@		@@ -22,5 +22,5 @@
22	</script>	22	</script>
23		23
24	<% if errors %>	24	<% if errors %>
25	- <%= render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' } %>	25	+ <%= render_dialog_error_messages 'product' %>
26	<% end %>	26	<% end %>
	@@ -17,5 +17,5 @@		@@ -17,5 +17,5 @@
17	</script>	17	</script>
18		18
19	<% if errors %>	19	<% if errors %>
20	- <%= render :partial => 'shared/dialog_error_messages', :locals => { :object_name => 'product' } %>	20	+ <%= render_dialog_error_messages 'product' %>
21	<% end %>	21	<% end %>
	@@ -12,7 +12,7 @@		@@ -12,7 +12,7 @@
12	<%= hidden_field_tag('environment[enabled_plugins][]', '') %>	12	<%= hidden_field_tag('environment[enabled_plugins][]', '') %>
13	<% @active_plugins.each do \|plugin\| %>	13	<% @active_plugins.each do \|plugin\| %>
14	<tr>	14	<tr>
15	- <td><%= plugin.plugin_name %></td>	15	+ <td><%= plugin.has_admin_url? ? link_to(plugin.plugin_name, plugin.admin_url) : plugin.plugin_name %></td>
16	<td><%= plugin.plugin_description %></td>	16	<td><%= plugin.plugin_description %></td>
17	<td><%= check_box_tag "environment[enabled_plugins][]", plugin, @environment.enabled_plugins.include?(plugin.to_s), :id => plugin.plugin_name %></td>	17	<td><%= check_box_tag "environment[enabled_plugins][]", plugin, @environment.enabled_plugins.include?(plugin.to_s), :id => plugin.plugin_name %></td>
18	</tr>	18	</tr>
1	-default: --tags ~@selenium,~@wip --exclude features/support/selenium.rb --exclude features/step_definitions/selenium_steps.rb
2	-selenium: --tags @selenium,~@wip	1	+default: --tags ~@selenium,~@wip --exclude features/support/selenium.rb --exclude features/step_definitions/selenium_steps.rb -r features/support -r features/step_definitions
		2	+selenium: --tags @selenium,~@wip -r features/support -r features/step_definitions
	@@ -56,4 +56,3 @@ Feature: plugins		@@ -56,4 +56,3 @@ Feature: plugins
56	Then I should not see "Test plugin button"	56	Then I should not see "Test plugin button"
57	When I go to the profile	57	When I go to the profile
58	Then I should not see "Test plugin tab"	58	Then I should not see "Test plugin tab"
59	-
	@@ -52,6 +52,13 @@ class Noosfero::Plugin		@@ -52,6 +52,13 @@ class Noosfero::Plugin
52	_("No description informed.")	52	_("No description informed.")
53	end	53	end
54		54
		55	+ def admin_url
		56	+ {:controller => "#{name.underscore}_admin", :action => 'index'}
		57	+ end
		58	+
		59	+ def has_admin_url?
		60	+ File.exists?(File.join(root_path, 'controllers', "#{name.underscore}_admin_controller.rb"))
		61	+ end
55	end	62	end
56		63
57	def expanded_template(file_path, locals = {})	64	def expanded_template(file_path, locals = {})
	@@ -121,4 +128,10 @@ class Noosfero::Plugin		@@ -121,4 +128,10 @@ class Noosfero::Plugin
121	[]	128	[]
122	end	129	end
123		130
		131	+ # -> Parse and possibly make changes of content (article, block, etc) during HTML rendering
		132	+ # returns = content as string after parser and changes
		133	+ def parse_content(raw_content)
		134	+ raw_content
		135	+ end
		136	+
124	end	137	end
	@@ -18,6 +18,12 @@ class PluginTest < Test::Unit::TestCase		@@ -18,6 +18,12 @@ class PluginTest < Test::Unit::TestCase
18	assert_includes Noosfero::Plugin.all, Plugin1.to_s	18	assert_includes Noosfero::Plugin.all, Plugin1.to_s
19	end	19	end
20		20
21	-end	21	+ should 'returns url to plugin management if plugin has admin_controller' do
		22	+ class Plugin1 < Noosfero::Plugin
		23	+ end
		24	+ File.stubs(:exists?).with(anything).returns(true)
22		25
		26	+ assert_equal({:controller => 'plugin_test/plugin1_admin', :action => 'index'}, Plugin1.admin_url)
		27	+ end
23		28
		29	+end