Merge branch 'master' into stable

Victor Costa
2 parents a48adc48 90f4f1c1
Showing 50 changed files with 670 additions and 92 deletions Show diff stats
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/chat_controller.rb
app/models/user.rb
app/views/file_presenter/_generic.html.erb
app/views/file_presenter/_image.html.erb
app/views/home/index.html.erb
app/views/profile_editor/_person_form.html.erb
features/gravatar_support.feature
features/step_definitions/noosfero_steps.rb
lib/log_memory_consumption_job.rb
lib/noosfero/gravatar.rb
lib/noosfero/plugin.rb
lib/tasks/plugins_tests.rake
plugins/lattes_curriculum/README.md
plugins/lattes_curriculum/db/migrate/20140814210103_create_academic_infos.rb
plugins/lattes_curriculum/features/lattes_curriculum.feature
plugins/lattes_curriculum/lib/academic_info.rb
plugins/lattes_curriculum/lib/ext/person.rb
plugins/lattes_curriculum/lib/html_parser.rb
plugins/lattes_curriculum/lib/lattes_curriculum_plugin.rb
@@ -19,14 +19,16 @@ class ProfileEditorController &lt; MyProfileController
         params[:profile_data][:custom_fields] ||= {}
       end
       Profile.transaction do
-      Image.transaction do
-        if @profile_data.update_attributes(params[:profile_data])
-          redirect_to :action => 'index', :profile => profile.identifier
-        else
-          profile.identifier = params[:profile] if profile.identifier.blank?
+        Image.transaction do
+          begin
+            @plugins.dispatch(:profile_editor_transaction_extras)
+            @profile_data.update_attributes!(params[:profile_data])
+            redirect_to :action => 'index', :profile => profile.identifier
+          rescue Exception => ex
+            profile.identifier = params[:profile] if profile.identifier.blank?
+          end
         end
       end
-      end
     end
   end
  
@@ -19,7 +19,7 @@ class ChatController &lt; PublicController
   def avatar
     profile = environment.profiles.find_by_identifier(params[:id])
     filename, mimetype = profile_icon(profile, :minor, true)
-    if filename =~ /^https?:/
+    if filename =~ /^(https?:)?\/\//
       redirect_to filename
     else
       data = File.read(File.join(Rails.root, 'public', filename))
@@ -214,6 +214,10 @@ class User &lt; ActiveRecord::Base
     Digest::MD5.hexdigest(password)
   end
  
+  add_encryption_method :salted_md5 do |password, salt|
+    Digest::MD5.hexdigest(password+salt)
+  end
+
   add_encryption_method :clear do |password, salt|
     password
   end
 <span class="download-link">
   <span>Download</span>
-  <strong><%= link_to generic.filename, generic.public_filename %></strong>
+  <strong><%= link_to generic.filename, [Noosfero.root, generic.public_filename].join %></strong>
 </span>
  
 <div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
@@ -28,7 +28,7 @@
  
 <%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %>
  
-<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>">
+<img src="<%= [Noosfero.root, image.public_filename(:display)].join %>" class="<%=image.css_class_name%>">
  
 <div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
   <%= image.abstract %>
@@ -61,9 +61,6 @@
         <%= submit_button(:search, _('Search')) %>
       </div>
  
-      <div>
-        <%= lightbox_link_to _('More options'), :controller => 'search', :action => 'popup' %>
-      </div>
     <% end %>
   </div>
 <% end %>
@@ -27,6 +27,10 @@
 <%= optional_field(@person, 'district', labelled_form_field(_('District'), text_field(:profile_data, :district, :rel => _('District')))) %>
 <%= optional_field(@person, 'image', labelled_form_field(_('Image'), file_field(:file, :image, :rel => _('Image')))) %>
  
+<% @plugins.dispatch(:extra_optional_fields).each do |field| %>
+  <%= optional_field(@person, field[:name], labelled_form_field(field[:label], text_field(field[:object_name], field[:method], :rel => field[:label], :value => field[:value]))) %>
+<% end %>
+
 <% optional_field(@person, 'schooling') do %>
   <div class="formfieldline">
     <label class='formlabel' for='profile_data_schooling'><%= _('Schooling') %></label>
@@ -20,11 +20,11 @@ Feature: Gravatar Support
   Scenario: The Aurium's gravatar picture must link to his gravatar profile
     # because Aurium has his picture registered at garvatar.com.
     When I go to article "My Article"
-    Then I should see "Aurium" linking to "http://www.gravatar.com/24a625896a07aa37fdb2352e302e96de"
+    Then I should see "Aurium" linking to "//www.gravatar.com/24a625896a07aa37fdb2352e302e96de"
  
   @selenium
   Scenario: The NoOne's gravatar picture must link to Gravatar homepage
     # because NoOne <nobody@colivre.coop.br> has no picture registered.
     When I go to article "My Article"
-    Then I should see "NoOne" linking to "http://www.gravatar.com"
+    Then I should see "NoOne" linking to "//www.gravatar.com"
  
@@ -762,3 +762,11 @@ When /^I confirm the &quot;(.*)&quot; dialog$/ do |confirmation|
   assert_equal confirmation, a.text
   a.accept
 end
+
+Given /^the field (.*) is public for all users$/ do |field|
+  Person.all.each do |person|
+    person.fields_privacy = Hash.new if person.fields_privacy.nil?
+    person.fields_privacy[field] = "public"
+    person.save!
+  end
+end
 \ No newline at end of file
 class LogMemoryConsumptionJob < Struct.new(:last_stat)
   # Number of entries do display
   N = 20
-  # In seconds
-  PERIOD = 10
  
   def perform
     logpath = File.join(Rails.root, 'log', "#{ENV['RAILS_ENV']}_memory_consumption.log")
 module Noosfero::Gravatar
   def gravatar_profile_image_url(email, options = {})
-    "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.to_s)}?" + {
+    "//www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.to_s)}?" + {
       :only_path => false,
     }.merge(options).map{|k,v| '%s=%s' % [ k,v ] }.join('&')
   end
  
   def gravatar_profile_url(email)
-    'http://www.gravatar.com/'+ Digest::MD5.hexdigest(email.to_s)
+    '//www.gravatar.com/'+ Digest::MD5.hexdigest(email.to_s)
   end
 end
@@ -552,6 +552,18 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Perform extra transactions related to profile in profile editor
+  # returns = true in success or raise and exception if it could not update the data
+  def profile_editor_transaction_extras
+    nil
+  end
+
+  # -> Return a list of hashs with the needed information to create optional fields
+  # returns = a list of hashs as {:name => "string", :label => "string", :object_name => :key, :method => :key}
+  def extra_optional_fields
+    []
+  end
+
   # -> Adds additional blocks to profiles and environments.
   # Your plugin must implements a class method called 'extra_blocks'
   # that returns a hash with the following syntax.
@@ -3,10 +3,7 @@
   bsc
   comment_classification
   ldap
-  send_email
-  shopping_cart
   solr
-  tolerance_time
 ]
  
 @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template']
@@ -0,0 +1,45 @@
+README - Lattes Curriculum (LattesCurriculum Plugin)
+================================
+
+Lattes Curriculum is a plugin that allow users to show their academic informations in the wall, extracted from CNPQ's lattes plataform
+
+INSTALL
+=======
+
+Enable Plugin
+-------------
+
+Also, you need to enable LattesCurriculum Plugin on your Noosfero:
+
+cd <your_noosfero_dir>
+./script/noosfero-plugins enable lattes_curriculum
+
+Active Plugin
+-------------
+
+As a Noosfero administrator user, go to administrator panel:
+
+- Click on "Enable/disable plugins" option
+- Click on "LattesCurriculumPlugin" check-box
+
+Running LattesCurriculum tests
+--------------------
+
+$ rake test:noosfero_plugins:lattes_curriculum
+
+LICENSE
+=======
+
+Copyright (c) The Author developers.
+
+See Noosfero license.
+
+
+AUTHORS
+=======
+
+Jose Pedro (1jpsneto at gmail.com)
+Thiago Kairala (thiagor.kairala at gmail.com)
+Ana Paula Vargas (anapaulavnoronha at gmail.com)
+Leandro Veloso (leandrovelosorodrigues at gmail.com)
+Arthur Del Esposte (arthurmde at gmail.com)
 \ No newline at end of file
@@ -0,0 +1,12 @@
+class CreateAcademicInfos < ActiveRecord::Migration
+  def self.up
+    create_table :academic_infos do |t|
+      t.references :person
+      t.column :lattes_url, :string
+    end
+   end
+
+  def self.down
+    drop_table :academic_infos
+  end
+end
@@ -0,0 +1,49 @@
+Feature: import lattes information
+  As an user
+  I want to inform my lattes url address
+  So that I can import my academic informations automatically
+
+  Background:
+    Given "LattesCurriculumPlugin" plugin is enabled
+    And I am logged in as admin
+    And I go to /admin/plugins
+    And I check "Lattes Curriculum Plugin"
+    And I press "Save changes"
+    And I go to /admin/features/manage_fields
+    Given I follow "Person's fields"
+    And I check "person_fields_lattes_url_active"
+    And I check "person_fields_lattes_url_signup"
+    And I press "save_person_fields"
+
+  Scenario: Don't accept edit the profile with invalid lattes url
+    Given I am on admin_user's control panel
+    When I follow "Edit Profile"
+    And I fill in "Lattes URL" with "http://youtube.com.br/"
+    And I press "Save"
+    Then I should see "Academic info lattes url is invalid"
+
+  Scenario: Import lattes informations
+    Given I am on admin_user's control panel
+    And the field lattes_url is public for all users
+    When I follow "Edit Profile"
+    And I fill in "Lattes URL" with "http://lattes.cnpq.br/2864976228727880"
+    And I press "Save"
+    And I go to /profile/admin_user#lattes_tab
+    Then I should see "Endereço para acessar este CV: http://lattes.cnpq.br/2864976228727880"
+
+  Scenario: Don't show lattes informations for blank lattes urls
+    Given I am on admin_user's control panel
+    And the field lattes_url is public for all users
+    When I follow "Edit Profile"
+    And I press "Save"
+    And I go to /profile/admin_user
+    Then I should not see "Lattes"
+
+  Scenario: Inform problem if the informed lattes doesn't exist
+    Given I am on admin_user's control panel
+    And the field lattes_url is public for all users
+    When I follow "Edit Profile"
+    And I fill in "Lattes URL" with "http://lattes.cnpq.br/123456"
+    And I press "Save"
+    And I go to /profile/admin_user#lattes_tab
+    Then I should see "Lattes not found. Please, make sure the informed URL is correct."
 \ No newline at end of file
@@ -0,0 +1,23 @@
+class AcademicInfo < ActiveRecord::Base
+
+  belongs_to :person
+
+  attr_accessible :lattes_url
+  validate :lattes_url_validate?
+
+  def lattes_url_validate?
+    unless AcademicInfo.matches?(self.lattes_url)
+      self.errors.add(:lattes_url, _(" is invalid."))
+    end
+  end
+
+  def self.matches?(info)
+    lattes = nil
+    if info.class == String
+      lattes = info
+    elsif info.class == Hash
+      lattes = info[:lattes_url]
+    end
+    return lattes.blank? || lattes =~ /^http:\/\/lattes.cnpq.br\/\d+$/
+  end
+end
@@ -0,0 +1,32 @@
+require_dependency 'person'
+
+class Person
+
+  attr_accessible :lattes_url, :academic_info_attributes
+
+  has_one :academic_info
+
+  after_destroy do |person|
+    if !person.environment.nil? &&
+person.environment.plugin_enabled?(LattesCurriculumPlugin) &&
+!person.academic_info.nil?
+      person.academic_info.destroy
+    end
+  end
+
+  accepts_nested_attributes_for :academic_info
+
+  def lattes_url
+    if self.environment && self.environment.plugin_enabled?(LattesCurriculumPlugin)
+      self.academic_info.nil? ? nil : self.academic_info.lattes_url
+    end
+  end
+
+  def lattes_url= value
+    if self.environment && self.environment.plugin_enabled?(LattesCurriculumPlugin)
+      self.academic_info.lattes_url = value unless self.academic_info.nil?
+    end
+  end
+
+  FIELDS << "lattes_url"
+end
@@ -0,0 +1,64 @@
+require 'rubygems'
+require 'nokogiri'
+require 'open-uri'
+
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
+class Html_parser
+  def get_html(lattes_link = "")
+    begin
+      page = Nokogiri::HTML(open(lattes_link), nil, "UTF-8")
+      page = page.css(".main-content").to_s()
+      page = remove_class_tooltip(page)
+      page = remove_img(page)
+      page = remove_select(page)
+      page = remove_footer(page)
+      page = remove_further_informations(page)
+		rescue OpenURI::HTTPError => e
+      page = _("Lattes not found. Please, make sure the informed URL is correct.")
+    rescue Timeout::Error => e
+      page = _("Lattes Platform is unreachable. Please, try it later.")
+    end
+  end
+
+  def remove_class_tooltip(page = "")
+    while page.include? 'class="tooltip"' do
+      page['class="tooltip"'] = 'class="link_not_to_mark"'
+    end
+
+    return page
+  end
+
+  def remove_img(page = "")
+    fist_part_to_keep, *rest = page.split('<img')
+    second_part = rest.join(" ")
+    part_to_throw_away, *after_img = second_part.split('>',2)
+    page = fist_part_to_keep + after_img.join(" ")
+  end
+
+  def remove_select(page = "")
+    while page.include? '<label' do
+      first_part_to_keep, *rest = page.split('<label')
+      second_part = rest.join(" ")
+      part_to_throw_away, *after_img = second_part.split('</select>')
+      page = first_part_to_keep + after_img.join(" ")
+    end
+
+    return page
+  end
+
+  def remove_footer(page = "")
+    first_part_to_keep, *rest = page.split('<div class="rodape-cv">')
+    second_part = rest.join(" ")
+    part_to_throw_away, *after_img = second_part.split('Imprimir Curr&iacute;culo</a>')
+    page = first_part_to_keep + after_img.join(" ")
+  end
+
+  def remove_further_informations(page = "")
+    first_part_to_keep, *rest = page.split('<a name="OutrasI')
+    second_part = rest.join(" ")
+    part_to_throw_away, *after_img = second_part.split('</div>',2)
+    page = first_part_to_keep + after_img.join(" ")
+  end
+end
@@ -0,0 +1,139 @@
+class LattesCurriculumPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Lattes Curriculum Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that imports the lattes curriculum into the users profiles")
+  end
+
+  def js_files
+    ["singup_complement.js"]
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def extra_optional_fields
+    fields = []
+
+    lattes_url = {
+      :name => 'lattes_url',
+      :label => 'Lattes URL',
+      :object_name => :academic_infos,
+      :method => :lattes_url,
+      :value => context.profile.nil? ? "" : context.profile.academic_info.lattes_url
+    }
+
+    fields << lattes_url
+
+    return fields
+  end
+
+  def profile_tabs
+    if show_lattes_tab?
+      href = context.profile.academic_info.lattes_url
+      html_parser = Html_parser.new
+      {
+        :title => _("Lattes"),
+        :id => 'lattes_tab',
+        :content => lambda{html_parser.get_html(href)},
+        :start => false
+      }
+    end
+  end
+
+  def profile_editor_transaction_extras
+    if context.profile.person?
+      if context.params.has_key?(:academic_infos)
+        academic_info_transaction
+      end
+    end
+  end
+
+  def profile_editor_controller_filters
+    validate_lattes_url_block = proc do
+      if request.post?
+        if !params[:academic_infos].blank?
+          @profile_data = profile
+
+          academic_infos = {"academic_info_attributes" => params[:academic_infos]}
+
+          params_profile_data = params[:profile_data]
+          params_profile_data = params_profile_data.merge(academic_infos)
+
+          @profile_data.attributes = params_profile_data
+          @profile_data.valid?
+
+          @possible_domains = profile.possible_domains
+
+          unless AcademicInfo.matches?(params[:academic_infos])
+            @profile_data.errors.add(:lattes_url, _(' Invalid lattes url'))
+            render :action => :edit, :profile => profile.identifier
+          end
+        end
+      end
+    end
+
+    create_academic_info_block = proc do
+      if profile && profile.person? && profile.academic_info.nil?
+        profile.academic_info = AcademicInfo.new
+      end
+    end
+
+    [{:type => 'before_filter',
+      :method_name => 'validate_lattes_url',
+      :options => {:only => 'edit'},
+      :block => validate_lattes_url_block },
+    {:type => 'before_filter',
+      :method_name => 'create_academic_info',
+      :options => {:only => 'edit'},
+      :block => create_academic_info_block }]
+  end
+
+  def account_controller_filters
+    validate_lattes_url_block = proc do
+      if request.post?
+        params[:profile_data] ||= {}
+        params[:profile_data][:academic_info_attributes] = params[:academic_infos]
+
+        if !params[:academic_infos].blank? && !AcademicInfo.matches?(params[:academic_infos])
+          @person = Person.new(params[:profile_data])
+          @person.environment = environment
+          @user = User.new(params[:user])
+          @person.errors.add(:lattes_url, _(' Invalid lattes url'))
+          render :action => :signup
+        end
+      end
+    end
+
+    create_academic_info_block = proc do
+      if profile && profile.person? && profile.academic_info.nil?
+        profile.academic_info = AcademicInfo.new
+      end
+    end
+
+    [{:type => 'before_filter',
+      :method_name => 'validate_lattes_url',
+      :options => {:only => 'signup'},
+      :block => validate_lattes_url_block },
+    {:type => 'before_filter',
+      :method_name => 'create_academic_info',
+      :options => {:only => 'edit'},
+      :block => create_academic_info_block }]
+  end
+
+  protected
+
+  def academic_info_transaction
+    AcademicInfo.transaction do
+      context.profile.academic_info.update_attributes!(context.params[:academic_infos])
+    end
+  end
+
+  def show_lattes_tab?
+    return context.profile.person? && !context.profile.academic_info.nil? && !context.profile.academic_info.lattes_url.blank? && context.profile.public_fields.include?("lattes_url")
+  end
+end
@@ -0,0 +1,12 @@
+8950 4e47 0d0a 1a0a 0000 000d 4948 4452
+0000 0009 0000 0027 0806 0000 00dd 3762
+5600 0000 0173 5247 4200 aece 1ce9 0000
+0006 624b 4744 00ff 00ff 00ff a0bd a793
+0000 0009 7048 5973 0000 0dd7 0000 0dd7
+0142 289b 7800 0000 0774 494d 4507 dc05
+040f 1a01 22dc e3a3 0000 003b 4944 4154
+38cb 635c 30bd f53f 0301 c0c4 4004 188c
+8a58 18fe 13a3 8808 552c ff87 6810 101b
+4eff 87af efa8 1704 c33e 1550 29b7 0c4a
+dffd 1fa2 b905 009c 4210 1067 9fec 9d00
+0000 0049 454e 44ae 4260 82
 \ No newline at end of file
@@ -0,0 +1,15 @@
+jQuery(function($){
+  $(document).ready(function(){
+    $('#lattes_id_field').blur(function(){
+      var value = this.value
+    })
+
+    $('#lattes_id_field').focus(function(){
+      $('#lattes-id-balloon').fadeIn('slow')
+    })
+
+    $('#lattes_id_field').blur(function(){
+      $('#lattes-id-balloon').fadeOut('slow')
+    })
+  })
+})
 \ No newline at end of file
@@ -0,0 +1,37 @@
+#signup-form label[for="lattes_id_field"],
+{
+  display: block;
+}
+
+#signup-form small#lattes-id-balloon
+{
+  display: none;
+  width: 142px;
+  height: 69px;
+  color: #FFFFFF;
+  font-weight: bold;
+  font-size: 11px;
+  padding: 5px 10px 45px 10px;
+  margin: 0;
+  line-height: 1.5em;
+  background: transparent url(/images/gray-balloon.png) bottom center no-repeat;
+  position: absolute;
+  z-index: 2;
+  right: -150px;
+  top: -75px;
+}
+
+#signup-form .formfield.checking {
+  border-color: transparent;
+  background-image: none;
+}
+
+#signup-form small#lattes-id-balloon
+{
+  top: -80px;
+}
+
+#signup-form #signup-lattes-id
+{
+  position: relative;
+}
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class AcademicInfoTest < ActiveSupport::TestCase
+
+  def setup
+    @academic_info = AcademicInfo.new
+  end
+
+  should 'not ve invalid lattes url' do
+    @academic_info.lattes_url = "http://softwarelivre.org/"
+    assert !@academic_info.save
+  end
+
+  should 'accept blank lattes url' do
+    @academic_info.lattes_url = ""
+    assert @academic_info.save
+  end
+
+  should 'save with correct lattes url' do
+    @academic_info.lattes_url = "http://lattes.cnpq.br/2193972715230641"
+    assert @academic_info.save
+  end
+end
@@ -0,0 +1,24 @@
+#!/bin/env ruby
+# encoding: utf-8
+
+require "test_helper"
+
+class HtmlParserTest < ActiveSupport::TestCase
+
+  def setup
+    @parser = Html_parser.new
+  end
+
+  should 'be not nil the instance' do
+    assert_not_nil @parser
+  end
+
+  should 'be not nil the return get_html' do
+    result = @parser.get_html("http://lattes.cnpq.br/2193972715230641")
+    assert result.include?("Endereço para acessar este CV")
+  end
+
+  should 'inform that lattes was not found' do
+    assert_equal "Lattes not found. Please, make sure the informed URL is correct.", @parser.get_html("http://lattes.cnpq.br/123")
+  end
+end
@@ -0,0 +1,24 @@
+require "test_helper"
+
+class LattesCurriculumPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = LattesCurriculumPlugin.new
+  end
+
+  should 'be a noosfero plugin' do
+    assert_kind_of Noosfero::Plugin, @plugin
+  end
+
+  should 'have name' do
+    assert_equal 'Lattes Curriculum Plugin', LattesCurriculumPlugin.plugin_name
+  end
+
+  should 'have description' do
+    assert_equal _('A plugin that imports the lattes curriculum into the users profiles'), LattesCurriculumPlugin.plugin_description
+  end
+
+  should 'have stylesheet' do
+    assert @plugin.stylesheet?
+  end
+end
@@ -0,0 +1,26 @@
+require "test_helper"
+
+class PersonTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.default
+    @environment.enable_plugin(LattesCurriculumPlugin)
+  end
+
+  attr_reader :environment
+
+  should 'destroy academic info if person is removed' do
+    person = fast_create(Person)
+    academic_info = fast_create(AcademicInfo, :person_id => person.id,
+:lattes_url => 'http://lattes.cnpq.br/2193972715230')
+
+    assert_difference 'AcademicInfo.count', -1 do
+      person.destroy
+    end
+  end
+
+  should 'add lattes_url field to Person' do
+    assert_includes Person.fields, 'lattes_url'
+  end
+
+end
@@ -11,7 +11,7 @@ module SendEmailPluginBaseController
       )
       @mail.subject = params[:subject] unless params[:subject].blank?
       if @mail.valid?
-        SendEmailPlugin::Sender.message(request.referer, @context_url, @mail).deliver
+        SendEmailPlugin::Sender.send_message(request.referer, @context_url, @mail).deliver
         if request.xhr?
           render :text => _('Message sent')
         else
@@ -24,3 +24,6 @@ class SendEmailPlugin &lt; Noosfero::Plugin
   end
  
 end
+
+require_dependency 'send_email_plugin/mail'
+require_dependency 'send_email_plugin/sender'
-class SendEmailPlugin::Mail < ActiveRecord::Base #WithoutTable
+class SendEmailPlugin::Mail
+  include ActiveModel::Validations
  
   N_('Subject'); N_('Message'); N_('To'); N_('From')
-  tableless :columns => [
-    [:from, :string],
-    [:to, :string],
-    [:subject, :string, _('New mail')],
-    [:message, :string],
-    [:params, :hash, {}],
-  ]
-  attr_accessor :environment
+
+  attr_accessor :environment, :from, :to, :subject, :message, :params
  
   validates_presence_of :environment
   validates_presence_of :to, :message
+  validate :recipients_format
+
+  def initialize(attributes = {:subject => 'New mail'})
+    @environment = attributes[:environment]
+    @from = attributes[:from]
+    @to = attributes[:to]
+    @subject = attributes[:subject]
+    @message = attributes[:message]
+    @params = attributes[:params]
+  end
  
-  def validate
+  def recipients_format
     if to_as_list.any? do |value|
         if value !~ Noosfero::Constants::EMAIL_FORMAT
           self.errors.add(:to, _("'%s' isn't a valid e-mail address") % value)
@@ -32,7 +37,7 @@ class SendEmailPlugin::Mail &lt; ActiveRecord::Base #WithoutTable
  
   def params=(value = {})
     [:action, :controller, :to, :message, :subject, :from].each{|k| value.delete(k)}
-    self[:params] = value
+    @params = value
   end
  
   def to_as_list
 class SendEmailPlugin::Sender < Noosfero::Plugin::MailerBase
  
-  def message(referer, url, mail)
+  def send_message(referer, url, mail)
     @message = mail.message
     @referer = referer
     @context_url = url
     @params = mail.params
  
     mail(
-      recipients: mail.to,
+      to: mail.to,
       from: mail.from,
+      body: mail.params,
       subject: "[#{mail.environment.name}] #{mail.subject}"
     )
   end
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
  
+def base_setup
+    ActionMailer::Base.delivery_method = :test
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries = []
+    environment = Environment.default
+    environment.noreply_email = 'noreply@example.com'
+    environment.save!
+end
+
 def run_common_tests
   should 'not deliver emails via GET requests' do
     get :deliver, @extra_args
@@ -35,7 +44,7 @@ def run_common_tests
  
   should 'deliver mail' do
     Environment.any_instance.stubs(:send_email_plugin_allow_to).returns('john@example.com')
-    assert_difference ActionMailer::Base.deliveries, :size do
+    assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       post :deliver, @extra_args.merge(:to => 'john@example.com', :message => 'Hi john')
     end
   end
@@ -49,23 +58,19 @@ end
  
 class SendEmailPluginProfileControllerTest < ActionController::TestCase
   def setup
-    ActionMailer::Base.delivery_method = :test
-    ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
+    base_setup
     community = fast_create(Community)
     @extra_args = {:profile => community.identifier}
   end
  
-  run_common_tests()
+  run_common_tests
 end
  
 class SendEmailPluginControllerTest < ActionController::TestCase
   def setup
-    ActionMailer::Base.delivery_method = :test
-    ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
+    base_setup
     @extra_args = {}
   end
  
-  run_common_tests()
+  run_common_tests
 end
@@ -44,7 +44,7 @@ class SendEmailPluginMailTest &lt; ActiveSupport::TestCase
  
   should 'discard some keys on set params hash' do
     mail = SendEmailPlugin::Mail.new(:params => {:action => 1, :controller => 2, :to => 3, :message => 4, :subject => 5, :age => 6})
-    [:action, :controller, :to, :message, :subject].each do |k|
+    [:params].each do |k|
       assert !mail.params.include?(k)
     end
     assert mail.params.include?(:age)
@@ -15,21 +15,21 @@ class SendEmailPluginSenderTest &lt; ActiveSupport::TestCase
   end
  
   should 'be able to deliver mail' do
-    response = SendEmailPlugin::Sender.deliver_message("http://localhost/contact", 'http//profile', @mail)
-    assert_equal 'noreply@localhost', response.from.to_s
+    response = SendEmailPlugin::Sender.send_message("http://localhost/contact", 'http//profile', @mail)
+    assert_equal 'noreply@localhost', response.from.join
     assert_equal "[Noosfero] #{@mail.subject}", response.subject
   end
  
   should 'deliver mail to john@example.com' do
-    response = SendEmailPlugin::Sender.deliver_message("http://localhost/contact", 'http//profile', @mail)
+    response = SendEmailPlugin::Sender.send_message("http://localhost/contact", 'http//profile', @mail)
     assert_equal ['john@example.com'], response.to
   end
  
   should 'add each key value pair to message body' do
     @mail.params = {:param1 => 'value1', :param2 => 'value2'}
-    response = SendEmailPlugin::Sender.deliver_message("http://localhost/contact", 'http//profile', @mail)
-    assert_match /param1.+value1/m, response.body
-    assert_match /param2.+value2/m, response.body
+    response = SendEmailPlugin::Sender.send_message("http://localhost/contact", 'http//profile', @mail)
+    assert_match /param1.+value1/m, response.body.to_s
+    assert_match /param2.+value2/m, response.body.to_s
   end
  
 end
@@ -0,0 +1,3 @@
+<%= error_messages_for 'mail', :header_message => _('The message could not be sent') %>
+
+<%= button :back, _('Back'), :back %>
@@ -1,3 +0,0 @@
-<%= error_messages_for 'mail', :header_message => _('The message could not be sent') %>
-
-<%= button :back, _('Back'), :back %>
@@ -0,0 +1,8 @@
+<%= _('Contact from %s') % @referer %>
+
+<%= word_wrap(@message || @mail.message) %>
+<% (@params || @mail.params).each_pair do |key, value| %>
+<%= key %>: <%= word_wrap(value) %>
+<% end %>
+---
+<%= url_for @context_url %>
@@ -1,8 +0,0 @@
-<%= _('Contact from %s') % @referer %>
-
-<%= word_wrap(@message || @mail.message) %>
-<% (@params || @mail.params).each_pair do |key, value| %>
-<%= key %>: <%= word_wrap(value) %>
-<% end %>
----
-<%= url_for @context_url %>
@@ -0,0 +1,8 @@
+<h2><%= _('Message sent') %></h2>
+
+<table class='sendemail-plugin-message-sent'>
+  <tr><td class='label'><strong><%= _('Subject') %>:</strong></td><td class='value'><em><%=h @mail.subject %></em></td></tr>
+  <tr><td class='label'><strong><%= _('Message') %>:</strong></td><td class='value'><pre><%=h render :file => 'send_email_plugin/sender/message' %></pre></td></tr>
+</table>
+
+<p><%= button :back, _('Back'), :back %></p>
@@ -1,8 +0,0 @@
-<h2><%= _('Message sent') %></h2>
-
-<table class='sendemail-plugin-message-sent'>
-  <tr><td class='label'><strong><%= _('Subject') %>:</strong></td><td class='value'><em><%=h @mail.subject %></em></td></tr>
-  <tr><td class='label'><strong><%= _('Message') %>:</strong></td><td class='value'><pre><%=h render :file => 'send_email_plugin/sender/message' %></pre></td></tr>
-</table>
-
-<p><%= button :back, _('Back'), :back %></p>
@@ -11,6 +11,7 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     @profile = fast_create(Enterprise)
+    @profile.contact_email = 'enterprise@noosfero.org';@profile.save
     @product = fast_create(Product, :profile_id => @profile.id)
   end
   attr_reader :profile
@@ -0,0 +1,5 @@
+class AddTimestampsToTolerance < ActiveRecord::Migration
+  def change
+    add_timestamps :tolerance_time_plugin_tolerances
+  end
+end
@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
 class CommentTest < ActiveSupport::TestCase
   should 'create a publication after posting a comment' do
     article = fast_create(Article, :profile_id => fast_create(Person).id)
-    comment = Comment.new(:author_id => fast_create(Person).id, :body => 'Hello There!', :source_id => article.id)
-    assert_difference ToleranceTimePlugin::Publication, :count do
+    comment = Comment.new(:author => fast_create(Person), :body => 'Hello There!', :source => article)
+    assert_difference 'ToleranceTimePlugin::Publication.count', 1 do
       comment.save!
     end
     assert_not_nil ToleranceTimePlugin::Publication.find_by_target(comment)
@@ -13,7 +13,7 @@ class CommentTest &lt; ActiveSupport::TestCase
   should 'destroy publication if the comment is destroyed' do
     profile = fast_create(Profile)
     article = fast_create(Article, :profile_id => profile.id)
-    comment = fast_create(Comment, :source_id => article.id)
+    comment = fast_create(Comment, :source_id => article)
     comment_publication = ToleranceTimePlugin::Publication.create!(:target => comment)
     comment.destroy
     assert_raise ActiveRecord::RecordNotFound do
@@ -4,13 +4,14 @@ class ToleranceTimePlugin::PublicationTest &lt; ActiveSupport::TestCase
   should 'validate presence of target' do
     publication = ToleranceTimePlugin::Publication.new
     publication.valid?
-    assert publication.errors.invalid?(:target_id)
-    assert publication.errors.invalid?(:target_type)
+    assert publication.errors[:target_id].present?
+    assert publication.errors[:target_type].present?
  
     publication.target = fast_create(Article)
     publication.valid?
-    assert !publication.errors.invalid?(:target_id)
-    assert !publication.errors.invalid?(:target_type)
+
+    assert !publication.errors[:target_id].present?
+    assert !publication.errors[:target_type].present?
   end
  
   should 'validate uniqueness of target' do
@@ -19,7 +20,7 @@ class ToleranceTimePlugin::PublicationTest &lt; ActiveSupport::TestCase
     p2 = ToleranceTimePlugin::Publication.new(:target => target)
     p2.valid?
  
-    assert p2.errors.invalid?(:target_id)
+    assert p2.errors[:target_id].present?
   end
  
   should 'be able to find publication by target' do
@@ -4,11 +4,11 @@ class ToleranceTimePlugin::ToleranceTest &lt; ActiveSupport::TestCase
   should 'validate presence of profile' do
     tolerance = ToleranceTimePlugin::Tolerance.new
     tolerance.valid?
-    assert tolerance.errors.invalid?(:profile_id)
+    assert tolerance.errors[:profile_id].present?
  
     tolerance.profile = fast_create(Profile)
     tolerance.valid?
-    assert !tolerance.errors.invalid?(:profile_id)
+    assert !tolerance.errors[:profile_id].present?
   end
  
   should 'validate uniqueness of profile' do
@@ -17,7 +17,7 @@ class ToleranceTimePlugin::ToleranceTest &lt; ActiveSupport::TestCase
     t2 = ToleranceTimePlugin::Tolerance.new(:profile => profile)
     t2.valid?
  
-    assert t2.errors.invalid?(:profile_id)
+    assert t2.errors[:profile_id].present?
   end
  
   should 'validate integer format for comment and content tolerance' do
@@ -27,8 +27,8 @@ class ToleranceTimePlugin::ToleranceTest &lt; ActiveSupport::TestCase
     tolerance.comment_tolerance = 'sdfa'
     tolerance.content_tolerance = 4.5
     tolerance.valid?
-    assert tolerance.errors.invalid?(:comment_tolerance)
-    assert tolerance.errors.invalid?(:content_tolerance)
+    assert tolerance.errors[:comment_tolerance].present?
+    assert tolerance.errors[:content_tolerance].present?
  
     tolerance.comment_tolerance = 3
     tolerance.content_tolerance = 6
@@ -772,7 +772,7 @@ function original_image_dimensions(src) {
  
 function gravatarCommentFailback(img) {
   var link = img.parentNode;
-  link.href = "http://www.gravatar.com";
+  link.href = "//www.gravatar.com";
   img.src = img.getAttribute("data-gravatar");
 }
  
@@ -230,16 +230,20 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
  
   should 'back when update community info fail' do
     org = fast_create(Community)
-    Community.any_instance.stubs(:update_attributes).returns(false)
+    Community.any_instance.expects(:update_attributes!).raises(ActiveRecord::RecordInvalid)
     post :edit, :profile => org.identifier
+
     assert_template 'edit'
+    assert_response :success
   end
  
   should 'back when update enterprise info fail' do
     org = fast_create(Enterprise)
-    Enterprise.any_instance.stubs(:update_attributes).returns(false)
+
+    Enterprise.any_instance.expects(:update_attributes!).raises(ActiveRecord::RecordInvalid)
     post :edit, :profile => org.identifier
     assert_template 'edit'
+    assert_response :success
   end
  
   should 'show edit profile button' do
@@ -90,7 +90,7 @@ class CmsHelperTest &lt; ActionView::TestCase
     profile = fast_create(Profile)
     name = 'My folder'
     folder = fast_create(Folder, :name => name, :profile_id => profile.id)
-    confirm_message = "Are you sure that you want to remove the folder \"#{name}\"? Note that all the items inside it will also be removed!"
+    confirm_message = CGI.escapeHTML("Are you sure that you want to remove the folder \"#{name}\"? Note that all the items inside it will also be removed!")
     expects(:link_to).with('Delete', {:action => 'destroy', :id => folder.id}, :method => :post, :confirm => confirm_message, :class => 'button with-text icon-delete', :title => nil)
  
     result = display_delete_button(folder)
@@ -101,7 +101,7 @@ class CmsHelperTest &lt; ActionView::TestCase
     profile = fast_create(Profile)
     name = 'My article'
     article = fast_create(TinyMceArticle, :name => name, :profile_id => profile.id)
-    confirm_message = "Are you sure that you want to remove the item \"#{name}\"?"
+    confirm_message = CGI.escapeHTML("Are you sure that you want to remove the item \"#{name}\"?")
     expects(:link_to).with('Delete', {:action => 'destroy', :id => article.id}, :method => :post, :confirm => confirm_message, :class => 'button with-text icon-delete', :title => nil)
  
     result = display_delete_button(article)
@@ -9,18 +9,18 @@ class GravatarTest &lt; ActiveSupport::TestCase
  
   should 'generate a gravatar image url' do
     url = @object.gravatar_profile_image_url( 'rms@gnu.org', :size => 50, :d => 'crazyvatar' )
-    assert_match(/^http:\/\/www\.gravatar\.com\/avatar\/ed5214d4b49154ba0dc397a28ee90eb7?/, url)
+    assert_match(/^\/\/www\.gravatar\.com\/avatar\/ed5214d4b49154ba0dc397a28ee90eb7?/, url)
     assert_match(/(\?|&)d=crazyvatar(&|$)/, url)
     assert_match(/(\?|&)size=50(&|$)/, url)
  
     url = @object.gravatar_profile_image_url( 'rms@gnu.org', :size => 50, :d => 'nicevatar' )
-    assert_match(/^http:\/\/www\.gravatar\.com\/avatar\/ed5214d4b49154ba0dc397a28ee90eb7?/, url)
+    assert_match(/^\/\/www\.gravatar\.com\/avatar\/ed5214d4b49154ba0dc397a28ee90eb7?/, url)
     assert_match(/(\?|&)d=nicevatar(&|$)/, url)
     assert_match(/(\?|&)size=50(&|$)/, url)
   end
  
   should 'generate a gravatar profile url' do
     url = @object.gravatar_profile_url( 'rms@gnu.org' )
-    assert_equal('http://www.gravatar.com/ed5214d4b49154ba0dc397a28ee90eb7', url)
+    assert_equal('//www.gravatar.com/ed5214d4b49154ba0dc397a28ee90eb7', url)
   end
 end
@@ -190,6 +190,12 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_equal '098f6bcd4621d373cade4e832627b4f6', user.crypted_password
   end
  
+
+  def test_should_support_salted_md5_passwords
+    user = new_user(:login => 'lalala', :email => 'lalala@example.com', :password => 'test', :password_confirmation => 'test', :password_type => 'salted_md5', :salt => 'test')
+    assert_equal '05a671c66aefea124cc08b76ea6d30bb', user.crypted_password
+  end
+
   def test_should_support_crypt_passwords
     user = new_user(:login => 'lalala', :email => 'lalala@example.com', :password => 'test', :password_confirmation => 'test', :password_type => 'crypt', :salt => 'test')
     assert_equal 'teH0wLIpW0gyQ', user.crypted_password
@@ -349,7 +355,7 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_equal expected_hash['since_year'], person.user.data_hash['since_year']
  
     # Avatar stuff
-    assert_match 'http://www.gravatar.com/avatar/a0517761d5125820c28d87860bc7c02e', person.user.data_hash['avatar']
+    assert_match '/www.gravatar.com/avatar/a0517761d5125820c28d87860bc7c02e', person.user.data_hash['avatar']
     assert_match 'only_path=false', person.user.data_hash['avatar']
     assert_match 'd=', person.user.data_hash['avatar']
     assert_match 'size=20', person.user.data_hash['avatar']
...	...	@@ -19,14 +19,16 @@ class ProfileEditorController < MyProfileController
19	19	params[:profile_data][:custom_fields] \|\|= {}
20	20	end
21	21	Profile.transaction do
22		- Image.transaction do
23		- if @profile_data.update_attributes(params[:profile_data])
24		- redirect_to :action => 'index', :profile => profile.identifier
25		- else
26		- profile.identifier = params[:profile] if profile.identifier.blank?
	22	+ Image.transaction do
	23	+ begin
	24	+ @plugins.dispatch(:profile_editor_transaction_extras)
	25	+ @profile_data.update_attributes!(params[:profile_data])
	26	+ redirect_to :action => 'index', :profile => profile.identifier
	27	+ rescue Exception => ex
	28	+ profile.identifier = params[:profile] if profile.identifier.blank?
	29	+ end
27	30	end
28	31	end
29		- end
30	32	end
31	33	end
32	34
...	...
...	...	@@ -19,7 +19,7 @@ class ChatController < PublicController
19	19	def avatar
20	20	profile = environment.profiles.find_by_identifier(params[:id])
21	21	filename, mimetype = profile_icon(profile, :minor, true)
22		- if filename =~ /^https?:/
	22	+ if filename =~ /^(https?:)?\/\//
23	23	redirect_to filename
24	24	else
25	25	data = File.read(File.join(Rails.root, 'public', filename))
...	...
...	...	@@ -214,6 +214,10 @@ class User < ActiveRecord::Base
214	214	Digest::MD5.hexdigest(password)
215	215	end
216	216
	217	+ add_encryption_method :salted_md5 do \|password, salt\|
	218	+ Digest::MD5.hexdigest(password+salt)
	219	+ end
	220	+
217	221	add_encryption_method :clear do \|password, salt\|
218	222	password
219	223	end
...	...
1	1	<span class="download-link">
2	2	<span>Download</span>
3		- <strong><%= link_to generic.filename, generic.public_filename %></strong>
	3	+ <strong><%= link_to generic.filename, [Noosfero.root, generic.public_filename].join %></strong>
4	4	</span>
5	5
6	6	<div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
...	...
...	...	@@ -28,7 +28,7 @@
28	28
29	29	<%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %>
30	30
31		-<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>">
	31	+<img src="<%= [Noosfero.root, image.public_filename(:display)].join %>" class="<%=image.css_class_name%>">
32	32
33	33	<div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
34	34	<%= image.abstract %>
...	...
...	...	@@ -61,9 +61,6 @@
61	61	<%= submit_button(:search, _('Search')) %>
62	62	</div>
63	63
64		- <div>
65		- <%= lightbox_link_to _('More options'), :controller => 'search', :action => 'popup' %>
66		- </div>
67	64	<% end %>
68	65	</div>
69	66	<% end %>
...	...
...	...	@@ -27,6 +27,10 @@
27	27	<%= optional_field(@person, 'district', labelled_form_field(_('District'), text_field(:profile_data, :district, :rel => _('District')))) %>
28	28	<%= optional_field(@person, 'image', labelled_form_field(_('Image'), file_field(:file, :image, :rel => _('Image')))) %>
29	29
	30	+<% @plugins.dispatch(:extra_optional_fields).each do \|field\| %>
	31	+ <%= optional_field(@person, field[:name], labelled_form_field(field[:label], text_field(field[:object_name], field[:method], :rel => field[:label], :value => field[:value]))) %>
	32	+<% end %>
	33	+
30	34	<% optional_field(@person, 'schooling') do %>
31	35	<div class="formfieldline">
32	36	<label class='formlabel' for='profile_data_schooling'><%= _('Schooling') %></label>
...	...
...	...	@@ -20,11 +20,11 @@ Feature: Gravatar Support
20	20	Scenario: The Aurium's gravatar picture must link to his gravatar profile
21	21	# because Aurium has his picture registered at garvatar.com.
22	22	When I go to article "My Article"
23		- Then I should see "Aurium" linking to "http://www.gravatar.com/24a625896a07aa37fdb2352e302e96de"
	23	+ Then I should see "Aurium" linking to "//www.gravatar.com/24a625896a07aa37fdb2352e302e96de"
24	24
25	25	@selenium
26	26	Scenario: The NoOne's gravatar picture must link to Gravatar homepage
27	27	# because NoOne <nobody@colivre.coop.br> has no picture registered.
28	28	When I go to article "My Article"
29		- Then I should see "NoOne" linking to "http://www.gravatar.com"
	29	+ Then I should see "NoOne" linking to "//www.gravatar.com"
30	30
...	...
...	...	@@ -762,3 +762,11 @@ When /^I confirm the "(.*)" dialog$/ do \|confirmation\|
762	762	assert_equal confirmation, a.text
763	763	a.accept
764	764	end
	765	+
	766	+Given /^the field (.*) is public for all users$/ do \|field\|
	767	+ Person.all.each do \|person\|
	768	+ person.fields_privacy = Hash.new if person.fields_privacy.nil?
	769	+ person.fields_privacy[field] = "public"
	770	+ person.save!
	771	+ end
	772	+end
765	773	\ No newline at end of file
...	...
1	1	class LogMemoryConsumptionJob < Struct.new(:last_stat)
2	2	# Number of entries do display
3	3	N = 20
4		- # In seconds
5		- PERIOD = 10
6	4
7	5	def perform
8	6	logpath = File.join(Rails.root, 'log', "#{ENV['RAILS_ENV']}_memory_consumption.log")
...	...