rubyXL 3.3.29 → 3.4.33

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)
@@ -18,13 +17,13 @@ module RubyXL
   class Alignment < OOXMLObject
     define_attribute(:horizontal,      RubyXL::ST_HorizontalAlignment)
     define_attribute(:vertical,        RubyXL::ST_VerticalAlignment)
-    define_attribute(:textRotation,    :int)
+    define_attribute(:textRotation,    :uint)
     define_attribute(:wrapText,        :bool)
-    define_attribute(:indent,          :int)
+    define_attribute(:indent,          :uint)
     define_attribute(:relativeIndent,  :int)
     define_attribute(:justifyLastLine, :bool)
     define_attribute(:shrinkToFit,     :bool)
-    define_attribute(:readingOrder,    :int)
+    define_attribute(:readingOrder,    :uint)
     define_element_name 'alignment'
   end
 
@@ -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)
@@ -16,8 +15,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_sheetPr-4.html
   class ChartsheetProperties < OOXMLObject
-    define_attribute(:published,                         :bool, :default => true)
-    define_attribute(:codeName,                          :string)
+    define_attribute(:published,     :bool, :default => true)
+    define_attribute(:codeName,      :string)
     define_child_node(RubyXL::Color, :node_name => :tabColor)
     define_element_name 'sheetPr'
   end
@@ -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

@@ -1,19 +1,19 @@
 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)
-    define_attribute(:rgb,     :string)
+    define_attribute(:rgb,     RubyXL::ST_UnsignedIntHex)
     define_attribute(:theme,   :uint)
     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
@@ -21,7 +21,5 @@ module RubyXL
         raise 'invalid color'
       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

@@ -0,0 +1,175 @@
+require 'rubyXL/objects/ooxml_object'
+require 'rubyXL/objects/simple_types'
+require 'rubyXL/objects/extensions'
+
+# Connections
+# https://msdn.microsoft.com/en-us/library/dd908547(v=office.12).aspx
+# http://www.datypic.com/sc/ooxml/s-sml-externalConnections.xsd.html
+
+module RubyXL
+  # http://www.datypic.com/sc/ooxml/e-ssml_dbPr-1.html
+  class OdbcOleDbProperties < OOXMLObject
+    define_attribute(:connection,    RubyXL::ST_Xstring, :required => true)
+    define_attribute(:command,       RubyXL::ST_Xstring)
+    define_attribute(:serverCommand, RubyXL::ST_Xstring)
+    define_attribute(:commandType,   :uint, :default => 2)
+
+    define_element_name 'dbPr'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_olapPr-1.html
+  class OlapProperties < OOXMLObject
+    define_attribute(:local,              :bool, :default => false)
+    define_attribute(:localConnection,    RubyXL::ST_Xstring)
+    define_attribute(:localRefresh,       :bool, :default => true)
+    define_attribute(:sendLocale,         :bool, :default => false)
+    define_attribute(:rowDrillCount,      :uint)
+    define_attribute(:serverFill,         :bool, :default => true)
+    define_attribute(:serverNumberFormat, :bool, :default => true)
+    define_attribute(:serverFont,         :bool, :default => true)
+    define_attribute(:serverFontColor,    :bool, :default => true)
+
+    define_element_name 'olapPr'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_s-1.html
+  # TODO: ssml:m & ssml:x... but how?
+  class ConnectionTable < OOXMLObject
+    define_attribute(:v, RubyXL::ST_Xstring, :required => true)
+
+    define_element_name 's'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_tables-1.html
+  class ConnectionTables < OOXMLObject
+    define_child_node(RubyXL::ConnectionTable, :collection => :with_count, :accessor => :tables, :node_name => :table)
+    define_element_name 'tables'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_webPr-1.html
+  class WebQueryProperties < OOXMLObject
+    define_attribute(:xml,         :bool, :default => false)
+    define_attribute(:sourceData,  :bool, :default => false)
+    define_attribute(:parsePre,    :bool, :default => false)
+    define_attribute(:consecutive, :bool, :default => false)
+    define_attribute(:firstRow,    :bool, :default => false)
+    define_attribute(:xl97,        :bool, :default => false)
+    define_attribute(:textDates,   :bool, :default => false)
+    define_attribute(:xl2000,      :bool, :default => false)
+    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(:editPage,    RubyXL::ST_Xstring)
+
+    define_child_node(RubyXL::ConnectionTables)
+
+    define_element_name 'webPr'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_textField-1.html
+  class ConnectionTextField < OOXMLObject
+    define_attribute(:type, RubyXL::ST_ExternalConnectionType, :default => 'general')
+    define_attribute(:position, :uint, :default => 0)
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_textFields-1.html
+  class ConnectionTextFields < OOXMLObject
+    define_child_node(RubyXL::ConnectionTextField, :collection => :with_count, :accessor => :text_fields, :node_name => :textField)
+
+    define_element_name 'textFields'
+  end
+
+  # 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(:codePage,    :uint, :default => 1252)
+    define_attribute(:firstRow,    :uint, :default => 1)
+    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(: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(:delimiter,   RubyXL::ST_Xstring)
+
+    define_child_node(RubyXL::ConnectionTextFields)
+
+    define_element_name 'textPr'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_parameter-1.html
+  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(:refreshOnChange, :bool, :default => false)
+    define_attribute(:prompt,          RubyXL::ST_Xstring)
+    define_attribute(:boolean,         :bool)
+    define_attribute(:double,          :double)
+    define_attribute(:integer,         :int)
+    define_attribute(:string,          RubyXL::ST_Xstring)
+    define_attribute(:cell,            RubyXL::ST_Xstring)
+    define_element_name 'parameter'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_parameters-1.html
+  class QueryParameters < OOXMLObject
+    define_child_node(RubyXL::QueryParameter, :collection => :with_count, :accessor => :parameters, :node_name => :parameter)
+    define_element_name 'parameters'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_connection-1.html
+  class Connection < OOXMLObject
+    define_attribute(:id,                    :uint, :required => true)
+    define_attribute(:sourceFile,            RubyXL::ST_Xstring)
+    define_attribute(:odcFile,               RubyXL::ST_Xstring)
+    define_attribute(:keepAlive,             :bool, :default => false)
+    define_attribute(:interval,              :uint, :default => 0)
+    define_attribute(:name,                  RubyXL::ST_Xstring)
+    define_attribute(:description,           RubyXL::ST_Xstring)
+    define_attribute(:type,                  :uint)
+    define_attribute(:reconnectionMethod,    :uint, :default => 1)
+    define_attribute(:refreshedVersion,      :uint, :required => true)
+    define_attribute(:minRefreshableVersion, :uint, :default => 0)
+    define_attribute(:savePassword,          :bool, :default => false)
+    define_attribute(:new,                   :bool, :default => false)
+    define_attribute(:deleted,               :bool, :default => false)
+    define_attribute(:onlyUseConnectionFile, :bool, :default => false)
+    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(:singleSignOnId,        RubyXL::ST_Xstring)
+
+    define_child_node(RubyXL::OdbcOleDbProperties)
+    define_child_node(RubyXL::OlapProperties)
+    define_child_node(RubyXL::WebQueryProperties)
+    define_child_node(RubyXL::TextImportSettings)
+    define_child_node(RubyXL::QueryParameters)
+    define_child_node(RubyXL::ExtensionStorageArea)
+
+    define_element_name 'connection'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_connections.html
+  class Connections < OOXMLTopLevelObject
+    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)
+
+    define_element_name 'connections'
+
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil)
+
+    def xlsx_path
+      ROOT.join('xl', 'connections.xml')
+    end
+  end
+end

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

data/lib/rubyXL/objects/content_types.rb

@@ -1,7 +1,6 @@
 require 'rubyXL/objects/ooxml_object'
 
 module RubyXL
-
   class ContentTypeDefault < OOXMLObject
     define_attribute(:Extension,   :string)
     define_attribute(:ContentType, :string)
@@ -9,7 +8,7 @@ module RubyXL
   end
 
   class ContentTypeOverride < OOXMLObject
-    define_attribute(:PartName,   :string)
+    define_attribute(:PartName, :string)
     define_attribute(:ContentType, :string)
     define_element_name 'Override'
   end
@@ -48,7 +47,7 @@ module RubyXL
       content_types_by_ext.each_pair { |ext, content_types_arr|
         next if ext.nil? || defaults.any? { |d| d.extension == ext }
         most_frequent_ct = content_types_arr.group_by { |ct| ct }.values.max_by(&:size).first
-        defaults << RubyXL::ContentTypeDefault.new(:extension => ext, :content_type => most_frequent_ct )
+        defaults << RubyXL::ContentTypeDefault.new(:extension => ext, :content_type => most_frequent_ct)
       }
 
       self.overrides = []
@@ -64,14 +63,12 @@ module RubyXL
 
           ext = obj.xlsx_path.extname[1..-1]
           next if defaults.any? { |d| (d.extension == ext) && (d.content_type == obj_content_type) }
-          overrides << RubyXL::ContentTypeOverride.new(:part_name => obj.xlsx_path,
+          overrides << RubyXL::ContentTypeOverride.new(:part_name    => obj.xlsx_path,
                                                        :content_type => obj_content_type)
         }
       }
 
       true
     end
-
   end
-
 end

data/lib/rubyXL/objects/data_validation.rb

@@ -3,7 +3,6 @@ require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/formula'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_dataValidation-1.html
   class DataValidation < OOXMLObject
     define_attribute(:type,             RubyXL::ST_DataValidationType,       :default => 'none')
@@ -11,6 +10,8 @@ module RubyXL
     define_attribute(:imeMode,          RubyXL::ST_DataValidationImeMode,    :default => 'noControl')
     define_attribute(:operator,         RubyXL::ST_DataValidationOperator,   :default => 'between')
     define_attribute(:allowBlank,       :bool, :default => false)
+    # Documentation lies. This property should have been called "HIDE dropdown",
+    #   since that's what happens when it is set to true.
     define_attribute(:showDropDown,     :bool, :default => false)
     define_attribute(:showInputMessage, :bool, :default => false)
     define_attribute(:showErrorMessage, :bool, :default => false)
@@ -33,5 +34,4 @@ module RubyXL
     define_child_node(RubyXL::DataValidation, :collection => :with_count)
     define_element_name 'dataValidations'
   end
-
 end

data/lib/rubyXL/objects/document_properties.rb

@@ -3,11 +3,10 @@ require 'rubyXL/objects/container_nodes'
 require 'time'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-extended-properties_Properties.html
   class DocumentPropertiesFile < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.extended-properties+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.extended-properties+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties'.freeze
 
     attr_accessor :workbook
 
@@ -39,7 +38,7 @@ module RubyXL
     define_child_node(RubyXL::StringNode,  :node_name => :AppVersion)
     define_child_node(RubyXL::IntegerNode, :node_name => :DocSecurity)
     set_namespaces('http://schemas.openxmlformats.org/officeDocument/2006/extended-properties' => nil,
-                   'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes' => 'vt')
+                   'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes'      => 'vt')
     define_element_name 'Properties'
 
     def add_parts_count(name, count)
@@ -70,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
 
@@ -84,13 +84,12 @@ module RubyXL
     def xlsx_path
       ROOT.join('docProps', 'app.xml')
     end
-
   end
 
 
   class CorePropertiesFile < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-package.core-properties+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-package.core-properties+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties'.freeze
 
     attr_accessor :workbook
 
@@ -112,10 +111,10 @@ module RubyXL
     define_child_node(RubyXL::StringNode,    :node_name => 'cp:version')
 
     set_namespaces('http://schemas.openxmlformats.org/package/2006/metadata/core-properties' => 'cp',
-                   'http://purl.org/dc/elements/1.1/' => 'dc',
-                   'http://purl.org/dc/terms/' => 'dcterms',
-                   'http://purl.org/dc/dcmitype/' => 'dcmitype',
-                   'http://www.w3.org/2001/XMLSchema-instance' => 'xsi')
+                   'http://purl.org/dc/elements/1.1/'                                        => 'dc',
+                   'http://purl.org/dc/terms/'                                               => 'dcterms',
+                   'http://purl.org/dc/dcmitype/'                                            => 'dcmitype',
+                   'http://www.w3.org/2001/XMLSchema-instance'                               => 'xsi')
     define_element_name 'cp:coreProperties'
 
     def xlsx_path
@@ -127,7 +126,7 @@ module RubyXL
     end
 
     def creator=(v)
-      self.dc_creator = v && RubyXL::StringNodeW3C.new(:value => v)
+      self.dc_creator = v && RubyXL::StringNode.new(:value => v)
     end
 
     def modifier
@@ -135,7 +134,7 @@ module RubyXL
     end
 
     def modifier=(v)
-      self.cp_last_modified_by = v && RubyXL::StringNodeW3C.new(:value => v)
+      self.cp_last_modified_by = v && RubyXL::StringNode.new(:value => v)
     end
 
     def created_at
@@ -153,7 +152,5 @@ module RubyXL
     def modified_at=(v)
       self.dcterms_modified = RubyXL::StringNodeW3C.default(v)
     end
-
   end
-
 end

data/lib/rubyXL/objects/extensions.rb

@@ -1,7 +1,6 @@
 require 'rubyXL/objects/ooxml_object'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_ext-1.html
   class RawOOXML < OOXMLObject
     attr_accessor :raw_xml
@@ -49,5 +48,4 @@ module RubyXL
   class RevisionPointer < OOXMLIgnored
     define_element_name 'xr:revisionPtr'
   end
-
 end