diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 0f64e2ae..1da21492 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -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: diff --git a/lib/paper_trail/version_concern.rb b/lib/paper_trail/version_concern.rb index 2640115f..1df43e53 100644 --- a/lib/paper_trail/version_concern.rb +++ b/lib/paper_trail/version_concern.rb @@ -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