merging with master

Leandro Santos
2 parents 5a628522 b7e8d430
Showing 415 changed files with 5782 additions and 4483 deletions Show diff stats
.gitlab-ci.yml
.travis.yml
Gemfile
Gemfile.lock
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/environment_role_manager_controller.rb
app/controllers/admin/features_controller.rb
app/controllers/admin/organizations_controller.rb
app/controllers/admin/role_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/email_templates_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/email_templates_controller.rb
app/controllers/my_profile/friends_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
@@ -14,6 +14,10 @@ stages:
 #  script: bundle exec rake ci:smoke
 #  stage: smoke-tests
  
+api:
+  script: bundle exec rake test:api
+  stage: all-tests
+
 units:
   script: bundle exec rake test:units
   stage: all-tests
@@ -5,24 +5,21 @@ notifications:
     template:
       - "%{repository_slug} %{branch} %{commit} %{commit_subject} - %{result} %{build_url}"
  
+# trusty constainers take more time to start
+#dist: trusty
+
 language: ruby
 rvm:
-  - 2.2.3
+  - 2.2
+  # ruby 2.3 works but isn't stable on travis
+
+cache: bundler
  
-sudo: false
 addons:
   apt:
     packages:
-      - po4a
-      - iso-codes
       - tango-icon-theme
       - pidgin-data
-      # for gem extensions
-      - libmagickwand-dev
-      - libpq-dev
-      - libreadline-dev
-      - libsqlite3-dev
-      - libxslt1-dev
   artifacts:
     paths:
       - $(ls tmp/artifact* | tr "\n" ":")
@@ -37,7 +34,7 @@ before_install:
   - gem install bundler
   - sed -i 's/softwarepublico.gov.br\/gitlab/github.com/' .gitmodules
   - git submodule update --init --recursive
-cache: bundler
+#cache: bundler
  
 before_script:
   - mkdir -p tmp/{pids,cache} log cache
@@ -46,19 +43,25 @@ before_script:
 # database
   - cp config/database.yml.travis config/database.yml
   - psql -c 'create database myapp_test;' -U postgres
-  - bundle exec rake db:schema:load &>/dev/null
+  - bundle exec rake db:schema:load
   - bundle exec rake db:migrate &>/dev/null
  
 env:
+  - TASK=test:api
   - TASK=test:units
   - TASK=test:functionals
   - TASK=test:integration
-  - TASK=cucumber LANG=en
-  - TASK=selenium
-  - SLICE=1/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
-  - SLICE=2/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
-  - SLICE=3/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
-  - SLICE=4/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
+  - SLICE=1/2 TASK=cucumber LANG=en
+  - SLICE=2/2 TASK=cucumber LANG=en
+  - SLICE=1/4 TASK=selenium
+  - SLICE=2/4 TASK=selenium
+  - SLICE=3/4 TASK=selenium
+  - SLICE=4/4 TASK=selenium
+  - SLICE=1/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install
+  - SLICE=2/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install
+  - SLICE=3/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install
+  - SLICE=4/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install
+  - SLICE=5/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install
  
 script:
   - ./script/ci
@@ -31,6 +31,7 @@ gem &#39;whenever&#39;, :require =&gt; false
 gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
 gem 'diffy',                    '~> 3.0'
 gem 'slim'
+gem 'activerecord-session_store', ('1.0.0.pre' if RUBY_VERSION >= '2.3.0')
  
 # API dependencies
 gem 'grape',                    '~> 0.12'
@@ -44,6 +45,7 @@ gem &#39;rack-contrib&#39;
 gem 'liquid',                    '~> 3.0.3'
  
 gem 'api-pagination',           '>= 4.1.1'
+gem 'liquid',                    '~> 3.0.3'
  
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -55,8 +57,6 @@ gem &#39;protected_attributes&#39;
 gem 'rails-observers'
 gem 'actionpack-page_caching'
 gem 'actionpack-action_caching'
-gem 'activerecord-session_store'
-gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
  
 # gem for error reporting
 gem 'airbrake', '~> 4'
@@ -141,7 +141,6 @@ GEM
       activemodel (= 4.2.5)
       activesupport (= 4.2.5)
       arel (~> 6.0)
-    activerecord-deprecated_finders (1.0.4)
     activerecord-session_store (0.1.2)
       actionpack (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
@@ -417,7 +416,6 @@ DEPENDENCIES
   action_tracker_has_comments (= 0.0.0)!
   actionpack-action_caching
   actionpack-page_caching
-  activerecord-deprecated_finders
   activerecord-jdbcpostgresql-adapter
   activerecord-session_store
   acts-as-taggable-on (~> 3.5)
@@ -34,7 +34,7 @@ class AdminPanelController &lt; AdminController
     env = environment
     @portal_community = env.portal_community || Community.new
     if request.post?
-      portal_community = env.communities.find_by_identifier(params[:portal_community_identifier])
+      portal_community = env.communities.where(identifier: params[:portal_community_identifier]).first
       if portal_community
         if (env.portal_community != portal_community)
           env.portal_community = portal_community
@@ -7,7 +7,7 @@ class EnvironmentRoleManagerController &lt; AdminController
  
   def change_roles
     @admin = Person.find(params[:id])
-    @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) }
+    @roles = Role.all.select{ |r| r.has_kind?(:environment) }
   end
  
   def update_roles
@@ -22,7 +22,7 @@ class EnvironmentRoleManagerController &lt; AdminController
   end
  
   def change_role
-    @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) }
+    @roles = Role.all.select{ |r| r.has_kind?(:environment) }
     @admin = Person.find(params[:id])
     @associations = @admin.find_roles(environment)
   end
@@ -34,7 +34,7 @@ class EnvironmentRoleManagerController &lt; AdminController
       redirect_to :action => 'index'
     else
       @admin = Person.find(params[:person])
-      @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) }
+      @roles = Role.all.select{ |r| r.has_kind?(:environment) }
       render :action => 'affiliate'
     end
   end
@@ -60,7 +60,7 @@ class EnvironmentRoleManagerController &lt; AdminController
   end
  
   def make_admin
-    @people = Person.find(:all)
-    @roles = Role.find(:all).select{|r|r.has_kind?(:environment)}
+    @people = Person.all
+    @roles = Role.all.select{|r|r.has_kind?(:environment)}
   end
 end
@@ -100,7 +100,7 @@ class FeaturesController &lt; AdminController
     CustomField.destroy(custom_fields_to_destroy)
  
     custom_field_list.each_pair do |id, custom_field|
-      field = CustomField.find_by_id(id)
+      field = CustomField.find_by(id: id)
       if not field.blank?
         params_to_update = custom_field.except(:format, :extras, :customized_type,:environment)
         field.update_attributes(params_to_update)
@@ -7,7 +7,11 @@ class OrganizationsController &lt; AdminController
     @title = _('Organization profiles')
     @type = params[:type] || "any"
     @types_filter = [[_('All'), 'any'], [_('Community'), 'Community'], [_('Enterprise'), 'Enterprise']]
-    @types_filter = @types_filter | @plugins.dispatch(:organization_types_filter_options)
+    @plugins.dispatch_without_flatten(:organization_types_filter_options).each do |plugin_response|
+      @types_filter = @types_filter | plugin_response
+    end
+    @types_hash = {}
+    @types_filter.each{|list| @types_hash[list.last] = list.first}
  
     scope = @plugins.dispatch_first(:filter_manage_organization_scope, @type)
     if scope.blank?
@@ -2,7 +2,7 @@ class RoleController &lt; AdminController
   protect 'manage_environment_roles', :environment
  
   def index
-    @roles = environment.roles.find(:all, :conditions => {:profile_id => nil})
+    @roles = environment.roles.where profile_id: nil
   end
  
   def new
@@ -48,7 +48,7 @@ class UsersController &lt; AdminController
  
   def destroy_user
     if request.post?
-      person = environment.people.find_by_id(params[:id])
+      person = environment.people.find_by id: params[:id]
       if person && person.destroy
         session[:notice] = _('The profile was deleted.')
       else
@@ -128,7 +128,7 @@ class ApplicationController &lt; ActionController::Base
     # Sets text domain based on request host for custom internationalization
     FastGettext.text_domain = Domain.custom_locale(request.host)
  
-    @domain = Domain.find_by_name(request.host)
+    @domain = Domain.by_name(request.host)
     if @domain.nil?
       @environment = Environment.default
       # Avoid crashes on test and development setups
@@ -143,7 +143,7 @@ class ApplicationController &lt; ActionController::Base
  
       # Check if the requested profile belongs to another domain
       if @profile && !params[:profile].blank? && params[:profile] != @profile.identifier
-        @profile = @environment.profiles.find_by_identifier params[:profile]
+        @profile = @environment.profiles.find_by(identifier: params[:profile])
         redirect_to url_for(params.merge host: @profile.default_hostname)
       end
     end
@@ -175,7 +175,7 @@ class ApplicationController &lt; ActionController::Base
   def load_category
     unless params[:category_path].blank?
       path = params[:category_path]
-      @category = environment.categories.find_by_path(path)
+      @category = environment.categories.find_by(path: path)
       if @category.nil?
         render_not_found(path)
       end
@@ -16,10 +16,9 @@ class BoxOrganizerController &lt; ApplicationController
       target_position = block_before.position
  
       @target_box = block_before.box
-    else
-      (params[:target] =~ /end-of-box-([0-9]+)/)
+    elsif params[:target] =~ /end-of-box-([0-9]+)/
  
-      @target_box = boxes_holder.boxes.find_by_id($1)
+      @target_box = boxes_holder.boxes.find_by id: $1
     end
  
     @block = new_block(params[:type], @target_box) if @block.nil?
@@ -35,8 +34,8 @@ class BoxOrganizerController &lt; ApplicationController
       @block.insert_at(@target_box.blocks.size + 1)
       @block.move_to_bottom
     else
-      # insert the block in the given position
-      @block.insert_at(@block.position && @block.position < target_position ? target_position - 1 : target_position)
+      new_position = if @block.position and @block.position < target_position then target_position - 1 else target_position end
+      @block.insert_at new_position
     end
  
     @block.save!
@@ -1,62 +0,0 @@
-class EmailTemplatesController < ApplicationController
-
-  def index
-    @email_templates = owner.email_templates
-  end
-
-  def show
-    @email_template = owner.email_templates.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @email_template }
-    end
-  end
-
-  def show_parsed
-    @email_template = owner.email_templates.find(params[:id])
-    template_params = {:profile => owner, :environment => environment}
-    render json: {:parsed_body => @email_template.parsed_body(template_params), :parsed_subject => @email_template.parsed_subject(template_params)}
-  end
-
-  def new
-    @email_template = owner.email_templates.build(:owner => owner)
-  end
-
-  def edit
-    @email_template = owner.email_templates.find(params[:id])
-  end
-
-  def create
-    @email_template = owner.email_templates.build(params[:email_template])
-    @email_template.owner = owner
-
-    if @email_template.save
-      session[:notice] = _('Email template was successfully created.')
-      redirect_to url_for(:action => :index)
-    else
-      render action: "new"
-    end
-  end
-
-  def update
-    @email_template = owner.email_templates.find(params[:id])
-
-    if @email_template.update_attributes(params[:email_template])
-      session[:notice] = _('Email template was successfully updated.')
-      redirect_to url_for(:action => :index)
-    else
-      render action: "edit"
-    end
-  end
-
-  def destroy
-    @email_template = owner.email_templates.find(params[:id])
-    @email_template.destroy
-
-    respond_to do |format|
-      format.html { redirect_to url_for(:action => :index)}
-      format.json { head :no_content }
-    end
-  end
-end
@@ -3,6 +3,7 @@ class CmsController &lt; MyProfileController
   protect 'edit_profile', :profile, :only => [:set_home_page]
  
   include ArticleHelper
+  include CategoriesHelper
  
   def search_tags
     arg = params[:term].downcase
@@ -33,7 +34,7 @@ class CmsController &lt; MyProfileController
  
   protect_if :only => [:new, :upload_files] do |c, user, profile|
     parent_id = c.params[:article].present? ? c.params[:article][:parent_id] : c.params[:parent_id]
-    parent = profile.articles.find_by_id(parent_id)
+    parent = profile.articles.find_by(id: parent_id)
     user && user.can_post_content?(profile, parent)
   end
  
@@ -58,11 +59,10 @@ class CmsController &lt; MyProfileController
  
   def index
     @article = nil
-    @articles = profile.top_level_articles.paginate(
-      :order => "case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC",
-      :per_page => per_page,
-      :page => params[:npage]
-    )
+    @articles = profile.top_level_articles
+      .order("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC")
+      .paginate(per_page: per_page, page: params[:npage])
+
     render :action => 'view'
   end
  
@@ -256,12 +256,7 @@ class CmsController &lt; MyProfileController
  
   def update_categories
     @object = params[:id] ? @profile.articles.find(params[:id]) : Article.new
-    @categories = @toplevel_categories = environment.top_level_categories
-    if params[:category_id]
-      @current_category = Category.find(params[:category_id])
-      @categories = @current_category.children
-    end
-    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'article' }
+    render_categories 'article'
   end
  
   def search_communities_to_publish
@@ -0,0 +1,77 @@
+class EmailTemplatesController < ApplicationController
+
+  def index
+    @email_templates = owner.email_templates
+  end
+
+  def show
+    @email_template = owner.email_templates.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @email_template }
+    end
+  end
+
+  def show_parsed
+    @email_template = owner.email_templates.find(params[:id])
+    template_params = {:profile => owner, :environment => environment}
+    render json: {:parsed_body => @email_template.parsed_body(template_params), :parsed_subject => @email_template.parsed_subject(template_params)}
+  end
+
+  def new
+    @email_template = owner.email_templates.build(:owner => owner)
+    @template_params_allowed = template_params_allowed template_params.keys
+  end
+
+  def edit
+    @email_template = owner.email_templates.find(params[:id])
+    @template_params_allowed = template_params_allowed template_params.keys
+  end
+
+  def create
+    @email_template = owner.email_templates.build(params[:email_template])
+    @email_template.owner = owner
+
+    if @email_template.save
+      session[:notice] = _('Email template was successfully created.')
+      redirect_to url_for(:action => :index)
+    else
+      render action: "new"
+    end
+  end
+
+  def update
+    @email_template = owner.email_templates.find(params[:id])
+
+    if @email_template.update_attributes(params[:email_template])
+      session[:notice] = _('Email template was successfully updated.')
+      redirect_to url_for(:action => :index)
+    else
+      render action: "edit"
+    end
+  end
+
+  def destroy
+    @email_template = owner.email_templates.find(params[:id])
+    @email_template.destroy
+
+    respond_to do |format|
+      format.html { redirect_to url_for(:action => :index)}
+      format.json { head :no_content }
+    end
+  end
+
+  private
+
+  def template_params
+    {:profile_name => current_user.name, :environment_name => environment.name }
+  end
+
+  def template_params_allowed params
+      result = ""
+      params.each{ |param| result <<  "{{ #{param} }} " } if params
+      result
+  end
+
+end
@@ -22,7 +22,7 @@ class FriendsController &lt; MyProfileController
   end
  
   def remove_suggestion
-    @person = profile.suggested_people.find_by_identifier(params[:id])
+    @person = profile.suggested_people.find_by(identifier: params[:id])
     redirect_to :action => 'suggest' unless @person
     if @person && request.post?
       profile.remove_suggestion(@person)
@@ -32,7 +32,7 @@ class FriendsController &lt; MyProfileController
   end
  
   def connections
-    @suggestion = profile.suggested_profiles.of_person.enabled.find_by_suggestion_id(params[:id])
+    @suggestion = profile.suggested_profiles.of_person.enabled.find_by(suggestion_id: params[:id])
     if @suggestion
       @tags = @suggestion.tag_connections
       @profiles = @suggestion.profile_connections
@@ -35,7 +35,7 @@ class ManageProductsController &lt; ApplicationController
   end
  
   def categories_for_selection
-    @category = environment.categories.find_by_id params[:category_id]
+    @category = environment.categories.find_by id: params[:category_id]
     @object_name = params[:object_name]
     if @category
       @categories = @category.children
@@ -103,7 +103,7 @@ class ManageProductsController &lt; ApplicationController
   def search_categories
     @term = params[:term].downcase
     conditions = ['LOWER(name) LIKE ? OR LOWER(name) LIKE ?', "#{@term}%", "% #{@term}%"]
-    @categories = ProductCategory.all :conditions => conditions, :limit => 10
+    @categories = ProductCategory.where(conditions).limit(10)
     render :json => (@categories.map do |category|
       {:label => category.name, :value => category.id}
     end)
@@ -169,7 +169,7 @@ class ManageProductsController &lt; ApplicationController
  
   def edit_input
     if request.xhr?
-      @input = @profile.inputs.find_by_id(params[:id])
+      @input = @profile.inputs.find_by id: params[:id]
       if @input
         if request.post?
           if @input.update(params[:input])
@@ -206,7 +206,6 @@ class ManageProductsController &lt; ApplicationController
   end
  
   def certifiers_for_selection
-    # updated to use hash as argument to exists? to avoid sql injection vunerabillity (http://brakemanscanner.org/docs/warning_types/sql_injection/)
     @qualifier = Qualifier.exists?(:id => params[:id]) ? Qualifier.find(params[:id]) : nil
     render :update do |page|
       page.replace_html params[:certifier_area], :partial => 'certifiers_for_selection'
@@ -5,7 +5,7 @@ class MembershipsController &lt; MyProfileController
  
   def index
     @roles = environment.roles.select do |role|
-      ra = profile.role_assignments.find_by_role_id(role.id)
+      ra = profile.role_assignments.find_by(role_id: role.id)
       ra.present? && ra.resource_type == 'Profile'
     end
     @filter = params[:filter_type].to_i
@@ -47,7 +47,7 @@ class MembershipsController &lt; MyProfileController
   end
  
   def remove_suggestion
-    @community = profile.suggested_communities.find_by_identifier(params[:id])
+    @community = profile.suggested_communities.find_by(identifier: params[:id])
     custom_per_page = params[:per_page] || per_page
     redirect_to :action => 'suggest' unless @community
     if @community && request.post?
@@ -58,7 +58,7 @@ class MembershipsController &lt; MyProfileController
   end
  
   def connections
-    @suggestion = profile.suggested_profiles.of_community.enabled.find_by_suggestion_id(params[:id])
+    @suggestion = profile.suggested_profiles.of_community.enabled.find_by(suggestion_id: params[:id])
     if @suggestion
       @tags = @suggestion.tag_connections
       @profiles = @suggestion.profile_connections
@@ -6,6 +6,7 @@ class ProfileDesignController &lt; BoxOrganizerController
  
   before_filter :protect_uneditable_block, :only => [:save]
   before_filter :protect_fixed_block, :only => [:move_block]
+  include CategoriesHelper
  
   def protect_uneditable_block
     block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
@@ -67,4 +68,9 @@ class ProfileDesignController &lt; BoxOrganizerController
     blocks
   end
  
+  def update_categories
+    @object = params[:id] ? @profile.blocks.find(params[:id]) : Block.new
+    render_categories 'block'
+  end
+
 end
@@ -9,6 +9,7 @@ class ProfileEditorController &lt; MyProfileController
   before_filter :check_user_can_edit_header_footer, :only => [:header_footer]
   helper_method :has_welcome_page
   helper CustomFieldsHelper
+  include CategoriesHelper
  
   def index
     @pending_tasks = Task.to(profile).pending.without_spam.select{|i| user.has_permission?(i.permission, profile)}
@@ -63,12 +64,7 @@ class ProfileEditorController &lt; MyProfileController
  
   def update_categories
     @object = profile
-    @categories = @toplevel_categories = environment.top_level_categories
-    if params[:category_id]
-      @current_category = Category.find(params[:category_id])
-      @categories = @current_category.children
-    end
-    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => 'profile_data' }
+    render_categories 'profile_data'
   end
  
   def header_footer
@@ -60,7 +60,7 @@ class ProfileMembersController &lt; MyProfileController
       redirect_to :action => 'index'
     else
       @member = Person.find(params[:person])
-      @roles = environment.roles.find(:all).select{ |r| r.has_kind?('Profile') }
+      @roles = environment.roles.all.select{ |r| r.has_kind?('Profile') }
       render :action => 'affiliate'
     end
   end
@@ -120,7 +120,7 @@ class ProfileMembersController &lt; MyProfileController
     @collection = :profile_admins
  
     if profile.community?
-      member = profile.members.find_by_identifier(params[:id])
+      member = profile.members.find_by(identifier: params[:id])
       profile.add_admin(member)
     end
     render :layout => false
@@ -131,7 +131,7 @@ class ProfileMembersController &lt; MyProfileController
     @collection = :profile_admins
  
     if profile.community?
-      member = profile.members.find_by_identifier(params[:id])
+      member = profile.members.find_by(identifier: params[:id])
       profile.remove_admin(member)
     end
     render :layout => false
@@ -15,12 +15,12 @@ class SpamController &lt; MyProfileController
           profile.comments_received.find(params[:remove_comment]).destroy
         end
         if params[:remove_task]
-          Task.to(profile).find_by_id(params[:remove_task]).destroy
+          Task.to(profile).find_by(id: params[:remove_task]).destroy
         end
         if params[:mark_comment_as_ham]
           profile.comments_received.find(params[:mark_comment_as_ham]).ham!
         end
-        if params[:mark_task_as_ham] && (t = Task.to(profile).find_by_id(params[:mark_task_as_ham]))
+        if params[:mark_task_as_ham] && (t = Task.to(profile).find_by(id: params[:mark_task_as_ham]))
           t.ham!
         end
         if request.xhr?
 class TasksController < MyProfileController
  
-  protect [:perform_task, :view_tasks], :profile, :only => [:index, :save_tags, :search_tags]
-  protect :perform_task, :profile, :only => [:processed, :change_responsible, :close, :new, :list_requested, :ticket_details, :search_tags]
   include TasksHelper
  
+  protect [:perform_task, :view_tasks], :profile, :only => [:index, :save_tags, :search_tags]
+  protect :perform_task, :profile, :except => [:index, :save_tags, :search_tags]
+  helper CustomFieldsHelper
  
   def index
-    @rejection_email_templates = profile.email_templates.find_all_by_template_type(:task_rejection)
-    @acceptance_email_templates = profile.email_templates.find_all_by_template_type(:task_acceptance)
+    @rejection_email_templates = profile.email_templates.where template_type: :task_rejection
+    @acceptance_email_templates = profile.email_templates.where template_type: :task_acceptance
  
     @filter_type = params[:filter_type].presence
     @filter_text = params[:filter_text].presence
@@ -110,7 +111,7 @@ class TasksController &lt; MyProfileController
   end
  
   def list_requested
-    @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
+    @tasks = Task.without_spam.where requestor_id: profile.id
   end
  
   def ticket_details
@@ -17,7 +17,7 @@ class AccountController &lt; ApplicationController
   end
  
   def activate
-    @user = User.find_by_activation_code(params[:activation_code]) if params[:activation_code]
+    @user = User.find_by(activation_code: params[:activation_code]) if params[:activation_code]
     if @user
       unless @user.environment.enabled?('admin_must_approve_new_users')
         if @user.activate
@@ -126,7 +126,7 @@ class AccountController &lt; ApplicationController
           end
           @user.community_to_join = session[:join]
           @user.signup!
-          owner_role = Role.find_by_name('owner')
+          owner_role = Role.find_by(name: 'owner')
           @user.person.affiliate(@user.person, [owner_role]) if owner_role
           invitation = Task.from_code(@invitation_code).first
           if invitation
@@ -313,7 +313,7 @@ class AccountController &lt; ApplicationController
   end
  
   def check_email
-    if User.find_by_email_and_environment_id(params[:address], environment.id).nil?
+    if User.find_by(email: params[:address], environment_id: environment.id).nil?
       @status = _('This e-mail address is available')
       @status_class = 'validated'
     else
@@ -510,7 +510,7 @@ class AccountController &lt; ApplicationController
   def check_join_in_community(user)
     profile_to_join = session[:join]
     unless profile_to_join.blank?
-     environment.profiles.find_by_identifier(profile_to_join).add_member(user.person)
+     environment.profiles.find_by(identifier: profile_to_join).add_member(user.person)
      session.delete(:join)
     end
   end
@@ -44,7 +44,7 @@ class ChatController &lt; PublicController
   end
  
   def avatar
-    profile = environment.profiles.find_by_identifier(params[:id])
+    profile = environment.profiles.find_by(identifier: params[:id])
     filename, mimetype = profile_icon(profile, :minor, true)
     if filename =~ /^(https?:)?\/\//
       redirect_to filename
@@ -87,7 +87,7 @@ class ChatController &lt; PublicController
   end
  
   def recent_messages
-    other = environment.profiles.find_by_identifier(params[:identifier])
+    other = environment.profiles.find_by(identifier: params[:identifier])
     if other.kind_of?(Organization)
       messages = ChatMessage.where('to_id=:other', :other => other.id)
     else
@@ -6,7 +6,6 @@ class ContactController &lt; PublicController
   def new
     @contact = build_contact
     if request.post? && params[:confirm] == 'true'
-      # updated to use hash as argument to exists? to avoid sql injection vunerabillity (http://brakemanscanner.org/docs/warning_types/sql_injection/)
       @contact.city = (!params[:city].blank? && City.exists?(:id => params[:city])) ? City.find(params[:city]).name : nil
       @contact.state = (!params[:state].blank? && State.exists?(:id => params[:state])) ? State.find(params[:state]).name : nil
       if @contact.deliver
@@ -22,7 +22,7 @@ class ContentViewerController &lt; ApplicationController
       @page = profile.home_page
       return if redirected_to_profile_index
     else
-      @page = profile.articles.find_by_path(path)
+      @page = profile.articles.find_by path: path
       return if redirected_page_from_old_path(path)
     end
  
@@ -80,13 +80,13 @@ class ContentViewerController &lt; ApplicationController
  
   def versions_diff
     path = params[:page]
-    @page = profile.articles.find_by_path(path)
-    @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
+    @page = profile.articles.find_by path: path
+    @v1, @v2 = @page.versions.find_by(version: params[:v1]), @page.versions.find_by(version: params[:v2])
   end
  
   def article_versions
     path = params[:page]
-    @page = profile.articles.find_by_path(path)
+    @page = profile.articles.find_by path: path
     return unless allow_access_to_page(path)
  
     render_access_denied unless @page.display_versions?
@@ -173,7 +173,7 @@ class ContentViewerController &lt; ApplicationController
  
   def redirected_page_from_old_path(path)
     unless @page
-      page_from_old_path = profile.articles.find_by_old_path(path)
+      page_from_old_path = profile.articles.find_by_old_path path
       if page_from_old_path
         redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
         return true
@@ -194,7 +194,7 @@ class ContentViewerController &lt; ApplicationController
   end
  
   def rendered_versioned_article
-    @versioned_article = @page.versions.find_by_version(@version)
+    @versioned_article = @page.versions.find_by version: @version
     if @versioned_article && @page.versions.latest.version != @versioned_article.version
       render :template => 'content_viewer/versioned_article.html.erb'
       return true
@@ -68,7 +68,7 @@ class EnterpriseRegistrationController &lt; ApplicationController
   # saying to the user that the enterprise was created.
   def creation
     @create_enterprise.perform
-    @enterprise = @create_enterprise.target.profiles.find_by_identifier(@create_enterprise.identifier)
+    @enterprise = @create_enterprise.target.profiles.find_by identifier: @create_enterprise.identifier
   end
  
 end
@@ -339,7 +339,7 @@ class ProfileController &lt; PublicController
         user.register_report(abuse_report, profile)
  
         if !params[:content_type].blank?
-          abuse_report = AbuseReport.find_by_reporter_id_and_abuse_complaint_id(user.id, profile.opened_abuse_complaint.id)
+          abuse_report = AbuseReport.find_by(reporter_id: user.id, abuse_complaint_id: profile.opened_abuse_complaint.id)
           Delayed::Job.enqueue DownloadReportedImagesJob.new(abuse_report, article)
         end
  
@@ -373,8 +373,8 @@ class ProfileController &lt; PublicController
  
   def send_mail
     @mailing = profile.mailings.build(params[:mailing])
-    @email_templates = profile.email_templates.find_all_by_template_type(:organization_members)
     @mailing.data = session[:members_filtered] ? {:members_filtered => session[:members_filtered]} : {}
+    @email_templates = profile.email_templates.where template_type: :organization_members
     if request.post?
       @mailing.locale = locale
       @mailing.person = user
@@ -171,7 +171,7 @@ class SearchController &lt; PublicController
       render_not_found if params[:action] == 'category_index'
     else
       path = params[:category_path]
-      @category = environment.categories.find_by_path(path)
+      @category = environment.categories.find_by path: path
       if @category.nil?
         render_not_found(path)
       else
@@ -181,14 +181,14 @@ class SearchController &lt; PublicController
   end
  
   def available_searches
-    @available_searches ||= ActiveSupport::OrderedHash[
-      :articles, _('Contents'),
-      :people, _('People'),
-      :communities, _('Communities'),
-      :enterprises, _('Enterprises'),
-      :products, _('Products and Services'),
-      :events, _('Events'),
-    ]
+    @available_searches ||= {
+      articles:    _('Contents'),
+      people:      _('People'),
+      communities: _('Communities'),
+      enterprises: _('Enterprises'),
+      products:    _('Products and Services'),
+      events:      _('Events'),
+    }
   end
  
   def load_search_assets
@@ -248,7 +248,11 @@ class SearchController &lt; PublicController
   def visible_profiles(klass, *extra_relations)
     relations = [:image, :domains, :environment, :preferred_domain]
     relations += extra_relations
-    @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
+    if current_user && current_user.person.is_admin?
+      @environment.send(klass.name.underscore.pluralize).includes(relations)
+    else
+      @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
+    end
   end
  
   def per_page
@@ -256,13 +260,13 @@ class SearchController &lt; PublicController
   end
  
   def available_assets
-    assets = ActiveSupport::OrderedHash[
-      :articles, _('Contents'),
-      :enterprises, _('Enterprises'),
-      :people, _('People'),
-      :communities, _('Communities'),
-      :products, _('Products and Services'),
-    ]
+    assets = {
+      articles:    _('Contents'),
+      enterprises: _('Enterprises'),
+      people:      _('People'),
+      communities: _('Communities'),
+      products:    _('Products and Services'),
+    }
   end
  
 end
@@ -56,6 +56,8 @@ module ApplicationHelper
  
   include ThemeLoaderHelper
  
+  include TaskHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -318,7 +320,7 @@ module ApplicationHelper
     if File.exists?(Rails.root.join('public', theme_path, 'favicon.ico'))
       '/designs/themes/' + profile.theme + '/favicon.ico'
     else
-      favicon = profile.articles.find_by_path('favicon.ico')
+      favicon = profile.articles.find_by path: 'favicon.ico'
       if favicon
         favicon.public_filename
       else
@@ -1165,8 +1167,8 @@ module ApplicationHelper
   end
  
   def default_folder_for_image_upload(profile)
-    default_folder = profile.folders.find_by_type('Gallery')
-    default_folder = profile.folders.find_by_type('Folder') if default_folder.nil?
+    default_folder = profile.folders.find_by type: 'Gallery'
+    default_folder = profile.folders.find_by type: 'Folder' if default_folder.nil?
     default_folder
   end
  
 module BlockHelper
  
-  def block_title(title)
-    tag_class = 'block-title'
+  def block_title(title, subtitle=nil)
+    block_header = block_heading title
+    block_header += block_heading(subtitle, 'h4') if subtitle
+    content_tag 'div', block_header, :class => 'block-header'
+  end
+
+  def block_heading(title, heading='h3')
+    tag_class = 'block-' + (heading == 'h3' ? 'title' : 'subtitle')
     tag_class += ' empty' if title.empty?
-    content_tag 'h3', content_tag('span', h(title)), :class => tag_class
+    content_tag heading, content_tag('span', h(title)), :class => tag_class
   end
  
   def highlights_block_config_image_fields(block, image={}, row_number=nil)
@@ -34,4 +34,15 @@ module CategoriesHelper
       {:id => category_id ? "select-category-#{category_id}-link" : nil, :remote => true, :class => html_class}.merge(html_options)
   end
  
+  def render_categories object_name
+    @toplevel_categories = environment.top_level_categories
+    if params[:category_id]
+      @current_category = Category.find(params[:category_id])
+      @categories = @current_category.children
+    else
+      @categories = @toplevel_categories
+    end
+    render :template => 'shared/update_categories', :locals => { :category => @current_category, :object_name => object_name }
+  end
+
 end
@@ -37,8 +37,15 @@ module CustomFieldsHelper
   end
  
   def display_custom_field_value(custom_field_value)
-    value = profile.custom_value(custom_field_value.custom_field.name)
-    case custom_field_value.custom_field.format
+    value_for_format custom_field_value.custom_field.format, custom_field_value.value
+  end
+
+  def display_value_for_custom_field(custom_field, value)
+    value_for_format custom_field.format, value
+  end
+
+  def value_for_format format, value
+    case format
     when 'text', 'list', 'numeric', 'date', 'string'
       value
     when 'checkbox'
@@ -47,6 +54,7 @@ module CustomFieldsHelper
       url = value[/\Ahttps?:\/\//i] ? value : "http://#{value}"
       link_to(value, url, :target => '_blank')
     end
+
   end
  
   private
@@ -50,15 +50,15 @@ module FormsHelper
   end
  
   def select_city( simple=false )
-    states = State.find(:all, :order => 'name')
-    
+    states = State.order(:name).all
+
     state_id = 'state-' + FormsHelper.next_id_number
     city_id = 'city-' + FormsHelper.next_id_number
  
     if states.length < 1
       return
     end
-    
+
     if simple
       states = [State.new(:name => _('Select the State'))] + states
       cities = [City.new(:name => _('Select the City'))]
@@ -82,7 +82,7 @@ module FormsHelper
       states = [State.new(:name => '---')] + states
       cities = [City.new(:name => '---')]
  
-      html = 
+      html =
       content_tag( 'div',
                    labelled_select( _('State:'), 'state', :id, :name, nil, states, :id => state_id ),
                    :class => 'select_state_for_origin' ) +
@@ -90,7 +90,7 @@ module FormsHelper
                    labelled_select( _('City:'), 'city', :id, :name, nil, cities, :id => city_id ),
                    :class => 'select_city_for_origin' )
     end
-    
+
     html +
     observe_field( state_id, :update => city_id, :function => "new Ajax.Updater(#{city_id.inspect}, #{url_for(:controller => 'search', :action => 'cities').inspect}, {asynchronous:true, evalScripts:true, parameters:'state_id=' + value}); $(#{city_id.inspect}).innerHTML = '<option>#{_('Loading...')}</option>'", :with => 'state_id')
   end
@@ -222,7 +222,7 @@ module ManageProductsHelper
   end
   def select_certifiers(qualifier, product = nil)
     if qualifier
-      selected = product ? product.product_qualifiers.find_by_qualifier_id(qualifier.id).certifier_id : nil
+      selected = product ? product.product_qualifiers.find_by(qualifier_id: qualifier.id).certifier_id : nil
       select_tag("product[qualifiers_list][#{qualifier.id}]", options_for_select(certifiers_for_select(qualifier), selected))
     else
       select_tag("product[qualifiers_list][nil]")
 module ProfileHelper
  
-  COMMON_CATEGORIES = ActiveSupport::OrderedHash.new
+  COMMON_CATEGORIES = {}
   COMMON_CATEGORIES[:content] = [:blogs, :image_galleries, :events, :article_tags]
   COMMON_CATEGORIES[:interests] = [:interests]
   COMMON_CATEGORIES[:general] = nil
  
-  PERSON_CATEGORIES = ActiveSupport::OrderedHash.new
+  PERSON_CATEGORIES = {}
   PERSON_CATEGORIES[:basic_information] = [:nickname, :sex, :birth_date, :location, :privacy_setting, :created_at]
   PERSON_CATEGORIES[:contact] = [:contact_phone, :cell_phone, :comercial_phone, :contact_information, :email, :personal_website, :jabber_id]
   PERSON_CATEGORIES[:location] = [:address, :address_reference, :zip_code, :city, :state, :district, :country, :nationality]
@@ -14,13 +14,13 @@ module ProfileHelper
   PERSON_CATEGORIES[:network] = [:friends, :communities, :enterprises]
   PERSON_CATEGORIES.merge!(COMMON_CATEGORIES)
  
-  ORGANIZATION_CATEGORIES = ActiveSupport::OrderedHash.new
+  ORGANIZATION_CATEGORIES = {}
   ORGANIZATION_CATEGORIES[:basic_information] = [:display_name, :created_at, :foundation_year, :type, :language, :members_count, :location, :address_reference, :historic_and_current_context, :admins]
   ORGANIZATION_CATEGORIES[:contact] = [:contact_person, :contact_phone, :contact_email, :organization_website, :jabber_id]
   ORGANIZATION_CATEGORIES[:economic] = [:business_name, :acronym, :economic_activity, :legal_form, :products, :activities_short_description, :management_information]
   ORGANIZATION_CATEGORIES.merge!(COMMON_CATEGORIES)
  
-  CATEGORY_MAP = ActiveSupport::OrderedHash.new
+  CATEGORY_MAP = {}
   CATEGORY_MAP[:person] = PERSON_CATEGORIES
   CATEGORY_MAP[:organization] = ORGANIZATION_CATEGORIES
  
@@ -114,7 +114,12 @@ module ProfileImageHelper
     end
  
     extra_info_tag = ''
-    img_class = 'profile-image'
+
+    if profile.secret?
+      img_class = 'profile-image secret-profile'
+    else
+      img_class = 'profile-image'
+    end
  
     if extra_info.is_a? Hash
       extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
@@ -137,4 +142,4 @@ module ProfileImageHelper
       :title => profile.name ),
       :class => 'vcard'), :class => 'common-profile-list-block')
   end
-end
 \ No newline at end of file
+end
@@ -14,7 +14,7 @@ class TaskMailer &lt; ApplicationMailer
     mail(
       to: task.target.notification_emails.compact,
       from: self.class.generate_from(task),
-      subject: "[%s] %s" % [self.environment.name, task.target_notification_description]
+      subject: "[%s] %s" % [task.environment.name, task.target_notification_description]
     )
   end
  
@@ -27,7 +27,7 @@ class TaskMailer &lt; ApplicationMailer
     mail(
       to: task.friend_email,
       from: self.class.generate_from(task),
-      subject: '[%s] %s' % [ self.environment.name, task.target_notification_description ]
+      subject: '[%s] %s' % [ task.requestor.environment.name, task.target_notification_description ]
     )
   end
  
@@ -38,14 +38,14 @@ class TaskMailer &lt; ApplicationMailer
  
     @message = extract_message(task.send("#{name}_message"))
     @requestor = task.requestor.name
-    @url = url_for(:host => self.environment.default_hostname, :controller => 'home')
+    @url = url_for(:host => task.requestor.environment.default_hostname, :controller => 'home')
  
     mail_with_template(
       to: task.requestor.notification_emails,
       from: self.class.generate_from(task),
-      subject: '[%s] %s' % [self.environment.name, task.target_notification_description],
+      subject: '[%s] %s' % [task.requestor.environment.name, task.target_notification_description],
       email_template: task.email_template,
-      template_params: {:environment => self.environment, :task => task, :message => @message, :url => @url, :requestor => task.requestor}
+      template_params: {:environment => task.requestor.environment, :task => task, :message => @message, :url => @url, :requestor => task.requestor}
     )
   end
  
@@ -31,7 +31,7 @@ class UserMailer &lt; ApplicationMailer
       from: "#{user.environment.name} <#{user.environment.contact_email}>",
       to: user.email,
       subject: _("[%s] Activate your account") % [user.environment.name],
-      template_params: {:environment => user.environment, :activation_code => @activation_code, :redirection => @redirection, :join => @join},
+      template_params: {:environment => user.environment, :activation_code => @activation_code, :redirection => @redirection, :join => @join, :person => user.person, :url => @url},
       email_template: user.environment.email_templates.find_by_template_type(:user_activation),
     )
   end
@@ -57,7 +57,7 @@ class AddFriend &lt; Task
   end
  
   def remove_from_suggestion_list(task)
-    suggestion = task.requestor.suggested_profiles.find_by_suggestion_id task.target.id
+    suggestion = task.requestor.suggested_profiles.find_by suggestion_id: task.target.id
     suggestion.disable if suggestion
   end
 end
@@ -59,7 +59,7 @@ class AddMember &lt; Task
   end
  
   def remove_from_suggestion_list(task)
-    suggestion = task.requestor.profile_suggestions.find_by_suggestion_id task.target.id
+    suggestion = task.requestor.profile_suggestions.find_by suggestion_id: task.target.id
     suggestion.disable if suggestion
   end
  
@@ -20,7 +20,7 @@ class ApproveArticle &lt; Task
   end
  
   def article
-    Article.find_by_id data[:article_id]
+    Article.find_by id: data[:article_id]
   end
  
   def article= value
@@ -39,7 +39,7 @@ class ApproveArticle &lt; Task
   settings_items :create_link, :type => :boolean, :default => false
  
   def article_parent
-    Article.find_by_id article_parent_id.to_i
+    Article.find_by id: article_parent_id.to_i
   end
  
   def article_parent= value
@@ -18,7 +18,7 @@ class ApproveComment &lt; Task
   end
  
   def article
-    Article.find_by_id comment.source_id unless self.comment.nil?
+    Article.find_by id: comment.source_id unless self.comment.nil?
   end
  
   def article_name
@@ -13,6 +13,7 @@ class Article &lt; ActiveRecord::Base
                   :archived
  
   acts_as_having_image
+  include Noosfero::Plugin::HotSpot
  
   SEARCHABLE_FIELDS = {
     :name => {:label => _('Name'), :weight => 10},
@@ -29,17 +30,13 @@ class Article &lt; ActiveRecord::Base
  
   def initialize(*params)
     super
-
-    if !params.blank?
-      if params.first.has_key?(:profile) && !params.first[:profile].blank?
-        profile = params.first[:profile]
-        self.published = false unless profile.public_profile
+    if params.present? && params.first.present?
+      if params.first.symbolize_keys.has_key?(:published)
+        self.published = params.first.symbolize_keys[:published]
+      elsif params.first[:profile].present? && !params.first[:profile].public_profile
+        self.published = false
       end
-
-      self.published = params.first["published"] if params.first.has_key?("published")
-      self.published = params.first[:published] if params.first.has_key?(:published)
     end
-
   end
  
   def self.default_search_display
@@ -78,15 +75,11 @@ class Article &lt; ActiveRecord::Base
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
   belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
  
-  #Article followers relation
-  has_many :article_followers, :dependent => :destroy
-  has_many :person_followers, :class_name => 'Person', :through => :article_followers, :source => :person
-
-  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
+  has_many :comments, -> { order 'created_at asc' }, class_name: 'Comment', as: 'source', dependent: :destroy
  
   has_many :article_followers, :dependent => :destroy
   has_many :person_followers, :class_name => 'Person', :through => :article_followers, :source => :person
-  has_many :person_followers_emails, :class_name => 'User', :through => :person_followers, :source => :user, :select => :email
+  has_many :person_followers_emails, -> { select :email }, class_name: 'User', through: :person_followers, source: :user
  
   has_many :article_categorizations, -> { where 'articles_categories.virtual = ?', false }
   has_many :categories, :through => :article_categorizations
@@ -289,7 +282,7 @@ class Article &lt; ActiveRecord::Base
   # retrives the most commented articles, sorted by the comment count (largest
   # first)
   def self.most_commented(limit)
-    paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
+    order('comments_count DESC').paginate(page: 1, per_page: limit)
   end
  
   scope :more_popular, -> { order 'hits DESC' }
@@ -298,7 +291,7 @@ class Article &lt; ActiveRecord::Base
   }
  
   def self.recent(limit = nil, extra_conditions = {}, pagination = true)
-    result = scoped({:conditions => extra_conditions}).
+    result = where(extra_conditions).
       is_public.
       relevant_as_recent.
       limit(limit).
@@ -480,7 +473,7 @@ class Article &lt; ActiveRecord::Base
  
   def rotate_translations
     unless self.translations.empty?
-      rotate = self.translations.all
+      rotate = self.translations.to_a
       root = rotate.shift
       root.update_attribute(:translation_of_id, nil)
       root.translations = rotate
@@ -774,7 +767,7 @@ class Article &lt; ActiveRecord::Base
  
   def version_license(version_number = nil)
     return license if version_number.nil?
-    profile.environment.licenses.find_by_id(get_version(version_number).license_id)
+    profile.environment.licenses.find_by(id: get_version(version_number).license_id)
   end
  
   alias :active_record_cache_key :cache_key
@@ -863,6 +856,7 @@ class Article &lt; ActiveRecord::Base
     true
   end
  
+  # FIXME see if it's needed
   def view_page
     "content_viewer/view_page"
   end
 class Block < ActiveRecord::Base
  
-  attr_accessible :title, :display, :limit, :box_id, :posts_per_page,
+  attr_accessible :title, :subtitle, :display, :limit, :box_id, :posts_per_page,
                   :visualization_format, :language, :display_user,
                   :box, :edit_modes, :move_modes, :mirror
  
-  # to be able to generate HTML
-  include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
  
   # Block-specific stuff
@@ -13,7 +11,8 @@ class Block &lt; ActiveRecord::Base
  
   delegate :environment, :to => :box, :allow_nil => true
  
-  acts_as_list :scope => :box
+  acts_as_list scope: -> block { where box_id: block.box_id }
+
   belongs_to :box
   belongs_to :mirror_block, :class_name => "Block"
   has_many :observers, :class_name => "Block", :foreign_key => "mirror_block_id"
@@ -98,8 +98,9 @@ class Blog &lt; Folder
       when :by_year
         posts.published.native_translations
           .except(:order)
-          .count(:all, :group => 'EXTRACT(YEAR FROM published_at)')
-          .sort_by {|year, count| -year.to_i}
+          .group('EXTRACT(YEAR FROM published_at)')
+          .count
+          .sort_by{ |year, count| -year.to_i }
       when :by_month
         posts.published.native_translations
           .except(:order)
 class Box < ActiveRecord::Base
+
+  acts_as_list scope: -> box { where owner_id: box.owner_id, owner_type: box.owner_type }
+
   belongs_to :owner, :polymorphic => true
-  acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\''
-  has_many :blocks, :dependent => :destroy, :order => 'position'
+  has_many :blocks, -> { order 'position' }, dependent: :destroy
  
   attr_accessible :owner
  
@@ -90,7 +90,7 @@ class Category &lt; ActiveRecord::Base
  
   def children_for_menu
     results = []
-    pending = children.where(display_in_menu: true).all
+    pending = children.where(display_in_menu: true).to_a
     while pending.present?
       cat = pending.shift
       results << cat
@@ -94,7 +94,7 @@ class Comment &lt; ActiveRecord::Base
   end
  
   def self.recent(limit = nil)
-    self.find(:all, :order => 'created_at desc, id desc', :limit => limit)
+    self.order('created_at desc, id desc').limit(limit).all
   end
  
   def notification_emails
@@ -33,7 +33,7 @@ class Community &lt; Organization
     community = Community.new(attributes)
     community.environment = environment
     if community.environment.enabled?('admin_must_approve_new_communities')
-      CreateCommunity.create!(attributes.merge(:requestor => requestor, :environment => environment).except(:custom_values))
+      CreateCommunity.create!(attributes.merge(:requestor => requestor, :environment => environment))
     else
       community.save!
       community.add_admin(requestor)
@@ -77,7 +77,7 @@ class Community &lt; Organization
   end
  
   def each_member(offset=0)
-    while member = self.members.first(:order => :id, :offset => offset)
+    while member = self.members.order(:id).offset(offset).first
       yield member
       offset = offset + 1
     end
@@ -20,6 +20,9 @@ class CreateCommunity &lt; Task
     attr_accessible field.to_sym
   end
  
+  settings_items :custom_values
+  attr_accessible :custom_values
+
   def validate
     self.environment.required_community_fields.each do |field|
       if self.send(field).blank?
@@ -36,6 +39,7 @@ class CreateCommunity &lt; Task
  
     community.update(community_data)
     community.image = image if image
+    community.custom_values = custom_values
     community.environment = self.environment
     community.save!
     community.add_admin(self.requestor)
@@ -63,6 +67,14 @@ class CreateCommunity &lt; Task
     end
   end
  
+  def reject_details
+    true
+  end
+
+  def custom_fields_moderate
+    true
+  end
+
   # tells if this request was rejected
   def rejected?
     self.status == Task::Status::CANCELLED
 class CustomField < ActiveRecord::Base
-  attr_accessible :name, :default_value, :format, :extras, :customized_type, :active, :required, :signup, :environment
+  attr_accessible :name, :default_value, :format, :extras, :customized_type, :active, :required, :signup, :environment, :moderation_task
   serialize :customized_type
   serialize :extras
   has_many :custom_field_values, :dependent => :delete_all
@@ -36,8 +36,8 @@ class Domain &lt; ActiveRecord::Base
   # finds a domain by its name. The argument <tt>name</tt> can start with
   # "www.", but it will be removed before searching. So searching for
   # 'www.example.net' is exactly the same as searching for just 'example.net'
-  def self.find_by_name(name)
-    self.where('name = ?', self.extract_domain_name(name)).first
+  def self.by_name(name)
+    self.find_by(name: self.extract_domain_name(name))
   end
  
   # turns the argument (expected to be a String) into a domain name that is
@@ -82,7 +82,7 @@ class Domain &lt; ActiveRecord::Base
     Noosfero::MultiTenancy.setup!(domainname)
     @hosting[domainname] ||=
       begin
-        domain = Domain.find_by_name(domainname)
+        domain = Domain.by_name(domainname)
         !domain.nil? && (domain.owner_type == 'Profile')
       end
   end
@@ -61,7 +61,7 @@ class Environment &lt; ActiveRecord::Base
  
   module Roles
     def self.admin(env_id)
-      Role.find_by_key_and_environment_id('environment_administrator', env_id)
+      Role.find_by(key: 'environment_administrator', environment_id: env_id)
     end
   end
  
@@ -248,7 +248,7 @@ class Environment &lt; ActiveRecord::Base
  
   acts_as_accessible
  
-  has_many :units, :order => 'position'
+  has_many :units, -> { order 'position' }
   has_many :production_costs, :as => :owner
  
   def superior_intances
@@ -714,7 +714,7 @@ class Environment &lt; ActiveRecord::Base
   def default_hostname(email_hostname = false)
     domain = 'localhost'
     unless self.domains(true).empty?
-      domain = (self.domains.find_by_is_default(true) || self.domains.find(:first, :order => 'id')).name
+      domain = (self.domains.find_by(is_default: true) || self.domains.order(:id).first).name
       domain = email_hostname ? domain : (force_www ? ('www.' + domain) : domain)
     end
     domain
@@ -808,7 +808,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def community_default_template
-    template = Community.find_by_id settings[:community_template_id]
+    template = Community.find_by id: settings[:community_template_id]
     template if template && template.is_template?
   end
  
@@ -821,7 +821,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def person_default_template
-    template = Person.find_by_id settings[:person_template_id]
+    template = Person.find_by id: settings[:person_template_id]
     template if template && template.is_template?
   end
  
@@ -834,7 +834,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def enterprise_default_template
-    template = Enterprise.find_by_id settings[:enterprise_template_id]
+    template = Enterprise.find_by id: settings[:enterprise_template_id]
     template if template && template.is_template?
   end
  
@@ -843,7 +843,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def inactive_enterprise_template
-    template = Enterprise.find_by_id settings[:inactive_enterprise_template_id]
+    template = Enterprise.find_by id: settings[:inactive_enterprise_template_id]
     template if template && template.is_template
   end
  
 class Forum < Folder
  
-  acts_as_having_posts :order => 'updated_at DESC'
+  acts_as_having_posts -> { reorder 'updated_at DESC' }
   include PostsLimit
  
   attr_accessible :has_terms_of_use, :terms_of_use, :topic_creation
@@ -12,7 +12,7 @@ class Forum &lt; Folder
  
   before_save do |forum|
     if forum.has_terms_of_use
-      last_editor = forum.profile.environment.people.find_by_id(forum.last_changed_by_id)
+      last_editor = forum.profile.environment.people.find_by(id: forum.last_changed_by_id)
       if last_editor && !forum.users_with_agreement.exists?(last_editor)
         forum.users_with_agreement << last_editor
       end
@@ -34,14 +34,14 @@ class Forum &lt; Folder
   end
  
   module TopicCreation
-    BASE = ActiveSupport::OrderedHash.new
+    BASE = {}
     BASE['users'] = _('Logged users')
  
-    PERSON = ActiveSupport::OrderedHash.new
+    PERSON = {}
     PERSON['self'] = _('Me')
     PERSON['related'] = _('Friends')
  
-    GROUP = ActiveSupport::OrderedHash.new
+    GROUP = {}
     GROUP['self'] = _('Administrators')
     GROUP['related'] = _('Members')
  
@@ -9,7 +9,7 @@ class Input &lt; ActiveRecord::Base
   validates_presence_of :product
   validates_presence_of :product_category
  
-  acts_as_list :scope => :product
+  acts_as_list scope: -> input { where product_id: input.product_id }
  
   belongs_to :unit
  
@@ -67,7 +67,7 @@ class Invitation &lt; Task
       end
  
       begin
-        user = find_by_profile_id ? Person.find_by_id(contact_to_invite).user : User.find_by_email(friend_email)
+        user = find_by_profile_id ? Person.find_by(id: contact_to_invite).user : User.find_by(email: friend_email)
       rescue
         user = nil
       end
@@ -22,8 +22,12 @@ class ModerateUserRegistration &lt; Task
     "#{name} (#{email})"
   end
  
+  def custom_fields_moderate
+    true
+  end
+
   def perform
-    user=environment.users.find_by_id(user_id)
+    user=environment.users.find_by(id: user_id)
     user.activate
   end
  
@@ -58,4 +62,4 @@ class ModerateUserRegistration &lt; Task
     _("User \"%{user}\" just requested to register. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :user => self.name }
   end
  
-end
 \ No newline at end of file
+end
@@ -27,12 +27,13 @@ class NationalRegion &lt; ActiveRecord::Base
                    :type => NationalRegionType::CITY,
                    :state => state}];
  
-    region = NationalRegion.find(find_return,
-                                  :select => "national_regions.name as city, nr.name as state, national_regions.national_region_code",
-                                  :conditions => conditions,
-                                  :joins => "LEFT JOIN national_regions as nr ON  national_regions.parent_national_region_code = nr.national_region_code",
-                                  :limit => 10
-                                  )
+    region = NationalRegion
+      .select('national_regions.name as city, nr.name as state, national_regions.national_region_code')
+      .where(conditions)
+      .joins('LEFT JOIN national_regions as nr ON  national_regions.parent_national_region_code = nr.national_region_code')
+      .limit(10)
+    region = region.send find_return
+
     return region
   end
  
@@ -50,19 +51,19 @@ class NationalRegion &lt; ActiveRecord::Base
                   {:name => state_name,
                    :type => NationalRegionType::STATE}];
  
-    region = NationalRegion.find(find_return,
-                                  :select => "national_regions.name as state, national_regions.national_region_code",
-                                  :conditions => conditions,
-                                  :limit => 10
-                                  )
+    region = NationalRegion
+      .select('national_regions.name as state, national_regions.national_region_code')
+      .where(conditions)
+      .limit(10)
+    region = region.send find_return
+
     return region
    end
  
   def self.validate!(city, state, country)
  
-    country_region = NationalRegion.find_by_national_region_code(country,
-                                                :conditions => ["national_region_type_id = :type",
-                                                               {:type => NationalRegionType::COUNTRY}])
+    country_region = NationalRegion
+      .find_by(national_region_code: country, national_region_type_id: NationalRegionType::COUNTRY)
  
     if(country_region)
  
@@ -55,7 +55,7 @@ class Organization &lt; Profile
  
   has_many :custom_roles, :class_name => 'Role', :foreign_key => :profile_id
  
-  scope :more_popular, :order => 'members_count DESC'
+  scope :more_popular, -> { order 'members_count DESC' }
  
   validate :presence_of_required_fieds, :unless => :is_template
  
@@ -112,7 +112,8 @@ class Person &lt; Profile
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
  
-  has_many :suggested_profiles, class_name: 'ProfileSuggestion', foreign_key: :person_id, order: 'score DESC', dependent: :destroy
+  has_many :suggested_profiles, -> { order 'score DESC' },
+    class_name: 'ProfileSuggestion', foreign_key: :person_id, dependent: :destroy
   has_many :suggested_people, -> {
     where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true
   }, through: :suggested_profiles, source: :suggestion
@@ -397,7 +398,7 @@ class Person &lt; Profile
  
  
   def self.with_pending_tasks
-    Person.find(:all).select{ |person| !person.tasks.pending.empty? or person.has_organization_pending_tasks? }
+    Person.all.select{ |person| !person.tasks.pending.empty? or person.has_organization_pending_tasks? }
   end
  
   def has_organization_pending_tasks?
@@ -491,7 +492,7 @@ class Person &lt; Profile
   end
  
   def each_friend(offset=0)
-    while friend = self.friends.first(:order => :id, :offset => offset)
+    while friend = self.friends.order(:id).offset(offset).first
       yield friend
       offset = offset + 1
     end
@@ -573,7 +574,7 @@ class Person &lt; Profile
   end
  
   def remove_suggestion(profile)
-    suggestion = suggested_profiles.find_by_suggestion_id profile.id
+    suggestion = suggested_profiles.find_by suggestion_id: profile.id
     suggestion.disable if suggestion
   end
  
@@ -28,7 +28,7 @@ class Product &lt; ActiveRecord::Base
  
   belongs_to :product_category
  
-  has_many :inputs, :dependent => :destroy, :order => 'position'
+  has_many :inputs, -> { order 'position' }, dependent: :destroy
   has_many :price_details, :dependent => :destroy
   has_many :production_costs, :through => :price_details
  
@@ -50,7 +50,7 @@ class Product &lt; ActiveRecord::Base
   validates_numericality_of :price, :allow_nil => true
   validates_numericality_of :discount, :allow_nil => true
  
-  scope :more_recent, :order => "created_at DESC"
+  scope :more_recent, -> { order 'created_at DESC' }
  
   scope :from_category, -> category {
     joins(:product_category).where('categories.path LIKE ?', "%#{category.slug}%") if category
@@ -75,6 +75,8 @@ class Product &lt; ActiveRecord::Base
     ).uniq
   }
  
+  scope :recent, -> limit=nil { order('id DESC').limit(limit) }
+
   after_update :save_image
  
   def lat
@@ -128,10 +130,6 @@ class Product &lt; ActiveRecord::Base
     product_category ? product_category.name : _('Uncategorized product')
   end
  
-  def self.recent(limit = nil)
-    self.find(:all, :order => 'id desc', :limit => limit)
-  end
-
   def url
     self.profile.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => id)
   end
@@ -5,7 +5,7 @@ class ProductCategory &lt; Category
  
   attr_accessible :name, :parent, :environment
  
-  scope :unique, :select => 'DISTINCT ON (path) categories.*'
+  scope :unique, -> { select 'DISTINCT ON (path) categories.*' }
   scope :by_enterprise, -> enterprise {
     distinct.joins(:products).
     where('products.profile_id = ?', enterprise.id)
@@ -14,6 +14,10 @@ class ProductCategory &lt; Category
     where 'environment_id = ?', environment.id
   }
  
+  scope :unique_by_level, lambda { |level| {
+    :select => "DISTINCT ON (filtered_category) split_part(path, '/', #{level.to_i}) AS filtered_category, categories.*"
+  }}
+
   def all_products
     Product.where(product_category_id: (all_children << self).map(&:id))
   end
@@ -91,7 +91,7 @@ class Profile &lt; ActiveRecord::Base
     end
     private
     def self.find_role(name, env_id)
-      ::Role.find_by_key_and_environment_id("profile_#{name}", env_id)
+      ::Role.find_by key: "profile_#{name}", environment_id: env_id
     end
   end
  
@@ -144,6 +144,9 @@ class Profile &lt; ActiveRecord::Base
   }
   scope :no_templates, -> { where is_template: false }
  
+  scope :recent, -> limit=nil { order('id DESC').limit(limit) }
+
+
   # Returns a scoped object to select profiles in a given location or in a radius
   # distance from the given location center.
   # The parameter can be the `request.params` with the keys:
@@ -207,14 +210,6 @@ class Profile &lt; ActiveRecord::Base
     members(field).where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value
   end
  
-  class << self
-    def count_with_distinct(*args)
-      options = args.last || {}
-      count_without_distinct(:id, {:distinct => true}.merge(options))
-    end
-    alias_method_chain :count, :distinct
-  end
-
   def members_by_role(roles)
     Person.members_of(self).by_role(roles)
   end
@@ -232,18 +227,17 @@ class Profile &lt; ActiveRecord::Base
   scope :is_public, -> { where visible: true, public_profile: true, secret: false }
   scope :enabled, -> { where enabled: true }
  
-  # Subclasses must override this method
-  scope :more_popular
-
-  scope :more_active,  :order => 'activities_count DESC'
-  scope :more_recent, :order => "created_at DESC"
+  # subclass specific
+  scope :more_popular, -> { }
+  scope :more_active, -> { order 'activities_count DESC' }
+  scope :more_recent, -> { order "created_at DESC" }
  
   acts_as_trackable :dependent => :destroy
  
   has_many :profile_activities
   has_many :action_tracker_notifications, :foreign_key => 'profile_id'
-  has_many :tracked_notifications, :through => :action_tracker_notifications, :source => :action_tracker, :order => 'updated_at DESC'
-  has_many :scraps_received, :class_name => 'Scrap', :foreign_key => :receiver_id, :order => "updated_at DESC", :dependent => :destroy
+  has_many :tracked_notifications, -> { order 'updated_at DESC' }, through: :action_tracker_notifications, source: :action_tracker
+  has_many :scraps_received, -> { order 'updated_at DESC' }, class_name: 'Scrap', foreign_key: :receiver_id, dependent: :destroy
   belongs_to :template, :class_name => 'Profile', :foreign_key => 'template_id'
  
   has_many :comments_received, :class_name => 'Comment', :through => :articles, :source => :comments
@@ -324,7 +318,7 @@ class Profile &lt; ActiveRecord::Base
  
   has_many :tasks, :dependent => :destroy, :as => 'target'
  
-  has_many :events, :source => 'articles', :class_name => 'Event', :order => 'start_date'
+  has_many :events, -> { order 'start_date' }, source: 'articles', class_name: 'Event'
  
   def find_in_all_tasks(task_id)
     begin
@@ -588,7 +582,7 @@ class Profile &lt; ActiveRecord::Base
     #  person = Profile['username']
     #  org = Profile.['orgname']
     def [](identifier)
-      self.find_by_identifier(identifier)
+      self.find_by identifier: identifier
     end
  
   end
@@ -767,11 +761,11 @@ private :generate_url, :url_options
  
   def copy_article_tree(article, parent=nil)
     return if !copy_article?(article)
-    original_article = self.articles.find_by_name(article.name)
+    original_article = self.articles.find_by name: article.name
     if original_article
       num = 2
       new_name = original_article.name + ' ' + num.to_s
-      while self.articles.find_by_name(new_name)
+      while self.articles.find_by name: new_name
         num = num + 1
         new_name = original_article.name + ' ' + num.to_s
       end
@@ -851,10 +845,6 @@ private :generate_url, :url_options
     end
   end
  
-  def self.recent(limit = nil)
-    self.find(:all, :order => 'id desc', :limit => limit)
-  end
-
   # returns +true+ if the given +user+ can see profile information about this
   # +profile+, and +false+ otherwise.
   def display_info_to?(user)
@@ -948,7 +938,7 @@ private :generate_url, :url_options
   has_many :blogs, :source => 'articles', :class_name => 'Blog'
  
   def blog
-    self.has_blog? ? self.blogs.first(:order => 'id') : nil
+    self.has_blog? ? self.blogs.order(:id).first : nil
   end
  
   def has_blog?
@@ -958,7 +948,7 @@ private :generate_url, :url_options
   has_many :forums, :source => 'articles', :class_name => 'Forum'
  
   def forum
-    self.has_forum? ? self.forums.first(:order => 'id') : nil
+    self.has_forum? ? self.forums.order(:id).first : nil
   end
  
   def has_forum?
@@ -1186,7 +1176,7 @@ private :generate_url, :url_options
   settings_items :custom_url_redirection, type: String, default: nil
  
   def remove_from_suggestion_list(person)
-    suggestion = person.suggested_profiles.find_by_suggestion_id self.id
+    suggestion = person.suggested_profiles.find_by suggestion_id: self.id
     suggestion.disable if suggestion
   end
  
@@ -9,8 +9,12 @@ class ProfileActivity &lt; ActiveRecord::Base
   belongs_to :activity, polymorphic: true
  
   # non polymorphic versions
-  belongs_to :scrap, foreign_key: :activity_id, class_name: 'Scrap', conditions: {profile_activities: {activity_type: 'Scrap'}}
-  belongs_to :action_tracker, foreign_key: :activity_id, class_name: 'ActionTracker::Record', conditions: {profile_activities: {activity_type: 'ActionTracker::Record'}}
+  belongs_to :scrap, -> {
+    where profile_activities: {activity_type: 'Scrap'}
+  }, foreign_key: :activity_id, class_name: 'Scrap'
+  belongs_to :action_tracker, -> {
+    where profile_activities: {activity_type: 'ActionTracker::Record'}
+  }, foreign_key: :activity_id, class_name: 'ActionTracker::Record'
  
   before_validation :copy_timestamps
  
@@ -18,11 +18,11 @@ class ProfileListBlock &lt; Block
     result = nil
     public_profiles = profiles.is_public.includes([:image,:domains,:preferred_domain,:environment])
     if !prioritize_profiles_with_image
-result = public_profiles.all(:limit => get_limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = public_profiles.limit(get_limit).order('profiles.updated_at DESC').sort_by{ rand }
     elsif profiles.visible.with_image.count >= get_limit
-      result = public_profiles.with_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = public_profiles.with_image.limit(get_limit * 5).order('profiles.updated_at DESC').sort_by{ rand }
     else
-      result = public_profiles.with_image.sort_by{ rand } + public_profiles.without_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = public_profiles.with_image.sort_by{ rand } + public_profiles.without_image.limit(get_limit * 5).order('profiles.updated_at DESC').sort_by{ rand }
     end
     result.slice(0..get_limit-1)
   end
@@ -120,7 +120,8 @@ class ProfileSuggestion &lt; ActiveRecord::Base
     return if suggested_profiles.blank?
  
     suggested_profiles.each do |suggested_profile|
-      suggestion = person.suggested_profiles.find_or_initialize_by_suggestion_id(suggested_profile.id)
+      suggestion   = person.suggested_profiles.find_by suggestion_id: suggested_profile.id
+      suggestion ||= person.suggested_profiles.build({suggestion_id: suggested_profile.id}, without_protection: true)
       RULES.each do |rule, options|
         begin
           value = suggested_profile.send("#{rule}_count").to_i
-# Region is a special type of category that is related to geographical issues. 
+# Region is a special type of category that is related to geographical issues.
 class Region < Category
- 
-  attr_accessible :name 
- 
+
+  attr_accessible :name
+
   has_and_belongs_to_many :validators, :class_name => 'Organization', :join_table => :region_validators
  
   require_dependency 'enterprise' # enterprises can also be validators
@@ -11,8 +11,10 @@ class Region &lt; Category
     validators.count > 0
   end
  
-  scope :with_validators, :select => 'DISTINCT ON (categories.id) *',
-    :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)'
+  scope :with_validators, -> {
+    select('DISTINCT ON (categories.id) *')
+      .joins('INNER JOIN region_validators on (region_validators.region_id = categories.id)')
+  }
  
 end
  
@@ -13,7 +13,9 @@ class Scrap &lt; ActiveRecord::Base
   has_many :replies, :class_name => 'Scrap', :foreign_key => 'scrap_id', :dependent => :destroy
   belongs_to :root, :class_name => 'Scrap', :foreign_key => 'scrap_id'
  
-  has_many :profile_activities, foreign_key: :activity_id, conditions: {profile_activities: {activity_type: 'Scrap'}}, dependent: :destroy
+  has_many :profile_activities, -> {
+    where profile_activities: {activity_type: 'Scrap'}
+  }, foreign_key: :activity_id, dependent: :destroy
  
   after_create :create_activity
   after_update :update_activity
@@ -25,7 +25,7 @@ class SearchTerm &lt; ActiveRecord::Base
   # Therefore the score is 97. Them we sum every score to get the total score
   # for a search term.
   def self.occurrences_scores
-    ActiveSupport::OrderedHash[*ActiveRecord::Base.connection.execute(
+    Hash[*ActiveRecord::Base.connection.execute(
       joins(:occurrences).
       select("search_terms.id, sum(#{SearchTermOccurrence::EXPIRATION_TIME.to_i} - extract(epoch from (now() - search_term_occurrences.created_at))) as value").
       where("search_term_occurrences.created_at > ?", DateTime.now - SearchTermOccurrence::EXPIRATION_TIME).
 class Session < ActiveRecord::SessionStore::Session
  
+  attr_accessible :session_id, :data
+
   # removed and redefined on super class
   def self.find_by_session_id session_id
     super
@@ -32,6 +32,8 @@ class Task &lt; ActiveRecord::Base
     end
   end
  
+  include Noosfero::Plugin::HotSpot
+
   belongs_to :requestor, :class_name => 'Profile', :foreign_key => :requestor_id
   belongs_to :target, :foreign_key => :target_id, :polymorphic => true
   belongs_to :responsible, :class_name => 'Person', :foreign_key => :responsible_id
@@ -136,9 +138,9 @@ class Task &lt; ActiveRecord::Base
       group = klass.to_s.downcase.pluralize
       id = attribute.to_s + "_id"
       if environment.respond_to?(group)
-        attrb = value || environment.send(group).find_by_id(record.send(id))
+        attrb = value || environment.send(group).find_by(id: record.send(id))
       else
-        attrb = value || klass.find_by_id(record.send(id))
+        attrb = value || klass.find_by(id: record.send(id))
       end
       if attrb.respond_to?(klass.to_s.downcase + "?")
         unless attrb.send(klass.to_s.downcase + "?")
@@ -207,6 +209,10 @@ class Task &lt; ActiveRecord::Base
     true
   end
  
+  def custom_fields_moderate
+    false
+  end
+
   def icon
     {:type => :defined_image, :src => "/images/icons-app/user-minor.png", :name => requestor.name, :url => requestor.url}
   end
@@ -272,6 +278,7 @@ class Task &lt; ActiveRecord::Base
   end
  
   def environment
+    return target if target.kind_of?(Environment)
     self.target.environment unless self.target.nil?
   end
  
@@ -312,9 +319,19 @@ class Task &lt; ActiveRecord::Base
   scope :canceled, -> { where status: Task::Status::CANCELLED }
   scope :closed, -> { where status: [Task::Status::CANCELLED, Task::Status::FINISHED] }
   scope :opened, -> { where status: [Task::Status::ACTIVE, Task::Status::HIDDEN] }
-  scope :of, -> type { where "tasks.type LIKE ?", type if type }
-  scope :order_by, -> attribute, ord { order "#{attribute} #{ord}" }
-  scope :like, -> field, value { where "LOWER(#{field}) LIKE ?", "%#{value.downcase}%" if value }
+  scope :of, -> type { where :type => type  if type }
+  scope :order_by, -> attribute, ord {
+      if ord.downcase.include? 'desc'
+        order attribute.to_sym => :desc
+      else
+        order attribute.to_sym
+      end
+  }
+  scope :like, -> field, value {
+      if value
+        where "LOWER(#{field}) LIKE ?", "%#{value.downcase}%"
+      end
+  }
   scope :pending_all, -> profile, filter_type, filter_text {
     self.to(profile).without_spam.pending.of(filter_type).like('data', filter_text)
   }
 class Unit < ActiveRecord::Base
  
+  acts_as_list scope: -> unit { where environment_id: unit.environment_id }
+
   attr_accessible :name, :singular, :plural, :environment
  
   validates_presence_of :singular
   validates_presence_of :plural
  
   belongs_to :environment
+
   validates_presence_of :environment_id
-  acts_as_list :scope => :environment
+  validates_presence_of :singular
+  validates_presence_of :plural
  
   def name
     self.singular
@@ -25,7 +25,7 @@ class User &lt; ActiveRecord::Base
   end
  
   def self.[](login)
-    self.find_by_login(login)
+    self.find_by login: login
   end
  
   # FIXME ugly workaround
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
 <% if block.article %>
   <%=
     h(article_to_html(FilePresenter.for(block.article),
 <% if block.blog %>
-  <%= block_title(block.title) %>
+  <%= block_title(block.title, block.subtitle) %>
  
   <ul class='blog-archives'>
     <% block.blog.total_number_of_posts(:by_year).each do |year, count| %>
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
  
 <%= display_category_menu block, block.selected_categories %>
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
 <% unless block.products.blank? %>
   <%= link_to content_tag(:span, _('Previous')), '#', :class => 'featured-product-prev featured-product-arrow'  %>
   <div class="featured-products-block-container">
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
  
 <%=
     if block.error_message.blank?
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
+
 <% if !block.featured_images.empty? %>
   <div class='highlights-border'>
     <div class='highlights-container'>
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
  
 <%= block.links.empty? && block.title.empty? ? content_tag('em', _('Please, edit this block to add links')) : '' %>
  
 <% if block.owner.lat %>
-  <%= block_title block.title %>
+  <%= block_title(block.title, block.subtitle) %>
   <div class='the-localization-map'>
     <img src="https://maps.google.com/maps/api/staticmap?center=<%=block.owner.lat%>,<%=block.owner.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=block.owner.lat%>,<%=block.owner.lng%>&sensor=false"/>
   </div>
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
  
 <ul>
   <li><%= link_to(_('Homepage'), block.owner.url, :class => 'url') %></li>
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
  
 <ul>
   <% block.products.each do |product| %>
-<%= block_title(block.view_title) %>
+<%= block_title(block.view_title, block.subtitle) %>
  
 <%
   list = block.profile_list.map do |item|
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
  
 <%= render :partial => 'shared/profile_search_form' %>
-<%=h block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
  
 <%=h block.html %>
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
  
 <ul>
   <% block.docs.map do |item| %>
@@ -7,7 +7,7 @@
   end
 %>
  
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
  
 <% if images %>
   <% description = images.any? { |img| !img.abstract.blank? } %>
-<%= block_title(block.title) %>
+<%= block_title(block.title, block.subtitle) %>
  
 <%
   is_env = block.owner.class == Environment
@@ -4,6 +4,7 @@
   <%= form_tag(:action => 'save', :id => @block.id) do %>
  
     <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
+    <%= labelled_form_field(_('Custom subtitle for this block: '), text_field(:block, :subtitle)) %>
  
     <%= render :partial => partial_for_class(@block.class) %>
  
@@ -16,7 +16,7 @@
         <%= _('The following parameters may be used in subject and body:') %>
       </div>
       <div class="values">
-        {{profile.name}}, {{profile.identifier}}, {{environment.name}}
+        <%= @template_params_allowed %>
       </div>
     </div>
     <%= render :file => 'shared/tiny_mce' %>
@@ -16,6 +16,7 @@
       <%= labelled_check_box _('Active'), "custom_fields[#{id}][active]", 1, field.active, :id => "active_checkbox", :onclick  => "active_action('custom_fields[#{id}][active]','custom_fields[#{id}][required]', 'custom_fields[#{id}][signup]')" %>
       <%= labelled_check_box _('Required'), "custom_fields[#{id}][required]", 1, field.required, :id => "required_checkbox", :onclick  => "required_action('custom_fields[#{id}][active]','custom_fields[#{id}][required]', 'custom_fields[#{id}][signup]')" %>
       <%= labelled_check_box _('Display on creation?'), "custom_fields[#{id}][signup]", 1, field.signup, :id => "signup_checkbox",:onclick  => "signup_action('custom_fields[#{id}][active]','custom_fields[#{id}][required]', 'custom_fields[#{id}][signup]')" %>
+      <%= labelled_check_box _('Display on moderation?'), "custom_fields[#{id}][moderation_task]", 1, field.moderation_task %>
     </div>
  
     <% if field.format == "list" %>
 <div id="user">
-  <% user = (session[:user] && User.find_by_id(session[:user])) || nil %>
+  <% user = (session[:user] && User.find_by(id: session[:user])) || nil %>
   <% if user.present? %>
     <% user = user.person %>
     <span class='logged-in'>
@@ -30,7 +30,7 @@
          </div>
         </td>
  
-        <td> <%= _(p.type) %> </td>
+        <td> <%= @types_hash[p.type] %> </td>
       </tr>
     <% end %>
   </table>
@@ -12,6 +12,11 @@
  
   <% to = @mailing.data[:members_filtered].present? ? @mailing.recipients.map{|r| r.name}.join(', ') : _('All members')%>
   <%= labelled_form_field(_('To:'), text_area(:data, 'members_filtered', :value => to, :rows => 4, :disabled => 'disabled', :class => 'send-mail-recipients'))  %>
+<div class="template-selection">
+  <% if @email_templates.present? %>
+    <%= labelled_form_field(_('Select a template:'), select_tag(:template, options_from_collection_for_select(@email_templates, :id, :name), :include_blank => true, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed'))) %>
+  </div>
+<% end %>
  
 <%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
  
@@ -6,7 +6,7 @@
       </div>
       <span class='profile-details'>
         <strong><%= group.name %></strong><br/>
-        <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
+        <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by(resource_id: group.id) %>
         <%= _('Type: %s') % _(group.class.identification) %> <br/>
         <%= _('Description: %s') % group.description  + '<br/>' if group.community? %>
         <%= _('Members: %s') % group.members_count.to_s %> <br/>
@@ -9,7 +9,7 @@
       <li><strong><%=_('Email')%></strong>: <%=task.email%> </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><%=_('Folder')%></strong>: <%=if (a = Article.find_by(id: task.article_object.parent_id)) then a.name else '<em>' + s_('Folder|none') + '</em>' end%> </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'>
@@ -0,0 +1,10 @@
+<% if task.custom_values.present? %>
+  <% task.custom_values.each_pair do |name, value| %>
+    <% custom_field = CustomField.where(:name =>name, :environment => task.environment).first%>
+    <% if custom_field.moderation_task %>
+      <div class="field-name">
+        <%= name +": " + display_value_for_custom_field(custom_field, value['value']) %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
...	...	@@ -14,6 +14,10 @@ stages:
14	14	# script: bundle exec rake ci:smoke
15	15	# stage: smoke-tests
16	16
	17	+api:
	18	+ script: bundle exec rake test:api
	19	+ stage: all-tests
	20	+
17	21	units:
18	22	script: bundle exec rake test:units
19	23	stage: all-tests
...	...
...	...	@@ -5,24 +5,21 @@ notifications:
5	5	template:
6	6	- "%{repository_slug} %{branch} %{commit} %{commit_subject} - %{result} %{build_url}"
7	7
	8	+# trusty constainers take more time to start
	9	+#dist: trusty
	10	+
8	11	language: ruby
9	12	rvm:
10		- - 2.2.3
	13	+ - 2.2
	14	+ # ruby 2.3 works but isn't stable on travis
	15	+
	16	+cache: bundler
11	17
12		-sudo: false
13	18	addons:
14	19	apt:
15	20	packages:
16		- - po4a
17		- - iso-codes
18	21	- tango-icon-theme
19	22	- pidgin-data
20		- # for gem extensions
21		- - libmagickwand-dev
22		- - libpq-dev
23		- - libreadline-dev
24		- - libsqlite3-dev
25		- - libxslt1-dev
26	23	artifacts:
27	24	paths:
28	25	- $(ls tmp/artifact* \| tr "\n" ":")
...	...	@@ -37,7 +34,7 @@ before_install:
37	34	- gem install bundler
38	35	- sed -i 's/softwarepublico.gov.br\/gitlab/github.com/' .gitmodules
39	36	- git submodule update --init --recursive
40		-cache: bundler
	37	+#cache: bundler
41	38
42	39	before_script:
43	40	- mkdir -p tmp/{pids,cache} log cache
...	...	@@ -46,19 +43,25 @@ before_script:
46	43	# database
47	44	- cp config/database.yml.travis config/database.yml
48	45	- psql -c 'create database myapp_test;' -U postgres
49		- - bundle exec rake db:schema:load &>/dev/null
	46	+ - bundle exec rake db:schema:load
50	47	- bundle exec rake db:migrate &>/dev/null
51	48
52	49	env:
	50	+ - TASK=test:api
53	51	- TASK=test:units
54	52	- TASK=test:functionals
55	53	- TASK=test:integration
56		- - TASK=cucumber LANG=en
57		- - TASK=selenium
58		- - SLICE=1/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
59		- - SLICE=2/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
60		- - SLICE=3/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
61		- - SLICE=4/4 TASK=test:noosfero_plugins BUNDLE_OPTS=install
	54	+ - SLICE=1/2 TASK=cucumber LANG=en
	55	+ - SLICE=2/2 TASK=cucumber LANG=en
	56	+ - SLICE=1/4 TASK=selenium
	57	+ - SLICE=2/4 TASK=selenium
	58	+ - SLICE=3/4 TASK=selenium
	59	+ - SLICE=4/4 TASK=selenium
	60	+ - SLICE=1/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install
	61	+ - SLICE=2/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install
	62	+ - SLICE=3/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install
	63	+ - SLICE=4/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install
	64	+ - SLICE=5/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install
62	65
63	66	script:
64	67	- ./script/ci
...	...
...	...	@@ -31,6 +31,7 @@ gem 'whenever', :require => false
31	31	gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
32	32	gem 'diffy', '~> 3.0'
33	33	gem 'slim'
	34	+gem 'activerecord-session_store', ('1.0.0.pre' if RUBY_VERSION >= '2.3.0')
34	35
35	36	# API dependencies
36	37	gem 'grape', '~> 0.12'
...	...	@@ -44,6 +45,7 @@ gem 'rack-contrib'
44	45	gem 'liquid', '~> 3.0.3'
45	46
46	47	gem 'api-pagination', '>= 4.1.1'
	48	+gem 'liquid', '~> 3.0.3'
47	49
48	50	# asset pipeline
49	51	gem 'uglifier', '>= 1.0.3'
...	...	@@ -55,8 +57,6 @@ gem 'protected_attributes'
55	57	gem 'rails-observers'
56	58	gem 'actionpack-page_caching'
57	59	gem 'actionpack-action_caching'
58		-gem 'activerecord-session_store'
59		-gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
60	60
61	61	# gem for error reporting
62	62	gem 'airbrake', '~> 4'
...	...
...	...	@@ -141,7 +141,6 @@ GEM
141	141	activemodel (= 4.2.5)
142	142	activesupport (= 4.2.5)
143	143	arel (~> 6.0)
144		- activerecord-deprecated_finders (1.0.4)
145	144	activerecord-session_store (0.1.2)
146	145	actionpack (>= 4.0.0, < 5)
147	146	activerecord (>= 4.0.0, < 5)
...	...	@@ -417,7 +416,6 @@ DEPENDENCIES
417	416	action_tracker_has_comments (= 0.0.0)!
418	417	actionpack-action_caching
419	418	actionpack-page_caching
420		- activerecord-deprecated_finders
421	419	activerecord-jdbcpostgresql-adapter
422	420	activerecord-session_store
423	421	acts-as-taggable-on (~> 3.5)
...	...
...	...	@@ -34,7 +34,7 @@ class AdminPanelController < AdminController
34	34	env = environment
35	35	@portal_community = env.portal_community \|\| Community.new
36	36	if request.post?
37		- portal_community = env.communities.find_by_identifier(params[:portal_community_identifier])
	37	+ portal_community = env.communities.where(identifier: params[:portal_community_identifier]).first
38	38	if portal_community
39	39	if (env.portal_community != portal_community)
40	40	env.portal_community = portal_community
...	...
...	...	@@ -7,7 +7,7 @@ class EnvironmentRoleManagerController < AdminController
7	7
8	8	def change_roles
9	9	@admin = Person.find(params[:id])
10		- @roles = Role.find(:all).select{ \|r\| r.has_kind?(:environment) }
	10	+ @roles = Role.all.select{ \|r\| r.has_kind?(:environment) }
11	11	end
12	12
13	13	def update_roles
...	...	@@ -22,7 +22,7 @@ class EnvironmentRoleManagerController < AdminController
22	22	end
23	23
24	24	def change_role
25		- @roles = Role.find(:all).select{ \|r\| r.has_kind?(:environment) }
	25	+ @roles = Role.all.select{ \|r\| r.has_kind?(:environment) }
26	26	@admin = Person.find(params[:id])
27	27	@associations = @admin.find_roles(environment)
28	28	end
...	...	@@ -34,7 +34,7 @@ class EnvironmentRoleManagerController < AdminController
34	34	redirect_to :action => 'index'
35	35	else
36	36	@admin = Person.find(params[:person])
37		- @roles = Role.find(:all).select{ \|r\| r.has_kind?(:environment) }
	37	+ @roles = Role.all.select{ \|r\| r.has_kind?(:environment) }
38	38	render :action => 'affiliate'
39	39	end
40	40	end
...	...	@@ -60,7 +60,7 @@ class EnvironmentRoleManagerController < AdminController
60	60	end
61	61
62	62	def make_admin
63		- @people = Person.find(:all)
64		- @roles = Role.find(:all).select{\|r\|r.has_kind?(:environment)}
	63	+ @people = Person.all
	64	+ @roles = Role.all.select{\|r\|r.has_kind?(:environment)}
65	65	end
66	66	end
...	...
...	...	@@ -100,7 +100,7 @@ class FeaturesController < AdminController
100	100	CustomField.destroy(custom_fields_to_destroy)
101	101
102	102	custom_field_list.each_pair do \|id, custom_field\|
103		- field = CustomField.find_by_id(id)
	103	+ field = CustomField.find_by(id: id)
104	104	if not field.blank?
105	105	params_to_update = custom_field.except(:format, :extras, :customized_type,:environment)
106	106	field.update_attributes(params_to_update)
...	...
...	...	@@ -7,7 +7,11 @@ class OrganizationsController < AdminController
7	7	@title = _('Organization profiles')
8	8	@type = params[:type] \|\| "any"
9	9	@types_filter = [[_('All'), 'any'], [_('Community'), 'Community'], [_('Enterprise'), 'Enterprise']]
10		- @types_filter = @types_filter \| @plugins.dispatch(:organization_types_filter_options)
	10	+ @plugins.dispatch_without_flatten(:organization_types_filter_options).each do \|plugin_response\|
	11	+ @types_filter = @types_filter \| plugin_response
	12	+ end
	13	+ @types_hash = {}
	14	+ @types_filter.each{\|list\| @types_hash[list.last] = list.first}
11	15
12	16	scope = @plugins.dispatch_first(:filter_manage_organization_scope, @type)
13	17	if scope.blank?
...	...
...	...	@@ -2,7 +2,7 @@ class RoleController < AdminController
2	2	protect 'manage_environment_roles', :environment
3	3
4	4	def index
5		- @roles = environment.roles.find(:all, :conditions => {:profile_id => nil})
	5	+ @roles = environment.roles.where profile_id: nil
6	6	end
7	7
8	8	def new
...	...
...	...	@@ -48,7 +48,7 @@ class UsersController < AdminController
48	48
49	49	def destroy_user
50	50	if request.post?
51		- person = environment.people.find_by_id(params[:id])
	51	+ person = environment.people.find_by id: params[:id]
52	52	if person && person.destroy
53	53	session[:notice] = _('The profile was deleted.')
54	54	else
...	...