Fix Performance/Sum cop (mastodon#24788)

11ways · Jul 7, 2023 · c5ae71f · c5ae71f
1 parent 524052e
commit c5ae71f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -371,14 +371,6 @@ Performance/StartWith:
   Exclude:
     - 'app/lib/extractor.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: OnlySumOrWithInitialValue.
-Performance/Sum:
-  Exclude:
-    - 'app/lib/activity_tracker.rb'
-    - 'app/models/trends/history.rb'
-    - 'lib/paperclip/color_extractor.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Performance/TimesMap:
   Exclude:

diff --git a/app/lib/activity_tracker.rb b/app/lib/activity_tracker.rb
@@ -43,7 +43,7 @@ def sum(start_at, end_at = Time.now.utc)
 
     case @type
     when :basic
-      redis.mget(*keys).map(&:to_i).sum
+      redis.mget(*keys).sum(&:to_i)
     when :unique
       redis.pfcount(*keys)
     end

diff --git a/app/models/trends/history.rb b/app/models/trends/history.rb
@@ -11,7 +11,7 @@ def initialize(prefix, id, date_range)
     end
 
     def uses
-      with_redis { |redis| redis.mget(*@days.map { |day| day.key_for(:uses) }).map(&:to_i).sum }
+      with_redis { |redis| redis.mget(*@days.map { |day| day.key_for(:uses) }).sum(&:to_i) }
     end
 
     def accounts

diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
@@ -173,7 +173,7 @@ def lighten_or_darken(color, by)
     def palette_from_histogram(result, quantity)
       frequencies       = result.scan(/([0-9]+)\:/).flatten.map(&:to_f)
       hex_values        = result.scan(/\#([0-9A-Fa-f]{6,8})/).flatten
-      total_frequencies = frequencies.reduce(&:+).to_f
+      total_frequencies = frequencies.sum.to_f
 
       frequencies.map.with_index { |f, i| [f / total_frequencies, hex_values[i]] }
                  .sort_by { |r| -r[0] }