rubyXL 2.3.4 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f6768f10a3fbfbd65f4629a65b28124aa18ee2e
-  data.tar.gz: b67d77590fa6de2c7d6faa59c425bbba7caaf01c
+  metadata.gz: f7eb72c2b30df89f942b111f761a1abbaec3248a
+  data.tar.gz: b9594666aa329bccd62afdeb67fc42a30fd2072a
 SHA512:
-  metadata.gz: 7edbe3015a318c5adf7fa3d22b4bf576348777344b05115bc348785d865fcfcf26b07bc3b0dffea2f7dc4e2a1936b797a4477986cdde4f56469e1df34d87bcff
-  data.tar.gz: 218a3bf86defbdc7509a6d5543973038e1f4673ddc79ffc1221633ee32c3c25e7c9123ab9e266607f1b1e4ca13f44af1b81490ac91b68593950a5fac185f0ac9
+  metadata.gz: 6de5fe2a07e6f5983196af5834de60b11144cdc1bf3b15917fa3cb9d0f5cc9be2501bea17ac10117f23a0dfdecb6f5478c7c90313ad28ed261d19819ab58d46e
+  data.tar.gz: 3f09a471e147982249df6c658ca34f27bcb49737ecaa1d8e81047251e1536efaa2c14f51ca54069142f3a42f3e1b0326af318351e9802f4b4470def54f9fcf05

data/VERSION

@@ -1 +1 @@
-2.3.4
+2.4.0

data/lib/rubyXL.rb

@@ -8,6 +8,8 @@ require 'rubyXL/objects/shared_strings'
 require 'rubyXL/objects/worksheet'
 require 'rubyXL/objects/chartsheet'
 require 'rubyXL/objects/calculation_chain'
+require 'rubyXL/objects/content_types'
+require 'rubyXL/objects/theme'
 require 'rubyXL/objects/workbook'
 require 'rubyXL/objects/document_properties'
 require 'rubyXL/objects/relationships'

data/lib/rubyXL/objects/calculation_chain.rb

@@ -21,8 +21,13 @@ module RubyXL
     define_element_name 'calcChain'
     set_namespaces('xmlns' => 'http://schemas.openxmlformats.org/spreadsheetml/2006/main')
 
-    def self.filepath
+    def self.xlsx_path
       File.join('xl', 'calcChain.xml')
     end
+
+    def self.content_type
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml'
+    end
+
   end
 end

data/lib/rubyXL/objects/chartsheet.rb

@@ -74,11 +74,13 @@ module RubyXL
     set_namespaces('xmlns'       => 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
                    'xmlns:r'     => 'http://schemas.openxmlformats.org/officeDocument/2006/relationships')
 
+    attr_accessor :state
+
     def sheet_index
       @workbook.worksheets.select{ |sheet| sheet.is_a?(self.class) }.index{ |sheet| sheet.equal?(self) }
     end
 
-    def filepath
+    def xlsx_path
       File.join('xl', 'chartsheets', "sheet#{sheet_index + 1}.xml")
     end
 
@@ -86,6 +88,10 @@ module RubyXL
       'chartsheet'
     end
 
+    def self.content_type
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml'
+    end
+
     attr_accessor :workbook, :sheet_name, :sheet_id
 
   end

data/lib/rubyXL/objects/container_nodes.rb

@@ -35,6 +35,11 @@ module RubyXL
     define_attribute(:_, :float, :accessor => :value)
   end
 
+  class StringNodeW3C < OOXMLObject
+    define_attribute(:_, :string, :accessor => :value)
+    define_attribute('xsi:type', :string, :required => true, :default => 'dcterms:W3CDTF')
+  end
+
   # http://www.schemacentral.com/sc/ooxml/e-docPropsVTypes_variant.html
   class Variant < OOXMLObject
     define_child_node(RubyXL::Variant,      :node_name => 'vt:variant')
@@ -118,4 +123,4 @@ module RubyXL
     define_child_node(RubyXL::Vector)
   end
 
-end
+end

data/lib/rubyXL/objects/content_types.rb

@@ -0,0 +1,95 @@
+require 'rubyXL/objects/ooxml_object'
+
+module RubyXL
+
+  class ContentTypeDefault < OOXMLObject
+    define_attribute(:Extension,   :string)
+    define_attribute(:ContentType, :string)
+    define_element_name 'Default'
+  end
+
+  class ContentTypeOverride < OOXMLObject
+    define_attribute(:PartName,   :string)
+    define_attribute(:ContentType, :string)
+    define_element_name 'Override'
+  end
+
+  class ContentTypes < OOXMLTopLevelObject
+    attr_accessor :workbook
+
+    define_child_node(RubyXL::ContentTypeDefault,  :collection => true, :accessor => :defaults)
+    define_child_node(RubyXL::ContentTypeOverride, :collection => true, :accessor => :overrides)
+
+    set_namespaces(:xmlns => 'http://schemas.openxmlformats.org/package/2006/content-types')
+    define_element_name 'Types'
+
+    def self.xlsx_path
+      '[Content_Types].xml'
+    end
+
+    def generate_override(obj)
+      RubyXL::ContentTypeOverride.new(:part_name => "/#{obj.xlsx_path}", :content_type => obj.class.content_type)
+    end
+
+    def before_write_xml
+      self.defaults = []
+      unless @workbook.printer_settings.empty?
+        defaults << RubyXL::ContentTypeDefault.new(:extension => 'bin',
+                      :content_type => 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings')
+      end
+
+      defaults << RubyXL::ContentTypeDefault.new(:extension => 'rels',
+                      :content_type => 'application/vnd.openxmlformats-package.relationships+xml' )
+
+      defaults << RubyXL::ContentTypeDefault.new(:extension => 'xml',
+                      :content_type => 'application/xml' )
+
+      defaults << RubyXL::ContentTypeDefault.new(:extension => 'jpeg', :content_type => 'image/jpeg' )
+
+      self.overrides = []
+      overrides << generate_override(workbook)
+      workbook.worksheets.each { |sheet| overrides << generate_override(sheet) }
+      overrides << generate_override(workbook.stylesheet)
+      overrides << generate_override(workbook.document_properties)
+      overrides << generate_override(workbook.core_properties)
+      overrides << generate_override(workbook.shared_strings_container) unless workbook.shared_strings_container.empty?
+      overrides << generate_override(workbook.calculation_chain) unless workbook.calculation_chain.nil?
+      overrides << generate_override(workbook.theme)
+
+      workbook.charts.each_pair { |k, v|
+        case k
+        when /^chart\d*.xml$/ then
+          overrides << RubyXL::ContentTypeOverride.new(:part_name => "/#{@workbook.charts.local_dir_path}/#{k}",
+                         :content_type => 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml')
+        when /^style\d*.xml$/ then
+          overrides << RubyXL::ContentTypeOverride.new(:part_name => "/#{@workbook.charts.local_dir_path}/#{k}",
+                         :content_type => 'application/vnd.ms-office.chartstyle+xml')
+        when /^colors\d*.xml$/ then
+          overrides << RubyXL::ContentTypeOverride.new(:part_name => "/#{@workbook.charts.local_dir_path}/#{k}",
+                         :content_type => 'application/vnd.ms-office.chartcolorstyle+xml')
+        end
+      }
+
+      workbook.drawings.each_pair { |k, v|
+        overrides << RubyXL::ContentTypeOverride.new(:part_name => "/#{@workbook.drawings.local_dir_path}/#{k}",
+                       :content_type => 'application/vnd.openxmlformats-officedocument.drawing+xml')
+      }
+
+      unless workbook.external_links.nil?
+        1.upto(workbook.external_links.size - 1) { |i|
+          overrides << RubyXL::ContentTypeOverride.new(:part_name => "/xl/externalLinks/externalLink#{i}.xml",
+                       :content_type => 'application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml')
+        }
+      end
+
+      unless @workbook.macros.empty?
+        overrides << RubyXL::ContentTypeOverride.new(:part_name => '/xl/vbaProject.bin',
+                       :content_type => 'application/vnd.ms-office.vbaProject')
+      end
+
+      true
+    end
+
+  end
+
+end

data/lib/rubyXL/objects/document_properties.rb

@@ -67,10 +67,86 @@ module RubyXL
       true
     end
 
-    def self.filepath
+    def self.xlsx_path
       File.join('docProps', 'app.xml')
     end
 
+    def self.content_type
+      'application/vnd.openxmlformats-officedocument.extended-properties+xml'
+    end
+
+  end
+
+
+  class CoreProperties < OOXMLTopLevelObject
+    attr_accessor :workbook
+
+    define_child_node(RubyXL::StringNode,    :node_name => 'dc:creator')
+    define_child_node(RubyXL::StringNode,    :node_name => 'dc:description')
+    define_child_node(RubyXL::StringNode,    :node_name => 'dc:identifier')
+    define_child_node(RubyXL::StringNode,    :node_name => 'dc:language')
+    define_child_node(RubyXL::StringNode,    :node_name => 'dc:subject')
+    define_child_node(RubyXL::StringNode,    :node_name => 'dc:title')
+    define_child_node(RubyXL::StringNodeW3C, :node_name => 'dcterms:created')
+    define_child_node(RubyXL::StringNodeW3C, :node_name => 'dcterms:modified')
+    define_child_node(RubyXL::StringNode,    :node_name => 'cp:lastModifiedBy')
+    define_child_node(RubyXL::StringNode,    :node_name => 'cp:lastPrinted')
+    define_child_node(RubyXL::StringNode,    :node_name => 'cp:category')
+    define_child_node(RubyXL::StringNode,    :node_name => 'cp:contentStatus')
+    define_child_node(RubyXL::StringNode,    :node_name => 'cp:contentType')
+    define_child_node(RubyXL::StringNode,    :node_name => 'cp:keywords')
+    define_child_node(RubyXL::StringNode,    :node_name => 'cp:revision')
+    define_child_node(RubyXL::StringNode,    :node_name => 'cp:version')
+
+    set_namespaces('xmlns:cp'       => 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties',
+                   'xmlns:dc'       => 'http://purl.org/dc/elements/1.1/',
+                   'xmlns:dcterms'  => 'http://purl.org/dc/terms/',
+                   'xmlns:dcmitype' => 'http://purl.org/dc/dcmitype/',
+                   'xmlns:xsi'      => 'http://www.w3.org/2001/XMLSchema-instance')
+    define_element_name 'cp:coreProperties'
+
+    def self.xlsx_path
+      File.join('docProps', 'core.xml')
+    end
+
+    def self.content_type
+      'application/vnd.openxmlformats-package.core-properties+xml'
+    end
+
+    def creator
+      dc_creator && dc_creator.value
+    end
+
+    def creator=(v)
+      self.dc_creator = RubyXL::StringNodeW3C.new(:value => v)
+    end
+
+    def modifier
+      cp_last_modified_by && cp_last_modified_by.value
+    end
+
+    def modifier=(v)
+      self.cp_last_modified_by = RubyXL::StringNodeW3C.new(:value => v)
+    end
+
+    def created_at
+      val = dcterms_created && dcterms_created.value
+      val && (val.strip.empty? ? nil : Time.parse(val))
+    end
+
+    def created_at=(v)
+      self.dcterms_created = RubyXL::StringNodeW3C.new(:value => v.iso8601)
+    end
+
+    def modified_at
+      val = dcterms_modified && dcterms_modified.value
+      val && (val.strip.empty? ? nil : Time.parse(val))
+    end
+
+    def modified_at=(v)
+      self.dcterms_modified = RubyXL::StringNodeW3C.new(:value => v.iso8601)
+    end
+
   end
 
 end

data/lib/rubyXL/objects/ooxml_object.rb

@@ -236,8 +236,12 @@ module RubyXL
     # * +xml+ - Base Nokogiri::XML object used for building. If omitted, a blank document will be generated.
     # * +node_name_override+ - if present, is used instead of the default element name for this object provided by +define_element_name+
     # ==== Examples
-    #   obj.write_xml
-    # Creates a new Nokogiti::XML and 
+    #   obj.write_xml()
+    # Creates a new empty +Nokogiri::XML+, populates it with the OOXML structure as described in the respective definition, and returns the resulting +Nokogiri::XML+ object.
+    #   obj.write_xml(seed_xml)
+    # Using the passed-in +Nokogiri+ +xml+ object, creates a new element corresponding to +obj+ according to its definition, along with all its properties and children, and returns the newly created element.
+    #   obj.write_xml(seed_xml, 'overriden_element_name')
+    # Same as above, but uses the passed-in +node_name_override+ as the new element name, instead of its default name set by +define_element_name+.
     def write_xml(xml = nil, node_name_override = nil)
       if xml.nil? then
         seed_xml = Nokogiri::XML('<?xml version = "1.0" standalone ="yes"?>')
@@ -384,11 +388,11 @@ module RubyXL
   class OOXMLTopLevelObject < OOXMLObject
     # Prototype method. For top-level OOXML object, returns the path at which the current object's XML file
     # is located within the <tt>.xslx</tt> zip container.
-    def filepath
-      self.class.filepath
+    def xlsx_path
+      self.class.xlsx_path
     end
 
-    def self.filepath
+    def self.xlsx_path
       raise 'Subclass responsebility'
     end
 
@@ -407,7 +411,7 @@ module RubyXL
     # === Parameters
     # * +dirpath+ - path to the directory with the unzipped <tt>.xslx</tt> contents.
     def self.parse_file(dirpath)
-      full_path = File.join(dirpath, filepath)
+      full_path = File.join(dirpath, xlsx_path)
       return nil unless File.exist?(full_path)
       parse(File.open(full_path, 'r'))
     end
@@ -418,7 +422,7 @@ module RubyXL
     def add_to_zip(zipfile)
       xml_string = write_xml
       return if xml_string.empty?
-      zipfile.get_output_stream(self.filepath) { |f| f << xml_string }
+      zipfile.get_output_stream(self.xlsx_path) { |f| f << xml_string }
     end
 
   end

data/lib/rubyXL/objects/relationships.rb

@@ -35,6 +35,10 @@ module RubyXL
     def find_by_rid(r_id)
       relationships.find { |r| r.id == r_id }
     end
+
+    def find_by_target(target)
+      relationships.find { |r| r.target == target }
+    end
   end
 
 
@@ -46,7 +50,7 @@ module RubyXL
       self.relationships = []
 
       @workbook.worksheets.each_with_index { |sheet, i|
-        relationships << document_relationship(sheet.filepath.gsub(/^xl\//, ''), sheet.rel_type)
+        relationships << document_relationship(sheet.xlsx_path.gsub(/^xl\//, ''), sheet.rel_type)
       }
 
       @workbook.external_links.each_key { |k| 
@@ -67,7 +71,7 @@ module RubyXL
       true
     end
 
-    def self.filepath
+    def self.xlsx_path
       File.join('xl', '_rels', 'workbook.xml.rels')
     end
 
@@ -80,14 +84,14 @@ module RubyXL
     def before_write_xml
       self.relationships = []
 
-      relationships << document_relationship('xl/workbook.xml', 'officeDocument')
+      relationships << document_relationship('xl/workbook.xml',   'officeDocument')
       relationships << metadata_relationship('docProps/core.xml', 'core-properties')
-      relationships << document_relationship('docProps/app.xml', 'extended-properties')
+      relationships << document_relationship('docProps/app.xml',  'extended-properties')
 
       true
     end
 
-    def self.filepath
+    def self.xlsx_path
       File.join('_rels', '.rels')
     end
   end

data/lib/rubyXL/objects/shared_strings.rb

@@ -48,10 +48,14 @@ module RubyXL
       index 
     end
 
-    def self.filepath
+    def self.xlsx_path
       File.join('xl', 'sharedStrings.xml')
     end
 
+    def self.content_type
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'
+    end
+
   end
 
 end

data/lib/rubyXL/objects/simple_types.rb

@@ -74,5 +74,39 @@ module RubyXL
 
   ST_ConditionalFormattingOperator = %w{ lessThan lessThanOrEqual equal notEqual greaterThanOrEqual greaterThan
                                          between notBetween containsText notContains beginsWith endsWith }
-
+  ST_BlackWhiteMode = %w{ clr auto gray ltGray invGray grayWhite blackGray blackWhite black white hidden }
+  ST_ShapeType = %w{ line lineInv triangle rtTriangle rect diamond parallelogram trapezoid
+                     nonIsoscelesTrapezoid pentagon hexagon heptagon octagon decagon dodecagon
+                     star4 star5 star6 star7 star8 star10 star12 star16 star24 star32
+                     roundRect round1Rect round2SameRect round2DiagRect snipRoundRect
+                     snip1Rect snip2SameRect snip2DiagRect plaque ellipse teardrop homePlate chevron
+                     pieWedge pie blockArc donut noSmoking rightArrow leftArrow upArrow downArrow
+                     stripedRightArrow notchedRightArrow bentUpArrow
+                     leftRightArrow upDownArrow leftUpArrow leftRightUpArrow quadArrow
+                     leftArrowCallout rightArrowCallout upArrowCallout downArrowCallout
+                     leftRightArrowCallout upDownArrowCallout quadArrowCallout bentArrow uturnArrow circularArrow
+                     leftCircularArrow leftRightCircularArrow curvedRightArrow
+                     curvedLeftArrow curvedUpArrow curvedDownArrow swooshArrow
+                     cube can lightningBolt heart sun moon smileyFace irregularSeal1 irregularSeal2 foldedCorner
+                     bevel frame halfFrame corner diagStripe chord arc leftBracket rightBracket leftBrace rightBrace
+                     bracketPair bracePair straightConnector1 bentConnector2
+                     bentConnector3 bentConnector4 bentConnector5 curvedConnector2 curvedConnector3
+                     curvedConnector4 curvedConnector5 callout1 callout2 callout3
+                     accentCallout1 accentCallout2 accentCallout3 borderCallout1 borderCallout2 borderCallout3
+                     accentBorderCallout1 accentBorderCallout2 accentBorderCallout3
+                     wedgeRectCallout wedgeRoundRectCallout wedgeEllipseCallout cloudCallout
+                     cloud ribbon ribbon2 ellipseRibbon ellipseRibbon2 leftRightRibbon
+                     verticalScroll horizontalScroll wave doubleWave plus
+                     flowChartProcess flowChartDecision flowChartInputOutput flowChartPredefinedProcess
+                     flowChartInternalStorage flowChartDocument flowChartMultidocument flowChartTerminator
+                     flowChartPreparation flowChartManualInput flowChartManualOperation flowChartConnector
+                     flowChartPunchedCard flowChartPunchedTape flowChartSummingJunction flowChartOr flowChartCollate
+                     flowChartSort flowChartExtract flowChartMerge flowChartOfflineStorage flowChartOnlineStorage
+                     flowChartMagneticTape flowChartMagneticDisk flowChartMagneticDrum flowChartDisplay
+                     flowChartDelay flowChartAlternateProcess flowChartOffpageConnector actionButtonBlank
+                     actionButtonHome actionButtonHelp actionButtonInformation actionButtonForwardNext
+                     actionButtonBackPrevious actionButtonEnd actionButtonBeginning actionButtonReturn
+                     actionButtonDocument actionButtonSound actionButtonMovie gear6 gear9 funnel
+                     mathPlus mathMinus mathMultiply mathDivide mathEqual mathNotEqual
+                     cornerTabs squareTabs plaqueTabs chartX chartStar chartPlus }
 end

data/lib/rubyXL/objects/stylesheet.rb

@@ -183,10 +183,14 @@ module RubyXL
       @format_hash = nil
     end
 
-    def self.filepath
+    def self.xlsx_path
       File.join('xl', 'styles.xml')
     end
 
+    def self.content_type
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'
+    end
+
     def self.default
       self.new(:fonts          => RubyXL::Fonts.defaults,
                :fills          => RubyXL::Fills.defaults,

data/lib/rubyXL/objects/theme.rb

@@ -4,7 +4,7 @@ require 'rubyXL/objects/extensions'
 module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-a_ext-1.html
-  class Extension < OOXMLObject
+  class AExtension < OOXMLObject
     define_attribute(:uri, :string)
     define_element_name 'a:ext'
     attr_accessor :raw_xml
@@ -22,19 +22,23 @@ module RubyXL
   end
 
   class AExtensionStorageArea < OOXMLObject
+#FIXME#
     define_child_node(RubyXL::AExtension, :collection => true)
     define_element_name 'a:extLst'
   end
 
   class ColorScheme < OOXMLObject
+#FIXME#
     define_element_name 'a:clrScheme'
   end
 
   class FontScheme < OOXMLObject
+#FIXME#
     define_element_name 'a:fontScheme'
   end
 
   class FormatScheme < OOXMLObject
+#FIXME#
     define_element_name 'a:fmtScheme'
   end
 
@@ -47,18 +51,479 @@ module RubyXL
     define_element_name 'a:themeElements'
   end
 
+  # http://www.schemacentral.com/sc/ooxml/e-a_off-1.html
+  class Offset < OOXMLObject
+    define_attribute(:x, :int, :required => true)
+    define_attribute(:y, :int, :required => true)
+    define_element_name 'a:off'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_ext-2.html
+  class Extents < OOXMLObject
+    define_attribute(:cx, :int, :required => true)
+    define_attribute(:cy, :int, :required => true)
+    define_element_name 'a:ext'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_xfrm-4.html
+  class TwoDTransform < OOXMLObject
+    define_attribute(:rot,   :int,  :default => 0)
+    define_attribute(:flipH, :bool, :default => false)
+    define_attribute(:flipV, :bool, :default => false)
+    define_child_node(RubyXL::Offset)
+    define_child_node(RubyXL::Extents)
+    define_element_name 'a:xfrm'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_custGeom-1.html
+  class CustomGeometry < OOXMLObject
+#        a:avLst [0..1]    Adjust Value List
+#        a:gdLst [0..1]    List of Shape Guides
+#        a:ahLst [0..1]    List of Shape Adjust Handles
+#        a:cxnLst [0..1]    List of Shape Connection Sites
+#        a:rect [0..1]    Shape Text Rectangle
+#        a:pathLst [1..1]    List of Shape Paths
+    define_element_name 'a:custGeom'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_prstGeom-1.html
+  class PresetGeometry < OOXMLObject
+#        a:avLst [0..1]    Adjust Value List
+    define_attribute(:prst, RubyXL::ST_ShapeType, :required => true)
+    define_element_name 'a:prstGeom'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_spPr-1.html
+  class VisualProperties < OOXMLObject
+    define_child_node(RubyXL::TwoDTransform)
+    define_child_node(RubyXL::CustomGeometry)
+    define_child_node(RubyXL::PresetGeometry)
+#        a:noFill    No Fill
+#        a:solidFill    Solid Fill
+#        a:gradFill    Gradient Fill
+#        a:blipFill    Picture Fill
+#        a:pattFill    Pattern Fill
+#        a:grpFill    Group Fill
+#    a:ln [0..1]    
+#        a:effectLst    Effect Container
+#        a:effectDag    Effect Container
+#    a:scene3d [0..1]    3-D Scene
+#    a:sp3d [0..1]    3-D Shape Properties
+#    a:extLst [0..1]    Extension List
+    define_attribute(:bwMode, RubyXL::ST_BlackWhiteMode)
+
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_element_name 'a:spPr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_spDef-1.html
+  class ShapeDefault < OOXMLObject
+    define_child_node(RubyXL::VisualProperties)
+#    a:bodyPr [1..1]    BodyProperties
+#    a:lstStyle [1..1]    TextListStyles
+#    a:style [0..1]    Shape Style
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_element_name 'a:spDef'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_objectDefaults-1.html
+  class ObjectDefaults < OOXMLObject
+    define_child_node(RubyXL::ShapeDefault)
+#    a:spDef [0..1]    
+#    a:lnDef [0..1]    LineDefault
+#    a:txDef [0..1]    TextDefault
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_element_name 'a:objectDefaults'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_extraClrScheme-1.html
+  class ExtraColorScheme < OOXMLObject
+#    a:clrScheme [1..1]    ColorScheme
+#    a:clrMap [0..1]    ColorMap
+    define_element_name 'a:extraClrScheme'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_extraClrSchemeLst-1.html
+  class ExtraColorSchemeList < OOXMLContainerObject
+    define_child_node(RubyXL::ExtraColorScheme, :collection => true)
+    define_element_name 'a:extraClrSchemeLst'
+  end
+  
+  # http://www.schemacentral.com/sc/ooxml/e-a_custClr-1.html
+  class CustomColor < OOXMLObject
+#    a:scrgbClr    RGB Color Model - Percentage Variant
+#    a:srgbClr    RGB Color Model - Hex Variant
+#    a:hslClr    Hue, Saturation, Luminance Color Model
+#    a:sysClr    System Color
+#    a:schemeClr    Scheme Color
+#    a:prstClr    Preset Color
+    define_attribute(:name, :string, :default => '')
+    define_element_name 'a:custClr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_custClrLst-1.html
+  class CustomColorList < OOXMLContainerObject
+    define_child_node(RubyXL::CustomColor, :collection => true)
+    define_element_name 'a:custClrLst'
+  end
+
   # http://www.schemacentral.com/sc/ooxml/e-a_theme.html
-  class Theme < OOXMLObject
+  class Theme < OOXMLTopLevelObject
     define_attribute(:name, :string, :default => '')
     define_child_node(RubyXL::ThemeElements)
     define_child_node(RubyXL::ObjectDefaults)
-#a:extraClrSchemeLst [0..1]    Extra Color Scheme List
-#a:custClrLst [0..1]    Custom Color List
+    define_child_node(RubyXL::ExtraColorSchemeList)
+    define_child_node(RubyXL::CustomColorList)
     define_child_node(RubyXL::AExtensionStorageArea)
 
     define_element_name 'a:theme'
 
     set_namespaces('xmlns:a' => 'http://schemas.openxmlformats.org/drawingml/2006/main')
-  end
 
-end
+    def self.xlsx_path
+      File.join('xl', 'theme', 'theme1.xml')
+    end
+
+    def self.content_type
+      'application/vnd.openxmlformats-officedocument.theme+xml'
+    end
+
+
+    ###### Temporary storage of the theme until I'm done with fully implementing
+    ###### all of its intricacies
+    attr_accessor :raw_xml
+
+    def self.parse_file(dirpath)
+      full_path = File.join(dirpath, xlsx_path)
+      return nil unless File.exist?(full_path)
+      obj = self.new
+      
+      obj.raw_xml = File.open(full_path, 'r').read
+      obj
+    end
+
+    def write_xml
+      raw_xml || # Use fallback theme.
+        '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme">
+<a:themeElements>
+<a:clrScheme name="Office">
+<a:dk1>
+<a:sysClr val="windowText" lastClr="000000"/>
+</a:dk1>
+<a:lt1>
+<a:sysClr val="window" lastClr="FFFFFF"/>
+</a:lt1>
+<a:dk2>
+<a:srgbClr val="1F497D"/>
+</a:dk2>
+<a:lt2>
+<a:srgbClr val="EEECE1"/>
+</a:lt2>
+<a:accent1>
+<a:srgbClr val="4F81BD"/>
+</a:accent1>
+<a:accent2>
+<a:srgbClr val="C0504D"/>
+</a:accent2>
+<a:accent3>
+<a:srgbClr val="9BBB59"/>
+</a:accent3>
+<a:accent4>
+<a:srgbClr val="8064A2"/>
+</a:accent4>
+<a:accent5>
+<a:srgbClr val="4BACC6"/>
+</a:accent5>
+<a:accent6>
+<a:srgbClr val="F79646"/>
+</a:accent6>
+<a:hlink>
+<a:srgbClr val="0000FF"/>
+</a:hlink>
+<a:folHlink>
+<a:srgbClr val="800080"/>
+</a:folHlink>
+</a:clrScheme>
+<a:fontScheme name="Office">
+<a:majorFont>
+<a:latin typeface="Cambria"/>
+<a:ea typeface=""/>
+<a:cs typeface=""/>
+<a:font script="Jpan" typeface="ＭＳ Ｐゴシック"/>
+<a:font script="Hang" typeface="맑은 고딕"/>
+<a:font script="Hans" typeface="宋体"/>
+<a:font script="Hant" typeface="新細明體"/>
+<a:font script="Arab" typeface="Times New Roman"/>
+<a:font script="Hebr" typeface="Times New Roman"/>
+<a:font script="Thai" typeface="Tahoma"/>
+<a:font script="Ethi" typeface="Nyala"/>
+<a:font script="Beng" typeface="Vrinda"/>
+<a:font script="Gujr" typeface="Shruti"/>
+<a:font script="Khmr" typeface="MoolBoran"/>
+<a:font script="Knda" typeface="Tunga"/>
+<a:font script="Guru" typeface="Raavi"/>
+<a:font script="Cans" typeface="Euphemia"/>
+<a:font script="Cher" typeface="Plantagenet Cherokee"/>
+<a:font script="Yiii" typeface="Microsoft Yi Baiti"/>
+<a:font script="Tibt" typeface="Microsoft Himalaya"/>
+<a:font script="Thaa" typeface="MV Boli"/>
+<a:font script="Deva" typeface="Mangal"/>
+<a:font script="Telu" typeface="Gautami"/>
+<a:font script="Taml" typeface="Latha"/>
+<a:font script="Syrc" typeface="Estrangelo Edessa"/>
+<a:font script="Orya" typeface="Kalinga"/>
+<a:font script="Mlym" typeface="Kartika"/>
+<a:font script="Laoo" typeface="DokChampa"/>
+<a:font script="Sinh" typeface="Iskoola Pota"/>
+<a:font script="Mong" typeface="Mongolian Baiti"/>
+<a:font script="Viet" typeface="Times New Roman"/>
+<a:font script="Uigh" typeface="Microsoft Uighur"/>
+</a:majorFont>
+<a:minorFont>
+<a:latin typeface="Calibri"/>
+<a:ea typeface=""/>
+<a:cs typeface=""/>
+<a:font script="Jpan" typeface="ＭＳ Ｐゴシック"/>
+<a:font script="Hang" typeface="맑은 고딕"/>
+<a:font script="Hans" typeface="宋体"/>
+<a:font script="Hant" typeface="新細明體"/>
+<a:font script="Arab" typeface="Arial"/>
+<a:font script="Hebr" typeface="Arial"/>
+<a:font script="Thai" typeface="Tahoma"/>
+<a:font script="Ethi" typeface="Nyala"/>
+<a:font script="Beng" typeface="Vrinda"/>
+<a:font script="Gujr" typeface="Shruti"/>
+<a:font script="Khmr" typeface="DaunPenh"/>
+<a:font script="Knda" typeface="Tunga"/>
+<a:font script="Guru" typeface="Raavi"/>
+<a:font script="Cans" typeface="Euphemia"/>
+<a:font script="Cher" typeface="Plantagenet Cherokee"/>
+<a:font script="Yiii" typeface="Microsoft Yi Baiti"/>
+<a:font script="Tibt" typeface="Microsoft Himalaya"/>
+<a:font script="Thaa" typeface="MV Boli"/>
+<a:font script="Deva" typeface="Mangal"/>
+<a:font script="Telu" typeface="Gautami"/>
+<a:font script="Taml" typeface="Latha"/>
+<a:font script="Syrc" typeface="Estrangelo Edessa"/>
+<a:font script="Orya" typeface="Kalinga"/>
+<a:font script="Mlym" typeface="Kartika"/>
+<a:font script="Laoo" typeface="DokChampa"/>
+<a:font script="Sinh" typeface="Iskoola Pota"/>
+<a:font script="Mong" typeface="Mongolian Baiti"/>
+<a:font script="Viet" typeface="Arial"/>
+<a:font script="Uigh" typeface="Microsoft Uighur"/>
+</a:minorFont>
+</a:fontScheme>
+<a:fmtScheme name="Office">
+<a:fillStyleLst>
+<a:solidFill>
+<a:schemeClr val="phClr"/>
+</a:solidFill>
+<a:gradFill rotWithShape="1">
+<a:gsLst>
+<a:gs pos="0">
+<a:schemeClr val="phClr">
+<a:tint val="50000"/>
+<a:satMod val="300000"/>
+</a:schemeClr>
+</a:gs>
+<a:gs pos="35000">
+<a:schemeClr val="phClr">
+<a:tint val="37000"/>
+<a:satMod val="300000"/>
+</a:schemeClr>
+</a:gs>
+<a:gs pos="100000">
+<a:schemeClr val="phClr">
+<a:tint val="15000"/>
+<a:satMod val="350000"/>
+</a:schemeClr>
+</a:gs>
+</a:gsLst>
+<a:lin ang="16200000" scaled="1"/>
+</a:gradFill>
+<a:gradFill rotWithShape="1">
+<a:gsLst>
+<a:gs pos="0">
+<a:schemeClr val="phClr">
+<a:tint val="100000"/>
+<a:shade val="100000"/>
+<a:satMod val="130000"/>
+</a:schemeClr>
+</a:gs>
+<a:gs pos="100000">
+<a:schemeClr val="phClr">
+<a:tint val="50000"/>
+<a:shade val="100000"/>
+<a:satMod val="350000"/>
+</a:schemeClr>
+</a:gs>
+</a:gsLst>
+<a:lin ang="16200000" scaled="0"/>
+</a:gradFill>
+</a:fillStyleLst>
+<a:lnStyleLst>
+<a:ln w="9525" cap="flat" cmpd="sng" algn="ctr">
+<a:solidFill>
+<a:schemeClr val="phClr">
+<a:shade val="95000"/>
+<a:satMod val="105000"/>
+</a:schemeClr>
+</a:solidFill>
+<a:prstDash val="solid"/>
+</a:ln>
+<a:ln w="25400" cap="flat" cmpd="sng" algn="ctr">
+<a:solidFill>
+<a:schemeClr val="phClr"/>
+</a:solidFill>
+<a:prstDash val="solid"/>
+</a:ln>
+<a:ln w="38100" cap="flat" cmpd="sng" algn="ctr">
+<a:solidFill>
+<a:schemeClr val="phClr"/>
+</a:solidFill>
+<a:prstDash val="solid"/>
+</a:ln>
+</a:lnStyleLst>
+<a:effectStyleLst>
+<a:effectStyle>
+<a:effectLst>
+<a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0">
+<a:srgbClr val="000000">
+<a:alpha val="38000"/>
+</a:srgbClr>
+</a:outerShdw>
+</a:effectLst>
+</a:effectStyle>
+<a:effectStyle>
+<a:effectLst>
+<a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0">
+<a:srgbClr val="000000">
+<a:alpha val="35000"/>
+</a:srgbClr>
+</a:outerShdw>
+</a:effectLst>
+</a:effectStyle>
+<a:effectStyle>
+<a:effectLst>
+<a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0">
+<a:srgbClr val="000000">
+<a:alpha val="35000"/>
+</a:srgbClr>
+</a:outerShdw>
+</a:effectLst>
+<a:scene3d>
+<a:camera prst="orthographicFront">
+<a:rot lat="0" lon="0" rev="0"/>
+</a:camera>
+<a:lightRig rig="threePt" dir="t">
+<a:rot lat="0" lon="0" rev="1200000"/>
+</a:lightRig>
+</a:scene3d>
+<a:sp3d>
+<a:bevelT w="63500" h="25400"/>
+</a:sp3d>
+</a:effectStyle>
+</a:effectStyleLst>
+<a:bgFillStyleLst>
+<a:solidFill>
+<a:schemeClr val="phClr"/>
+</a:solidFill>
+<a:gradFill rotWithShape="1">
+<a:gsLst>
+<a:gs pos="0">
+<a:schemeClr val="phClr">
+<a:tint val="40000"/>
+<a:satMod val="350000"/>
+</a:schemeClr>
+</a:gs>
+<a:gs pos="40000">
+<a:schemeClr val="phClr">
+<a:tint val="45000"/>
+<a:shade val="99000"/>
+<a:satMod val="350000"/>
+</a:schemeClr>
+</a:gs>
+<a:gs pos="100000">
+<a:schemeClr val="phClr">
+<a:shade val="20000"/>
+<a:satMod val="255000"/>
+</a:schemeClr>
+</a:gs>
+</a:gsLst>
+<a:path path="circle">
+<a:fillToRect l="50000" t="-80000" r="50000" b="180000"/>
+</a:path>
+</a:gradFill>
+<a:gradFill rotWithShape="1">
+<a:gsLst>
+<a:gs pos="0">
+<a:schemeClr val="phClr">
+<a:tint val="80000"/>
+<a:satMod val="300000"/>
+</a:schemeClr>
+</a:gs>
+<a:gs pos="100000">
+<a:schemeClr val="phClr">
+<a:shade val="30000"/>
+<a:satMod val="200000"/>
+</a:schemeClr>
+</a:gs>
+</a:gsLst>
+<a:path path="circle">
+<a:fillToRect l="50000" t="50000" r="50000" b="50000"/>
+</a:path>
+</a:gradFill>
+</a:bgFillStyleLst>
+</a:fmtScheme>
+</a:themeElements>
+<a:objectDefaults>
+<a:spDef>
+<a:spPr/>
+<a:bodyPr/>
+<a:lstStyle/>
+<a:style>
+<a:lnRef idx="1">
+<a:schemeClr val="accent1"/>
+</a:lnRef>
+<a:fillRef idx="3">
+<a:schemeClr val="accent1"/>
+</a:fillRef>
+<a:effectRef idx="2">
+<a:schemeClr val="accent1"/>
+</a:effectRef>
+<a:fontRef idx="minor">
+<a:schemeClr val="lt1"/>
+</a:fontRef>
+</a:style>
+</a:spDef>
+<a:lnDef>
+<a:spPr/>
+<a:bodyPr/>
+<a:lstStyle/>
+<a:style>
+<a:lnRef idx="2">
+<a:schemeClr val="accent1"/>
+</a:lnRef>
+<a:fillRef idx="0">
+<a:schemeClr val="accent1"/>
+</a:fillRef>
+<a:effectRef idx="1">
+<a:schemeClr val="accent1"/>
+</a:effectRef>
+<a:fontRef idx="minor">
+<a:schemeClr val="tx1"/>
+</a:fontRef>
+</a:style>
+</a:lnDef>
+</a:objectDefaults>
+<a:extraClrSchemeLst/>
+</a:theme>'
+
+    end
+    ######
+
+  end
+
+end