rubyXL 3.3.29 → 3.4.27

data/lib/rubyXL/objects/sheet_data.rb

@@ -3,9 +3,18 @@ require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/text'
 require 'rubyXL/objects/formula'
 require 'rubyXL/cell'
-require 'rubyXL/convenience_methods'
 
 module RubyXL
+  # http://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.cellvalues(v=office.14).aspx
+  module DataType
+    SHARED_STRING = 's'
+    RAW_STRING    = 'str'
+    INLINE_STRING = 'inlineStr'
+    ERROR         = 'e'
+    BOOLEAN       = 'b'
+    NUMBER        = 'n'
+    DATE          = 'd' # Only available in Office2010.
+  end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_v-1.html
   class CellValue < OOXMLObject
@@ -25,15 +34,17 @@ module RubyXL
 
     define_attribute(:r,   :ref)
     define_attribute(:s,   :int,  :default => 0, :accessor => :style_index)
-    define_attribute(:t,   RubyXL::ST_CellType,  :accessor => :datatype, :default => 'n' )
+    define_attribute(:t,   RubyXL::ST_CellType,  :accessor => :datatype, :default => 'n')
     define_attribute(:cm,  :int,  :default => 0)
     define_attribute(:vm,  :int,  :default => 0)
     define_attribute(:ph,  :bool, :default => false)
     define_child_node(RubyXL::Formula,   :accessor => :formula)
     define_child_node(RubyXL::CellValue, :accessor => :value_container)
-    define_child_node(RubyXL::RichText)    # is
+    define_child_node(RubyXL::RichText) # is
     define_element_name 'c'
 
+    attr_accessor :worksheet
+
     def index_in_collection
       r.col_range.begin
     end
@@ -63,12 +74,30 @@ module RubyXL
       value_container.value = v
     end
 
+    def get_cell_xf
+      workbook.stylesheet.cell_xfs[self.style_index || 0]
+    end
+
+    def get_cell_font
+      workbook.stylesheet.fonts[get_cell_xf.font_id]
+    end
+
+    def get_cell_border
+      workbook.stylesheet.borders[get_cell_xf.border_id]
+    end
+
     def number_format
       workbook.stylesheet.get_number_format_by_id(get_cell_xf.num_fmt_id)
     end
 
     def is_date?
-      return false unless raw_value =~ NUMBER_REGEXP # Only fully numeric values can be dates
+      return false unless # Only fully numeric values can be dates
+        case raw_value
+        when Numeric then true
+        when String  then raw_value =~ NUMBER_REGEXP
+        else false
+        end
+
       num_fmt = self.number_format
       num_fmt && num_fmt.is_date_format?
     end
@@ -83,9 +112,10 @@ module RubyXL
       when RubyXL::DataType::INLINE_STRING then is.to_s
       when RubyXL::DataType::RAW_STRING    then raw_value
       else
-        if is_date? then workbook.num_to_date(r.to_f)
+        if is then is.to_s
+        elsif is_date? then workbook.num_to_date(r.to_f)
         elsif r.is_a?(String) && (r =~ NUMBER_REGEXP) then # Numeric
-          if $1 != '' then r.to_f
+          if Regexp.last_match(1) != '' then r.to_f
           else r.to_i
           end
         else r
@@ -95,13 +125,12 @@ module RubyXL
 
     def inspect
       str = "#<#{self.class}(#{row},#{column}): #{raw_value.inspect}"
-      str += " =#{self.formula.expression}" if self.formula
-      str += ", datatype=#{self.datatype.inspect}, style_index=#{self.style_index.inspect}>"
+      str << " =#{self.formula.expression}" if self.formula
+      str << ", datatype=#{self.datatype.inspect}, style_index=#{self.style_index.inspect}>"
       return str
     end
 
     include LegacyCell
-    include CellConvenienceMethods
   end
 
 #TODO#<row r="1" spans="1:1" x14ac:dyDescent="0.25">
@@ -186,7 +215,5 @@ module RubyXL
     def size
       rows.size
     end
-
   end
-
 end

data/lib/rubyXL/objects/simple_types.rb

@@ -140,7 +140,7 @@ module RubyXL
   ST_TextHorzOverflowType = %w{ overflow clip }
   ST_TextVerticalType     = %w{ horz vert vert270 wordArtVert eaVert mongolianVert wordArtVertRtl }
   ST_TextWrappingType     = %w{ none square }
-  ST_TextAnchoringType	  = %w{ t ctr b just dist }
+  ST_TextAnchoringType = %w{ t ctr b just dist }
   ST_TextShapeType        = %w{ textNoShape textPlain textStop textTriangle textTriangleInverted textChevron
                                 textChevronInverted textRingInside textRingOutside textArchUp textArchDown
                                 textCircle textButton textArchUpPour textArchDownPour textCirclePour textButtonPour
@@ -223,10 +223,27 @@ module RubyXL
 
   ST_TextUnderlineType    = %w{ none words sng dbl heavy dotted dottedHeavy dash dashHeavy dashLong dashLongHeavy
                                 dotDash dotDashHeavy dotDotDash dotDotDashHeavy wavy wavyHeavy wavyDbl }
+  ST_UnderlineValues      = %w{ single double singleAccounting doubleAccounting none }
+
   ST_TextStrikeType       = %w{ noStrike sngStrike dblStrike }
   ST_TextCapsType         = %w{ none small all }
 
+  # TODO: http://www.datypic.com/sc/ooxml/t-ssml_ST_UnsignedIntHex.html
+  ST_UnsignedIntHex       = :string # length = 4
   # TODO: http://www.datypic.com/sc/ooxml/t-ssml_ST_UnsignedShortHex.html
-  ST_UnsignedShortHex     = :string
+  ST_UnsignedShortHex     = :string # length = 2
+
+  ST_Xstring = :string
+
+  # Query Tables
+  ST_GrowShrinkType = %w{ insertDelete insertClear overwriteClear }
+
+  # Connections
+  ST_CredMethod             = %w{ integrated none stored prompt }
+  ST_ParameterType          = %w{ prompt value cell }
+  ST_FileType               = %w{ mac win dos }
+  ST_Qualifier              = %w{ doubleQuote singleQuote none }
+  ST_ExternalConnectionType = %w{ general text MDY DMY YMD MYD DYM YDM skip EMD }
 
+  ST_HtmlFmt = %w{ none rtf all }
 end

data/lib/rubyXL/objects/storage.rb

@@ -1,5 +1,4 @@
 module RubyXL
-
   class GenericStorageObject
     SAVE_ORDER = 0
 
@@ -24,13 +23,18 @@ module RubyXL
   end
 
   class PrinterSettingsFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings'.freeze
+  end
+
+  class CustomPropertyFile < GenericStorageObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.customProperty'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/customProperty'.freeze
   end
 
   class DrawingFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawing+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawing+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -41,12 +45,11 @@ module RubyXL
       else store_relationship(rf, :unknown)
       end
     end
-
   end
 
   class ChartFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -58,18 +61,17 @@ module RubyXL
       else store_relationship(rf, :unknown)
       end
     end
-
   end
 
   class BinaryImageFile < GenericStorageObject
-    CONTENT_TYPE = 'image/jpeg'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image'
+    CONTENT_TYPE = 'image/jpeg'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image'.freeze
   end
 
   class VMLDrawingFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.vmlDrawing'
-#    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
-    REL_TYPE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.vmlDrawing'.freeze
+#    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'.freeze
+    REL_TYPE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -77,32 +79,33 @@ module RubyXL
   end
 
   class ChartColorsFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-office.chartcolorstyle+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartColorStyle'
+    CONTENT_TYPE = 'application/vnd.ms-office.chartcolorstyle+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartColorStyle'.freeze
   end
 
   class ChartStyleFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-office.chartstyle+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartStyle'
+    CONTENT_TYPE = 'application/vnd.ms-office.chartstyle+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartStyle'.freeze
   end
 
   class TableFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table'.freeze
   end
 
   class ControlPropertiesFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp'
+    CONTENT_TYPE = 'application/vnd.ms-excel.controlproperties+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp'.freeze
   end
 
   class PivotCacheRecordsFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords'.freeze
   end
 
   class PivotCacheDefinitionFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -110,8 +113,8 @@ module RubyXL
   end
 
   class PivotTableFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -119,64 +122,72 @@ module RubyXL
   end
 
   class HyperlinkRelFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink'.freeze
   end
 
   class ThumbnailFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail'
-    CONTENT_TYPE = 'image/x-wmf'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail'.freeze
+    CONTENT_TYPE = 'image/x-wmf'.freeze
   end
 
   class ChartUserShapesFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartUserShapes'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartUserShapes'.freeze
   end
 
   class CustomPropertiesFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.custom-properties+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.custom-properties+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties'.freeze
   end
 
   class MacrosFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-office.vbaProject'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2006/relationships/vbaProject'
+    CONTENT_TYPE = 'application/vnd.ms-office.vbaProject'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2006/relationships/vbaProject'.freeze
   end
 
   class CustomXMLFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml'.freeze
   end
 
   class SlicerFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-excel.slicer+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicer'
+    CONTENT_TYPE = 'application/vnd.ms-excel.slicer+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicer'.freeze
   end
 
   class SlicerCacheFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-excel.slicerCache+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicerCache'
+    CONTENT_TYPE = 'application/vnd.ms-excel.slicerCache+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicerCache'.freeze
   end
 
   class OLEObjectFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.oleObject'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.oleObject'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject'.freeze
+  end
+
+  class SheetMetadata < GenericStorageObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata'.freeze
+  end
+
+  class PersonMetadata < GenericStorageObject
+    CONTENT_TYPE = 'application/vnd.ms-excel.person+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2017/10/relationships/person'.freeze
   end
 
   class ActiveX < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/control'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/control'.freeze
 
     include RubyXL::RelationshipSupport
 
     def attach_relationship(rid, rf)
       case rf
-      when RubyXL::ChartFile       then store_relationship(rf) # TODO
+      when RubyXL::ChartFile then store_relationship(rf) # TODO
       else store_relationship(rf, :unknown)
       end
     end
-
   end
 
   class ActiveXBinary < GenericStorageObject
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2006/relationships/activeXControlBinary'
+    REL_TYPE = 'http://schemas.microsoft.com/office/2006/relationships/activeXControlBinary'.freeze
   end
-
 end

data/lib/rubyXL/objects/stylesheet.rb

@@ -6,7 +6,6 @@ require 'rubyXL/objects/border'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_numFmt-1.html
   class NumberFormat < OOXMLObject
     define_attribute(:numFmtId,   :int,    :required => true)
@@ -15,9 +14,8 @@ module RubyXL
 
     def is_date_format?
       #             v-------- Toss all the escaped chars -------v v--- and see if any date-related remained
-      !!(format_code.gsub(/(\"[^\"]*\"|\[[^\]]*\]|[\\_*].)/i, '') =~ /[dmyhs]/i)
+      !!(format_code.gsub(/("[^"]*"|\[[^\]]*\]|[\\_*].)/i, '') =~ /[dmyhs]/i)
     end
-
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_numFmts-1.html
@@ -63,7 +61,6 @@ module RubyXL
     def find_by_format_id(format_id)
       self.find { |fmt| fmt.num_fmt_id == format_id }
     end
-
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_cellStyleXfs-1.html
@@ -83,9 +80,7 @@ module RubyXL
 
     def self.default
       self.new(:_ => [
-                 RubyXL::XF.new(
-                   :num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0, :xfId => 0
-                 )
+                 RubyXL::XF.new(:num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0, :xfId => 0)
                ])
     end
   end
@@ -161,8 +156,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_styleSheet.html
   class Stylesheet < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles'.freeze
 
     define_child_node(RubyXL::NumberFormats, :accessor => :number_formats)
     define_child_node(RubyXL::Fonts)
@@ -176,11 +171,11 @@ module RubyXL
     define_child_node(RubyXL::Colors)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'styleSheet'
-    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',
-                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
-                   'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac' => 'x14ac',
-                   'urn:schemas-microsoft-com:mac:vml' => 'mv')
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006'         => 'mc',
+                   'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac'         => 'x14ac',
+                   'urn:schemas-microsoft-com:mac:vml'                                   => 'mv')
 
     def initialize(*args)
       super
@@ -226,7 +221,5 @@ module RubyXL
 
       return max_fmt_id
     end
-
   end
-
 end

data/lib/rubyXL/objects/text.rb

@@ -4,7 +4,6 @@ require 'rubyXL/objects/container_nodes'
 require 'rubyXL/objects/color'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_t-1.html
   class Text < OOXMLObject
     define_attribute(:_,           :string, :accessor => :value)
@@ -19,12 +18,12 @@ 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) { |c| '_x%04x_' % c.ord }
       true
     end
 
     def to_s
-      value.to_s.gsub(ESCAPED_UNICODE) { |m| $1.hex.chr(::Encoding::UTF_8) }
+      value.to_s.gsub(ESCAPED_UNICODE) { Regexp.last_match(1).hex.chr(::Encoding::UTF_8) }
     end
   end
 
@@ -57,7 +56,6 @@ module RubyXL
     def to_s
       t.to_s
     end
-
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_rPh-1.html
@@ -70,7 +68,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_phoneticPr-1.html
   class PhoneticProperties < OOXMLObject
-    define_attribute(:fontId,    :int,    :required => true)
+    define_attribute(:fontId,    :int, :required => true)
     define_attribute(:type,      RubyXL::ST_PhoneticType,      :default => 'fullwidthKatakana')
     define_attribute(:alignment, RubyXL::ST_PhoneticAlignment, :default => 'left')
     define_element_name 'phoneticPr'
@@ -85,10 +83,10 @@ module RubyXL
     define_element_name 'is'
 
     def to_s
-      str = t.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
     end
   end
-
 end

data/lib/rubyXL/objects/theme.rb

@@ -1,9 +1,9 @@
 # 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'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-a_ext-1.html
   class AExtension < OOXMLObject
     define_attribute(:uri, :string)
@@ -19,7 +19,6 @@ module RubyXL
     def write_xml(xml, node_name_override = nil)
       self.raw_xml
     end
-
   end
 
   class AExtensionStorageArea < OOXMLObject
@@ -1164,7 +1163,7 @@ module RubyXL
   class CT_Hyperlink < OOXMLObject
     define_child_node(RubyXL::CT_EmbeddedWAVAudioFile)
     define_child_node(RubyXL::AExtensionStorageArea)
-    define_attribute(:'r:id',         :string)
+    define_relationship
     define_attribute(:invalidUrl,     :string, :default => '')
     define_attribute(:action,         :string, :default => '')
     define_attribute(:tgtFrame,       :string, :default => '')
@@ -1183,7 +1182,7 @@ module RubyXL
     define_child_node(RubyXL::CT_GradientFillProperties)
     define_child_node(RubyXL::CT_BlipFillProperties)
     define_child_node(RubyXL::CT_PatternFillProperties)
-    define_child_node(RubyXL::BooleanValue,      :node_name => 'a:grpFill')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:grpFill')
     # -- EG_EffectProperties
     define_child_node(RubyXL::CT_EffectList)
     define_child_node(RubyXL::CT_EffectContainer, :node_name => 'a:effectDag')
@@ -1373,8 +1372,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-a_theme.html
   class Theme < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.theme+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.theme+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme'.freeze
 
     define_attribute(:name, :string, :default => '')
     define_child_node(RubyXL::ThemeElements)
@@ -1391,6 +1390,25 @@ module RubyXL
       ROOT.join('xl', 'theme', 'theme1.xml')
     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
+      end
+    end
+
     def self.default
       default_theme = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme">
@@ -1710,7 +1728,5 @@ module RubyXL
 </a:theme>'
       self.parse(default_theme)
     end
-
   end
-
 end