rubyXL 3.4.18 → 3.4.25

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)
@@ -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,7 +2,6 @@ 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/
@@ -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)
@@ -86,7 +85,5 @@ module RubyXL
       self.sort_by!{ |r| r.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

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')
@@ -35,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)
@@ -84,13 +83,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 +110,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
@@ -153,7 +151,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

data/lib/rubyXL/objects/external_links.rb

@@ -1,5 +1,4 @@
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_sheetName-1.html
   class SheetName < OOXMLObject
     define_attribute(:val, :string)
@@ -89,21 +88,20 @@ module RubyXL
   end
 
   class ExternalLinksFile < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink'.freeze
 
     include RubyXL::RelationshipSupport
     define_child_node(RubyXL::ExternalBook)
     define_child_node(RubyXL::OleLink)
 
     define_element_name 'externalLink'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
-                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main'           => nil,
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006'         => 'mc',
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
 
     def xlsx_path
       ROOT.join('xl', 'externalLinks', "externalLink#{file_index}.xml")
     end
   end
-
 end

data/lib/rubyXL/objects/fill.rb

@@ -2,7 +2,6 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/simple_types'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_stop-1.html
   class Stop < OOXMLObject
     define_attribute(:position, :double, :required => true)
@@ -13,8 +12,8 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_patternFill-1.html
   class PatternFill < OOXMLObject
     define_attribute(:patternType, RubyXL::ST_PatternType)
-    define_child_node(RubyXL::Color, :node_name => :fgColor )
-    define_child_node(RubyXL::Color, :node_name => :bgColor )
+    define_child_node(RubyXL::Color, :node_name => :fgColor)
+    define_child_node(RubyXL::Color, :node_name => :bgColor)
     define_element_name 'patternFill'
   end
 
@@ -39,7 +38,6 @@ module RubyXL
     def self.default(pattern_type)
       self.new(:pattern_fill => RubyXL::PatternFill.new(:pattern_type => pattern_type))
     end
-
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_fills-1.html
@@ -51,5 +49,4 @@ module RubyXL
       self.new(:_ => [ RubyXL::Fill.default('none'), RubyXL::Fill.default('gray125') ])
     end
   end
-
 end

data/lib/rubyXL/objects/filters.rb

@@ -3,7 +3,6 @@ require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_dateGroupItem-1.html
   class DateGroupItem < OOXMLObject
     define_attribute(:year,   :int, :required => true)
@@ -18,7 +17,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_filters-1.html
   class FilterContainer < OOXMLObject
-    define_attribute(:blank,        :bool,  :default  => false)
+    define_attribute(:blank,        :bool, :default => false)
     define_attribute(:calendarType, RubyXL::ST_CalendarType, :default => 'none')
     define_child_node(RubyXL::StringValue,   :collection => true, :accessor => :filters, :node_name => :filter)
     define_child_node(RubyXL::DateGroupItem, :collection => true, :accessor => :date_group_items)
@@ -43,7 +42,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_customFilters-1.html
   class CustomFilters < OOXMLContainerObject
-    define_attribute(:and, :bool,  :default => false)
+    define_attribute(:and, :bool, :default => false)
     define_child_node(RubyXL::CustomFilter, :collection => true)
     define_element_name 'customFilters'
   end
@@ -87,9 +86,9 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_sortCondition-1.html
   class SortCondition < OOXMLObject
-    define_attribute(:descending, :bool,   :default  => false)
+    define_attribute(:descending, :bool, :default => false)
     define_attribute(:sortBy,     RubyXL::ST_SortBy, :default => 'value')
-    define_attribute(:ref,        :ref,    :required => true)
+    define_attribute(:ref,        :ref, :required => true)
     define_attribute(:customList, :string)
     define_attribute(:dxfId,      :int)
     define_attribute(:iconSet,    RubyXL::ST_IconSetType, :required => true, :default => '3Arrows')
@@ -116,5 +115,4 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'autoFilter'
   end
-
-end
+end

data/lib/rubyXL/objects/font.rb

@@ -3,7 +3,6 @@ require 'rubyXL/objects/container_nodes'
 require 'rubyXL/objects/color'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_font-1.html
   class Font < OOXMLObject
     # Since we have no capability to load the actual fonts, we'll have to live with the default.
@@ -21,14 +20,14 @@ module RubyXL
     define_child_node(RubyXL::BooleanValue, :node_name => :extend)
     define_child_node(RubyXL::Color)
     define_child_node(RubyXL::FloatValue,   :node_name => :sz)
-    define_child_node(RubyXL::BooleanValue, :node_name => :u)
+    define_child_node(RubyXL::StringValue,  :node_name => :u) # ST_UnderlineValues (http://www.datypic.com/sc/ooxml/e-ssml_u-1.html)
     define_child_node(RubyXL::StringValue,  :node_name => :vertAlign)
     define_child_node(RubyXL::StringValue,  :node_name => :scheme)
     define_element_name 'font'
 
     def self.default(size = 10)
       self.new(:name => RubyXL::StringValue.new(:val => 'Verdana'),
-               :sz   => RubyXL::FloatValue.new(:val => size) )
+               :sz   => RubyXL::FloatValue.new(:val => size))
     end
   end
 
@@ -41,5 +40,4 @@ module RubyXL
       self.new(:_ => [ RubyXL::Font.default(10), RubyXL::Font.default(8) ])
     end
   end
-
 end

data/lib/rubyXL/objects/formula.rb

@@ -2,12 +2,11 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/simple_types'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_f-1.html
   class Formula < OOXMLObject
     define_attribute(:_,    :string, :accessor => :expression)
     define_attribute(:t,    RubyXL::ST_CellFormulaType, :default => 'normal')
-    define_attribute(:aca,  :bool,   :default => false)
+    define_attribute(:aca,  :bool, :default => false)
     define_attribute(:ref,  :ref)
     define_attribute(:dt2D, :bool,   :default => false)
     define_attribute(:dtr,  :bool,   :default => false)
@@ -15,10 +14,9 @@ module RubyXL
     define_attribute(:del2, :bool,   :default => false)
     define_attribute(:r1,   :ref)
     define_attribute(:r2,   :ref)
-    define_attribute(:ca,   :bool,   :default => false)
+    define_attribute(:ca,   :bool, :default => false)
     define_attribute(:si,   :int)
-    define_attribute(:bx,   :bool,   :default => false)
+    define_attribute(:bx,   :bool, :default => false)
     define_element_name 'f'
   end
-
 end

data/lib/rubyXL/objects/ooxml_object.rb

@@ -12,10 +12,10 @@ module RubyXL
     # addressing variable by name creates it in the context of defining class, while calling
     # the setter/getter method addresses it in the context of descendant class,
     # which is what we need.
-    def obtain_class_variable(var_name, default = {})
+    def obtain_class_variable(var_name, default = nil)
       self.class_variable_get(var_name)
     rescue NameError
-      self.class_variable_set(var_name, default)
+      self.class_variable_set(var_name, default || {})
     end
 
     # Defines an attribute of OOXML object.
@@ -45,9 +45,10 @@ module RubyXL
     # The value of the element will be accessible as a <tt>String</tt> by calling +obj.expression+
     #   define_attribute(:errorStyle, %w{ stop warning information }, :default => 'stop',)
     # A <tt>String</tt> attribute named 'errorStyle' will be accessible as +obj.error_style+, valid values are <tt>"stop"</tt>, <tt>"warning"</tt>, <tt>"information"</tt>
-    def define_attribute(attr_name, attr_type, extra_params = {})
+    def define_attribute(attr_name, attr_type, extra_params = nil)
       attrs = obtain_class_variable(:@@ooxml_attributes)
-      attr_hash = extra_params.merge({ :attr_type => attr_type })
+      attr_hash = { :attr_type => attr_type }
+      attr_hash.merge!(extra_params) if extra_params
       attr_hash[:accessor] ||= accessorize(attr_name)
       attrs[attr_name.to_s] = attr_hash
       self.send(:attr_accessor, attr_hash[:accessor]) unless attr_hash[:computed]
@@ -84,7 +85,7 @@ module RubyXL
       accessor = (extra_params[:accessor] || accessorize(child_node_name)).to_sym
 
       child_nodes[child_node_name] = {
-        :class => klass,
+        :class    => klass,
         :is_array => extra_params[:collection],
         :accessor => accessor
       }
@@ -147,7 +148,6 @@ module RubyXL
         known_namespaces ||= obtain_class_variable(:@@ooxml_namespaces)
 
         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
@@ -185,21 +185,21 @@ module RubyXL
     private
     def accessorize(str)
       acc = str.to_s.dup
-      acc.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-      acc.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-      acc.gsub!(':','_')
+      acc.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+      acc.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+      acc.gsub!(':', '_')
       acc.downcase.to_sym
     end
 
     def process_attribute(obj, raw_value, params)
       val = raw_value &&
               case params[:attr_type]
-              when :double then Float(raw_value)  # http://www.datypic.com/sc/xsd/t-xsd_double.html
+              when :double then Float(raw_value) # http://www.datypic.com/sc/xsd/t-xsd_double.html
               when :string then raw_value
               when Array   then raw_value # Case of Simple Types
               when :sqref  then RubyXL::Sqref.new(raw_value)
               when :ref    then RubyXL::Reference.new(raw_value)
-              when :bool   then ['1', 'true'].include?(raw_value)  # http://www.datypic.com/sc/xsd/t-xsd_boolean.html
+              when :bool   then ['1', 'true'].include?(raw_value) # http://www.datypic.com/sc/xsd/t-xsd_boolean.html
               when :int    then Integer(raw_value)
               when :uint   then
                 v = Integer(raw_value)
@@ -208,7 +208,6 @@ module RubyXL
               end
       obj.send("#{params[:accessor]}=", val)
     end
-
   end
 
 
@@ -224,8 +223,9 @@ module RubyXL
     end
     private :obtain_class_variable
 
-    def initialize(params = {})
+    def initialize(params = nil)
       @local_namespaces = nil
+      params ||= {}
 
       obtain_class_variable(:@@ooxml_attributes).each_value { |v|
         instance_variable_set("@#{v[:accessor]}", params[v[:accessor]]) unless v[:computed]
@@ -236,7 +236,6 @@ module RubyXL
 
     def init_child_nodes(params)
       obtain_class_variable(:@@ooxml_child_nodes).each_value { |v|
-
         initial_value =
           if params.has_key?(v[:accessor]) then params[v[:accessor]]
           elsif v[:is_array] then []
@@ -361,7 +360,6 @@ module RubyXL
       }
       true
     end
-
   end
 
   # Parent class for defining OOXML based objects (not unlike Rails' +ActiveRecord+!)
@@ -415,7 +413,6 @@ module RubyXL
       end
       protected :define_count_attribute
     end
-
   end
 
   # Extension class providing functionality for top-level OOXML objects that are represented by
@@ -466,7 +463,5 @@ module RubyXL
     def file_index
       root.rels_hash[self.class].index{ |f| f.equal?(self) }.to_i + 1
     end
-
   end
-
 end