Merge branch 'suggest_article_refactor' into api

Victor Costa
2 parents 3ebc0a24 88d13891
Showing 54 changed files with 446 additions and 208 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/events_controller.rb
app/controllers/public/search_controller.rb
app/helpers/blog_helper.rb
app/helpers/boxes_helper.rb
app/helpers/tinymce_helper.rb
app/models/article.rb
app/models/blog.rb
app/models/suggest_article.rb
app/models/user.rb
app/views/cms/_blog.html.erb
app/views/cms/suggest_an_article.html.erb
app/views/content_viewer/blog_page.html.erb
app/views/profile/report_abuse.html.erb
app/views/profile_editor/edit.html.erb
app/views/search/search.js.erb
app/views/spam/_suggest_article.html.erb
app/views/tasks/_suggest_article_accept_details.html.erb
config/initializers/newrelic.rb
db/migrate/20140724134601_fix_yaml_encoding.rb
@@ -350,7 +350,8 @@ class CmsController &lt; MyProfileController
       @task.ip_address = request.remote_ip
       @task.user_agent = request.user_agent
       @task.referrer = request.referrer
-      if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
+      @task.requestor = current_person if logged_in?
+      if (logged_in? || verify_recaptcha(:model => @task, :message => _('Please type the words correctly'))) && @task.save
         session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
         redirect_to @back_to
       end
@@ -5,7 +5,11 @@ class EventsController &lt; PublicController
   def events
     @events = []
-    @date = build_date(params[:year], params[:month], params[:day])
+    begin
+      @date = build_date params[:year], params[:month], params[:day]
+    rescue ArgumentError # invalid date
+      return render_not_found
+    end
     if !params[:year] && !params[:month] && !params[:day]
       @events = profile.events.next_events_from_month(@date).paginate(:per_page => per_page, :page => params[:page])
@@ -62,7 +62,7 @@ class SearchController &lt; PublicController
   end
   def articles
-    @scope = @environment.articles.public.paginate(paginate_options)
+    @scope = @environment.articles.public
     full_text_search
   end
@@ -76,7 +76,7 @@ class SearchController &lt; PublicController
   end
   def products
-    @scope = @environment.products.paginate(paginate_options)
+    @scope = @environment.products
     full_text_search
   end
@@ -244,7 +244,7 @@ class SearchController &lt; PublicController
   def visible_profiles(klass, *extra_relations)
     relations = [:image, :domains, :environment, :preferred_domain]
     relations += extra_relations
-    @environment.send(klass.name.underscore.pluralize).visible.includes(relations).paginate(paginate_options)
+    @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
   end
   def per_page
@@ -17,28 +17,28 @@ module BlogHelper
     _('Configure blog')
   end
-  def list_posts(articles, format = 'full', paginate = true)
+  def list_posts(articles, conf = { format: 'full', paginate: true })
     pagination = will_paginate(articles, {
       :param_name => 'npage',
       :previous_label => _('&laquo; Newer posts'),
       :next_label => _('Older posts &raquo;'),
       :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
-    }) if articles.present? && paginate
+    }) if articles.present? && conf[:paginate]
     content = []
     artic_len = articles.length
     articles.each_with_index{ |art,i|
-      css_add = [ 'position-'+(i+1).to_s() ]
+      css_add = [ 'blog-post', 'position-'+(i+1).to_s() ]
       position = (i%2 == 0) ? 'odd-post' : 'even-post'
       css_add << 'first' if i == 0
       css_add << 'last'  if i == (artic_len-1)
       css_add << 'not-published' if !art.published?
-      css_add << position + '-inner'
-      content << content_tag('div',
-                             content_tag('div',
-                                         display_post(art, format).html_safe + '<br style="clear:both"/>'.html_safe,
-                                         :class => 'blog-post ' + css_add.join(' '),
-                                         :id => "post-#{art.id}"), :class => position
-                            )
+      css_add << position
+      content << (content_tag 'div', id: "post-#{art.id}", class: css_add do
+        content_tag 'div', class: position + '-inner blog-post-inner' do
+          display_post(art, conf[:format]).html_safe +
+          '<br style="clear:both"/>'.html_safe
+        end
+      end)
     }
     content.join("\n<hr class='sep-posts'/>\n") + (pagination or '')
   end
@@ -46,7 +46,16 @@ module BlogHelper
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
     title = article_title(article, :no_comments => no_comments)
-    html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
+    method = "display_#{format.split('+')[0]}_format"
+    html = send(method, FilePresenter.for(article)).html_safe
+    if format.split('+')[1] == 'pic'
+      img = article.first_image
+      if img.blank?
+        '<div class="post-pic empty"></div>'
+      else
+        '<div class="post-pic" style="background-image:url('+img+')"></div>'
+      end
+    end.to_s +
     title + html
   end
@@ -251,8 +251,8 @@ module BoxesHelper
               content_tag('h2', _('Embed block code')) +
               content_tag('div', _('Below, you''ll see a field containing embed code for the block. Just copy the code and paste it into your website or blogging software.'), :style => 'margin-bottom: 1em;') +
               content_tag('textarea', embed_code, :style => 'margin-bottom: 1em; width:100%; height:40%;', :readonly => 'readonly') +
-              thickbox_close_button(_('Close')), :style => 'display: none;', :id => "embed-code-box-#{block.id}")
-      buttons << thickbox_inline_popup_icon(:embed, _('Embed code'), {}, "embed-code-box-#{block.id}") << html
+              modal_close_button(_('Close')), :style => 'display: none;', :id => "embed-code-box-#{block.id}")
+      buttons << modal_inline_icon(:embed, _('Embed code'), {}, "#embed-code-box-#{block.id}") << html
     end
     content_tag('div', buttons.join("\n") + tag('br', :style => 'clear: left'), :class => 'button-bar')
@@ -17,6 +17,7 @@ module TinymceHelper
         searchreplace wordcount visualblocks visualchars code fullscreen
         insertdatetime media nonbreaking save table contextmenu directionality
         emoticons template paste textcolor colorpicker textpattern],
+      :image_advtab => true,
       :language => tinymce_language
     options[:toolbar1] = "insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
@@ -5,7 +5,7 @@ class Article &lt; ActiveRecord::Base
                   :allow_members_to_edit, :translation_of_id, :language,
                   :license_id, :parent_id, :display_posts_in_current_language,
                   :category_ids, :posts_per_page, :moderate_comments,
-                  :accept_comments, :feed, :published, :source,
+                  :accept_comments, :feed, :published, :source, :source_name,
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
                   :image_builder, :show_to_followers
@@ -784,7 +784,9 @@ class Article &lt; ActiveRecord::Base
   end
   def first_image
-    img = Nokogiri::HTML.fragment(self.lead.to_s).css('img[src]').first || Nokogiri::HTML.fragment(self.body.to_s).search('img').first
+    img = ( image.present? && { 'src' => image.public_filename } ) ||
+          Nokogiri::HTML.fragment(self.lead.to_s).css('img[src]').first ||
+          Nokogiri::HTML.fragment(self.body.to_s).search('img').first
     img.nil? ? '' : img['src']
   end
@@ -76,7 +76,7 @@ class Blog &lt; Folder
   end
   settings_items :visualization_format, :type => :string, :default => 'full'
-  validates_inclusion_of :visualization_format, :in => [ 'full', 'short' ], :if => :visualization_format
+  validates_inclusion_of :visualization_format, :in => [ 'full', 'short', 'short+pic' ], :if => :visualization_format
   settings_items :display_posts_in_current_language, :type => :boolean, :default => false
 class SuggestArticle < Task
-  validates_presence_of :target_id, :article_name, :email, :name, :article_body
+  validates_presence_of :target_id
+  validates_presence_of :email, :name, :if => Proc.new { |task| task.requestor.blank? }
+  validates_associated :article_object
   settings_items :email, :type => String
   settings_items :name, :type => String
-  settings_items :article_name, :type => String
-  settings_items :article_body, :type => String
-  settings_items :article_abstract, :type => String
-  settings_items :article_parent_id, :type => String
-  settings_items :source, :type => String
-  settings_items :source_name, :type => String
-  settings_items :highlighted, :type => :boolean, :default => false
   settings_items :ip_address, :type => String
   settings_items :user_agent, :type => String
   settings_items :referrer, :type => String
+  settings_items :article, :type => Hash, :default => {}
   after_create :schedule_spam_checking
@@ -24,34 +20,45 @@ class SuggestArticle &lt; Task
   include Noosfero::Plugin::HotSpot
   def sender
-    "#{name} (#{email})"
+    requestor ? "#{requestor.name}" : "#{name} (#{email})"
+  end
+
+  def article_object
+    if @article_object.nil?
+      @article_object = article_type.new(article.merge({:profile => target}))
+      if requestor.present?
+        @article_object.author = requestor
+      else
+        @article_object.author_name = name
+      end
+    end
+    @article_object
+  end
+
+  def article_type
+    (article[:type] || 'TinyMceArticle').constantize
   end
   def perform
-    task = TinyMceArticle.new
-    task.profile = target
-    task.name = article_name
-    task.author_name = name
-    task.body = article_body
-    task.abstract = article_abstract
-    task.parent_id = article_parent_id
-    task.source = source
-    task.source_name = source_name
-    task.highlighted = highlighted
-    task.save!
+    article_object.save!
   end
   def title
     _("Article suggestion")
   end
+  def article_name
+    article[:name]
+  end
+
   def subject
     article_name
   end
   def information
-    { :message => _('%{sender} suggested the publication of the article: %{subject}.'),
-      :variables => {:sender => sender} }
+    variables = requestor.blank? ? {:requestor => sender} : {}
+    { :message => _('%{requestor} suggested the publication of the article: %{subject}.'),
+      :variables => variables }
   end
   def accept_details
@@ -63,8 +70,8 @@ class SuggestArticle &lt; Task
   end
   def target_notification_description
-    _('%{sender} suggested the publication of the article: %{article}.') %
-    {:sender => sender, :article => article_name}
+    _('%{requestor} suggested the publication of the article: %{article}.') %
+    {:requestor => sender, :article => article_name}
   end
   def target_notification_message
@@ -46,7 +46,7 @@ class User &lt; ActiveRecord::Base
       p = Person.new
       p.attributes = user.person_data
-      p.identifier = user.login
+      p.identifier = user.login if p.identifier.blank?
       p.user = user
       p.environment = user.environment
       p.name ||= user.name || user.login
@@ -64,7 +64,11 @@
   <%= labelled_check_box(_('Remove cover image'),'remove_image',true,false)%>
 <% end %>
-<%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [ [ _('Full post'), 'full'], [ _('First paragraph'), 'short'] ])) %>
+<%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [
+  [ _('Full post'), 'full'],
+  [ _('First paragraph'), 'short'],
+  [ _('First paragraph, with post picture'), 'short+pic']
+])) %>
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Blog.posts_per_page_options)) %>
@@ -6,21 +6,22 @@
 <%= labelled_form_for 'task' do |f| %>
-  <%= required labelled_form_field(_('Title'), text_field(:task, 'article_name', :size => 50)) %>
+  <%= required labelled_form_field(_('Title'), text_field('task[article]', 'name', :size => 50)) %>
-  <%= labelled_form_field(_('Source'), text_field(:task, 'source_name')) %>
+  <%= labelled_form_field(_('Source'), text_field('task[article]', 'source_name')) %>
-  <%= labelled_form_field(_('Source URL'), text_field(:task, 'source')) %>
+  <%= labelled_form_field(_('Source URL'), text_field('task[article]', 'source')) %>
-  <%= required labelled_form_field(_('Your name'), text_field(:task, 'name')) %>
-
-  <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
+  <% unless logged_in? %>
+    <%= required labelled_form_field(_('Your name'), text_field(:task, 'name')) %>
+    <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
+  <% end %>
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => :task, :abstract_method => 'article_abstract', :body_method => 'article_body'} %>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => 'task[article]'} %>
   <%= hidden_field_tag('back_to', @back_to) %>
-  <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
+  <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) unless logged_in? %>
   <% button_bar do %>
     <%= submit_button :save, _('Save') %>
@@ -18,6 +18,9 @@
      format = inside_block.visualization_format
      paginate = false
    end
-   (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, format, paginate))
+   (blog.empty? ?
+     content_tag('em', _('(no posts)')) :
+     list_posts(posts, format: format, paginate: paginate)
+   )
   %>
 </div>
@@ -24,7 +24,7 @@
     $('#report-abuse-submit-button').css('cursor', 'progress');
     $.ajax({
       type: 'POST',
-      url: <%= url_for({:controller => 'profile', :action => 'register_report', :profile => profile.identifier}) %>,
+      url: <%= url_for({:controller => 'profile', :action => 'register_report', :profile => profile.identifier}).to_json %>,
       data: $(form).serialize(),
       dataType: 'json',
       success: function(data, status, ajax){
 <h1><%= _('Profile settings for %s') % profile.name %></h1>
-<%= javascript_include_tag 'deactivate_profile' %>
 <%= error_messages_for :profile_data %>
 <%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do |f| %>
-jQuery('#search-content').html('<%= escape_javascript(render :partial => "search_content") %>');
+jQuery('#search-content').replaceWith('<%= escape_javascript(render "search_content") %>');
+
@@ -7,13 +7,13 @@
     <ul class="suggest-article-details" style="display: none">
       <li><strong><%=_('Sent by')%></strong>: <%=task.name%> </li>
       <li><strong><%=_('Email')%></strong>: <%=task.email%> </li>
-      <li><strong><%=_('Source')%></strong>: <%=task.source_name%> </li>
-      <li><strong><%=_('Source URL')%></strong>: <%=task.source%> </li>
-      <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_parent_id))?a.name : '<em>' + s_('Folder|none') + '</em>'%> </li>
-      <li><strong><%=_('Lead')%></strong>: <%=task.article_abstract.blank? ? '<em>' + s_('Abstract|empty') + '</em>' : task.article_abstract%> </li>
+      <li><strong><%=_('Source')%></strong>: <%=task.article_object.source_name%> </li>
+      <li><strong><%=_('Source URL')%></strong>: <%=task.article_object.source%> </li>
+      <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_object.parent_id))?a.name : '<em>' + s_('Folder|none') + '</em>'%> </li>
+      <li><strong><%=_('Lead')%></strong>: <%=task.article_object.abstract.blank? ? '<em>' + s_('Abstract|empty') + '</em>' : task.article_object.abstract%> </li>
       <li><strong><%=_('Body')%></strong>:
       <div class='suggest-article-body'>
-        <%= task.article_body %>
+        <%= task.article_object.body %>
       </div>
       </li>
     </ul>
 <%= render :file => 'shared/tiny_mce' %>
-<%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
-<p><%= label_tag(_("Email: %s") % task.email) %> </p>
-<%= required labelled_form_field(_('Title'), f.text_field(:article_name, :size => 50)) %>
-<%= labelled_form_field(_('Source'), f.text_field(:source_name)) %>
-<%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
+<% unless task.requestor %>
+  <%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
+  <p><%= label_tag(_("Email: %s") % task.email) %> </p>
+<% end %>
-<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target) %>
-<%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
+<%= f.fields_for 'article', OpenStruct.new(task.article) do |a| %>
+  <%= required labelled_form_field(_('Title'), a.text_field(:name, :size => 50)) %>
+  <%= labelled_form_field(_('Source'), a.text_field(:source_name)) %>
+  <%= labelled_form_field(_("Source URL"), a.text_field(:source)) %>
-<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => f, :abstract_method => 'article_abstract', :body_method => 'article_body', :lead_id => task.id} %>
+  <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article][parent_id]", task.target) %>
+  <%= labelled_form_field(_('Highlight this article'), a.check_box(:highlighted)) %>
+
+  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => a, :lead_id => task.id} %>
+<% end %>
@@ -1,2 +0,0 @@
-# Load newrelic agent if its config file is defined.
-require 'newrelic_rpm' if File.exist?(File.dirname(__FILE__) + '/../newrelic.yml')
@@ -18,9 +18,8 @@ class FixYamlEncoding &lt; ActiveRecord::Migration
   private
   def self.fix_encoding(model, param)
-    result = model.all
-    puts "Fixing #{result.count} rows of #{model} (#{param})"
-    result.each do |r|
+    puts "Fixing #{model.count} rows of #{model} (#{param})"
+    model.find_each do |r|
       begin
         yaml = r.send(param)
         # if deserialization failed then a string is returned
+noosfero (1.1~rc4) wheezy; urgency=medium
+
+  * Fourth release candidate for Noosfero 1.1
+
+ -- Antonio Terceiro <terceiro@debian.org>  Wed, 01 Apr 2015 12:22:36 -0300
+
 noosfero (1.1~rc2) wheezy; urgency=low
   * Second release candidate for Noosfero 1.1
@@ -25,6 +25,7 @@ etc/init.d/noosfero               etc/init.d
 etc/logrotate.d/noosfero          etc/logrotate.d
 etc/noosfero/varnish-accept-language.vcl  etc/noosfero
 etc/noosfero/varnish-noosfero.vcl         etc/noosfero
+etc/awstats-noosfero.conf         etc/noosfero
 lib                               usr/share/noosfero
 locale                            usr/share/noosfero
 plugins                           usr/share/noosfero
@@ -250,6 +250,7 @@ Feature: edit article
   Scenario: add a translation to an article
     Given I am on joaosilva's sitemap
     And I follow "Save the whales"
+    And the following languages "en es" are available on environment
     Then I should not see "Add translation"
     And I follow "Edit"
     And I select "English" from "Language"
@@ -267,6 +268,7 @@ Feature: edit article
       | owner     | name               | language |
       | joaosilva | Article in English | en       |
     And I am on joaosilva's sitemap
+    And the following languages "en pt" are available on environment
     When I follow "Article in English"
     And I follow "Add translation"
     And I fill in "Title" with "Article in Portuguese"
@@ -207,18 +207,3 @@ Feature: login
       | Password | 123456 |
     When I press "Log in"
     Then I should be on joaosilva's control panel
-
-  Scenario: join community on login
-    Given the following users
-      | login | name |
-      | mariasilva | Maria Silva |
-    And the following communities
-       | name           | identifier    | owner     |
-       | Free Software  | freesoftware  | mariasilva |
-    And I am on /freesoftware
-    When I follow "Join"
-    And I fill in the following:
-      | Username / Email | joaosilva |
-      | Password | 123456 |
-    And I press "Log in"
-    Then "Joao Silva" should be a member of "Free Software"
@@ -22,6 +22,10 @@ Given /^Noosfero is configured to use (.+) as default$/ do |lang|
   Noosfero.default_locale = language_to_code(lang)
 end
+Given /^the following languages "([^"]*)" are available on environment$/ do |languages|
+  Environment.default.update_attribute(:languages, languages.split)
+end
+
 After do
   # reset everything back to normal
   Noosfero.default_locale = nil
@@ -8,6 +8,10 @@ class Noosfero::Plugin
     self.context = context
   end
+  def environment
+    context.environment if self.context
+  end
+
   class << self
     attr_writer :should_load
@@ -35,6 +39,7 @@ class Noosfero::Plugin
       # filters must be loaded after all extensions
       klasses.each do |plugin|
         load_plugin_filters plugin
+        load_plugin_hotspots plugin
       end
     end
@@ -108,6 +113,23 @@ class Noosfero::Plugin
       end
     end
+    # This is a generic method to extend the hotspots list with plugins
+    # hotspots. This allows plugins to extend other plugins.
+    # To use this, the plugin must define its hotspots inside a module Hotspots.
+    # Its also needed to include Noosfero::Plugin::HotSpot module
+    # in order to dispatch plugins methods.
+    #
+    # Checkout FooPlugin for usage example.
+    def load_plugin_hotspots(plugin)
+      ActionDispatch::Reloader.to_prepare do
+        begin
+          module_name = "#{plugin.name}::Hotspots"
+          Noosfero::Plugin.send(:include, module_name.constantize)
+        rescue NameError
+        end
+      end
+    end
+
     def add_controller_filters(controller_class, plugin, filters)
       unless filters.is_a?(Array)
         filters = [filters]
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.1~rc2'
+  VERSION = '1.1~rc4'
 end
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
@@ -4,7 +4,6 @@ $broken_plugins = %w[
   comment_classification
   ldap
   solr
-  stoa
 ]
 @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template']
@@ -58,7 +58,7 @@ class ContextContentPlugin::ContextContentBlock &lt; Block
   def contents(page, p=1)
     return @children unless @children.blank?
     if page
-      @children = page.children.with_types(types).paginate(:per_page => limit, :page => p)
+      @children = page.children.with_types(types).order(:name).paginate(:per_page => limit, :page => p)
       (@children.blank? && show_parent_content) ? contents(page.parent, p) : @children
     else
       nil
@@ -51,18 +51,18 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
   should 'show contents for next page' do
     @block.limit = 2
     folder = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article2 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article3 = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
+    article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
+    article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
     assert_equal [article3], @block.contents(folder, 2)
   end
   should 'show parent contents for next page' do
     @block.limit = 2
     folder = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article2 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article3 = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
+    article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
+    article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
     assert_equal [article3], @block.contents(article1, 2)
   end
 class FooPlugin < Noosfero::Plugin
+  include Noosfero::Plugin::HotSpot
   def self.plugin_name
     "Foo"
@@ -8,12 +9,29 @@ class FooPlugin &lt; Noosfero::Plugin
     _("A sample plugin to test autoload craziness.")
   end
+  module Hotspots
+    # -> Custom foo plugin hotspot
+    # do something to extend the FooPlugin behaviour
+    # receive params a, b and c
+    # returns = boolean or something else
+    def foo_plugin_my_hotspot(a, b, c)
+    end
+
+    # -> Custom title for foo profiles tab
+    # returns = a string with a custom title
+    def foo_plugin_tab_title
+    end
+  end
+
   def control_panel_buttons
     {:title => 'Foo plugin button', :icon => '', :url => ''}
   end
   def profile_tabs
-    {:title => 'Foo plugin tab', :id => 'foo_plugin', :content => lambda {'Foo plugin random content'} }
+    title = plugins.dispatch_first(:foo_plugin_tab_title)
+    title = 'Foo plugin tab' unless title
+
+    {:title => title, :id => 'foo_plugin', :content => lambda {'Foo plugin random content'} }
   end
 end
@@ -4,7 +4,25 @@ class FooPluginTest &lt; ActiveSupport::TestCase
   def test_foo
     FooPlugin::Bar.create!
   end
+
   def test_monkey_patch
     Profile.new.bar
   end
+
+  should "respond to new hotspots" do
+    plugin = FooPlugin.new
+
+    assert plugin.respond_to?(:foo_plugin_my_hotspot)
+    assert plugin.respond_to?(:foo_plugin_tab_title)
+  end
+
+  should "other plugin respond to new hotspots" do
+    class TestPlugin < Noosfero::Plugin
+    end
+
+    plugin = TestPlugin.new
+
+    assert plugin.respond_to?(:foo_plugin_my_hotspot)
+    assert plugin.respond_to?(:foo_plugin_tab_title)
+  end
 end
@@ -77,18 +77,20 @@ class LdapAuthentication
   end
   def get_user_attributes_from_ldap_entry(entry)
-    {
-     :dn => entry.dn,
-     :fullname => LdapAuthentication.get_attr(entry, self.attr_fullname),
-     :mail => LdapAuthentication.get_attr(entry, self.attr_mail),
-    }
+    attributes = entry.instance_values["myhash"]
+
+    attributes[:dn] = entry.dn
+    attributes[:fullname] = LdapAuthentication.get_attr(entry, self.attr_fullname)
+    attributes[:mail] = LdapAuthentication.get_attr(entry, self.attr_mail)
+
+    attributes
   end
   # Return the attributes needed for the LDAP search.  It will only
   # include the user attributes if on-the-fly registration is enabled
   def search_attributes
     if onthefly_register?
-      ['dn', self.attr_fullname, self.attr_mail]
+      nil
     else
       ['dn']
     end
@@ -111,6 +113,7 @@ class LdapAuthentication
     end
     login_filter = Net::LDAP::Filter.eq( self.attr_login, login )
     object_filter = Net::LDAP::Filter.eq( "objectClass", "*" )
+
     attrs = {}
     search_filter = object_filter & login_filter
 require File.dirname(__FILE__) + '/ldap_authentication.rb'
 class LdapPlugin < Noosfero::Plugin
+  include Noosfero::Plugin::HotSpot
   def self.plugin_name
     "LdapPlugin"
@@ -10,6 +11,25 @@ class LdapPlugin &lt; Noosfero::Plugin
     _("A plugin that add ldap support.")
   end
+  module Hotspots
+    # -> Custom ldap plugin hotspot to set profile data before user creation
+    # receive the followings params:
+    # - attrs with ldap received data
+    # - login received by ldap
+    # - params from current context
+    # returns = updated person_data hash
+    def ldap_plugin_set_profile_data(attrs, login, params)
+    end
+
+    # -> Custom ldap plugin hotspot to update user object
+    # receive the followings params:
+    # - user: user object
+    # - attrs with ldap received data
+    # returns = none
+    def ldap_plugin_update_user(user, attrs)
+    end
+  end
+
   def allow_user_registration
     false
   end
@@ -39,13 +59,15 @@ class LdapPlugin &lt; Noosfero::Plugin
         user.name =  attrs[:fullname]
         user.password = password
         user.password_confirmation = password
-        user.person_data = context.params[:profile_data]
+        person_data = plugins.dispatch(:ldap_plugin_set_profile_data, attrs, login, context.params)
+        user.person_data = person_data.blank? ? context.params[:profile_data] : person_data
         user.activated_at = Time.now.utc
         user.activation_code = nil
         ldap = LdapAuthentication.new(context.environment.ldap_plugin_attributes)
         begin
-          user = nil unless user.save
+          user = nil unless user.save!
+          plugins.dispatch(:ldap_plugin_update_user, user, attrs)
         rescue
           #User not saved
         end
@@ -54,7 +76,6 @@ class LdapPlugin &lt; Noosfero::Plugin
       end
     else
-
       return nil if !user.activated?
       begin
 require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper")
 class ProfileDescriptionBlockTest < ActiveSupport::TestCase
-	def setup
-		e = Environment.default
+  def setup
+    e = Environment.default
     e.enabled_plugins = ['ProfileDescriptionPlugin']
     @person = create_user('test_user').person
     @profile = Profile.create!(:identifier => '1236',
                                :name => 'blabla',
                                :description => "")
-	end
+  end
   should 'describe itself' do
     assert_not_equal Block.description, ProfileDescriptionBlock.description
@@ -17,7 +17,7 @@ class ProfileDescriptionBlockTest &lt; ActiveSupport::TestCase
   should "show profile description inside block" do
     new_block = ProfileDescriptionBlock.create!
     @profile.boxes.first.blocks << new_block
-    block_menssage = "Description field are empty"
+    block_menssage = "Description field is empty"
     assert (instance_eval(&Block.last.content).include?(block_menssage)),
       "description block doesn't show not found description message"
     description = "This is an test"
@@ -60,13 +60,14 @@ class StoaPlugin &lt; Noosfero::Plugin
   end
   def account_controller_filters
-    block = lambda do |context|
+    block = proc do
       params[:profile_data] ||= {}
       params[:profile_data][:invitation_code] = params[:invitation_code]
       invitation = Task.pending.find(:first, :conditions => {:code => params[:invitation_code]})
       if request.post?
         if !invitation && !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])
-          @person = Person.new(:environment => context.environment)
+          # `self` below is evaluated in the context of account_controller
+          @person = Person.new(:environment => self.environment)
           @person.errors.add(:usp_id, _(' validation failed'))
           render :action => :signup
         end
@@ -16,7 +16,7 @@ class StoaPlugin::PersonApi &lt; Noosfero::FieldsDecorator
   end
   def homepage
-    context.url_for(url)
+    profile_homepage(context, object)
   end
   def birth_date
@@ -35,6 +35,16 @@ class StoaPlugin::PersonApi &lt; Noosfero::FieldsDecorator
   end
   def communities
-    object.communities.public.map {|community| {:url => context.url_for(community.url), :name => community.name}}
+    object.communities.public.map {|community| {:url => profile_homepage(context, community), :name => community.name}}
+  end
+
+  private
+
+  def profile_homepage(context, profile)
+    if context.respond_to?(:url_for)
+      context.url_for(profile.url)
+    else
+      profile.environment.top_url + '/' + profile.identifier
+    end
   end
 end
@@ -57,7 +57,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     organization.add_admin(admin)
     login_as(admin.identifier)
-    get :search_friend, :profile => organization.identifier, :q => '1234'
+    get :search, :profile => organization.identifier, :q => '1234'
     assert_equal [{"id" => person.id, "name" => person.name}].to_json, @response.body
     assert_response 200
@@ -29,6 +29,7 @@ Feature: sub_organizations_display
       And I follow "Manage sub-groups"
       And I follow "Register a new sub-enterprise"
       And I fill in "Name" with "Bart"
+      And I fill in "Address" with "bart"
       And I press "Next"
       Then I should see "Enterprise registration completed"
       And I am logged in as admin
@@ -2,4 +2,5 @@ require_dependency &#39;create_enterprise&#39;
 class CreateEnterprise
   settings_items :sub_organizations_plugin_parent_to_be
+  DATA_FIELDS << 'sub_organizations_plugin_parent_to_be'
 end
@@ -13,8 +13,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
-"PO-Revision-Date: 2015-03-17 21:44+0200\n"
-"Last-Translator: Evandro Junior <evandrojr@gmail.com>\n"
+"PO-Revision-Date: 2015-03-29 01:47+0200\n"
+"Last-Translator: daniel <dtygel@eita.org.br>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/pt/>\n"
 "Language: pt\n"
@@ -7281,7 +7281,7 @@ msgstr &quot;Seu nome&quot;
 #: app/views/cms/_upload_file_form.html.erb:4
 #: app/views/cms/_text_editor_sidebar.html.erb:16
 msgid "Choose folder to upload files:"
-msgstr "Escolha uma pasta para incluir arquivos:"
+msgstr "O arquivo ficará na seguinte pasta:"
 #: app/views/cms/_upload_file_form.html.erb:16
 msgid "More files"
@@ -7535,7 +7535,7 @@ msgstr &quot;Houve problemas com os seguintes arquivos:&quot;
 #: app/views/cms/upload_files.html.erb:15
 msgid "Publish media"
-msgstr "Publicar mídia"
+msgstr "Publicar imagem ou documento"
 #: app/views/cms/upload_files.html.erb:17
 msgid "Select the files you want to upload (max size %s):"
@@ -7551,7 +7551,7 @@ msgstr &quot;Enviando arquivos para %s&quot;
 #: app/views/cms/_text_editor_sidebar.html.erb:8
 msgid "Insert media"
-msgstr "Adicionar mídia"
+msgstr "Adicionar imagem ou documento"
 #: app/views/cms/_text_editor_sidebar.html.erb:8
 msgid "Show/Hide"
@@ -7559,7 +7559,7 @@ msgstr &quot;Mostrar/Ocultar&quot;
 #: app/views/cms/_text_editor_sidebar.html.erb:21
 msgid "New folder"
-msgstr "Nova pasta"
+msgstr "Criar pasta"
 #: app/views/cms/_text_editor_sidebar.html.erb:26
 msgid "Hide all uploads"
 jQuery(function($) {
   $('.report-abuse-action').live('click', function() {
-    if($(this).attr('href')){
-      noosfero.modal.inline($(this).attr('href'), {
-        innerHeight: '300px',
-        innerWidth: '445px'
-      });
-    }
+    if($(this).attr('href'))
+      noosfero.modal.url($(this).attr('href'));
+
     return false;
   });
@@ -1501,6 +1501,14 @@ a.comment-picture {
 #content .title {
   margin-bottom: 2px;
 }
+.blog-post .post-pic {
+  background-position: 50% 40%;
+  background-size: cover;
+  height: 150px;
+}
+.blog-post .post-pic.empty {
+  display: none;
+}
 .metadata, .blog-post .metadata {
   display: block;
   text-align: center;
@@ -85,7 +85,7 @@ environments_loop() {
 }
 do_running() {
-  pids=$(cat tmp/pids/thin.*.pid 2>/dev/null || true)
+  pids=$(sed "s/.*/& /" tmp/pids/thin.*.pid | tr -d '\n' 2>/dev/null || true)
   # passes if any of $pids exist, fails otherwise
   kill -0 $pids > /dev/null 2>&1
 }
@@ -454,7 +454,7 @@ module Noosfero::Factory
   end
   def defaults_for_suggest_article
-    { :name => 'Sender', :email => 'sender@example.com', :article_name => 'Some title', :article_body => 'some body text', :article_abstract => 'some abstract text'}
+    { :name => 'Sender', :email => 'sender@example.com', :article => {:name => 'Some title', :body => 'some body text', :abstract => 'some abstract text'}}
   end
   def defaults_for_comment(params = {})
@@ -699,7 +699,7 @@ class CmsControllerTest &lt; ActionController::TestCase
     xhr :get, :update_categories, :profile => profile.identifier, :category_id => top.id
     assert_template 'shared/update_categories'
     assert_equal top, assigns(:current_category)
-    assert_equal [c1, c2], assigns(:categories)
+    assert_equivalent [c1, c2], assigns(:categories)
   end
   should 'record when coming from public view on edit' do
@@ -1407,22 +1407,57 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_template 'suggest_an_article'
   end
+  should 'display name and email when a not logged in user suggest an article' do
+    logout
+    get :suggest_an_article, :profile => profile.identifier, :back_to => 'action_view'
+
+    assert_select '#task_name'
+    assert_select '#task_email'
+  end
+
+  should 'do not display name and email when a logged in user suggest an article' do
+    get :suggest_an_article, :profile => profile.identifier, :back_to => 'action_view'
+
+    assert_select '#task_name', 0
+    assert_select '#task_email', 0
+  end
+
+  should 'display captcha when suggest an article for not logged in users' do
+    logout
+    get :suggest_an_article, :profile => profile.identifier, :back_to => 'action_view'
+
+    assert_select '#dynamic_recaptcha'
+  end
+
+  should 'not display captcha when suggest an article for logged in users' do
+    get :suggest_an_article, :profile => profile.identifier, :back_to => 'action_view'
+
+    assert_select '#dynamic_recaptcha', 0
+  end
+
   should 'render TinyMce Editor on suggestion of article' do
     logout
     get :suggest_an_article, :profile => profile.identifier
-    assert_tag :tag => 'textarea', :attributes => { :name => /article_abstract/, :class => 'mceEditor' }
-    assert_tag :tag => 'textarea', :attributes => { :name => /article_body/, :class => 'mceEditor' }
+    assert_tag :tag => 'textarea', :attributes => { :name => /task\[article\]\[abstract\]/, :class => 'mceEditor' }
+    assert_tag :tag => 'textarea', :attributes => { :name => /task\[article\]\[body\]/, :class => 'mceEditor' }
   end
   should 'create a task suggest task to a profile' do
     c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => true)
     assert_difference 'SuggestArticle.count' do
-      post :suggest_an_article, :profile => c.identifier, :back_to => 'action_view', :task => {:article_name => 'some name', :article_body => 'some body', :email => 'some@localhost.com', :name => 'some name'}
+      post :suggest_an_article, :profile => c.identifier, :back_to => 'action_view', :task => {:article => {:name => 'some name', :body => 'some body'}, :email => 'some@localhost.com', :name => 'some name'}
     end
   end
+  should 'create suggest task with logged in user as the article author' do
+    c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => true)
+
+    post :suggest_an_article, :profile => c.identifier, :back_to => 'action_view', :task => {:article => {:name => 'some name', :body => 'some body'}}
+    assert_equal profile, SuggestArticle.last.requestor
+  end
+
   should 'suggest an article from a profile' do
     c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => true)
     get :suggest_an_article, :profile => c.identifier, :back_to => c.identifier
@@ -780,6 +780,20 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'div', :attributes => { :class => 'short-post'}, :content => /Anything/
   end
+  should 'show only first paragraph with picture of posts if visualization_format is short+pic' do
+    login_as(profile.identifier)
+
+    blog = Blog.create!(:name => 'A blog test', :profile => profile, :visualization_format => 'short+pic')
+
+    blog.posts << TinyMceArticle.create!(:name => 'first post', :parent => blog, :profile => profile, :body => '<p>Content to be displayed.</p> <img src="pic.jpg">')
+
+    get :view_page, :profile => profile.identifier, :page => blog.path
+
+    assert_select '.blog-post .post-pic' do |el|
+      assert_match /background-image:url\(pic.jpg\)/, el.to_s
+    end
+  end
+
   should 'display link to edit blog for allowed' do
     blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
     login_as(profile.identifier)
@@ -10,7 +10,7 @@ class SpamControllerTest &lt; ActionController::TestCase
     @article = fast_create(TextileArticle, :profile_id => @community.id)
     @spam_comment = fast_create(Comment, :source_id => @article.id, :spam => true, :name => 'foo', :email => 'foo@example.com')
-    @spam_suggest_article = SuggestArticle.create!(:name => 'spammer', :article_name => 'Spam article', :email => 'spammer@shady.place', :article_body => "Something you don't need", :target => @community, :spam => true)
+    @spam_suggest_article = SuggestArticle.create!(:name => 'spammer', :article => {:name => 'Spam article', :body => "Something you don't need"}, :email => 'spammer@shady.place', :target => @community, :spam => true)
     login_as @profile.identifier
   end
@@ -264,11 +264,11 @@ class TasksControllerTest &lt; ActionController::TestCase
     c = fast_create(Community)
     c.add_admin profile
     @controller.stubs(:profile).returns(c)
-    t = SuggestArticle.create!(:article_name => 'test name', :article_abstract => 'test abstract', :article_body => 'test body', :name => 'some name', :email => 'test@localhost.com', :target => c)
+    t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body'}, :name => 'some name', :email => 'test@localhost.com', :target => c)
     get :index
-    assert_tag :tag => 'textarea', :content => /test abstract/, :attributes => { :name => /article_abstract/, :class => 'mceEditor' }
-    assert_tag :tag => 'textarea', :content => /test body/, :attributes => { :name => /article_body/, :class => 'mceEditor' }
+    assert_tag :tag => 'textarea', :content => /test abstract/, :attributes => { :name => /tasks\[#{t.id}\]\[task\]\[article\]\[abstract\]/, :class => 'mceEditor' }
+    assert_tag :tag => 'textarea', :content => /test body/, :attributes => { :name => /tasks\[#{t.id}\]\[task\]\[article\]\[body\]/, :class => 'mceEditor' }
   end
   should 'create TinyMceArticle article after finish approve suggested article task' do
@@ -276,7 +276,7 @@ class TasksControllerTest &lt; ActionController::TestCase
     c = fast_create(Community)
     c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
     @controller.stubs(:profile).returns(c)
-    t = SuggestArticle.create!(:article_name => 'test name', :article_body => 'test body', :name => 'some name', :email => 'test@localhost.com', :target => c)
+    t = SuggestArticle.create!(:article => {:name => 'test name', :body => 'test body'}, :name => 'some name', :email => 'test@localhost.com', :target => c)
     post :close, :tasks => {t.id => { :task => {}, :decision => "finish"}}
     assert_not_nil TinyMceArticle.find(:first)
@@ -288,16 +288,13 @@ class TasksControllerTest &lt; ActionController::TestCase
     c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
     @controller.stubs(:profile).returns(c)
     t = SuggestArticle.new
-    t.article_name = 'test name' 
-    t.article_body = 'test body'
+    t.article = {:name => 'test name', :body => 'test body', :source => 'http://test.com', :source_name => 'some source name'}
     t.name = 'some name'
-    t.source = 'http://test.com'
-    t.source_name = 'some source name'
     t.email = 'test@localhost.com'
     t.target = c
     t.save!
-    post :close, :tasks => {t.id => { :task => {:article_name => 'new article name', :article_body => 'new body', :source => 'http://www.noosfero.com', :source_name => 'new source', :name => 'new name'}, :decision => "finish"}}
+    post :close, :tasks => {t.id => { :task => {:article => {:name => 'new article name', :body => 'new body', :source => 'http://www.noosfero.com', :source_name => 'new source'}, :name => 'new name'}, :decision => "finish"}}
     assert_equal 'new article name', TinyMceArticle.find(:first).name
     assert_equal 'new name', TinyMceArticle.find(:first).author_name
     assert_equal 'new body', TinyMceArticle.find(:first).body
@@ -305,6 +302,28 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_equal 'new source', TinyMceArticle.find(:first).source_name
   end
+  should "display name from article suggestion when requestor was not setted" do
+    Task.destroy_all
+    c = fast_create(Community)
+    c.add_admin profile
+    @controller.stubs(:profile).returns(c)
+    t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body'}, :name => 'some name', :email => 'test@localhost.com', :target => c)
+
+    get :index
+    assert_select "#tasks_#{t.id}_task_name"
+  end
+
+  should "not display name from article suggestion when requestor was setted" do
+    Task.destroy_all
+    c = fast_create(Community)
+    c.add_admin profile
+    @controller.stubs(:profile).returns(c)
+    t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body'}, :requestor => fast_create(Person), :target => c)
+
+    get :index
+    assert_select "#tasks_#{t.id}_task_name", 0
+  end
+
   should "not crash if accessing close without tasks parameter" do
     assert_nothing_raised do
       post :close
@@ -1715,6 +1715,18 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal 'bar.png', a.first_image
   end
+  should 'get first image from having_image' do
+    a = fast_create(Article,
+      :body => '<p>Foo</p><p><img src="bar.png" /></p>',
+      :abstract => '<p>Lead</p><p><img src="lead.png" /></p>'
+    )
+    img = {}
+    img.expects(:present?).returns true
+    img.expects(:public_filename).returns 'pic.jpg'
+    a.expects(:image).at_least_once.returns img
+    assert_equal 'pic.jpg', a.first_image
+  end
+
   should 'not get first image from anywhere' do
     a = fast_create(Article, :body => '<p>Foo</p><p>Bar</p>')
     assert_equal '', a.first_image
@@ -20,30 +20,36 @@ class BlogHelperTest &lt; ActionView::TestCase
   def _(s); s; end
   def h(s); s; end
-  should 'list published posts with class blog-post' do
-    blog.children << published_post = create(TextileArticle, :name => 'Post', :profile => profile, :parent => blog, :published => true)
-
-    expects(:display_post).with(anything, anything).returns('POST')
-    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last odd-post-inner', :id => "post-#{published_post.id}").returns('POST')
-    expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
-
-    assert_equal 'RESULT', list_posts(blog.posts)
-  end
-
-  should 'list even/odd posts with a different class' do
-    blog.children << older_post = create(TextileArticle, :name => 'First post', :profile => profile, :parent => blog, :published => true)
-
-    blog.children << newer_post = create(TextileArticle, :name => 'Second post', :profile => profile, :parent => blog, :published => true)
-
-    expects(:display_post).with(anything, anything).returns('POST').times(2)
-
-    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first odd-post-inner', :id => "post-#{newer_post.id}").returns('POST 1')
-    expects(:content_tag).with('div', "POST 1", :class => 'odd-post').returns('ODD-POST')
-
-    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-2 last even-post-inner', :id => "post-#{older_post.id}").returns('POST 2')
-    expects(:content_tag).with('div', "POST 2", :class => 'even-post').returns('EVEN-POST')
-
-    assert_equal "ODD-POST\n<hr class='sep-posts'/>\nEVEN-POST", list_posts(blog.posts)
+  should 'list blog posts with identifiers and classes' do
+    blog.children << older_post = create(TextileArticle, :name => 'First post',
+                     :profile => profile, :parent => blog, :published => true)
+    blog.children << some_post = create(TextileArticle, :name => 'Some post',
+                     :profile => profile, :parent => blog, :published => true)
+    blog.children << hidden_post = create(TextileArticle, :name => 'Hidden post',
+                     :profile => profile, :parent => blog, :published => false)
+    blog.children << newer_post = create(TextileArticle, :name => 'Last post',
+                     :profile => profile, :parent => blog, :published => true)
+
+    def content_tag(tag, content_or_options_with_block = nil, options = nil, &block)
+      if block_given?
+        options = content_or_options_with_block
+        content = block.call
+      else
+        content = content_or_options_with_block
+      end
+      options ||= {}
+      "<#{tag}#{options.map{|k,v| " #{k}=\"#{[v].flatten.join(' ')}\""}.join}>#{content}</#{tag}>"
+    end
+
+    html = HTML::Document.new(list_posts(blog.posts)).root
+    assert_select html, "div#post-#{newer_post.id}.blog-post.position-1.first.odd-post" +
+                        " > div.odd-post-inner.blog-post-inner > .title", 'Last post'
+    assert_select html, "div#post-#{hidden_post.id}.blog-post.position-2.not-published.even-post" +
+                        " > div.even-post-inner.blog-post-inner > .title", 'Hidden post'
+    assert_select html, "div#post-#{some_post.id}.blog-post.position-3.odd-post" +
+                        " > div.odd-post-inner.blog-post-inner > .title", 'Some post'
+    assert_select html, "div#post-#{older_post.id}.blog-post.position-4.last.even-post" +
+                        " > div.even-post-inner.blog-post-inner > .title", 'First post'
   end
@@ -3,6 +3,7 @@ require &#39;boxes_helper&#39;
 class BoxesHelperTest < ActionView::TestCase
+  include ApplicationHelper
   include BoxesHelper
   include ActionView::Helpers::TagHelper
@@ -181,4 +182,20 @@ class BoxesHelperTest &lt; ActionView::TestCase
     display_box_content(box, '')
   end
+  should 'display embed button when a block is embedable' do
+    box = create(Box, position: 1, owner: fast_create(Profile))
+    block = Block.create!(:box => box)
+    block.stubs(:embedable?).returns(true)
+    stubs(:url_for).returns('')
+    assert_tag_in_string block_edit_buttons(block), :tag => 'a', :attributes => {:class => 'button icon-button icon-embed '}
+  end
+
+  should 'not display embed button when a block is not embedable' do
+    box = create(Box, position: 1, owner: fast_create(Profile))
+    block = Block.create!(:box => box)
+    block.stubs(:embedable?).returns(false)
+    stubs(:url_for).returns('')
+    assert_no_tag_in_string block_edit_buttons(block), :tag => 'a', :attributes => {:class => 'button icon-button icon-embed '}
+  end
+
 end
@@ -13,16 +13,9 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
   should 'have the article_name' do
     t = SuggestArticle.new
-    assert !t.errors[:article_name.to_s].present?
-    t.valid?
-    assert t.errors[:article_name.to_s].present?
-  end
-
-  should 'have the article_body' do
-    t = SuggestArticle.new
-    assert !t.errors[:article_body.to_s].present?
-    t.valid?
-    assert t.errors[:article_body.to_s].present?
+    assert !t.article_object.errors[:name].present?
+    t.article_object.valid?
+    assert t.article_object.errors[:name].present?
   end
   should 'have the email' do
@@ -46,19 +39,12 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     assert t.errors[:target_id.to_s].present?
   end
-  should 'have the article_abstract' do
+  should 'have the article' do
     t = SuggestArticle.new
-    assert t.respond_to?(:article_abstract)
-  end
-
-  should 'have the article_parent_id' do
-    t = SuggestArticle.new
-    assert t.respond_to?(:article_parent_id)
-  end
-
-  should 'source be defined' do
-    t = SuggestArticle.new
-    assert t.respond_to?(:source)
+    assert t.respond_to?(:article_object)
+    assert !t.errors[:article_object].present?
+    t.valid?
+    assert t.errors[:article_object].present?
   end
   should 'create an article on with perfom method' do
@@ -66,9 +52,7 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     name = 'some name'
     body = 'some body'
     abstract = 'some abstract'
-    t.article_name = name
-    t.article_body = body
-    t.article_abstract = abstract
+    t.article = {:name => name, :body => body, :abstract => abstract}
     t.target = @profile
     count = TinyMceArticle.count
     t.perform
@@ -77,8 +61,7 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
   should 'fill source name and URL into created article' do
     t = build(SuggestArticle, :target => @profile)
-    t.source_name = 'GNU project'
-    t.source = 'http://www.gnu.org/'
+    t.article.merge!({:source_name => 'GNU project', :source => 'http://www.gnu.org/'})
     t.perform
     article = TinyMceArticle.last
@@ -95,7 +78,7 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
   should 'highlight created article' do
     t = build(SuggestArticle, :target => @profile)
-    t.highlighted = true
+    t.article[:highlighted] = true
     t.perform
     article = TinyMceArticle.last(:conditions => { :name => t.article_name}) # just to be sure
@@ -132,19 +115,19 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
   end
   should 'have target notification message' do
-    task = build(SuggestArticle, :target => @profile, :article_name => 'suggested article', :name => 'johndoe')
+    task = build(SuggestArticle, :target => @profile, :article => {:name => 'suggested article'}, :name => 'johndoe')
     assert_match(/#{task.name}.*suggested the publication of the article: #{task.subject}.*[\n]*.*to approve or reject/, task.target_notification_message)
   end
   should 'have target notification description' do
-    task = build(SuggestArticle,:target => @profile, :article_name => 'suggested article', :name => 'johndoe')
+    task = build(SuggestArticle,:target => @profile, :article => {:name => 'suggested article'}, :name => 'johndoe')
     assert_match(/#{task.name}.*suggested the publication of the article: #{task.subject}/, task.target_notification_description)
   end
   should 'deliver target notification message' do
-    task = build(SuggestArticle, :target => @profile, :article_name => 'suggested article', :name => 'johndoe', :email => 'johndoe@example.com')
+    task = build(SuggestArticle, :target => @profile, :article => {:name => 'suggested article'}, :name => 'johndoe', :email => 'johndoe@example.com')
     email = TaskMailer.target_notification(task, task.target_notification_message).deliver
@@ -160,7 +143,7 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
   should 'delegate spam detection to plugins' do
     Environment.default.enable_plugin(EverythingIsSpam)
-    t1 = build(SuggestArticle, :target => @profile, :article_name => 'suggested article', :name => 'johndoe', :email => 'johndoe@example.com')
+    t1 = build(SuggestArticle, :target => @profile, :article => {:name => 'suggested article'}, :name => 'johndoe', :email => 'johndoe@example.com')
     EverythingIsSpam.any_instance.expects(:check_for_spam)
@@ -189,7 +172,7 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
   should 'notify plugins of suggest_articles being marked as spam' do
     Environment.default.enable_plugin(SpamNotification)
-    t = SuggestArticle.create!(:target => @profile, :article_name => 'suggested article', :name => 'johndoe', :article_body => 'wanna feel my body? my body baaaby', :email => 'johndoe@example.com')
+    t = SuggestArticle.create!(:target => @profile, :article => {:name => 'suggested article', :body => 'wanna feel my body? my body baaaby'}, :name => 'johndoe', :email => 'johndoe@example.com')
     t.spam!
     process_delayed_job_queue
@@ -200,7 +183,7 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
   should 'notify plugins of suggest_articles being marked as ham' do
     Environment.default.enable_plugin(SpamNotification)
-    t = SuggestArticle.create!(:target => @profile, :article_name => 'suggested article', :name => 'johndoe', :article_body => 'wanna feel my body? my body baaaby', :email => 'johndoe@example.com')
+    t = SuggestArticle.create!(:target => @profile, :article => {:name => 'suggested article', :body => 'wanna feel my body? my body baaaby'}, :name => 'johndoe', :email => 'johndoe@example.com')
     t.ham!
     process_delayed_job_queue
@@ -219,10 +202,23 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
   end
   should 'log spammer ip after marking comment as spam' do
-    t = SuggestArticle.create!(:target => @profile, :article_name => 'suggested article', :name => 'johndoe', :article_body => 'wanna feel my body? my body baaaby', :email => 'johndoe@example.com', :ip_address => '192.168.0.1')
+    t = SuggestArticle.create!(:target => @profile, :article => {:name => 'suggested article', :body => 'wanna feel my body? my body baaaby'}, :name => 'johndoe', :email => 'johndoe@example.com', :ip_address => '192.168.0.1')
     t.spam!
     log = File.open('log/test_spammers.log')
     assert_match "SuggestArticle-id: #{t.id} IP: 192.168.0.1", log.read
   end
+  should 'not require name and email when requestor is present' do
+    t = SuggestArticle.new(:requestor => fast_create(Person))
+    t.valid?
+    assert t.errors[:email].blank?
+    assert t.errors[:name].blank?
+  end
+
+  should 'return name as sender when requestor is setted' do
+    person = fast_create(Person)
+    t = SuggestArticle.new(:requestor => person)
+    assert_equal person.name, t.sender
+  end
+
 end
@@ -87,6 +87,14 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_equal person_count + 1, Person.count
   end
+  def test_should_create_person_with_identifier_different_from_login
+    user = User.create!(:login => 'new_user', :email => 'new_user@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:identifier => "new_test"})
+
+    assert Person.exists?(['user_id = ?', user.id])
+
+    assert user.login != user.person.identifier
+  end
+
   def test_login_validation
     u = User.new
     u.valid?
@@ -355,7 +363,7 @@ class UserTest &lt; ActiveSupport::TestCase
     Person.any_instance.stubs(:created_at).returns(DateTime.parse('16-08-2010'))
     expected_hash = {
       'login' => 'x_and_y', 'is_admin' => true, 'since_month' => 8,
-      'chat_enabled' => false, 'since_year' => 2010, 'email_domain' => nil, 
+      'chat_enabled' => false, 'since_year' => 2010, 'email_domain' => nil,
       'amount_of_friends' => 0, 'friends_list' => {}, 'enterprises' => [],
     }
	@@ -62,7 +62,7 @@ class SearchController < PublicController		@@ -62,7 +62,7 @@ class SearchController < PublicController
62	end	62	end
63		63
64	def articles	64	def articles
65	- @scope = @environment.articles.public.paginate(paginate_options)	65	+ @scope = @environment.articles.public
66	full_text_search	66	full_text_search
67	end	67	end
68		68
	@@ -76,7 +76,7 @@ class SearchController < PublicController		@@ -76,7 +76,7 @@ class SearchController < PublicController
76	end	76	end
77		77
78	def products	78	def products
79	- @scope = @environment.products.paginate(paginate_options)	79	+ @scope = @environment.products
80	full_text_search	80	full_text_search
81	end	81	end
82		82
	@@ -244,7 +244,7 @@ class SearchController < PublicController		@@ -244,7 +244,7 @@ class SearchController < PublicController
244	def visible_profiles(klass, *extra_relations)	244	def visible_profiles(klass, *extra_relations)
245	relations = [:image, :domains, :environment, :preferred_domain]	245	relations = [:image, :domains, :environment, :preferred_domain]
246	relations += extra_relations	246	relations += extra_relations
247	- @environment.send(klass.name.underscore.pluralize).visible.includes(relations).paginate(paginate_options)	247	+ @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
248	end	248	end
249		249
250	def per_page	250	def per_page
	@@ -17,6 +17,7 @@ module TinymceHelper		@@ -17,6 +17,7 @@ module TinymceHelper
17	searchreplace wordcount visualblocks visualchars code fullscreen	17	searchreplace wordcount visualblocks visualchars code fullscreen
18	insertdatetime media nonbreaking save table contextmenu directionality	18	insertdatetime media nonbreaking save table contextmenu directionality
19	emoticons template paste textcolor colorpicker textpattern],	19	emoticons template paste textcolor colorpicker textpattern],
		20	+ :image_advtab => true,
20	:language => tinymce_language	21	:language => tinymce_language
21		22
22	options[:toolbar1] = "insertfile undo redo \| copy paste \| bold italic underline \| styleselect fontsizeselect \| forecolor backcolor \| alignleft aligncenter alignright alignjustify \| bullist numlist outdent indent \| link image"	23	options[:toolbar1] = "insertfile undo redo \| copy paste \| bold italic underline \| styleselect fontsizeselect \| forecolor backcolor \| alignleft aligncenter alignright alignjustify \| bullist numlist outdent indent \| link image"
	@@ -76,7 +76,7 @@ class Blog < Folder		@@ -76,7 +76,7 @@ class Blog < Folder
76	end	76	end
77		77
78	settings_items :visualization_format, :type => :string, :default => 'full'	78	settings_items :visualization_format, :type => :string, :default => 'full'
79	- validates_inclusion_of :visualization_format, :in => [ 'full', 'short' ], :if => :visualization_format	79	+ validates_inclusion_of :visualization_format, :in => [ 'full', 'short', 'short+pic' ], :if => :visualization_format
80		80
81	settings_items :display_posts_in_current_language, :type => :boolean, :default => false	81	settings_items :display_posts_in_current_language, :type => :boolean, :default => false
82		82
	@@ -46,7 +46,7 @@ class User < ActiveRecord::Base		@@ -46,7 +46,7 @@ class User < ActiveRecord::Base
46	p = Person.new	46	p = Person.new
47		47
48	p.attributes = user.person_data	48	p.attributes = user.person_data
49	- p.identifier = user.login	49	+ p.identifier = user.login if p.identifier.blank?
50	p.user = user	50	p.user = user
51	p.environment = user.environment	51	p.environment = user.environment
52	p.name \|\|= user.name \|\| user.login	52	p.name \|\|= user.name \|\| user.login
	@@ -24,7 +24,7 @@		@@ -24,7 +24,7 @@
24	$('#report-abuse-submit-button').css('cursor', 'progress');	24	$('#report-abuse-submit-button').css('cursor', 'progress');
25	$.ajax({	25	$.ajax({
26	type: 'POST',	26	type: 'POST',
27	- url: <%= url_for({:controller => 'profile', :action => 'register_report', :profile => profile.identifier}) %>,	27	+ url: <%= url_for({:controller => 'profile', :action => 'register_report', :profile => profile.identifier}).to_json %>,
28	data: $(form).serialize(),	28	data: $(form).serialize(),
29	dataType: 'json',	29	dataType: 'json',
30	success: function(data, status, ajax){	30	success: function(data, status, ajax){
1	<h1><%= _('Profile settings for %s') % profile.name %></h1>	1	<h1><%= _('Profile settings for %s') % profile.name %></h1>
2		2
3	-<%= javascript_include_tag 'deactivate_profile' %>
4	<%= error_messages_for :profile_data %>	3	<%= error_messages_for :profile_data %>
5		4
6	<%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do \|f\| %>	5	<%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do \|f\| %>
1	-jQuery('#search-content').html('<%= escape_javascript(render :partial => "search_content") %>');	1	+jQuery('#search-content').replaceWith('<%= escape_javascript(render "search_content") %>');
		2	+
1	<%= render :file => 'shared/tiny_mce' %>	1	<%= render :file => 'shared/tiny_mce' %>
2		2
3	-<%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
4	-<p><%= label_tag(_("Email: %s") % task.email) %> </p>
5	-<%= required labelled_form_field(_('Title'), f.text_field(:article_name, :size => 50)) %>
6	-<%= labelled_form_field(_('Source'), f.text_field(:source_name)) %>
7	-<%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>	3	+<% unless task.requestor %>
		4	+ <%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
		5	+ <p><%= label_tag(_("Email: %s") % task.email) %> </p>
		6	+<% end %>
8		7
9	-<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target) %>
10	-<%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>	8	+<%= f.fields_for 'article', OpenStruct.new(task.article) do \|a\| %>
		9	+ <%= required labelled_form_field(_('Title'), a.text_field(:name, :size => 50)) %>
		10	+ <%= labelled_form_field(_('Source'), a.text_field(:source_name)) %>
		11	+ <%= labelled_form_field(_("Source URL"), a.text_field(:source)) %>
11		12
12	-<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => f, :abstract_method => 'article_abstract', :body_method => 'article_body', :lead_id => task.id} %>	13	+ <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article][parent_id]", task.target) %>
		14	+ <%= labelled_form_field(_('Highlight this article'), a.check_box(:highlighted)) %>
		15	+
		16	+ <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => a, :lead_id => task.id} %>
		17	+<% end %>
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-# Load newrelic agent if its config file is defined.
2	-require 'newrelic_rpm' if File.exist?(File.dirname(__FILE__) + '/../newrelic.yml')
		1	+noosfero (1.1~rc4) wheezy; urgency=medium
		2	+
		3	+ * Fourth release candidate for Noosfero 1.1
		4	+
		5	+ -- Antonio Terceiro <terceiro@debian.org> Wed, 01 Apr 2015 12:22:36 -0300
		6	+
1	noosfero (1.1~rc2) wheezy; urgency=low	7	noosfero (1.1~rc2) wheezy; urgency=low
2		8
3	* Second release candidate for Noosfero 1.1	9	* Second release candidate for Noosfero 1.1