Merge branch 'api' into stable

Conflicts: test/unit/block_test.rb

Merge branch 'api' into stable
Conflicts: test/unit/block_test.rb
Victor Costa
2 parents 57521d2e 2f142b41
Showing 37 changed files with 445 additions and 212 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/tinymce_helper.rb
app/models/article.rb
app/models/block.rb
app/models/highlights_block.rb
app/models/suggest_article.rb
app/models/user.rb
app/views/cms/suggest_an_article.html.erb
app/views/profile/report_abuse.html.erb
app/views/profile_editor/edit.html.erb
app/views/shared/_profile_search_form.html.erb
app/views/spam/_suggest_article.html.erb
app/views/tasks/_suggest_article_accept_details.html.erb
app/views/user_mailer/profiles_suggestions_email.html.erb
debian/noosfero.install
features/signup.feature
lib/noosfero/api/entities.rb
lib/noosfero/api/v1/articles.rb
lib/noosfero/plugin.rb
plugins/event/po/pt/event.po
@@ -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
@@ -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, :published_at
@@ -23,7 +23,7 @@ class Block &lt; ActiveRecord::Base
   end
  
   def get_limit
-    [0,limit].max
+    [0,limit.to_i].max
   end
  
   def embed_code
@@ -26,8 +26,16 @@ class HighlightsBlock &lt; Block
   end
  
   def featured_images
-    block_images = images.select{|i| !i[:image_src].nil? }.sort { |x, y| x[:position] <=> y[:position] }
-    shuffle ? block_images.shuffle : block_images
+    images = get_images
+    shuffle ? images.shuffle : images
+  end
+
+  def get_images
+    images.select do |i|
+      !i[:image_src].nil?
+    end.sort do |x, y|
+      x[:position] <=> y[:position]
+    end
   end
  
   def content(args={})
 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,49 @@ 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}).except(:type))
+      if requestor.present?
+        @article_object.author = requestor
+      else
+        @article_object.author_name = name
+      end
+    end
+    @article_object
+  end
+
+  def article_type
+    if article[:type].present?
+      type = article[:type].constantize
+      return type if type < Article
+    end
+    TinyMceArticle
   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 +74,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
@@ -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') %>
@@ -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| %>
+<% search_label = _("Find in %s's content") % profile.short_name %>
 <%= form_tag( { :controller => 'profile_search', :profile => profile.identifier}, :method => 'get', :class => 'search_form' ) do %>
   <div class="search-field">
     <span class="formfield">
-      <%= search_input_with_suggestions 'q', :articles, @q, :title => _("Find in %s's content") % profile.short_name %>
+      <%= search_input_with_suggestions 'q', :articles, @q, :title => search_label, :placeholder => search_label %>
     </span>
     <%= submit_button(:search, _('Search')) %>
     <div>
@@ -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, task.article[:parent_id]) %>
+  <%= labelled_form_field(_('Highlight this article'), a.check_box(:highlighted)) %>
+
+  <%= a.hidden_field(:type) %>
+
+  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => a, :lead_id => task.id} %>
+<% end %>
@@ -10,8 +10,8 @@
     <% @people_suggestions.each do |person| %>
     <li><a href="<%= url_for(person.public_profile_url) %>"><%= person.name %></a></li>
     <% end %>
-  <ul>
-  <%= _("To see the full list of friends suggestions, follow the link: %s") % @people_suggestions_url %>
+  </ul>
+  <%= _("To see the full list of friends suggestions, follow the link: %s") % url_for(@people_suggestions_url) %>
 <% end %>
  
 <% unless @communities_suggestions.empty? %>
@@ -21,13 +21,15 @@
     <% @communities_suggestions.each do |community| %>
     <li><a href="<%= url_for(community.public_profile_url) %>"><%= community.name %></a></li>
     <% end %>
-  <ul>
-  <%= _("To see the full list of communities suggestions, follow the link: %s") % @communities_suggestions_url %>
+  </ul>
+  <%= _("To see the full list of communities suggestions, follow the link: %s") % url_for(@communities_suggestions_url) %>
 <% end %>
  
  
 <%= _("Greetings,") %>
  
---
-<%= _('%s team.') % @environment %>
+<p><%= _("Greetings,") %></p>
+
+--<br/>
+<%= _('%s team.') % @environment %><br/>
 <%= @url %>
@@ -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
@@ -267,32 +267,6 @@ Feature: signup
     Then I should be on the homepage
  
   @selenium
-  Scenario: join community on signup
-    Given the following users
-      | login | name |
-      | mariasilva | Maria Silva |
-    And the following communities
-       | name           | identifier    | owner     |
-       | Free Software  | freesoftware  | mariasilva |
-    And feature "skip_new_user_email_confirmation" is disabled on environment
-    And I am on /freesoftware
-    When I follow "Join"
-    And I follow "New user"
-    And I fill in the following within ".no-boxes":
-      | e-Mail                | josesilva@example.com |
-      | Username              | josesilva             |
-      | Password              | secret                |
-      | Password confirmation | secret                |
-      | Full name             | José da Silva         |
-    And wait for the captcha signup time
-    And I press "Create my account"
-    And I go to josesilva's confirmation URL
-    And I fill in "Username" with "josesilva"
-    And I fill in "Password" with "secret"
-    And I press "Log in"
-    Then "José da Silva" should be a member of "Free Software"
-
-  @selenium
   Scenario: user registration is moderated by admin
     Given feature "admin_must_approve_new_users" is enabled on environment
     And feature "skip_new_user_email_confirmation" is disabled on environment
@@ -101,7 +101,12 @@ module Noosfero
       class UserLogin < User
         expose :private_token
       end
-  
+
+      class Task < Entity
+        expose :id
+        expose :type
+      end
+
     end
   end
 end
@@ -57,6 +57,21 @@ module Noosfero
             present find_article(article.children, params[:child_id]), :with => Entities::Article, :fields => params[:fields]
           end
  
+          post ':id/children/suggest' do
+            parent_article = environment.articles.find(params[:id])
+
+            suggest_article = SuggestArticle.new
+            suggest_article.article = params[:article]
+            suggest_article.article[:parent_id] = parent_article.id
+            suggest_article.target = parent_article.profile
+            suggest_article.requestor = current_person
+
+            unless suggest_article.save
+              render_api_errors!(suggest_article.article_object.errors.full_messages)
+            end
+            present suggest_article, :with => Entities::Task, :fields => params[:fields]
+          end
+
           # Example Request:
           #  POST api/v1/articles/:id/children?private_token=234298743290432&article[name]=title&article[body]=body
           post ':id/children' do
@@ -81,7 +96,6 @@ module Noosfero
             present article, :with => Entities::Article, :fields => params[:fields]
           end
  
-  
         end
  
         resource :communities do
@@ -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]
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1~rc4\n"
+"POT-Creation-Date: 2015-04-20 19:44-0300\n"
 "PO-Revision-Date: 2015-01-30 00:18-0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,61 +16,53 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  
+#: plugins/event/lib/event_plugin.rb:4
+msgid "Event Extras"
+msgstr "Extras para Eventos"
+
+#: plugins/event/lib/event_plugin.rb:8
+msgid ""
+"Include a new block to show the environment's or profiles' events information"
+msgstr ""
+"Adiciona um novo bloco para apresentar as informações de eventos do ambiente "
+"ou dos perfis"
+
 #: plugins/event/lib/event_plugin/event_block.rb:12
 msgid "Events"
 msgstr "Eventos"
  
 #: plugins/event/lib/event_plugin/event_block.rb:16
 msgid "Show the profile events or all environment events."
-msgstr "Mostrar todos os eventos."
+msgstr "Mostra todos os eventos de um perfil ou do ambiente."
  
 #: plugins/event/lib/event_plugin/event_block.rb:65
-#, fuzzy
 msgid "One month ago"
 msgid_plural "%d months ago"
-msgstr[0] "Iniciou a um mês atrás."
-msgstr[1] "Iniciou a %d meses atrás."
+msgstr[0] "Um mês atrás"
+msgstr[1] "%d meses atrás."
  
 #: plugins/event/lib/event_plugin/event_block.rb:67
 msgid "Yesterday"
 msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ontem"
+msgstr[1] "%d dias atrás"
  
 #: plugins/event/lib/event_plugin/event_block.rb:69
 msgid "Today"
-msgstr ""
+msgstr "Hoje"
  
 #: plugins/event/lib/event_plugin/event_block.rb:71
 msgid "Tomorrow"
 msgid_plural "%d days left to start"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Amanhã"
+msgstr[1] "%d dias para começar"
  
 #: plugins/event/lib/event_plugin/event_block.rb:73
-#, fuzzy
 msgid "One month left to start"
 msgid_plural "%d months left to start"
 msgstr[0] "Um mês para iniciar"
 msgstr[1] "% meses para iniciar"
  
-#: plugins/event/lib/event_plugin.rb:4
-msgid "Event Extras"
-msgstr "Eventos"
-
-#: plugins/event/lib/event_plugin.rb:8
-msgid ""
-"Include a new block to show the environment's or profiles' events information"
-msgstr ""
-"Adiciona um novo bloco para apresentar as informações de eventos do ambiente "
-"ou de perfis"
-
-#: plugins/event/views/event_plugin/event_block_item.html.erb:6
-msgid "Duration: 1 day"
-msgid_plural "Duration: %s days"
-msgstr[0] ""
-msgstr[1] ""
-
 #: plugins/event/views/profile_design/event_plugin/_event_block.html.erb:1
 msgid "Limit of items"
 msgstr "Limite de itens"
@@ -94,12 +86,17 @@ msgstr &quot;Mostrar apenas eventos futuros&quot;
  
 #: plugins/event/views/profile_design/event_plugin/_event_block.html.erb:22
 msgid "Limit of days to display"
-msgstr "Limite de dias de distância para mostrar eventos"
+msgstr "Limite de dias para mostrar"
  
 #: plugins/event/views/profile_design/event_plugin/_event_block.html.erb:24
-#, fuzzy
 msgid "Only show events in this interval of days."
-msgstr "Mostar somente eventos que acontecem dentro do limite de dias"
+msgstr "Mostar somente os eventos nesse intervalo de dias"
+
+#: plugins/event/views/event_plugin/event_block_item.html.erb:6
+msgid "Duration: 1 day"
+msgid_plural "Duration: %s days"
+msgstr[0] "Duração: 1 dia"
+msgstr[1] "Duração: %s dias"
  
 #~ msgid "Started one day ago."
 #~ msgid_plural "Started %d days ago."
 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
 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;
   });
  
@@ -85,7 +85,7 @@ environments_loop() {
 }
  
 do_running() {
-  pids=$(sed "s/.*/& /" tmp/pids/thin.*.pid | tr -d '\n' 2>/dev/null || true)
+  pids=$(sed "s/.*/& /" tmp/pids/thin.*.pid 2>/dev/null | tr -d '\n')
   # 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 = {})
@@ -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
@@ -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
  
@@ -295,11 +295,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
@@ -307,7 +307,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)
@@ -319,16 +319,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
@@ -336,6 +333,51 @@ 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 "append hidden tag with type value from article suggestion" 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', :type => 'TextArticle'}, :name => 'some name', :email => 'test@localhost.com', :target => c)
+
+    get :index
+    assert_select "#tasks_#{t.id}_task_article_type[value=TextArticle]"
+  end
+
+  should "display parent_id selection from article suggestion with predefined value" do
+    Task.destroy_all
+    c = fast_create(Community)
+    c.add_admin profile
+    @controller.stubs(:profile).returns(c)
+    parent = fast_create(Folder, :profile_id => c.id)
+    t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body', :parent_id => parent.id}, :name => 'some name', :email => 'test@localhost.com', :target => c)
+
+    get :index
+    assert_select "#tasks_#{t.id}_task_article_parent_id option[value=#{parent.id}]"
+  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
@@ -492,4 +492,26 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     assert_equal ['title'], json['articles'].first.keys
   end
  
+  should 'suggest article children' do
+    article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
+    params[:target_id] = user.person.id
+    params[:article] = {:name => "Article name", :body => "Article body"}
+    assert_difference "SuggestArticle.count" do
+      post "/api/v1/articles/#{article.id}/children/suggest?#{params.to_query}"
+    end
+    json = JSON.parse(last_response.body)
+    assert_equal 'SuggestArticle', json['type']
+  end
+
+  should 'suggest event children' do
+    article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
+    params[:target_id] = user.person.id
+    params[:article] = {:name => "Article name", :body => "Article body", :type => "Event"}
+    assert_difference "SuggestArticle.count" do
+      post "/api/v1/articles/#{article.id}/children/suggest?#{params.to_query}"
+    end
+    json = JSON.parse(last_response.body)
+    assert_equal 'SuggestArticle', json['type']
+  end
+
 end
@@ -364,4 +364,10 @@ class BlockTest &lt; ActiveSupport::TestCase
     assert_equal 'block_preview.png', NewBlock.default_preview_path
   end
  
+  should 'get limit as a number when limit is string' do
+    block = RecentDocumentsBlock.new
+    block.settings[:limit] = '5'
+    assert block.get_limit.is_a?(Fixnum)
+  end
+
 end
@@ -109,33 +109,14 @@ class HighlightsBlockTest &lt; ActiveSupport::TestCase
   end
  
   should 'list images randomically' do
-    f1 = mock()
-    f1.expects(:public_filename).returns('address')
-    UploadedFile.expects(:find).with(1).returns(f1)
-    f2 = mock()
-    f2.expects(:public_filename).returns('address')
-    UploadedFile.expects(:find).with(2).returns(f2)
-    f3 = mock()
-    f3.expects(:public_filename).returns('address')
-    UploadedFile.expects(:find).with(3).returns(f3)
-    f4 = mock()
-    f4.expects(:public_filename).returns('address')
-    UploadedFile.expects(:find).with(4).returns(f4)
-    f5 = mock()
-    f5.expects(:public_filename).returns('address')
-    UploadedFile.expects(:find).with(5).returns(f5)
     block = HighlightsBlock.new
-    i1 = {:image_id => 1, :address => '/address', :position => 3, :title => 'address'}
-    i2 = {:image_id => 2, :address => '/address', :position => 1, :title => 'address'}
-    i3 = {:image_id => 3, :address => '/address', :position => 2, :title => 'address'}
-    i4 = {:image_id => 4, :address => '/address', :position => 5, :title => 'address'}
-    i5 = {:image_id => 5, :address => '/address', :position => 4, :title => 'address'}
-    block.images = [i1,i2,i3,i4,i5]
     block.shuffle = true
-    block.save!
-    block.reload
-    assert_equal [i1,i2,i3,i4,i5], block.images
-    assert_not_equal [i2,i3,i1,i4,i5], block.featured_images
+
+    images = []
+    block.expects(:get_images).returns(images)
+    images.expects(:shuffle).returns(images)
+
+    block.featured_images
   end
  
   [Environment, Profile].each do |klass|
@@ -30,4 +30,17 @@ class LayoutHelperTest &lt; ActionView::TestCase
     assert_match /<link [^<]*href="\/designs\/themes\/my-theme\/global.css"/, css
   end
  
+  should 'append javascript files of enabled plugins in noosfero javascripts' do
+    plugin1 = Noosfero::Plugin.new
+    plugin1.expects(:js_files).returns(['plugin1.js'])
+    plugin2 = Noosfero::Plugin.new
+    plugin2.expects(:js_files).returns('plugin2.js')
+    @plugins = [plugin1, plugin2]
+    expects(:environment).returns(Environment.default).at_least_once
+    expects(:profile).returns(nil).at_least_once
+    js_tag = noosfero_javascript
+    assert_match /plugin1\.js/, js_tag
+    assert_match /plugin2\.js/, js_tag
+  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
-    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
+  should 'have the article' 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,44 @@ 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
+
+  should 'create an event on perfom method' do
+    t = SuggestArticle.new
+    t.article = {:name => 'name', :body => 'body', :type => 'Event'}
+    t.target = @profile
+    assert_difference "Event.count" do
+      t.perform
+    end
+  end
+
+  should 'accept article type parameter' do
+    t = SuggestArticle.new
+    t.article = {:name => 'name', :body => 'body', :type => 'TextArticle'}
+    t.article_type == TextArticle
+  end
+
+  should 'fallback to tinymce when type parameter is invalid' do
+    t = SuggestArticle.new
+    t.article = {:name => 'name', :body => 'body', :type => 'Comment'}
+    t.article_type == TinyMceArticle
+  end
+
 end
@@ -18,6 +18,14 @@ class UserMailerTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'deliver profiles suggestions email' do
+    person = create_user('some-user').person
+    ProfileSuggestion.create!(:person => person, :suggestion =>
+fast_create(Person))
+    email = UserMailer.profiles_suggestions_email(person).deliver
+    assert_match /profile\/some-user\/friends\/suggest/, email.body.to_s
+  end
+
   private
  
     def read_fixture(action)
@@ -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' => [],
     }
...	...	@@ -350,7 +350,8 @@ class CmsController < MyProfileController
350	350	@task.ip_address = request.remote_ip
351	351	@task.user_agent = request.user_agent
352	352	@task.referrer = request.referrer
353		- if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
	353	+ @task.requestor = current_person if logged_in?
	354	+ if (logged_in? \|\| verify_recaptcha(:model => @task, :message => _('Please type the words correctly'))) && @task.save
354	355	session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
355	356	redirect_to @back_to
356	357	end
...	...
...	...	@@ -17,6 +17,7 @@ module TinymceHelper
17	17	searchreplace wordcount visualblocks visualchars code fullscreen
18	18	insertdatetime media nonbreaking save table contextmenu directionality
19	19	emoticons template paste textcolor colorpicker textpattern],
	20	+ :image_advtab => true,
20	21	:language => tinymce_language
21	22
22	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"
...	...
...	...	@@ -5,7 +5,7 @@ class Article < ActiveRecord::Base
5	5	:allow_members_to_edit, :translation_of_id, :language,
6	6	:license_id, :parent_id, :display_posts_in_current_language,
7	7	:category_ids, :posts_per_page, :moderate_comments,
8		- :accept_comments, :feed, :published, :source,
	8	+ :accept_comments, :feed, :published, :source, :source_name,
9	9	:highlighted, :notify_comments, :display_hits, :slug,
10	10	:external_feed_builder, :display_versions, :external_link,
11	11	:image_builder, :show_to_followers, :published_at
...	...
...	...	@@ -23,7 +23,7 @@ class Block < ActiveRecord::Base
23	23	end
24	24
25	25	def get_limit
26		- [0,limit].max
	26	+ [0,limit.to_i].max
27	27	end
28	28
29	29	def embed_code
...	...
...	...	@@ -26,8 +26,16 @@ class HighlightsBlock < Block
26	26	end
27	27
28	28	def featured_images
29		- block_images = images.select{\|i\| !i[:image_src].nil? }.sort { \|x, y\| x[:position] <=> y[:position] }
30		- shuffle ? block_images.shuffle : block_images
	29	+ images = get_images
	30	+ shuffle ? images.shuffle : images
	31	+ end
	32	+
	33	+ def get_images
	34	+ images.select do \|i\|
	35	+ !i[:image_src].nil?
	36	+ end.sort do \|x, y\|
	37	+ x[:position] <=> y[:position]
	38	+ end
31	39	end
32	40
33	41	def content(args={})
...	...
1	1	class SuggestArticle < Task
2	2
3		- validates_presence_of :target_id, :article_name, :email, :name, :article_body
	3	+ validates_presence_of :target_id
	4	+ validates_presence_of :email, :name, :if => Proc.new { \|task\| task.requestor.blank? }
	5	+ validates_associated :article_object
4	6
5	7	settings_items :email, :type => String
6	8	settings_items :name, :type => String
7		- settings_items :article_name, :type => String
8		- settings_items :article_body, :type => String
9		- settings_items :article_abstract, :type => String
10		- settings_items :article_parent_id, :type => String
11		- settings_items :source, :type => String
12		- settings_items :source_name, :type => String
13		- settings_items :highlighted, :type => :boolean, :default => false
14	9	settings_items :ip_address, :type => String
15	10	settings_items :user_agent, :type => String
16	11	settings_items :referrer, :type => String
	12	+ settings_items :article, :type => Hash, :default => {}
17	13
18	14	after_create :schedule_spam_checking
19	15
...	...	@@ -24,34 +20,49 @@ class SuggestArticle < Task
24	20	include Noosfero::Plugin::HotSpot
25	21
26	22	def sender
27		- "#{name} (#{email})"
	23	+ requestor ? "#{requestor.name}" : "#{name} (#{email})"
	24	+ end
	25	+
	26	+ def article_object
	27	+ if @article_object.nil?
	28	+ @article_object = article_type.new(article.merge({:profile => target}).except(:type))
	29	+ if requestor.present?
	30	+ @article_object.author = requestor
	31	+ else
	32	+ @article_object.author_name = name
	33	+ end
	34	+ end
	35	+ @article_object
	36	+ end
	37	+
	38	+ def article_type
	39	+ if article[:type].present?
	40	+ type = article[:type].constantize
	41	+ return type if type < Article
	42	+ end
	43	+ TinyMceArticle
28	44	end
29	45
30	46	def perform
31		- task = TinyMceArticle.new
32		- task.profile = target
33		- task.name = article_name
34		- task.author_name = name
35		- task.body = article_body
36		- task.abstract = article_abstract
37		- task.parent_id = article_parent_id
38		- task.source = source
39		- task.source_name = source_name
40		- task.highlighted = highlighted
41		- task.save!
	47	+ article_object.save!
42	48	end
43	49
44	50	def title
45	51	_("Article suggestion")
46	52	end
47	53
	54	+ def article_name
	55	+ article[:name]
	56	+ end
	57	+
48	58	def subject
49	59	article_name
50	60	end
51	61
52	62	def information
53		- { :message => _('%{sender} suggested the publication of the article: %{subject}.'),
54		- :variables => {:sender => sender} }
	63	+ variables = requestor.blank? ? {:requestor => sender} : {}
	64	+ { :message => _('%{requestor} suggested the publication of the article: %{subject}.'),
	65	+ :variables => variables }
55	66	end
56	67
57	68	def accept_details
...	...	@@ -63,8 +74,8 @@ class SuggestArticle < Task
63	74	end
64	75
65	76	def target_notification_description
66		- _('%{sender} suggested the publication of the article: %{article}.') %
67		- {:sender => sender, :article => article_name}
	77	+ _('%{requestor} suggested the publication of the article: %{article}.') %
	78	+ {:requestor => sender, :article => article_name}
68	79	end
69	80
70	81	def target_notification_message
...	...
...	...	@@ -46,7 +46,7 @@ class User < ActiveRecord::Base
46	46	p = Person.new
47	47
48	48	p.attributes = user.person_data
49		- p.identifier = user.login
	49	+ p.identifier = user.login if p.identifier.blank?
50	50	p.user = user
51	51	p.environment = user.environment
52	52	p.name \|\|= user.name \|\| user.login
...	...
...	...	@@ -6,21 +6,22 @@
6	6
7	7	<%= labelled_form_for 'task' do \|f\| %>
8	8
9		- <%= required labelled_form_field(_('Title'), text_field(:task, 'article_name', :size => 50)) %>
	9	+ <%= required labelled_form_field(_('Title'), text_field('task[article]', 'name', :size => 50)) %>
10	10
11		- <%= labelled_form_field(_('Source'), text_field(:task, 'source_name')) %>
	11	+ <%= labelled_form_field(_('Source'), text_field('task[article]', 'source_name')) %>
12	12
13		- <%= labelled_form_field(_('Source URL'), text_field(:task, 'source')) %>
	13	+ <%= labelled_form_field(_('Source URL'), text_field('task[article]', 'source')) %>
14	14
15		- <%= required labelled_form_field(_('Your name'), text_field(:task, 'name')) %>
16		-
17		- <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
	15	+ <% unless logged_in? %>
	16	+ <%= required labelled_form_field(_('Your name'), text_field(:task, 'name')) %>
	17	+ <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
	18	+ <% end %>
18	19
19		- <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => :task, :abstract_method => 'article_abstract', :body_method => 'article_body'} %>
	20	+ <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => 'task[article]'} %>
20	21
21	22	<%= hidden_field_tag('back_to', @back_to) %>
22	23
23		- <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
	24	+ <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) unless logged_in? %>
24	25
25	26	<% button_bar do %>
26	27	<%= submit_button :save, _('Save') %>
...	...
...	...	@@ -24,7 +24,7 @@
24	24	$('#report-abuse-submit-button').css('cursor', 'progress');
25	25	$.ajax({
26	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	28	data: $(form).serialize(),
29	29	dataType: 'json',
30	30	success: function(data, status, ajax){
...	...
1	1	<h1><%= _('Profile settings for %s') % profile.name %></h1>
2	2
3		-<%= javascript_include_tag 'deactivate_profile' %>
4	3	<%= error_messages_for :profile_data %>
5	4
6	5	<%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do \|f\| %>
...	...