From 9e5bc61c60f8775150163d6d2da73d60083f0dbd Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Thu, 15 Jun 2023 09:20:31 +0200 Subject: Fix Lint/UnusedBlockArgument offenses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use `each_value` instead of `each` where possible. The performance gain is minimal (3%). ``` Comparison: each_value: 4105733.4 i/s each: 3998011.4 i/s - 1.03x (± 0.00) slower ``` --- .rubocop_todo.yml | 8 -------- lib/axlsx/drawing/axes.rb | 2 +- lib/axlsx/workbook/worksheet/pivot_table.rb | 4 ++-- lib/axlsx/workbook/worksheet/sheet_view.rb | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index fc0449d9..525fd031 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -60,14 +60,6 @@ Lint/NonLocalExitFromIterator: Exclude: - 'lib/axlsx/util/validators.rb' -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments. -Lint/UnusedBlockArgument: - Exclude: - - 'lib/axlsx/drawing/axes.rb' - - 'lib/axlsx/workbook/worksheet/pivot_table.rb' - - 'lib/axlsx/workbook/worksheet/sheet_view.rb' - # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods. Lint/UnusedMethodArgument: diff --git a/lib/axlsx/drawing/axes.rb b/lib/axlsx/drawing/axes.rb index 010fe8cd..f63ef95d 100644 --- a/lib/axlsx/drawing/axes.rb +++ b/lib/axlsx/drawing/axes.rb @@ -32,7 +32,7 @@ module Axlsx def to_xml_string(str = +'', options = {}) if options[:ids] # CatAxis must come first in the XML (for Microsoft Excel at least) - sorted = axes.sort_by { |name, axis| axis.is_a?(CatAxis) ? 0 : 1 } + sorted = axes.sort_by { |_name, axis| axis.is_a?(CatAxis) ? 0 : 1 } sorted.each { |axis| str << '' } else axes.each { |axis| axis[1].to_xml_string(str) } diff --git a/lib/axlsx/workbook/worksheet/pivot_table.rb b/lib/axlsx/workbook/worksheet/pivot_table.rb index a75842cd..97c4515b 100644 --- a/lib/axlsx/workbook/worksheet/pivot_table.rb +++ b/lib/axlsx/workbook/worksheet/pivot_table.rb @@ -210,7 +210,7 @@ module Axlsx end str << '' str << '' - rows.size.times do |i| + rows.size.times do str << '' end str << '' @@ -220,7 +220,7 @@ module Axlsx str << '' str << "" str << '' - data[1..-1].each_with_index do |datum_value, i| + (data.size - 1).times do |i| str << "" end str << '' diff --git a/lib/axlsx/workbook/worksheet/sheet_view.rb b/lib/axlsx/workbook/worksheet/sheet_view.rb index 6138cbf7..ee19061a 100644 --- a/lib/axlsx/workbook/worksheet/sheet_view.rb +++ b/lib/axlsx/workbook/worksheet/sheet_view.rb @@ -198,7 +198,7 @@ module Axlsx serialized_attributes str str << '>' @pane.to_xml_string(str) if @pane - @selections.each do |key, selection| + @selections.each_value do |selection| selection.to_xml_string(str) end str << '' -- cgit v1.2.3