From 0f6062ef7cafb53396256c7b5b9cf5e715693637 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Mon, 22 May 2023 18:58:38 +0200 Subject: Fix Style/NonNilCheck offenses There were 8 occurrences of `!nil?` and 4 of `!= nil`. This change will standardize the usage of non-nil checks --- lib/axlsx/drawing/d_lbls.rb | 2 +- lib/axlsx/workbook/worksheet/col.rb | 2 +- lib/axlsx/workbook/worksheet/page_setup.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/axlsx') diff --git a/lib/axlsx/drawing/d_lbls.rb b/lib/axlsx/drawing/d_lbls.rb index 8965599c..7e3936cc 100644 --- a/lib/axlsx/drawing/d_lbls.rb +++ b/lib/axlsx/drawing/d_lbls.rb @@ -76,7 +76,7 @@ module Axlsx str << '' instance_vals = Axlsx.instance_values_for(self) %w(d_lbl_pos show_legend_key show_val show_cat_name show_ser_name show_percent show_bubble_size show_leader_lines).each do |key| - next unless instance_vals.key?(key) && instance_vals[key] != nil + next unless instance_vals.key?(key) && !instance_vals[key].nil? str << "" end diff --git a/lib/axlsx/workbook/worksheet/col.rb b/lib/axlsx/workbook/worksheet/col.rb index 539a6007..ff942d32 100644 --- a/lib/axlsx/workbook/worksheet/col.rb +++ b/lib/axlsx/workbook/worksheet/col.rb @@ -114,7 +114,7 @@ module Axlsx # current @width value. # TODO!!! # Axlsx.validate_unsigned_numeric(v) unless v == nil - @custom_width = @best_fit = v != nil + @custom_width = @best_fit = !v.nil? @width = v.nil? ? v : [v, MAX_WIDTH].min end diff --git a/lib/axlsx/workbook/worksheet/page_setup.rb b/lib/axlsx/workbook/worksheet/page_setup.rb index 0bd0cdb8..6fc8ccba 100644 --- a/lib/axlsx/workbook/worksheet/page_setup.rb +++ b/lib/axlsx/workbook/worksheet/page_setup.rb @@ -225,8 +225,8 @@ module Axlsx # We treat any page set up that has a value set for fit_to_width or fit_to_height value as fit_to_page. # @return [Boolean] def fit_to_page? - # is there some better what to express this? - (fit_to_width != nil || fit_to_height != nil) + # is there some better way to express this? + (!fit_to_width.nil? || !fit_to_height.nil?) end # Serializes the page settings element. -- cgit v1.2.3