Merge commit 'refs/merge-requests/283' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/283 Conflicts: test/unit/comment_test.rb

Merge commit 'refs/merge-requests/283' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/283 Conflicts: test/unit/comment_test.rb
Rodrigo Souto
2 parents 8748da0c a1c06b2b
Showing 34 changed files with 1075 additions and 58 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/boxes_helper.rb
app/helpers/macros_helper.rb
app/models/comment.rb
app/models/environment.rb
app/views/comment/_comment_form.rhtml
app/views/content_viewer/view_page.rhtml
app/views/shared/tiny_mce.rhtml
db/schema.rb
lib/noosfero/plugin.rb
lib/noosfero/plugin/manager.rb
plugins/comment_group_macro/controllers/profile/comment_group_macro_plugin_profile_controller.rb
plugins/comment_group_macro/controllers/public/comment_group_macro_plugin_public_controller.rb
plugins/comment_group_macro/db/migrate/20121220201629_add_group_id_to_comment.rb
plugins/comment_group_macro/lib/comment_group_macro_plugin.rb
plugins/comment_group_macro/lib/comment_group_macro_plugin/ext/article.rb
plugins/comment_group_macro/lib/comment_group_macro_plugin/ext/comment.rb
plugins/comment_group_macro/public/comment_group.css
plugins/comment_group_macro/public/comment_group.js
@@ -98,10 +98,13 @@ class ContentViewerController &lt; ApplicationController
         session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
       end
     end
+   
+    @comments = @plugins.dispatch_first(:load_comments, @page)
+    @comments ||= @page.comments.without_spam.as_thread
+    @comments = [@comments] unless @comments.is_a?(Array)
+
+    @comments_count = Comment.count_thread(@comments)
  
-    comments = @page.comments.without_spam
-    @comments = comments.as_thread
-    @comments_count = comments.count
     if params[:slideshow]
       render :action => 'slideshow', :layout => 'slideshow'
     end
@@ -947,10 +947,7 @@ module ApplicationHelper
     options.merge!(:page => params[:npage])
     content = article.to_html(options)
     content = content.kind_of?(Proc) ? self.instance_eval(&content).html_safe : content.html_safe
-    @plugins && @plugins.each do |plugin|
-      content = plugin.parse_content(content)
-    end
-    content
+    filter_html(content, article)
   end
  
   # Please, use link_to by default!
@@ -1407,6 +1404,38 @@ module ApplicationHelper
     @no_design_blocks = true
   end
  
+  def filter_html(html, source)
+    if @plugins
+      html = convert_macro(html, source)
+    end
+    html
+  end
+
+  def convert_macro(html, source)
+    doc = Hpricot(html)
+    while element = doc.search('.macro').first
+      macro_name = element['data-macro']
+      method_name = "macro_#{macro_name}"
+      attrs = collect_macro_attributes(element)
+      plugin_instance = Environment.macros[environment.id][method_name]
+      if plugin_instance
+        result = plugin_instance.send(method_name, attrs, element.inner_html, source)
+        element.inner_html = result.kind_of?(Proc) ? self.instance_eval(&result) : result
+        element['class'] = "parsed-macro #{macro_name}"
+      else
+        element.inner_html = _("Unsupported macro %s!") % macro_name
+        element['class'] = "failed-macro #{macro_name}"
+      end
+      attrs.each {|key, value| element.remove_attribute("data-macro-#{key}")}
+    end
+    doc.html
+  end
+
+  def collect_macro_attributes(element)
+    element.attributes.to_hash.select {|key, value| key[0..10] == 'data-macro-'}.
+                       inject({}){|result, a| result.merge({a[0][11..-1] => a[1]})}.with_indifferent_access
+  end
+
   def default_folder_for_image_upload(profile)
     default_folder = profile.folders.find_by_type('Gallery')
     default_folder = profile.folders.find_by_type('Folder') if default_folder.nil?
@@ -99,8 +99,8 @@ module BoxesHelper
     unless block.visible?
       options[:title] = _("This block is invisible. Your visitors will not see it.")
     end
-    @controller.send(:content_editor?) || @plugins.each do |plugin|
-      result = plugin.parse_content(result)
+    if @controller.send(:content_editor?)
+      result = filter_html(result, block)
     end
     box_decorator.block_target(block.box, block) +
       content_tag('div',
@@ -0,0 +1,96 @@
+module MacrosHelper
+
+  def macros_in_menu
+    Environment.macros[@environment.id].reject{ |macro_name, plugin_instance| macro_configuration(macro_name)[:icon_path] }
+  end
+
+  def macros_with_buttons
+    Environment.macros[@environment.id].reject{ |macro_name, plugin_instance| !macro_configuration(macro_name)[:icon_path] }
+  end
+
+  def macro_configuration(macro_name)
+    plugin_instance = Environment.macros[@environment.id][macro_name]
+    plugin_instance.send("config_#{macro_name}")
+  end
+
+  def macro_title(macro_name)
+    macro_configuration(macro_name)[:title] || macro_name.to_s.humanize
+  end
+  
+  def generate_macro_config_dialog(macro_name)
+    if macro_configuration(macro_name)[:skip_dialog]
+      "function(){#{macro_generator(macro_name)}}"
+    else
+      "function(){
+        jQuery('<div>'+#{macro_configuration_dialog(macro_name).to_json}+'</div>').dialog({
+          title: #{macro_title(macro_name).to_json},
+          modal: true,
+          buttons: [
+            {text: #{_('Ok').to_json}, click: function(){
+              tinyMCE.activeEditor.execCommand('mceInsertContent', false,
+              (function(dialog){ #{macro_generator(macro_name)} })(this));
+              jQuery(this).dialog('close');
+            }},
+            {text: #{_('Cancel').to_json}, click: function(){jQuery(this).dialog('close');}}
+          ]
+        });
+      }"
+    end
+  end
+
+  def include_macro_js_files
+    plugins_javascripts = []
+    Environment.macros[environment.id].map do |macro_name, plugin_instance|
+      if macro_configuration(macro_name)[:js_files]
+        macro_configuration(macro_name)[:js_files].map { |js| plugins_javascripts << plugin_instance.class.public_path(js) } 
+      end
+    end
+    javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty?
+  end
+
+  def macro_css_files
+    plugins_css = []
+    Environment.macros[environment.id].map do |macro_name, plugin_instance|
+      if macro_configuration(macro_name)[:css_files]
+        macro_configuration(macro_name)[:css_files].map { |css| plugins_css << plugin_instance.class.public_path(css) } 
+      end
+    end
+    plugins_css.join(',')
+  end
+
+  protected
+  
+  def macro_generator(macro_name)
+    if macro_configuration(macro_name)[:generator]
+      macro_configuration(macro_name)[:generator]
+    else
+      macro_default_generator(macro_name)
+    end
+  end
+  
+  def macro_default_generator(macro_name)
+    code = "var params = {};"
+    configuration = macro_configuration(macro_name)
+    configuration[:params].map do |field|
+      code += "params.#{field[:name]} = jQuery('*[name=#{field[:name]}]', dialog).val();"
+    end
+    code + "
+      var html = jQuery('<div class=\"macro mceNonEditable\" data-macro=\"#{macro_name[6..-1]}\">'+#{macro_title(macro_name).to_json}+'</div>')[0];
+      for(key in params) html.setAttribute('data-macro-'+key,params[key]);
+      return html.outerHTML;
+    "
+  end
+
+  def macro_configuration_dialog(macro_name)
+    macro_configuration(macro_name)[:params].map do |field|
+      label_name = field[:label] || field[:name].to_s.humanize
+      case field[:type]
+      when 'text'
+        labelled_form_field(label_name, text_field_tag(field[:name], field[:default]))
+      when 'select'
+        labelled_form_field(label_name, select_tag(field[:name], options_for_select(field[:values], field[:default])))
+      end
+    end.join("\n")
+  end
+
+end
@@ -152,6 +152,14 @@ class Comment &lt; ActiveRecord::Base
     @replies = comments_list
   end
  
+  def self.count_thread(comments)
+    count = comments.length
+    comments.each do |c|
+      count+=count_thread(c.replies)
+    end
+    count
+  end
+
   def self.as_thread
     result = {}
     root = []
@@ -16,6 +16,10 @@ class Environment &lt; ActiveRecord::Base
     filename
   end
  
+  class << self
+    attr_accessor :macros
+  end
+
   PERMISSIONS['Environment'] = {
     'view_environment_admin_panel' => N_('View environment admin panel'),
     'edit_environment_features' => N_('Edit environment features'),
@@ -79,6 +79,8 @@ function check_captcha(button, confirm_action) {
   <%= hidden_field_tag(:view, params[:view])%>
   <%= f.hidden_field(:reply_of_id) %>
  
+  <%= @plugins.dispatch(:comment_form_extra_contents, local_assigns).collect { |content| instance_eval(&content) }.join("") %>
+
   <% button_bar do %>
     <%= submit_button('add', _('Post comment'), :onclick => "if(check_captcha(this)) { save_comment(this) } else { check_captcha(this, save_comment)};return false;") %>
     <% if !edition_mode %>
@@ -90,7 +90,7 @@
  
   <% if @page.accept_comments? || @comments_count > 0 %>
     <h3 <%= 'class="no-comments-yet"' if @comments_count == 0 %>>
-      <%= number_of_comments(@page) %>
+      <%= display_number_of_comments(@comments_count) %>
     </h3>
   <% end %>
  
+<% extend MacrosHelper %>
 <%= javascript_include_tag 'tinymce/jscripts/tiny_mce/tiny_mce.js' %>
+<%= include_macro_js_files %>
 <script type="text/javascript">
-  var myplugins = "searchreplace,print,table,contextmenu";
+  var myplugins = "searchreplace,print,table,contextmenu,-macrosPlugin";
   var first_line, second_line;
   var mode = '<%= mode ||= false %>'
   <% if mode %>
@@ -8,36 +10,80 @@
     second_line = ""
   <% else %>
     first_line = "print,separator,copy,paste,separator,undo,redo,separator,search,replace,separator,forecolor,fontsizeselect,formatselect"
-    second_line = "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code"
+    second_line = "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code,macros"
+    <% macros_with_buttons.each do |macro_name, plugin_instance| %>
+      second_line += ',<%=macro_name %>'
+    <% end %>
   <% end %>
  
   if (tinymce.isIE) {
     // the paste plugin is only useful in Internet Explorer
     myplugins = "paste," + myplugins;
   }
+
+tinymce.create('tinymce.plugins.MacrosPlugin', {
+  createControl: function(n, cm) {
+    switch (n) {
+       case 'macros':
+         <% unless macros_in_menu.empty? %>
+           var c = cm.createMenuButton('macros', {
+             title : 'Macros',
+             image : '/designs/icons/tango/Tango/16x16/emblems/emblem-system.png',
+             icons : false
+           });
+  
+           <% macros_in_menu.each do |macro_name, plugin_instance| %>
+             c.onRenderMenu.add(function(c, m) {
+               m.add({
+                 title: <%= macro_title(macro_name).to_json %>,
+                 onclick: <%= generate_macro_config_dialog(macro_name) %>
+               });
+             });
+           <% end %>
+  
+           // Return the new menu button instance
+           return c;
+         <% end %>
+    }
+    return null;
+  }
+});
+
+// Register plugin with a short name
+tinymce.PluginManager.add('macrosPlugin', tinymce.plugins.MacrosPlugin);
+
 tinyMCE.init({
-        mode : "textareas",
-        editor_selector : "mceEditor",
-        theme : "advanced",
-        relative_urls : false,
-        remove_script_host : false,
-        document_base_url : <%= environment.top_url.to_json %>,
-        plugins: myplugins,
-        theme_advanced_toolbar_location : "top",
-        theme_advanced_layout_manager: 'SimpleLayout',
-        theme_advanced_buttons1 : first_line,
-        theme_advanced_buttons2 : second_line,
-        theme_advanced_buttons3 : "",
-        theme_advanced_blockformats :"p,address,pre,h2,h3,h4,h5,h6",
-        paste_auto_cleanup_on_paste : true,
-        paste_insert_word_content_callback : "convertWord",
-        paste_use_dialog: false,
-        apply_source_formatting : true,
-        extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling],embed[title|src|type|height|width]",
-        content_css: '/stylesheets/tinymce.css',
-        language: <%= tinymce_language.inspect %>,
-        entity_encoding: 'raw'
-        });
+  mode : "textareas",
+  editor_selector : "mceEditor",
+  theme : "advanced",
+  relative_urls : false,
+  remove_script_host : false,
+  document_base_url : <%= environment.top_url.to_json %>,
+  plugins: myplugins,
+  theme_advanced_toolbar_location : "top",
+  theme_advanced_layout_manager: 'SimpleLayout',
+  theme_advanced_buttons1 : first_line,
+  theme_advanced_buttons2 : second_line,
+  theme_advanced_buttons3 : "",
+  theme_advanced_blockformats :"p,address,pre,h2,h3,h4,h5,h6",
+  paste_auto_cleanup_on_paste : true,
+  paste_insert_word_content_callback : "convertWord",
+  paste_use_dialog: false,
+  apply_source_formatting : true,
+  extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling],embed[title|src|type|height|width]",
+  content_css: '/stylesheets/tinymce.css,<%= macro_css_files %>',
+  language: <%= tinymce_language.inspect %>,
+  entity_encoding: 'raw',
+  setup : function(ed) {
+    <% macros_with_buttons.each do |macro_name, plugin_instance| %>
+           ed.addButton('<%= macro_name %>', {
+               title: <%= macro_title(macro_name).to_json %>,
+               onclick: <%= generate_macro_config_dialog(macro_name) %>,
+               image : '<%= macro_configuration(macro_name)[:icon_path]%>'
+             });
+    <% end %>
+  }
+});
  
 function convertWord(type, content) {
   switch (type) {
@@ -131,7 +131,6 @@ ActiveRecord::Schema.define(:version =&gt; 20130606110602) do
     t.integer  "license_id"
   end
  
-  add_index "articles", ["name"], :name => "index_articles_on_name"
   add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
   add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
   add_index "articles", ["slug"], :name => "index_articles_on_slug"
@@ -221,6 +220,7 @@ ActiveRecord::Schema.define(:version =&gt; 20130606110602) do
     t.string   "source_type"
     t.string   "user_agent"
     t.string   "referrer"
+    t.integer  "group_id"
   end
  
   add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
@@ -5,6 +5,13 @@ class Noosfero::Plugin
  
   attr_accessor :context
  
+  def initialize(context=nil)
+    self.context = context
+    macro_methods.each do |method|
+      Environment.macros[context.environment.id][method] = self unless context.nil?
+    end
+  end
+
   class << self
  
     def klass(dir)
@@ -242,8 +249,8 @@ class Noosfero::Plugin
  
   # -> 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
+  def parse_content(args)
+    args
   end
  
   # -> Adds links to the admin panel
@@ -279,6 +286,18 @@ class Noosfero::Plugin
   def filter_comment(comment)
   end
  
+  # Define custom logic to load the article comments.
+  #
+  # Example:
+  #
+  #   def load_comments(article)
+  #     article.comments.find(:all, :conditions => ['spam IS NULL OR spam = ?', false])
+  #   end
+  #
+  def load_comments(article)
+    nil
+  end
+
   # This method is called by the CommentHandler background job before sending
   # the notification email. If the comment is marked as spam (i.e. by calling
   # <tt>comment.spam!</tt>), then the notification email will *not* be sent.
@@ -355,7 +374,7 @@ class Noosfero::Plugin
   def profile_info_extra_contents
     nil
   end
-
+  
   # -> Removes the invite friend button from the friends controller
   # returns = boolean
   def remove_invite_friends_button
@@ -417,6 +436,18 @@ class Noosfero::Plugin
   def login_extra_contents
     nil
   end
+  
+  # -> Adds adicional content to comment form
+  # returns = lambda block that creates html code
+  def comment_form_extra_contents(args)
+    nil
+  end
+
+  # -> Register macro methods in environment
+  # returns  = ['method1', 'method2', ...]
+  def macro_methods
+    []
+  end
  
   # -> Finds objects by their contents
   # returns = {:results => [a, b, c, ...], ...}
@@ -504,6 +535,11 @@ class Noosfero::Plugin
     # returns = string with reason of expiration
     elsif method.to_s =~ /^content_expire_(#{content_actions.join('|')})$/
       nil
+    # -> Answers to a specific macro
+    # expects: params, inner_html, content 
+    # returns = html_code
+    elsif method.to_s =~ /^macro_(.+)$/
+      nil
     else
       super
     end
@@ -6,6 +6,7 @@ class Noosfero::Plugin::Manager
   def initialize(environment, context)
     @environment = environment
     @context = context
+    Environment.macros = {environment.id => {}} unless environment.nil?
   end
  
   delegate :each, :to => :enabled_plugins
@@ -31,6 +32,15 @@ class Noosfero::Plugin::Manager
     map { |plugin| plugin.send(event, *args) }.compact
   end
  
+  def dispatch_first(event, *args)
+    value = nil
+    map do |plugin| 
+      value = plugin.send(event, *args) 
+      break if value
+    end
+    value
+  end
+
   alias :dispatch_scopes :dispatch_without_flatten
  
   def first(event, *args)
@@ -55,9 +65,7 @@ class Noosfero::Plugin::Manager
  
   def enabled_plugins
     @enabled_plugins ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin|
-      p = plugin.constantize.new
-      p.context = context
-      p
+      plugin.constantize.new(context)
     end
   end
  
@@ -0,0 +1,16 @@
+class CommentGroupMacroPluginProfileController < ProfileController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def view_comments
+    article_id = params[:article_id]
+    group_id = params[:group_id]
+    
+    article = profile.articles.find(article_id)
+    comments = article.group_comments.without_spam.in_group(group_id)
+    render :update do |page|
+      page.replace_html "comments_list_group_#{group_id}", :partial => 'comment/comment.rhtml', :collection => comments.as_thread
+      page.replace_html "comment-count-#{group_id}", comments.count
+    end
+  end
+
+end
@@ -0,0 +1,8 @@
+class CommentGroupMacroPluginPublicController < PublicController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def comment_group
+    render :json => { :group_id => Comment.find(params[:id]).group_id } 
+  end
+
+end
@@ -0,0 +1,9 @@
+class AddGroupIdToComment < ActiveRecord::Migration
+  def self.up
+    add_column :comments, :group_id, :integer
+  end
+
+  def self.down
+    remove_column :comments, :group_id
+  end
+end
@@ -0,0 +1,50 @@
+require_dependency 'comment_group_macro_plugin/ext/article'
+require_dependency 'comment_group_macro_plugin/ext/comment'
+
+#FIXME See a better way to generalize this parameter.
+ActionView::Base.sanitized_allowed_attributes += ['data-macro', 'data-macro-group_id']
+
+class CommentGroupMacroPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Comment Group"
+  end
+
+  def self.plugin_description
+    _("A plugin that display comment groups.")
+  end
+
+  def load_comments(article)
+    article.comments.without_spam.without_group.as_thread
+  end
+
+  #FIXME make this test
+  def macro_display_comments(params, inner_html, source)
+    group_id = params[:group_id].to_i
+    article = source
+    count = article.group_comments.without_spam.in_group(group_id).count
+
+    lambda {render :partial => 'plugins/comment_group_macro/views/comment_group.rhtml', :locals => {:group_id => group_id, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }}
+  end
+
+  def macro_methods
+    'macro_display_comments'
+  end
+
+  def config_macro_display_comments
+    { :params => [], :skip_dialog => true, :generator => 'makeCommentable();', :js_files => 'comment_group.js', :icon_path => '/designs/icons/tango/Tango/16x16/emblems/emblem-system.png', :css_files => 'comment_group.css' }
+  end
+
+  def comment_form_extra_contents(args)
+    comment = args[:comment]
+    group_id = comment.group_id || args[:group_id]
+    lambda {
+      hidden_field_tag('comment[group_id]', group_id) if group_id
+    }
+  end
+
+  def js_files
+    'comment_group_macro.js'
+  end
+
+end
@@ -0,0 +1,21 @@
+require_dependency 'article'
+
+class Article
+
+  #FIXME make this test 
+  has_many :group_comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc', :conditions => [ 'group_id IS NOT NULL']
+
+  #FIXME make this test 
+  validate :not_empty_group_comments_removed
+
+  #FIXME make this test 
+  def not_empty_group_comments_removed
+    if body
+      groups_with_comments = group_comments.collect {|comment| comment.group_id}.uniq
+      groups = Hpricot(body.to_s).search('.macro').collect{|element| element['data-macro-group_id'].to_i}
+      errors.add_to_base(N_('Not empty group comment cannot be removed')) unless (groups_with_comments-groups).empty?
+    end
+  end
+
+end
+
@@ -0,0 +1,12 @@
+require_dependency 'comment'
+
+class Comment
+
+  named_scope :without_group, :conditions => {:group_id => nil }
+
+  named_scope :in_group, lambda { |group_id| {
+      :conditions => ['group_id = ?', group_id]
+    }
+  }
+
+end
@@ -0,0 +1,6 @@
+div.article_comments {
+  background-color:#dddddd;
+  border-style: solid;
+  border-color:#bbbbbb;
+  border-width:2px;
+}
@@ -0,0 +1,47 @@
+function getNextGroupId() {
+  max = -1;
+  groups = jQuery('#article_body_ifr').contents().find('.article_comments');
+  groups.each(function(key, value) {
+    value = jQuery(value).attr('data-macro-group_id');
+    if(value>max) max = parseInt(value);
+  });
+  return max+1;
+}
+
+function makeCommentable() {
+  tinyMCE.activeEditor.focus();
+  start = jQuery(tinyMCE.activeEditor.selection.getStart()).closest('p');
+  end = jQuery(tinyMCE.activeEditor.selection.getEnd()).closest('p');
+
+  //text = start.parent().children();
+  text = jQuery('#article_body_ifr').contents().find('*');
+  selection = text.slice(text.index(start), text.index(end)+1);
+  
+  hasTag = false;
+  selection.each(function(key, value) {
+    commentTag = jQuery(value).closest('.article_comments');
+    if(commentTag.length) {
+      commentTag.children().unwrap('<div class=\"article_comments\"/>');
+      hasTag = true;
+    }
+  });
+
+  if(!hasTag) {
+    tags = start.siblings().add(start);
+    tags = tags.slice(tags.index(start), tags.index(end)>=0?tags.index(end)+1:tags.index(start)+1);
+    tags.wrapAll('<div class=\"macro article_comments\" data-macro=\"display_comments\" data-macro-group_id=\"'+getNextGroupId()+'\"/>');
+
+    contents = jQuery('#article_body_ifr').contents();
+    lastP = contents.find('p.article_comments_last_paragraph');
+    if(lastP.text().trim().length > 0) {
+      lastP.removeClass('article_comments_last_paragraph');
+    } else {
+      lastP.remove();
+    }
+    lastDiv = contents.find('div.article_comments').last();
+    if(lastDiv.next().length==0) {
+      lastDiv.after("<p class='article_comments_last_paragraph'>&nbsp;</p>");
+    }
+  }
+}
+
@@ -0,0 +1,39 @@
+var comment_group_anchor;
+jQuery(document).ready(function($) {
+  var anchor = window.location.hash;
+  if(anchor.length==0) return;
+
+  var val = anchor.split('-'); //anchor format = #comment-\d+
+  if(val.length!=2 || val[0]!='#comment') return; 
+  if($('div[data-macro=display_comments]').length==0) return; //display_comments div must exists
+  var comment_id = val[1];
+  if(!/^\d+$/.test(comment_id)) return; //test for integer
+
+  comment_group_anchor = anchor;
+  var url = '/plugin/comment_group_macro/public/comment_group/'+comment_id;
+  $.getJSON(url, function(data) {
+    if(data.group_id!=null) {
+      var button = $('div.comment_group_'+ data.group_id + ' a');
+      button.click();
+      $.scrollTo(button);
+    }
+  });
+}); 
+
+function toggleGroup(group) {
+  var div = jQuery('div.comments_list_toggle_group_'+group);
+  var visible = div.is(':visible');
+  if(!visible) 
+    jQuery('div.comment-group-loading-'+group).addClass('comment-button-loading');
+
+  div.toggle('fast');
+  return visible;
+}
+
+function loadCompleted(group) {
+  jQuery('div.comment-group-loading-'+group).removeClass('comment-button-loading')
+  if(comment_group_anchor) {
+    jQuery.scrollTo(jQuery(comment_group_anchor));
+    comment_group_anchor = null;
+  }
+}
@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/profile/comment_group_macro_plugin_profile_controller'
+
+# Re-raise errors caught by the controller.
+class CommentGroupMacroPluginProfileController; def rescue_action(e) raise e end; end
+
+class CommentGroupMacroPluginProfileControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = CommentGroupMacroPluginProfileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @profile = create_user('testuser').person
+    @article = profile.articles.build(:name => 'test')
+    @article.save!
+  end
+  attr_reader :article
+  attr_reader :profile
+
+  should 'be able to show group comments' do
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_template 'comment/_comment.rhtml'
+    assert_match /comments_list_group_0/, @response.body
+    assert_match /\"comment-count-0\", \"1\"/, @response.body
+  end
+  
+  should 'do not show global comments' do
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'global comment', :body => 'global', :group_id => nil)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_template 'comment/_comment.rhtml'
+    assert_match /comments_list_group_0/, @response.body
+    assert_match /\"comment-count-0\", \"1\"/, @response.body
+  end
+  
+end
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/public/comment_group_macro_plugin_public_controller'
+
+# Re-raise errors caught by the controller.
+class CommentGroupMacroPluginPublicController; def rescue_action(e) raise e end; end
+
+class CommentGroupMacroPluginPublicControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = CommentGroupMacroPluginPublicController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @profile = create_user('testuser').person
+    @article = profile.articles.build(:name => 'test')
+    @article.save!
+  end
+  attr_reader :article
+  attr_reader :profile
+
+  should 'be able to return group_id for a comment' do
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    xhr :get, :comment_group, :id => comment.id 
+    assert_match /\{\"group_id\":0\}/, @response.body
+  end
+  
+  should 'return group_id=null for a global comment' do
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala' )
+    xhr :get, :comment_group, :id => comment.id 
+    assert_match /\{\"group_id\":null\}/, @response.body
+  end
+  
+end
@@ -0,0 +1,81 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class CommentGroupMacroPluginTest < ActiveSupport::TestCase
+
+  include Noosfero::Plugin::HotSpot
+
+  def setup
+    @environment = Environment.default
+  end
+ 
+  attr_reader :environment
+
+  should 'register comment_group_macro in environment' do
+    Environment.macros = {}
+    Environment.macros[environment.id] = {}
+    macros = Environment.macros[environment.id]
+    context = mock()
+    context.stubs(:environment).returns(environment)
+    plugin = CommentGroupMacroPlugin.new(context)
+    assert_equal ['macro_display_comments'], macros.keys
+  end
+
+  should 'load_comments returns all the comments wihout group of an article passed as parameter' do
+    article = fast_create(Article)
+    c1 = fast_create(Comment, :source_id => article.id, :group_id => 1)
+    c2 = fast_create(Comment, :source_id => article.id)
+    c3 = fast_create(Comment, :source_id => article.id)
+
+    plugin = CommentGroupMacroPlugin.new
+    assert_equal [], [c2, c3] - plugin.load_comments(article)
+    assert_equal [], plugin.load_comments(article) - [c2, c3]
+  end
+ 
+  should 'load_comments not returns spam comments' do
+    article = fast_create(Article)
+    c1 = fast_create(Comment, :source_id => article.id, :group_id => 1)
+    c2 = fast_create(Comment, :source_id => article.id)
+    c3 = fast_create(Comment, :source_id => article.id, :spam => true)
+
+    plugin = CommentGroupMacroPlugin.new
+    assert_equal [], [c2] - plugin.load_comments(article)
+    assert_equal [], plugin.load_comments(article) - [c2]
+  end
+ 
+  should 'load_comments returns only root comments of article' do
+    article = fast_create(Article)
+    c1 = fast_create(Comment, :source_id => article.id, :group_id => 1)
+    c2 = fast_create(Comment, :source_id => article.id)
+    c3 = fast_create(Comment, :source_id => article.id, :reply_of_id => c2.id)
+
+    plugin = CommentGroupMacroPlugin.new
+    assert_equal [], [c2] - plugin.load_comments(article)
+    assert_equal [], plugin.load_comments(article) - [c2]
+  end
+
+  should 'params of macro display comments configuration be an empty array' do
+    plugin = CommentGroupMacroPlugin.new
+    assert_equal [], plugin.config_macro_display_comments[:params]
+  end
+
+  should 'skip_dialog of macro display comments configuration be true' do
+    plugin = CommentGroupMacroPlugin.new
+    assert plugin.config_macro_display_comments[:skip_dialog]
+  end
+
+  should 'generator of macro display comments configuration be the makeCommentable function' do
+    plugin = CommentGroupMacroPlugin.new
+    assert_equal 'makeCommentable();', plugin.config_macro_display_comments[:generator]
+  end
+ 
+  should 'js_files of macro display comments configuration return comment_group.js' do
+    plugin = CommentGroupMacroPlugin.new
+    assert_equal 'comment_group.js', plugin.config_macro_display_comments[:js_files]
+  end
+  
+  should 'css_files of macro display comments configuration return comment_group.css' do
+    plugin = CommentGroupMacroPlugin.new
+    assert_equal 'comment_group.css', plugin.config_macro_display_comments[:css_files]
+  end
+ 
+end
@@ -0,0 +1,30 @@
+<div class="comments">
+  <div class="comment_group_<%= group_id %>" style="float: left">
+    <div style="float: left">
+    <%= link_to_remote(image_tag("/plugins/comment_group_macro/images/comments.gif"),
+        :url => { :profile => profile_identifier, :controller => 'comment_group_macro_plugin_profile', :action => 'view_comments', :group_id => group_id, :article_id => article_id},
+        :loaded => visual_effect(:highlight, "comments_list_group_#{group_id}"),
+        :method => :post,
+        :condition => "!toggleGroup(#{group_id})",
+        :complete => "loadCompleted(#{group_id})")%>
+    </div>
+    <!-- FIXME: css file -->
+    <div id="comments_group_count_<%= group_id %>" style="float: right; vertical-align: middle; padding-left: 3px; padding-right: 5px; color: #5AC1FC"><span id="comment-count-<%= group_id %>" class='comment-count'><%= count %></span></div>
+
+  </div>
+
+  <div>
+    <%= inner_html %>
+  </div>
+
+  <div class="comment-group-loading-<%= group_id %>"/>
+
+  <div class="comments_list_toggle_group_<%= group_id %>" style="display:none">
+    <div class="article-comments-list">
+      <div id="comments_list_group_<%= group_id %>"></div>
+    </div>
+
+    <div id="page-comment-form-<%= group_id %>" class='post_comment_box closed'><%= render :partial => 'comment/comment_form', :locals => {:comment => Comment.new, :display_link => true, :cancel_triggers_hide => true, :group_id => group_id}%></div>
+
+  </div>
+</div>
@@ -12,12 +12,14 @@ class SendEmailPlugin &lt; Noosfero::Plugin
     true
   end
  
-  def parse_content(raw_content)
+  def parse_content(args)
+    raw_content = args[:html]
     if context.profile
       raw_content.gsub(/\{sendemail\}/, "/profile/#{context.profile.identifier}/plugin/send_email/deliver")
     else
       raw_content.gsub(/\{sendemail\}/, '/plugin/send_email/deliver')
     end
+    args.clone.merge({:html => raw_content})
   end
  
 end
@@ -146,14 +146,6 @@ class CommentControllerTest &lt; ActionController::TestCase
     assert_equal page, assigns(:comment).article
   end
  
-  should 'show comment form opened on error' do
-    login_as profile.identifier
-    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
-    xhr :post, :create, :profile => @profile.identifier, :id => page.id, :comment => { :title => '', :body => '' }, :confirm => 'true'
-    response = JSON.parse @response.body
-    assert_match /<div class=\"post_comment_box opened\"/, response["html"]
-  end
-
   should 'show validation error when body comment is missing' do
     login_as @profile.identifier
     page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
@@ -392,7 +384,7 @@ class CommentControllerTest &lt; ActionController::TestCase
     page = profile.articles.create(:name => 'myarticle', :body => 'the body of the text', :created_at => yesterday, :updated_at => yesterday)
     Article.record_timestamps = true
  
-    login_as('ze')
+    login_as @profile.identifier
     xhr :post, :create, :profile => profile.identifier, :id => page.id, :comment => { :title => 'crap!', :body => 'I think that this article is crap' }, :confirm => 'true'
     assert_not_equal yesterday, page.reload.updated_at
   end
@@ -1185,4 +1185,118 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_equal 1, assigns(:comments_count)
   end
  
+  should 'add extra content on comment form from plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def comment_form_extra_contents(args)
+        lambda {
+          hidden_field_tag('comment[some_field_id]', 1)
+         }
+      end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def comment_form_extra_contents(args)
+        lambda {
+          hidden_field_tag('comment[another_field_id]', 1)
+         }
+      end
+    end
+
+    Environment.default.enable_plugin(Plugin1.name)
+    Environment.default.enable_plugin(Plugin2.name)
+
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+
+    assert_tag :tag => 'input', :attributes => {:name => 'comment[some_field_id]', :type => 'hidden'}
+    assert_tag :tag => 'input', :attributes => {:name => 'comment[another_field_id]', :type => 'hidden'}
+  end
+
+  should 'collect comments as plugin definition' do
+    class Plugin1 < Noosfero::Plugin
+      def load_comments(page)
+        [page.comments.find(4)]
+      end
+    end
+    Environment.default.enable_plugin(Plugin1.name)
+    Comment.delete_all
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+    page.comments.build(:author => profile, :title => 'hi', :body => 'hello 1' ).save!
+    page.comments.build(:author => profile, :title => 'hi', :body => 'hello 2' ).save!
+    page.comments.build(:author => profile, :title => 'hi', :body => 'hello 3' ).save!
+    c = page.comments.build(:author => profile, :title => 'hi', :body => 'hello 4' )
+    c.save!
+
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+
+    assert_equal [c],  assigns(:comments)
+  end
+
+  should 'not be a problem if loaded comments of plugins not be an array' do
+    class Plugin1 < Noosfero::Plugin
+      def load_comments(page)
+        page.comments.find(4)
+      end
+    end
+    Environment.default.enable_plugin(Plugin1.name)
+    Comment.delete_all
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+    page.comments.build(:author => profile, :title => 'hi', :body => 'hello 1' ).save!
+    page.comments.build(:author => profile, :title => 'hi', :body => 'hello 2' ).save!
+    page.comments.build(:author => profile, :title => 'hi', :body => 'hello 3' ).save!
+    c = page.comments.build(:author => profile, :title => 'hi', :body => 'hello 4' )
+    c.save!
+
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+
+    assert_equal [c],  assigns(:comments)
+  end
+
+
+  should 'take in consideration only the first plugin comments definition' do
+    class Plugin1 < Noosfero::Plugin
+      def load_comments(page)
+        page.comments.first
+      end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def load_comments(page)
+        page.comments.last
+      end
+    end
+    Environment.default.enable_plugin(Plugin1.name)
+    Environment.default.enable_plugin(Plugin2.name)
+
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+    c1 = page.comments.build(:author => profile, :title => 'hi', :body => 'hello 1' )
+    c1.save!
+    page.comments.build(:author => profile, :title => 'hi', :body => 'hello 2' ).save!
+    page.comments.build(:author => profile, :title => 'hi', :body => 'hello 3' ).save!
+    c2 = page.comments.build(:author => profile, :title => 'hi', :body => 'hello 4' )
+    c2.save!
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+
+    assert_equal [c1],  assigns(:comments)
+  end
+
+  should 'empty array of comments collected by plugin make the comments variable be an empty array' do
+    class Plugin1 < Noosfero::Plugin
+      def load_comments(page)
+        []
+      end
+    end
+    Environment.default.enable_plugin(Plugin1.name)
+
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+    page.comments.build(:author => profile, :title => 'hi', :body => 'hello 1' ).save!
+    page.comments.build(:author => profile, :title => 'hi', :body => 'hello 2' ).save!
+
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+
+    assert_equal [],  assigns(:comments)
+  end
 end
@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class ApplicationHelperTest < ActiveSupport::TestCase
  
   include ApplicationHelper
+  include Noosfero::Plugin::HotSpot
  
   def setup
     self.stubs(:session).returns({})
@@ -658,6 +659,45 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
     assert_not_nil add_zoom_to_images
   end
  
+  should 'parse macros' do
+    class Plugin1 < Noosfero::Plugin
+      def macro_test1(params, inner_html, source)
+        'Test1'
+      end
+      def macro_test2(params, inner_html, source)
+        'Test2'
+      end
+
+      def macro_methods
+        ['macro_test1', 'macro_test2']
+      end
+    end
+
+    @environment = Environment.default
+    Environment.macros = {@environment.id => {}}
+    context = mock()
+    context.stubs(:environment).returns(@environment)
+    Plugin1.new(context)
+    html = '
+      <div class="macro nonEdit" data-macro="test1" data-macro-param="123"></div>
+      <div class="macro nonEdit" data-macro="test2"></div>
+      <div class="macro nonEdit" data-macro="unexistent" data-macro-param="987"></div>
+    '
+    parsed_html = convert_macro(html, mock())
+    parsed_divs = Hpricot(parsed_html).search('div')
+    expected_divs = Hpricot('
+      <div data-macro="test1" class="parsed-macro test1">Test1</div>
+      <div data-macro="test2" class="parsed-macro test2">Test2</div>
+      <div data-macro="unexistent" class="failed-macro unexistent">Unsupported macro unexistent!</div>
+    ').search('div')
+
+    # comparing div attributes between parsed and expected html 
+    parsed_divs.each_with_index do |div, i|
+      assert_equal expected_divs[i].attributes.to_hash, div.attributes.to_hash
+      assert_equal expected_divs[i].inner_text, div.inner_text
+    end
+  end
+
   should 'reference to article' do
     c = fast_create(Community)
     a = fast_create(TinyMceArticle, :profile_id => c.id)
@@ -700,6 +700,21 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert_equal c1, c1.comment_root
   end
  
+  should 'count a thread of comments' do
+    Comment.delete_all
+    comments = []
+    comments.push(create_comment)
+    c1 = create_comment
+    comments.push(c1)
+    create_comment(:reply_of_id => c1.id)
+    create_comment(:reply_of_id => c1.id)
+    c2 = create_comment
+    comments.push(c2)
+    create_comment(:reply_of_id => c2.id)
+   
+    assert_equal 6, Comment.count_thread(comments)
+  end
+
   private
  
   def create_comment(args = {})
@@ -0,0 +1,124 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class MacrosHelperTest < ActiveSupport::TestCase
+  include MacrosHelper
+  include ApplicationHelper
+  include ActionView::Helpers::FormOptionsHelper
+  include ActionView::Helpers::FormTagHelper
+  include ActionView::Helpers::TagHelper
+
+  CONFIG = {
+    :params => [
+      { :name => :identifier, :type => 'text'},
+      { :name => :size, :type => 'select',
+        :values => [
+          [_('Big'), :big],
+          [_('Icon'), :icon],
+          [_('Minor'), :minor],
+          [_('Portrait'), :portrait],
+          [_('Thumb'), :thumb]
+        ],
+        :default => :portrait
+      }
+    ],
+    :title => _('Profile Image Link')
+  }
+
+  should 'generate html for macro configuration' do
+    @environment = Environment.default
+    Environment.macros = {}
+    macros = Environment.macros[@environment.id] = {}
+    plugin_instance = mock
+    plugin_instance.stubs('config_macro_example').returns(CONFIG)
+    macros['macro_example'] = plugin_instance
+    html = macro_configuration_dialog('macro_example')
+    assert_tag_in_string html, :tag => 'label', :content => _('Identifier')
+    assert_tag_in_string html, :tag => 'input', :attributes => {:name => 'identifier'}
+    assert_tag_in_string html, :tag => 'label', :content => 'size'.humanize
+    assert_tag_in_string html, :tag => 'select', :attributes => {:name => 'size'}, :descendant => {:tag => 'option', :attributes => {:value => 'big'}, :content => _('Big')}
+    assert_tag_in_string html, :tag => 'select', :attributes => {:name => 'size'}, :descendant => {:tag => 'option', :attributes => {:value => 'icon'}, :content => _('Icon')}
+    assert_tag_in_string html, :tag => 'select', :attributes => {:name => 'size'}, :descendant => {:tag => 'option', :attributes => {:value => 'minor'}, :content => _('Minor')}
+    assert_tag_in_string html, :tag => 'select', :attributes => {:name => 'size'}, :descendant => {:tag => 'option', :attributes => {:value => 'portrait', :selected => true}, :content => _('Portrait')}
+    assert_tag_in_string html, :tag => 'select', :attributes => {:name => 'size'}, :descendant => {:tag => 'option', :attributes => {:value => 'thumb'}, :content => _('Thumb')}
+  end
+
+  should 'get macro title' do
+    @environment = Environment.default
+    Environment.macros = {}
+    macros = Environment.macros[@environment.id] = {}
+    plugin_instance = mock
+    plugin_instance.stubs('config_macro_example').returns(CONFIG)
+    macros['macro_example'] = plugin_instance
+    title = macro_title('macro_example')
+    assert _('Profile Image Link'), title
+  end
+
+  should 'get only macros in menu' do
+    @environment = Environment.default
+    Environment.macros = {}
+    macros = Environment.macros[@environment.id] = {}
+    plugin_instance = mock
+    plugin_instance.stubs('config_macro_example').returns({})
+    macros['macro_example'] = plugin_instance
+    plugin_instance_other = mock
+    plugin_instance_other.stubs('config_macro_example_other').returns({:icon_path => 'icon.png'})
+    macros['macro_example_other'] = plugin_instance_other
+    assert_equal [plugin_instance], macros_in_menu.values
+  end
+
+  should 'get only macros with buttons' do
+    @environment = Environment.default
+    Environment.macros = {}
+    macros = Environment.macros[@environment.id] = {}
+    plugin_instance = mock
+    plugin_instance.stubs('config_macro_example').returns({})
+    macros['macro_example'] = plugin_instance
+    plugin_instance_other = mock
+    plugin_instance_other.stubs('config_macro_example_other').returns({:icon_path => 'icon.png'})
+    macros['macro_example_other'] = plugin_instance_other
+    assert_equal [plugin_instance_other], macros_with_buttons.values
+  end
+
+  should 'skip macro config dialog and call generator directly' do
+    @environment = Environment.default
+    Environment.macros = {}
+    macros = Environment.macros[@environment.id] = {}
+    plugin_instance = mock
+    plugin_instance.stubs('config_macro_example').returns({:skip_dialog => true, :generator => '', :params => [] })
+    macros['macro_example'] = plugin_instance
+    assert_equal 'function(){}', generate_macro_config_dialog('macro_example')
+  end
+
+  should 'include js files' do
+    @environment = Environment.default
+    Environment.macros = {}
+    macros = Environment.macros[@environment.id] = {}
+    plugin_instance = mock
+    plugin_instance.stubs('config_macro_example').returns({:js_files => 'macro.js' })
+    plugin_instance.class.stubs(:public_path).with('macro.js').returns('macro.js')
+    macros['macro_example'] = plugin_instance
+    assert_equal '<script src="/javascripts/macro.js" type="text/javascript"></script>', include_macro_js_files
+  end
+  
+  should 'get macro css files' do
+    @environment = Environment.default
+    Environment.macros = {}
+    macros = Environment.macros[@environment.id] = {}
+    plugin_instance = mock
+    plugin_instance.stubs('config_macro_example').returns({:css_files => 'macro.css' })
+    plugin_instance.class.stubs(:public_path).with('macro.css').returns('macro.css')
+    macros['macro_example'] = plugin_instance
+    assert_equal 'macro.css', macro_css_files
+  end
+  
+  should 'get macro specific generator' do
+    @environment = Environment.default
+    Environment.macros = {}
+    macros = Environment.macros[@environment.id] = {}
+    plugin_instance = mock
+    plugin_instance.stubs('config_macro_example').returns({:generator => 'macro_generator' })
+    macros['macro_example'] = plugin_instance
+    assert_equal 'macro_generator', macro_generator('macro_example')
+  end
+
+end
@@ -2,6 +2,8 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
  
 class PluginManagerTest < ActiveSupport::TestCase
  
+  include Noosfero::Plugin::HotSpot
+
   def setup
     @environment = Environment.default
     @controller = mock()
@@ -26,8 +28,8 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     class Plugin4 < Noosfero::Plugin; end;
     environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s, Plugin4.to_s])
     Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin3.to_s, Plugin4.to_s])
-    plugins = manager.enabled_plugins.map { |instance| instance.class.to_s }
-    assert_equal [Plugin1.to_s, Plugin4.to_s], plugins
+    results = plugins.enabled_plugins.map { |instance| instance.class.to_s }
+    assert_equal [Plugin1.to_s, Plugin4.to_s], results
   end
  
   should 'map events to registered plugins' do
@@ -55,7 +57,33 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     p1 = Plugin1.new
     p2 = Plugin2.new
  
-    assert_equal [p1.random_event, p2.random_event], manager.dispatch(:random_event)
+    assert_equal [p1.random_event, p2.random_event], plugins.dispatch(:random_event)
+  end
+
+  should 'dispatch_first method returns the first plugin response if there is many plugins to responde the event' do
+
+    class Plugin1 < Noosfero::Plugin
+      def random_event
+        'Plugin 1 action.'
+      end
+    end
+
+    class Plugin2 < Noosfero::Plugin
+      def random_event
+        'Plugin 2 action.'
+      end
+    end
+
+    class Plugin3 < Noosfero::Plugin
+      def random_event
+        'Plugin 3 action.'
+      end
+    end
+
+    environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s, Plugin3.to_s])
+    p1 = Plugin1.new
+
+    assert_equal p1.random_event, plugins.dispatch_first(:random_event)
   end
  
   should 'return the first non-blank result' do
@@ -140,5 +168,32 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     assert_equal Plugin2, manager.first_plugin(:random_event)
   end
  
+  should 'dispatch_first method returns the first plugin response if there is many plugins to responde the event and the first one respond nil' do
+
+    class Plugin1 < Noosfero::Plugin
+      def random_event
+        nil
+      end
+    end
+
+    class Plugin2 < Noosfero::Plugin
+      def random_event
+        'Plugin 2 action.'
+      end
+    end
+
+    class Plugin3 < Noosfero::Plugin
+      def random_event
+        'Plugin 3 action.'
+      end
+    end
+
+    environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s, Plugin3.to_s])
+
+    p2 = Plugin2.new
+
+    assert_equal p2.random_event, plugins.dispatch_first(:random_event)
+  end
+
 end
  
@@ -7,6 +7,8 @@ class PluginTest &lt; ActiveSupport::TestCase
   end
   attr_reader :environment
  
+  include Noosfero::Plugin::HotSpot
+
   should 'keep the list of all loaded subclasses' do
     class Plugin1 < Noosfero::Plugin
     end
@@ -26,6 +28,61 @@ class PluginTest &lt; ActiveSupport::TestCase
     assert_equal({:controller => 'plugin_test/plugin1_admin', :action => 'index'}, Plugin1.admin_url)
   end
  
+  should 'register its macros in the environment when instantiated' do
+    class Plugin1 < Noosfero::Plugin
+      def macro_example1(params, inner_html, source)
+      end
+
+      def example2(params, inner_html, source)
+      end
+
+      def not_macro
+      end
+
+      def macro_methods
+        ['macro_example1', 'example2']
+      end
+    end
+    
+    Environment.macros = {}
+    Environment.macros[environment.id] = {}
+    macros = Environment.macros[environment.id]
+    context = mock()
+    context.stubs(:environment).returns(environment)
+
+    plugin_instance = Plugin1.new(context)
+
+    assert_equal plugin_instance, macros['macro_example1']
+    assert_equal plugin_instance, macros['example2']
+    assert_nil macros['not_macro']
+  end
+
+  should 'load_comments return nil by default' do
+
+    class Plugin1 < Noosfero::Plugin; end;
+
+    environment.stubs(:enabled_plugins).returns([Plugin1.to_s])
+
+    profile = fast_create(Profile, :name => 'test profile', :identifier => 'test_profile')
+    a = fast_create(Article, :name => 'my article', :profile_id => profile.id)
+    assert_nil plugins.dispatch_first(:load_comments, a)
+  end
+
+  should 'load_comments return the value defined by plugin' do
+
+    class Plugin1 < Noosfero::Plugin
+      def load_comments(page)
+        'some value'
+      end
+    end
+
+    environment.stubs(:enabled_plugins).returns([Plugin1.to_s])
+
+    profile = fast_create(Profile, :name => 'test profile', :identifier => 'test_profile')
+    a = fast_create(Article, :name => 'my article', :profile_id => profile.id)
+    assert_equal 'some value', plugins.dispatch_first(:load_comments, a)
+  end
+
   should 'returns empty hash for class method extra_blocks by default if no blocks are defined on plugin' do
  
     class SomePlugin1 < Noosfero::Plugin
@@ -494,8 +551,4 @@ class PluginTest &lt; ActiveSupport::TestCase
     end
   end
  
-
-
-
-
 end
...	...	@@ -98,10 +98,13 @@ class ContentViewerController < ApplicationController
98	98	session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
99	99	end
100	100	end
	101	+
	102	+ @comments = @plugins.dispatch_first(:load_comments, @page)
	103	+ @comments \|\|= @page.comments.without_spam.as_thread
	104	+ @comments = [@comments] unless @comments.is_a?(Array)
	105	+
	106	+ @comments_count = Comment.count_thread(@comments)
101	107
102		- comments = @page.comments.without_spam
103		- @comments = comments.as_thread
104		- @comments_count = comments.count
105	108	if params[:slideshow]
106	109	render :action => 'slideshow', :layout => 'slideshow'
107	110	end
...	...
...	...	@@ -947,10 +947,7 @@ module ApplicationHelper
947	947	options.merge!(:page => params[:npage])
948	948	content = article.to_html(options)
949	949	content = content.kind_of?(Proc) ? self.instance_eval(&content).html_safe : content.html_safe
950		- @plugins && @plugins.each do \|plugin\|
951		- content = plugin.parse_content(content)
952		- end
953		- content
	950	+ filter_html(content, article)
954	951	end
955	952
956	953	# Please, use link_to by default!
...	...	@@ -1407,6 +1404,38 @@ module ApplicationHelper
1407	1404	@no_design_blocks = true
1408	1405	end
1409	1406
	1407	+ def filter_html(html, source)
	1408	+ if @plugins
	1409	+ html = convert_macro(html, source)
	1410	+ end
	1411	+ html
	1412	+ end
	1413	+
	1414	+ def convert_macro(html, source)
	1415	+ doc = Hpricot(html)
	1416	+ while element = doc.search('.macro').first
	1417	+ macro_name = element['data-macro']
	1418	+ method_name = "macro_#{macro_name}"
	1419	+ attrs = collect_macro_attributes(element)
	1420	+ plugin_instance = Environment.macros[environment.id][method_name]
	1421	+ if plugin_instance
	1422	+ result = plugin_instance.send(method_name, attrs, element.inner_html, source)
	1423	+ element.inner_html = result.kind_of?(Proc) ? self.instance_eval(&result) : result
	1424	+ element['class'] = "parsed-macro #{macro_name}"
	1425	+ else
	1426	+ element.inner_html = _("Unsupported macro %s!") % macro_name
	1427	+ element['class'] = "failed-macro #{macro_name}"
	1428	+ end
	1429	+ attrs.each {\|key, value\| element.remove_attribute("data-macro-#{key}")}
	1430	+ end
	1431	+ doc.html
	1432	+ end
	1433	+
	1434	+ def collect_macro_attributes(element)
	1435	+ element.attributes.to_hash.select {\|key, value\| key[0..10] == 'data-macro-'}.
	1436	+ inject({}){\|result, a\| result.merge({a[0][11..-1] => a[1]})}.with_indifferent_access
	1437	+ end
	1438	+
1410	1439	def default_folder_for_image_upload(profile)
1411	1440	default_folder = profile.folders.find_by_type('Gallery')
1412	1441	default_folder = profile.folders.find_by_type('Folder') if default_folder.nil?
...	...
...	...	@@ -99,8 +99,8 @@ module BoxesHelper
99	99	unless block.visible?
100	100	options[:title] = _("This block is invisible. Your visitors will not see it.")
101	101	end
102		- @controller.send(:content_editor?) \|\| @plugins.each do \|plugin\|
103		- result = plugin.parse_content(result)
	102	+ if @controller.send(:content_editor?)
	103	+ result = filter_html(result, block)
104	104	end
105	105	box_decorator.block_target(block.box, block) +
106	106	content_tag('div',
...	...
...	...	@@ -0,0 +1,96 @@
	1	+module MacrosHelper
	2	+
	3	+ def macros_in_menu
	4	+ Environment.macros[@environment.id].reject{ \|macro_name, plugin_instance\| macro_configuration(macro_name)[:icon_path] }
	5	+ end
	6	+
	7	+ def macros_with_buttons
	8	+ Environment.macros[@environment.id].reject{ \|macro_name, plugin_instance\| !macro_configuration(macro_name)[:icon_path] }
	9	+ end
	10	+
	11	+ def macro_configuration(macro_name)
	12	+ plugin_instance = Environment.macros[@environment.id][macro_name]
	13	+ plugin_instance.send("config_#{macro_name}")
	14	+ end
	15	+
	16	+ def macro_title(macro_name)
	17	+ macro_configuration(macro_name)[:title] \|\| macro_name.to_s.humanize
	18	+ end
	19	+
	20	+ def generate_macro_config_dialog(macro_name)
	21	+ if macro_configuration(macro_name)[:skip_dialog]
	22	+ "function(){#{macro_generator(macro_name)}}"
	23	+ else
	24	+ "function(){
	25	+ jQuery('<div>'+#{macro_configuration_dialog(macro_name).to_json}+'</div>').dialog({
	26	+ title: #{macro_title(macro_name).to_json},
	27	+ modal: true,
	28	+ buttons: [
	29	+ {text: #{_('Ok').to_json}, click: function(){
	30	+ tinyMCE.activeEditor.execCommand('mceInsertContent', false,
	31	+ (function(dialog){ #{macro_generator(macro_name)} })(this));
	32	+ jQuery(this).dialog('close');
	33	+ }},
	34	+ {text: #{_('Cancel').to_json}, click: function(){jQuery(this).dialog('close');}}
	35	+ ]
	36	+ });
	37	+ }"
	38	+ end
	39	+ end
	40	+
	41	+ def include_macro_js_files
	42	+ plugins_javascripts = []
	43	+ Environment.macros[environment.id].map do \|macro_name, plugin_instance\|
	44	+ if macro_configuration(macro_name)[:js_files]
	45	+ macro_configuration(macro_name)[:js_files].map { \|js\| plugins_javascripts << plugin_instance.class.public_path(js) }
	46	+ end
	47	+ end
	48	+ javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty?
	49	+ end
	50	+
	51	+ def macro_css_files
	52	+ plugins_css = []
	53	+ Environment.macros[environment.id].map do \|macro_name, plugin_instance\|
	54	+ if macro_configuration(macro_name)[:css_files]
	55	+ macro_configuration(macro_name)[:css_files].map { \|css\| plugins_css << plugin_instance.class.public_path(css) }
	56	+ end
	57	+ end
	58	+ plugins_css.join(',')
	59	+ end
	60	+
	61	+ protected
	62	+
	63	+ def macro_generator(macro_name)
	64	+ if macro_configuration(macro_name)[:generator]
	65	+ macro_configuration(macro_name)[:generator]
	66	+ else
	67	+ macro_default_generator(macro_name)
	68	+ end
	69	+ end
	70	+
	71	+ def macro_default_generator(macro_name)
	72	+ code = "var params = {};"
	73	+ configuration = macro_configuration(macro_name)
	74	+ configuration[:params].map do \|field\|
	75	+ code += "params.#{field[:name]} = jQuery('*[name=#{field[:name]}]', dialog).val();"
	76	+ end
	77	+ code + "
	78	+ var html = jQuery('<div class=\"macro mceNonEditable\" data-macro=\"#{macro_name[6..-1]}\">'+#{macro_title(macro_name).to_json}+'</div>')[0];
	79	+ for(key in params) html.setAttribute('data-macro-'+key,params[key]);
	80	+ return html.outerHTML;
	81	+ "
	82	+ end
	83	+
	84	+ def macro_configuration_dialog(macro_name)
	85	+ macro_configuration(macro_name)[:params].map do \|field\|
	86	+ label_name = field[:label] \|\| field[:name].to_s.humanize
	87	+ case field[:type]
	88	+ when 'text'
	89	+ labelled_form_field(label_name, text_field_tag(field[:name], field[:default]))
	90	+ when 'select'
	91	+ labelled_form_field(label_name, select_tag(field[:name], options_for_select(field[:values], field[:default])))
	92	+ end
	93	+ end.join("\n")
	94	+ end
	95	+
	96	+end
...	...
...	...	@@ -152,6 +152,14 @@ class Comment < ActiveRecord::Base
152	152	@replies = comments_list
153	153	end
154	154
	155	+ def self.count_thread(comments)
	156	+ count = comments.length
	157	+ comments.each do \|c\|
	158	+ count+=count_thread(c.replies)
	159	+ end
	160	+ count
	161	+ end
	162	+
155	163	def self.as_thread
156	164	result = {}
157	165	root = []
...	...
...	...	@@ -16,6 +16,10 @@ class Environment < ActiveRecord::Base
16	16	filename
17	17	end
18	18
	19	+ class << self
	20	+ attr_accessor :macros
	21	+ end
	22	+
19	23	PERMISSIONS['Environment'] = {
20	24	'view_environment_admin_panel' => N_('View environment admin panel'),
21	25	'edit_environment_features' => N_('Edit environment features'),
...	...
...	...	@@ -79,6 +79,8 @@ function check_captcha(button, confirm_action) {
79	79	<%= hidden_field_tag(:view, params[:view])%>
80	80	<%= f.hidden_field(:reply_of_id) %>
81	81
	82	+ <%= @plugins.dispatch(:comment_form_extra_contents, local_assigns).collect { \|content\| instance_eval(&content) }.join("") %>
	83	+
82	84	<% button_bar do %>
83	85	<%= submit_button('add', _('Post comment'), :onclick => "if(check_captcha(this)) { save_comment(this) } else { check_captcha(this, save_comment)};return false;") %>
84	86	<% if !edition_mode %>
...	...
...	...	@@ -90,7 +90,7 @@
90	90
91	91	<% if @page.accept_comments? \|\| @comments_count > 0 %>
92	92	<h3 <%= 'class="no-comments-yet"' if @comments_count == 0 %>>
93		- <%= number_of_comments(@page) %>
	93	+ <%= display_number_of_comments(@comments_count) %>
94	94	</h3>
95	95	<% end %>
96	96
...	...
	1	+<% extend MacrosHelper %>
1	2	<%= javascript_include_tag 'tinymce/jscripts/tiny_mce/tiny_mce.js' %>
	3	+<%= include_macro_js_files %>
2	4	<script type="text/javascript">
3		- var myplugins = "searchreplace,print,table,contextmenu";
	5	+ var myplugins = "searchreplace,print,table,contextmenu,-macrosPlugin";
4	6	var first_line, second_line;
5	7	var mode = '<%= mode \|\|= false %>'
6	8	<% if mode %>
...	...	@@ -8,36 +10,80 @@
8	10	second_line = ""
9	11	<% else %>
10	12	first_line = "print,separator,copy,paste,separator,undo,redo,separator,search,replace,separator,forecolor,fontsizeselect,formatselect"
11		- second_line = "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code"
	13	+ second_line = "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code,macros"
	14	+ <% macros_with_buttons.each do \|macro_name, plugin_instance\| %>
	15	+ second_line += ',<%=macro_name %>'
	16	+ <% end %>
12	17	<% end %>
13	18
14	19	if (tinymce.isIE) {
15	20	// the paste plugin is only useful in Internet Explorer
16	21	myplugins = "paste," + myplugins;
17	22	}
	23	+
	24	+tinymce.create('tinymce.plugins.MacrosPlugin', {
	25	+ createControl: function(n, cm) {
	26	+ switch (n) {
	27	+ case 'macros':
	28	+ <% unless macros_in_menu.empty? %>
	29	+ var c = cm.createMenuButton('macros', {
	30	+ title : 'Macros',
	31	+ image : '/designs/icons/tango/Tango/16x16/emblems/emblem-system.png',
	32	+ icons : false
	33	+ });
	34	+
	35	+ <% macros_in_menu.each do \|macro_name, plugin_instance\| %>
	36	+ c.onRenderMenu.add(function(c, m) {
	37	+ m.add({
	38	+ title: <%= macro_title(macro_name).to_json %>,
	39	+ onclick: <%= generate_macro_config_dialog(macro_name) %>
	40	+ });
	41	+ });
	42	+ <% end %>
	43	+
	44	+ // Return the new menu button instance
	45	+ return c;
	46	+ <% end %>
	47	+ }
	48	+ return null;
	49	+ }
	50	+});
	51	+
	52	+// Register plugin with a short name
	53	+tinymce.PluginManager.add('macrosPlugin', tinymce.plugins.MacrosPlugin);
	54	+
18	55	tinyMCE.init({
19		- mode : "textareas",
20		- editor_selector : "mceEditor",
21		- theme : "advanced",
22		- relative_urls : false,
23		- remove_script_host : false,
24		- document_base_url : <%= environment.top_url.to_json %>,
25		- plugins: myplugins,
26		- theme_advanced_toolbar_location : "top",
27		- theme_advanced_layout_manager: 'SimpleLayout',
28		- theme_advanced_buttons1 : first_line,
29		- theme_advanced_buttons2 : second_line,
30		- theme_advanced_buttons3 : "",
31		- theme_advanced_blockformats :"p,address,pre,h2,h3,h4,h5,h6",
32		- paste_auto_cleanup_on_paste : true,
33		- paste_insert_word_content_callback : "convertWord",
34		- paste_use_dialog: false,
35		- apply_source_formatting : true,
36		- extended_valid_elements : "applet[style\|archive\|codebase\|code\|height\|width],comment,iframe[src\|style\|allowtransparency\|frameborder\|width\|height\|scrolling],embed[title\|src\|type\|height\|width]",
37		- content_css: '/stylesheets/tinymce.css',
38		- language: <%= tinymce_language.inspect %>,
39		- entity_encoding: 'raw'
40		- });
	56	+ mode : "textareas",
	57	+ editor_selector : "mceEditor",
	58	+ theme : "advanced",
	59	+ relative_urls : false,
	60	+ remove_script_host : false,
	61	+ document_base_url : <%= environment.top_url.to_json %>,
	62	+ plugins: myplugins,
	63	+ theme_advanced_toolbar_location : "top",
	64	+ theme_advanced_layout_manager: 'SimpleLayout',
	65	+ theme_advanced_buttons1 : first_line,
	66	+ theme_advanced_buttons2 : second_line,
	67	+ theme_advanced_buttons3 : "",
	68	+ theme_advanced_blockformats :"p,address,pre,h2,h3,h4,h5,h6",
	69	+ paste_auto_cleanup_on_paste : true,
	70	+ paste_insert_word_content_callback : "convertWord",
	71	+ paste_use_dialog: false,
	72	+ apply_source_formatting : true,
	73	+ extended_valid_elements : "applet[style\|archive\|codebase\|code\|height\|width],comment,iframe[src\|style\|allowtransparency\|frameborder\|width\|height\|scrolling],embed[title\|src\|type\|height\|width]",
	74	+ content_css: '/stylesheets/tinymce.css,<%= macro_css_files %>',
	75	+ language: <%= tinymce_language.inspect %>,
	76	+ entity_encoding: 'raw',
	77	+ setup : function(ed) {
	78	+ <% macros_with_buttons.each do \|macro_name, plugin_instance\| %>
	79	+ ed.addButton('<%= macro_name %>', {
	80	+ title: <%= macro_title(macro_name).to_json %>,
	81	+ onclick: <%= generate_macro_config_dialog(macro_name) %>,
	82	+ image : '<%= macro_configuration(macro_name)[:icon_path]%>'
	83	+ });
	84	+ <% end %>
	85	+ }
	86	+});
41	87
42	88	function convertWord(type, content) {
43	89	switch (type) {
...	...
...	...	@@ -131,7 +131,6 @@ ActiveRecord::Schema.define(:version => 20130606110602) do
131	131	t.integer "license_id"
132	132	end
133	133
134		- add_index "articles", ["name"], :name => "index_articles_on_name"
135	134	add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
136	135	add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
137	136	add_index "articles", ["slug"], :name => "index_articles_on_slug"
...	...	@@ -221,6 +220,7 @@ ActiveRecord::Schema.define(:version => 20130606110602) do
221	220	t.string "source_type"
222	221	t.string "user_agent"
223	222	t.string "referrer"
	223	+ t.integer "group_id"
224	224	end
225	225
226	226	add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
...	...