rubyXL 1.2.10 → 2.1.1

data/lib/rubyXL/writer/content_types_writer.rb

@@ -1,77 +1,113 @@
-# require File.expand_path(File.join(File.dirname(__FILE__),'workbook'))
-# require File.expand_path(File.join(File.dirname(__FILE__),'worksheet'))
-# require File.expand_path(File.join(File.dirname(__FILE__),'cell'))
-# require File.expand_path(File.join(File.dirname(__FILE__),'color'))
-require 'rubygems'
-require 'nokogiri'
+module RubyXL
+  module Writer
+    class ContentTypesWriter < GenericWriter
 
+      def filepath
+        '[Content_Types].xml'
+      end
 
-module RubyXL
-module Writer
-  class ContentTypesWriter
-    attr_accessor :dirpath, :filepath, :workbook
-    def initialize(dirpath, wb)
-      @dirpath = dirpath
-      @workbook = wb
-      @filepath = dirpath + '/[Content_Types].xml'
-    end
+      def write()
+
+        render_xml do |xml|
+          xml << (xml.create_element('Types',
+                    :xmlns => 'http://schemas.openxmlformats.org/package/2006/content-types') { |root|
 
-    def write()
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.Types('xmlns'=>"http://schemas.openxmlformats.org/package/2006/content-types") {
-          xml.Default('Extension'=>'xml', 'ContentType'=>'application/xml')
-          unless @workbook.shared_strings.nil?
-            xml.Override('PartName'=>'/xl/sharedStrings.xml',
-              'ContentType'=>"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml")
-          end
-          if @workbook.macros.nil? && @workbook.drawings.nil?
-            xml.Override('PartName'=>'/xl/workbook.xml',
-              'ContentType'=>"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml")
-          else
-            xml.Override('PartName'=>'/xl/workbook.xml',
-              'ContentType'=>"application/vnd.ms-excel.sheet.macroEnabled.main+xml")
-          end
-          xml.Override('PartName'=>"/xl/styles.xml",
-            'ContentType'=>"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml")
-          xml.Default('Extension'=>'rels','ContentType'=>'application/vnd.openxmlformats-package.relationships+xml')
-          unless @workbook.external_links.nil?
-            1.upto(@workbook.external_links.size-1) do |i|
-              xml.Override('PartName'=>"/xl/externalLinks/externalLink#{i}.xml",
-              'ContentType'=>"application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml")
+            unless @workbook.printer_settings.empty?
+              root << xml.create_element('Default', {
+                        :Extension => 'bin',
+                        :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings' })
             end
-          end
-          unless @workbook.macros.nil?
-            xml.Override('PartName'=>'/xl/vbaProject.bin',
-              'ContentType'=>'application/vnd.ms-office.vbaProject')
-          end
-          unless @workbook.printer_settings.nil?
-            xml.Default('Extension'=>'bin',
-              'ContentType'=>'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings')
-          end
-          unless @workbook.drawings.nil?
-            xml.Default('Extension'=>'vml',
-              'ContentType'=>'application/vnd.openxmlformats-officedocument.vmlDrawing')
-          end
-          xml.Override('PartName'=>'/xl/theme/theme1.xml',
-            'ContentType'=>"application/vnd.openxmlformats-officedocument.theme+xml")
-          @workbook.worksheets.each_with_index do |sheet,i|
-            xml.Override('PartName'=>"/xl/worksheets/sheet#{i+1}.xml",
-              'ContentType'=>"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml")
-          end
-          xml.Override('PartName'=>'/docProps/core.xml',
-            'ContentType'=>"application/vnd.openxmlformats-package.core-properties+xml")
-          xml.Override('PartName'=>'/docProps/app.xml',
-            'ContentType'=>"application/vnd.openxmlformats-officedocument.extended-properties+xml")
-        }
-      end
+            root << xml.create_element('Default', {
+                      :Extension => 'rels',
+                      :ContentType => 'application/vnd.openxmlformats-package.relationships+xml' })
 
-      contents = builder.to_xml
-      contents = contents.gsub(/\n/,'')
-      contents = contents.gsub(/>(\s)+</,'><')
-      contents = contents.sub(/<\?xml version=\"1.0\"\?>/,'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'+"\n")
+            root << xml.create_element('Default', {
+                      :Extension => 'xml',
+                      :ContentType => 'application/xml' })
+
+            root << xml.create_element('Default', {
+                      :Extension => 'jpeg',
+                      :ContentType => 'image/jpeg' })
+
+#           if @workbook.macros.nil? && @workbook.drawings.empty?
+            root << xml.create_element('Override', {
+                      :PartName    => '/xl/workbook.xml',
+                      :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml' })
+#           else
+#             xml.Override('PartName'=>'/xl/workbook.xml',
+#               'ContentType'=>"application/vnd.ms-excel.sheet.macroEnabled.main+xml")
+#           end
+
+            @workbook.worksheets.each_with_index { |sheet,i|
+              root << xml.create_element('Override', {
+                        :PartName    => "/xl/worksheets/sheet#{i+1}.xml",
+                        :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml' })
+            }
+
+            root << xml.create_element('Override', {
+                      :PartName    => '/xl/theme/theme1.xml',
+                      :ContentType => 'application/vnd.openxmlformats-officedocument.theme+xml' })
+
+            root << xml.create_element('Override', {
+                      :PartName    => '/xl/styles.xml',
+                      :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml' })
+
+            unless @workbook.shared_strings_container.empty?
+              root << xml.create_element('Override', {
+                        :PartName    => '/xl/sharedStrings.xml',
+                        :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml' })
+            end
+
+            @workbook.drawings.each_pair { |k, v|
+              root << xml.create_element('Override', {
+                        :PartName    => "/#{@workbook.drawings.local_dir_path}/#{k}",
+                        :ContentType => 'application/vnd.openxmlformats-officedocument.drawing+xml' })
+#            xml.Default('Extension'=>'vml',
+#              'ContentType'=>'application/vnd.openxmlformats-officedocument.vmlDrawing')
+            }
+
+            @workbook.charts.each_pair { |k, v|
+              case k
+              when /^chart\d*.xml$/ then
+                root << xml.create_element('Override', {
+                          :PartName    => "/#{@workbook.charts.local_dir_path}/#{k}",
+                          :ContentType => 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml' })
+              when /^style\d*.xml$/ then
+                root << xml.create_element('Override', {
+                          :PartName    => "/#{@workbook.charts.local_dir_path}/#{k}",
+                          :ContentType => 'application/vnd.ms-office.chartstyle+xml' })
+              when /^colors\d*.xml$/ then
+                root << xml.create_element('Override', {
+                          :PartName    => "/#{@workbook.charts.local_dir_path}/#{k}",
+                          :ContentType => 'application/vnd.ms-office.chartcolorstyle+xml' })
+              end
+            }
+
+            root << xml.create_element('Override', {
+                      :PartName    => '/docProps/core.xml',
+                      :ContentType => 'application/vnd.openxmlformats-package.core-properties+xml' })
+
+            root << xml.create_element('Override', {
+                      :PartName    => '/docProps/app.xml',
+                      :ContentType => 'application/vnd.openxmlformats-officedocument.extended-properties+xml' })
+
+            unless @workbook.external_links.nil?
+              1.upto(@workbook.external_links.size-1) do |i|
+                root << xml.create_element('Override', {
+                          :PartName    => "/xl/externalLinks/externalLink#{i}.xml",
+                          :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml' })
+              end
+            end
+
+            unless @workbook.macros.nil?
+              root << xml.create_element('Override', {
+                        :PartName    => '/xl/vbaProject.bin',
+                        :ContentType => 'application/vnd.ms-office.vbaProject' })
+            end
+          })
+        end
+      end
 
-      contents
     end
   end
 end
-end

data/lib/rubyXL/writer/core_writer.rb

@@ -1,51 +1,34 @@
-# require File.expand_path(File.join(File.dirname(__FILE__),'workbook'))
-# require File.expand_path(File.join(File.dirname(__FILE__),'worksheet'))
-# require File.expand_path(File.join(File.dirname(__FILE__),'cell'))
-# require File.expand_path(File.join(File.dirname(__FILE__),'color'))
-require 'rubygems'
-require 'nokogiri'
-
 module RubyXL
-module Writer
-  class CoreWriter
-    attr_accessor :dirpath, :filepath, :workbook
-
-    def initialize(dirpath, wb)
-      @dirpath = dirpath
-      @workbook = wb
-      @filepath = @dirpath + '/docProps/core.xml'
-    end
-
-    def write()
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.coreProperties('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") {
-          xml['dc'].creator @workbook.creator.to_s
-          xml['cp'].lastModifiedBy @workbook.modifier.to_s
-          xml['dcterms'].created('xsi:type' => 'dcterms:W3CDTF') do
-            @workbook.created_at
-          end
+  module Writer
+    class CoreWriter < GenericWriter
 
-          xml['dcterms'].modified('xsi:type' => 'dcterms:W3CDTF')
-        }
+      def filepath
+        File.join('docProps', 'core.xml')
       end
 
-      contents = builder.to_xml
-      contents = contents.gsub(/coreProperties/,'cp:coreProperties')
-      contents = contents.gsub(/\n/,'')
-      contents = contents.gsub(/>(\s)+</,'><')
-
-      #seems hack-y..
-      contents = contents.gsub(/<dcterms:created xsi:type=\"dcterms:W3CDTF\"\/>/,
-        '<dcterms:created xsi:type="dcterms:W3CDTF">'+@workbook.created_at+'</dcterms:created>')
-      contents = contents.gsub(/<dcterms:modified xsi:type=\"dcterms:W3CDTF\"\/>/,
-        '<dcterms:modified xsi:type="dcterms:W3CDTF">'+@workbook.modified_at+'</dcterms:modified>')
-
-      contents = contents.sub(/<\?xml version=\"1.0\"\?>/,'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'+"\n")
+      def write()
+        render_xml do |xml|
+          xml << (xml.create_element('cp:coreProperties', 
+                     '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') { |root|
+
+            root << xml.create_element('dc:creator',        @workbook.creator)
+            root << xml.create_element('cp:lastModifiedBy', @workbook.modifier)
+
+            unless @workbook.created_at.to_s.empty?
+              root << xml.create_element('dcterms:created',  { 'xsi:type' => 'dcterms:W3CDTF' }, @workbook.created_at)
+            end
+
+            unless @workbook.modified_at.to_s.empty?
+              root << xml.create_element('dcterms:modified', { 'xsi:type' => 'dcterms:W3CDTF' }, @workbook.modified_at)
+            end
+          })
+        end
+      end
 
-      return contents
     end
   end
 end
-end

data/lib/rubyXL/writer/generic_writer.rb

@@ -0,0 +1,43 @@
+require 'rubygems'
+require 'nokogiri'
+
+module RubyXL
+  module Writer
+    class GenericWriter
+
+      def initialize(workbook)
+        @workbook = workbook
+        # +self.class+ makes sure constant is pulled from descendant class, not from this one.
+        # self.class::FILEPATH
+      end
+
+      def filepath
+        raise 'Subclass responsebility'
+      end
+
+      def render_xml
+        seed_xml = Nokogiri::XML('<?xml version = "1.0" standalone ="yes"?>')
+        seed_xml.encoding = 'UTF-8'
+
+        yield(seed_xml)
+
+        seed_xml.to_xml({ :indent => 0, :save_with => Nokogiri::XML::Node::SaveOptions::AS_XML })
+      end
+
+      def add_to_zip(zipfile)
+        output = write
+        return if output.nil?
+        zipfile.get_output_stream(filepath) { |f| f << output }
+      end
+
+      def ooxml_object
+        raise 'Subclass responsebility'
+      end
+
+      def write
+        ooxml_object && ooxml_object.write_xml
+      end
+
+    end
+  end
+end

data/lib/rubyXL/writer/root_rels_writer.rb

@@ -1,25 +1,17 @@
-# require File.expand_path(File.join(File.dirname(__FILE__),'workbook'))
-# require File.expand_path(File.join(File.dirname(__FILE__),'worksheet'))
-# require File.expand_path(File.join(File.dirname(__FILE__),'cell'))
-# require File.expand_path(File.join(File.dirname(__FILE__),'color'))
-require 'rubygems'
-require 'nokogiri'
-
 module RubyXL
-module Writer
-  class RootRelsWriter
-    attr_accessor :dirpath, :workbook
+  module Writer
+    class RootRelsWriter < GenericWriter
 
-    def initialize(dirpath, wb)
-      @dirpath = dirpath
-      @wb = wb
-    end
+      def filepath
+        File.join('_rels', '.rels')
+      end
+
+      def write()
+        contents = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/></Relationships>'
+        contents
+      end
 
-    def write()
-      contents = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-      <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/></Relationships>'
-      contents
     end
   end
 end
-end

data/lib/rubyXL/writer/styles_writer.rb

@@ -1,407 +1,15 @@
-require 'rubygems'
-require 'nokogiri'
-
 module RubyXL
-module Writer
-  class StylesWriter
-    attr_accessor :dirpath, :filepath, :workbook
-
-    def initialize(dirpath, wb)
-      @dirpath = dirpath
-      @workbook = wb
-      @filepath = @dirpath + '/xl/styles.xml'
-    end
-
-    def write()
-      font_id_corrector = {}
-      fill_id_corrector = {}
-      border_id_corrector = {}
-      style_id_corrector = {}
-
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.styleSheet('xmlns'=>"http://schemas.openxmlformats.org/spreadsheetml/2006/main") {
-          unless @workbook.num_fmts.nil? || @workbook.num_fmts[:attributes].nil?
-            xml.numFmts('count'=>@workbook.num_fmts[:attributes][:count].to_s) {
-              @workbook.num_fmts[:numFmt].each do |fmt|
-                attributes = fmt[:attributes]
-                xml.numFmt('numFmtId'=>attributes[:numFmtId].to_s,
-                  'formatCode'=>attributes[:formatCode].to_s)
-              end
-            }
-          end
-
-          offset = 0
-          #default font should stay the same
-          font_id_corrector['0']=0
-          1.upto(@workbook.fonts.size-1) do |i|
-            font_id_corrector[i.to_s] = i-offset
-            if @workbook.fonts[i.to_s][:count] == 0
-              @workbook.fonts[i.to_s] = nil
-              font_id_corrector[i.to_s] = nil
-              offset += 1
-            end
-          end
-
-
-          offset = 0
-          #STARTS AT 2 because excel is stupid
-          #and it seems to hard code access the first
-          #2 styles.............
-          fill_id_corrector['0']=0
-          fill_id_corrector['1']=1
-          2.upto(@workbook.fills.size-1) do |i|
-            fill_id_corrector[i.to_s] = i-offset
-            if @workbook.fills[i.to_s][:count] == 0
-              @workbook.fills[i.to_s] = nil
-              fill_id_corrector[i.to_s] = nil
-              offset += 1
-            end
-          end
-
-          #sets index to itself as init correction
-          #if items deleted, indexes adjusted
-          #that id 'corrects' to nil
-          offset = 0
-
-          #default border should stay the same
-          border_id_corrector['0'] = 0
-          1.upto(@workbook.borders.size-1) do |i|
-            border_id_corrector[i.to_s] = i-offset
-            if @workbook.borders[i.to_s][:count] == 0
-              @workbook.borders[i.to_s] = nil
-              border_id_corrector[i.to_s] = nil
-              offset += 1
-            end
-          end
-
-          if !@workbook.cell_xfs[:xf].is_a?(Array)
-            @workbook.cell_xfs[:xf] = [@workbook.cell_xfs[:xf]]
-          end
-          
-
-          
-          style_id_corrector['0']=0
-          delete_list = []
-          i = 1
-          while(i < @workbook.cell_xfs[:xf].size) do
-            if style_id_corrector[i.to_s].nil?
-              style_id_corrector[i.to_s]= i
-            end
-            # style correction commented out until bug is fixed
-            j = i+1
-            while(j < @workbook.cell_xfs[:xf].size) do
-              if hash_equal(@workbook.cell_xfs[:xf][i],@workbook.cell_xfs[:xf][j]) #check if this is working
-                style_id_corrector[j.to_s] = i
-                delete_list << j
-              end
-              j += 1
-            end
-            i += 1
-          end
-          
-          #go through delete list, if before delete_list index 0, offset 0, if before delete_list index 1, offset 1, etc.
-          delete_list.sort!
-
-          i = 1
-          offset = 0
-          offset_corrector = 0
-          delete_list << @workbook.cell_xfs[:xf].size
-          while offset < delete_list.size do
-            delete_index = delete_list[offset] - offset
-
-            while i <= delete_list[offset] do #if <= instead of <, fixes odd border but adds random cells with fill              
-              if style_id_corrector[i.to_s] == i
-                style_id_corrector[i.to_s] -= offset# unless style_id_corrector[i.to_s].nil? #173 should equal 53, not 52?
-              end
-
-              i += 1
-            end
-            @workbook.cell_xfs[:xf].delete_at(delete_index)
-            offset += 1
-          end
-          
-          @workbook.style_corrector = style_id_corrector
-
+  module Writer
+    class StylesWriter < GenericWriter
 
-          xml.fonts('count'=>@workbook.fonts.size) {
-            0.upto(@workbook.fonts.size-1) do |i|
-              font = @workbook.fonts[i.to_s]
-              unless font.nil?
-                font = font[:font]
-                xml.font {
-                  xml.sz('val'=>font[:sz][:attributes][:val].to_s)
-                  unless font[:b].nil?
-                    xml.b
-                  end
-                  unless font[:i].nil?
-                    xml.i
-                  end
-                  unless font[:u].nil?
-                    xml.u
-                  end
-                  unless font[:strike].nil?
-                    xml.strike
-                  end
-                  unless font[:color].nil?
-                    unless font[:color][:attributes][:indexed].nil?
-                      xml.color('indexed'=>font[:color][:attributes][:indexed])
-                    else
-                      unless font[:color][:attributes][:rgb].nil?
-                        xml.color('rgb'=>font[:color][:attributes][:rgb])
-                      else
-                        unless font[:color][:attributes][:theme].nil?
-                          xml.color('theme'=>font[:color][:attributes][:theme])
-                        end
-                      end
-                    end
-                  end
-                  unless font[:family].nil?
-                    xml.family('val'=>font[:family][:attributes][:val].to_s)
-                  end
-                  unless font[:scheme].nil?
-                    xml.scheme('val'=>font[:scheme][:attributes][:val].to_s)
-                  end
-
-                  xml.name('val'=>font[:name][:attributes][:val].to_s)
-                }
-              end
-            end
-          }
-
-          xml.fills('count'=>@workbook.fills.size) {
-            0.upto(@workbook.fills.size-1) do |i|
-              fill = @workbook.fills[i.to_s]
-              unless fill.nil?
-                fill = fill[:fill]
-                xml.fill {
-                  xml.patternFill('patternType'=>fill[:patternFill][:attributes][:patternType].to_s) {
-                    unless fill[:patternFill][:fgColor].nil?
-                      fgColor = fill[:patternFill][:fgColor][:attributes]
-                      unless fgColor[:indexed].nil?
-                        xml.fgColor('indexed'=>fgColor[:indexed].to_s)
-                      else
-                        unless fgColor[:rgb].nil?
-                          xml.fgColor('rgb'=>fgColor[:rgb])
-                        end
-                      end
-                    end
-                    unless fill[:patternFill][:bgColor].nil?
-                      bgColor = fill[:patternFill][:bgColor][:attributes]
-                      unless bgColor[:indexed].nil?
-                        xml.bgColor('indexed'=>bgColor[:indexed].to_s)
-                      else
-                        unless bgColor[:rgb].nil?
-                          xml.bgColor('rgb'=>bgColor[:rgb])
-                        end
-                      end
-                    end
-                  }
-                }
-              end
-            end
-          }
-
-          xml.borders('count'=>@workbook.borders.size) {
-            0.upto(@workbook.borders.size-1) do |i|
-              border = @workbook.borders[i.to_s]
-              unless border.nil?
-                border = border[:border]
-                xml.border {
-                  if border[:left][:attributes].nil?
-                    xml.left
-                  else
-                    xml.left('style'=>border[:left][:attributes][:style]) {
-                      unless border[:left][:color].nil?
-                        color = border[:left][:color][:attributes]
-                        unless color[:indexed].nil?
-                          xml.color('indexed'=>color[:indexed])
-                        else
-                          unless color[:rgb].nil?
-                            xml.color('rgb'=>color[:rgb])
-                          end
-                        end
-                      end
-                    }
-                  end
-                  if border[:right][:attributes].nil?
-                    xml.right
-                  else
-                    xml.right('style'=>border[:right][:attributes][:style]) {
-                      unless border[:right][:color].nil?
-                        color = border[:right][:color][:attributes]
-                        unless color[:indexed].nil?
-                          xml.color('indexed'=>color[:indexed])
-                        else
-                          unless color[:rgb].nil?
-                            xml.color('rgb'=>color[:rgb])
-                          end
-                        end
-                      end
-                    }
-                  end
-                  if border[:top][:attributes].nil?
-                    xml.top
-                  else
-                    xml.top('style'=>border[:top][:attributes][:style]) {
-                      unless border[:top][:color].nil?
-                        color = border[:top][:color][:attributes]
-                        unless color[:indexed].nil?
-                          xml.color('indexed'=>color[:indexed])
-                        else
-                          unless color[:rgb].nil?
-                            xml.color('rgb'=>color[:rgb])
-                          end
-                        end
-                      end
-                    }
-                  end
-                  if border[:bottom][:attributes].nil?
-                    xml.bottom
-                  else
-                    xml.bottom('style'=>border[:bottom][:attributes][:style]) {
-                      unless border[:bottom][:color].nil?
-                        color = border[:bottom][:color][:attributes]
-                        unless color[:indexed].nil?
-                          xml.color('indexed'=>color[:indexed])
-                        else
-                          unless color[:rgb].nil?
-                            xml.color('rgb'=>color[:rgb])
-                          end
-                        end
-                      end
-                    }
-                  end
-                  if border[:diagonal][:attributes].nil?
-                    xml.diagonal
-                  else
-                    xml.diagonal('style'=>border[:diagonal][:attributes][:style]) {
-                      unless border[:diagonal][:color].nil?
-                        color = border[:diagonal][:color][:attributes]
-                        unless color[:indexed].nil?
-                          xml.color('indexed'=>color[:indexed])
-                        else
-                          unless color[:rgb].nil?
-                            xml.color('rgb'=>color[:rgb])
-                          end
-                        end
-                      end
-                    }
-                  end
-                }
-              end #unless border.nil?
-            end #0.upto(size)
-          }
-
-          xml.cellStyleXfs('count'=>@workbook.cell_style_xfs[:attributes][:count].to_s) {
-            @workbook.cell_style_xfs[:xf].each do |style|
-              style = @workbook.get_style_attributes(style)
-              xml.xf('numFmtId'=>style[:numFmtId].to_s,
-              'fontId'=>font_id_corrector[style[:fontId].to_s].to_s,
-              'fillId'=>fill_id_corrector[style[:fillId].to_s].to_s,
-              'borderId'=>border_id_corrector[style[:borderId].to_s].to_s)
-            end
-          }
-
-          xml.cellXfs('count'=>@workbook.cell_xfs[:xf].size) {
-            @workbook.cell_xfs[:xf].each do |xf_obj|
-              xf = @workbook.get_style_attributes(xf_obj)
-
-              xml.xf('numFmtId'=>xf[:numFmtId].to_s,
-              'fontId'=>font_id_corrector[xf[:fontId].to_s].to_s,
-              'fillId'=>fill_id_corrector[xf[:fillId].to_s].to_s,
-              'borderId'=>border_id_corrector[xf[:borderId].to_s].to_s,
-              'xfId'=>xf[:xfId].to_s,
-              'applyFont'=>xf[:applyFont].to_i.to_s, #0 if nil
-              'applyFill'=>xf[:applyFill].to_i.to_s,
-              'applyAlignment'=>xf[:applyAlignment].to_i.to_s,
-              'applyNumberFormat'=>xf[:applyNumberFormat].to_i.to_s) {
-                unless xf_obj.is_a?Array
-                  unless xf_obj[:alignment].nil?
-                    xml.alignment('horizontal'=>xf_obj[:alignment][:attributes][:horizontal].to_s,
-                                  'vertical'=>xf_obj[:alignment][:attributes][:vertical].to_s,
-                                  'wrapText'=>xf_obj[:alignment][:attributes][:wrapText].to_s)
-                  end
-                end
-              }
-            end
-          }
-          xml.cellStyles('count'=>@workbook.cell_styles[:attributes][:count].to_s) {
-
-            @workbook.cell_styles[:cellStyle].each do |style|
-              style = @workbook.get_style_attributes(style)
-              xml.cellStyle('name'=>style[:name].to_s,
-              'xfId'=>style[:xfId].to_s,
-              'builtinId'=>style[:builtinId].to_s)
-            end
-          }
-          xml.dxfs('count'=>'0')
-          xml.tableStyles('count'=>'0', 'defaultTableStyle'=>'TableStyleMedium9')
-
-          unless @colors.nil?
-            xml.colors {
-              unless @colors[:indexedColors].nil?
-                xml.indexedColors {
-                  @colors[:indexedColors].each do |rgb_color|
-                    xml.rgbColor rgb_color[:attributes][:rgb]
-                  end
-                }
-              end
-
-              unless @colors[:mruColors].nil?
-                xml.mruColors {
-                  @colors[:mruColors].each do |color|
-                    xml.color color[:attributes][:rgb]
-                  end
-                }
-              end
-            }
-          end
-        }
-      end
-      contents = builder.to_xml
-      contents = contents.gsub(/\n/,'')
-      contents = contents.gsub(/>(\s)+</,'><')
-      contents = contents.sub(/<\?xml version=\"1.0\"\?>/,'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'+"\n")
-      contents
-    end
-
-    private
-
-    def hash_equal(h1,h2)
-      if h1.nil?
-        if h2.nil?
-          return true
-        else
-          return false
-        end
-      elsif h2.nil?
-        return false
-      end
-      if h1.size != h2.size
-        return false
+      def filepath
+        File.join('xl', 'styles.xml')
       end
 
-      h1.each do |k,v|
-        if (h1[k].is_a?String) || (h2[k].is_a?String)
-          if (h1.is_a?Hash) && (h2.is_a?Hash)
-            unless hash_equal(h1[k].to_s,h2[k].to_s)
-              return false
-            end
-          else
-            unless h1[k].to_s == h2[k].to_s
-              return false
-            end
-          end
-        else
-          unless h1[k] == h2[k]
-            return false
-          end
-        end
+      def ooxml_object
+        @workbook.stylesheet
       end
 
-      true
     end
-
   end
 end
-end