rubyXL 3.4.14 → 3.4.33

data/lib/rubyXL/convenience_methods/color.rb

@@ -1,6 +1,5 @@
 module RubyXL
   module ColorConvenienceMethods
-
     def get_rgb(workbook)
       if rgb then
         return rgb
@@ -13,7 +12,6 @@ module RubyXL
         RubyXL::RgbColor.parse(color_value).to_hls.apply_tint(tint).to_rgb.to_s
       end
     end
-
   end
 
   module ColorConvenienceClasses
@@ -50,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
@@ -60,7 +58,7 @@ module RubyXL
       end
 
       def self.parse(str)
-        r, g, b, a = str.unpack("A2A2A2A2")
+        r, g, b, a = str.unpack('A2A2A2A2')
 
         rgb_color = RgbColor.new
         rgb_color.r = r && r.to_i(16)
@@ -73,12 +71,11 @@ module RubyXL
 
       def to_s
         if a && a != 0 then
-          "%02x%02x%02x%02x" % [ r, g, b, a ]
+          format('%02x%02x%02x%02x', r, g, b, a)
         else
-          "%02x%02x%02x" % [ r, g, b ]
+          format('%02x%02x%02x', r, g, b)
         end
       end
-
     end
 
     class HlsColor
@@ -98,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)
@@ -127,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
@@ -146,12 +143,11 @@ 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
       end
-
     end
   end
 

data/lib/rubyXL/convenience_methods/workbook.rb

@@ -1,7 +1,5 @@
 module RubyXL
-
   module WorkbookConvenienceMethods
-
     def each
       worksheets.each{ |i| yield i }
     end
@@ -23,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)
@@ -73,8 +67,8 @@ module RubyXL
     def modify_fill(style_index, rgb)
       xf = cell_xfs[style_index || 0].dup
       new_fill = RubyXL::Fill.new(:pattern_fill =>
-                   RubyXL::PatternFill.new(:pattern_type => 'solid',
-                                           :fg_color => RubyXL::Color.new(:rgb => rgb)))
+                                                   RubyXL::PatternFill.new(:pattern_type => 'solid',
+                                                                           :fg_color     => RubyXL::Color.new(:rgb => rgb)))
       register_new_xf(register_new_fill(new_fill, xf))
     end
 
@@ -130,6 +124,13 @@ module RubyXL
       self.defined_names && self.defined_names.find { |n| n.name == name }
     end
 
+    def title
+      self.root.core_properties.dc_title && self.root.core_properties.dc_title.value
+    end
+
+    def title=(v)
+      self.root.core_properties.dc_title = v && RubyXL::StringNode.new(:value => v)
+    end
   end
 
   RubyXL::Workbook.send(:include, RubyXL::WorkbookConvenienceMethods) # ruby 2.1 compat

data/lib/rubyXL/convenience_methods/worksheet.rb

@@ -1,5 +1,4 @@
 module RubyXL
-
   module WorksheetConvenienceMethods
     NAME = 0
     SIZE = 1
@@ -106,6 +105,21 @@ module RubyXL
         }
       }
 
+      # Update merged cells for all rows below
+      if self.merged_cells then
+        merged_cells.each { |mc|
+          next if mc.ref.row_range.last < row_index
+
+          in_merged_cell = mc.ref.row_range.first < row_index
+          mc.ref = RubyXL::Reference.new(
+            mc.ref.row_range.first + (in_merged_cell ? 0 : 1),
+            mc.ref.row_range.last + 1,
+            mc.ref.col_range.first,
+            mc.ref.col_range.last,
+          )
+        }
+      end
+
       return new_row
     end
 
@@ -121,6 +135,23 @@ module RubyXL
         row && row.cells.each{ |c| c.row -= 1 unless c.nil? }
       }
 
+      # Update row number of merged cells
+      if self.merged_cells then
+        merged_cells.delete_if { |mc| mc.ref.row_range == (row_index..row_index) }
+        merged_cells.each { |mc|
+          next if mc.ref.row_range.last < row_index
+
+          in_merged_cell = mc.ref.row_range.first <= row_index
+          mc.ref = RubyXL::Reference.new(
+            mc.ref.row_range.first - (in_merged_cell ? 0 : 1),
+            mc.ref.row_range.last - 1,
+            mc.ref.col_range.first,
+            mc.ref.col_range.last,
+          )
+        }
+        merged_cells.delete_if { |mc| mc.ref.single_cell? }
+      end
+
       return deleted
     end
 
@@ -152,6 +183,21 @@ module RubyXL
 
       cols.insert_column(column_index)
 
+      # Update merged cells for all rows below
+      if self.merged_cells then
+        merged_cells.each { |mc|
+          next if mc.ref.col_range.last < column_index
+
+          in_merged_cell = mc.ref.row_range.first < column_index
+          mc.ref = RubyXL::Reference.new(
+            mc.ref.row_range.first,
+            mc.ref.row_range.last,
+            mc.ref.col_range.first + (in_merged_cell ? 0 : 1),
+            mc.ref.col_range.last + 1,
+          )
+        }
+      end
+
       # TODO: update column numbers
     end
 
@@ -160,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)
@@ -171,6 +217,24 @@ module RubyXL
       }
 
       cols.each { |range| range.delete_column(column_index) }
+
+      # Update row number of merged cells
+      return unless self.merged_cells
+
+      merged_cells.delete_if { |mc| mc.ref.col_range == (column_index..column_index) }
+      merged_cells.each { |mc|
+        next if mc.ref.col_range.last < column_index
+
+        in_merged_cell = mc.ref.col_range.first <= column_index
+        mc.ref = RubyXL::Reference.new(
+          mc.ref.row_range.first,
+          mc.ref.row_range.last,
+          mc.ref.col_range.first - (in_merged_cell ? 0 : 1),
+          mc.ref.col_range.last - 1,
+        )
+      }
+
+      merged_cells.delete_if { |mc| mc.ref.single_cell? }
     end
 
     def get_row_style(row_index)
@@ -216,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)
@@ -318,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
@@ -625,12 +689,44 @@ 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)
+      # "Any double quote characters in the value should be escaped with another double quote.
+      # If the value does not contain a comma, newline or double quote, then the String value should be returned unchanged.
+      # If the value contains a comma, newline or double quote, then the String value should be returned enclosed in double quotes."
+      expr = '"' + list_arr.collect{ |str| str.gsub('"', '""') }.join(',') + '"'
+      self.data_validations ||= RubyXL::DataValidations.new
+      self.data_validations <<
+        RubyXL::DataValidation.new({:sqref    => RubyXL::Reference.new(ref),
+                                    :formula1 => RubyXL::Formula.new(:expression => expr),
+                                    :type     => 'list'})
     end
   end
 

data/lib/rubyXL/objects/border.rb

@@ -2,7 +2,6 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/simple_types'
 
 module RubyXL
-
   class BorderEdge < OOXMLObject
     define_attribute(:style, RubyXL::ST_BorderStyle, :default => 'none')
     define_child_node(RubyXL::Color)
@@ -68,7 +67,5 @@ module RubyXL
     def self.default
       self.new(:_ => [ RubyXL::Border.new ])
     end
-
   end
-
 end

data/lib/rubyXL/objects/calculation_chain.rb

@@ -15,8 +15,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_calcChain.html
   class CalculationChain < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/calcChain'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/calcChain'.freeze
 
     define_child_node(RubyXL::CalculationChainCell, :collection => true, :accessor => :cells)
     define_child_node(RubyXL::ExtensionStorageArea)

data/lib/rubyXL/objects/cell_style.rb

@@ -2,11 +2,10 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/simple_types'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_cellStyle-1.html
   class CellStyle < OOXMLObject
     define_attribute(:name,          :string)
-    define_attribute(:xfId,          :int,  :required => true)
+    define_attribute(:xfId,          :int, :required => true)
     define_attribute(:builtinId,     :int)
     define_attribute(:iLevel,        :int)
     define_attribute(:hidden,        :bool)
@@ -61,5 +60,4 @@ module RubyXL
     define_attribute(:formatCode, :string, :required => true)
     define_element_name 'numFmt'
   end
-
 end

data/lib/rubyXL/objects/chartsheet.rb

@@ -5,7 +5,6 @@ require 'rubyXL/objects/relationships'
 require 'rubyXL/objects/sheet_common'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_sheetProtection-4.html
   class ChartsheetProtection < OOXMLObject
     define_attribute(:password, RubyXL::ST_UnsignedShortHex)
@@ -34,7 +33,7 @@ module RubyXL
     define_attribute(:horizontalDpi,      :int,    :default => 600)
     define_attribute(:verticalDpi,        :int,    :default => 600)
     define_attribute(:copies,             :int,    :default => 1)
-    define_attribute(:'r:id',             :string)
+    define_relationship
     define_element_name 'pageSetup'
   end
 
@@ -42,7 +41,7 @@ module RubyXL
   class ChartsheetView < OOXMLObject
     define_attribute(:tabSelected,    :bool,  :default => false)
     define_attribute(:zoomScale,      :int,   :default => 100)
-    define_attribute(:workbookViewId, :int,   :required => true, :default => 0 )
+    define_attribute(:workbookViewId, :int,   :required => true, :default => 0)
     define_attribute(:zoomToFit,      :bool,  :default => false)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'sheetView'
@@ -57,14 +56,13 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_chartsheet.html
   class Chartsheet < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartsheet'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartsheet'.freeze
 
     include RubyXL::RelationshipSupport
     define_relationship(RubyXL::DrawingFile)
 
-    attr_accessor :state, :rels
-    attr_accessor :workbook, :sheet_name, :sheet_id
+    attr_accessor :state, :rels, :workbook, :sheet_name, :sheet_id
 
     define_child_node(RubyXL::ChartsheetProperties)
     define_child_node(RubyXL::ChartsheetViews)
@@ -80,13 +78,11 @@ module RubyXL
     define_child_node(RubyXL::WebPublishingItems)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'chartsheet'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main'           => nil,
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
 
     def xlsx_path
       ROOT.join('xl', 'chartsheets', "sheet#{file_index}.xml")
     end
-
   end
-
 end

data/lib/rubyXL/objects/color.rb

@@ -2,10 +2,9 @@ require 'rubyXL/objects/ooxml_object'
 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)
@@ -14,7 +13,7 @@ module RubyXL
     define_attribute(:tint,    :double, :default => 0.0)
     define_element_name 'color'
 
-    #validates hex color code, no '#' allowed
+    # validates hex color code, no '#' allowed
     def self.validate_color(color)
       if color =~ COLOR_REGEXP
         return true
@@ -23,5 +22,4 @@ module RubyXL
       end
     end
   end
-
 end

data/lib/rubyXL/objects/column_range.rb

@@ -1,7 +1,6 @@
 require 'rubyXL/objects/ooxml_object'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_col-1.html
   class ColumnRange < OOXMLObject
     define_attribute(:min,          :uint, :required => true)
@@ -18,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
+
+    def self.chars2raw(width_in_chars)
+      ((width_in_chars + (5.0 / RubyXL::Font::MAX_DIGIT_WIDTH)) * 256).to_i / 256.0
     end
 
-    DEFAULT_WIDTH = 9
+    DEFAULT_WIDTH = 8
   end
 
   class ColumnRanges < OOXMLContainerObject
@@ -48,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
@@ -59,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
 
@@ -83,10 +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/comments.rb

@@ -2,7 +2,6 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_comment-1.html
   class Comment < OOXMLObject
     define_child_node(RubyXL::RichText, :node_name => 'text')
@@ -28,7 +27,7 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_comments.html
   class CommentsFile < OOXMLTopLevelObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments'.freeze
 
     define_child_node(RubyXL::Authors)
     define_child_node(RubyXL::CommentList)
@@ -41,7 +40,5 @@ module RubyXL
     def xlsx_path
       ROOT.join('xl', "comments#{file_index}.xml")
     end
-
   end
-
 end

data/lib/rubyXL/objects/connection.rb

@@ -59,7 +59,7 @@ module RubyXL
     define_attribute(:url,         RubyXL::ST_Xstring)
     define_attribute(:post,        RubyXL::ST_Xstring)
     define_attribute(:htmlTables,  :bool, :default => false)
-    define_attribute(:htmlFormat,  ssml:ST_HtmlFmt, :default => "none")
+    define_attribute(:htmlFormat,  ssml:ST_HtmlFmt, :default => 'none')
     define_attribute(:editPage,    RubyXL::ST_Xstring)
 
     define_child_node(RubyXL::ConnectionTables)
@@ -69,7 +69,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_textField-1.html
   class ConnectionTextField < OOXMLObject
-    define_attribute(:type, RubyXL::ST_ExternalConnectionType, :default => "general")
+    define_attribute(:type, RubyXL::ST_ExternalConnectionType, :default => 'general')
     define_attribute(:position, :uint, :default => 0)
   end
 
@@ -83,19 +83,19 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_textPr-1.html
   class TextImportSettings < OOXMLObject
     define_attribute(:prompt, :bool, :default => true)
-    define_attribute(:fileType,    RubyXL::ST_FileType, :default => "win")
+    define_attribute(:fileType,    RubyXL::ST_FileType, :default => 'win')
     define_attribute(:codePage,    :uint, :default => 1252)
     define_attribute(:firstRow,    :uint, :default => 1)
-    define_attribute(:sourceFile,  RubyXL::ST_Xstring,  :default => "")
+    define_attribute(:sourceFile,  RubyXL::ST_Xstring, :default => '')
     define_attribute(:delimited,   :bool, :default => true)
-    define_attribute(:decimal,     RubyXL::ST_Xstring,  :default => ".")
-    define_attribute(:thousands,   RubyXL::ST_Xstring,  :default => ",")
+    define_attribute(:decimal,     RubyXL::ST_Xstring,  :default => '.')
+    define_attribute(:thousands,   RubyXL::ST_Xstring,  :default => ',')
     define_attribute(:tab,         :bool, :default => true)
     define_attribute(:space,       :bool, :default => false)
     define_attribute(:comma,       :bool, :default => false)
     define_attribute(:semicolon,   :bool, :default => false)
     define_attribute(:consecutive, :bool, :default => false)
-    define_attribute(:qualifier,   ssml:ST_Qualifier, :default => "doubleQuote")
+    define_attribute(:qualifier,   ssml:ST_Qualifier, :default => 'doubleQuote')
     define_attribute(:delimiter,   RubyXL::ST_Xstring)
 
     define_child_node(RubyXL::ConnectionTextFields)
@@ -107,7 +107,7 @@ module RubyXL
   class QueryParameter < OOXMLObject
     define_attribute(:name,            RubyXL::ST_Xstring)
     define_attribute(:sqlType,         :int, :default => 0)
-    define_attribute(:parameterType,   RubyXL::ST_ParameterType, :default => "prompt")
+    define_attribute(:parameterType,   RubyXL::ST_ParameterType, :default => 'prompt')
     define_attribute(:refreshOnChange, :bool, :default => false)
     define_attribute(:prompt,          RubyXL::ST_Xstring)
     define_attribute(:boolean,         :bool)
@@ -144,7 +144,7 @@ module RubyXL
     define_attribute(:background,            :bool, :default => false)
     define_attribute(:refreshOnLoad,         :bool, :default => false)
     define_attribute(:saveData,              :bool, :default => false)
-    define_attribute(:credentials,           RubyXL::ST_CredMethod, :default => "integrated")
+    define_attribute(:credentials,           RubyXL::ST_CredMethod, :default => 'integrated')
     define_attribute(:singleSignOnId,        RubyXL::ST_Xstring)
 
     define_child_node(RubyXL::OdbcOleDbProperties)
@@ -159,8 +159,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_connections.html
   class Connections < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/connections'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/connections'.freeze
 
     define_child_node(RubyXL::Connection, :collection => true, :accessor => :connections)
 

data/lib/rubyXL/objects/container_nodes.rb

@@ -2,7 +2,6 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/simple_types'
 
 module RubyXL
-
   class BooleanValue < OOXMLObject
     define_attribute(:val, :bool, :required => true, :default => true)
   end
@@ -46,12 +45,11 @@ module RubyXL
     def self.default(v)
       v && self.new(:value => v.to_datetime.iso8601)
     end
-
   end
 
   # http://www.datypic.com/sc/ooxml/e-docPropsVTypes_variant.html
   class Variant < OOXMLObject
-    define_child_node(RubyXL::Variant,      :node_name => 'vt:variant')
+    define_child_node(RubyXL::Variant, :node_name => 'vt:variant')
 
 #   vector    Vector
 #    array    Array
@@ -125,11 +123,9 @@ module RubyXL
       known_child_nodes.values.each { |v| self.size += self.send(v[:accessor]).size }
       true
     end
-
   end
 
   class VectorValue < OOXMLObject
     define_child_node(RubyXL::Vector)
   end
-
 end