rubyXL 3.4.27 → 3.4.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ededaa2494386b21ce1c01a251a85cca7415c0c6114895debfb0b28007bc9c13
-  data.tar.gz: 818e9f45a8f68a1821d16a489c516b6ba84e3add5ccc734025c785010f489f27
+  metadata.gz: 14119a8af99822bbe1fd209a060d5374e92fe921750766cc83fa2cebdf586963
+  data.tar.gz: a3870a59650bd9b32c82bd6ad950aa720cb9f50370b96956eecb522d1c8e8fce
 SHA512:
-  metadata.gz: 93a29b20843980d6549d52c560ec70bf1cb9bc322b20d201857f268aaef3ddeb2f8b3e4afca2584bcb53bdf2b471bea0b127d3bcf17ee769d95bfa1e5d3ea650
-  data.tar.gz: 5276b2c4614066cb60ffeaaeb058109c025668a4cf4df40161fc28aa8ab097de3a8e3bdfd95757d01c8357ec43781efaf4a27f66ca2ff6246b5a74401e8148a5
+  metadata.gz: 27f8bf50de4801721703c78a73b156626998d37a7fa1ce76a05e2848d9bf233a29ed91044567b2b02a8cd29487872f2a5ed2eeeb65c45ae6b3fed8b4bfccea25
+  data.tar.gz: 7ba264f255d544ba9efb9bb5aaa272a2ba84442930bf41eb72c6a63571b0ed21a69255975c843b796725ce17ca29c81950b1784a0c027a54dc35e4801ea0870e

data/.rubocop.yml

@@ -16,6 +16,34 @@ AllCops:
     - Gemfile
     - rubyXL.gemspec
 
+# "Excessive" parentheses are your friend. You will understand it in time, Luke.
+Style/TernaryParentheses:
+  Enabled: false
+
+# Implicity is evil. Unwilingness to type a couple extra characters is laziness.
+Style/RedundantConstantBase:
+  Enabled: false
+
+# I don't see a good reason in this. Unless you are paid per line.
+Style/CommentedKeyword:
+  Enabled: false
+
+# Yes, some things are "redundant" but they are there exactly to drive home some point...
+Style/RedundantSelf:
+  Enabled: false
+
+Naming/AccessorMethodName:
+  Enabled: false
+
+Layout/FirstArrayElementIndentation:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Layout/LeadingCommentSpace:
+  Enabled: false
+
 Style/BlockDelimiters:
   Enabled: false
 

data/README.rdoc

@@ -168,7 +168,9 @@ Please note: these methods are being phased out in favor of the OOXML object mod
   worksheet.change_column_width(0, 30)  # Sets first column width to 30
 
 ==== Merging Cells
-  worksheet.merge_cells(0, 0, 1, 1)  # Merges A1:B2
+  worksheet.merge_cells(0, 1, 2, 3)  # Merges B1:D3
+  worksheet.merge_cells('A2:C4')     # Merges A2:C4
+  worksheet.merge_cells(row_from: 0, row_to: 1, col_from 2:, col_to: 3) # Merges C1:D2
 
 ==== Insert Row
 This method will insert a row at specified index, pushing all rows below it down. It also copies styles from row above.

data/VERSION

@@ -1 +1 @@
-3.4.27
+3.4.33

data/lib/rubyXL/convenience_methods/cell.rb

@@ -116,7 +116,7 @@ module RubyXL
 
     def fill_color
       validate_worksheet
-      return workbook.get_fill_color(get_cell_xf)
+      workbook.get_fill_color(get_cell_xf)
     end
 
     def horizontal_alignment

data/lib/rubyXL/convenience_methods/color.rb

@@ -48,8 +48,8 @@ module RubyXL
         end
 
         hls_color.h = (g - b) / delta       if (r == max)
-        hls_color.h = 2.0 + (b - r) / delta if (g == max)
-        hls_color.h = 4.0 + (r - g) / delta if (b == max)
+        hls_color.h = 2.0 + ((b - r) / delta) if (g == max)
+        hls_color.h = 4.0 + ((r - g) / delta) if (b == max)
 
         hls_color.h *= 60;
         hls_color.h += 360 if hls_color.h < 0
@@ -95,7 +95,7 @@ module RubyXL
             t1 = l + s - (l * s)
           end
 
-          t2 = 2.0 * l - t1;
+          t2 = (2.0 * l) - t1;
           h = self.h / 360.0
 
           t_r = h + (1.0 / 3.0)
@@ -124,11 +124,11 @@ module RubyXL
         t3 -= 1.0 if (t3 > 1)
 
         if (6.0 * t3 < 1) then
-          color = t2 + (t1 - t2) * 6.0 * t3;
+          color = t2 + ((t1 - t2) * 6.0 * t3);
         elsif (2.0 * t3 < 1) then
           color = t1;
         elsif (3.0 * t3 < 2) then
-          color = t2 + (t1 - t2) * ((2.0 / 3.0) - t3) * 6.0;
+          color = t2 + ((t1 - t2) * ((2.0 / 3.0) - t3) * 6.0);
         else
           color = t2;
         end
@@ -143,7 +143,7 @@ module RubyXL
         if tint < 0 then
           self.l = l * (1.0 + tint);
         else
-          self.l = l * (1.0 - tint) + tint;
+          self.l = (l * (1.0 - tint)) + tint;
         end
 
         self

data/lib/rubyXL/convenience_methods/workbook.rb

@@ -21,11 +21,7 @@ module RubyXL
     end
 
     def get_fill_color(xf)
-      fill = fills[xf.fill_id]
-      pattern = fill && fill.pattern_fill
-      color = pattern && pattern.fg_color
-      color = color && color.get_rgb(self)
-      color && color.to_s || 'ffffff'
+      fills[xf.fill_id]&.pattern_fill&.fg_color&.get_rgb(self)&.to_s || 'ffffff'
     end
 
     def register_new_fill(new_fill, old_xf)

data/lib/rubyXL/convenience_methods/worksheet.rb

@@ -206,10 +206,10 @@ module RubyXL
       validate_nonnegative(column_index)
 
       # Delete column
-      sheet_data.rows.each { |row| row && row.cells.delete_at(column_index) }
+      sheet_data.rows.each { |row| row&.cells&.delete_at(column_index) }
 
       # Update column numbers for cells to the right of the deleted column
-      sheet_data.rows.each_with_index { |row, row_index|
+      sheet_data.rows.each { |row|
         next if row.nil?
         row.cells.each_with_index { |c, ci|
           c.column = ci if c.is_a?(Cell)
@@ -280,7 +280,7 @@ module RubyXL
       validate_workbook
       validate_nonnegative(row)
       row = sheet_data.rows[row]
-      row && row.ht || RubyXL::Row::DEFAULT_HEIGHT
+      (row && row.ht) || RubyXL::Row::DEFAULT_HEIGHT
     end
 
     def get_row_border(row, border_direction)
@@ -382,7 +382,7 @@ module RubyXL
     # Get column width measured in number of digits, as per
     # http://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.column%28v=office.14%29.aspx
     def change_column_width(column_index, width_in_chars = RubyXL::ColumnRange::DEFAULT_WIDTH)
-      change_column_width_raw(column_index, ((width_in_chars + (5.0 / RubyXL::Font::MAX_DIGIT_WIDTH)) * 256).to_i / 256.0)
+      change_column_width_raw(column_index, RubyXL::ColumnRange::chars2raw(width_in_chars))
     end
 
     # Helper method to get the style index for a column
@@ -689,12 +689,32 @@ module RubyXL
     end
 
     # Merges cells within a rectangular area
-    def merge_cells(start_row, start_col, end_row, end_col)
+    # #merge_cells(row_from, col_from, row_to, col_to)
+    # #merge_cells(reference_string)
+    # #merge_cells(row_from:, row_to:, col_from:, col_to:)
+    def merge_cells(*params)
       validate_workbook
 
+      row_from = col_from = row_to = col_to = nil
+      case params.size
+      when 4 then row_from, col_from, row_to, col_to = params
+      when 1 then
+        case params.first
+        when Hash then
+          row_from, row_to, col_from, col_to = params.first.fetch_values(:row_from, :row_to, :col_from, :col_to)
+        when String then
+          from, to = params[0].split(':')
+          raise ArgumentError.new("reference for merging cells must be a range") if to.nil?
+          row_from, col_from = RubyXL::Reference.ref2ind(from)
+          row_to, col_to = RubyXL::Reference.ref2ind(to)
+        else
+          raise ArgumentError.new("invalid value for #{self.class}: #{params[0].inspect}") unless params[0].is_a?(String)
+        end
+      end
+
       self.merged_cells ||= RubyXL::MergedCells.new
       # TODO: add validation to make sure ranges are not intersecting with existing ones
-      merged_cells << RubyXL::MergedCell.new(:ref => RubyXL::Reference.new(start_row, end_row, start_col, end_col))
+      merged_cells << RubyXL::MergedCell.new(:ref => RubyXL::Reference.new(row_from, row_to, col_from, col_to))
     end
 
     def add_validation_list(ref, list_arr)

data/lib/rubyXL/objects/color.rb

@@ -4,7 +4,7 @@ require 'rubyXL/objects/simple_types'
 module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_color-4.html
   class Color < OOXMLObject
-    COLOR_REGEXP = /\A([a-f]|[A-F]|[0-9]){6}\Z/
+    COLOR_REGEXP = /\A(?:[a-f0-9]{6}|[a-f0-9]{8})\Z/i
 
     define_attribute(:auto,    :bool)
     define_attribute(:indexed, :uint)

data/lib/rubyXL/objects/column_range.rb

@@ -17,21 +17,25 @@ module RubyXL
 
     def delete_column(col_index)
       col = col_index + 1
-      self.min -=1 if min >= col
-      self.max -=1 if max >= col
+      self.min -= 1 if min >= col
+      self.max -= 1 if max >= col
     end
 
     def insert_column(col_index)
       col = col_index + 1
-      self.min +=1 if min >= col
-      self.max +=1 if max >= col - 1
+      self.min += 1 if min >= col
+      self.max += 1 if max >= col - 1
     end
 
     def include?(col_index)
-      ((min-1)..(max-1)).include?(col_index)
+      ((min - 1)..(max - 1)).include?(col_index)
     end
 
-    DEFAULT_WIDTH = 9
+    def self.chars2raw(width_in_chars)
+      ((width_in_chars + (5.0 / RubyXL::Font::MAX_DIGIT_WIDTH)) * 256).to_i / 256.0
+    end
+
+    DEFAULT_WIDTH = 8
   end
 
   class ColumnRanges < OOXMLContainerObject
@@ -47,7 +51,7 @@ module RubyXL
       old_range = self.locate_range(col_index)
 
       if old_range.nil? then
-        new_range = RubyXL::ColumnRange.new
+        new_range = RubyXL::ColumnRange.new(width: RubyXL::ColumnRange.chars2raw(RubyXL::ColumnRange::DEFAULT_WIDTH))
       else
         if old_range.min == col_num && old_range.max == col_num then
           return old_range # Single column range, OK to change in place
@@ -58,9 +62,9 @@ module RubyXL
           new_range = old_range.dup
           old_range.max -= 1
         else
-          range_before = old_range.dup
-          range_before.max = col_index # col_num - 1
-          self << range_before
+          prior_range = old_range.dup
+          prior_range.max = col_index # col_num - 1
+          self << prior_range
 
           old_range.min = col_num + 1
 
@@ -82,8 +86,8 @@ module RubyXL
     end
 
     def before_write_xml
-      self.sort_by!{ |r| r.min }
-      !(self.empty?)
+      self.sort_by!(&:min)
+      !self.empty?
     end
   end
 end

data/lib/rubyXL/objects/document_properties.rb

@@ -69,6 +69,7 @@ module RubyXL
         when RubyXL::Chartsheet then chartsheets += 1
         end
       }
+
       add_parts_count('Worksheets', worksheets) if worksheets > 0
       add_parts_count('Charts', chartsheets) if chartsheets > 0
 

data/lib/rubyXL/objects/ooxml_object.rb

@@ -21,7 +21,7 @@ module RubyXL
     # Defines an attribute of OOXML object.
     # === Parameters
     # * +attribute_name+ - Name of the element attribute as seen in the source XML. Can be either <tt>"String"</tt> or <tt>:Symbol</tt>
-    #   * Special attibute name <tt>'_'</tt> (underscore) denotes the value of the element rather than attribute.
+    #   * Special attribute name <tt>'_'</tt> (underscore) denotes the value of the element rather than attribute.
     # * +attribute_type+ - Specifies the conversion type for the attribute when parsing. Available options are:
     #   * +:int+ - <tt>Integer</tt>
     #   * +:uint+ - Unsigned <tt>Integer</tt>
@@ -123,7 +123,9 @@ module RubyXL
       end
 
       obj = self.new
-      obj.local_namespaces = node.namespace_definitions
+      hsh = {}
+      node.namespace_definitions.each { |ns| hsh[ns.href] = ns.prefix }
+      obj.local_namespaces = hsh
 
       known_attributes = obtain_class_variable(:@@ooxml_attributes)
 
@@ -149,8 +151,9 @@ module RubyXL
 
         node.element_children.each { |child_node|
           ns = child_node.namespace
-          prefix = if known_namespaces.has_key?(ns.href) then known_namespaces[ns.href]
-                   else ns.prefix
+
+          prefix = if known_namespaces.has_key?(ns&.href) then known_namespaces[ns&.href]
+                   else ns&.prefix
                    end
 
           child_node_name = case prefix
@@ -254,8 +257,8 @@ module RubyXL
 
     def ==(other)
       other.is_a?(self.class) &&
-        obtain_class_variable(:@@ooxml_attributes).all? { |k, v| self.send(v[:accessor]) == other.send(v[:accessor]) } &&
-        obtain_class_variable(:@@ooxml_child_nodes).all? { |k, v| self.send(v[:accessor]) == other.send(v[:accessor]) }
+        obtain_class_variable(:@@ooxml_attributes).all? { |_k, v| self.send(v[:accessor]) == other.send(v[:accessor]) } &&
+        obtain_class_variable(:@@ooxml_child_nodes).all? { |_k, v| self.send(v[:accessor]) == other.send(v[:accessor]) }
     end
 
     # Recursively write the OOXML object and all its children out as Nokogiri::XML. Immediately before the actual
@@ -312,12 +315,11 @@ module RubyXL
       element_text = attrs.delete('_')
       elem = xml.create_element(node_name_override || obtain_class_variable(:@@ooxml_tag_name), attrs, element_text)
 
-      if @local_namespaces.nil? || @local_namespaces.empty? then # If no local namespaces provided in the original document,
-        # use the defaults
-        obtain_class_variable(:@@ooxml_namespaces).each_pair { |k, v| elem.add_namespace_definition(v, k) }
-      else # otherwise preserve the original ones
-        @local_namespaces.each { |ns| elem.add_namespace_definition(ns.prefix, ns.href) }
-      end
+      # First, populate namespaces from the original document
+      @local_namespaces&.each_pair { |href, prefix| elem.add_namespace_definition(prefix, href) }
+
+      # Then, add defaults. Note that if some namespace prefix was already set, Nokogiri will NOT change that namespace.
+      obtain_class_variable(:@@ooxml_namespaces).each_pair { |href, prefix| elem.add_namespace_definition(prefix, href) }
 
       child_nodes = obtain_class_variable(:@@ooxml_child_nodes)
       child_nodes.each_pair { |child_node_name, child_node_params|
@@ -355,7 +357,7 @@ module RubyXL
     def before_write_xml
       #TODO# This will go away once containers are fully implemented.
       child_nodes = obtain_class_variable(:@@ooxml_child_nodes)
-      child_nodes.each_pair { |child_node_name, child_node_params|
+      child_nodes.each_pair { |_child_node_name, child_node_params|
         self.count = self.send(child_node_params[:accessor]).size if child_node_params[:is_array] == :with_count
       }
       true
@@ -369,7 +371,7 @@ module RubyXL
     include OOXMLObjectInstanceMethods
   end
 
-  # Parent class for OOXML conainer objects (for example,
+  # Parent class for OOXML container objects (for example,
   # <tt>&lt;fonts&gt;&lt;font&gt;...&lt;/font&gt;&lt;font&gt;...&lt;/font&gt;&lt;/fonts&gt;</tt>
   # that obscures the top-level container, allowing direct access to the contents as +Array+.
   class OOXMLContainerObject < Array

data/lib/rubyXL/objects/query_table.rb

@@ -25,7 +25,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_queryTableFields-1.html
   class QueryTableFields < OOXMLObject
-    define_child_node(RubyXL::QueryTableField, :collection => :with_count, :accessor => :fields, :node_name => :queryTableField)
+    define_child_node(RubyXL::QueryTableField, :collection => :with_count,
+                      :accessor => :fields, :node_name => :queryTableField)
     define_element_name 'queryTableFields'
   end
 
@@ -38,7 +39,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_queryTableDeletedFields-1.html
   class QueryTableDeletedFields < OOXMLObject
-    define_child_node(RubyXL::QueryTableDeletedField, :collection => :with_count, :accessor => :deleted_fields, :node_name => :deletedField)
+    define_child_node(RubyXL::QueryTableDeletedField, :collection => :with_count,
+                      :accessor => :deleted_fields, :node_name => :deletedField)
     define_element_name 'queryTableDeletedFields'
   end
 

data/lib/rubyXL/objects/reference.rb

@@ -1,6 +1,6 @@
 module RubyXL
   class Reference
-    ROW_MAX = 1024*1024
+    ROW_MAX = 1024 * 1024
     COL_MAX = 16393
 
     attr_reader :row_range, :col_range
@@ -61,15 +61,18 @@ module RubyXL
     end
 
     def cover?(other)
-      !other.nil? && (@row_range.cover?(other.row_range.begin) && @row_range.cover?(other.row_range.end) &&
-                      @col_range.cover?(other.col_range.begin) && @col_range.cover?(other.col_range.end))
+      !other.nil? && (@row_range.cover?(other.row_range.begin) &&
+                      @row_range.cover?(other.row_range.end) &&
+                      @col_range.cover?(other.col_range.begin) &&
+                      @col_range.cover?(other.col_range.end))
     end
 
     def to_s
       if single_cell? then
         self.class.ind2ref(@row_range.begin, @col_range.begin)
       else
-        self.class.ind2ref(@row_range.begin, @col_range.begin) + ':' + self.class.ind2ref(@row_range.end, @col_range.end)
+        self.class.ind2ref(@row_range.begin, @col_range.begin) + ':' +
+                           self.class.ind2ref(@row_range.end, @col_range.end)
       end
     end
 
@@ -99,7 +102,8 @@ module RubyXL
     # Converts Excel-style cell reference to +row+ and +col+ zero-based indices.
     def self.ref2ind(str)
       return [ -1, -1 ] unless str =~ /\A([A-Z]+)(\d+)\Z/
-      [ Regexp.last_match(2).to_i - 1, Regexp.last_match(1).each_byte.inject(0) { |col, chr| col * 26 + (chr - 64) } - 1 ]
+      [ Regexp.last_match(2).to_i - 1,
+        Regexp.last_match(1).each_byte.inject(0) { |col, chr| (col * 26) + (chr - 64) } - 1 ]
     end
   end
 
@@ -109,7 +113,7 @@ module RubyXL
     end
 
     def to_s
-      self.collect{ |ref| ref.to_s }.join(' ')
+      self.collect(&:to_s).join(' ')
     end
   end
 end

data/lib/rubyXL/objects/relationships.rb

@@ -95,7 +95,7 @@ module RubyXL
         self.related_files[rel.id] = obj
       }
 
-      @@debug_indent -=2 if @@debug_indent
+      @@debug_indent -= 2 if @@debug_indent
 
       related_files
     end

data/lib/rubyXL/objects/shared_strings.rb

@@ -20,7 +20,7 @@ module RubyXL
       super
       # So far, going by the structure that the original creator had in mind. However,
       # since the actual implementation is now extracted into a separate class,
-      # we will be able to transparrently change it later if needs be.
+      # we will be able to transparently change it later if needs be.
       @index_by_content = {}
     end
 

data/lib/rubyXL/objects/sheet_data.rb

@@ -50,7 +50,7 @@ module RubyXL
     end
 
     def row
-      r && r.first_row
+      r&.first_row
     end
 
     def row=(v)
@@ -58,7 +58,7 @@ module RubyXL
     end
 
     def column
-      r && r.first_col
+      r&.first_col
     end
 
     def column=(v)
@@ -66,7 +66,7 @@ module RubyXL
     end
 
     def raw_value
-      value_container && value_container.value
+      value_container&.value
     end
 
     def raw_value=(v)
@@ -98,8 +98,7 @@ module RubyXL
         else false
         end
 
-      num_fmt = self.number_format
-      num_fmt && num_fmt.is_date_format?
+      self.number_format&.is_date_format?
     end
 
     # Gets massaged value of the cell, converting datatypes to those known to Ruby (that includes
@@ -111,6 +110,7 @@ module RubyXL
       when RubyXL::DataType::SHARED_STRING then workbook.shared_strings_container[r.to_i].to_s
       when RubyXL::DataType::INLINE_STRING then is.to_s
       when RubyXL::DataType::RAW_STRING    then raw_value
+      when RubyXL::DataType::DATE          then raw_value && DateTime.parse(raw_value)
       else
         if is then is.to_s
         elsif is_date? then workbook.num_to_date(r.to_f)
@@ -133,7 +133,7 @@ module RubyXL
     include LegacyCell
   end
 
-#TODO#<row r="1" spans="1:1" x14ac:dyDescent="0.25">
+#TODO# <row r="1" spans="1:1" x14ac:dyDescent="0.25">
 
   # http://www.datypic.com/sc/ooxml/e-ssml_row-1.html
   class Row < OOXMLObject

data/lib/rubyXL/objects/storage.rb

@@ -11,7 +11,7 @@ module RubyXL
     end
 
     def self.parse_file(zip_file, file_path)
-      (entry = zip_file.find_entry(RubyXL::from_root(file_path))) && self.new(file_path, entry.get_input_stream { |f| f.read })
+      (entry = zip_file.find_entry(RubyXL::from_root(file_path))) && self.new(file_path, entry.get_input_stream(&:read))
     end
 
     def add_to_zip(zip_stream)

data/lib/rubyXL/objects/stylesheet.rb

@@ -79,9 +79,8 @@ module RubyXL
     define_element_name 'cellXfs'
 
     def self.default
-      self.new(:_ => [
-                 RubyXL::XF.new(:num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0, :xfId => 0)
-               ])
+      self.new(:_ => [ RubyXL::XF.new(:num_fmt_id => 0, :font_id => 0, :fill_id => 0,
+                                      :border_id => 0, :xfId => 0) ])
     end
   end
 

data/lib/rubyXL/objects/text.rb

@@ -18,7 +18,7 @@ module RubyXL
 
     def before_write_xml
       preserve_whitespace
-      self.value.gsub!(INVALID_XML10_CHARS) { |c| '_x%04x_' % c.ord }
+      self.value.gsub(INVALID_XML10_CHARS) { |bad_char| format('_x%04x_', bad_char.ord) }
       true
     end
 
@@ -84,8 +84,8 @@ module RubyXL
 
     def to_s
       # `dup` here unfreezes the string since it's not a constant but initial value
-      str = if t.nil? then ''.dup else t.to_s end
-      r && r.each { |rtr| str << rtr.to_s if rtr }
+      str = t.nil? ? ''.dup : t.to_s
+      r&.each { |rtr| str << rtr.to_s if rtr }
       str
     end
   end

data/lib/rubyXL/objects/theme.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8  <-- magic comment, need this because of sime fancy fonts in the default scheme below. See http://stackoverflow.com/questions/6444826/ruby-utf-8-file-encoding
-
 require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/extensions'
 
@@ -1391,21 +1389,21 @@ module RubyXL
     end
 
     def get_theme_color(idx)
-      color_scheme = a_theme_elements && a_theme_elements.a_clr_scheme
-
-      if color_scheme then
-        case idx
-        when 0 then color_scheme.a_lt1
-        when 1 then color_scheme.a_dk1
-        when 2 then color_scheme.a_lt2
-        when 3 then color_scheme.a_dk2
-        when 4 then color_scheme.a_accent1
-        when 5 then color_scheme.a_accent2
-        when 6 then color_scheme.a_accent3
-        when 7 then color_scheme.a_accent4
-        when 8 then color_scheme.a_accent5
-        when 9 then color_scheme.a_accent6
-        end
+      color_scheme = a_theme_elements&.a_clr_scheme
+
+      return unless color_scheme
+
+      case idx
+      when 0 then color_scheme.a_lt1
+      when 1 then color_scheme.a_dk1
+      when 2 then color_scheme.a_lt2
+      when 3 then color_scheme.a_dk2
+      when 4 then color_scheme.a_accent1
+      when 5 then color_scheme.a_accent2
+      when 6 then color_scheme.a_accent3
+      when 7 then color_scheme.a_accent4
+      when 8 then color_scheme.a_accent5
+      when 9 then color_scheme.a_accent6
       end
     end
 

data/lib/rubyXL/objects/workbook.rb

@@ -303,7 +303,7 @@ module RubyXL
     REL_TYPE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument'.freeze
 
     # http://www.accountingweb.com/technology/excel/seven-characters-you-cant-use-in-worksheet-names
-    SHEET_NAME_FORBIDDEN_CHARS = /[\/\\*\[\]:?]/
+    SHEET_NAME_FORBIDDEN_CHARS = %r{[/\\*\[\]:?]}
 
     # https://answers.microsoft.com/en-us/msoffice/forum/all/excel-history-is-a-reserved-name-help/f8a398a4-b72c-48e3-82da-4f132c305e91
     SHEET_NAME_FORBIDDEN_NAMES = [ 'History' ]
@@ -411,12 +411,12 @@ module RubyXL
     alias_method :write, :save
 
     DATE1904 = DateTime.new(1904, 1, 1)
-    # Subtracting one day to accomodate for erroneous 1900 leap year compatibility only for 1900 based dates
+    # Subtracting one day to accommodate for erroneous 1900 leap year compatibility only for 1900 based dates
     DATE1899 = DateTime.new(1899, 12, 31) - 1
     MARCH_1_1900 = 61
 
     def base_date
-      (workbook_properties && workbook_properties.date1904) ? DATE1904 : DATE1899
+      workbook_properties&.date1904 ? DATE1904 : DATE1899
     end
     private :base_date
 
@@ -432,11 +432,11 @@ module RubyXL
 
       # Bug-for-bug Excel compatibility (https://support.microsoft.com/kb/214058/)
       if num < MARCH_1_1900 then
-        num += 1 unless workbook_properties && workbook_properties.date1904
+        num += 1 unless workbook_properties&.date1904
       end
 
       dateparts = num.divmod(1)
-      base_date + (dateparts[0] + (dateparts[1] * 86400).round(6) / 86400)
+      base_date + (dateparts[0] + ((dateparts[1] * 86400).round(6) / 86400))
     end
 
     include Enumerable
@@ -518,7 +518,7 @@ module RubyXL
     end
 
     def company
-      root.document_properties.company && root.document_properties.company.value
+      root.document_properties.company&.value
     end
 
     def company=(v)
@@ -527,7 +527,7 @@ module RubyXL
     end
 
     def application
-      root.document_properties.application && root.document_properties.application.value
+      root.document_properties.application&.value
     end
 
     def application=(v)
@@ -536,7 +536,7 @@ module RubyXL
     end
 
     def appversion
-      root.document_properties.app_version && root.document_properties.app_version.value
+      root.document_properties.app_version&.value
     end
 
     def appversion=(v)
@@ -561,7 +561,7 @@ module RubyXL
     end
 
     def date1904
-      workbook_properties && workbook_properties.date1904
+      workbook_properties&.date1904
     end
 
     def date1904=(v)