Skip to content

Commit d2a81f0

Browse files
committed
Pass symbol as an argument instead of a block
1 parent 5b03a6e commit d2a81f0

File tree

11 files changed

+15
-17
lines changed

11 files changed

+15
-17
lines changed

app/controllers/rails_admin/main_controller.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ def redirect_to_on_success
9090
def sanitize_params_for!(action, model_config = @model_config, target_params = params[@abstract_model.param_key])
9191
return unless target_params.present?
9292
fields = model_config.send(action).with(controller: self, view: view_context, object: @object).visible_fields
93-
allowed_methods = fields.collect do|f|
94-
f.allowed_methods
95-
end.flatten.uniq.collect(&:to_s) << 'id' << '_destroy'
93+
allowed_methods = fields.collect(&:allowed_methods).flatten.uniq.collect(&:to_s) << 'id' << '_destroy'
9694
fields.each { |f| f.parse_input(target_params) }
9795
target_params.slice!(*allowed_methods)
9896
target_params.permit! if target_params.respond_to?(:permit!)

lib/rails_admin/abstract_model.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def new(m)
2727
def polymorphic_parents(adapter, model_name, name)
2828
@@polymorphic_parents[adapter.to_sym] ||= {}.tap do |hash|
2929
all(adapter).each do |am|
30-
am.associations.select { |r| r.as }.each do |association|
30+
am.associations.select(&:as).each do |association|
3131
(hash[[association.klass.to_s.underscore, association.as].join('_').to_sym] ||= []) << am.model
3232
end
3333
end

lib/rails_admin/config/fields/base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def virtual?
152152
# Accessor for field's length restrictions per validations
153153
#
154154
register_instance_option :valid_length do
155-
@valid_length ||= abstract_model.model.validators_on(name).detect { |v| v.kind == :length }.try { |v| v.options } || {}
155+
@valid_length ||= abstract_model.model.validators_on(name).detect { |v| v.kind == :length }.try(&:options) || {}
156156
end
157157

158158
register_instance_option :partial do

lib/rails_admin/config/fields/types/belongs_to_association.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ class BelongsToAssociation < RailsAdmin::Config::Fields::Association
1212
end
1313

1414
register_instance_option :sortable do
15-
@sortable ||= abstract_model.adapter_supports_joins? && associated_model_config.abstract_model.properties.collect { |p| p.name }.include?(associated_model_config.object_label_method) ? associated_model_config.object_label_method : {abstract_model.table_name => method_name}
15+
@sortable ||= abstract_model.adapter_supports_joins? && associated_model_config.abstract_model.properties.collect(&:name).include?(associated_model_config.object_label_method) ? associated_model_config.object_label_method : {abstract_model.table_name => method_name}
1616
end
1717

1818
register_instance_option :searchable do
19-
@searchable ||= associated_model_config.abstract_model.properties.collect { |p| p.name }.include?(associated_model_config.object_label_method) ? [associated_model_config.object_label_method, {abstract_model.model => method_name}] : {abstract_model.model => method_name}
19+
@searchable ||= associated_model_config.abstract_model.properties.collect(&:name).include?(associated_model_config.object_label_method) ? [associated_model_config.object_label_method, {abstract_model.model => method_name}] : {abstract_model.model => method_name}
2020
end
2121

2222
register_instance_option :partial do

lib/rails_admin/config/has_fields.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def fields(*field_names, &block)
8383
return all_fields if field_names.empty? && !block
8484

8585
if field_names.empty?
86-
defined = _fields.select { |f| f.defined }
86+
defined = _fields.select(&:defined)
8787
defined = _fields if defined.empty?
8888
else
8989
defined = field_names.collect { |field_name| _fields.detect { |f| f.name == field_name } }

spec/dummy_app/app/active_record/team.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Team < ActiveRecord::Base
1515
belongs_to :division
1616

1717
def player_names_truncated
18-
players.collect { |p| p.name }.join(', ')[0..32]
18+
players.collect(&:name).join(', ')[0..32]
1919
end
2020

2121
def color_enum

spec/dummy_app/app/mongoid/team.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Team
3636
validates_length_of :mascot, maximum: 100
3737

3838
def player_names_truncated
39-
players.collect { |p| p.name }.join(', ')[0..32]
39+
players.collect(&:name).join(', ')[0..32]
4040
end
4141

4242
def color_enum

spec/orm/active_record.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def columns_hash
2727
end
2828

2929
def column_names
30-
@column_names ||= columns.collect { |column| column.name }
30+
@column_names ||= columns.collect(&:name)
3131
end
3232

3333
def column_defaults

spec/rails_admin/adapters/active_record/association_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ARComment < ActiveRecord::Base
5454

5555
it 'list associations types in supported [:belongs_to, :has_and_belongs_to_many, :has_many, :has_one]' do
5656
# ActiveRecord 4.1 converts has_and_belongs_to_many association to has_many
57-
expect((@post.associations + @blog.associations + @user.associations).collect { |a| a.type }.uniq.collect(&:to_s)).to include(*%w(belongs_to has_many has_one))
57+
expect((@post.associations + @blog.associations + @user.associations).collect(&:type).uniq.collect(&:to_s)).to include(*%w(belongs_to has_many has_one))
5858
end
5959

6060
describe 'belongs_to association' do

spec/rails_admin/adapters/mongoid_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
end
5757

5858
it 'supports eager loading' do
59-
expect(@abstract_model.all(include: :team).inclusions.collect { |i| i.class_name }).to eq(['Team'])
59+
expect(@abstract_model.all(include: :team).inclusions.collect(&:class_name)).to eq(['Team'])
6060
end
6161

6262
it 'supports limiting' do

0 commit comments

Comments
 (0)