Merge branch 'master' into export-comment-paragraph

Conflicts: app/helpers/forms_helper.rb app/views/cms/edit.html.erb plugins/comment_paragraph/controllers/profile/comment_paragraph_plugin_profile_controller.rb plugins/comment_paragraph/test/functional/comment_paragraph_plugin_profile_controller_test.rb

Merge branch 'master' into export-comment-paragraph
Conflicts: app/helpers/forms_helper.rb app/views/cms/edit.html.erb plugins/comment_paragraph/controllers/profile/comment_paragraph_plugin_profile_controller.rb plugins/comment_paragraph/test/functional/comment_paragraph_plugin_profile_controller_test.rb
Victor Costa
2 parents b1ce9803 f0ec4fa4
Showing 1543 changed files with 76044 additions and 82153 deletions Show diff stats
.gitlab-ci.yml
.travis.yml
AUTHORS.md
Gemfile
Rakefile
Vagrantfile
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/categories_controller.rb
app/controllers/admin/environment_role_manager_controller.rb
app/controllers/admin/features_controller.rb
app/controllers/admin/licenses_controller.rb
app/controllers/admin/plugins_controller.rb
app/controllers/admin/role_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application.rb
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/enterprise_validation_controller.rb
app/controllers/my_profile/manage_products_controller.rb
+image: noosfero/ci
+
 before_script:
-  - mkdir -p tmp/{pids,cache} log
-  - bundle check || bundle install
-# workaround for plugins with Gemfile
-  - perl -pi -e 's/--local //' script/noosfero-plugins
-  - script/noosfero-plugins disableall
-  - bundle exec rake makemo &>/dev/null
-# database
-  - cp config/database.yml.gitlab-ci config/database.yml
-  - createdb gitlab_ci_test || true
-  - bundle exec rake db:schema:load &>/dev/null
-  - bundle exec rake db:migrate &>/dev/null
+  - mkdir -p locale # makes quick-start skip compiling translations
+  - ./script/set-apt-proxy
+  - ./script/silent-quick-start
+
+stages:
+  - smoke-tests
+  - all-tests
+
+smoke:
+  script: bundle exec rake ci:smoke
+  stage: smoke-tests
 units:
   script: bundle exec rake test:units
+  stage: all-tests
+
 functionals:
   script: bundle exec rake test:functionals
+  stage: all-tests
+
 integration:
   script: bundle exec rake test:integration
+  stage: all-tests
+
 cucumber:
   script: bundle exec rake cucumber
+  stage: all-tests
+
 selenium:
   script: bundle exec rake selenium
+  stage: all-tests
+
 plugins:
   script: bundle exec rake test:noosfero_plugins
-
+  stage: all-tests
@@ -8,8 +8,7 @@ notifications:
 language: ruby
 rvm:
-# for 2.2 support we need to upgrade the pg gem
-  - 2.1.6
+  - 2.2.3
 sudo: false
 addons:
@@ -26,19 +25,16 @@ addons:
       - libsqlite3-dev
       - libxslt1-dev
-before_install:
-  - gem env
-
 # workaround for https://github.com/travis-ci/travis-ci/issues/4536
 before_install:
-  - export GEM_HOME=$PWD/vendor/bundle/ruby/2.1.0
+  - export GEM_HOME=$PWD/vendor/bundle/ruby/2.2.0
   - gem install bundler
 cache: bundler
 before_script:
   - mkdir -p tmp/{pids,cache} log
   - script/noosfero-plugins disableall
-  - bundle exec rake makemo &>/dev/null
+  #- bundle exec rake makemo &>/dev/null
 # database
   - cp config/database.yml.travis config/database.yml
   - psql -c 'create database myapp_test;' -U postgres
@@ -49,7 +45,7 @@ env:
   - TASK=test:units
   - TASK=test:functionals
   - TASK=test:integration
-  - TASK=cucumber
+  - TASK=cucumber LANG=en
   - TASK=selenium
   - TASK=test:noosfero_plugins BUNDLE_OPTS=install
@@ -11,6 +11,7 @@ Developers
 Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
 Alan Freihof Tygel <alantygel@gmail.com>
 Alessandro Palmeira <alessandro.palmeira@gmail.com>
+Alexandre Barbosa <alexandreab@live.com>
 Alexandre Torres <alexandrekry@gmail.com>
 Alex Campelo <campelo.al1@gmail.com>
 Álvaro Fernando <alvarofernandoms@gmail.com>
@@ -31,6 +32,7 @@ Caio SBA &lt;caio@colivre.coop.br&gt;
 Caio Tiago Oliveira <caiotiago@colivre.coop.br>
 Carlos Andre de Souza <carlos.andre.souza@msn.com>
 Carlos Morais <carlos88morais@gmail.com>
+Carlos Purificacao <carloseugenio@gmail.com>
 Christophe DANIEL <papaeng@gmail.com>
 Daniela Feitosa <alessandro.palmeira@gmail.com>
 Daniel Alves <danpaulalves@gmail.com>
@@ -52,10 +54,12 @@ Fernanda Lopes &lt;nanda.listas+psl@gmail.com&gt;
 Filipe Ribeiro <firibeiro77@live.com>
 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Gabriela Navarro <navarro1703@gmail.com>
+Gabriel Silva <gabriel93.silva@gmail.com>
 Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
 Guilherme C. Muniz <guilherme.cmuniz@gmail.com>
 Guilherme Rojas <guilhermehrojas@gmail.com>
+Gustavo Coelho <gust.rod.coelho@gmail.com>
 Gustavo Jaruga <darksshades@gmail.com>
 Hebert Douglas <hebertdougl@gmail.com>
 Hugo Melo <hugo@riseup.net>
@@ -84,14 +88,16 @@ Luciano Prestes Cavalcanti &lt;lucianopcbr@gmail.com&gt;
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
 Luiz Matos <luizff.matos@gmail.com>
+Macartur de Sousa <macartur.sc@gmail.com>
 Marcelo Júnior <maljunior@gmail.com>
 Marcos Ramos <ms.ramos@outlook.com>
 Marcos Ronaldo <marcos.rpj2@gmail.com>
+María Vecino <mariavecino@ecoalternative.net>
 Mariel Zasso <noosfero-br@listas.softwarelivre.org>
 Martín Olivera <molivera@solar.org.ar>
 Matheus Faria <matheus.sousa.faria@gmail.com>
 Maurilio Atila <cabelotaina@gmail.com>
-Melissa Wen <melissa@colivre.coop.br>
+Melissa Wen <melissa.srw@gmail.com>
 M for Momo <mo@rtnp.org>
 Michal Čihař <michal@cihar.com>
 Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
@@ -115,6 +121,7 @@ Raquel &lt;rcordioli@gmail.com&gt;
 Renan Costa <renan2727@hotmail.com>
 Renan Teruo <renanteruoc@gmail.com>
 Rodrigo Medeiros <rodrigo.mss01@gmail.com>
+Rodrigo Siqueira <siqueira@kuniri.org>
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronnie Simon <ronniesimonf@gmail.com>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
@@ -131,7 +138,7 @@ Valessio Brito &lt;contato@valessiobrito.com.br&gt;
 Victor Costa <vfcosta@gmail.com>
 Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
 Victor Navarro <victor.matias.navarro@gmail.com>
-Vinicius Cubas Brand <viniciuscb@gmail.com>
+Vinicius Brand <viniciuscb@gmail.com>
 Vitor Barbosa <vitornga15@gmail.com>
 Wilton Rodrigues <braynwilton@gmail.com>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
 source "https://rubygems.org"
-gem 'rails',                    '~> 3.2.22'
-gem 'minitest',                 '~> 3.2.0'
-gem 'fast_gettext',             '~> 0.6.8'
-gem 'acts-as-taggable-on',      '~> 3.4.2'
+
+platform :ruby do
+  gem 'pg',                     '~> 0.17'
+  gem 'rmagick',                '~> 2.13'
+end
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+  gem 'rmagick4j'
+end
+
+gem 'rails',                    '~> 4.2.4'
+gem 'fast_gettext',             '~> 0.9'
+gem 'acts-as-taggable-on',      '~> 3.5'
 gem 'rails_autolink',           '~> 1.1.5'
-gem 'pg',                       '~> 0.13.2'
-gem 'rmagick',                  '~> 2.13.1'
-gem 'RedCloth',                 '~> 4.2.9'
-gem 'will_paginate',            '~> 3.0.3'
+gem 'RedCloth',                 '~> 4.2'
 gem 'ruby-feedparser',          '~> 0.7'
-gem 'daemons',                  '~> 1.1.5'
+gem 'daemons',                  '~> 1.1'
 gem 'unicorn',                  '~> 4.8'
-gem 'nokogiri',                 '~> 1.5.5'
+gem 'nokogiri',                 '~> 1.6.0'
+gem 'will_paginate',            '~> 3.0.7'
+gem 'pothoven-attachment_fu',   '~> 3.2.16'
+gem 'delayed_job'
+gem 'delayed_job_active_record'
 gem 'rake', :require => false
-gem 'rest-client',              '~> 1.6.7'
+gem 'rest-client',              '~> 1.6'
 gem 'exception_notification',   '~> 4.0.1'
-gem 'gettext',                  '~> 2.2.1', :require => false
-gem 'locale',                   '~> 2.0.5'
+gem 'gettext',                  '~> 3.1', :require => false
+gem 'locale',                   '~> 2.1'
 gem 'whenever', :require => false
-gem 'eita-jrails', '~> 0.9.5', require: 'jrails'
+gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
+gem 'diffy',                    '~> 3.0'
+gem 'slim'
 # API dependencies
 gem 'grape',                    '~> 0.12'
@@ -30,30 +42,53 @@ gem &#39;rack-contrib&#39;
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
 gem 'sass-rails'
-gem 'sass', '~> 3.1.19'
+gem 'sprockets-rails', '~> 2.1'
+
+# gems to enable rails3 behaviour
+gem 'protected_attributes'
+gem 'rails-observers'
+gem 'actionpack-page_caching'
+gem 'actionpack-action_caching'
+gem 'activerecord-session_store'
+gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
 group :production do
   gem 'dalli', '~> 2.7.0'
 end
+group :development, :test do
+  gem 'spring'
+end
+
 group :test do
-  gem 'rspec',                  '~> 2.14.0'
-  gem 'rspec-rails',            '~> 2.14.1'
+  gem 'rspec',                  '~> 3.3', require: false
+  gem 'rspec-rails',            '~> 3.2', require: false
   gem 'mocha',                  '~> 1.1.0', :require => false
   gem 'test-unit' if RUBY_VERSION >= '2.2.0'
+  gem 'minitest'
+  gem 'minitest-reporters'
 end
 group :cucumber do
-  gem 'cucumber-rails',         '~> 1.0.6', :require => false
-  gem 'capybara',               '~> 2.1.0'
-  gem 'cucumber',               '~> 1.0.6'
-  gem 'database_cleaner',       '~> 1.2.0'
-  gem 'selenium-webdriver',     '~> 2.47.0'
+  gem 'capybara',               '~> 2.2'
+  gem 'launchy'
+  gem 'cucumber'
+  gem 'cucumber-rails',         '~> 1.4.2', :require => false
+  gem 'database_cleaner',       '~> 1.3'
+  gem 'selenium-webdriver',     '>= 2.50'
 end
 # Requires custom dependencies
 eval(File.read('config/Gemfile'), binding) rescue nil
+vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
+vendor.each do |dir|
+  plugin = File.basename dir
+  version = if Dir.glob("#{dir}/*.gemspec").length > 0 then '> 0.0.0' else '0.0.0' end
+
+  gem plugin, version, path: dir
+end
+
 # include gemfiles from enabled plugins
 # plugins in baseplugins/ are not included on purpose. They should not have any
 # dependencies.
@@ -17,36 +17,3 @@ end.flatten.each do |taskfile|
   load taskfile
 end 
-# plugins' tasks
-plugins_tasks = Dir.glob("config/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake").sort +
-  Dir.glob("config/plugins/*/vendor/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake").sort
-plugins_tasks.each{ |ext| load ext }
-
-
-desc "Print out grape routes"
-task :grape_routes => :environment do
-  #require 'api/api.rb'
-  Noosfero::API::API.routes.each do |route|
-    puts route
-    method = route.route_method
-    path = route.route_path
-    puts "     #{method} #{path}"
-  end
-end
-
-# plugins' tasks
-plugins_tasks = Dir.glob("config/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake").sort +
-  Dir.glob("config/plugins/*/vendor/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake").sort
-plugins_tasks.each{ |ext| load ext }
-
-
-desc "Print out grape routes"
-task :grape_routes => :environment do
-  #require 'api/api.rb'
-  Noosfero::API::API.routes.each do |route|
-    puts route
-    method = route.route_method
-    path = route.route_path
-    puts "     #{method} #{path}"
-  end
-end
@@ -3,7 +3,7 @@
 VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
+  config.vm.box = ENV.fetch('VAGRANT_BOX', "debian/jessie64")
   config.vm.network :forwarded_port, host: 3000, guest: 3000
   config.vm.provision :shell do |shell|
     shell.inline = 'su vagrant -c /vagrant/script/vagrant'
@@ -12,7 +12,7 @@ class AdminPanelController &lt; AdminController
       if params[:environment][:languages]
         params[:environment][:languages] = params[:environment][:languages].map {|lang, value| lang if value=='true'}.compact
       end
-      if @environment.update_attributes(params[:environment])
+      if @environment.update(params[:environment])
         session[:notice] = _('Environment settings updated')
         redirect_to :action => 'index'
       end
@@ -54,7 +54,7 @@ class AdminPanelController &lt; AdminController
      if request.post?
        env = environment
-       folders = params[:folders].map{|fid| Folder.find(:first, :conditions => {:profile_id => env.portal_community, :id => fid})} if params[:folders]
+       folders = env.portal_community.folders.where(id: params[:folders]).order(params[:folders].reverse.map{ |f| "id=#{f}" }) if params[:folders]
        env.portal_folders = folders
        if env.save
          session[:notice] = _('Saved the portal folders')
@@ -65,7 +65,7 @@ class AdminPanelController &lt; AdminController
   def set_portal_news_amount
     if request.post?
-      if @environment.update_attributes(params[:environment])
+      if @environment.update(params[:environment])
         session[:notice] = _('Saved the number of news on folders')
         redirect_to :action => 'index'
       end
 class CategoriesController < AdminController
   protect 'manage_environment_categories', :environment
-  
+
   helper :categories
   def index
-    @categories = environment.categories.find(:all, :conditions => "parent_id is null AND type is null")
-    @regions = environment.regions.find(:all, :conditions => {:parent_id => nil})
-    @product_categories = environment.product_categories.find(:all, :conditions => {:parent_id => nil})
+    @categories = environment.categories.where("parent_id is null AND type is null")
+    @regions = environment.regions.where(:parent_id => nil)
+    @product_categories = environment.product_categories.where(:parent_id => nil)
   end
   def get_children
@@ -43,7 +43,7 @@ class CategoriesController &lt; AdminController
     begin
       @category = environment.categories.find(params[:id])
       if request.post?
-        @category.update_attributes!(params[:category])
+        @category.update!(params[:category])
         @saved = true
         session[:notice] = _("Category %s saved." % @category.name)
         redirect_to :action => 'index'
@@ -2,7 +2,7 @@ class EnvironmentRoleManagerController &lt; AdminController
   protect 'manage_environment_roles', :environment
   def index
-    @admins = Person.find(:all, :conditions => ['role_assignments.resource_type = ?', 'Environment'], :include => :role_assignments )
+    @admins = Person.where('role_assignments.resource_type = ?', 'Environment').includes(:role_assignments)
   end
   def change_roles
 class FeaturesController < AdminController
   protect 'edit_environment_features', :environment
-  
+  helper CustomFieldsHelper
+
   def index
     @features = Environment.available_features.sort_by{|k,v|v}
   end
   post_only :update
   def update
-    if @environment.update_attributes(params[:environment])
+    if @environment.update(params[:environment])
       session[:notice] = _('Features updated successfully.')
       redirect_to :action => 'index'
     else
@@ -51,9 +52,37 @@ class FeaturesController &lt; AdminController
     redirect_to :action => 'manage_fields'
   end
+  def manage_custom_fields
+    custom_field_list = params[:custom_fields] || {}
+
+    custom_fields_to_destroy =
+      params[:customized_type].constantize.custom_fields(environment).map(&:id) - custom_field_list.keys.map(&:to_i)
+    CustomField.destroy(custom_fields_to_destroy)
+
+    custom_field_list.each_pair do |id, custom_field|
+      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)
+      else
+        if !custom_field[:extras].nil?
+          tmp = []
+          custom_field[:extras].each_pair do |k, v|
+            tmp << v
+          end
+          custom_field[:extras] = tmp
+        end
+        field =  CustomField.new custom_field.except(:environment)
+        field.environment=environment
+        field.save if field.valid?
+      end
+    end
+    redirect_to :action => 'manage_fields'
+  end
+
   def search_members
     arg = params[:q].downcase
-    result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%"])
+    result = environment.people.where('LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%")
     render :text => prepare_to_token_input(result).to_json
   end
@@ -23,7 +23,7 @@ class LicensesController &lt; AdminController
     @license = environment.licenses.find(params[:license_id])
     if request.post?
       begin
-        @license.update_attributes!(params[:license])
+        @license.update!(params[:license])
         session[:notice] = _('License updated')
         redirect_to :action => 'index'
       rescue
@@ -8,7 +8,7 @@ class PluginsController &lt; AdminController
   post_only :update
   def update
     params[:environment][:enabled_plugins].delete('')
-    if @environment.update_attributes(params[:environment])
+    if @environment.update(params[:environment])
       session[:notice] = _('Plugins updated successfully.')
     else
       session[:error] = _('Plugins were not updated successfully.')
@@ -29,7 +29,7 @@ class RoleController &lt; AdminController
   def update
     @role = environment.roles.find(params[:id])
-    if @role.update_attributes(params[:role])
+    if @role.update(params[:role])
       redirect_to :action => 'show', :id => @role
     else
       session[:notice] = _('Failed to edit role')
@@ -63,7 +63,7 @@ class UsersController &lt; AdminController
     respond_to do |format|
       format.html
       format.xml do
-        users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
+        users = User.where(:environment_id => environment.id).includes(:person)
         send_data users.to_xml(
             :skip_types => true,
             :only => %w[email login created_at updated_at],
@@ -1 +0,0 @@
-require 'application_controller'
@@ -8,7 +8,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :init_noosfero_plugins
   before_filter :allow_cross_domain_access
-  before_filter :login_from_cookie
+  include AuthenticatedSystem
   before_filter :require_login_for_environment, :if => :private_environment?
   before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
@@ -45,7 +45,7 @@ class ApplicationController &lt; ActionController::Base
   include ApplicationHelper
   layout :get_layout
   def get_layout
-    return nil if request.format == :js or request.xhr?
+    return false if request.format == :js or request.xhr?
     theme_layout = theme_option(:layout)
     if theme_layout
@@ -69,15 +69,12 @@ class ApplicationController &lt; ActionController::Base
   helper :language
   include DesignHelper
-
-  # Be sure to include AuthenticationSystem in Application Controller instead
-  include AuthenticatedSystem
   include PermissionCheck
   before_filter :set_locale
   def set_locale
     FastGettext.available_locales = environment.available_locales
-    FastGettext.default_locale = environment.default_locale
+    FastGettext.default_locale = environment.default_locale || 'en'
     FastGettext.locale = (params[:lang] || session[:lang] || environment.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
     I18n.locale = FastGettext.locale.to_s.gsub '_', '-'
     I18n.default_locale = FastGettext.default_locale.to_s.gsub '_', '-'
@@ -134,12 +131,11 @@ class ApplicationController &lt; ActionController::Base
     @domain = Domain.find_by_name(request.host)
     if @domain.nil?
       @environment = Environment.default
-      if @environment.nil? && Rails.env.development?
-        # This should only happen in development ...
+      # Avoid crashes on test and development setups
+      if @environment.nil? && !Rails.env.production?
         @environment = Environment.new
         @environment.name = "Noosfero"
         @environment.is_default = true
-        @environment.save!
       end
     else
       @environment = @domain.environment
@@ -148,7 +144,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]
-        redirect_to params.merge(:host => @profile.default_hostname)
+        redirect_to url_for(params.merge host: @profile.default_hostname)
       end
     end
   end
@@ -163,7 +159,8 @@ class ApplicationController &lt; ActionController::Base
   def render_not_found(path = nil)
     @no_design_blocks = true
     @path ||= request.path
-    render :template => 'shared/not_found.html.erb', :status => 404, :layout => get_layout
+    # force html template even if the browser asked for a image
+    render template: 'shared/not_found', status: 404, layout: get_layout, formats: [:html]
   end
   alias :render_404 :render_not_found
@@ -171,7 +168,8 @@ class ApplicationController &lt; ActionController::Base
     @no_design_blocks = true
     @message = message
     @title = title
-    render :template => 'shared/access_denied.html.erb', :status => 403
+    # force html template even if the browser asked for a image
+    render template: 'shared/access_denied', status: 403, formats: [:html]
   end
   def load_category
@@ -185,13 +183,7 @@ class ApplicationController &lt; ActionController::Base
   end
   include SearchTermHelper
-
-  def find_by_contents(asset, context, scope, query, paginate_options={:page => 1}, options={})
-    scope = scope.with_templates(options[:template_id]) unless options[:template_id].blank?
-    search = plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options)
-    register_search_term(query, scope.count, search[:results].count, context, asset)
-    search
-  end
+  include FindByContents
   def find_suggestions(query, context, asset, options={})
     plugins.dispatch_first(:find_suggestions, query, context, asset, options)
@@ -204,7 +196,7 @@ class ApplicationController &lt; ActionController::Base
   def redirect_to_current_user
     if params[:profile] == '~'
       if logged_in?
-        redirect_to params.merge(:profile => user.identifier)
+        redirect_to url_for(params.merge profile: user.identifier)
       else
         render_not_found
       end
@@ -3,12 +3,11 @@ class BoxOrganizerController &lt; ApplicationController
   before_filter :login_required
   def index
+    @available_blocks = available_blocks.uniq.sort_by(&:pretty_name)
   end
   def move_block
-    @block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
-
-    @source_box = @block.box
+    @block = params[:id] ? boxes_holder.blocks.find(params[:id].gsub(/^block-/, '')) : nil
     target_position = nil
@@ -20,9 +19,12 @@ class BoxOrganizerController &lt; ApplicationController
     else
       (params[:target] =~ /end-of-box-([0-9]+)/)
-      @target_box = boxes_holder.boxes.find($1)
+      @target_box = boxes_holder.boxes.find_by_id($1)
     end
+    @block = new_block(params[:type], @target_box) if @block.nil?
+    @source_box = @block.box
+
     if (@source_box != @target_box)
       @block.remove_from_list
       @block.box = @target_box
@@ -58,23 +60,6 @@ class BoxOrganizerController &lt; ApplicationController
     redirect_to :action => 'index'
   end
-  def add_block
-    type = params[:type]
-    if ! type.blank?
-      if available_blocks.map(&:name).include?(type)
-        boxes_holder.boxes.find(params[:box_id]).blocks << type.constantize.new
-        redirect_to :action => 'index'
-      else
-        raise ArgumentError.new("Type %s is not allowed. Go away." % type)
-      end
-    else
-      @center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
-      @side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
-      @boxes = boxes_holder.boxes.with_position
-      render :action => 'add_block', :layout => false
-    end
-  end
-
   def edit
     @block = boxes_holder.blocks.find(params[:id])
     render :action => 'edit', :layout => false
@@ -84,9 +69,9 @@ class BoxOrganizerController &lt; ApplicationController
     if request.xhr? and params[:query]
       search = params[:query]
       path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
-        boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{portal}/"+content.path }
+                    boxes_holder.portal_community.articles.where("name ILIKE ? OR path ILIKE ?", "%#{search}%", "%#{search}%").limit(20).map { |content| "/{portal}/"+content.path }
       elsif boxes_holder.is_a?(Profile)
-        boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{profile}/"+content.path }
+        boxes_holder.articles.where("name ILIKE ? OR path ILIKE ?", "%#{search}%", "%#{search}%").limit(20).map { |content| "/{profile}/"+content.path }
       else
         []
       end
@@ -98,7 +83,7 @@ class BoxOrganizerController &lt; ApplicationController
   def save
     @block = boxes_holder.blocks.find(params[:id])
-    @block.update_attributes(params[:block])
+    @block.update(params[:block])
     redirect_to :action => 'index'
   end
@@ -121,6 +106,27 @@ class BoxOrganizerController &lt; ApplicationController
     redirect_to :action => 'index'
   end
+  def show_block_type_info
+    type = params[:type]
+    if type.blank? || !available_blocks.map(&:name).include?(type)
+      raise ArgumentError.new("Type %s is not allowed. Go away." % type)
+    end
+    @block = type.constantize.new
+    @block.box = Box.new(:owner => boxes_holder)
+    render :action => 'show_block_type_info', :layout => false
+  end
+
   protected :boxes_editor?
+  protected
+
+  def new_block(type, box)
+    if !available_blocks.map(&:name).include?(type)
+      raise ArgumentError.new("Type %s is not allowed. Go away." % type)
+    end
+    block = type.constantize.new
+    box.blocks << block
+    block
+  end
+
 end
@@ -6,7 +6,7 @@ class CmsController &lt; MyProfileController
   def search_tags
     arg = params[:term].downcase
-    result = ActsAsTaggableOn::Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
+    result = Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
     render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
   end
@@ -50,16 +50,9 @@ class CmsController &lt; MyProfileController
   def view
     @article = profile.articles.find(params[:id])
-    conditions = []
-    if @article.has_posts?
-      conditions = ['type != ?', 'RssFeed']
-    end
-
-    @articles = @article.children.reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name").paginate(
-      :conditions => conditions,
-      :per_page => per_page,
-      :page => params[:npage]
-    )
+    @articles = @article.children.reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name")
+    @articles = @articles.where "type <> ?", 'RssFeed' if @article.has_posts?
+    @articles = @articles.paginate per_page: per_page, page: params[:npage]
   end
   def index
@@ -99,7 +92,7 @@ class CmsController &lt; MyProfileController
         @article.image.save!
       end
       @article.last_changed_by = user
-      if @article.update_attributes(params[:article])
+      if @article.update(params[:article])
         if !continue
           if @article.content_type.nil? || @article.image?
             success_redirect
@@ -230,7 +223,7 @@ class CmsController &lt; MyProfileController
       else
         session[:notice] = _('File(s) successfully uploaded')
         if @back_to
-          redirect_to @back_to
+          redirect_to url_for(@back_to)
         elsif @parent
           redirect_to :action => 'view', :id => @parent.id
         else
@@ -381,7 +374,7 @@ class CmsController &lt; MyProfileController
   def search_article_privacy_exceptions
     arg = params[:q].downcase
-    result = profile.members.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    result = profile.members.where('LOWER(name) LIKE ?', "%#{arg}%")
     render :text => prepare_to_token_input(result).to_json
   end
@@ -54,7 +54,7 @@ class EnterpriseValidationController &lt; MyProfileController
   def edit_validation_info
     @info = profile.validation_info
     if request.post?
-      if @info.update_attributes(params[:info])
+      if @info.update(params[:info])
         redirect_to :action => 'index'
       end
     end
@@ -69,7 +69,7 @@ class ManageProductsController &lt; ApplicationController
     field = params[:field]
     if request.post?
       begin
-        @product.update_attributes!(params[:product])
+        @product.update!(params[:product])
         render :partial => "display_#{field}", :locals => {:product => @product}
       rescue Exception => e
         render :partial => "edit_#{field}", :locals => {:product => @product, :errors => true}
@@ -86,7 +86,7 @@ class ManageProductsController &lt; ApplicationController
     @edit = true
     @level = @category.level
     if request.post?
-      if @product.update_attributes({:product_category_id => params[:selected_category_id]}, :without_protection => true)
+      if @product.update({:product_category_id => params[:selected_category_id]}, :without_protection => true)
         render :partial => 'shared/redirect_via_javascript',
           :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
       else
@@ -115,7 +115,7 @@ class ManageProductsController &lt; ApplicationController
     @categories = ProductCategory.top_level_for(environment)
     @level = 0
     if request.post?
-      if @input.update_attributes(:product_category_id => params[:selected_category_id])
+      if @input.update(:product_category_id => params[:selected_category_id])
         @inputs = @product.inputs
         render :partial => 'display_inputs'
       else
@@ -172,7 +172,7 @@ class ManageProductsController &lt; ApplicationController
       @input = @profile.inputs.find_by_id(params[:id])
       if @input
         if request.post?
-          if @input.update_attributes(params[:input])
+          if @input.update(params[:input])
             render :partial => 'display_input', :locals => {:input => @input}
           else
             render :partial => 'edit_input'
 class MapsController < MyProfileController
+  skip_before_filter :verify_authenticity_token, only: [:google_map]
+
   protect 'edit_profile', :profile
   def edit_location
@@ -15,7 +17,7 @@ class MapsController &lt; MyProfileController
         end
         Profile.transaction do
-          if profile.update_attributes!(params[:profile_data])
+          if profile.update!(params[:profile_data])
             BlockSweeper.expire_blocks profile.blocks.select{ |b| b.class == LocationBlock }
             session[:notice] = _('Address was updated successfully!')
             redirect_to :action => 'edit_location'
 class MembershipsController < MyProfileController
   protect 'manage_memberships', :profile
+  helper CustomFieldsHelper
   def index
     @roles = environment.roles.select do |role|
@@ -17,12 +18,14 @@ class MembershipsController &lt; MyProfileController
   def new_community
     @community = Community.new(params[:community])
+    custom_values = params[:profile_data][:custom_values] if (params[:profile_data] && params[:profile_data][:custom_values])
+    @community.custom_values = custom_values
     @community.environment = environment
     @back_to = params[:back_to] || url_for(:action => 'index')
     if request.post? && @community.valid?
       begin
         # Community was created
-        @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment}))
+        @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment, :custom_values => custom_values}))
         @community.reload
         redirect_to :action => 'welcome', :community_id => @community.id, :back_to => @back_to
       rescue ActiveRecord::RecordNotFound
@@ -15,8 +15,9 @@ class ProfileDesignController &lt; BoxOrganizerController
   end
   def protect_fixed_block
+    return if params[:id].blank?
     block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
-    if !current_person.is_admin? && !block.movable?
+    if block.present? && !current_person.is_admin? && !block.movable?
       render_access_denied
     end
   end
@@ -8,6 +8,7 @@ class ProfileEditorController &lt; MyProfileController
   before_filter :forbid_destroy_profile, :only => [:destroy_profile]
   before_filter :check_user_can_edit_header_footer, :only => [:header_footer]
   helper_method :has_welcome_page
+  helper CustomFieldsHelper
   def index
     @pending_tasks = Task.to(profile).pending.without_spam.select{|i| user.has_permission?(i.permission, profile)}
@@ -27,7 +28,7 @@ class ProfileEditorController &lt; MyProfileController
         Image.transaction do
           begin
             @plugins.dispatch(:profile_editor_transaction_extras)
-            @profile_data.update_attributes!(params[:profile_data])
+            @profile_data.update!(params[:profile_data])
             redirect_to :action => 'index', :profile => profile.identifier
           rescue Exception => ex
             profile.identifier = params[:profile] if profile.identifier.blank?
@@ -83,7 +84,7 @@ class ProfileEditorController &lt; MyProfileController
       if @profile.destroy
         session[:notice] = _('The profile was deleted.')
         if(params[:return_to])
-          redirect_to params[:return_to]
+          redirect_to url_for(params[:return_to])
         else
           redirect_to :controller => 'home'
         end
@@ -97,7 +98,7 @@ class ProfileEditorController &lt; MyProfileController
     @welcome_page = profile.welcome_page || TinyMceArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
     if request.post?
       begin
-        @welcome_page.update_attributes!(params[:welcome_page])
+        @welcome_page.update!(params[:welcome_page])
         profile.welcome_page = @welcome_page
         profile.save!
         session[:notice] = _('Welcome page saved successfully.')
@@ -47,7 +47,7 @@ class ProfileMembersController &lt; MyProfileController
   end
   def remove_role
-    @association = RoleAssignment.find(:all, :conditions => {:id => params[:id], :target_id => profile.id})
+    @association = RoleAssignment.where(:id => params[:id], :target_id => profile.id)
     if @association.destroy
       session[:notice] = 'Member succefully unassociated'
     else
@@ -120,7 +120,7 @@ class ProfileMembersController &lt; MyProfileController
   def search_user
     role = Role.find(params[:role])
-    render :text => environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR LOWER(identifier) LIKE ?', "%#{params['q_'+role.key]}%", "%#{params['q_'+role.key]}%"]).
+    render :text => environment.people.where('LOWER(name) LIKE ? OR LOWER(identifier) LIKE ?', "%#{params['q_'+role.key]}%", "%#{params['q_'+role.key]}%").
       select { |person| !profile.members_by_role(role).include?(person) }.
       map {|person| {:id => person.id, :name => person.name} }.
       to_json
@@ -58,7 +58,7 @@ class ProfileRolesController &lt; MyProfileController
   def update
     @role = environment.roles.find(params[:id])
-    if @role.update_attributes(params[:role])
+    if @role.update(params[:role])
       redirect_to :action => 'show', :id => @role
     else
       session[:notice] = _('Failed to edit role')
@@ -48,7 +48,7 @@ class TasksController &lt; MyProfileController
         if request.post? && VALID_DECISIONS.include?(decision) && id && decision != 'skip'
           task = profile.find_in_all_tasks(id)
           begin
-            task.update_attributes(value[:task])
+            task.update(value[:task])
             task.send(decision, current_person)
           rescue Exception => ex
             message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
@@ -86,7 +86,7 @@ class TasksController &lt; MyProfileController
   end
   def ticket_details
-    @ticket = Ticket.find(:first, :conditions => ['(requestor_id = ? or target_id = ?) and id = ?', profile.id, profile.id, params[:id]])
+    @ticket = Ticket.where('(requestor_id = ? or target_id = ?) and id = ?', profile.id, profile.id, params[:id]).first
   end
 end
@@ -6,6 +6,9 @@ class AccountController &lt; ApplicationController
   before_filter :redirect_if_logged_in, :only => [:login, :signup]
   before_filter :protect_from_bots, :only => :signup
+  protect_from_forgery except: [:login]
+
+  helper CustomFieldsHelper
   # say something nice, you goof!  something sweet.
   def index
     unless logged_in?
@@ -117,9 +120,9 @@ class AccountController &lt; ApplicationController
           @user.signup!
           owner_role = Role.find_by_name('owner')
           @user.person.affiliate(@user.person, [owner_role]) if owner_role
-          invitation = Task.find_by_code(@invitation_code)
+          invitation = Task.from_code(@invitation_code).first
           if invitation
-            invitation.update_attributes!({:friend => @user.person})
+            invitation.update! friend: @user.person
             invitation.finish
           end
@@ -209,7 +212,7 @@ class AccountController &lt; ApplicationController
   #
   # Posts back.
   def new_password
-    @change_password = ChangePassword.find_by_code(params[:code])
+    @change_password = ChangePassword.from_code(params[:code]).first
     unless @change_password
       render :action => 'invalid_change_password_code', :status => 403
@@ -218,7 +221,7 @@ class AccountController &lt; ApplicationController
     if request.post?
       begin
-        @change_password.update_attributes!(params[:change_password])
+        @change_password.update!(params[:change_password])
         @change_password.finish
         render :action => 'new_password_ok'
       rescue ActiveRecord::RecordInvalid => e
@@ -402,7 +405,7 @@ class AccountController &lt; ApplicationController
   end
   def load_enterprise_activation
-    @enterprise_activation ||= EnterpriseActivation.find_by_code(params[:enterprise_code])
+    @enterprise_activation ||= EnterpriseActivation.from_code(params[:enterprise_code]).first
   end
   def load_enterprise
@@ -426,7 +429,7 @@ class AccountController &lt; ApplicationController
   def go_to_initial_page
     if params[:return_to]
-      redirect_to params[:return_to]
+      redirect_to url_for(params[:return_to])
     elsif environment.enabled?('allow_change_of_redirection_after_login')
       check_redirection_options(user, user.preferred_login_redirection, user.admin_url)
     else
@@ -487,7 +490,7 @@ class AccountController &lt; ApplicationController
   def check_redirection
     unless params[:redirection].blank?
       session[:return_to] = @user.return_to
-      @user.update_attributes(:return_to => nil)
+      @user.update(:return_to => nil)
     end
   end
@@ -67,7 +67,7 @@ class ChatController &lt; PublicController
   def update_presence_status
     if request.xhr?
-      current_user.update_attributes({:chat_status_at => DateTime.now}.merge(params[:status] || {}))
+      current_user.update({:chat_status_at => DateTime.now}.merge(params[:status] || {}))
     end
     render :nothing => true
   end
@@ -78,7 +78,7 @@ class CommentController &lt; ApplicationController
     respond_to do |format|
       format.js do
         comment_to_render = @comment.comment_root
-        render :json => { 
+        render :json => {
             :render_target => comment_to_render.anchor,
             :html => render_to_string(:partial => 'comment', :locals => {:comment => comment_to_render, :display_link => true}),
             :msg => _('Comment successfully created.')
@@ -114,7 +114,7 @@ class CommentController &lt; ApplicationController
   end
   def update
-    if @comment.update_attributes(params[:comment])
+    if @comment.update(params[:comment])
       @plugins.dispatch(:process_extra_comment_params, [@comment,params])
       respond_to do |format|
@@ -4,7 +4,7 @@ class EnterpriseRegistrationController &lt; ApplicationController
   before_filter :login_required
   # Just go to the first step.
-  # 
+  #
   # FIXME: shouldn't this action present some sort of welcome message and point
   # to the first step explicitly?
   def index
@@ -15,7 +15,7 @@ class EnterpriseRegistrationController &lt; ApplicationController
         @create_enterprise.target = Profile.find(params[:create_enterprise][:target_id])
       end
     elsif @validation == :admin || @validation == :none
-        @create_enterprise.target = environment
+      @create_enterprise.target = environment
     end
     @create_enterprise.requestor = user
     the_action =
@@ -40,7 +40,7 @@ class EnterpriseRegistrationController &lt; ApplicationController
   protected
-  # Fill in the form and select your Region. 
+  # Fill in the form and select your Region.
   #
   # Posts back.
   def basic_information
@@ -7,6 +7,7 @@ class ProfileController &lt; PublicController
   helper TagsHelper
   helper ActionTrackerHelper
+  helper CustomFieldsHelper
   protect 'send_mail_to_members', :profile, :only => [:send_mail]
@@ -37,7 +38,7 @@ class ProfileController &lt; PublicController
   def tag_feed
     @tag = params[:id]
-    tagged = profile.articles.paginate(:per_page => 20, :page => 1, :order => 'published_at DESC', :include => :tags, :conditions => ['tags.name LIKE ?', @tag])
+    tagged = profile.articles.paginate(:per_page => 20, :page => 1).order('published_at DESC').joins(:tags).where('tags.name LIKE ?', @tag)
     feed_writer = FeedWriter.new
     data = feed_writer.write(
       tagged,
@@ -205,7 +206,7 @@ class ProfileController &lt; PublicController
   def more_comments
     profile_filter = @profile.person? ? {:user_id => @profile} : {:target_id => @profile}
-    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity]}.merge(profile_filter))
+    activity = ActionTracker::Record.where({:id => params[:activity]}.merge profile_filter).first
     comments_count = activity.comments.count
     comment_page = (params[:comment_page] || 1).to_i
     comments_per_page = 5
@@ -225,7 +226,7 @@ class ProfileController &lt; PublicController
   end
   def more_replies
-    activity = Scrap.find(:first, :conditions => {:id => params[:activity], :receiver_id => @profile, :scrap_id => nil})
+    activity = Scrap.where(:id => params[:activity], :receiver_id => @profile, :scrap_id => nil).first
     comments_count = activity.replies.count
     comment_page = (params[:comment_page] || 1).to_i
     comments_per_page = 5
@@ -272,7 +273,7 @@ class ProfileController &lt; PublicController
   def remove_notification
     begin
       raise if !can_edit_profile
-      notification = ActionTrackerNotification.find(:first, :conditions => {:profile_id => profile.id, :action_tracker_id => params[:activity_id]})
+      notification = ActionTrackerNotification.where(profile_id: profile.id, action_tracker_id: params[:activity_id]).first
       notification.destroy
       render :text => _('Notification successfully removed.')
     rescue
@@ -14,7 +14,7 @@ class SearchController &lt; PublicController
   # Backwards compatibility with old URLs
   def redirect_asset_param
     return unless params.has_key?(:asset)
-    redirect_to params.merge(:action => params.delete(:asset))
+    redirect_to url_for(params.merge action: params.delete(:asset))
   end
   no_design_blocks
@@ -62,12 +62,12 @@ class SearchController &lt; PublicController
   end
   def articles
-    @scope = @environment.articles.public
+    @scope = @environment.articles.is_public
     full_text_search
   end
   def contents
-    redirect_to params.merge(:action => :articles)
+    redirect_to url_for(params.merge action: :articles)
   end
   def people
@@ -122,7 +122,7 @@ class SearchController &lt; PublicController
   # keep old URLs workings
   def assets
     params[:action] = params[:asset].is_a?(Array) ? :index : params.delete(:asset)
-    redirect_to params
+    redirect_to url_for(params)
   end
   def tags
@@ -13,7 +13,7 @@ class ThemesController &lt; ApplicationController
   def index
     @environment = environment
-    @themes = (environment.themes + Theme.approved_themes(target)).sort_by { |t| t.name }
+    @themes = (environment.themes + Theme.approved_themes(target)).uniq.sort_by { |t| t.name }
     @current_theme = target.theme
@@ -8,6 +8,10 @@ module ApplicationHelper
   include PermissionNameHelper
+  include UrlHelper
+
+  include PartialsHelper
+
   include ModalHelper
   include BoxesHelper
@@ -281,36 +285,6 @@ module ApplicationHelper
     concat(content_tag('div', capture(&block).to_s + tag('br', :style => 'clear: left;'), options))
   end
-
-  def partial_for_class_in_view_path(klass, view_path, prefix = nil, suffix = nil)
-    return nil if klass.nil?
-    name = [prefix, klass.name.underscore, suffix].compact.map(&:to_s).join('_')
-
-    search_name = String.new(name)
-    if search_name.include?("/")
-      search_name.gsub!(/(\/)([^\/]*)$/,'\1_\2')
-      name = File.join(params[:controller], name) if defined?(params) && params[:controller]
-    else
-      search_name = "_" + search_name
-    end
-
-    path = defined?(params) && params[:controller] ? File.join(view_path, params[:controller], search_name + '.html.erb') : File.join(view_path, search_name + '.html.erb')
-    return name if File.exists?(File.join(path))
-
-    partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)
-  end
-
-  def partial_for_class(klass, prefix=nil, suffix=nil)
-    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
-    name = klass.name.underscore
-    controller.view_paths.each do |view_path|
-      partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
-      return partial if partial
-    end
-
-    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
-  end
-
   def render_profile_actions klass
     name = klass.to_s.underscore
     begin
@@ -529,32 +503,6 @@ module ApplicationHelper
     sex
   end
-  def profile_cat_icons( profile )
-    if profile.class == Enterprise
-      icons = profile.product_categories.unique_by_level(2).limit(3).map do |c|
-        filtered_category = c.filtered_category.blank? ? c.path.split('/').last : c.filtered_category
-        category_title = filtered_category.split(/[-_\s,.;'"]+/).map(&:capitalize).join(' ')
-        category_name = category_title.gsub(' ', '_' )
-        category_icon = "/images/icons-cat/#{category_name}.png"
-        if ! File.exists?(Rails.root.join('public', category_icon))
-          category_icon = '/images/icons-cat/undefined.png'
-        end
-        content_tag('span',
-          content_tag( 'span', category_title ),
-          :title => category_title,
-          :class => 'product-cat-icon cat_icon_' + category_name,
-          :style => "background-image:url(#{category_icon})"
-        )
-      end.join("\n").html_safe
-      content_tag('div',
-        content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
-        :class => 'product-category-icons'
-      )
-    else
-      ''
-    end
-  end
-
   def links_for_balloon(profile)
     if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
       if profile.kind_of?(Person)
@@ -613,7 +561,7 @@ module ApplicationHelper
     link_to(
       content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
       content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-      extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+      extra_info + profile_sex_icon( profile ),
       profile.url,
       :class => 'profile_link url',
       :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
@@ -907,8 +855,14 @@ module ApplicationHelper
   end
   alias :top_url :base_url
+  class View < ActionView::Base
+    def url_for *args
+      self.controller.url_for *args
+    end
+  end
+
   def helper_for_article(article)
-    article_helper = ActionView::Base.new
+    article_helper = View.new
     article_helper.controller = controller
     article_helper.extend ArticleHelper
     article_helper.extend Rails.application.routes.url_helpers
@@ -119,7 +119,7 @@ module ArticleHelper
   end
   def add_option_to_followers(article, tokenized_children)
-    label_message = article.profile.organization? ? _('For all community members') : _('For all your friends')
+    label_message = article.profile.organization? ? _('Allow all community members to view this content') : _('Allow all your friends to view this content')
     check_box(
       :article,
@@ -137,7 +137,7 @@ module ArticleHelper
         'div',
         content_tag(
           'label',
-          _('Fill in the search field to add the exception users to see this content'),
+          _('Allow only community members entered below to view this content'),
           :id => "text-input-search-exception-users"
         ) +
         token_input_field_tag(
@@ -146,7 +146,7 @@ module ArticleHelper
           {:action => 'search_article_privacy_exceptions'},
           {
             :focus => false,
-            :hint_text => _('Type in a search term for a user'),
+            :hint_text => _('Type in a name of a community member'),
             :pre_populate => tokenized_children
           }
         )
@@ -19,7 +19,7 @@ module BlockHelper
         content_tag('span', _('Title')) +
         text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
       }</label></td>
-      <td>#{button_without_text(:delete, _('Remove'), '#', class: 'delete-highlight', :confirm=>_('Are you sure you want to remove this highlight'))}</td>
+      <td>#{button_without_text(:delete, _('Remove'), '#', class: 'delete-highlight', data: {confirm: _('Are you sure you want to remove this highlight')})}</td>
     </tr>
     "
   end
 module BoxOrganizerHelper
+  def display_icon(block)
+    image_path = nil
+    plugin = @plugins.fetch_first_plugin(:has_block?, block)
+
+    theme = Theme.new(environment.theme) # remove this
+    if File.exists?(File.join(theme.filesystem_path, block.icon_path))
+      image_path = File.join(theme.public_path, block.icon_path)
+    elsif plugin && File.exists?(File.join(Rails.root, 'public', plugin.public_path, block.icon_path))
+      image_path = File.join('/', plugin.public_path, block.icon_path)
+    elsif File.exists?(File.join(Rails.root, 'public', block.icon_path))
+      image_path = block.icon_path
+    else
+      image_path = block.default_icon_path
+    end
+
+    image_tag(image_path, height: '48', width: '48', class: 'block-type-icon', alt: '' )
+  end
+
+  def display_previews(block)
+    images_path = nil
+    plugin = @plugins.fetch_first_plugin(:has_block?, block)
+
+    theme = Theme.new(environment.theme) # remove this
+
+    images_path = Dir.glob(File.join(theme.filesystem_path, 'images', block.preview_path, '*'))
+    images_path = images_path.map{|path| path.gsub(theme.filesystem_path, theme.public_path) } unless images_path.empty?
+
+    images_path = Dir.glob(File.join(Rails.root, 'public', plugin.public_path, 'images', block.preview_path, '*')) if plugin && images_path.empty?
+    images_path = images_path.map{|path| path.gsub(File.join(Rails.root, 'public'), '') } unless images_path.empty?
+
+    images_path = Dir.glob(File.join(Rails.root, 'public', 'images', block.preview_path, '*')) if images_path.empty?
+    images_path = images_path.map{|path| path.gsub(File.join(Rails.root, 'public'), '') } unless images_path.empty?
+
+    images_path = 1.upto(3).map{block.default_preview_path} if images_path.empty?
+
+    content_tag(:ul,
+      images_path.map do |preview|
+	content_tag(:li, image_tag(preview, height: '240', alt: ''))
+      end.join("\n")
+    )
+  end
+
   def icon_selector(icon = 'no-ico')
     render :partial => 'icon_selector', :locals => { :icon => icon }
   end
@@ -10,4 +52,4 @@ module BoxOrganizerHelper
     end
   end
-end
 \ No newline at end of file
+end
@@ -190,8 +190,9 @@ module BoxesHelper
       else
         "before-block-#{block.id}"
       end
-    if block.nil? || movable?(block)
-      content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover')
+    if block.nil? or movable?(block)
+      url = url_for(:action => 'move_block', :target => id)
+      content_tag('div', _('Drop Here'), :id => id, :class => 'block-target' ) + drop_receiving_element(id, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover', :activeClass => 'block-target-active', :tolerance => 'pointer', :onDrop => "function(ev, ui) { dropBlock('#{url}', '#{_('loading...')}', ev, ui);}")
     else
       ""
     end
@@ -199,7 +200,25 @@ module BoxesHelper
   # makes the given block draggable so it can be moved away.
   def block_handle(block)
-    movable?(block) ? draggable_element("block-#{block.id}", :revert => true) : ""
+    return "" unless movable?(block)
+    icon = "<div><div>#{display_icon(block.class)}</div><span>#{_(block.class.pretty_name)}</span></div>"
+    block_draggable("block-#{block.id}",
+                    :helper => "function() {return cloneDraggableBlock($(this), '#{icon}')}")
+  end
+
+  def block_draggable(element_id, options={})
+    draggable_options = {
+      :revert => "'invalid'",
+      :appendTo => "'#block-store-draggables'",
+      :helper => '"clone"',
+      :revertDuration => 200,
+      :scroll => false,
+      :start => "startDragBlock",
+      :stop => "stopDragBlock",
+      :cursor => "'move'",
+      :cursorAt => '{ left: 0, top:0, right:0, bottom:0 }',
+    }.merge(options)
+    draggable_element(element_id, draggable_options)
   end
   def block_edit_buttons(block)
@@ -236,7 +255,7 @@ module BoxesHelper
     end
     if movable?(block) && !block.main?
-      buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
+      buttons << icon_button(:delete, _('Remove block'), { action: 'remove', id: block.id }, method: 'post', data: {confirm: _('Are you sure you want to remove this block?')})
       buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
     end
@@ -34,7 +34,7 @@ module CmsHelper
   end
   def display_delete_button(article)
-    expirable_button article, :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
+    expirable_button article, :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, 'data-confirm' => delete_article_message(article)
   end
   def expirable_button(content, action, title, url, options = {})
@@ -42,7 +42,7 @@ module CmsHelper
     if reason.present?
       options[:class] = (options[:class] || '') + ' disabled'
       options[:disabled] = 'disabled'
-      options.delete(:confirm)
+      options.delete('data-confirm')
       options.delete(:method)
       title = reason
     end
@@ -0,0 +1,58 @@
+module CustomFieldsHelper
+
+  def format_name(format)
+    names = {}
+    names['string'] = _('String')
+    names['text'] = _('Text')
+    names['date'] = _('Date')
+    names['numeric'] = _('Numeric')
+    names['link'] = _('Link')
+    names['list'] = _('List')
+    names['checkbox'] = _('Checkbox')
+    names[format]
+  end
+
+  def custom_field_forms(customized_type)
+    forms = []
+    forms << [_('String'), form_for_format(customized_type,'string')]
+    forms << [_('Text'), form_for_format(customized_type,'text')]
+    forms << [_('Date'), form_for_format(customized_type,'date')]
+    forms << [_('Numeric'), form_for_format(customized_type,'numeric')]
+    forms << [_('Link'), form_for_format(customized_type,'link')]
+    forms << [_('List'), form_for_format(customized_type,'list')]
+    forms << [_('Checkbox'), form_for_format(customized_type,'checkbox')]
+    forms
+  end
+
+  def render_extras_field(id, extra=nil, field=nil)
+    if extra.nil?
+      CGI::escapeHTML((render(:partial => 'features/custom_fields/extras_field', :locals => {:id => id, :extra => nil, :field => field})))
+    else
+      render :partial => 'features/custom_fields/extras_field', :locals => {:id => id, :extra => extra, :field => field}
+    end
+  end
+
+  def form_for_field(field, customized_type)
+    render :partial => 'features/custom_fields/form', :locals => {:field => field}
+  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
+    when 'text', 'list', 'numeric', 'date', 'string'
+      value
+    when 'checkbox'
+      value == "1" ? _('Yes') : _('No')
+    when 'link'
+      url = value[/\Ahttps?:\/\//i] ? value : "http://#{value}"
+      link_to(value, url, :target => '_blank')
+    end
+  end
+
+  private
+
+  def form_for_format(customized_type, format)
+    field = CustomField.new(:format => format, :customized_type => customized_type, :environment => environment)
+    CGI::escapeHTML((render(:partial => 'features/custom_fields/form', :locals => {:field => field})))
+  end
+end
@@ -24,7 +24,8 @@ module EventsHelper
   end
   def populate_calendar(selected_date, events)
-    events.reject! {|event| !event.display_to?(user)}
+    selected_date = selected_date.to_date
+    events = events.reject{ |event| !event.display_to? user }
     calendar = Event.date_range(selected_date.year, selected_date.month).map do |date|
       [
         # the day itself
@@ -5,13 +5,11 @@ module FolderHelper
   def list_contents(configure={})
     configure[:recursive] ||= false
     configure[:list_type] ||= :folder
-    if !configure[:contents].blank?
-      configure[:contents] = configure[:contents].paginate(
-        :order => "name ASC",
-        :per_page => 30,
-        :page => params[:npage]
-      )
-
+    contents = configure[:contents]
+    contents = contents.order('name ASC') unless contents.is_a? Array
+    contents = contents.paginate per_page: 30, page: params[:npage]
+    configure[:contents] = contents
+    if contents.present?
       render :file => 'shared/content_list', :locals => configure
     else
       content_tag('em', _('(empty folder)'))
@@ -184,9 +184,9 @@ module FormsHelper
     datepicker_options[:year_suffix] ||= ''
     element_id = html_options[:id] || 'datepicker-date'
-    value_js_formatted = value.strftime('%Y-%m-%d %H:%S')
     value = value.strftime(format) if value.present?
     method = datepicker_options[:time] ? 'datetimepicker' : 'datepicker'
+    current_date_or_nil = value.present? ? "new Date('#{value}')" : "null"
     result = text_field_tag(name, value, html_options)
     result +=
     "
@@ -237,7 +237,7 @@ module FormsHelper
         weekHeader: #{datepicker_options[:week_header].to_json},
         yearRange: #{datepicker_options[:year_range].to_json},
         yearSuffix: #{datepicker_options[:year_suffix].to_json}
-      }).datepicker('setDate', new Date('#{value_js_formatted}'))
+      }).datepicker('setDate', current_date_or_nil)
     </script>
     ".html_safe
     result
@@ -0,0 +1,43 @@
+module PartialsHelper
+
+  def partial_for_class_in_view_path(klass, view_path, prefix = nil, suffix = nil)
+    return nil if klass.nil?
+    name = [prefix, klass.name.underscore, suffix].compact.map(&:to_s).join('_')
+
+    search_name = String.new(name)
+    if search_name.include?("/")
+      search_name.gsub!(/(\/)([^\/]*)$/,'\1_\2')
+      name = File.join(params[:controller], name) if defined?(params) && params[:controller]
+    else
+      search_name = "_" + search_name
+    end
+
+    path = defined?(params) && params[:controller] ? File.join(view_path, params[:controller], search_name + '.html.erb') : File.join(view_path, search_name + '.html.erb')
+    return name if File.exists?(File.join(path))
+
+    partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)
+  end
+
+  def partial_for_class(klass, prefix=nil, suffix=nil)
+    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
+    name = klass.name.underscore
+    controller.view_paths.each do |view_path|
+      partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
+      return partial if partial
+    end
+
+    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
+  end
+
+  def render_partial_for_class klass, *args
+    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
+    begin
+      partial = klass.name.underscore
+      partial = "#{params[:controller]}/#{partial}" if params[:controller] and partial.index '/'
+      return render partial, *args
+    rescue ActionView::MissingTemplate
+      return render_partial_for_class klass.superclass, *args
+    end
+  end
+
+end
@@ -20,18 +20,9 @@ module TinymceHelper
       :image_advtab => true,
       :language => tinymce_language
-    options[:toolbar1] = "fullscreen | insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
-    if options[:mode] == 'simple'
-      options[:menubar] = false
-    else
-      options[:menubar] = 'edit insert view tools'
-      options[:toolbar2] = 'print preview code media | table'
-
-      options[:toolbar2] += ' | macros'
-      macros_with_buttons.each do |macro|
-        options[:toolbar2] += " #{macro.identifier}"
-      end
-    end
+    options[:toolbar1] = toolbar1(options[:mode])
+    options[:menubar] = menubar(options[:mode])
+    options[:toolbar2] = toolbar2(options[:mode])
     options[:macros_setup] = macros_with_buttons.map do |macro|
       <<-EOS
@@ -49,4 +40,29 @@ module TinymceHelper
     "noosfero.tinymce.init(#{options.to_json})"
   end
+  def menubar mode
+    if mode =='restricted' || mode == 'simple'
+      return false
+    end
+    return 'edit insert view tools'
+  end
+
+  def toolbar1 mode
+    if mode == 'restricted'
+      return "bold italic underline | link"
+    end
+    return "fullscreen | insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
+  end
+
+  def toolbar2 mode
+    if mode.blank?
+      toolbar2 = 'print preview code media | table'
+      toolbar2 += ' | macros'
+      macros_with_buttons.each do |macro|
+        toolbar2 += " #{macro.identifier}"
+      end
+      return toolbar2
+    end
+  end
+
 end
@@ -0,0 +1,7 @@
+module UrlHelper
+
+  def back_url
+    'javascript:history.back()'
+  end
+
+end
@@ -0,0 +1,18 @@
+require_relative '../helpers/application_helper'
+
+class ApplicationMailer < ActionMailer::Base
+
+  include AuthenticatedSystem
+
+  helper ApplicationHelper
+
+  attr_accessor :environment
+
+  def default_url_options options = nil
+    options ||= {}
+    options[:host] = environment.default_hostname if environment
+    options
+  end
+
+end
+
-class CommentNotifier < ActionMailer::Base
+class CommentNotifier < ApplicationMailer
+
   def notification(comment)
     profile = comment.article.profile
+    self.environment = profile.environment
     @recipient = profile.nickname || profile.name
     @sender = comment.author_name
     @sender_link = comment.author_link
@@ -8,7 +10,6 @@ class CommentNotifier &lt; ActionMailer::Base
     @comment_url = comment.url
     @comment_title = comment.title
     @comment_body = comment.body
-    @environment = profile.environment.name
     @url = profile.environment.top_url
     mail(
@@ -20,6 +21,8 @@ class CommentNotifier &lt; ActionMailer::Base
   def mail_to_followers(comment, emails)
     profile = comment.article.profile
+    self.environment = profile.environment
+
     @recipient = profile.nickname || profile.name
     @sender = comment.author_name
     @sender_link = comment.author_link
@@ -28,7 +31,6 @@ class CommentNotifier &lt; ActionMailer::Base
     @unsubscribe_url = comment.article.view_url.merge({:unfollow => true})
     @comment_title = comment.title
     @comment_body = comment.body
-    @environment = profile.environment.name
     @url = profile.environment.top_url
     mail(
@@ -30,14 +30,16 @@ class Contact
     Contact::Sender.notification(self).deliver
   end
-  class Sender < ActionMailer::Base
+  class Sender < ApplicationMailer
+
     def notification(contact)
+      self.environment = contact.dest.environment
+
       @name = contact.name
       @email = contact.email
       @city = contact.city
       @state = contact.state
       @message = contact.message
-      @environment = contact.dest.environment.name
       @url = url_for(:host => contact.dest.environment.default_hostname, :controller => 'home')
       @target = contact.dest.name
 class EnvironmentMailing < Mailing
   def recipients(offset=0, limit=100)
-   source.people.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
+    source.people.order(:id).offset(offset).limit(limit)
+      .joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
+      .where("m.person_id" => nil)
   end
   def each_recipient
@@ -46,7 +46,8 @@ class Mailing &lt; ActiveRecord::Base
     end
   end
-  class Sender < ActionMailer::Base
+  class Sender < ApplicationMailer
+
     def notification(mailing, recipient)
       @message = mailing.body
       @signature_message = mailing.signature_message
@@ -5,7 +5,9 @@ class OrganizationMailing &lt; Mailing
   end
   def recipients(offset=0, limit=100)
-    source.members.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
+    source.members.order(:id).offset(offset).limit(limit)
+      .joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
+      .where("m.person_id" => nil)
   end
   def each_recipient
-class PendingTaskNotifier < ActionMailer::Base
+class PendingTaskNotifier < ApplicationMailer
   def notification(person)
+    self.environment = person.environment
+
     @person = person
     @tasks = person.tasks.pending
     @organizations_with_pending_tasks = person.organizations_with_pending_tasks
-    @environment = person.environment.name
     @url = url_for(:host => person.environment.default_hostname, :controller => 'home')
     @default_hostname = person.environment.default_hostname
     @url_for_pending_tasks = url_for(:host => person.environment.default_hostname, :controller => 'tasks', :profile => person.identifier)
-class ScrapNotifier < ActionMailer::Base
+class ScrapNotifier < ApplicationMailer
+
   def notification(scrap)
     sender, receiver = scrap.sender, scrap.receiver
+    self.environment = sender.environment
     # for tests
     return unless receiver.email
@@ -9,7 +11,6 @@ class ScrapNotifier &lt; ActionMailer::Base
     @sender_link = sender.url
     @scrap_content = scrap.content
     @wall_url = scrap.scrap_wall_url
-    @environment = sender.environment.name
     @url = sender.environment.top_url
     mail(
       to: receiver.email,
-class TaskMailer < ActionMailer::Base
+class TaskMailer < ApplicationMailer
   def target_notification(task, message)
+    self.environment = task.environment
+
     @message = extract_message(message)
     @target = task.target.name
-    @environment = task.environment.name
     @url = generate_environment_url(task, :controller => 'home')
     url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url.merge(:script_name => Noosfero.root('/')))
     @tasks_url = url_for_tasks_list
@@ -16,6 +17,8 @@ class TaskMailer &lt; ActionMailer::Base
   end
   def invitation_notification(task)
+    self.environment = task.requestor.environment
+
     msg = task.expanded_message
     @message = msg.gsub /<url>/, generate_environment_url(task, :controller => 'account', :action => 'signup', :invitation_code => task.code)
@@ -27,11 +30,12 @@ class TaskMailer &lt; ActionMailer::Base
   end
   def generic_message(name, task)
+    self.environment = task.requestor.environment
+
     return if !task.respond_to?("#{name}_message")
     @message = extract_message(task.send("#{name}_message"))
     @requestor = task.requestor.name
-    @environment = task.requestor.environment.name
     @url = url_for(:host => task.requestor.environment.default_hostname, :controller => 'home')
     mail(
-class UserMailer < ActionMailer::Base
+class UserMailer < ApplicationMailer
+
   def activation_email_notify(user)
+    self.environment = user.environment
+
     user_email = "#{user.login}@#{user.email_domain}"
     @name = user.name
     @email = user_email
     @webmail = MailConf.webmail_url(user.login, user.email_domain)
-    @environment = user.environment.name
     @url = url_for(:host => user.environment.default_hostname, :controller => 'home')
     mail(
@@ -15,9 +17,10 @@ class UserMailer &lt; ActionMailer::Base
   end
   def activation_code(user)
+    self.environment = user.environment
+
     @recipient = user.name
     @activation_code = user.activation_code
-    @environment = user.environment.name
     @url = user.environment.top_url
     @redirection = (true if user.return_to)
     @join = (user.community_to_join if user.community_to_join)
@@ -30,6 +33,8 @@ class UserMailer &lt; ActionMailer::Base
   end
   def signup_welcome_email(user)
+    self.environment = user.environment
+
     @body = user.environment.signup_welcome_text_body.gsub('{user_name}', user.name)
     email_subject = user.environment.signup_welcome_text_subject
     mail(
@@ -42,8 +47,9 @@ class UserMailer &lt; ActionMailer::Base
   end
   def profiles_suggestions_email(user)
+    self.environment = user.environment
+
     @recipient = user.name
-    @environment = user.environment.name
     @url = user.environment.top_url
     @people_suggestions_url = user.people_suggestions_url
     @people_suggestions = user.suggested_people.sample(3)
@@ -11,7 +11,7 @@ class AddMember &lt; Task
   alias :organization :target
   alias :organization= :target=
-  settings_items :roles
+  settings_items :roles, type: Array
   after_create do |task|
     remove_from_suggestion_list(task)
@@ -8,7 +8,7 @@ class ApproveComment &lt; Task
   def comment
     unless @comment || self.comment_attributes.nil?
       @comment = Comment.new
-      @comment.assign_attributes(ActiveSupport::JSON.decode(self.comment_attributes), :without_protection => true)
+      @comment.assign_attributes(ActiveSupport::JSON.decode(self.comment_attributes.to_s), :without_protection => true)
     end
     @comment
   end
@@ -79,9 +79,9 @@ 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'
-  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
+  has_many :comments, :class_name => 'Comment', :as => 'source', :dependent => :destroy, :order => 'created_at asc'
-  has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
+  has_many :article_categorizations, -> { where 'articles_categories.virtual = ?', false }
   has_many :categories, :through => :article_categorizations
   has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization'
@@ -133,17 +133,15 @@ class Article &lt; ActiveRecord::Base
   xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
-  scope :in_category, lambda { |category|
-    {:include => 'categories_including_virtual', :conditions => { 'categories.id' => category.id }}
+  scope :in_category, -> category {
+    includes('categories_including_virtual').where('categories.id' => category.id)
   }
   include TimeScopes
-  scope :by_range, lambda { |range| {
-    :conditions => [
-      'articles.published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
-    ]
-  }}
+  scope :by_range, -> range {
+    where 'articles.published_at BETWEEN :start_date AND :end_date', { start_date: range.first, end_date: range.last }
+  }
   URL_FORMAT = /\A(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?\Z/ix
@@ -267,19 +265,21 @@ class Article &lt; ActiveRecord::Base
   # retrieves all articles belonging to the given +profile+ that are not
   # sub-articles of any other article.
-  scope :top_level_for, lambda { |profile|
-    {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
+  scope :top_level_for, -> profile {
+    where 'parent_id is null and profile_id = ?', profile.id
   }
-  scope :public,
-    :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile]
+  scope :is_public, -> {
+    joins(:profile).
+    where("articles.advertise = ? AND articles.published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true)
+  }
-  scope :more_recent,
-    :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
-      ((articles.type != ?) OR articles.type is NULL)",
-      true, true, true, true, 'RssFeed'
-    ],
-    :order => 'articles.published_at desc, articles.id desc'
+  scope :more_recent, -> {
+    order('articles.published_at desc, articles.id desc')
+    .where("articles.advertise = ? AND articles.published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
+    ((articles.type != ?) OR articles.type is NULL)",
+    true, true, true, true, 'RssFeed')
+  }
   # retrives the most commented articles, sorted by the comment count (largest
   # first)
@@ -287,12 +287,14 @@ class Article &lt; ActiveRecord::Base
     paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
   end
-  scope :more_popular, :order => 'hits DESC'
-  scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]
+  scope :more_popular, -> { order 'hits DESC' }
+  scope :relevant_as_recent, -> {
+   where "(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"
+  }
   def self.recent(limit = nil, extra_conditions = {}, pagination = true)
     result = scoped({:conditions => extra_conditions}).
-      public.
+      is_public.
       relevant_as_recent.
       limit(limit).
       order(['articles.published_at desc', 'articles.id desc'])
@@ -417,7 +419,7 @@ class Article &lt; ActiveRecord::Base
     self.translations.map(&:language)
   end
-  scope :native_translations, :conditions => { :translation_of_id => nil }
+  scope :native_translations, -> { where :translation_of_id => nil }
   def translatable?
     false
@@ -459,7 +461,7 @@ class Article &lt; ActiveRecord::Base
   def rotate_translations
     unless self.translations.empty?
-      rotate = self.translations
+      rotate = self.translations.all
       root = rotate.shift
       root.update_attribute(:translation_of_id, nil)
       root.translations = rotate
@@ -472,7 +474,7 @@ class Article &lt; ActiveRecord::Base
     elsif self.native_translation.language == locale
       self.native_translation
     else
-      self.native_translation.translations.first(:conditions => { :language => locale })
+      self.native_translation.translations.where(:language => locale).first
     end
   end
@@ -500,19 +502,19 @@ class Article &lt; ActiveRecord::Base
     ['TextArticle', 'TextileArticle', 'TinyMceArticle']
   end
-  scope :published, :conditions => ['articles.published = ?', true]
-  scope :folders, lambda {|profile|{:conditions => ['articles.type IN (?)', profile.folder_types] }}
-  scope :no_folders, lambda {|profile|{:conditions => ['articles.type NOT IN (?)', profile.folder_types]}}
-  scope :galleries, :conditions => [ "articles.type IN ('Gallery')" ]
-  scope :images, :conditions => { :is_image => true }
-  scope :no_images, :conditions => { :is_image => false }
-  scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
-  scope :files, :conditions => { :type => 'UploadedFile' }
-  scope :with_types, lambda { |types| { :conditions => [ 'articles.type IN (?)', types ] } }
+  scope :published, -> { where 'articles.published = ?', true }
+  scope :folders, -> profile { where 'articles.type IN (?)', profile.folder_types }
+  scope :no_folders, -> profile { where 'articles.type NOT IN (?)', profile.folder_types }
+  scope :galleries, -> { where "articles.type IN ('Gallery')" }
+  scope :images, -> { where :is_image => true }
+  scope :no_images, -> { where :is_image => false }
+  scope :text_articles, -> { where 'articles.type IN (?)', text_article_types }
+  scope :files, -> { where :type => 'UploadedFile' }
+  scope :with_types, -> types { where 'articles.type IN (?)', types }
-  scope :more_popular, :order => 'hits DESC'
-  scope :more_comments, :order => "comments_count DESC"
-  scope :more_recent, :order => "created_at DESC"
+  scope :more_popular, -> { order 'hits DESC' }
+  scope :more_comments, -> { order "comments_count DESC" }
+  scope :more_recent, -> { order "created_at DESC" }
   scope :display_filter, lambda {|user, profile|
     return published if (user.nil? && profile && profile.public?)
@@ -634,7 +636,7 @@ class Article &lt; ActiveRecord::Base
   ]
   def self.find_by_old_path(old_path)
-    find(:first, :include => :versions, :conditions => ['article_versions.path = ?', old_path], :order => 'article_versions.id desc')
+    self.includes(:versions).where('article_versions.path = ?', old_path).order('article_versions.id DESC').first
   end
   def hit
@@ -720,11 +722,11 @@ class Article &lt; ActiveRecord::Base
   end
   def get_version(version_number = nil)
-    version_number ? versions.find(:first, :order => 'version', :offset => version_number - 1) : versions.earliest
+    if version_number then self.versions.order('version').offset(version_number - 1).first else self.versions.earliest end
   end
   def author_by_version(version_number = nil)
-    version_number ? profile.environment.people.find_by_id(get_version(version_number).author_id) : author
+    if version_number then profile.environment.people.where(id: get_version(version_number).author_id).first else author end
   end
   def author_name(version_number = nil)
@@ -820,7 +822,7 @@ class Article &lt; ActiveRecord::Base
   end
   def activity
-    ActionTracker::Record.find_by_target_type_and_target_id 'Article', self.id
+    ActionTracker::Record.where(target_type: 'Article', target_id: self.id).first
   end
   def create_activity
@@ -3,7 +3,15 @@ class ArticleBlock &lt; Block
   attr_accessible :article_id
   def self.description
-    _('Display one of your contents')
+    _('Display one of your contents.')
+  end
+
+  def self.short_description
+    _('Show one article')
+  end
+
+  def self.pretty_name
+    _('Article')
   end
   def help
 class ArticleCategorization < ActiveRecord::Base
-  set_table_name :articles_categories
+  self.table_name = :articles_categories
+
   belongs_to :article
   belongs_to :category
@@ -20,7 +20,7 @@ class Block &lt; ActiveRecord::Base
   acts_as_having_settings
-  scope :enabled, :conditions => { :enabled => true }
+  scope :enabled, -> { where :enabled => true }
   after_save do |block|
     if block.owner.kind_of?(Profile) && block.owner.is_template? && block.mirror?
@@ -141,6 +141,36 @@ class Block &lt; ActiveRecord::Base
     '(dummy)'
   end
+  def self.short_description
+    self.pretty_name
+  end
+
+  def self.icon
+    "/images/icon_block.png"
+  end
+
+  def self.icon_path
+    basename = self.name.split('::').last.underscore
+    File.join('images', 'blocks', basename, 'icon.png')
+  end
+
+  def self.pretty_name
+    self.name.split('::').last.gsub('Block','')
+  end
+
+  def self.default_icon_path
+    '/images/icon_block.png'
+  end
+
+  def self.preview_path
+    base_name = self.name.split('::').last.underscore
+    File.join('blocks', base_name,'previews')
+  end
+
+  def self.default_preview_path
+    "/images/block_preview.png"
+  end
+
   # Returns the content to be used for this block.
   #
   # This method can return several types of objects:
@@ -15,7 +15,7 @@ class BlogArchivesBlock &lt; Block
     _('Blog posts')
   end
-  settings_items :blog_id, Integer
+  settings_items :blog_id, type: Integer
   def blog
     blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
@@ -33,10 +33,10 @@ class BlogArchivesBlock &lt; Block
     results = ''
     posts = visible_posts(args[:person])
     posts.except(:order).count(:all, :group => 'EXTRACT(YEAR FROM published_at)').sort_by {|year, count| -year.to_i}.each do |year, count|
-      results << content_tag('li', content_tag('strong', "#{year} (#{count})"))
-      results << "<ul class='#{year}-archive'>"
-      posts.except(:order).count(:all, :conditions => ['EXTRACT(YEAR FROM published_at)=?', year], :group => 'EXTRACT(MONTH FROM published_at)').sort_by {|month, count| -month.to_i}.each do |month, count|
-        results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(:year => year, :month => month)))
+      results << content_tag('li', content_tag('strong', "#{year.to_i} (#{count})"))
+      results << "<ul class='#{year.to_i}-archive'>"
+      posts.except(:order).where('EXTRACT(YEAR FROM published_at)=?', year.to_i).group('EXTRACT(MONTH FROM published_at)').count.sort_by {|month, count| -month.to_i}.each do |month, count|
+        results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(year: year.to_i, month: month.to_i)))
       end
       results << "</ul>"
     end
@@ -7,7 +7,7 @@ class Box &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
-  scope :with_position, :conditions => ['boxes.position > 0']
+  scope :with_position, -> { where 'boxes.position > 0' }
   def environment
     owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
 module Categorization
   def add_category_to_object(category, object)
-    if !find(:first, :conditions => {object_id_column => object, :category_id => category} )
+    if !self.where(object_id_column => object, :category_id => category).first
       connection.execute("insert into #{table_name} (category_id, #{object_id_column}) values(#{category.id}, #{object.id})")
       c = category.parent
-      while !c.nil? && !self.find(:first, :conditions => {object_id_column => object, :category_id => c})
+      while !c.nil? && !self.where(object_id_column => object, :category_id => c).first
         connection.execute("insert into #{table_name} (category_id, #{object_id_column}, virtual) values(#{c.id}, #{object.id}, 1>0)")
         c = c.parent
       end
@@ -14,12 +14,12 @@ class Category &lt; ActiveRecord::Base
   validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('{fn} is already being used by another category.').fix_i18n
   belongs_to :environment
-  # Finds all top level categories for a given environment. 
-  scope :top_level_for, lambda { |environment|
-    {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
+  # Finds all top level categories for a given environment.
+  scope :top_level_for, -> environment {
+    where 'parent_id is null and environment_id = ?', environment.id
   }
-  scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} }
+  scope :on_level, -> parent { where :parent_id => parent }
   acts_as_filesystem
@@ -46,26 +46,26 @@ class Category &lt; ActiveRecord::Base
     display_color = nil if display_color.blank?
   end
-  scope :from_types, lambda { |types|
-    types.select{ |t| t.blank? }.empty? ?
-      { :conditions => { :type => types } } :
-      { :conditions => [ "type IN (?) OR type IS NULL", types.reject{ |t| t.blank? } ] }
+  scope :from_types, -> types {
+    if types.select{ |t| t.blank? }.empty? then
+      where(type: types) else
+      where("type IN (?) OR type IS NULL", types.reject{ |t| t.blank? }) end
   }
   def recent_people(limit = 10)
-    self.people.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+    self.people.reorder('created_at DESC, id DESC').paginate(page: 1, per_page: limit)
   end
   def recent_enterprises(limit = 10)
-    self.enterprises.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+    self.enterprises.reorder('created_at DESC, id DESC').paginate(page: 1, per_page: limit)
   end
   def recent_communities(limit = 10)
-    self.communities.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+    self.communities.reorder('created_at DESC, id DESC').paginate(page: 1, per_page: limit)
   end
   def recent_products(limit = 10)
-    self.products.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+    self.products.reorder('created_at DESC, id DESC').paginate(page: 1, per_page: limit)
   end
   def recent_articles(limit = 10)
@@ -73,7 +73,7 @@ class Category &lt; ActiveRecord::Base
   end
   def recent_comments(limit = 10)
-    comments.paginate(:order => 'created_at DESC, comments.id DESC', :page => 1, :per_page => limit)
+    self.comments.reorder('created_at DESC, comments.id DESC').paginate(page: 1, per_page: limit)
   end
   def most_commented_articles(limit = 10)
@@ -81,7 +81,7 @@ class Category &lt; ActiveRecord::Base
   end
   def upcoming_events(limit = 10)
-    self.events.paginate(:conditions => [ 'start_date >= ?', DateTime.now.beginning_of_day ], :order => 'start_date', :page => 1, :per_page => limit)
+    self.events.where('start_date >= ?', DateTime.now.beginning_of_day).order('start_date').paginate(page: 1, per_page: limit)
   end
   def display_in_menu?
@@ -90,11 +90,11 @@ class Category &lt; ActiveRecord::Base
   def children_for_menu
     results = []
-    pending = children.find(:all, :conditions => { :display_in_menu => true})
-    while !pending.empty?
+    pending = children.where(display_in_menu: true).all
+    while pending.present?
       cat = pending.shift
       results << cat
-      pending += cat.children.find(:all, :conditions => { :display_in_menu => true} )
+      pending += cat.children.where :display_in_menu => true
     end
     results
@@ -102,7 +102,7 @@ class Category &lt; ActiveRecord::Base
   def is_leaf_displayable_in_menu?
     return false if self.display_in_menu == false
-    self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
+    self.children.where(:display_in_menu => true).empty?
   end
   def with_color
@@ -20,7 +20,7 @@ class Certifier &lt; ActiveRecord::Base
   validates_presence_of :name
   def destroy
-    product_qualifiers.each { |pq| pq.update_attributes! :certifier => nil }
+    product_qualifiers.each { |pq| pq.update! :certifier => nil }
     super
   end
@@ -18,7 +18,7 @@ class Comment &lt; ActiveRecord::Base
   has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
   belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
-  scope :without_reply, :conditions => ['reply_of_id IS NULL']
+  scope :without_reply, -> { where 'reply_of_id IS NULL' }
   include TimeScopes
@@ -3,9 +3,17 @@ class CommunitiesBlock &lt; ProfileListBlock
   attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
   def self.description
+    _("<p>Display all of your communities.</p><p>You could choose the amount of communities will be displayed and you could priorize that profiles with images.</p> <p>The view all button is always present in the block.</p>")
+  end
+
+  def self.short_description
     _('Communities')
   end
+  def self.pretty_name
+    _('Communities Block')
+  end
+
   def default_title
     n_('{#} community', '{#} communities', profile_count)
   end
@@ -29,11 +29,11 @@ class Community &lt; Organization
   # places that call this method are safe from mass-assignment by setting the
   # environment key themselves.
   def self.create_after_moderation(requestor, attributes = {})
-    environment = attributes.delete(:environment)
+    environment = attributes[:environment]
     community = Community.new(attributes)
     community.environment = environment
     if community.environment.enabled?('admin_must_approve_new_communities')
-      CreateCommunity.create!(attributes.merge(:requestor => requestor, :environment => environment))
+      CreateCommunity.create!(attributes.merge(:requestor => requestor, :environment => environment).except(:custom_values))
     else
       community.save!
       community.add_admin(requestor)
@@ -34,7 +34,7 @@ class CreateCommunity &lt; Task
       ! DATA_FIELDS.include?(key.to_s)
     end
-    community.update_attributes(community_data)
+    community.update(community_data)
     community.image = image if image
     community.environment = self.environment
     community.save!
@@ -16,13 +16,13 @@ class CreateEnterprise &lt; Task
     settings_items field.to_sym
   end
-  # checks for virtual attributes 
+  # checks for virtual attributes
   validates_presence_of :name, :identifier
   #checks if the validation method is region to validates
   validates_presence_of :region_id, :if => lambda { |obj| obj.environment.organization_approval_method == :region }
-  validates_format_of :foundation_year, :with => /^\d*$/
+  validates_numericality_of :foundation_year, only_integer: true, if: -> o { o.foundation_year.present? }
   # checks for actual attributes
   validates_presence_of :requestor_id, :target_id
@@ -129,7 +129,7 @@ class CreateEnterprise &lt; Task
     finish
   end
-  # tells if this request was appoved 
+  # tells if this request was appoved
   def approved?
     self.status == Task::Status::FINISHED
   end
@@ -0,0 +1,34 @@
+class CustomField < ActiveRecord::Base
+  attr_accessible :name, :default_value, :format, :extras, :customized_type, :active, :required, :signup, :environment
+  serialize :customized_type
+  serialize :extras
+  has_many :custom_field_values, :dependent => :delete_all
+  belongs_to :environment
+
+  validates_presence_of :name, :format, :customized_type, :environment
+  validate :related_to_other?
+  validate :unique?
+
+  def unique?
+    if environment.custom_fields.any?{|cf| cf.name==name && cf.environment == environment && cf.customized_type==customized_type && new_record?}
+      errors.add(:body, N_("There is a field with the same name for this type in this environment"))
+      return false
+    end
+    true
+  end
+
+  def related_to_other?
+    environment.custom_fields.any? do |cf|
+      if cf.name == name && cf.customized_type != customized_type
+        ancestor = cf.customized_type.constantize < customized_type.constantize
+        descendant = cf.customized_type.constantize > customized_type.constantize
+        if ancestor || descendant
+          errors.add(:body, N_("New field related to existent one with same name"))
+          return false
+        end
+      end
+    end
+    true
+  end
+end
+
@@ -0,0 +1,14 @@
+class CustomFieldValue < ActiveRecord::Base
+  belongs_to :custom_field
+  belongs_to :customized, :polymorphic => true
+  attr_accessible :value, :public, :customized, :custom_field, :customized_type
+  validate :can_save?
+
+  def can_save?
+    if value.blank? && custom_field.required
+      errors.add(custom_field.name, _("can't be blank"))
+      return false
+    end
+    return true
+  end
+end
@@ -14,7 +14,7 @@ class Domain &lt; ActiveRecord::Base
   # <tt>name</tt> must be sequences of alphanumeric characters (a to z,
   # 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.
-  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
+  validates_format_of :name, with: /\A([a-z0-9_-]+\.)+[a-z0-9_-]+\z/, message: N_('{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
   # checks validations that could not be expressed using Rails' predefined
   # validations. In particular:
@@ -37,7 +37,7 @@ class Domain &lt; ActiveRecord::Base
   # "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.find(:first, :conditions => [ 'name = ?', self.extract_domain_name(name) ])
+    self.where('name = ?', self.extract_domain_name(name)).first
   end
   # turns the argument (expected to be a String) into a domain name that is
@@ -25,10 +25,6 @@ class Enterprise &lt; Organization
   has_many :favorite_enterprise_people
   has_many :fans, source: :person, through: :favorite_enterprise_people
-  def product_categories
-    ProductCategory.by_enterprise(self)
-  end
-
   N_('Organization website'); N_('Historic and current context'); N_('Activities short description'); N_('City'); N_('State'); N_('Country'); N_('ZIP code')
   settings_items :organization_website, :historic_and_current_context, :activities_short_description
@@ -71,7 +67,7 @@ class Enterprise &lt; Organization
   end
   def highlighted_products_with_image(options = {})
-    Product.find(:all, {:conditions => {:highlighted => true}, :joins => :image}.merge(options))
+    Product.where(:highlighted => true).joins(:image)
   end
   def required_fields
@@ -17,10 +17,14 @@ class Environment &lt; ActiveRecord::Base
   has_many :users
-  self.partial_updates = false
+  # allow roles use
+  def self.dangerous_attribute_method? name
+    false
+  end
   has_many :tasks, :dependent => :destroy, :as => 'target'
   has_many :search_terms, :as => :context
+  has_many :custom_fields, :dependent => :destroy
   IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
@@ -108,7 +112,7 @@ class Environment &lt; ActiveRecord::Base
   def admins
     admin_role = Environment::Roles.admin(self)
     return [] if admin_role.blank?
-    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', admin_role.id])
+    Person.members_of(self).where 'role_assignments.role_id = ?', admin_role.id
   end
   # returns the available features for a Environment, in the form of a
@@ -223,9 +227,11 @@ class Environment &lt; ActiveRecord::Base
   has_many :licenses
   has_many :categories
-  has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'
+  has_many :display_categories, -> {
+    order('display_color').where('display_color is not null and parent_id is null')
+  }, class_name: 'Category'
-  has_many :product_categories, :conditions => { :type => 'ProductCategory'}
+  has_many :product_categories, -> { where type: 'ProductCategory'}
   has_many :regions
   has_many :states
   has_many :cities
@@ -690,7 +696,7 @@ class Environment &lt; ActiveRecord::Base
   # the default Environment.
   def self.default
-    self.find(:first, :conditions => [ 'is_default = ?', true ] )
+    self.where('is_default = ?', true).first
   end
   # returns an array with the top level categories for this environment.
@@ -871,7 +877,7 @@ class Environment &lt; ActiveRecord::Base
   end
   def portal_folders
-    (settings[:portal_folders] || []).map{|fid| portal_community.articles.find(:first, :conditions => { :id => fid }) }.compact
+    (settings[:portal_folders] || []).map{|fid| portal_community.articles.where(id: fid).first }.compact
   end
   def portal_folders=(folders)
@@ -958,7 +964,7 @@ class Environment &lt; ActiveRecord::Base
   end
   def highlighted_products_with_image(options = {})
-    Product.find(:all, {:conditions => {:highlighted => true, :profile_id => self.enterprises.find(:all, :select => :id) }, :joins => :image}.merge(options))
+    self.products.where(highlighted: true).joins(:image).order('created_at ASC')
   end
   settings_items :home_cache_in_minutes, :type => :integer, :default => 5
@@ -12,14 +12,14 @@ class Event &lt; Article
   settings_items :address, :type => :string
   def link=(value)
-    self.setting[:link] = maybe_add_http(value)
+    self.setting[:link] = maybe_add_http(URI.escape value.to_s)
   end
   def link
     maybe_add_http(self.setting[:link])
   end
-  xss_terminate :only => [ :name, :body, :link, :address ], :with => 'white_list', :on => 'validation'
+  xss_terminate :only => [ :name, :body, :address ], :with => 'white_list', :on => 'validation'
   def initialize(*args)
     super(*args)
@@ -34,23 +34,21 @@ class Event &lt; Article
     end
   end
-  scope :by_day, lambda { |date|
-    { :conditions => [' start_date >= :start_date AND start_date <= :end_date AND end_date IS NULL OR (start_date <= :end_date  AND end_date >= :start_date)', {:start_date => date.beginning_of_day, :end_date => date.end_of_day}],
-      :order => 'start_date ASC'
-    }
+  scope :by_day, -> date {
+    where('start_date >= :start_date AND start_date <= :end_date AND end_date IS NULL OR (start_date <= :end_date  AND end_date >= :start_date)',
+          start_date: date.beginning_of_day, end_date: date.end_of_day).
+    order('start_date ASC')
   }
-  scope :next_events_from_month, lambda { |date|
+  scope :next_events_from_month, -> date {
     date_temp = date.strftime("%Y-%m-%d")
-    { :conditions => ["start_date >= ?","#{date_temp}"],
-      :order => 'start_date ASC'
-    }
+    order('start_date ASC')
+    .where("start_date >= ?","#{date_temp}")
   }
-  scope :by_month, lambda { |date|
-    { :conditions => ["EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?",date.year,date.month],
-      :order => 'start_date ASC'
-    }
+  scope :by_month, -> date {
+    order('start_date ASC')
+    .where("EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?", date.year, date.month)
   }
   include WhiteListFilter
@@ -71,12 +69,10 @@ class Event &lt; Article
     'event'
   end
-  scope :by_range, lambda { |range| {
-    :conditions => [
-      'start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',
-      { :start_day => range.first, :end_day => range.last }
-    ]
-  }}
+  scope :by_range, -> range {
+    where('start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',
+      {:start_day => range.first, :end_day => range.last})
+  }
   def self.date_range(year, month)
     if year.nil? || month.nil?
@@ -91,11 +87,11 @@ class Event &lt; Article
     first_day = DateTime.new(year, month, 1)
     last_day = first_day + 1.month - 1.day
-    first_day..last_day
+    first_day.to_date..last_day.to_date
   end
   def date_range
-    start_date..(end_date||start_date)
+    start_date.to_date..(end_date||start_date).to_date
   end
   def first_paragraph
@@ -114,7 +110,7 @@ class Event &lt; Article
   end
   def duration
-    (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24)
+    (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24) + 1
   end
   alias_method :article_lead, :lead
@@ -5,9 +5,9 @@ class ExternalFeed &lt; ActiveRecord::Base
   validates_presence_of :address, :if => lambda {|efeed| efeed.enabled}
   validates_uniqueness_of :blog_id
-  scope :enabled, :conditions => { :enabled => true }
-  scope :expired, lambda {
-    { :conditions => ['(fetched_at is NULL) OR (fetched_at < ?)', Time.now - FeedUpdater.update_interval] }
+  scope :enabled, -> { where enabled: true }
+  scope :expired, -> {
+    where '(fetched_at is NULL) OR (fetched_at < ?)', Time.now - FeedUpdater.update_interval
   }
   attr_accessible :address, :enabled, :only_once
@@ -11,7 +11,7 @@ class FeaturedProductsBlock &lt; Block
     if block.owner.kind_of?(Environment) && block.product_ids.blank?
       total = block.owner.products.count
       offset = rand([(total - block.groups_of * 3) + 1, 1].max)
-      block.product_ids = block.owner.highlighted_products_with_image(:offset => offset, :limit => block.groups_of * 3).map(&:id)
+      block.product_ids = block.owner.highlighted_products_with_image.offset(offset).limit(block.groups_of * 3).map(&:id)
     end
     block.groups_of = block.groups_of.to_i
   end
@@ -20,6 +20,10 @@ class FeaturedProductsBlock &lt; Block
     _('Featured Products')
   end
+  def self.pretty_name
+    _('Featured Products')
+  end
+
   def products
     Product.find(self.product_ids) || []
   end
@@ -27,8 +27,8 @@ class FeedReaderBlock &lt; Block
   settings_items :update_errors, :type => :integer, :default => 0
   settings_items :error_message, :type => :string
-  scope :expired, lambda {
-    { :conditions => [ '(fetched_at is NULL) OR (fetched_at < ?)', Time.now - FeedUpdater.update_interval] }
+  scope :expired, -> {
+    where '(fetched_at is NULL) OR (fetched_at < ?)', Time.now - FeedUpdater.update_interval
   }
   before_create do |block|
@@ -40,6 +40,10 @@ class FeedReaderBlock &lt; Block
     _('Feed reader')
   end
+  def self.pretty_name
+    _('Feed Reader')
+  end
+
   def help
     _('This block can be used to list the latest new from any site you want. You just need to inform the address of a RSS feed.')
   end
@@ -56,10 +56,11 @@ class Folder &lt; Article
     profile.recent_documents(limit, ["articles.type != ? AND articles.highlighted = ? AND articles.parent_id = ?", 'Folder', highlight, id])
   end
-  has_many :images, :class_name => 'Article',
-                    :foreign_key => 'parent_id',
-                    :order => 'articles.type, articles.name',
-                    :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery')", UploadedFile.content_types]
+  has_many :images, -> {
+    order('articles.type, articles.name').
+    where("articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery')", UploadedFile.content_types)
+  }, class_name: 'Article', foreign_key: 'parent_id'
+
   def accept_uploads?
     !self.has_posts? || self.gallery?
@@ -25,7 +25,7 @@ class HighlightsBlock &lt; Block
   end
   def self.description
-    _('Highlights')
+    _('Creates image slideshow')
   end
   def featured_images
 class Image < ActiveRecord::Base
+  attr_accessible :uploaded_data, :label, :remove_image
+  attr_accessor :remove_image
+
   def self.max_size
     Image.attachment_options[:max_size]
   end
   sanitize_filename
-  has_attachment :content_type => :image, 
-                 :storage => :file_system, 
+  has_attachment :content_type => :image,
+                 :storage => :file_system,
                  :path_prefix => 'public/image_uploads',
                  :resize_to => '800x600>',
                  :thumbnails => { :big      => '150x150',
@@ -15,7 +18,8 @@ class Image &lt; ActiveRecord::Base
                                   :portrait => '64x64',
                                   :minor    => '50x50>',
                                   :icon     => '20x20!' },
-                 :max_size => 5.megabytes # remember to update validate message below
+                 :max_size => 5.megabytes, # remember to update validate message below
+                 processor: 'Rmagick'
   validates_attachment :size => N_("{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
@@ -23,10 +27,8 @@ class Image &lt; ActiveRecord::Base
   postgresql_attachment_fu
-  attr_accessible :uploaded_data, :label, :remove_image
-  attr_accessor :remove_image
-
   def current_data
     File.file?(full_filename) ? File.read(full_filename) : nil
   end
+
 end
@@ -13,7 +13,7 @@ class Input &lt; ActiveRecord::Base
   belongs_to :unit
-  scope :relevant_to_price, :conditions => { :relevant_to_price => true }
+  scope :relevant_to_price, -> { where relevant_to_price: true }
   include FloatHelper
@@ -45,7 +45,7 @@ class InviteFriend &lt; Invitation
   private
   def check_for_invitation_existence
     if friend
-      friend.tasks.pending.of("InviteFriend").find(:all, :conditions => {:requestor_id => person.id, :target_id => friend.id}).blank?
+      friend.tasks.pending.of("InviteFriend").where(requestor_id: person.id, target_id: friend.id).blank?
     end
   end
@@ -65,7 +65,7 @@ class InviteMember &lt; Invitation
   private
   def check_for_invitation_existence
     if friend
-      friend.tasks.pending.of("InviteMember").find(:all, :conditions => {:requestor_id => person.id}).select { |t| t.data[:community_id] == community_id }.blank?
+      friend.tasks.pending.of("InviteMember").where(requestor_id: person.id).select{ |t| t.data[:community_id] == community_id }.blank?
     end
   end
@@ -41,7 +41,7 @@ class LinkListBlock &lt; Block
     [N_('New window'), '_new'],
   ]
-  settings_items :links, Array, :default => []
+  settings_items :links, type: Array, :default => []
   before_save do |block|
     block.links = block.links.delete_if {|i| i[:name].blank? and i[:address].blank?}
@@ -55,6 +55,10 @@ class LinkListBlock &lt; Block
     _('This block can be used to create a menu of links. You can add, remove and update the links as you wish.')
   end
+  def self.pretty_name
+    _('Link list')
+  end
+
   def content(args={})
     block_title(title) +
     content_tag('ul',
@@ -84,7 +84,7 @@ class Organization &lt; Profile
   end
   def find_pending_validation(code)
-    validations.pending.find(:first, :conditions => {:code => code})
+    validations.pending.where(code: code).first
   end
   def processed_validations
@@ -92,7 +92,7 @@ class Organization &lt; Profile
   end
   def find_processed_validation(code)
-    validations.finished.find(:first, :conditions => {:code => code})
+    validations.finished.where(code: code).first
   end
   def is_validation_entity?
@@ -116,6 +116,7 @@ class Organization &lt; Profile
     tag_list
     template_id
     district
+    address_line2
     address_reference
   ]
@@ -136,11 +137,11 @@ class Organization &lt; Profile
   end
   N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Tag list'); N_('District'); N_('Address reference')
-  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_reference
+  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_line2, :address_reference
   settings_items :zip_code, :city, :state, :country
-  validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT
+  validates_numericality_of :foundation_year, only_integer: true, if: -> o { o.foundation_year.present? }
   validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.blank? })
   validates_as_cnpj :cnpj
@@ -190,7 +191,7 @@ class Organization &lt; Profile
   end
   def already_request_membership?(person)
-    self.tasks.pending.find_by_requestor_id(person.id, :conditions => { :type => 'AddMember' })
+    self.tasks.pending.where(type: 'AddMember', requestor_id: person.id).first
   end
   def jid(options = {})
@@ -16,27 +16,26 @@ class Person &lt; Profile
   acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
   acts_as_accessor
-  scope :members_of, lambda { |resources|
-    resources = [resources] if !resources.kind_of?(Array)
+  scope :members_of, -> resources {
+    resources = Array(resources)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
-    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }
+    select('DISTINCT profiles.*').joins(:role_assignments).where([conditions])
   }
-  scope :not_members_of, lambda { |resources|
-    resources = [resources] if !resources.kind_of?(Array)
+  scope :not_members_of, -> resources {
+    resources = Array(resources)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
-    { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions] }
+    select('DISTINCT profiles.*').where('"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions)
   }
-  scope :by_role, lambda { |roles|
-    roles = [roles] unless roles.kind_of?(Array)
-    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.role_id IN (?)',
-roles] }
+  scope :by_role, -> roles {
+    roles = Array(roles)
+    select('DISTINCT profiles.*').joins(:role_assignments).where('role_assignments.role_id IN (?)', roles)
   }
-  scope :not_friends_of, lambda { |resources|
+  scope :not_friends_of, -> resources {
     resources = Array(resources)
-    { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "friendships" ON "friendships"."person_id" = "profiles"."id" WHERE "friendships"."friend_id" IN (%s))' % resources.map(&:id)] }
+    select('DISTINCT profiles.*').where('"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "friendships" ON "friendships"."person_id" = "profiles"."id" WHERE "friendships"."friend_id" IN (%s))' % resources.map(&:id))
   }
   scope :visible_for_person, lambda { |person|
@@ -68,6 +67,9 @@ roles] }
   end
   alias_method_chain :has_permission?, :plugins
+  # for eager loading
+  has_many :memberships, through: :role_assignments, source: :resource, source_type: 'Profile'
+
   def memberships
     scopes = []
     plugins_scopes = plugins.dispatch_scopes(:person_memberships, self)
@@ -81,10 +83,14 @@ roles] }
     memberships.where('role_assignments.role_id = ?', role.id)
   end
+  has_many :comments, :foreign_key => :author_id
+
   has_many :friendships, :dependent => :destroy
   has_many :friends, :class_name => 'Person', :through => :friendships
-  scope :online, lambda { { :include => :user, :conditions => ["users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes] } }
+  scope :online, -> {
+    joins(:user).where("users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes)
+  }
   has_many :requested_tasks, :class_name => 'Task', :foreign_key => :requestor_id, :dependent => :destroy
@@ -100,21 +106,31 @@ roles] }
   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_people, :through => :suggested_profiles, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true]
-  has_many :suggested_communities, :through => :suggested_profiles, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true]
+  has_many :suggested_profiles, class_name: 'ProfileSuggestion', foreign_key: :person_id, order: 'score DESC', dependent: :destroy
+  has_many :suggested_people, -> {
+    where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true
+  }, through: :suggested_profiles, source: :suggestion
+  has_many :suggested_communities, -> {
+    where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true
+  }, through: :suggested_profiles, source: :suggestion
-  scope :more_popular, :order => 'friends_count DESC'
+  scope :more_popular, -> { order 'friends_count DESC' }
-  scope :abusers, :joins => :abuse_complaints, :conditions => ['tasks.status = 3'], :select => 'DISTINCT profiles.*'
-  scope :non_abusers, :joins => "LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'", :conditions => ["tasks.status != 3 OR tasks.id is NULL"], :select => "DISTINCT profiles.*"
+  scope :abusers, -> {
+    joins(:abuse_complaints).where('tasks.status = 3').select('DISTINCT profiles.*')
+  }
+  scope :non_abusers, -> {
+    select("DISTINCT profiles.*").
+    joins("LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'").
+    where("tasks.status != 3 OR tasks.id is NULL")
+  }
-  scope :admins, :joins => [:role_assignments => :role], :conditions => ['roles.key = ?', 'environment_administrator' ]
-  scope :activated, :joins => :user, :conditions => ['users.activation_code IS NULL AND users.activated_at IS NOT NULL']
-  scope :deactivated, :joins => :user, :conditions => ['NOT (users.activation_code IS NULL AND users.activated_at IS NOT NULL)']
+  scope :admins, -> { joins(:role_assignments => :role).where('roles.key = ?', 'environment_administrator') }
+  scope :activated, -> { joins(:user).where('users.activation_code IS NULL AND users.activated_at IS NOT NULL') }
+  scope :deactivated, -> { joins(:user).where('NOT (users.activation_code IS NULL AND users.activated_at IS NOT NULL)') }
   after_destroy do |person|
-    Friendship.find(:all, :conditions => { :friend_id => person.id}).each { |friendship| friendship.destroy }
+    Friendship.where(friend_id: person.id).each{ |friendship| friendship.destroy }
   end
   belongs_to :user, :dependent => :delete
@@ -177,7 +193,7 @@ roles] }
   end
   def remove_friend(friend)
-    Friendship.find(:first, :conditions => {:friend_id => friend, :person_id => id}).destroy
+    Friendship.where(friend_id: friend, person_id: id).first.destroy
   end
   FIELDS = %w[
@@ -194,6 +210,7 @@ roles] }
   district
   zip_code
   address
+  address_line2
   address_reference
   cell_phone
   comercial_phone
@@ -259,7 +276,7 @@ roles] }
   settings_items :formation, :custom_formation, :custom_area_of_study
   N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code'); N_('District'); N_('Address reference')
-  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code, :district, :address_reference
+  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code, :district, :address_line2, :address_reference
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -288,7 +305,7 @@ roles] }
   end
   validates_each :email, :on => :update do |record,attr,value|
-    if User.find(:first, :conditions => ['email = ? and id != ? and environment_id = ?', value, record.user.id, record.environment.id])
+    if User.where('email = ? and id != ? and environment_id = ?', value, record.user.id, record.environment.id).first
       record.errors.add(attr, _('{fn} is already used by other user').fix_i18n)
     end
   end
@@ -397,7 +414,7 @@ roles] }
   def ask_to_join?(community)
     return false if !community.visible?
     return false if memberships.include?(community)
-    return false if AddMember.find(:first, :conditions => {:requestor_id => self.id, :target_id => community.id})
+    return false if AddMember.where(requestor_id: self.id, target_id: community.id).first
     !refused_communities.include?(community)
   end
+# FIXME needed by test/units/application_helper.rb
+require_dependency 'application_helper'
+
 class PersonNotifier
   def initialize(person)
@@ -28,7 +31,7 @@ class PersonNotifier
   def notify
     if @person.notification_time && @person.notification_time > 0
-      notifications = @person.tracked_notifications.find(:all, :conditions => ["created_at > ?", notify_from])
+      notifications = @person.tracked_notifications.where("created_at > ?", notify_from)
       tasks = Task.to(@person).without_spam.pending.where("created_at > ?", notify_from).order_by('created_at', 'asc')
       Noosfero.with_locale @person.environment.default_language do
@@ -74,9 +77,8 @@ class PersonNotifier
   end
-  class Mailer < ActionMailer::Base
+  class Mailer < ApplicationMailer
-    helper ApplicationHelper
     helper ActionTrackerHelper
     def session
@@ -85,8 +87,8 @@ class PersonNotifier
     def content_summary(person, notifications, tasks)
       if person.environment
-        ActionMailer::Base.asset_host = person.environment.top_url
-        ActionMailer::Base.default_url_options[:host] = person.environment.default_hostname
+        ApplicationMailer.asset_host = person.environment.top_url
+        ApplicationMailer.default_url_options[:host] = person.environment.default_hostname
       end
       @current_theme = 'default'
@@ -94,7 +96,7 @@ class PersonNotifier
       @recipient = @profile.nickname || @profile.name
       @notifications = notifications
       @tasks = tasks
-      @environment = @profile.environment.name
+      @environment = @profile.environment
       @url = @profile.environment.top_url
       mail(
         content_type: "text/html",
@@ -52,8 +52,8 @@ class Product &lt; ActiveRecord::Base
   scope :more_recent, :order => "created_at DESC"
-  scope :from_category, lambda { |category|
-    {:joins => :product_category, :conditions => ['categories.path LIKE ?', "%#{category.slug}%"]} if category
+  scope :from_category, -> category {
+    joins(:product_category).where('categories.path LIKE ?', "%#{category.slug}%") if category
   }
   scope :visible_for_person, lambda { |person|
@@ -6,19 +6,16 @@ class ProductCategory &lt; Category
   attr_accessible :name, :parent, :environment
   scope :unique, :select => 'DISTINCT ON (path) categories.*'
-  scope :by_enterprise, lambda { |enterprise| {
-    :joins => :products,
-    :conditions => ['products.profile_id = ?', enterprise.id]
-  }}
-  scope :by_environment, lambda { |environment| {
-    :conditions => ['environment_id = ?', environment.id]
-  }}
-  scope :unique_by_level, lambda { |level| {
-    :select => "DISTINCT ON (filtered_category) split_part(path, '/', #{level}) AS filtered_category, categories.*"
-  }}
+  scope :by_enterprise, -> enterprise {
+    distinct.joins(:products).
+    where('products.profile_id = ?', enterprise.id)
+  }
+  scope :by_environment, -> environment {
+    where 'environment_id = ?', environment.id
+  }
   def all_products
-    Product.find(:all, :conditions => { :product_category_id => (all_children << self).map(&:id) })
+    Product.where(product_category_id: (all_children << self).map(&:id))
   end
   def self.menu_categories(top_category, env)
@@ -39,7 +39,7 @@ class ProductsBlock &lt; Block
     link_to(_('View all products'), owner.public_profile_url.merge(:controller => 'catalog', :action => 'index'))
   end
-  settings_items :product_ids, Array
+  settings_items :product_ids, type: Array
   def product_ids=(array)
     self.settings[:product_ids] = array
     if self.settings[:product_ids]
@@ -50,7 +50,7 @@ class Profile &lt; ActiveRecord::Base
       all_roles(env_id).select{ |r| r.key.match(/^profile_/) unless r.key.blank? || !r.profile_id.nil?}
     end
     def self.all_roles(env_id)
-      Role.all :conditions => { :environment_id => env_id }
+      Role.where(environment_id: env_id)
     end
     def self.method_missing(m, *args, &block)
       role = find_role(m, args[0])
@@ -84,23 +84,32 @@ class Profile &lt; ActiveRecord::Base
   }
   acts_as_accessible
+  acts_as_customizable
   include Noosfero::Plugin::HotSpot
-  scope :memberships_of, lambda { |person| { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.accessor_type = ? AND role_assignments.accessor_id = ?', person.class.base_class.name, person.id ] } }
+  scope :memberships_of, -> person {
+    select('DISTINCT profiles.*').
+    joins(:role_assignments).
+    where('role_assignments.accessor_type = ? AND role_assignments.accessor_id = ?', person.class.base_class.name, person.id)
+  }
   #FIXME: these will work only if the subclass is already loaded
-  scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  scope :templates, lambda { |template_id = nil|
-    conditions = {:conditions => {:is_template => true}}
-    conditions[:conditions].merge!({:id => template_id}) unless template_id.nil?
-    conditions
+  scope :enterprises, -> {
+    where((Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR "))
+  }
+  scope :communities, -> {
+    where((Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR "))
+  }
+  scope :templates, -> template_id = nil {
+    s = where is_template: true
+    s = s.where id: template_id if template_id
+    s
   }
-  scope :with_templates, lambda { |templates|
-    {:conditions => {:template_id => templates}}
+  scope :with_templates, -> templates {
+    where template_id: templates
   }
-  scope :no_templates, {:conditions => {:is_template => false}}
+  scope :no_templates, -> { where is_template: false }
   # Returns a scoped object to select profiles in a given location or in a radius
   # distance from the given location center.
@@ -177,10 +186,10 @@ class Profile &lt; ActiveRecord::Base
     Profile.column_names.map{|n| [Profile.table_name, n].join('.')}.join(',')
   end
-  scope :visible, :conditions => { :visible => true, :secret => false }
-  scope :disabled, :conditions => { :visible => false }
-  scope :public, :conditions => { :visible => true, :public_profile => true, :secret => false }
-  scope :enabled, :conditions => { :enabled => true }
+  scope :visible, -> { where visible: true, secret: false }
+  scope :disabled, -> { where visible: false }
+  scope :is_public, -> { where visible: true, public_profile: true, secret: false }
+  scope :enabled, -> { where enabled: true }
   # Subclasses must override this method
   scope :more_popular
@@ -229,7 +238,7 @@ class Profile &lt; ActiveRecord::Base
   validates_length_of :description, :maximum => 550, :allow_nil => true
   # Valid identifiers must match this format.
-  IDENTIFIER_FORMAT = /^#{Noosfero.identifier_format}$/
+  IDENTIFIER_FORMAT = /\A#{Noosfero.identifier_format}\Z/
   # These names cannot be used as identifiers for Profiles
   RESERVED_IDENTIFIERS = %w[
@@ -281,7 +290,7 @@ class Profile &lt; ActiveRecord::Base
     end
   end
-  has_many :profile_categorizations, :conditions => [ 'categories_profiles.virtual = ?', false ]
+  has_many :profile_categorizations, -> { where 'categories_profiles.virtual = ?', false }
   has_many :categories, :through => :profile_categorizations
   has_many :profile_categorizations_including_virtual, :class_name => 'ProfileCategorization'
@@ -508,14 +517,13 @@ class Profile &lt; ActiveRecord::Base
     self.articles.recent(limit, options, pagination)
   end
-  def last_articles(limit = 10, options = {})
-    options = { :limit => limit,
-                :conditions => ["advertise = ? AND published = ? AND
-                                 ((articles.type != ? and articles.type != ? and articles.type != ?) OR
-                                 articles.type is NULL)",
-                                 true, true, 'UploadedFile', 'RssFeed', 'Blog'],
-                :order => 'articles.published_at desc, articles.id desc' }.merge(options)
-    self.articles.find(:all, options)
+  def last_articles limit = 10
+    self.articles.limit(limit).where(
+      "advertise = ? AND published = ? AND
+      ((articles.type != ? and articles.type != ? and articles.type != ?) OR
+      articles.type is NULL)",
+      true, true, 'UploadedFile', 'RssFeed', 'Blog'
+    ).order('articles.published_at desc, articles.id desc')
   end
   class << self
@@ -713,7 +721,7 @@ private :generate_url, :url_options
         num = num + 1
         new_name = original_article.name + ' ' + num.to_s
       end
-      original_article.update_attributes!(:name => new_name)
+      original_article.update!(:name => new_name)
     end
     article_copy = article.copy(:profile => self, :parent => parent, :advertise => false)
     if article.profile.home_page == article
@@ -25,8 +25,8 @@ class ProfileActivity &lt; ActiveRecord::Base
   protected
   def copy_timestamps
-    self.created_at = self.activity.created_at
-    self.updated_at = self.activity.updated_at
+    self.created_at = self.activity.created_at if self.activity.created_at
+    self.updated_at = self.activity.updated_at if self.activity.updated_at
   end
 end
 class ProfileCategorization < ActiveRecord::Base
-  set_table_name :categories_profiles
+  self.table_name = :categories_profiles
   belongs_to :profile
   belongs_to :category
@@ -13,7 +13,7 @@ class ProfileCategorization &lt; ActiveRecord::Base
   end
   def self.remove_region(profile)
-    region = profile.categories.find(:first, :conditions => { :type => [Region, State, City].map(&:name) })
+    region = profile.categories.where(type: [Region, State, City].map(&:name)).first
     if region
       ids = region.hierarchy.map(&:id)
       self.delete_all(:profile_id => profile.id, :category_id => ids)
 class ProfileInfoBlock < Block
   def self.description
-    _('Profile information')
+    _('Display profile image and links to access initial homepage, control panel and profile activities.')
+  end
+
+  def self.short_description
+    _('Show profile information')
+  end
+
+  def self.pretty_name
+    _('Profile Information')
   end
   def help
@@ -16,7 +16,7 @@ class ProfileListBlock &lt; Block
   def profile_list
     result = nil
-    public_profiles = profiles.public.includes([:image,:domains,:preferred_domain,:environment])
+    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 }
     elsif profiles.visible.with_image.count >= get_limit
@@ -28,7 +28,7 @@ result = public_profiles.all(:limit =&gt; get_limit, :order =&gt; &#39;profiles.updated_at
   end
   def profile_count
-    profiles.public.length
+    profiles.is_public.length
   end
   # the title of the block. Probably will be overriden in subclasses.
	@@ -8,8 +8,7 @@ notifications:		@@ -8,8 +8,7 @@ notifications:
8		8
9	language: ruby	9	language: ruby
10	rvm:	10	rvm:
11	-# for 2.2 support we need to upgrade the pg gem
12	- - 2.1.6	11	+ - 2.2.3
13		12
14	sudo: false	13	sudo: false
15	addons:	14	addons:
	@@ -26,19 +25,16 @@ addons:		@@ -26,19 +25,16 @@ addons:
26	- libsqlite3-dev	25	- libsqlite3-dev
27	- libxslt1-dev	26	- libxslt1-dev
28		27
29	-before_install:
30	- - gem env
31	-
32	# workaround for https://github.com/travis-ci/travis-ci/issues/4536	28	# workaround for https://github.com/travis-ci/travis-ci/issues/4536
33	before_install:	29	before_install:
34	- - export GEM_HOME=$PWD/vendor/bundle/ruby/2.1.0	30	+ - export GEM_HOME=$PWD/vendor/bundle/ruby/2.2.0
35	- gem install bundler	31	- gem install bundler
36	cache: bundler	32	cache: bundler
37		33
38	before_script:	34	before_script:
39	- mkdir -p tmp/{pids,cache} log	35	- mkdir -p tmp/{pids,cache} log
40	- script/noosfero-plugins disableall	36	- script/noosfero-plugins disableall
41	- - bundle exec rake makemo &>/dev/null	37	+ #- bundle exec rake makemo &>/dev/null
42	# database	38	# database
43	- cp config/database.yml.travis config/database.yml	39	- cp config/database.yml.travis config/database.yml
44	- psql -c 'create database myapp_test;' -U postgres	40	- psql -c 'create database myapp_test;' -U postgres
	@@ -49,7 +45,7 @@ env:		@@ -49,7 +45,7 @@ env:
49	- TASK=test:units	45	- TASK=test:units
50	- TASK=test:functionals	46	- TASK=test:functionals
51	- TASK=test:integration	47	- TASK=test:integration
52	- - TASK=cucumber	48	+ - TASK=cucumber LANG=en
53	- TASK=selenium	49	- TASK=selenium
54	- TASK=test:noosfero_plugins BUNDLE_OPTS=install	50	- TASK=test:noosfero_plugins BUNDLE_OPTS=install
55		51
	@@ -17,36 +17,3 @@ end.flatten.each do \|taskfile\|		@@ -17,36 +17,3 @@ end.flatten.each do \|taskfile\|
17	load taskfile	17	load taskfile
18	end	18	end
19		19
20	-# plugins' tasks
21	-plugins_tasks = Dir.glob("config/plugins//{tasks,lib/tasks,rails/tasks}//.rake").sort +
22	- Dir.glob("config/plugins//vendor/plugins//{tasks,lib/tasks,rails/tasks}/*/.rake").sort
23	-plugins_tasks.each{ \|ext\| load ext }
24	-
25	-
26	-desc "Print out grape routes"
27	-task :grape_routes => :environment do
28	- #require 'api/api.rb'
29	- Noosfero::API::API.routes.each do \|route\|
30	- puts route
31	- method = route.route_method
32	- path = route.route_path
33	- puts " #{method} #{path}"
34	- end
35	-end
36	-
37	-# plugins' tasks
38	-plugins_tasks = Dir.glob("config/plugins//{tasks,lib/tasks,rails/tasks}//.rake").sort +
39	- Dir.glob("config/plugins//vendor/plugins//{tasks,lib/tasks,rails/tasks}/*/.rake").sort
40	-plugins_tasks.each{ \|ext\| load ext }
41	-
42	-
43	-desc "Print out grape routes"
44	-task :grape_routes => :environment do
45	- #require 'api/api.rb'
46	- Noosfero::API::API.routes.each do \|route\|
47	- puts route
48	- method = route.route_method
49	- path = route.route_path
50	- puts " #{method} #{path}"
51	- end
52	-end
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3		3
4	VAGRANTFILE_API_VERSION = "2"	4	VAGRANTFILE_API_VERSION = "2"
5	Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|	5	Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|
6	- config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")	6	+ config.vm.box = ENV.fetch('VAGRANT_BOX', "debian/jessie64")
7	config.vm.network :forwarded_port, host: 3000, guest: 3000	7	config.vm.network :forwarded_port, host: 3000, guest: 3000
8	config.vm.provision :shell do \|shell\|	8	config.vm.provision :shell do \|shell\|
9	shell.inline = 'su vagrant -c /vagrant/script/vagrant'	9	shell.inline = 'su vagrant -c /vagrant/script/vagrant'
	@@ -12,7 +12,7 @@ class AdminPanelController < AdminController		@@ -12,7 +12,7 @@ class AdminPanelController < AdminController
12	if params[:environment][:languages]	12	if params[:environment][:languages]
13	params[:environment][:languages] = params[:environment][:languages].map {\|lang, value\| lang if value=='true'}.compact	13	params[:environment][:languages] = params[:environment][:languages].map {\|lang, value\| lang if value=='true'}.compact
14	end	14	end
15	- if @environment.update_attributes(params[:environment])	15	+ if @environment.update(params[:environment])
16	session[:notice] = _('Environment settings updated')	16	session[:notice] = _('Environment settings updated')
17	redirect_to :action => 'index'	17	redirect_to :action => 'index'
18	end	18	end
	@@ -54,7 +54,7 @@ class AdminPanelController < AdminController		@@ -54,7 +54,7 @@ class AdminPanelController < AdminController
54		54
55	if request.post?	55	if request.post?
56	env = environment	56	env = environment
57	- folders = params[:folders].map{\|fid\| Folder.find(:first, :conditions => {:profile_id => env.portal_community, :id => fid})} if params[:folders]	57	+ folders = env.portal_community.folders.where(id: params[:folders]).order(params[:folders].reverse.map{ \|f\| "id=#{f}" }) if params[:folders]
58	env.portal_folders = folders	58	env.portal_folders = folders
59	if env.save	59	if env.save
60	session[:notice] = _('Saved the portal folders')	60	session[:notice] = _('Saved the portal folders')
	@@ -65,7 +65,7 @@ class AdminPanelController < AdminController		@@ -65,7 +65,7 @@ class AdminPanelController < AdminController
65		65
66	def set_portal_news_amount	66	def set_portal_news_amount
67	if request.post?	67	if request.post?
68	- if @environment.update_attributes(params[:environment])	68	+ if @environment.update(params[:environment])
69	session[:notice] = _('Saved the number of news on folders')	69	session[:notice] = _('Saved the number of news on folders')
70	redirect_to :action => 'index'	70	redirect_to :action => 'index'
71	end	71	end
	@@ -2,7 +2,7 @@ class EnvironmentRoleManagerController < AdminController		@@ -2,7 +2,7 @@ class EnvironmentRoleManagerController < AdminController
2	protect 'manage_environment_roles', :environment	2	protect 'manage_environment_roles', :environment
3		3
4	def index	4	def index
5	- @admins = Person.find(:all, :conditions => ['role_assignments.resource_type = ?', 'Environment'], :include => :role_assignments )	5	+ @admins = Person.where('role_assignments.resource_type = ?', 'Environment').includes(:role_assignments)
6	end	6	end
7		7
8	def change_roles	8	def change_roles
1	class FeaturesController < AdminController	1	class FeaturesController < AdminController
2	protect 'edit_environment_features', :environment	2	protect 'edit_environment_features', :environment
3	-	3	+ helper CustomFieldsHelper
		4	+
4	def index	5	def index
5	@features = Environment.available_features.sort_by{\|k,v\|v}	6	@features = Environment.available_features.sort_by{\|k,v\|v}
6	end	7	end
7		8
8	post_only :update	9	post_only :update
9	def update	10	def update
10	- if @environment.update_attributes(params[:environment])	11	+ if @environment.update(params[:environment])
11	session[:notice] = _('Features updated successfully.')	12	session[:notice] = _('Features updated successfully.')
12	redirect_to :action => 'index'	13	redirect_to :action => 'index'
13	else	14	else
	@@ -51,9 +52,37 @@ class FeaturesController < AdminController		@@ -51,9 +52,37 @@ class FeaturesController < AdminController
51	redirect_to :action => 'manage_fields'	52	redirect_to :action => 'manage_fields'
52	end	53	end
53		54
		55	+ def manage_custom_fields
		56	+ custom_field_list = params[:custom_fields] \|\| {}
		57	+
		58	+ custom_fields_to_destroy =
		59	+ params[:customized_type].constantize.custom_fields(environment).map(&:id) - custom_field_list.keys.map(&:to_i)
		60	+ CustomField.destroy(custom_fields_to_destroy)
		61	+
		62	+ custom_field_list.each_pair do \|id, custom_field\|
		63	+ field = CustomField.find_by_id(id)
		64	+ if not field.blank?
		65	+ params_to_update = custom_field.except(:format, :extras, :customized_type,:environment)
		66	+ field.update_attributes(params_to_update)
		67	+ else
		68	+ if !custom_field[:extras].nil?
		69	+ tmp = []
		70	+ custom_field[:extras].each_pair do \|k, v\|
		71	+ tmp << v
		72	+ end
		73	+ custom_field[:extras] = tmp
		74	+ end
		75	+ field = CustomField.new custom_field.except(:environment)
		76	+ field.environment=environment
		77	+ field.save if field.valid?
		78	+ end
		79	+ end
		80	+ redirect_to :action => 'manage_fields'
		81	+ end
		82	+
54	def search_members	83	def search_members
55	arg = params[:q].downcase	84	arg = params[:q].downcase
56	- result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%"])	85	+ result = environment.people.where('LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%")
57	render :text => prepare_to_token_input(result).to_json	86	render :text => prepare_to_token_input(result).to_json
58	end	87	end
59		88
	@@ -23,7 +23,7 @@ class LicensesController < AdminController		@@ -23,7 +23,7 @@ class LicensesController < AdminController
23	@license = environment.licenses.find(params[:license_id])	23	@license = environment.licenses.find(params[:license_id])
24	if request.post?	24	if request.post?
25	begin	25	begin
26	- @license.update_attributes!(params[:license])	26	+ @license.update!(params[:license])
27	session[:notice] = _('License updated')	27	session[:notice] = _('License updated')
28	redirect_to :action => 'index'	28	redirect_to :action => 'index'
29	rescue	29	rescue
	@@ -8,7 +8,7 @@ class PluginsController < AdminController		@@ -8,7 +8,7 @@ class PluginsController < AdminController
8	post_only :update	8	post_only :update
9	def update	9	def update
10	params[:environment][:enabled_plugins].delete('')	10	params[:environment][:enabled_plugins].delete('')
11	- if @environment.update_attributes(params[:environment])	11	+ if @environment.update(params[:environment])
12	session[:notice] = _('Plugins updated successfully.')	12	session[:notice] = _('Plugins updated successfully.')
13	else	13	else
14	session[:error] = _('Plugins were not updated successfully.')	14	session[:error] = _('Plugins were not updated successfully.')
	@@ -29,7 +29,7 @@ class RoleController < AdminController		@@ -29,7 +29,7 @@ class RoleController < AdminController
29		29
30	def update	30	def update
31	@role = environment.roles.find(params[:id])	31	@role = environment.roles.find(params[:id])
32	- if @role.update_attributes(params[:role])	32	+ if @role.update(params[:role])
33	redirect_to :action => 'show', :id => @role	33	redirect_to :action => 'show', :id => @role
34	else	34	else
35	session[:notice] = _('Failed to edit role')	35	session[:notice] = _('Failed to edit role')
	@@ -63,7 +63,7 @@ class UsersController < AdminController		@@ -63,7 +63,7 @@ class UsersController < AdminController
63	respond_to do \|format\|	63	respond_to do \|format\|
64	format.html	64	format.html
65	format.xml do	65	format.xml do
66	- users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])	66	+ users = User.where(:environment_id => environment.id).includes(:person)
67	send_data users.to_xml(	67	send_data users.to_xml(
68	:skip_types => true,	68	:skip_types => true,
69	:only => %w[email login created_at updated_at],	69	:only => %w[email login created_at updated_at],