Merge pull request #755 from magni-/rubocop_multiline_block_chain

Fix Style/MultilineBlockChain offenses
This commit is contained in:
Jared Beck 2016-04-04 14:15:57 -04:00
commit b061bb22ef
2 changed files with 4 additions and 7 deletions

View File

@ -54,11 +54,6 @@ Style/ModuleFunction:
- 'lib/paper_trail/serializers/json.rb'
- 'lib/paper_trail/serializers/yaml.rb'
# Offense count: 2
Style/MultilineBlockChain:
Exclude:
- 'lib/paper_trail/version_concern.rb'
# Offense count: 4
Style/MultilineTernaryOperator:
Exclude:

View File

@ -124,7 +124,8 @@ module PaperTrail
arel_field = arel_table[:object]
where_conditions = args.map { |field, value|
PaperTrail.serializer.where_object_condition(arel_field, field, value)
}.reduce { |a, e| a.and(e) }
}
where_conditions = where_conditions.reduce { |a, e| a.and(e) }
where(where_conditions)
end
end
@ -150,7 +151,8 @@ module PaperTrail
arel_field = arel_table[:object_changes]
where_conditions = args.map { |field, value|
PaperTrail.serializer.where_object_changes_condition(arel_field, field, value)
}.reduce { |a, e| a.and(e) }
}
where_conditions = where_conditions.reduce { |a, e| a.and(e) }
where(where_conditions)
end
end