Merge pull request #243 from tagliala/chore/fix-zero-length-predicate-offenses

Fix Style/ZeroLengthPredicate unsafe offenses

4 files changed, 5 insertions, 15 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index df3b4467..1de00edb 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -308,11 +308,8 @@ Style/NonNilCheck:
 Style/NumericPredicate:
   Exclude:
     - 'spec/**/*'
-    - 'lib/axlsx/package.rb'
     - 'lib/axlsx/stylesheet/font.rb'
     - 'lib/axlsx/util/validators.rb'
-    - 'lib/axlsx/workbook/workbook.rb'
-    - 'lib/axlsx/workbook/worksheet/sheet_pr.rb'
     - 'lib/axlsx/workbook/worksheet/worksheet.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -546,13 +543,6 @@ Style/YodaCondition:
   Exclude:
     - 'lib/axlsx/workbook/worksheet/col.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/ZeroLengthPredicate:
-  Exclude:
-    - 'lib/axlsx/package.rb'
-    - 'lib/axlsx/workbook/workbook.rb'
-    - 'lib/axlsx/workbook/worksheet/sheet_pr.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
diff --git a/lib/axlsx/package.rb b/lib/axlsx/package.rb
index e8276d7c..3f225648 100644
--- a/lib/axlsx/package.rb
+++ b/lib/axlsx/package.rb
@@ -239,7 +239,7 @@ module Axlsx
       end
 
       workbook.comments.each do |comment|
-        if comment.size > 0
+        unless comment.empty?
           parts << { :entry => "xl/#{comment.pn}", :doc => comment, :schema => SML_XSD }
           parts << { :entry => "xl/#{comment.vml_drawing.pn}", :doc => comment.vml_drawing, :schema => nil }
         end
@@ -314,13 +314,13 @@ module Axlsx
       end
 
       workbook.comments.each do |comment|
-        if comment.size > 0
+        unless comment.empty?
           c_types << Axlsx::Override.new(:PartName => "/xl/#{comment.pn}",
                                          :ContentType => COMMENT_CT)
         end
       end
 
-      if workbook.comments.size > 0
+      unless workbook.comments.empty?
         c_types << Axlsx::Default.new(:Extension => "vml", :ContentType => VML_DRAWING_CT)
       end
 
diff --git a/lib/axlsx/workbook/workbook.rb b/lib/axlsx/workbook/workbook.rb
index a0696cda..95d3e4a7 100644
--- a/lib/axlsx/workbook/workbook.rb
+++ b/lib/axlsx/workbook/workbook.rb
@@ -406,7 +406,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      add_worksheet(name: 'Sheet1') unless worksheets.size > 0
+      add_worksheet(name: 'Sheet1') if worksheets.empty?
       str << '<?xml version="1.0" encoding="UTF-8"?>'
       str << '<workbook xmlns="' << XML_NS << '" xmlns:r="' << XML_NS_R << '">'
       str << '<workbookPr date1904="' << @@date1904.to_s << '"/>'
diff --git a/lib/axlsx/workbook/worksheet/sheet_pr.rb b/lib/axlsx/workbook/worksheet/sheet_pr.rb
index 86826f77..ea191fa0 100644
--- a/lib/axlsx/workbook/worksheet/sheet_pr.rb
+++ b/lib/axlsx/workbook/worksheet/sheet_pr.rb
@@ -82,7 +82,7 @@ module Axlsx
 
     def update_properties
       page_setup_pr.fit_to_page = worksheet.fit_to_page?
-      if worksheet.auto_filter.columns.size > 0
+      unless worksheet.auto_filter.columns.empty?
         self.filter_mode = 1
         self.enable_format_conditions_calculation = 1
       end