Merge branch 'drop-find_by_' into 'master'

Drop deprecated finders Finally (I hope) the last code from rails 2 See merge request !846

Merge branch 'drop-find_by_' into 'master'
Drop deprecated finders Finally (I hope) the last code from rails 2 See merge request !846
Braulio Bhavamitra
2 parents 22d4574a 9f4a8f6a
Showing 234 changed files with 890 additions and 932 deletions Show diff stats
Gemfile
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/environment_role_manager_controller.rb
app/controllers/admin/features_controller.rb
app/controllers/admin/role_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/profile_members_controller.rb
app/controllers/my_profile/spam_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/chat_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/enterprise_registration_controller.rb
app/controllers/public/profile_controller.rb
@@ -52,7 +52,6 @@ gem &#39;protected_attributes&#39;
 gem 'rails-observers'
 gem 'actionpack-page_caching'
 gem 'actionpack-action_caching'
-gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
  
 group :production do
   gem 'dalli', '~> 2.7.0'
@@ -34,7 +34,7 @@ class AdminPanelController &lt; AdminController
     env = environment
     @portal_community = env.portal_community || Community.new
     if request.post?
-      portal_community = env.communities.find_by_identifier(params[:portal_community_identifier])
+      portal_community = env.communities.where(identifier: params[:portal_community_identifier]).first
       if portal_community
         if (env.portal_community != portal_community)
           env.portal_community = portal_community
@@ -7,7 +7,7 @@ class EnvironmentRoleManagerController &lt; AdminController
  
   def change_roles
     @admin = Person.find(params[:id])
-    @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) }
+    @roles = Role.all.select{ |r| r.has_kind?(:environment) }
   end
  
   def update_roles
@@ -22,7 +22,7 @@ class EnvironmentRoleManagerController &lt; AdminController
   end
  
   def change_role
-    @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) }
+    @roles = Role.all.select{ |r| r.has_kind?(:environment) }
     @admin = Person.find(params[:id])
     @associations = @admin.find_roles(environment)
   end
@@ -34,7 +34,7 @@ class EnvironmentRoleManagerController &lt; AdminController
       redirect_to :action => 'index'
     else
       @admin = Person.find(params[:person])
-      @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) }
+      @roles = Role.all.select{ |r| r.has_kind?(:environment) }
       render :action => 'affiliate'
     end
   end
@@ -60,7 +60,7 @@ class EnvironmentRoleManagerController &lt; AdminController
   end
  
   def make_admin
-    @people = Person.find(:all)
-    @roles = Role.find(:all).select{|r|r.has_kind?(:environment)}
+    @people = Person.all
+    @roles = Role.all.select{|r|r.has_kind?(:environment)}
   end
 end
@@ -60,7 +60,7 @@ class FeaturesController &lt; AdminController
     CustomField.destroy(custom_fields_to_destroy)
  
     custom_field_list.each_pair do |id, custom_field|
-      field = CustomField.find_by_id(id)
+      field = CustomField.find_by(id: id)
       if not field.blank?
         params_to_update = custom_field.except(:format, :extras, :customized_type,:environment)
         field.update_attributes(params_to_update)
@@ -2,7 +2,7 @@ class RoleController &lt; AdminController
   protect 'manage_environment_roles', :environment
  
   def index
-    @roles = environment.roles.find(:all, :conditions => {:profile_id => nil})
+    @roles = environment.roles.where profile_id: nil
   end
  
   def new
@@ -48,7 +48,7 @@ class UsersController &lt; AdminController
  
   def destroy_user
     if request.post?
-      person = environment.people.find_by_id(params[:id])
+      person = environment.people.find_by id: params[:id]
       if person && person.destroy
         session[:notice] = _('The profile was deleted.')
       else
@@ -123,7 +123,7 @@ class ApplicationController &lt; ActionController::Base
     # Sets text domain based on request host for custom internationalization
     FastGettext.text_domain = Domain.custom_locale(request.host)
  
-    @domain = Domain.find_by_name(request.host)
+    @domain = Domain.by_name(request.host)
     if @domain.nil?
       @environment = Environment.default
       # Avoid crashes on test and development setups
@@ -138,7 +138,7 @@ class ApplicationController &lt; ActionController::Base
  
       # Check if the requested profile belongs to another domain
       if @profile && !params[:profile].blank? && params[:profile] != @profile.identifier
-        @profile = @environment.profiles.find_by_identifier params[:profile]
+        @profile = @environment.profiles.find_by(identifier: params[:profile])
         redirect_to url_for(params.merge host: @profile.default_hostname)
       end
     end
@@ -170,7 +170,7 @@ class ApplicationController &lt; ActionController::Base
   def load_category
     unless params[:category_path].blank?
       path = params[:category_path]
-      @category = environment.categories.find_by_path(path)
+      @category = environment.categories.find_by(path: path)
       if @category.nil?
         render_not_found(path)
       end
@@ -16,10 +16,9 @@ class BoxOrganizerController &lt; ApplicationController
       target_position = block_before.position
  
       @target_box = block_before.box
-    else
-      (params[:target] =~ /end-of-box-([0-9]+)/)
+    elsif params[:target] =~ /end-of-box-([0-9]+)/
  
-      @target_box = boxes_holder.boxes.find_by_id($1)
+      @target_box = boxes_holder.boxes.find_by id: $1
     end
  
     @block = new_block(params[:type], @target_box) if @block.nil?
@@ -35,8 +34,8 @@ class BoxOrganizerController &lt; ApplicationController
       @block.insert_at(@target_box.blocks.size + 1)
       @block.move_to_bottom
     else
-      # insert the block in the given position
-      @block.insert_at(@block.position && @block.position < target_position ? target_position - 1 : target_position)
+      new_position = if @block.position and @block.position < target_position then target_position - 1 else target_position end
+      @block.insert_at new_position
     end
  
     @block.save!
@@ -34,7 +34,7 @@ class CmsController &lt; MyProfileController
  
   protect_if :only => [:new, :upload_files] do |c, user, profile|
     parent_id = c.params[:article].present? ? c.params[:article][:parent_id] : c.params[:parent_id]
-    parent = profile.articles.find_by_id(parent_id)
+    parent = profile.articles.find_by(id: parent_id)
     user && user.can_post_content?(profile, parent)
   end
  
@@ -59,11 +59,10 @@ class CmsController &lt; MyProfileController
  
   def index
     @article = nil
-    @articles = profile.top_level_articles.paginate(
-      :order => "case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC",
-      :per_page => per_page,
-      :page => params[:npage]
-    )
+    @articles = profile.top_level_articles
+      .order("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC")
+      .paginate(per_page: per_page, page: params[:npage])
+
     render :action => 'view'
   end
  
@@ -22,7 +22,7 @@ class FriendsController &lt; MyProfileController
   end
  
   def remove_suggestion
-    @person = profile.suggested_people.find_by_identifier(params[:id])
+    @person = profile.suggested_people.find_by(identifier: params[:id])
     redirect_to :action => 'suggest' unless @person
     if @person && request.post?
       profile.remove_suggestion(@person)
@@ -32,7 +32,7 @@ class FriendsController &lt; MyProfileController
   end
  
   def connections
-    @suggestion = profile.suggested_profiles.of_person.enabled.find_by_suggestion_id(params[:id])
+    @suggestion = profile.suggested_profiles.of_person.enabled.find_by(suggestion_id: params[:id])
     if @suggestion
       @tags = @suggestion.tag_connections
       @profiles = @suggestion.profile_connections
@@ -35,7 +35,7 @@ class ManageProductsController &lt; ApplicationController
   end
  
   def categories_for_selection
-    @category = environment.categories.find_by_id params[:category_id]
+    @category = environment.categories.find_by id: params[:category_id]
     @object_name = params[:object_name]
     if @category
       @categories = @category.children
@@ -103,7 +103,7 @@ class ManageProductsController &lt; ApplicationController
   def search_categories
     @term = params[:term].downcase
     conditions = ['LOWER(name) LIKE ? OR LOWER(name) LIKE ?', "#{@term}%", "% #{@term}%"]
-    @categories = ProductCategory.all :conditions => conditions, :limit => 10
+    @categories = ProductCategory.where(conditions).limit(10)
     render :json => (@categories.map do |category|
       {:label => category.name, :value => category.id}
     end)
@@ -169,7 +169,7 @@ class ManageProductsController &lt; ApplicationController
  
   def edit_input
     if request.xhr?
-      @input = @profile.inputs.find_by_id(params[:id])
+      @input = @profile.inputs.find_by id: params[:id]
       if @input
         if request.post?
           if @input.update(params[:input])
@@ -5,7 +5,7 @@ class MembershipsController &lt; MyProfileController
  
   def index
     @roles = environment.roles.select do |role|
-      ra = profile.role_assignments.find_by_role_id(role.id)
+      ra = profile.role_assignments.find_by(role_id: role.id)
       ra.present? && ra.resource_type == 'Profile'
     end
     @filter = params[:filter_type].to_i
@@ -47,7 +47,7 @@ class MembershipsController &lt; MyProfileController
   end
  
   def remove_suggestion
-    @community = profile.suggested_communities.find_by_identifier(params[:id])
+    @community = profile.suggested_communities.find_by(identifier: params[:id])
     custom_per_page = params[:per_page] || per_page
     redirect_to :action => 'suggest' unless @community
     if @community && request.post?
@@ -58,7 +58,7 @@ class MembershipsController &lt; MyProfileController
   end
  
   def connections
-    @suggestion = profile.suggested_profiles.of_community.enabled.find_by_suggestion_id(params[:id])
+    @suggestion = profile.suggested_profiles.of_community.enabled.find_by(suggestion_id: params[:id])
     if @suggestion
       @tags = @suggestion.tag_connections
       @profiles = @suggestion.profile_connections
@@ -60,7 +60,7 @@ class ProfileMembersController &lt; MyProfileController
       redirect_to :action => 'index'
     else
       @member = Person.find(params[:person])
-      @roles = environment.roles.find(:all).select{ |r| r.has_kind?('Profile') }
+      @roles = environment.roles.all.select{ |r| r.has_kind?('Profile') }
       render :action => 'affiliate'
     end
   end
@@ -120,7 +120,7 @@ class ProfileMembersController &lt; MyProfileController
     @collection = :profile_admins
  
     if profile.community?
-      member = profile.members.find_by_identifier(params[:id])
+      member = profile.members.find_by(identifier: params[:id])
       profile.add_admin(member)
     end
     render :layout => false
@@ -131,7 +131,7 @@ class ProfileMembersController &lt; MyProfileController
     @collection = :profile_admins
  
     if profile.community?
-      member = profile.members.find_by_identifier(params[:id])
+      member = profile.members.find_by(identifier: params[:id])
       profile.remove_admin(member)
     end
     render :layout => false
@@ -15,12 +15,12 @@ class SpamController &lt; MyProfileController
           profile.comments_received.find(params[:remove_comment]).destroy
         end
         if params[:remove_task]
-          Task.to(profile).find_by_id(params[:remove_task]).destroy
+          Task.to(profile).find_by(id: params[:remove_task]).destroy
         end
         if params[:mark_comment_as_ham]
           profile.comments_received.find(params[:mark_comment_as_ham]).ham!
         end
-        if params[:mark_task_as_ham] && (t = Task.to(profile).find_by_id(params[:mark_task_as_ham]))
+        if params[:mark_task_as_ham] && (t = Task.to(profile).find_by(id: params[:mark_task_as_ham]))
           t.ham!
         end
         if request.xhr?
@@ -7,8 +7,8 @@ class TasksController &lt; MyProfileController
   helper CustomFieldsHelper
  
   def index
-    @rejection_email_templates = profile.email_templates.find_all_by_template_type(:task_rejection)
-    @acceptance_email_templates = profile.email_templates.find_all_by_template_type(:task_acceptance)
+    @rejection_email_templates = profile.email_templates.where template_type: :task_rejection
+    @acceptance_email_templates = profile.email_templates.where template_type: :task_acceptance
  
     @filter_type = params[:filter_type].presence
     @filter_text = params[:filter_text].presence
@@ -88,7 +88,7 @@ class TasksController &lt; MyProfileController
   end
  
   def list_requested
-    @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
+    @tasks = Task.without_spam.where requestor_id: profile.id
   end
  
   def ticket_details
@@ -17,7 +17,7 @@ class AccountController &lt; ApplicationController
   end
  
   def activate
-    @user = User.find_by_activation_code(params[:activation_code]) if params[:activation_code]
+    @user = User.find_by(activation_code: params[:activation_code]) if params[:activation_code]
     if @user
       unless @user.environment.enabled?('admin_must_approve_new_users')
         if @user.activate
@@ -118,7 +118,7 @@ class AccountController &lt; ApplicationController
           end
           @user.community_to_join = session[:join]
           @user.signup!
-          owner_role = Role.find_by_name('owner')
+          owner_role = Role.find_by(name: 'owner')
           @user.person.affiliate(@user.person, [owner_role]) if owner_role
           invitation = Task.from_code(@invitation_code).first
           if invitation
@@ -305,7 +305,7 @@ class AccountController &lt; ApplicationController
   end
  
   def check_email
-    if User.find_by_email_and_environment_id(params[:address], environment.id).nil?
+    if User.find_by(email: params[:address], environment_id: environment.id).nil?
       @status = _('This e-mail address is available')
       @status_class = 'validated'
     else
@@ -502,7 +502,7 @@ class AccountController &lt; ApplicationController
   def check_join_in_community(user)
     profile_to_join = session[:join]
     unless profile_to_join.blank?
-     environment.profiles.find_by_identifier(profile_to_join).add_member(user.person)
+     environment.profiles.find_by(identifier: profile_to_join).add_member(user.person)
      session.delete(:join)
     end
   end
@@ -44,7 +44,7 @@ class ChatController &lt; PublicController
   end
  
   def avatar
-    profile = environment.profiles.find_by_identifier(params[:id])
+    profile = environment.profiles.find_by(identifier: params[:id])
     filename, mimetype = profile_icon(profile, :minor, true)
     if filename =~ /^(https?:)?\/\//
       redirect_to filename
@@ -87,7 +87,7 @@ class ChatController &lt; PublicController
   end
  
   def recent_messages
-    other = environment.profiles.find_by_identifier(params[:identifier])
+    other = environment.profiles.find_by(identifier: params[:identifier])
     if other.kind_of?(Organization)
       messages = ChatMessage.where('to_id=:other', :other => other.id)
     else
@@ -18,7 +18,7 @@ class ContentViewerController &lt; ApplicationController
       @page = profile.home_page
       return if redirected_to_profile_index
     else
-      @page = profile.articles.find_by_path(path)
+      @page = profile.articles.find_by path: path
       return if redirected_page_from_old_path(path)
     end
  
@@ -76,13 +76,13 @@ class ContentViewerController &lt; ApplicationController
  
   def versions_diff
     path = params[:page]
-    @page = profile.articles.find_by_path(path)
-    @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
+    @page = profile.articles.find_by path: path
+    @v1, @v2 = @page.versions.find_by(version: params[:v1]), @page.versions.find_by(version: params[:v2])
   end
  
   def article_versions
     path = params[:page]
-    @page = profile.articles.find_by_path(path)
+    @page = profile.articles.find_by path: path
     return unless allow_access_to_page(path)
  
     render_access_denied unless @page.display_versions?
@@ -169,7 +169,7 @@ class ContentViewerController &lt; ApplicationController
  
   def redirected_page_from_old_path(path)
     unless @page
-      page_from_old_path = profile.articles.find_by_old_path(path)
+      page_from_old_path = profile.articles.find_by_old_path path
       if page_from_old_path
         redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
         return true
@@ -190,7 +190,7 @@ class ContentViewerController &lt; ApplicationController
   end
  
   def rendered_versioned_article
-    @versioned_article = @page.versions.find_by_version(@version)
+    @versioned_article = @page.versions.find_by version: @version
     if @versioned_article && @page.versions.latest.version != @versioned_article.version
       render :template => 'content_viewer/versioned_article.html.erb'
       return true
@@ -68,7 +68,7 @@ class EnterpriseRegistrationController &lt; ApplicationController
   # saying to the user that the enterprise was created.
   def creation
     @create_enterprise.perform
-    @enterprise = @create_enterprise.target.profiles.find_by_identifier(@create_enterprise.identifier)
+    @enterprise = @create_enterprise.target.profiles.find_by identifier: @create_enterprise.identifier
   end
  
 end
@@ -339,7 +339,7 @@ class ProfileController &lt; PublicController
         user.register_report(abuse_report, profile)
  
         if !params[:content_type].blank?
-          abuse_report = AbuseReport.find_by_reporter_id_and_abuse_complaint_id(user.id, profile.opened_abuse_complaint.id)
+          abuse_report = AbuseReport.find_by(reporter_id: user.id, abuse_complaint_id: profile.opened_abuse_complaint.id)
           Delayed::Job.enqueue DownloadReportedImagesJob.new(abuse_report, article)
         end
  
@@ -374,7 +374,7 @@ class ProfileController &lt; PublicController
   def send_mail
     @mailing = profile.mailings.build(params[:mailing])
     @mailing.data = session[:members_filtered] ? {:members_filtered => session[:members_filtered]} : {}
-    @email_templates = profile.email_templates.find_all_by_template_type(:organization_members)
+    @email_templates = profile.email_templates.where template_type: :organization_members
     if request.post?
       @mailing.locale = locale
       @mailing.person = user
@@ -167,7 +167,7 @@ class SearchController &lt; PublicController
       render_not_found if params[:action] == 'category_index'
     else
       path = params[:category_path]
-      @category = environment.categories.find_by_path(path)
+      @category = environment.categories.find_by path: path
       if @category.nil?
         render_not_found(path)
       else
@@ -177,14 +177,14 @@ class SearchController &lt; PublicController
   end
  
   def available_searches
-    @available_searches ||= ActiveSupport::OrderedHash[
-      :articles, _('Contents'),
-      :people, _('People'),
-      :communities, _('Communities'),
-      :enterprises, _('Enterprises'),
-      :products, _('Products and Services'),
-      :events, _('Events'),
-    ]
+    @available_searches ||= {
+      articles:    _('Contents'),
+      people:      _('People'),
+      communities: _('Communities'),
+      enterprises: _('Enterprises'),
+      products:    _('Products and Services'),
+      events:      _('Events'),
+    }
   end
  
   def load_search_assets
@@ -256,13 +256,13 @@ class SearchController &lt; PublicController
   end
  
   def available_assets
-    assets = ActiveSupport::OrderedHash[
-      :articles, _('Contents'),
-      :enterprises, _('Enterprises'),
-      :people, _('People'),
-      :communities, _('Communities'),
-      :products, _('Products and Services'),
-    ]
+    assets = {
+      articles:    _('Contents'),
+      enterprises: _('Enterprises'),
+      people:      _('People'),
+      communities: _('Communities'),
+      products:    _('Products and Services'),
+    }
   end
  
 end
@@ -318,7 +318,7 @@ module ApplicationHelper
     if File.exists?(Rails.root.join('public', theme_path, 'favicon.ico'))
       '/designs/themes/' + profile.theme + '/favicon.ico'
     else
-      favicon = profile.articles.find_by_path('favicon.ico')
+      favicon = profile.articles.find_by path: 'favicon.ico'
       if favicon
         favicon.public_filename
       else
@@ -1154,8 +1154,8 @@ module ApplicationHelper
   end
  
   def default_folder_for_image_upload(profile)
-    default_folder = profile.folders.find_by_type('Gallery')
-    default_folder = profile.folders.find_by_type('Folder') if default_folder.nil?
+    default_folder = profile.folders.find_by type: 'Gallery'
+    default_folder = profile.folders.find_by type: 'Folder' if default_folder.nil?
     default_folder
   end
  
@@ -50,15 +50,15 @@ module FormsHelper
   end
  
   def select_city( simple=false )
-    states = State.find(:all, :order => 'name')
-    
+    states = State.order(:name).all
+
     state_id = 'state-' + FormsHelper.next_id_number
     city_id = 'city-' + FormsHelper.next_id_number
  
     if states.length < 1
       return
     end
-    
+
     if simple
       states = [State.new(:name => _('Select the State'))] + states
       cities = [City.new(:name => _('Select the City'))]
@@ -82,7 +82,7 @@ module FormsHelper
       states = [State.new(:name => '---')] + states
       cities = [City.new(:name => '---')]
  
-      html = 
+      html =
       content_tag( 'div',
                    labelled_select( _('State:'), 'state', :id, :name, nil, states, :id => state_id ),
                    :class => 'select_state_for_origin' ) +
@@ -90,7 +90,7 @@ module FormsHelper
                    labelled_select( _('City:'), 'city', :id, :name, nil, cities, :id => city_id ),
                    :class => 'select_city_for_origin' )
     end
-    
+
     html +
     observe_field( state_id, :update => city_id, :function => "new Ajax.Updater(#{city_id.inspect}, #{url_for(:controller => 'search', :action => 'cities').inspect}, {asynchronous:true, evalScripts:true, parameters:'state_id=' + value}); $(#{city_id.inspect}).innerHTML = '<option>#{_('Loading...')}</option>'", :with => 'state_id')
   end
@@ -222,7 +222,7 @@ module ManageProductsHelper
   end
   def select_certifiers(qualifier, product = nil)
     if qualifier
-      selected = product ? product.product_qualifiers.find_by_qualifier_id(qualifier.id).certifier_id : nil
+      selected = product ? product.product_qualifiers.find_by(qualifier_id: qualifier.id).certifier_id : nil
       select_tag("product[qualifiers_list][#{qualifier.id}]", options_for_select(certifiers_for_select(qualifier), selected))
     else
       select_tag("product[qualifiers_list][nil]")
 module ProfileHelper
  
-  COMMON_CATEGORIES = ActiveSupport::OrderedHash.new
+  COMMON_CATEGORIES = {}
   COMMON_CATEGORIES[:content] = [:blogs, :image_galleries, :events, :article_tags]
   COMMON_CATEGORIES[:interests] = [:interests]
   COMMON_CATEGORIES[:general] = nil
  
-  PERSON_CATEGORIES = ActiveSupport::OrderedHash.new
+  PERSON_CATEGORIES = {}
   PERSON_CATEGORIES[:basic_information] = [:nickname, :sex, :birth_date, :location, :privacy_setting, :created_at]
   PERSON_CATEGORIES[:contact] = [:contact_phone, :cell_phone, :comercial_phone, :contact_information, :email, :personal_website, :jabber_id]
   PERSON_CATEGORIES[:location] = [:address, :address_reference, :zip_code, :city, :state, :district, :country, :nationality]
@@ -14,13 +14,13 @@ module ProfileHelper
   PERSON_CATEGORIES[:network] = [:friends, :communities, :enterprises]
   PERSON_CATEGORIES.merge!(COMMON_CATEGORIES)
  
-  ORGANIZATION_CATEGORIES = ActiveSupport::OrderedHash.new
+  ORGANIZATION_CATEGORIES = {}
   ORGANIZATION_CATEGORIES[:basic_information] = [:display_name, :created_at, :foundation_year, :type, :language, :members_count, :location, :address_reference, :historic_and_current_context, :admins]
   ORGANIZATION_CATEGORIES[:contact] = [:contact_person, :contact_phone, :contact_email, :organization_website, :jabber_id]
   ORGANIZATION_CATEGORIES[:economic] = [:business_name, :acronym, :economic_activity, :legal_form, :products, :activities_short_description, :management_information]
   ORGANIZATION_CATEGORIES.merge!(COMMON_CATEGORIES)
  
-  CATEGORY_MAP = ActiveSupport::OrderedHash.new
+  CATEGORY_MAP = {}
   CATEGORY_MAP[:person] = PERSON_CATEGORIES
   CATEGORY_MAP[:organization] = ORGANIZATION_CATEGORIES
  
@@ -57,7 +57,7 @@ class AddFriend &lt; Task
   end
  
   def remove_from_suggestion_list(task)
-    suggestion = task.requestor.suggested_profiles.find_by_suggestion_id task.target.id
+    suggestion = task.requestor.suggested_profiles.find_by suggestion_id: task.target.id
     suggestion.disable if suggestion
   end
 end
@@ -59,7 +59,7 @@ class AddMember &lt; Task
   end
  
   def remove_from_suggestion_list(task)
-    suggestion = task.requestor.profile_suggestions.find_by_suggestion_id task.target.id
+    suggestion = task.requestor.profile_suggestions.find_by suggestion_id: task.target.id
     suggestion.disable if suggestion
   end
  
@@ -20,7 +20,7 @@ class ApproveArticle &lt; Task
   end
  
   def article
-    Article.find_by_id data[:article_id]
+    Article.find_by id: data[:article_id]
   end
  
   def article= value
@@ -39,7 +39,7 @@ class ApproveArticle &lt; Task
   settings_items :create_link, :type => :boolean, :default => false
  
   def article_parent
-    Article.find_by_id article_parent_id.to_i
+    Article.find_by id: article_parent_id.to_i
   end
  
   def article_parent= value
@@ -18,7 +18,7 @@ class ApproveComment &lt; Task
   end
  
   def article
-    Article.find_by_id comment.source_id unless self.comment.nil?
+    Article.find_by id: comment.source_id unless self.comment.nil?
   end
  
   def article_name
@@ -74,11 +74,11 @@ class Article &lt; ActiveRecord::Base
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
   belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
  
-  has_many :comments, :class_name => 'Comment', :as => 'source', :dependent => :destroy, :order => 'created_at asc'
+  has_many :comments, -> { order 'created_at asc' }, class_name: 'Comment', as: 'source', dependent: :destroy
  
   has_many :article_followers, :dependent => :destroy
   has_many :person_followers, :class_name => 'Person', :through => :article_followers, :source => :person
-  has_many :person_followers_emails, :class_name => 'User', :through => :person_followers, :source => :user, :select => :email
+  has_many :person_followers_emails, -> { select :email }, class_name: 'User', through: :person_followers, source: :user
  
   has_many :article_categorizations, -> { where 'articles_categories.virtual = ?', false }
   has_many :categories, :through => :article_categorizations
@@ -279,7 +279,7 @@ class Article &lt; ActiveRecord::Base
   # retrives the most commented articles, sorted by the comment count (largest
   # first)
   def self.most_commented(limit)
-    paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
+    order('comments_count DESC').paginate(page: 1, per_page: limit)
   end
  
   scope :more_popular, -> { order 'hits DESC' }
@@ -288,7 +288,7 @@ class Article &lt; ActiveRecord::Base
   }
  
   def self.recent(limit = nil, extra_conditions = {}, pagination = true)
-    result = scoped({:conditions => extra_conditions}).
+    result = where(extra_conditions).
       is_public.
       relevant_as_recent.
       limit(limit).
@@ -470,7 +470,7 @@ class Article &lt; ActiveRecord::Base
  
   def rotate_translations
     unless self.translations.empty?
-      rotate = self.translations.all
+      rotate = self.translations.to_a
       root = rotate.shift
       root.update_attribute(:translation_of_id, nil)
       root.translations = rotate
@@ -752,7 +752,7 @@ class Article &lt; ActiveRecord::Base
  
   def version_license(version_number = nil)
     return license if version_number.nil?
-    profile.environment.licenses.find_by_id(get_version(version_number).license_id)
+    profile.environment.licenses.find_by(id: get_version(version_number).license_id)
   end
  
   alias :active_record_cache_key :cache_key
@@ -11,7 +11,8 @@ class Block &lt; ActiveRecord::Base
  
   delegate :environment, :to => :box, :allow_nil => true
  
-  acts_as_list :scope => :box
+  acts_as_list scope: -> block { where box_id: block.box_id }
+
   belongs_to :box
   belongs_to :mirror_block, :class_name => "Block"
   has_many :observers, :class_name => "Block", :foreign_key => "mirror_block_id"
@@ -98,8 +98,9 @@ class Blog &lt; Folder
       when :by_year
         posts.published.native_translations
           .except(:order)
-          .count(:all, :group => 'EXTRACT(YEAR FROM published_at)')
-          .sort_by {|year, count| -year.to_i}
+          .group('EXTRACT(YEAR FROM published_at)')
+          .count
+          .sort_by{ |year, count| -year.to_i }
       when :by_month
         posts.published.native_translations
           .except(:order)
 class Box < ActiveRecord::Base
+
+  acts_as_list scope: -> box { where owner_id: box.owner_id, owner_type: box.owner_type }
+
   belongs_to :owner, :polymorphic => true
-  acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\''
-  has_many :blocks, :dependent => :destroy, :order => 'position'
+  has_many :blocks, -> { order 'position' }, dependent: :destroy
  
   attr_accessible :owner
  
@@ -90,7 +90,7 @@ class Category &lt; ActiveRecord::Base
  
   def children_for_menu
     results = []
-    pending = children.where(display_in_menu: true).all
+    pending = children.where(display_in_menu: true).to_a
     while pending.present?
       cat = pending.shift
       results << cat
@@ -92,7 +92,7 @@ class Comment &lt; ActiveRecord::Base
   end
  
   def self.recent(limit = nil)
-    self.find(:all, :order => 'created_at desc, id desc', :limit => limit)
+    self.order('created_at desc, id desc').limit(limit).all
   end
  
   def notification_emails
@@ -77,7 +77,7 @@ class Community &lt; Organization
   end
  
   def each_member(offset=0)
-    while member = self.members.first(:order => :id, :offset => offset)
+    while member = self.members.order(:id).offset(offset).first
       yield member
       offset = offset + 1
     end
@@ -36,8 +36,8 @@ class Domain &lt; ActiveRecord::Base
   # finds a domain by its name. The argument <tt>name</tt> can start with
   # "www.", but it will be removed before searching. So searching for
   # 'www.example.net' is exactly the same as searching for just 'example.net'
-  def self.find_by_name(name)
-    self.where('name = ?', self.extract_domain_name(name)).first
+  def self.by_name(name)
+    self.find_by(name: self.extract_domain_name(name))
   end
  
   # turns the argument (expected to be a String) into a domain name that is
@@ -82,7 +82,7 @@ class Domain &lt; ActiveRecord::Base
     Noosfero::MultiTenancy.setup!(domainname)
     @hosting[domainname] ||=
       begin
-        domain = Domain.find_by_name(domainname)
+        domain = Domain.by_name(domainname)
         !domain.nil? && (domain.owner_type == 'Profile')
       end
   end
@@ -61,7 +61,7 @@ class Environment &lt; ActiveRecord::Base
  
   module Roles
     def self.admin(env_id)
-      Role.find_by_key_and_environment_id('environment_administrator', env_id)
+      Role.find_by(key: 'environment_administrator', environment_id: env_id)
     end
   end
  
@@ -248,7 +248,7 @@ class Environment &lt; ActiveRecord::Base
  
   acts_as_accessible
  
-  has_many :units, :order => 'position'
+  has_many :units, -> { order 'position' }
   has_many :production_costs, :as => :owner
  
   def superior_intances
@@ -714,7 +714,7 @@ class Environment &lt; ActiveRecord::Base
   def default_hostname(email_hostname = false)
     domain = 'localhost'
     unless self.domains(true).empty?
-      domain = (self.domains.find_by_is_default(true) || self.domains.find(:first, :order => 'id')).name
+      domain = (self.domains.find_by(is_default: true) || self.domains.order(:id).first).name
       domain = email_hostname ? domain : (force_www ? ('www.' + domain) : domain)
     end
     domain
@@ -808,7 +808,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def community_default_template
-    template = Community.find_by_id settings[:community_template_id]
+    template = Community.find_by id: settings[:community_template_id]
     template if template && template.is_template?
   end
  
@@ -821,7 +821,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def person_default_template
-    template = Person.find_by_id settings[:person_template_id]
+    template = Person.find_by id: settings[:person_template_id]
     template if template && template.is_template?
   end
  
@@ -834,7 +834,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def enterprise_default_template
-    template = Enterprise.find_by_id settings[:enterprise_template_id]
+    template = Enterprise.find_by id: settings[:enterprise_template_id]
     template if template && template.is_template?
   end
  
@@ -843,7 +843,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def inactive_enterprise_template
-    template = Enterprise.find_by_id settings[:inactive_enterprise_template_id]
+    template = Enterprise.find_by id: settings[:inactive_enterprise_template_id]
     template if template && template.is_template
   end
  
 class Forum < Folder
  
-  acts_as_having_posts :order => 'updated_at DESC'
+  acts_as_having_posts -> { reorder 'updated_at DESC' }
   include PostsLimit
  
   attr_accessible :has_terms_of_use, :terms_of_use, :topic_creation
@@ -12,7 +12,7 @@ class Forum &lt; Folder
  
   before_save do |forum|
     if forum.has_terms_of_use
-      last_editor = forum.profile.environment.people.find_by_id(forum.last_changed_by_id)
+      last_editor = forum.profile.environment.people.find_by(id: forum.last_changed_by_id)
       if last_editor && !forum.users_with_agreement.exists?(last_editor)
         forum.users_with_agreement << last_editor
       end
@@ -34,14 +34,14 @@ class Forum &lt; Folder
   end
  
   module TopicCreation
-    BASE = ActiveSupport::OrderedHash.new
+    BASE = {}
     BASE['users'] = _('Logged users')
  
-    PERSON = ActiveSupport::OrderedHash.new
+    PERSON = {}
     PERSON['self'] = _('Me')
     PERSON['related'] = _('Friends')
  
-    GROUP = ActiveSupport::OrderedHash.new
+    GROUP = {}
     GROUP['self'] = _('Administrators')
     GROUP['related'] = _('Members')
  
@@ -9,7 +9,7 @@ class Input &lt; ActiveRecord::Base
   validates_presence_of :product
   validates_presence_of :product_category
  
-  acts_as_list :scope => :product
+  acts_as_list scope: -> input { where product_id: input.product_id }
  
   belongs_to :unit
  
@@ -67,7 +67,7 @@ class Invitation &lt; Task
       end
  
       begin
-        user = find_by_profile_id ? Person.find_by_id(contact_to_invite).user : User.find_by_email(friend_email)
+        user = find_by_profile_id ? Person.find_by(id: contact_to_invite).user : User.find_by(email: friend_email)
       rescue
         user = nil
       end
@@ -27,7 +27,7 @@ class ModerateUserRegistration &lt; Task
   end
  
   def perform
-    user=environment.users.find_by_id(user_id)
+    user=environment.users.find_by(id: user_id)
     user.activate
   end
  
@@ -27,12 +27,13 @@ class NationalRegion &lt; ActiveRecord::Base
                    :type => NationalRegionType::CITY,
                    :state => state}];
  
-    region = NationalRegion.find(find_return,
-                                  :select => "national_regions.name as city, nr.name as state, national_regions.national_region_code",
-                                  :conditions => conditions,
-                                  :joins => "LEFT JOIN national_regions as nr ON  national_regions.parent_national_region_code = nr.national_region_code",
-                                  :limit => 10
-                                  )
+    region = NationalRegion
+      .select('national_regions.name as city, nr.name as state, national_regions.national_region_code')
+      .where(conditions)
+      .joins('LEFT JOIN national_regions as nr ON  national_regions.parent_national_region_code = nr.national_region_code')
+      .limit(10)
+    region = region.send find_return
+
     return region
   end
  
@@ -50,19 +51,19 @@ class NationalRegion &lt; ActiveRecord::Base
                   {:name => state_name,
                    :type => NationalRegionType::STATE}];
  
-    region = NationalRegion.find(find_return,
-                                  :select => "national_regions.name as state, national_regions.national_region_code",
-                                  :conditions => conditions,
-                                  :limit => 10
-                                  )
+    region = NationalRegion
+      .select('national_regions.name as state, national_regions.national_region_code')
+      .where(conditions)
+      .limit(10)
+    region = region.send find_return
+
     return region
    end
  
   def self.validate!(city, state, country)
  
-    country_region = NationalRegion.find_by_national_region_code(country,
-                                                :conditions => ["national_region_type_id = :type",
-                                                               {:type => NationalRegionType::COUNTRY}])
+    country_region = NationalRegion
+      .find_by(national_region_code: country, national_region_type_id: NationalRegionType::COUNTRY)
  
     if(country_region)
  
@@ -55,7 +55,7 @@ class Organization &lt; Profile
  
   has_many :custom_roles, :class_name => 'Role', :foreign_key => :profile_id
  
-  scope :more_popular, :order => 'members_count DESC'
+  scope :more_popular, -> { order 'members_count DESC' }
  
   validate :presence_of_required_fieds, :unless => :is_template
  
@@ -109,7 +109,8 @@ class Person &lt; Profile
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
  
-  has_many :suggested_profiles, class_name: 'ProfileSuggestion', foreign_key: :person_id, order: 'score DESC', dependent: :destroy
+  has_many :suggested_profiles, -> { order 'score DESC' },
+    class_name: 'ProfileSuggestion', foreign_key: :person_id, dependent: :destroy
   has_many :suggested_people, -> {
     where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true
   }, through: :suggested_profiles, source: :suggestion
@@ -392,7 +393,7 @@ class Person &lt; Profile
  
  
   def self.with_pending_tasks
-    Person.find(:all).select{ |person| !person.tasks.pending.empty? or person.has_organization_pending_tasks? }
+    Person.all.select{ |person| !person.tasks.pending.empty? or person.has_organization_pending_tasks? }
   end
  
   def has_organization_pending_tasks?
@@ -486,7 +487,7 @@ class Person &lt; Profile
   end
  
   def each_friend(offset=0)
-    while friend = self.friends.first(:order => :id, :offset => offset)
+    while friend = self.friends.order(:id).offset(offset).first
       yield friend
       offset = offset + 1
     end
@@ -568,7 +569,7 @@ class Person &lt; Profile
   end
  
   def remove_suggestion(profile)
-    suggestion = suggested_profiles.find_by_suggestion_id profile.id
+    suggestion = suggested_profiles.find_by suggestion_id: profile.id
     suggestion.disable if suggestion
   end
  
@@ -28,7 +28,7 @@ class Product &lt; ActiveRecord::Base
  
   belongs_to :product_category
  
-  has_many :inputs, :dependent => :destroy, :order => 'position'
+  has_many :inputs, -> { order 'position' }, dependent: :destroy
   has_many :price_details, :dependent => :destroy
   has_many :production_costs, :through => :price_details
  
@@ -50,7 +50,7 @@ class Product &lt; ActiveRecord::Base
   validates_numericality_of :price, :allow_nil => true
   validates_numericality_of :discount, :allow_nil => true
  
-  scope :more_recent, :order => "created_at DESC"
+  scope :more_recent, -> { order 'created_at DESC' }
  
   scope :from_category, -> category {
     joins(:product_category).where('categories.path LIKE ?', "%#{category.slug}%") if category
@@ -75,6 +75,8 @@ class Product &lt; ActiveRecord::Base
     ).uniq
   }
  
+  scope :recent, -> limit=nil { order('id DESC').limit(limit) }
+
   after_update :save_image
  
   def lat
@@ -128,10 +130,6 @@ class Product &lt; ActiveRecord::Base
     product_category ? product_category.name : _('Uncategorized product')
   end
  
-  def self.recent(limit = nil)
-    self.find(:all, :order => 'id desc', :limit => limit)
-  end
-
   def url
     self.profile.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => id)
   end
@@ -5,7 +5,7 @@ class ProductCategory &lt; Category
  
   attr_accessible :name, :parent, :environment
  
-  scope :unique, :select => 'DISTINCT ON (path) categories.*'
+  scope :unique, -> { select 'DISTINCT ON (path) categories.*' }
   scope :by_enterprise, -> enterprise {
     distinct.joins(:products).
     where('products.profile_id = ?', enterprise.id)
@@ -62,7 +62,7 @@ class Profile &lt; ActiveRecord::Base
     end
     private
     def self.find_role(name, env_id)
-      ::Role.find_by_key_and_environment_id("profile_#{name}", env_id)
+      ::Role.find_by key: "profile_#{name}", environment_id: env_id
     end
   end
  
@@ -115,6 +115,9 @@ class Profile &lt; ActiveRecord::Base
   }
   scope :no_templates, -> { where is_template: false }
  
+  scope :recent, -> limit=nil { order('id DESC').limit(limit) }
+
+
   # Returns a scoped object to select profiles in a given location or in a radius
   # distance from the given location center.
   # The parameter can be the `request.params` with the keys:
@@ -178,14 +181,6 @@ class Profile &lt; ActiveRecord::Base
     members(field).where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value
   end
  
-  class << self
-    def count_with_distinct(*args)
-      options = args.last || {}
-      count_without_distinct(:id, {:distinct => true}.merge(options))
-    end
-    alias_method_chain :count, :distinct
-  end
-
   def members_by_role(roles)
     Person.members_of(self).by_role(roles)
   end
@@ -203,18 +198,17 @@ class Profile &lt; ActiveRecord::Base
   scope :is_public, -> { where visible: true, public_profile: true, secret: false }
   scope :enabled, -> { where enabled: true }
  
-  # Subclasses must override this method
-  scope :more_popular
-
-  scope :more_active,  :order => 'activities_count DESC'
-  scope :more_recent, :order => "created_at DESC"
+  # subclass specific
+  scope :more_popular, -> { }
+  scope :more_active, -> { order 'activities_count DESC' }
+  scope :more_recent, -> { order "created_at DESC" }
  
   acts_as_trackable :dependent => :destroy
  
   has_many :profile_activities
   has_many :action_tracker_notifications, :foreign_key => 'profile_id'
-  has_many :tracked_notifications, :through => :action_tracker_notifications, :source => :action_tracker, :order => 'updated_at DESC'
-  has_many :scraps_received, :class_name => 'Scrap', :foreign_key => :receiver_id, :order => "updated_at DESC", :dependent => :destroy
+  has_many :tracked_notifications, -> { order 'updated_at DESC' }, through: :action_tracker_notifications, source: :action_tracker
+  has_many :scraps_received, -> { order 'updated_at DESC' }, class_name: 'Scrap', foreign_key: :receiver_id, dependent: :destroy
   belongs_to :template, :class_name => 'Profile', :foreign_key => 'template_id'
  
   has_many :comments_received, :class_name => 'Comment', :through => :articles, :source => :comments
@@ -295,7 +289,7 @@ class Profile &lt; ActiveRecord::Base
  
   has_many :tasks, :dependent => :destroy, :as => 'target'
  
-  has_many :events, :source => 'articles', :class_name => 'Event', :order => 'start_date'
+  has_many :events, -> { order 'start_date' }, source: 'articles', class_name: 'Event'
  
   def find_in_all_tasks(task_id)
     begin
@@ -559,7 +553,7 @@ class Profile &lt; ActiveRecord::Base
     #  person = Profile['username']
     #  org = Profile.['orgname']
     def [](identifier)
-      self.find_by_identifier(identifier)
+      self.find_by identifier: identifier
     end
  
   end
@@ -738,11 +732,11 @@ private :generate_url, :url_options
  
   def copy_article_tree(article, parent=nil)
     return if !copy_article?(article)
-    original_article = self.articles.find_by_name(article.name)
+    original_article = self.articles.find_by name: article.name
     if original_article
       num = 2
       new_name = original_article.name + ' ' + num.to_s
-      while self.articles.find_by_name(new_name)
+      while self.articles.find_by name: new_name
         num = num + 1
         new_name = original_article.name + ' ' + num.to_s
       end
@@ -799,10 +793,6 @@ private :generate_url, :url_options
     end
   end
  
-  def self.recent(limit = nil)
-    self.find(:all, :order => 'id desc', :limit => limit)
-  end
-
   # returns +true+ if the given +user+ can see profile information about this
   # +profile+, and +false+ otherwise.
   def display_info_to?(user)
@@ -896,7 +886,7 @@ private :generate_url, :url_options
   has_many :blogs, :source => 'articles', :class_name => 'Blog'
  
   def blog
-    self.has_blog? ? self.blogs.first(:order => 'id') : nil
+    self.has_blog? ? self.blogs.order(:id).first : nil
   end
  
   def has_blog?
@@ -906,7 +896,7 @@ private :generate_url, :url_options
   has_many :forums, :source => 'articles', :class_name => 'Forum'
  
   def forum
-    self.has_forum? ? self.forums.first(:order => 'id') : nil
+    self.has_forum? ? self.forums.order(:id).first : nil
   end
  
   def has_forum?
@@ -1134,7 +1124,7 @@ private :generate_url, :url_options
   settings_items :custom_url_redirection, type: String, default: nil
  
   def remove_from_suggestion_list(person)
-    suggestion = person.suggested_profiles.find_by_suggestion_id self.id
+    suggestion = person.suggested_profiles.find_by suggestion_id: self.id
     suggestion.disable if suggestion
   end
  
@@ -9,8 +9,12 @@ class ProfileActivity &lt; ActiveRecord::Base
   belongs_to :activity, polymorphic: true
  
   # non polymorphic versions
-  belongs_to :scrap, foreign_key: :activity_id, class_name: 'Scrap', conditions: {profile_activities: {activity_type: 'Scrap'}}
-  belongs_to :action_tracker, foreign_key: :activity_id, class_name: 'ActionTracker::Record', conditions: {profile_activities: {activity_type: 'ActionTracker::Record'}}
+  belongs_to :scrap, -> {
+    where profile_activities: {activity_type: 'Scrap'}
+  }, foreign_key: :activity_id, class_name: 'Scrap'
+  belongs_to :action_tracker, -> {
+    where profile_activities: {activity_type: 'ActionTracker::Record'}
+  }, foreign_key: :activity_id, class_name: 'ActionTracker::Record'
  
   before_validation :copy_timestamps
  
@@ -18,11 +18,11 @@ class ProfileListBlock &lt; Block
     result = nil
     public_profiles = profiles.is_public.includes([:image,:domains,:preferred_domain,:environment])
     if !prioritize_profiles_with_image
-result = public_profiles.all(:limit => get_limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = public_profiles.limit(get_limit).order('profiles.updated_at DESC').sort_by{ rand }
     elsif profiles.visible.with_image.count >= get_limit
-      result = public_profiles.with_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = public_profiles.with_image.limit(get_limit * 5).order('profiles.updated_at DESC').sort_by{ rand }
     else
-      result = public_profiles.with_image.sort_by{ rand } + public_profiles.without_image.all(:limit => get_limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
+      result = public_profiles.with_image.sort_by{ rand } + public_profiles.without_image.limit(get_limit * 5).order('profiles.updated_at DESC').sort_by{ rand }
     end
     result.slice(0..get_limit-1)
   end
@@ -120,7 +120,8 @@ class ProfileSuggestion &lt; ActiveRecord::Base
     return if suggested_profiles.blank?
  
     suggested_profiles.each do |suggested_profile|
-      suggestion = person.suggested_profiles.find_or_initialize_by_suggestion_id(suggested_profile.id)
+      suggestion   = person.suggested_profiles.find_by suggestion_id: suggested_profile.id
+      suggestion ||= person.suggested_profiles.build({suggestion_id: suggested_profile.id}, without_protection: true)
       RULES.each do |rule, options|
         begin
           value = suggested_profile.send("#{rule}_count").to_i
-# Region is a special type of category that is related to geographical issues. 
+# Region is a special type of category that is related to geographical issues.
 class Region < Category
- 
-  attr_accessible :name 
- 
+
+  attr_accessible :name
+
   has_and_belongs_to_many :validators, :class_name => 'Organization', :join_table => :region_validators
  
   require_dependency 'enterprise' # enterprises can also be validators
@@ -11,8 +11,10 @@ class Region &lt; Category
     validators.count > 0
   end
  
-  scope :with_validators, :select => 'DISTINCT ON (categories.id) *',
-    :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)'
+  scope :with_validators, -> {
+    select('DISTINCT ON (categories.id) *')
+      .joins('INNER JOIN region_validators on (region_validators.region_id = categories.id)')
+  }
  
 end
  
@@ -13,7 +13,9 @@ class Scrap &lt; ActiveRecord::Base
   has_many :replies, :class_name => 'Scrap', :foreign_key => 'scrap_id', :dependent => :destroy
   belongs_to :root, :class_name => 'Scrap', :foreign_key => 'scrap_id'
  
-  has_many :profile_activities, foreign_key: :activity_id, conditions: {profile_activities: {activity_type: 'Scrap'}}, dependent: :destroy
+  has_many :profile_activities, -> {
+    where profile_activities: {activity_type: 'Scrap'}
+  }, foreign_key: :activity_id, dependent: :destroy
  
   after_create :create_activity
   after_update :update_activity
@@ -25,7 +25,7 @@ class SearchTerm &lt; ActiveRecord::Base
   # Therefore the score is 97. Them we sum every score to get the total score
   # for a search term.
   def self.occurrences_scores
-    ActiveSupport::OrderedHash[*ActiveRecord::Base.connection.execute(
+    Hash[*ActiveRecord::Base.connection.execute(
       joins(:occurrences).
       select("search_terms.id, sum(#{SearchTermOccurrence::EXPIRATION_TIME.to_i} - extract(epoch from (now() - search_term_occurrences.created_at))) as value").
       where("search_term_occurrences.created_at > ?", DateTime.now - SearchTermOccurrence::EXPIRATION_TIME).
@@ -137,9 +137,9 @@ class Task &lt; ActiveRecord::Base
       group = klass.to_s.downcase.pluralize
       id = attribute.to_s + "_id"
       if environment.respond_to?(group)
-        attrb = value || environment.send(group).find_by_id(record.send(id))
+        attrb = value || environment.send(group).find_by(id: record.send(id))
       else
-        attrb = value || klass.find_by_id(record.send(id))
+        attrb = value || klass.find_by(id: record.send(id))
       end
       if attrb.respond_to?(klass.to_s.downcase + "?")
         unless attrb.send(klass.to_s.downcase + "?")
 class Unit < ActiveRecord::Base
  
+  acts_as_list scope: -> unit { where environment_id: unit.environment_id }
+
   attr_accessible :name, :singular, :plural, :environment
  
   validates_presence_of :singular
   validates_presence_of :plural
  
   belongs_to :environment
+
   validates_presence_of :environment_id
-  acts_as_list :scope => :environment
+  validates_presence_of :singular
+  validates_presence_of :plural
  
   def name
     self.singular
@@ -25,7 +25,7 @@ class User &lt; ActiveRecord::Base
   end
  
   def self.[](login)
-    self.find_by_login(login)
+    self.find_by login: login
   end
  
   # FIXME ugly workaround
 <div id="user">
-  <% user = (session[:user] && User.find_by_id(session[:user])) || nil %>
+  <% user = (session[:user] && User.find_by(id: session[:user])) || nil %>
   <% if user.present? %>
     <% user = user.person %>
     <span class='logged-in'>
@@ -6,7 +6,7 @@
       </div>
       <span class='profile-details'>
         <strong><%= group.name %></strong><br/>
-        <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
+        <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by(resource_id: group.id) %>
         <%= _('Type: %s') % _(group.class.identification) %> <br/>
         <%= _('Description: %s') % group.description  + '<br/>' if group.community? %>
         <%= _('Members: %s') % group.members_count.to_s %> <br/>
@@ -9,7 +9,7 @@
       <li><strong><%=_('Email')%></strong>: <%=task.email%> </li>
       <li><strong><%=_('Source')%></strong>: <%=task.article_object.source_name%> </li>
       <li><strong><%=_('Source URL')%></strong>: <%=task.article_object.source%> </li>
-      <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_object.parent_id))?a.name : '<em>' + s_('Folder|none') + '</em>'%> </li>
+      <li><strong><%=_('Folder')%></strong>: <%=if (a = Article.find_by(id: task.article_object.parent_id)) then a.name else '<em>' + s_('Folder|none') + '</em>' end%> </li>
       <li><strong><%=_('Lead')%></strong>: <%=task.article_object.abstract.blank? ? '<em>' + s_('Abstract|empty') + '</em>' : task.article_object.abstract%> </li>
       <li><strong><%=_('Body')%></strong>:
       <div class='suggest-article-body'>
 class DestroyOrganizationAndPersonInfos < ActiveRecord::Migration
   def self.up
-    Person.find(:all).each do |i|
+    Person.find_each do |i|
       info = ActiveRecord::Base.connection.select_one("select * from person_infos where person_id = #{i.id}")
       i.name = info["name"] unless info["name"].nil?
       i.address = info["address"] unless info["address"].nil?
@@ -11,7 +11,7 @@ class DestroyOrganizationAndPersonInfos &lt; ActiveRecord::Migration
     end
     drop_table :person_infos
  
-    Organization.find(:all).each do |i|
+    Organization.find_each do |i|
       info = ActiveRecord::Base.connection.select_one("select * from organization_infos where organization_id = #{i.id}")
       [ "contact_person", "contact_email", "acronym", "foundation_year", "legal_form", "economic_activity", "management_information", "validated" ].each do |field|
         i.send("#{field}=", info[field])
@@ -2,13 +2,13 @@ class AddVirtualFlagToCategorizations &lt; ActiveRecord::Migration
   def self.up
     add_column :articles_categories, :virtual, :boolean, :default => false
     execute('update articles_categories set virtual = (1!=1)')
-    Article.find(:all).each do |article|
+    Article.find_each do |article|
       article.category_ids = article.categories.map(&:id)
     end
  
     add_column :categories_profiles, :virtual, :boolean, :default => false
     execute('update categories_profiles set virtual = (1!=1)')
-    Profile.find(:all).each do |profile|
+    Profile.find_each do |profile|
       profile.category_ids = profile.categories.map(&:id)
     end
   end
 class CreateProductCategorizations < ActiveRecord::Migration
   def self.up
-    
+
     create_table :product_categorizations do |t|
       t.integer :category_id
       t.integer :product_id
@@ -11,7 +11,7 @@ class CreateProductCategorizations &lt; ActiveRecord::Migration
  
     total = Product.count.to_f
     percent = 0
-    Product.find(:all).each_with_index do |p,i|
+    Product.find_each_with_index do |p,i|
       if p.product_category
         ProductCategorization.add_category_to_product(p.product_category, p)
       end
 class CreateTemplates < ActiveRecord::Migration
   def self.up
-    Environment.find(:all).each do |env|
+    Environment.find_each do |env|
       if env.person_template.nil? && env.community_template.nil? && env.enterprise_template.nil?
         env.create_templates
       end
@@ -12,13 +12,13 @@ class AddEnviromentIdToRole &lt; ActiveRecord::Migration
   def self.up
     add_column :roles, :environment_id, :integer
  
-    roles = Role.find(:all)
-    Environment.find(:all).each do |env|
+    roles = Role.all
+    Environment.find_each do |env|
       roles.each do |role|
         re = RoleWithEnvironment.new(role.attributes)
         re.environment = env
         re.save
-        RoleAssignment.find_all_by_role_id(role.id).select{|ra| ra.resource && (ra.resource.kind_of?(Profile) ? ra.resource.environment_id : ra.resource.id) == env.id }.each do |ra|
+        RoleAssignment.where(role_id: role.id).select{|ra| ra.resource && (ra.resource.kind_of?(Profile) ? ra.resource.environment_id : ra.resource.id) == env.id }.each do |ra|
           ra.role_id = re.id
           ra.save
         end
@@ -30,14 +30,14 @@ class AddEnviromentIdToRole &lt; ActiveRecord::Migration
   def self.down
     roles_by_name = {}
     roles_by_key = {}
-    roles_with_environment = RoleWithEnvironment.find(:all)
+    roles_with_environment = RoleWithEnvironment.all
     roles_with_environment.each do |re|
       if re.key
         role = roles_by_name[re.key] || roles_by_key[re.name] || Role.create(re.attributes)
         roles_by_name[role.name] ||= roles_by_key[role.key] ||= role
       end
       role = roles_by_name[re.name] ||= Role.create(re.attributes) unless role
-      RoleAssignment.find_all_by_role_id(re.id).each do |ra|
+      RoleAssignment.where(role_id: re.id).each do |ra|
         ra.role_id = role.id
         ra.save
       end
 class StripHtmlFromTagNames < ActiveRecord::Migration
   def self.up
-    Tag.all(:conditions => "name LIKE '%<%' OR name LIKE '%>%'").each do |tag|
+    Tag.where("name LIKE '%<%' OR name LIKE '%>%'").find_each do |tag|
       tag.name = tag.name.gsub(/[<>]/, '')
       tag.save
     end
 class SetProductCategoryIdToProducts < ActiveRecord::Migration
   def self.up
-    Product.all(:conditions => { :product_category_id => nil }).each do |product|
+    Product.where(product_category_id: nil).find_each do |product|
       next if product.enterprise.nil?
       product.update_attribute(:product_category_id, ProductCategory.top_level_for(product.enterprise.environment).first.id)
     end
 class SetOwnerEnvironmentToEnterprisesEnvironment < ActiveRecord::Migration
   def self.up
-    CreateEnterprise.find_all_by_status(3).each do |t|
-      if(Enterprise.find_by_identifier(t.data[:identifier]))
+    CreateEnterprise.where(status: 3).each do |t|
+      if(Enterprise.find_by(identifier: t.data[:identifier]))
         update("UPDATE profiles SET environment_id = '%s' WHERE identifier = '%s'" %
               [Person.find(t.requestor_id).environment.id, t.data[:identifier]])
       end
 class DontAcceptNullToEnvironmentTheme < ActiveRecord::Migration
   def self.up
-    Environment.all(:conditions => {:theme => nil}).each do |environment|
+    Environment.where(theme: nil).find_each do |environment|
       environment.update_attribute(:theme, 'default')
     end
  
@@ -10,7 +10,7 @@ class DontAcceptNullToEnvironmentTheme &lt; ActiveRecord::Migration
   def self.down
     change_column :environments, :theme, :string, :default => nil, :null => true
  
-    Environment.all(:conditions => {:theme => 'default'}).each do |environment|
+    Environment.where(theme: 'default').find_each do |environment|
       environment.update_attribute(:theme, nil)
     end
   end
@@ -2,7 +2,7 @@ class ChangeActionTrackerRecord &lt; ActiveRecord::Migration
   def self.up
     rename_column(:action_tracker, :dispatcher_type, :target_type)
     rename_column(:action_tracker, :dispatcher_id, :target_id)
-    ActionTracker::Record.update_all("verb='create_article'", {:verb => 'publish_article_in_community'})
+    ActionTracker:Record.where(verb: 'publish_article_in_community').update_all verb: 'create_article'
   end
  
   def self.down
@@ -2,7 +2,7 @@ class RemoveUselessTrackedActions &lt; ActiveRecord::Migration
   def self.up
     select_all("SELECT id FROM action_tracker").each do |tracker|
       verbs = ['update_article', 'remove_article', 'leave_comment', 'leave_community', 'remove_member_in_community']
-      activity = ActionTracker::Record.find_by_id(tracker['id'])
+      activity = ActionTracker::Record.find_by(id: tracker['id'])
       if activity
         if (activity.updated_at.to_time < Time.now.months_ago(3)) || verbs.include?(activity.verb)
           activity.destroy
@@ -4,7 +4,7 @@ class AdaptCreateArticlesActivity &lt; ActiveRecord::Migration
   # Creating new activities only to recent articles (not grouping)
   def self.up
     select_all("SELECT id FROM action_tracker WHERE verb = 'create_article'").each do |tracker|
-      activity = ActionTracker::Record.find_by_id(tracker['id'])
+      activity = ActionTracker::Record.find_by(id: tracker['id'])
       if activity
         activity.destroy
       end
@@ -14,14 +14,14 @@ class CreateDefaultLicenses &lt; ActiveRecord::Migration
  
   def self.down
     licenses = []
-    licenses += License.find(:all, :conditions => {:name => 'CC (by)'})
-    licenses += License.find(:all, :conditions => {:name => 'CC (by-nd)'})
-    licenses += License.find(:all, :conditions => {:name => 'CC (by-sa)'})
-    licenses += License.find(:all, :conditions => {:name => 'CC (by-nc)'})
-    licenses += License.find(:all, :conditions => {:name => 'CC (by-nc-nd)'})
-    licenses += License.find(:all, :conditions => {:name => 'CC (by-nc-sa)'})
-    licenses += License.find(:all, :conditions => {:name => 'Free Art'})
-    licenses += License.find(:all, :conditions => {:name => 'GNU FDL'})
+    licenses += License.where name: 'CC (by)'
+    licenses += License.where name: 'CC (by-nd)'
+    licenses += License.where name: 'CC (by-sa)'
+    licenses += License.where name: 'CC (by-nc)'
+    licenses += License.where name: 'CC (by-nc-nd)'
+    licenses += License.where name: 'CC (by-nc-sa)'
+    licenses += License.where name: 'Free Art'
+    licenses += License.where name: 'GNU FDL'
     licenses.compact.map(&:destroy)
   end
 end
 class RemoveActionTrackerWithTargetNil < ActiveRecord::Migration
   def self.up
     select_all("SELECT id FROM action_tracker").each do |tracker|
-      activity = ActionTracker::Record.find_by_id(tracker['id'])
+      activity = ActionTracker::Record.find_by(id: tracker['id'])
       if activity && activity.target.nil?
         activity.destroy
       end
@@ -2,8 +2,8 @@ class MoveTitleVirtualFieldToNameInUploadedFile &lt; ActiveRecord::Migration
   def self.up
     UploadedFile.find_each do |uploaded_file|
       uploaded_file.name = uploaded_file.setting.delete(:title)
-      UploadedFile.update_all({:setting => uploaded_file.setting.to_yaml, :name => uploaded_file.name}, 
-                              "id = #{uploaded_file.id}")
+      UploadedFile.where(id: uploaded_file.id).update_all setting: uploaded_file.setting.to_yaml, name: uploaded_file.name
+
     end
   end
  
@@ -8,7 +8,7 @@ class ChangeCategoryDisplayColorToString &lt; ActiveRecord::Migration
     end
  
     COLORS.each_with_index do |color, i|
-      Category.update_all({:display_color_tmp => color}, {:display_color => i+1})
+      Category.where(display_color: i+1).update_all display_color_tmp: color
     end
  
     change_table :categories do |t|
@@ -25,7 +25,7 @@ class ChangeCategoryDisplayColorToString &lt; ActiveRecord::Migration
     end
  
     COLORS.each_with_index do |color, i|
-      Category.update_all({:display_color_tmp => i+1}, {:display_color => color})
+      Category.where(display_color: color).update_all display_color_tmp: i+1
     end
  
     change_table :categories do |t|
 class AddCustomRolesPermissionToAdminRoles < ActiveRecord::Migration
   def self.up
-    environment_admin = Role.find_by_key("environment_administrator")
-    profile_admin = Role.find_by_key("profile_admin")
+    environment_admin = Role.find_by(key: "environment_administrator")
+    profile_admin = Role.find_by(key: "profile_admin")
     environment_admin.permissions.append("manage_custom_roles")
     profile_admin.permissions.append("manage_custom_roles")
     environment_admin.save!
     profile_admin.save!
   end
   def self.down
-    environment_admin = Role.find_by_key("environment_administrator")
-    profile_admin = Role.find_by_key("profile_admin")
+    environment_admin = Role.find_by(key: "environment_administrator")
+    profile_admin = Role.find_by(key: "profile_admin")
     environment_admin.permissions.delete("manage_custom_roles")
     profile_admin.permissions.delete("manage_custom_roles")
     environment_admin.save!
@@ -45,7 +45,6 @@ Depends: adduser,
          ruby-actionpack-action-caching,
          ruby-actionpack-page-caching,
          ruby-activerecord-session-store,
-         ruby-activerecord-deprecated-finders,
          ruby-acts-as-taggable-on (>= 3.5),
          ruby-api-pagination,
          ruby-daemons,
 Given /^I fill in "([^\"]*)" with code of "([^\"]*)"$/ do |field, enterprise|
-  enterprise = Enterprise.find_by_name(enterprise)
+  enterprise = Enterprise.find_by(name: enterprise)
   value = EnterpriseActivation.all.select { |task| task.enterprise == enterprise}.first.code
   fill_in(field, :with => value)
 end
  
 Given /^enterprise "([^\"]*)" should be enabled$/ do |enterprise|
-  Enterprise.find_by_name(enterprise).enabled?.should be_truthy
+  Enterprise.find_by(name: enterprise).enabled?.should be_truthy
 end
  
 Given /^"([^\"]*)" is the active enterprise template$/ do |enterprise|
-  template = Enterprise.find_by_name(enterprise)
+  template = Enterprise.find_by(name: enterprise)
   template.boxes.destroy_all
   template.boxes << Box.new
   template.layout_template = 'leftbar'
@@ -24,8 +24,8 @@ Given /^&quot;([^\&quot;]*)&quot; is the active enterprise template$/ do |enterprise|
 end
  
 Given /^"([^\"]*)" has "([^\"]*)" as template$/ do |ent, templ|
-  template = Enterprise.find_by_name(templ)
-  enterprise = Enterprise.find_by_name(ent)
+  template = Enterprise.find_by(name: templ)
+  enterprise = Enterprise.find_by(name: ent)
   (template.boxes.size == enterprise.boxes.size).should be_truthy
   (template.layout_template == enterprise.layout_template).should be_truthy
   (template.theme == enterprise.theme).should be_truthy
@@ -34,8 +34,8 @@ Given /^&quot;([^\&quot;]*)&quot; has &quot;([^\&quot;]*)&quot; as template$/ do |ent, templ|
 end
  
 Given /^"([^\"]*)" doesnt have "([^\"]*)" as template$/ do |ent, templ|
-  template = Enterprise.find_by_name(templ)
-  enterprise = Enterprise.find_by_name(ent)
+  template = Enterprise.find_by(name: templ)
+  enterprise = Enterprise.find_by(name: ent)
   (template.boxes.size == enterprise.boxes.size).should be_falsey
   (template.layout_template == enterprise.layout_template).should be_falsey
   (template.theme == enterprise.theme).should be_falsey
@@ -44,16 +44,16 @@ Given /^&quot;([^\&quot;]*)&quot; doesnt have &quot;([^\&quot;]*)&quot; as template$/ do |ent, templ|
 end
  
 Given /^enterprise "([^\"]*)" is enabled$/ do |enterprise|
-  Enterprise.find_by_name(enterprise).update_attribute(:enabled,true)
-  Enterprise.find_by_name(enterprise).enabled?.should be_truthy
+  Enterprise.find_by(name: enterprise).update_attribute(:enabled,true)
+  Enterprise.find_by(name: enterprise).enabled?.should be_truthy
 end
  
 Given /^enterprise "([^\"]*)" should be blocked$/ do |enterprise|
-  Enterprise.find_by_name(enterprise).blocked?.should be_truthy
+  Enterprise.find_by(name: enterprise).blocked?.should be_truthy
 end
  
 Given /^enterprise "([^\"]*)" should not be blocked$/ do |enterprise|
-  Enterprise.find_by_name(enterprise).blocked?.should_not be_truthy
+  Enterprise.find_by(name: enterprise).blocked?.should_not be_truthy
 end
  
 Given /^enterprise template must be replaced after enable$/ do
@@ -10,11 +10,11 @@ When /^I create a content of type &quot;([^\&quot;]*)&quot; with the following data$/ do |conte
 end
  
 And /^I add to "([^\"]*)" the following exception "([^\"]*)"$/ do |article_name, user_exception|
-  article = Article.find_by_name(article_name)
+  article = Article.find_by(name: article_name)
   community = article.profile
   raise "The article profile is not a community." unless community.class == Community
  
-  my_user = community.members.find_by_name(user_exception)
+  my_user = community.members.find_by(name: user_exception)
   raise "Could not find #{user_exception} in #{community.name} community." if my_user.nil?
  
   article.article_privacy_exceptions << my_user
@@ -33,7 +33,7 @@ Given /^I reject community &quot;(.+)&quot;$/ do |community|
 end
  
 Then /^I should see "([^\"]*)"'s creation date$/ do |community|
-  com = Community.find_by_name community
+  com = Community.find_by name: community
   text = "Created at: #{show_date(com.created_at)}"
   has_content?(text)
 end
 Given /^I invite email "(.+)" to join community "(.+)"$/ do |email, community|
-  identifier = Community.find_by_name(community).identifier
+  identifier = Community.find_by(name: community).identifier
   visit("/myprofile/#{identifier}/profile_members")
   first(:link, "Invite people to join").click
   choose("Email")
@@ -3,7 +3,7 @@ Given /^the following users?$/ do |table|
   table.hashes.each do |item|
     person_data = item.dup
     person_data.delete("login")
-    category = Category.find_by_slug person_data.delete("category")
+    category = Category.find_by slug: person_data.delete("category")
     email = item[:email] || item[:login] + "@example.com"
     user = User.create!(:login => item[:login], :password => '123456', :password_confirmation => '123456', :email => email, :person_data => person_data)
     user.activate
@@ -15,12 +15,12 @@ Given /^the following users?$/ do |table|
 end
  
 Given /^"(.+)" is (invisible|visible)$/ do |user, visibility|
-  User.find_by_login(user).person.update({:visible => (visibility == 'visible')}, :without_protection => true)
+  User.find_by(login: user).person.update({visible: (visibility == 'visible')}, without_protection: true)
 end
  
 Given /^"(.+)" is (online|offline|busy) in chat$/ do |user, status|
   status = {'online' => 'chat', 'offline' => '', 'busy' => 'dnd'}[status]
-  User.find_by_login(user).update(:chat_status => status, :chat_status_at => DateTime.now)
+  User.find_by(login: user).update(:chat_status => status, :chat_status_at => DateTime.now)
 end
  
 Given /^the following (community|communities|enterprises?|organizations?)$/ do |kind,table|
@@ -40,11 +40,11 @@ Given /^the following (community|communities|enterprises?|organizations?)$/ do |
       d.save(:validate => false)
     end
     if city
-      c = City.find_by_name city
+      c = City.find_by name: city
       organization.region = c
     end
     if category && !category.blank?
-      cat = Category.find_by_slug category
+      cat = Category.find_by slug: category
       ProfileCategorization.add_category_to_profile(cat, organization)
     end
     if img_name
@@ -56,15 +56,15 @@ Given /^the following (community|communities|enterprises?|organizations?)$/ do |
 end
  
 Given /^"([^\"]*)" is associated with "([^\"]*)"$/ do |enterprise, bsc|
-  enterprise = Enterprise.find_by_name(enterprise) || Enterprise[enterprise]
-  bsc = BscPlugin::Bsc.find_by_name(bsc) || BscPlugin::Bsc[bsc]
+  enterprise = Enterprise.find_by(name: enterprise) || Enterprise[enterprise]
+  bsc = BscPlugin::Bsc.find_by(name: bsc) || BscPlugin::Bsc[bsc]
  
   bsc.enterprises << enterprise
 end
  
 Then /^"([^\"]*)" should be associated with "([^\"]*)"$/ do |enterprise, bsc|
-  enterprise = Enterprise.find_by_name(enterprise) || Enterprise[enterprise]
-  bsc = BscPlugin::Bsc.find_by_name(bsc) || BscPlugin::Bsc[bsc]
+  enterprise = Enterprise.find_by(name: enterprise) || Enterprise[enterprise]
+  bsc = BscPlugin::Bsc.find_by(name: bsc) || BscPlugin::Bsc[bsc]
  
   bsc.enterprises.should include(enterprise)
 end
@@ -121,7 +121,7 @@ Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded f
     translation_of_id = nil
     if item["translation_of"]
       if item["translation_of"] != "nil"
-        article = owner.articles.find_by_name(item["translation_of"])
+        article = owner.articles.find_by(name: item["translation_of"])
         translation_of_id = article.id if article
       end
       item.delete("translation_of")
@@ -135,10 +135,10 @@ Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded f
     end
     result = klass.new(item)
     if !parent.blank?
-      result.parent = Article.find_by_name(parent)
+      result.parent = Article.find_by(name: parent)
     end
     if category
-      cat = Category.find_by_slug category
+      cat = Category.find_by slug: category
       if cat
         result.add_category(cat)
       end
@@ -157,7 +157,7 @@ Given /^the following files$/ do |table|
     file = "/files/#{item[:file]}"
     article = UploadedFile.new(:profile => owner, :uploaded_data => fixture_file_upload(file, item[:mime]))
     if item[:parent]
-      article.parent = Article.find_by_slug(item[:parent])
+      article.parent = Article.find_by slug: item[:parent]
     end
     article.save!
     if item[:homepage]
@@ -180,7 +180,7 @@ Given /^the following articles? with images?$/ do |table|
     img_tag += "/>"
     article = TinyMceArticle.new(:profile => owner, :name => item[:name], :body => img_tag)
     if item[:parent]
-      article.parent = Article.find_by_slug(item[:parent])
+      article.parent = Article.find_by slug: item[:parent]
     end
     article.save!
     if item[:homepage]
@@ -194,14 +194,14 @@ Given /^the following products?$/ do |table|
   table.hashes.each do |item|
     data = item.dup
     owner = Enterprise[data.delete("owner")]
-    category = Category.find_by_slug(data.delete("category").to_slug)
+    category = Category.find_by slug: data.delete("category").to_slug
     data.merge!(:enterprise => owner, :product_category => category)
     if data[:img]
       img = Image.create!(:uploaded_data => fixture_file_upload('/files/'+data.delete("img")+'.png', 'image/png'))
       data.merge!(:image_id => img.id)
     end
     if data[:qualifier]
-      qualifier = Qualifier.find_by_name(data.delete("qualifier"))
+      qualifier = Qualifier.find_by name: data.delete("qualifier")
       data.merge!(:qualifiers => [qualifier])
     end
     product = Product.create!(data, :without_protection => true)
@@ -211,9 +211,9 @@ end
 Given /^the following inputs?$/ do |table|
   table.hashes.each do |item|
     data = item.dup
-    product = Product.find_by_name(data.delete("product"))
-    category = Category.find_by_slug(data.delete("category").to_slug)
-    unit = Unit.find_by_singular(data.delete("unit"))
+    product = Product.find_by name: data.delete("product")
+    category = Category.find_by slug: data.delete("category").to_slug
+    unit = Unit.find_by singular: data.delete("unit")
     solidary = data.delete("solidary")
     input = Input.create!(data.merge(:product => product, :product_category => category, :unit => unit,
                                      :is_from_solidarity_economy => solidary), :without_protection => true)
@@ -224,7 +224,7 @@ end
 Given /^the following states$/ do |table|
   table.hashes.each do |item|
     data = item.dup
-    if validator = Enterprise.find_by_name(data.delete("validator_name"))
+    if validator = Enterprise.find_by(name: data.delete("validator_name"))
       State.create!(data.merge(:environment => Environment.default, :validators => [validator]), :without_protection => true)
     else
       r = State.create!(data.merge(:environment => Environment.default))
@@ -235,7 +235,7 @@ end
 Given /^the following validation info$/ do |table|
   table.hashes.each do |item|
     data = item.dup
-    organization = Organization.find_by_name(data.delete("organization_name"))
+    organization = Organization.find_by name: data.delete("organization_name")
     ValidationInfo.create!(data.merge(:organization => organization))
   end
 end
@@ -245,7 +245,7 @@ Given /^the following (product_categories|product_category|category|categories|r
   table.hashes.each do |row|
     parent = row.delete("parent")
     if !parent.blank?
-      parent = Category.find_by_slug(parent.to_slug)
+      parent = Category.find_by slug: parent.to_slug
       row.merge!({:parent_id => parent.id})
     end
     category = klass.create!({:environment => Environment.default}.merge(row))
@@ -263,7 +263,7 @@ Given /^the following certifiers$/ do |table|
     row = row.dup
     qualifiers_list = row.delete("qualifiers")
     if qualifiers_list
-      row["qualifiers"] = qualifiers_list.split(', ').map{|i| Qualifier.find_by_name(i)}
+      row["qualifiers"] = qualifiers_list.split(', ').map{|i| Qualifier.find_by name: i }
     end
     Certifier.create!(row.merge(:environment_id => 1), :without_protection => true)
   end
@@ -279,8 +279,8 @@ end
  
 Given /^the following price details?$/ do |table|
   table.hashes.map{|item| item.dup}.each do |item|
-    product = Product.find_by_name item.delete('product')
-    production_cost = ProductionCost.find_by_name item.delete('production_cost')
+    product = Product.find_by name: item.delete('product')
+    production_cost = ProductionCost.find_by name: item.delete('production_cost')
     product.price_details.create!(item.merge(:production_cost => production_cost))
   end
 end
@@ -297,7 +297,7 @@ Given /^I am logged in as &quot;(.+)&quot;$/ do |username|
 end
  
 Given /^"([^"]*)" is environment admin$/ do |person|
-  user = Profile.find_by_name(person)
+  user = Profile.find_by name: person
   e = Environment.default
  
   e.add_admin(user)
@@ -337,41 +337,41 @@ Given /^&quot;(.+)&quot; is a member of &quot;(.+)&quot;$/ do |person, profile|
 end
  
 Then /^"(.+)" should be a member of "(.+)"$/ do |person,profile|
-  Profile.find_by_name(profile).members.should include(Person.find_by_name(person))
+  Profile.find_by(name: profile).members.should include(Person.find_by(name: person))
 end
  
 When /^"(.*)" is accepted on community "(.*)"$/ do |person, community|
-  person = Person.find_by_name(person)
-  community = Community.find_by_name(community)
+  person = Person.find_by name: person
+  community = Community.find_by name: community
   community.affiliate(person, Profile::Roles.member(community.environment.id))
 end
  
 Given /^"(.+)" is admin of "(.+)"$/ do |person, organization|
-  org = Profile.find_by_name(organization)
-  user = Profile.find_by_name(person)
+  org = Profile.find_by name: organization
+  user = Profile.find_by name: person
   org.add_admin(user)
 end
  
 Given /^"(.+)" is moderator of "(.+)"$/ do |person, organization|
-  org = Profile.find_by_name(organization)
-  user = Profile.find_by_name(person)
+  org = Profile.find_by name: organization
+  user = Profile.find_by name: person
   org.add_moderator(user)
 end
  
 Then /^"(.+)" should be admin of "(.+)"$/ do |person, organization|
-  org = Organization.find_by_name(organization)
-  user = Person.find_by_name(person)
+  org = Organization.find_by name: organization
+  user = Person.find_by name: person
   org.admins.should include(user)
 end
  
 Then /^"(.+)" should be moderator of "(.+)"$/ do |person,profile|
-  profile = Profile.find_by_name(profile)
-  person = Person.find_by_name(person)
+  profile = Profile.find_by name: profile
+  person = Person.find_by name: person
   profile.members_by_role(Profile::Roles.moderator(profile.environment.id)).should include(person)
 end
  
 Given /^"([^\"]*)" has no articles$/ do |profile|
-  (Profile[profile] || Profile.find_by_name(profile)).articles.delete_all
+  (Profile[profile] || Profile.find_by(name: profile)).articles.delete_all
 end
  
 Given /^the following (\w+) fields are (\w+) fields$/ do |klass, status, table|
@@ -393,7 +393,7 @@ Given /^the following (\w+) fields are (\w+) fields$/ do |klass, status, table|
 end
  
 Then /^"([^\"]*)" should have the following data$/ do |id, table|
-  profile = Profile.find_by_identifier(id)
+  profile = Profile.find_by identifier: id
   expected = table.hashes.first
   data = expected.keys.inject({}) { |hash, key| hash[key] = profile.send(key).to_s; hash }
   data.should == expected
@@ -408,12 +408,12 @@ Given /^&quot;(.+)&quot; is friend of &quot;(.+)&quot;$/ do |person, friend|
 end
  
 Given /^enterprise "([^\"]*)" is blocked$/ do |enterprise_name|
-  enterprise = Enterprise.find_by_name(enterprise_name)
+  enterprise = Enterprise.find_by name: enterprise_name
   enterprise.block
 end
  
 Given /^enterprise "([^\"]*)" is disabled$/ do |enterprise_name|
-  enterprise = Enterprise.find_by_name(enterprise_name)
+  enterprise = Enterprise.find_by name: enterprise_name
   enterprise.enabled = false
   enterprise.save
 end
@@ -470,7 +470,7 @@ Given /^the profile &quot;(.+)&quot; has no blocks$/ do |profile|
 end
  
 Given /^the articles of "(.+)" are moderated$/ do |organization|
-  organization = Organization.find_by_name(organization)
+  organization = Organization.find_by name: organization
   organization.moderated_articles = true
   organization.save
 end
@@ -478,7 +478,7 @@ end
 Given /^the following comments?$/ do |table|
   table.hashes.each do |item|
     data = item.dup
-    article = Article.find_by_name(data.delete("article"))
+    article = Article.find_by name: data.delete("article")
     author = data.delete("author")
     comment = article.comments.build(data)
     if author
@@ -489,7 +489,7 @@ Given /^the following comments?$/ do |table|
 end
  
 Given /^the community "(.+)" is closed$/ do |community|
-  community = Community.find_by_name(community)
+  community = Community.find_by name: community
   community.closed = true
   community.save
 end
@@ -510,8 +510,8 @@ Given /^the following units?$/ do |table|
 end
  
 Given /^"([^\"]*)" asked to join "([^\"]*)"$/ do |person, organization|
-  person = Person.find_by_name(person)
-  organization = Organization.find_by_name(organization)
+  person = Person.find_by name: person
+  organization = Organization.find_by name: organization
   AddMember.create!(:person => person, :organization => organization)
 end
  
@@ -531,7 +531,7 @@ Given /^the environment domain is &quot;([^\&quot;]*)&quot;$/ do |domain|
 end
  
 When /^([^\']*)'s account is activated$/ do |person|
-  Person.find_by_name(person).user.activate
+  Person.find_by(name: person).user.activate
 end
  
 Then /^I should receive an e-mail on (.*)$/ do |address|
@@ -547,13 +547,13 @@ end
  
 Then /^there should be an? (.+) named "([^\"]*)"$/ do |klass_name, profile_name|
   klass = klass_name.camelize.constantize
-  klass.find_by_name(profile_name).nil?.should be_falsey
+  klass.find_by(name: profile_name).nil?.should be_falsey
 end
  
 Then /^"([^\"]*)" profile should exist$/ do |profile_selector|
   profile = nil
   begin
-    profile = Profile.find_by_name(profile_selector)
+    profile = Profile.find_by(name: profile_selector)
     profile.nil?.should be_falsey
   rescue
     profile.nil?.should be_falsey
@@ -563,7 +563,7 @@ end
 Then /^"([^\"]*)" profile should not exist$/ do |profile_selector|
   profile = nil
   begin
-    profile = Profile.find_by_name(profile_selector)
+    profile = Profile.find_by(name: profile_selector)
     profile.nil?.should be_truthy
   rescue
     profile.nil?.should be_truthy
@@ -575,7 +575,7 @@ When &#39;I log off&#39; do
 end
  
 Then /^I should be taken to "([^\"]*)" product page$/ do |product_name|
-  product = Product.find_by_name(product_name)
+  product = Product.find_by(name: product_name)
   path = url_for(product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product, :only_path => true))
   if response.class.to_s == 'Webrat::SeleniumResponse'
     URI.parse(response.selenium.get_location).path.should == path_to(path)
@@ -589,7 +589,7 @@ Given /^the following enterprise homepages?$/ do |table|
   table.hashes.each do |item|
     data = item.dup
     home = EnterpriseHomepage.new(:name => data[:name])
-    ent = Enterprise.find_by_identifier(data[:enterprise])
+    ent = Enterprise.find_by(identifier: data[:enterprise])
     ent.articles << home
   end
 end
@@ -609,7 +609,7 @@ end
  
 Given /^the following cities$/ do |table|
   table.hashes.each do |item|
-    state = State.find_by_acronym item[:state]
+    state = State.find_by acronym: item[:state]
     if !state
       state = State.create!(:name => item[:state], :acronym => item[:state], :environment_id => Environment.default.id)
     end
@@ -626,7 +626,7 @@ end
  
 Given /^the following tags$/ do |table|
   table.hashes.each do |item|
-    article = Article.find_by_name item[:article]
+    article = Article.find_by name: item[:article]
     article.tag_list.add item[:name]
     article.save!
   end
@@ -639,7 +639,7 @@ When /^I search ([^\&quot;]*) for &quot;([^\&quot;]*)&quot;$/ do |asset, query|
 end
  
 Then /^I should see ([^\"]*)'s product image$/ do |product_name|
-  p = Product.find_by_name product_name
+  p = Product.find_by name: product_name
   path = url_for(p.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => p))
  
   with_scope('.zoomable-image') do
@@ -648,7 +648,7 @@ Then /^I should see ([^\&quot;]*)&#39;s product image$/ do |product_name|
 end
  
 Then /^I should not see ([^\"]*)'s product image$/ do |product_name|
-  p = Product.find_by_name product_name
+  p = Product.find_by name: product_name
   path = url_for(p.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => p))
  
   with_scope('.zoomable-image') do
@@ -673,14 +673,14 @@ Then /^I should not see ([^\&quot;]*)&#39;s community image$/ do |name|
 end
  
 Given /^the article "([^\"]*)" is updated by "([^\"]*)"$/ do |article, person|
-  a = Article.find_by_name article
-  p = Person.find_by_name person
+  a = Article.find_by name: article
+  p = Person.find_by name: person
   a.last_changed_by = p
   a.save!
 end
  
 Given /^the article "([^\"]*)" is updated with$/ do |article, table|
-  a = Article.find_by_name article
+  a = Article.find_by name: article
   row = table.hashes.first
   a.update(row)
 end
@@ -720,7 +720,7 @@ Given /^the profile (.*) is configured to (.*) after login$/ do |profile, option
     when 'redirect to profile control panel'
       'user_control_panel'
   end
-  profile = Profile.find_by_identifier(profile)
+  profile = Profile.find_by identifier: profile
   profile.redirection_after_login = redirection
   profile.save
 end
@@ -15,7 +15,7 @@ module NavigationHelpers
     # Here is an example that pulls values out of the Regexp:
     #
     #   when /^(.*)'s profile page$/i
-    #     user_profile_path(User.find_by_login($1))
+    #     user_profile_path(User.find_by(login: $1))
  
     when /^\//
       page_name
@@ -24,19 +24,19 @@ module NavigationHelpers
       '/site/welcome'
  
     when /article "([^"]+)"\s*$/
-      url_for(Article.find_by_name($1).url.merge({:only_path => true}))
+      url_for(Article.find_by(name: $1).url.merge({:only_path => true}))
  
     when /category "([^"]+)"/
-      '/cat/%s' % Category.find_by_name($1).slug
+      '/cat/%s' % Category.find_by(name: $1).slug
  
     when /edit "(.+)" by (.+)/
-      article_id = Person[$2].articles.find_by_slug($1.to_slug).id
+      article_id = Person[$2].articles.find_by(slug: $1.to_slug).id
       "/myprofile/#{$2}/cms/edit/#{article_id}"
  
     when /edit (.*Block) of (.+)/
       owner = Profile[$2]
       klass = $1.constantize
-      block = klass.find(:all).select{|i| i.owner == owner}.first
+      block = klass.all.select{|i| i.owner == owner}.first
       "/myprofile/#{$2}/profile_design/edit/#{block.id}"
  
     when /^(.*)'s homepage$/
@@ -85,18 +85,18 @@ module NavigationHelpers
       '/myprofile/%s/cms' % profile_identifier($1)
  
     when /^"(.+)" edit page/
-      article = Article.find_by_name($1)
+      article = Article.find_by name: $1
       '/myprofile/%s/cms/edit/%s' % [article.profile.identifier, article.id]
  
     when /^(.+)'s members management/
-      '/myprofile/%s/profile_members' % Profile.find_by_name($1).identifier
+      '/myprofile/%s/profile_members' % Profile.find_by(name: $1).identifier
  
     when /^(.+)'s new product page/
       '/myprofile/%s/manage_products/new' % profile_identifier($1)
  
     when /^(.+)'s page of product (.*)$/
-      enterprise = Profile.find_by_name($1)
-      product = enterprise.products.find_by_name($2)
+      enterprise = Profile.find_by(name: $1)
+      product = enterprise.products.find_by(name: $2)
       '/myprofile/%s/manage_products/show/%s' % [enterprise.identifier, product.id]
  
     when /^(.*)'s products page$/
@@ -138,7 +138,7 @@ module NavigationHelpers
   end
  
   def profile_identifier(field)
-    profile = Profile.find_by_name(field) || Profile.find_by_identifier(field)
+    profile = Profile.find_by(name: field) || Profile.find_by(identifier: field)
     profile.identifier
   end
 end
@@ -120,7 +120,7 @@ module ActsAsFileSystem
  
     def top_ancestor
       if has_ancestry? and !ancestry.nil?
-        self.class.base_class.find_by_id self.top_ancestor_id
+        self.class.base_class.find_by id: self.top_ancestor_id
       else
         self.hierarchy.first
       end
@@ -2,7 +2,7 @@ module ActsAsHavingBoxes
  
   module ClassMethods
     def  acts_as_having_boxes
-      has_many :boxes, :as => :owner, :dependent => :destroy, :order => 'position'
+      has_many :boxes, -> { order :position }, as: :owner, dependent: :destroy
       self.send(:include, ActsAsHavingBoxes)
     end
   end
 module ActsAsHavingPosts
  
   module ClassMethods
-    def  acts_as_having_posts(options = {})
-      has_many :posts, { :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'articles.type != ?', 'RssFeed' ], :order => 'published_at DESC, id DESC' }.merge(options)
+    def acts_as_having_posts(scope = nil)
+      has_many :posts, -> {
+        s = order('published_at DESC, id DESC').where('articles.type != ?', 'RssFeed')
+        s = s.instance_exec(&scope) if scope
+        s
+      }, class_name: 'Article', foreign_key: 'parent_id', source: :children
  
       attr_accessor :feed_attrs
  
@@ -9,7 +9,9 @@ Rails.configuration.to_prepare do
       end
     end
  
-    has_many :profile_activities, foreign_key: :activity_id, conditions: {profile_activities: {activity_type: 'ActionTracker::Record'}}, dependent: :destroy
+    has_many :profile_activities, -> {
+      where profile_activities: {activity_type: 'ActionTracker::Record'}
+    }, foreign_key: :activity_id, dependent: :destroy
  
     after_create :create_activity
     after_update :update_activity
@@ -22,7 +22,7 @@ require_relative &#39;../../find_by_contents&#39;
  
       def current_user
         private_token = (params[PRIVATE_TOKEN_PARAM] || headers['Private-Token']).to_s
-        @current_user ||= User.find_by_private_token(private_token)
+        @current_user ||= User.find_by private_token: private_token
         @current_user
       end
  
@@ -268,7 +268,7 @@ require_relative &#39;../../find_by_contents&#39;
       #   keys (unique) - A hash consisting of keys that must be unique
       def unique_attributes!(obj, keys)
         keys.each do |key|
-          cant_be_saved_request!(key) if obj.send("find_by_#{key.to_s}", params[key])
+          cant_be_saved_request!(key) if obj.find_by(key.to_s => params[key])
         end
       end
  
@@ -342,7 +342,7 @@ require_relative &#39;../../find_by_contents&#39;
       end
  
       def detect_stuff_by_domain
-        @domain = Domain.find_by_name(request.host)
+        @domain = Domain.by_name(request.host)
         if @domain.nil?
           @environment = Environment.default
           if @environment.nil? && Rails.env.development?
@@ -73,7 +73,7 @@ module Noosfero
       # Example Request:
       #   PATCH /activate?activation_code=28259abd12cc6a64ef9399cf3286cb998b96aeaf
       patch "/activate" do
-        user = User.find_by_activation_code(params[:activation_code])
+        user = User.find_by activation_code: params[:activation_code]
         if user
           unless user.environment.enabled?('admin_must_approve_new_users')
             if user.activate
@@ -141,7 +141,7 @@ module Noosfero
       # Example Request:
       #   PATCH /new_password?code=xxxx&password=secret&password_confirmation=secret
       patch "/new_password" do
-        change_password = ChangePassword.find_by_code(params[:code])
+        change_password = ChangePassword.find_by code: params[:code]
         not_found! if change_password.nil?
  
         if change_password.update_attributes(:password => params[:password], :password_confirmation => params[:password_confirmation])
@@ -9,7 +9,7 @@ module Noosfero
           get ':id/activities' do
             profile = environment.profiles
             profile = profile.visible_for_person(current_person) if profile.respond_to?(:visible_for_person)
-            profile = profile.find_by_id(params[:id])
+            profile = profile.find_by id: params[:id]
             activities = profile.activities.map(&:activity)
             present activities, :with => Entities::Activity, :current_person => current_person
           end
@@ -74,7 +74,7 @@ module Noosfero
               current_person.register_report(abuse_report, profile)
  
               if !params[:content_type].blank?
-                abuse_report = AbuseReport.find_by_reporter_id_and_abuse_complaint_id(current_person.id, profile.opened_abuse_complaint.id)
+                abuse_report = AbuseReport.find_by reporter_id: current_person.id, abuse_complaint_id: profile.opened_abuse_complaint.id
                 Delayed::Job.enqueue DownloadReportedImagesJob.new(abuse_report, article)
               end
  
@@ -253,7 +253,7 @@ module Noosfero
           get ':id/home_page' do
             profiles = environment.profiles
             profiles = profiles.visible_for_person(current_person)
-            profile = profiles.find_by_id(params[:id])
+            profile = profiles.find_by id: params[:id]
             present_partial profile.home_page, :with => Entities::Article
           end
         end
@@ -275,7 +275,7 @@ module Noosfero
                   profile = environment.send(kind.pluralize).find(params["#{kind}_id"])
  
                   if params[:path].present?
-                    article = profile.articles.find_by_path(params[:path])
+                    article = profile.articles.find_by path: params[:path]
                     if !article || !article.display_to?(current_person)
                       article = forbidden!
                     end
@@ -49,7 +49,7 @@ module Noosfero
           end
  
           get ':id' do
-            community = environment.communities.visible_for_person(current_person).find_by_id(params[:id])
+            community = environment.communities.visible_for_person(current_person).find_by id: params[:id]
             present community, :with => Entities::Community, :current_person => current_person
           end
  
@@ -26,7 +26,7 @@ module Noosfero
  
           desc "Return one enterprise by id"
           get ':id' do
-            enterprise = environment.enterprises.visible_for_person(current_person).find_by_id(params[:id])
+            enterprise = environment.enterprises.visible_for_person(current_person).find_by id: params[:id]
             present enterprise, :with => Entities::Enterprise, :current_person => current_person
           end
  
@@ -46,7 +46,7 @@ module Noosfero
  
           desc "Return the person information"
           get ':id' do
-            person = environment.people.visible_for_person(current_person).find_by_id(params[:id])
+            person = environment.people.visible_for_person(current_person).find_by id: params[:id]
             return not_found! if person.blank?
             present person, :with => Entities::Person, :current_person => current_person
           end
@@ -87,7 +87,7 @@ module Noosfero
  
           desc "Return the person friends"
           get ':id/friends' do
-            person = environment.people.visible_for_person(current_person).find_by_id(params[:id])
+            person = environment.people.visible_for_person(current_person).find_by id: params[:id]
             return not_found! if person.blank?
             friends = person.friends.visible
             present friends, :with => Entities::Person, :current_person => current_person
@@ -114,7 +114,7 @@ module Noosfero
             resource :members do
               paginate max_per_page: MAX_PER_PAGE
               get do
-                profile = environment.profiles.find_by_id(params[:profile_id])
+                profile = environment.profiles.find_by id: params[:profile_id]
                 members = select_filtered_collection_of(profile, 'members', params)
                 present members, :with => Entities::Person, :current_person => current_person
               end
@@ -16,7 +16,7 @@ module Noosfero
           get ':id' do
             profiles = environment.profiles
             profiles = profiles.visible_for_person(current_person)
-            profile = profiles.find_by_id(params[:id])
+            profile = profiles.find_by id: params[:id]
             present profile, :with => Entities::Profile, :current_person => current_person
           end
         end
@@ -17,7 +17,7 @@ module Noosfero
           end
  
           get ":id" do
-            user = environment.users.find_by_id(params[:id])
+            user = environment.users.find_by id: params[:id]
             unless user.person.display_info_to? current_person
               unauthorized!
             end
@@ -63,8 +63,12 @@ class ActiveRecord::Base
 end
  
 ActiveRecord::Calculations.class_eval do
-  def count_with_distinct column_name=nil, options={}
-    distinct.count_without_distinct column_name, options
+  def count_with_distinct column_name=self.primary_key
+    if column_name
+      distinct.count_without_distinct column_name
+    else
+      count_without_distinct
+    end
   end
   alias_method_chain :count, :distinct
 end
@@ -8,11 +8,11 @@ module TimeScopes
       if base.respond_to?(:scope) && base.attribute_names.include?('created_at')
         base.class_eval do
           scope :younger_than, lambda { |created_at|
-            {:conditions => ["#{table_name}.created_at > ?", created_at]}
+            where "#{table_name}.created_at > ?", created_at
           }
  
           scope :older_than, lambda { |created_at|
-            {:conditions => ["#{table_name}.created_at < ?", created_at]}
+            where "#{table_name}.created_at < ?", created_at
           }
         end
       end
@@ -37,7 +37,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     @request.env['HTTP_REFERER'] = first_url
     get :view_page, profile: @community.identifier, page: @community.articles.last.path.split('/')
     assert_equal 2, @community.page_views.count
-    assert_equal 1, @community.visits.count
+    assert_equal 2, @community.visits.count
  
     second_page_view = @community.page_views.order(:id).last
     assert_equal first_page_view, second_page_view.referer_page_view
@@ -48,7 +48,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     future = Time.now + 2*AnalyticsPlugin::TimeOnPageUpdateInterval
     Time.stubs(:now).returns(future)
     get :view_page, profile: @community.identifier, page: @community.articles.last.path.split('/')
-    assert_equal 2, @community.visits.count
+    assert_equal 3, @community.visits.count
   end
  
 end
...	...	@@ -52,7 +52,6 @@ gem 'protected_attributes'
52	52	gem 'rails-observers'
53	53	gem 'actionpack-page_caching'
54	54	gem 'actionpack-action_caching'
55		-gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
56	55
57	56	group :production do
58	57	gem 'dalli', '~> 2.7.0'
...	...
...	...	@@ -34,7 +34,7 @@ class AdminPanelController < AdminController
34	34	env = environment
35	35	@portal_community = env.portal_community \|\| Community.new
36	36	if request.post?
37		- portal_community = env.communities.find_by_identifier(params[:portal_community_identifier])
	37	+ portal_community = env.communities.where(identifier: params[:portal_community_identifier]).first
38	38	if portal_community
39	39	if (env.portal_community != portal_community)
40	40	env.portal_community = portal_community
...	...
...	...	@@ -7,7 +7,7 @@ class EnvironmentRoleManagerController < AdminController
7	7
8	8	def change_roles
9	9	@admin = Person.find(params[:id])
10		- @roles = Role.find(:all).select{ \|r\| r.has_kind?(:environment) }
	10	+ @roles = Role.all.select{ \|r\| r.has_kind?(:environment) }
11	11	end
12	12
13	13	def update_roles
...	...	@@ -22,7 +22,7 @@ class EnvironmentRoleManagerController < AdminController
22	22	end
23	23
24	24	def change_role
25		- @roles = Role.find(:all).select{ \|r\| r.has_kind?(:environment) }
	25	+ @roles = Role.all.select{ \|r\| r.has_kind?(:environment) }
26	26	@admin = Person.find(params[:id])
27	27	@associations = @admin.find_roles(environment)
28	28	end
...	...	@@ -34,7 +34,7 @@ class EnvironmentRoleManagerController < AdminController
34	34	redirect_to :action => 'index'
35	35	else
36	36	@admin = Person.find(params[:person])
37		- @roles = Role.find(:all).select{ \|r\| r.has_kind?(:environment) }
	37	+ @roles = Role.all.select{ \|r\| r.has_kind?(:environment) }
38	38	render :action => 'affiliate'
39	39	end
40	40	end
...	...	@@ -60,7 +60,7 @@ class EnvironmentRoleManagerController < AdminController
60	60	end
61	61
62	62	def make_admin
63		- @people = Person.find(:all)
64		- @roles = Role.find(:all).select{\|r\|r.has_kind?(:environment)}
	63	+ @people = Person.all
	64	+ @roles = Role.all.select{\|r\|r.has_kind?(:environment)}
65	65	end
66	66	end
...	...
...	...	@@ -60,7 +60,7 @@ class FeaturesController < AdminController
60	60	CustomField.destroy(custom_fields_to_destroy)
61	61
62	62	custom_field_list.each_pair do \|id, custom_field\|
63		- field = CustomField.find_by_id(id)
	63	+ field = CustomField.find_by(id: id)
64	64	if not field.blank?
65	65	params_to_update = custom_field.except(:format, :extras, :customized_type,:environment)
66	66	field.update_attributes(params_to_update)
...	...
...	...	@@ -2,7 +2,7 @@ class RoleController < AdminController
2	2	protect 'manage_environment_roles', :environment
3	3
4	4	def index
5		- @roles = environment.roles.find(:all, :conditions => {:profile_id => nil})
	5	+ @roles = environment.roles.where profile_id: nil
6	6	end
7	7
8	8	def new
...	...
...	...	@@ -48,7 +48,7 @@ class UsersController < AdminController
48	48
49	49	def destroy_user
50	50	if request.post?
51		- person = environment.people.find_by_id(params[:id])
	51	+ person = environment.people.find_by id: params[:id]
52	52	if person && person.destroy
53	53	session[:notice] = _('The profile was deleted.')
54	54	else
...	...
...	...	@@ -123,7 +123,7 @@ class ApplicationController < ActionController::Base
123	123	# Sets text domain based on request host for custom internationalization
124	124	FastGettext.text_domain = Domain.custom_locale(request.host)
125	125
126		- @domain = Domain.find_by_name(request.host)
	126	+ @domain = Domain.by_name(request.host)
127	127	if @domain.nil?
128	128	@environment = Environment.default
129	129	# Avoid crashes on test and development setups
...	...	@@ -138,7 +138,7 @@ class ApplicationController < ActionController::Base
138	138
139	139	# Check if the requested profile belongs to another domain
140	140	if @profile && !params[:profile].blank? && params[:profile] != @profile.identifier
141		- @profile = @environment.profiles.find_by_identifier params[:profile]
	141	+ @profile = @environment.profiles.find_by(identifier: params[:profile])
142	142	redirect_to url_for(params.merge host: @profile.default_hostname)
143	143	end
144	144	end
...	...	@@ -170,7 +170,7 @@ class ApplicationController < ActionController::Base
170	170	def load_category
171	171	unless params[:category_path].blank?
172	172	path = params[:category_path]
173		- @category = environment.categories.find_by_path(path)
	173	+ @category = environment.categories.find_by(path: path)
174	174	if @category.nil?
175	175	render_not_found(path)
176	176	end
...	...
...	...	@@ -16,10 +16,9 @@ class BoxOrganizerController < ApplicationController
16	16	target_position = block_before.position
17	17
18	18	@target_box = block_before.box
19		- else
20		- (params[:target] =~ /end-of-box-([0-9]+)/)
	19	+ elsif params[:target] =~ /end-of-box-([0-9]+)/
21	20
22		- @target_box = boxes_holder.boxes.find_by_id($1)
	21	+ @target_box = boxes_holder.boxes.find_by id: $1
23	22	end
24	23
25	24	@block = new_block(params[:type], @target_box) if @block.nil?
...	...	@@ -35,8 +34,8 @@ class BoxOrganizerController < ApplicationController
35	34	@block.insert_at(@target_box.blocks.size + 1)
36	35	@block.move_to_bottom
37	36	else
38		- # insert the block in the given position
39		- @block.insert_at(@block.position && @block.position < target_position ? target_position - 1 : target_position)
	37	+ new_position = if @block.position and @block.position < target_position then target_position - 1 else target_position end
	38	+ @block.insert_at new_position
40	39	end
41	40
42	41	@block.save!
...	...
...	...	@@ -34,7 +34,7 @@ class CmsController < MyProfileController
34	34
35	35	protect_if :only => [:new, :upload_files] do \|c, user, profile\|
36	36	parent_id = c.params[:article].present? ? c.params[:article][:parent_id] : c.params[:parent_id]
37		- parent = profile.articles.find_by_id(parent_id)
	37	+ parent = profile.articles.find_by(id: parent_id)
38	38	user && user.can_post_content?(profile, parent)
39	39	end
40	40
...	...	@@ -59,11 +59,10 @@ class CmsController < MyProfileController
59	59
60	60	def index
61	61	@article = nil
62		- @articles = profile.top_level_articles.paginate(
63		- :order => "case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC",
64		- :per_page => per_page,
65		- :page => params[:npage]
66		- )
	62	+ @articles = profile.top_level_articles
	63	+ .order("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC")
	64	+ .paginate(per_page: per_page, page: params[:npage])
	65	+
67	66	render :action => 'view'
68	67	end
69	68
...	...
...	...	@@ -22,7 +22,7 @@ class FriendsController < MyProfileController
22	22	end
23	23
24	24	def remove_suggestion
25		- @person = profile.suggested_people.find_by_identifier(params[:id])
	25	+ @person = profile.suggested_people.find_by(identifier: params[:id])
26	26	redirect_to :action => 'suggest' unless @person
27	27	if @person && request.post?
28	28	profile.remove_suggestion(@person)
...	...	@@ -32,7 +32,7 @@ class FriendsController < MyProfileController
32	32	end
33	33
34	34	def connections
35		- @suggestion = profile.suggested_profiles.of_person.enabled.find_by_suggestion_id(params[:id])
	35	+ @suggestion = profile.suggested_profiles.of_person.enabled.find_by(suggestion_id: params[:id])
36	36	if @suggestion
37	37	@tags = @suggestion.tag_connections
38	38	@profiles = @suggestion.profile_connections
...	...