rails4: use lambda syntax compatible with ruby 1.9 and 2.0

Braulio Bhavamitra
1 parent fe8fe114
Showing 18 changed files with 88 additions and 88 deletions Show diff stats
app/models/article.rb
app/models/category.rb
app/models/event.rb
app/models/person.rb
app/models/product.rb
app/models/product_category.rb
app/models/profile.rb
app/models/scrap.rb
app/models/task.rb
plugins/bsc/lib/bsc_plugin/contract.rb
plugins/comment_group/lib/ext/comment.rb
plugins/custom_forms/lib/custom_forms_plugin/form.rb
plugins/custom_forms/lib/custom_forms_plugin/membership_survey.rb
plugins/people_block/lib/ext/person.rb
plugins/spaminator/lib/spaminator_plugin/report.rb
plugins/sub_organizations/lib/ext/organization.rb
vendor/plugins/access_control/lib/role_assignment.rb
vendor/plugins/kandadaboggu-vote_fu/lib/models/vote.rb
@@ -74,7 +74,7 @@ class Article &lt; ActiveRecord::Base
   has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
-  has_many :article_categorizations, ->{ where 'articles_categories.virtual = ?', false }
+  has_many :article_categorizations, -> { where 'articles_categories.virtual = ?', false }
   has_many :categories, :through => :article_categorizations
   has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization'
@@ -126,13 +126,13 @@ class Article &lt; ActiveRecord::Base
   xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
-  scope :in_category, ->(category) {
+  scope :in_category, -> category {
     includes('categories_including_virtual').where('categories.id' => category.id)
   }
   include TimeScopes
-  scope :by_range, ->(range) {
+  scope :by_range, -> range {
     where 'articles.published_at BETWEEN :start_date AND :end_date', { start_date: range.first, end_date: range.last }
   }
@@ -256,16 +256,16 @@ class Article &lt; ActiveRecord::Base
   # retrieves all articles belonging to the given +profile+ that are not
   # sub-articles of any other article.
-  scope :top_level_for, ->(profile) {
+  scope :top_level_for, -> profile {
     where 'parent_id is null and profile_id = ?', profile.id
   }
-  scope :is_public, ->{
+  scope :is_public, -> {
     joins(:profile).
     where("advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true)
   }
-  scope :more_recent, ->{
+  scope :more_recent, -> {
     order('articles.published_at desc, articles.id desc')
     .where("advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
     ((articles.type != ?) OR articles.type is NULL)",
@@ -278,8 +278,8 @@ class Article &lt; ActiveRecord::Base
     paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
   end
-  scope :more_popular, ->{ order 'hits DESC' }
-  scope :relevant_as_recent, ->{
+  scope :more_popular, -> { order 'hits DESC' }
+  scope :relevant_as_recent, -> {
    where "(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"
   }
@@ -410,7 +410,7 @@ class Article &lt; ActiveRecord::Base
     self.translations.map(&:language)
   end
-  scope :native_translations, ->{ where :translation_of_id => nil }
+  scope :native_translations, -> { where :translation_of_id => nil }
   def translatable?
     false
@@ -489,19 +489,19 @@ class Article &lt; ActiveRecord::Base
     ['TextArticle', 'TextileArticle', 'TinyMceArticle']
   end
-  scope :published, ->{ where 'articles.published = ?', true }
-  scope :folders, ->(profile) { where 'articles.type IN (?)', profile.folder_types }
-  scope :no_folders, ->(profile) { where 'articles.type NOT IN (?)', profile.folder_types }
-  scope :galleries, ->{ where "articles.type IN ('Gallery')" }
-  scope :images, ->{ where :is_image => true }
-  scope :no_images, ->{ where :is_image => false }
-  scope :text_articles, ->{ where 'articles.type IN (?)', text_article_types }
-  scope :files, ->{ where :type => 'UploadedFile' }
-  scope :with_types, ->(types) { where 'articles.type IN (?)', types }
+  scope :published, -> { where 'articles.published = ?', true }
+  scope :folders, -> profile { where 'articles.type IN (?)', profile.folder_types }
+  scope :no_folders, -> profile { where 'articles.type NOT IN (?)', profile.folder_types }
+  scope :galleries, -> { where "articles.type IN ('Gallery')" }
+  scope :images, -> { where :is_image => true }
+  scope :no_images, -> { where :is_image => false }
+  scope :text_articles, -> { where 'articles.type IN (?)', text_article_types }
+  scope :files, -> { where :type => 'UploadedFile' }
+  scope :with_types, -> types { where 'articles.type IN (?)', types }
-  scope :more_popular, ->{ order 'hits DESC' }
-  scope :more_comments, ->{ order "comments_count DESC" }
-  scope :more_recent, ->{ order "created_at DESC" }
+  scope :more_popular, -> { order 'hits DESC' }
+  scope :more_comments, -> { order "comments_count DESC" }
+  scope :more_recent, -> { order "created_at DESC" }
   scope :display_filter, lambda {|user, profile|
     return published if (user.nil? && profile && profile.public?)
@@ -15,11 +15,11 @@ class Category &lt; ActiveRecord::Base
   belongs_to :environment
   # Finds all top level categories for a given environment.
-  scope :top_level_for, ->(environment) {
+  scope :top_level_for, -> environment {
     where 'parent_id is null and environment_id = ?', environment.id
   }
-  scope :on_level, ->(parent) { where :parent_id => parent }
+  scope :on_level, -> parent { where :parent_id => parent }
   acts_as_filesystem
@@ -46,7 +46,7 @@ class Category &lt; ActiveRecord::Base
     display_color = nil if display_color.blank?
   end
-  scope :from_types, ->(types) {
+  scope :from_types, -> types {
     if types.select{ |t| t.blank? }.empty? then
       where(type: types) else
       where("type IN (?) OR type IS NULL", types.reject{ |t| t.blank? }) end
@@ -34,19 +34,19 @@ class Event &lt; Article
     end
   end
-  scope :by_day, ->(date) {
+  scope :by_day, -> date {
     where('start_date >= :start_date AND start_date <= :end_date AND end_date IS NULL OR (start_date <= :end_date  AND end_date >= :start_date)',
           start_date: date.beginning_of_day, end_date: date.end_of_day).
     order('start_date ASC')
   }
-  scope :next_events_from_month, ->(date) {
+  scope :next_events_from_month, -> date {
     date_temp = date.strftime("%Y-%m-%d")
     order('start_date ASC')
     .where("start_date >= ?","#{date_temp}")
   }
-  scope :by_month, ->(date) {
+  scope :by_month, -> date {
     order('start_date ASC')
     .where("EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?", date.year, date.month)
   }
@@ -69,7 +69,7 @@ class Event &lt; Article
     'event'
   end
-  scope :by_range, ->(range) {
+  scope :by_range, -> range {
     where('start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',
       {:start_day => range.first, :end_day => range.last})
   }
@@ -16,24 +16,24 @@ class Person &lt; Profile
   acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
   acts_as_accessor
-  scope :members_of, ->(resources) {
+  scope :members_of, -> resources {
     resources = Array(resources)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
     select('DISTINCT profiles.*').joins(:role_assignments).where([conditions])
   }
-  scope :not_members_of, ->(resources) {
+  scope :not_members_of, -> resources {
     resources = Array(resources)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
     select('DISTINCT profiles.*').where('"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions)
   }
-  scope :by_role, ->(roles) {
+  scope :by_role, -> roles {
     roles = Array(roles)
     select('DISTINCT profiles.*').joins(:role_assignments).where('role_assignments.role_id IN (?)', roles)
   }
-  scope :not_friends_of, ->(resources) {
+  scope :not_friends_of, -> resources {
     resources = Array(resources)
     select('DISTINCT profiles.*').where('"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "friendships" ON "friendships"."person_id" = "profiles"."id" WHERE "friendships"."friend_id" IN (%s))' % resources.map(&:id))
   }
@@ -83,7 +83,7 @@ class Person &lt; Profile
   has_many :friendships, :dependent => :destroy
   has_many :friends, :class_name => 'Person', :through => :friendships
-  scope :online, ->{
+  scope :online, -> {
     joins(:user).where("users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes)
   }
@@ -102,27 +102,27 @@ class Person &lt; Profile
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
   has_many :suggested_profiles, class_name: 'ProfileSuggestion', foreign_key: :person_id, order: 'score DESC', dependent: :destroy
-  has_many :suggested_people, ->{
+  has_many :suggested_people, -> {
     where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true
   }, through: :suggested_profiles, source: :suggestion
-  has_many :suggested_communities, ->{
+  has_many :suggested_communities, -> {
     where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true
   }, through: :suggested_profiles, source: :suggestion
-  scope :more_popular, ->{ order 'friends_count DESC' }
+  scope :more_popular, -> { order 'friends_count DESC' }
-  scope :abusers, ->{
+  scope :abusers, -> {
     joins(:abuse_complaints).where('tasks.status = 3').select('DISTINCT profiles.*')
   }
-  scope :non_abusers, ->{
+  scope :non_abusers, -> {
     select("DISTINCT profiles.*").
     joins("LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'").
     where("tasks.status != 3 OR tasks.id is NULL")
   }
-  scope :admins, ->{ joins(:role_assignments => :role).where('roles.key = ?', 'environment_administrator') }
-  scope :activated, ->{ joins(:user).where('users.activation_code IS NULL AND users.activated_at IS NOT NULL') }
-  scope :deactivated, ->{ joins(:user).where('NOT (users.activation_code IS NULL AND users.activated_at IS NOT NULL)') }
+  scope :admins, -> { joins(:role_assignments => :role).where('roles.key = ?', 'environment_administrator') }
+  scope :activated, -> { joins(:user).where('users.activation_code IS NULL AND users.activated_at IS NOT NULL') }
+  scope :deactivated, -> { joins(:user).where('NOT (users.activation_code IS NULL AND users.activated_at IS NOT NULL)') }
   after_destroy do |person|
     Friendship.where(friend_id: person.id).each{ |friendship| friendship.destroy }
@@ -52,7 +52,7 @@ class Product &lt; ActiveRecord::Base
   scope :more_recent, :order => "created_at DESC"
-  scope :from_category, ->(category) {
+  scope :from_category, -> category {
     joins(:product_category).where('categories.path LIKE ?', "%#{category.slug}%") if category
   }
@@ -6,14 +6,14 @@ class ProductCategory &lt; Category
   attr_accessible :name, :parent, :environment
   scope :unique, :select => 'DISTINCT ON (path) categories.*'
-  scope :by_enterprise, ->(enterprise) {
+  scope :by_enterprise, -> enterprise {
     joins(:products).
     where('products.profile_id = ?', enterprise.id)
   }
-  scope :by_environment, ->(environment) {
+  scope :by_environment, -> environment {
     where 'environment_id = ?', environment.id
   }
-  scope :unique_by_level, ->(level) {
+  scope :unique_by_level, -> level {
     select "DISTINCT ON (filtered_category) split_part(path, '/', #{level}) AS filtered_category, categories.*"
   }
@@ -87,28 +87,28 @@ class Profile &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
-  scope :memberships_of, ->(person) {
+  scope :memberships_of, -> person {
     select('DISTINCT profiles.*').
     joins(:role_assignments).
     where('role_assignments.accessor_type = ? AND role_assignments.accessor_id = ?', person.class.base_class.name, person.id)
   }
   #FIXME: these will work only if the subclass is already loaded
-  scope :enterprises, ->{
+  scope :enterprises, -> {
     where((Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR "))
   }
-  scope :communities, ->{
+  scope :communities, -> {
     where((Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR "))
   }
-  scope :templates, ->(template_id = nil) {
+  scope :templates, -> template_id = nil {
     s = where is_template: true
     s = s.where id: template_id if template_id
     s
   }
-  scope :with_templates, ->(templates) {
+  scope :with_templates, -> templates {
     where template_id: templates
   }
-  scope :no_templates, ->{ where is_template: false }
+  scope :no_templates, -> { where is_template: false }
   # Returns a scoped object to select profiles in a given location or in a radius
   # distance from the given location center.
@@ -185,10 +185,10 @@ class Profile &lt; ActiveRecord::Base
     Profile.column_names.map{|n| [Profile.table_name, n].join('.')}.join(',')
   end
-  scope :visible, ->{ where visible: true, secret: false }
-  scope :disabled, ->{ where visible: false }
-  scope :is_public, ->{ where visible: true, public_profile: true, secret: false }
-  scope :enabled, ->{ where enabled: true }
+  scope :visible, -> { where visible: true, secret: false }
+  scope :disabled, -> { where visible: false }
+  scope :is_public, -> { where visible: true, public_profile: true, secret: false }
+  scope :enabled, -> { where enabled: true }
   # Subclasses must override this method
   scope :more_popular
@@ -289,7 +289,7 @@ class Profile &lt; ActiveRecord::Base
     end
   end
-  has_many :profile_categorizations, ->{ where 'categories_profiles.virtual = ?', false }
+  has_many :profile_categorizations, -> { where 'categories_profiles.virtual = ?', false }
   has_many :categories, :through => :profile_categorizations
   has_many :profile_categorizations_including_virtual, :class_name => 'ProfileCategorization'
@@ -18,9 +18,9 @@ class Scrap &lt; ActiveRecord::Base
   after_create :create_activity
   after_update :update_activity
-  scope :all_scraps, ->(profile) { limit(30).where("receiver_id = ? OR sender_id = ?", profile, profile) }
+  scope :all_scraps, -> profile { limit(30).where("receiver_id = ? OR sender_id = ?", profile, profile) }
-  scope :not_replies, ->{ where scrap_id: nil }
+  scope :not_replies, -> { where scrap_id: nil }
   track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target, :custom_user => :sender
@@ -281,16 +281,16 @@ class Task &lt; ActiveRecord::Base
     end
   end
-  scope :pending, ->{ where status: Task::Status::ACTIVE }
-  scope :hidden, ->{ where status: Task::Status::HIDDEN }
-  scope :finished, ->{ where status: Task::Status::FINISHED }
-  scope :canceled, ->{ where status: Task::Status::CANCELLED }
-  scope :closed, ->{ where status: [Task::Status::CANCELLED, Task::Status::FINISHED] }
-  scope :opened, ->{ where status: [Task::Status::ACTIVE, Task::Status::HIDDEN] }
-  scope :of, ->(type) { where "type LIKE ?", type if type }
-  scope :order_by, ->(attribute, ord) { order "#{attribute} #{ord}" }
-  scope :like, ->(field, value) { where "LOWER(#{field}) LIKE ?", "%#{value.downcase}%" if value }
-  scope :pending_all, ->(profile, filter_type, filter_text) {
+  scope :pending, -> { where status: Task::Status::ACTIVE }
+  scope :hidden, -> { where status: Task::Status::HIDDEN }
+  scope :finished, -> { where status: Task::Status::FINISHED }
+  scope :canceled, -> { where status: Task::Status::CANCELLED }
+  scope :closed, -> { where status: [Task::Status::CANCELLED, Task::Status::FINISHED] }
+  scope :opened, -> { where status: [Task::Status::ACTIVE, Task::Status::HIDDEN] }
+  scope :of, -> type { where "type LIKE ?", type if type }
+  scope :order_by, -> attribute, ord { order "#{attribute} #{ord}" }
+  scope :like, -> field, value { where "LOWER(#{field}) LIKE ?", "%#{value.downcase}%" if value }
+  scope :pending_all, -> profile, filter_type, filter_text {
     self.to(profile).without_spam.pending.of(filter_type).like('data', filter_text)
   }
@@ -364,7 +364,7 @@ class Task &lt; ActiveRecord::Base
   # specified code AND with status = Task::Status::ACTIVE.
   #
   # Can be used in subclasses to find only their instances.
-  scope :from_code, ->(code) { where code: code, status: Task::Status::ACTIVE }
+  scope :from_code, -> code { where code: code, status: Task::Status::ACTIVE }
   class << self
@@ -8,8 +8,8 @@ class BscPlugin::Contract &lt; ActiveRecord::Base
   belongs_to :bsc, :class_name => 'BscPlugin::Bsc'
-  named_scope :status, ->(status_list) { where 'status in (?)', status_list if status_list.present? }
-  named_scope :sorted_by, ->(sorter, direction) { order "#{sorter} #{direction}" }
+  named_scope :status, -> status_list { where 'status in (?)', status_list if status_list.present? }
+  named_scope :sorted_by, -> sorter, direction { order "#{sorter} #{direction}" }
   before_create do |contract|
     contract.created_at ||= Time.now.utc
@@ -2,9 +2,9 @@ require_dependency &#39;comment&#39;
 class Comment
-  scope :without_group, ->{ where group_id: nil }
+  scope :without_group, -> { where group_id: nil }
-  scope :in_group, ->(group_id) { where 'group_id = ?', group_id }
+  scope :in_group, -> group_id { where 'group_id = ?', group_id }
   attr_accessible :group_id
@@ -26,9 +26,9 @@ class CustomFormsPlugin::Form &lt; ActiveRecord::Base
     tasks.each {|task| task.cancel}
   end
-  scope :from_profile, ->(profile) { where profile_id: profile.id }
-  scope :on_memberships, ->{ where on_membership: true, for_admission: false }
-  scope :for_admissions, ->{ where for_admission: true }
+  scope :from_profile, -> profile { where profile_id: profile.id }
+  scope :on_memberships, -> { where on_membership: true, for_admission: false }
+  scope :for_admissions, -> { where for_admission: true }
 =begin
   scope :accessible_to lambda do |profile|
     #TODO should verify is profile is associated with the form owner
@@ -5,7 +5,7 @@ class CustomFormsPlugin::MembershipSurvey &lt; Task
   include CustomFormsPlugin::Helper
-  scope :from_profile, ->(profile) { where requestor_id: profile.id }
+  scope :from_profile, -> profile { where requestor_id: profile.id }
   def perform
     form = CustomFormsPlugin::Form.find(form_id)
@@ -2,7 +2,7 @@ require_dependency &#39;person&#39;
 class Person
-  scope :with_role, ->(role_id) {
+  scope :with_role, -> role_id {
     select('DISTINCT profiles.*').joins(:role_assignments).
     where("role_assignments.role_id = #{role_id}")
   }
@@ -8,7 +8,7 @@ class SpaminatorPlugin::Report &lt; ActiveRecord::Base
   attr_accessible :environment
-  scope :from_environment, ->(environment) { where :environment_id => environment }
+  scope :from_environment, -> environment { where :environment_id => environment }
   after_initialize do |report|
     report.failed = {:people => [], :comments => []} if report.failed.blank?
@@ -13,17 +13,17 @@ class Organization
   FIELDS << 'sub_organizations_plugin_parent_to_be'
-  scope :children, ->(parent) {
+  scope :children, -> parent {
     joins("inner join sub_organizations_plugin_relations as relations on profiles.id=relations.child_id").
     where("relations.parent_id = ?", parent.id)
   }
-  scope :parents, ->(*children) {
+  scope :parents, -> *children {
     joins("inner join sub_organizations_plugin_relations as relations on profiles.id=relations.parent_id").
     where("relations.child_id in (?)", children.map(&:id))
   }
-  scope :pending_children, ->(parent) {
+  scope :pending_children, -> parent {
     select("distinct profiles.*").
     joins("inner join sub_organizations_plugin_approve_paternity_relations as relations on profiles.id=relations.child_id inner join tasks on relations.task_id=tasks.id").
     where("relations.parent_id = ? AND tasks.status = 1", parent.id)
@@ -9,11 +9,11 @@ class RoleAssignment &lt; ActiveRecord::Base
   validates_presence_of :role, :accessor
   track_actions :join_community, :after_create, :keep_params => ["resource.name", "resource.url", "resource.profile_custom_icon"],
-    if: ->(x) { x.resource.is_a?(Community) && x.accessor.role_assignments.where(resource_id: x.resource.id, resource_type: 'Profile').count == 1 },
+    if: -> x { x.resource.is_a?(Community) && x.accessor.role_assignments.where(resource_id: x.resource.id, resource_type: 'Profile').count == 1 },
     :custom_user => :accessor, :custom_target => :resource
   track_actions :add_member_in_community, :after_create,
-    if: ->(x) { x.resource.is_a?(Community) && x.accessor.role_assignments.where(resource_id: x.resource.id, resource_type: 'Profile').count == 1 },
+    if: -> x { x.resource.is_a?(Community) && x.accessor.role_assignments.where(resource_id: x.resource.id, resource_type: 'Profile').count == 1 },
     :custom_user => :accessor, :custom_target => :resource
   def has_permission?(perm, res)
 class Vote < ActiveRecord::Base
-  scope :for_voter, ->(*args) {
+  scope :for_voter, -> *args {
     where "voter_id = ? AND voter_type = ?", args.first.id, args.first.class.base_class.name
   }
-  scope :for_voteable, ->(*args) {
+  scope :for_voteable, -> *args {
     where "voteable_id = ? AND voteable_type = ?", args.first.id, args.first.class.base_class.name
   }
-  scope :recent, ->(*args) {
+  scope :recent, -> *args {
     where "created_at > ?", (args.first || 2.weeks.ago).to_s(:db)
   }
-  scope :descending, ->{ order "created_at DESC" }
+  scope :descending, -> { order "created_at DESC" }
   # NOTE: Votes belong to the "voteable" interface, and also to voters
   belongs_to :voteable, :polymorphic => true
	@@ -15,11 +15,11 @@ class Category < ActiveRecord::Base		@@ -15,11 +15,11 @@ class Category < ActiveRecord::Base
15	belongs_to :environment	15	belongs_to :environment
16		16
17	# Finds all top level categories for a given environment.	17	# Finds all top level categories for a given environment.
18	- scope :top_level_for, ->(environment) {	18	+ scope :top_level_for, -> environment {
19	where 'parent_id is null and environment_id = ?', environment.id	19	where 'parent_id is null and environment_id = ?', environment.id
20	}	20	}
21		21
22	- scope :on_level, ->(parent) { where :parent_id => parent }	22	+ scope :on_level, -> parent { where :parent_id => parent }
23		23
24	acts_as_filesystem	24	acts_as_filesystem
25		25
	@@ -46,7 +46,7 @@ class Category < ActiveRecord::Base		@@ -46,7 +46,7 @@ class Category < ActiveRecord::Base
46	display_color = nil if display_color.blank?	46	display_color = nil if display_color.blank?
47	end	47	end
48		48
49	- scope :from_types, ->(types) {	49	+ scope :from_types, -> types {
50	if types.select{ \|t\| t.blank? }.empty? then	50	if types.select{ \|t\| t.blank? }.empty? then
51	where(type: types) else	51	where(type: types) else
52	where("type IN (?) OR type IS NULL", types.reject{ \|t\| t.blank? }) end	52	where("type IN (?) OR type IS NULL", types.reject{ \|t\| t.blank? }) end
	@@ -34,19 +34,19 @@ class Event < Article		@@ -34,19 +34,19 @@ class Event < Article
34	end	34	end
35	end	35	end
36		36
37	- scope :by_day, ->(date) {	37	+ scope :by_day, -> date {
38	where('start_date >= :start_date AND start_date <= :end_date AND end_date IS NULL OR (start_date <= :end_date AND end_date >= :start_date)',	38	where('start_date >= :start_date AND start_date <= :end_date AND end_date IS NULL OR (start_date <= :end_date AND end_date >= :start_date)',
39	start_date: date.beginning_of_day, end_date: date.end_of_day).	39	start_date: date.beginning_of_day, end_date: date.end_of_day).
40	order('start_date ASC')	40	order('start_date ASC')
41	}	41	}
42		42
43	- scope :next_events_from_month, ->(date) {	43	+ scope :next_events_from_month, -> date {
44	date_temp = date.strftime("%Y-%m-%d")	44	date_temp = date.strftime("%Y-%m-%d")
45	order('start_date ASC')	45	order('start_date ASC')
46	.where("start_date >= ?","#{date_temp}")	46	.where("start_date >= ?","#{date_temp}")
47	}	47	}
48		48
49	- scope :by_month, ->(date) {	49	+ scope :by_month, -> date {
50	order('start_date ASC')	50	order('start_date ASC')
51	.where("EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?", date.year, date.month)	51	.where("EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?", date.year, date.month)
52	}	52	}
	@@ -69,7 +69,7 @@ class Event < Article		@@ -69,7 +69,7 @@ class Event < Article
69	'event'	69	'event'
70	end	70	end
71		71
72	- scope :by_range, ->(range) {	72	+ scope :by_range, -> range {
73	where('start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',	73	where('start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',
74	{:start_day => range.first, :end_day => range.last})	74	{:start_day => range.first, :end_day => range.last})
75	}	75	}
	@@ -52,7 +52,7 @@ class Product < ActiveRecord::Base		@@ -52,7 +52,7 @@ class Product < ActiveRecord::Base
52		52
53	scope :more_recent, :order => "created_at DESC"	53	scope :more_recent, :order => "created_at DESC"
54		54
55	- scope :from_category, ->(category) {	55	+ scope :from_category, -> category {
56	joins(:product_category).where('categories.path LIKE ?', "%#{category.slug}%") if category	56	joins(:product_category).where('categories.path LIKE ?', "%#{category.slug}%") if category
57	}	57	}
58		58
	@@ -6,14 +6,14 @@ class ProductCategory < Category		@@ -6,14 +6,14 @@ class ProductCategory < Category
6	attr_accessible :name, :parent, :environment	6	attr_accessible :name, :parent, :environment
7		7
8	scope :unique, :select => 'DISTINCT ON (path) categories.*'	8	scope :unique, :select => 'DISTINCT ON (path) categories.*'
9	- scope :by_enterprise, ->(enterprise) {	9	+ scope :by_enterprise, -> enterprise {
10	joins(:products).	10	joins(:products).
11	where('products.profile_id = ?', enterprise.id)	11	where('products.profile_id = ?', enterprise.id)
12	}	12	}
13	- scope :by_environment, ->(environment) {	13	+ scope :by_environment, -> environment {
14	where 'environment_id = ?', environment.id	14	where 'environment_id = ?', environment.id
15	}	15	}
16	- scope :unique_by_level, ->(level) {	16	+ scope :unique_by_level, -> level {
17	select "DISTINCT ON (filtered_category) split_part(path, '/', #{level}) AS filtered_category, categories.*"	17	select "DISTINCT ON (filtered_category) split_part(path, '/', #{level}) AS filtered_category, categories.*"
18	}	18	}
19		19
	@@ -18,9 +18,9 @@ class Scrap < ActiveRecord::Base		@@ -18,9 +18,9 @@ class Scrap < ActiveRecord::Base
18	after_create :create_activity	18	after_create :create_activity
19	after_update :update_activity	19	after_update :update_activity
20		20
21	- scope :all_scraps, ->(profile) { limit(30).where("receiver_id = ? OR sender_id = ?", profile, profile) }	21	+ scope :all_scraps, -> profile { limit(30).where("receiver_id = ? OR sender_id = ?", profile, profile) }
22		22
23	- scope :not_replies, ->{ where scrap_id: nil }	23	+ scope :not_replies, -> { where scrap_id: nil }
24		24
25	track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{\|s\| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target, :custom_user => :sender	25	track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{\|s\| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target, :custom_user => :sender
26		26
	@@ -8,8 +8,8 @@ class BscPlugin::Contract < ActiveRecord::Base		@@ -8,8 +8,8 @@ class BscPlugin::Contract < ActiveRecord::Base
8		8
9	belongs_to :bsc, :class_name => 'BscPlugin::Bsc'	9	belongs_to :bsc, :class_name => 'BscPlugin::Bsc'
10		10
11	- named_scope :status, ->(status_list) { where 'status in (?)', status_list if status_list.present? }
12	- named_scope :sorted_by, ->(sorter, direction) { order "#{sorter} #{direction}" }	11	+ named_scope :status, -> status_list { where 'status in (?)', status_list if status_list.present? }
		12	+ named_scope :sorted_by, -> sorter, direction { order "#{sorter} #{direction}" }
13		13
14	before_create do \|contract\|	14	before_create do \|contract\|
15	contract.created_at \|\|= Time.now.utc	15	contract.created_at \|\|= Time.now.utc
	@@ -2,9 +2,9 @@ require_dependency 'comment'		@@ -2,9 +2,9 @@ require_dependency 'comment'
2		2
3	class Comment	3	class Comment
4		4
5	- scope :without_group, ->{ where group_id: nil }	5	+ scope :without_group, -> { where group_id: nil }
6		6
7	- scope :in_group, ->(group_id) { where 'group_id = ?', group_id }	7	+ scope :in_group, -> group_id { where 'group_id = ?', group_id }
8		8
9	attr_accessible :group_id	9	attr_accessible :group_id
10		10
	@@ -5,7 +5,7 @@ class CustomFormsPlugin::MembershipSurvey < Task		@@ -5,7 +5,7 @@ class CustomFormsPlugin::MembershipSurvey < Task
5		5
6	include CustomFormsPlugin::Helper	6	include CustomFormsPlugin::Helper
7		7
8	- scope :from_profile, ->(profile) { where requestor_id: profile.id }	8	+ scope :from_profile, -> profile { where requestor_id: profile.id }
9		9
10	def perform	10	def perform
11	form = CustomFormsPlugin::Form.find(form_id)	11	form = CustomFormsPlugin::Form.find(form_id)
	@@ -2,7 +2,7 @@ require_dependency 'person'		@@ -2,7 +2,7 @@ require_dependency 'person'
2		2
3	class Person	3	class Person
4		4
5	- scope :with_role, ->(role_id) {	5	+ scope :with_role, -> role_id {
6	select('DISTINCT profiles.*').joins(:role_assignments).	6	select('DISTINCT profiles.*').joins(:role_assignments).
7	where("role_assignments.role_id = #{role_id}")	7	where("role_assignments.role_id = #{role_id}")
8	}	8	}
	@@ -8,7 +8,7 @@ class SpaminatorPlugin::Report < ActiveRecord::Base		@@ -8,7 +8,7 @@ class SpaminatorPlugin::Report < ActiveRecord::Base
8		8
9	attr_accessible :environment	9	attr_accessible :environment
10		10
11	- scope :from_environment, ->(environment) { where :environment_id => environment }	11	+ scope :from_environment, -> environment { where :environment_id => environment }
12		12
13	after_initialize do \|report\|	13	after_initialize do \|report\|
14	report.failed = {:people => [], :comments => []} if report.failed.blank?	14	report.failed = {:people => [], :comments => []} if report.failed.blank?