rubyXL 2.5.7 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 794a18bdbb32248109cbf8db6c6980baa9554b94
-  data.tar.gz: 4d719ab25167db598f866854da7828b61e849b3b
+  metadata.gz: 5a09e59d3e1ba47212acd8cd808c8863d85016d7
+  data.tar.gz: f4ad0faaf011c66154a6d97f84c16ed255ddfd13
 SHA512:
-  metadata.gz: e78a5c5c76d25bbc1a0a8fa59ca07fe949a0b4584e22bf253894399d691f0fbc50518a9ec06740050fd9d01859c7474ac9594387dac7c18c7f1de022cfb7a644
-  data.tar.gz: 3096460f2cdd9f40f6385eaedcf59bcd6902ed24f46c1de7a16d8fac104228296b7cec75869639f0252b4dde959b63ceacb5bb0da7125abe04511346d80f27b9
+  metadata.gz: 9553c04829bf02bc5918341deeb9a535086bc80cbc0d64ce964fcad89cbfd5f925f4dda11e72aad5d015d3f82dbaa0ebb26b650da2327de15dcd57c4fb00e1c3
+  data.tar.gz: a0f90671f4710d6f1a5589e6d9462b171ed84873bdd5427c63d8daa24a6c1c845178f54775b7508bde5da07a3d487844e9f80de19081b1a3adb8209520f083b1

data/VERSION

@@ -1 +1 @@
-2.5.7
+3.0.0

data/lib/rubyXL.rb

@@ -1,3 +1,4 @@
+require 'rubyXL/objects/relationships'
 require 'rubyXL/workbook'
 require 'rubyXL/worksheet'
 require 'rubyXL/cell'
@@ -10,9 +11,11 @@ require 'rubyXL/objects/chartsheet'
 require 'rubyXL/objects/calculation_chain'
 require 'rubyXL/objects/content_types'
 require 'rubyXL/objects/theme'
+require 'rubyXL/objects/comments'
+require 'rubyXL/objects/root'
 require 'rubyXL/objects/workbook'
 require 'rubyXL/objects/document_properties'
-require 'rubyXL/objects/relationships'
+require 'rubyXL/objects/storage'
 require 'rubyXL/parser'
 
 module RubyXL

data/lib/rubyXL/objects/calculation_chain.rb

@@ -15,19 +15,17 @@ module RubyXL
 
   # http://www.schemacentral.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'
+
     define_child_node(RubyXL::CalculationChainCell, :collection => true, :accessor => :cells)
     define_child_node(RubyXL::ExtensionStorageArea)
 
     define_element_name 'calcChain'
     set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
 
-    def self.xlsx_path
+    def 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

@@ -57,6 +57,14 @@ module RubyXL
 
   # http://www.schemacentral.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'
+
+    include RubyXL::RelationshipSupport
+
+    attr_accessor :state, :rels
+    attr_accessor :workbook, :sheet_name, :sheet_id
+
     define_child_node(RubyXL::ChartsheetProperties)
     define_child_node(RubyXL::ChartsheetViews)
     define_child_node(RubyXL::ChartsheetProtection)
@@ -74,26 +82,21 @@ module RubyXL
     set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
 
-    attr_accessor :state
-
-    def sheet_index
-      @workbook.worksheets.select{ |sheet| sheet.is_a?(self.class) }.index{ |sheet| sheet.equal?(self) }
-    end
-
     def xlsx_path
-      File.join('xl', 'chartsheets', "sheet#{sheet_index + 1}.xml")
+      File.join('xl', 'chartsheets', "sheet#{file_index}.xml")
     end
 
-    def rel_type
-      'chartsheet'
+    def relationship_file_class
+      RubyXL::SheetRelationshipsFile
     end
 
-    def self.content_type
-      'application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml'
+    def attach_relationship(rid, rf)
+      case rf
+      when RubyXL::DrawingFile then store_relationship(rf) # TODO
+      else store_relationship(rf, :unknown)
+      end
     end
 
-    attr_accessor :workbook, :sheet_name, :sheet_id
-
   end
 
 end

data/lib/rubyXL/objects/color.rb

@@ -13,7 +13,7 @@ module RubyXL
 
     #validates hex color code, no '#' allowed
     def self.validate_color(color)
-      if color =~ /^([a-f]|[A-F]|[0-9]){6}$/
+      if color =~ /\A([a-f]|[A-F]|[0-9]){6}\Z/
         return true
       else
         raise 'invalid color'

data/lib/rubyXL/objects/comments.rb

@@ -0,0 +1,46 @@
+require 'rubyXL/objects/ooxml_object'
+require 'rubyXL/objects/extensions'
+
+module RubyXL
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_comment-1.html
+  class Comment < OOXMLObject
+    define_child_node(RubyXL::RichText, :node_name => 'text')
+    define_attribute(:ref,      :ref, :required => true)
+    define_attribute(:authorId, :int, :required => true)
+    define_attribute(:guid,     :string)
+    define_element_name 'comment'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_authors-1.html
+  class CommentList < OOXMLContainerObject
+    define_child_node(RubyXL::Comment, :collection => :true)
+    define_element_name 'commentList'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_authors-1.html
+  class Authors < OOXMLContainerObject
+    define_child_node(RubyXL::StringNode, :node_name => :author, :collection => :true)
+    define_element_name 'authors'
+  end
+
+  # http://www.schemacentral.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'
+
+    define_child_node(RubyXL::Authors)
+    define_child_node(RubyXL::CommentList)
+    define_child_node(RubyXL::ExtensionStorageArea)
+    define_element_name 'comments'
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
+
+    attr_accessor :workbook
+
+    def xlsx_path
+      File.join('xl', "comments#{file_index}.xml")
+    end
+
+  end
+
+end

data/lib/rubyXL/objects/content_types.rb

@@ -15,7 +15,7 @@ module RubyXL
   end
 
   class ContentTypes < OOXMLTopLevelObject
-    attr_accessor :workbook
+    attr_accessor :owner
 
     define_child_node(RubyXL::ContentTypeDefault,  :collection => true, :accessor => :defaults)
     define_child_node(RubyXL::ContentTypeOverride, :collection => true, :accessor => :overrides)
@@ -27,13 +27,22 @@ module RubyXL
       '[Content_Types].xml'
     end
 
-    def generate_override(obj)
-      obj && RubyXL::ContentTypeOverride.new(:part_name => "/#{obj.xlsx_path}", :content_type => obj.class.content_type)
+    def xlsx_path
+      self.class.xlsx_path
+    end
+
+    def self.save_order
+      999  # Must be saved last, so it has time to accumulate overrides from all others.
+    end
+
+    def add_override(obj)
+      return unless obj.class.const_defined?(:CONTENT_TYPE)
+      overrides << 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?
+      if owner.rels_hash[RubyXL::PrinterSettingsFile] then
         defaults << RubyXL::ContentTypeDefault.new(:extension => 'bin',
                       :content_type => 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings')
       end
@@ -45,58 +54,11 @@ module RubyXL
                       :content_type => 'application/xml' )
 
       # TODO: Need to only write these types when respective content is actually present.
-      defaults << RubyXL::ContentTypeDefault.new(:extension => 'jpeg', :content_type => 'image/jpeg' )
-      defaults << RubyXL::ContentTypeDefault.new(:extension => 'png', :content_type => 'image/png' )
-
-      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) if workbook.shared_strings_container && !workbook.shared_strings_container.empty?
-      overrides << generate_override(workbook.calculation_chain)
-      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|
-        case k
-        when /.xml$/ then
-          overrides << RubyXL::ContentTypeOverride.new(:part_name => "/#{@workbook.drawings.local_dir_path}/#{k}",
-                         :content_type => 'application/vnd.openxmlformats-officedocument.drawing+xml')
-        when /.vml$/ then
-          # more proper fix: <Default Extension="vml" ContentType="application/vnd.openxmlformats-officedocument.vmlDrawing"/>
-          overrides << RubyXL::ContentTypeOverride.new(:part_name => "/#{@workbook.drawings.local_dir_path}/#{k}",
-                         :content_type => 'application/vnd.openxmlformats-officedocument.vmlDrawing')
-        end
-      }
-
-      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
+      defaults << RubyXL::ContentTypeDefault.new(:extension => 'jpeg', :content_type => 'image/jpeg')
+      defaults << RubyXL::ContentTypeDefault.new(:extension => 'png', :content_type => 'image/png')
+      defaults << RubyXL::ContentTypeDefault.new(:extension => 'wmf', :content_type => 'image/x-wmf')
+      defaults << RubyXL::ContentTypeDefault.new(:extension => 'vml', :content_type => 'application/vnd.openxmlformats-officedocument.vmlDrawing')
 
-      overrides.compact!
       true
     end
 

data/lib/rubyXL/objects/document_properties.rb

@@ -4,7 +4,10 @@ require 'rubyXL/objects/container_nodes'
 module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-extended-properties_Properties.html
-  class DocumentProperties < OOXMLTopLevelObject
+  class DocumentPropertiesFile < OOXMLTopLevelObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.extended-properties+xml'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties'
+
     attr_accessor :workbook
 
     define_child_node(RubyXL::StringNode,  :node_name => :Template)
@@ -58,27 +61,26 @@ module RubyXL
         add_parts_count('Worksheets', @workbook.worksheets.size)
         @workbook.worksheets.each { |sheet| add_part_title(sheet.sheet_name) }
 
-        if @workbook.defined_name_container then
-          add_parts_count('Named Ranges', @workbook.defined_name_container.defined_names.size)
-          @workbook.defined_name_container.defined_names.each { |defined_name| add_part_title(defined_name.name) }
+        if @workbook.defined_names then
+          add_parts_count('Named Ranges', @workbook.defined_names.size)
+          @workbook.defined_names.each { |defined_name| add_part_title(defined_name.name) }
         end
       end
 
       true
     end
 
-    def self.xlsx_path
+    def xlsx_path
       File.join('docProps', 'app.xml')
     end
 
-    def self.content_type
-      'application/vnd.openxmlformats-officedocument.extended-properties+xml'
-    end
-
   end
 
 
-  class CoreProperties < OOXMLTopLevelObject
+  class CorePropertiesFile < OOXMLTopLevelObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-package.core-properties+xml'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties'
+
     attr_accessor :workbook
 
     define_child_node(RubyXL::StringNode,    :node_name => 'dc:creator')
@@ -105,14 +107,10 @@ module RubyXL
                    'http://www.w3.org/2001/XMLSchema-instance' => 'xsi')
     define_element_name 'cp:coreProperties'
 
-    def self.xlsx_path
+    def 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

data/lib/rubyXL/objects/filters.rb

@@ -103,7 +103,7 @@ module RubyXL
     define_attribute(:caseSensitive, :bool,   :default  => false)
     define_attribute(:sortMethod,    RubyXL::ST_SortMethod, :default => 'none')
     define_attribute(:ref,           :ref,    :required => true)
-    define_child_node(RubyXL::SortCondition,  :colection => true)
+    define_child_node(RubyXL::SortCondition,  :collection => true)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'sortState'
   end

data/lib/rubyXL/objects/ooxml_object.rb

@@ -63,7 +63,7 @@ module RubyXL
     # ==== Examples
     #   define_child_node(RubyXL::Alignment)
     # Define a singular child node parsed by the RubyXL::BorderEdge.parse() and accessed by the default <tt>obj.alignment</tt> accessor
-    #   define_child_node(RubyXL::Hyperlink, :colection => true, :accessor => :hyperlinks)
+    #   define_child_node(RubyXL::Hyperlink, :collection => true, :accessor => :hyperlinks)
     # Define an array of nodes accessed by <tt>obj.hyperlinks</tt> accessor, each of which will be parsed by the RubyXL::Hyperlink.parse()
     #   define_child_node(RubyXL::BorderEdge, :node_name => :left)
     #   define_child_node(RubyXL::BorderEdge, :node_name => :right)
@@ -109,7 +109,7 @@ module RubyXL
     end
 
     def parse(node, known_namespaces = nil)
-      node = Nokogiri::XML.parse(node) if node.is_a?(IO) || node.is_a?(String)
+      node = Nokogiri::XML.parse(node) if node.is_a?(IO) || node.is_a?(String) || node.is_a?(Zip::InputStream)
 
       if node.is_a?(Nokogiri::XML::Document) then
         @namespaces = node.namespaces
@@ -274,7 +274,7 @@ module RubyXL
         val = val &&
                 case v[:attr_type]
                 when :bool  then val ? '1' : '0'
-                when :float then val.to_s.gsub(/\.0*$/, '') # Trim trailing zeroes
+                when :float then val.to_s.gsub(/\.0*\Z/, '') # Trim trailing zeroes
                 else val
                 end
 
@@ -396,11 +396,11 @@ module RubyXL
     # 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 xlsx_path
-      self.class.xlsx_path
+      raise 'Subclass responsebility'
     end
 
-    def self.xlsx_path
-      raise 'Subclass responsebility'
+    def self.save_order
+      500
     end
 
     # Sets the list of namespaces on this object to be added when writing out XML. Valid only on top-level objects.
@@ -417,11 +417,20 @@ module RubyXL
     # directory containing the unzipped contents of <tt>.xslx</tt>
     # === Parameters
     # * +dirpath+ - path to the directory with the unzipped <tt>.xslx</tt> contents.
-    def self.parse_file(dirpath)
-      full_path = File.join(dirpath, xlsx_path)
-      return nil unless File.exist?(full_path)
-      # Making sure that the file will be automatically closed immediately after it has been read
-      File.open(full_path, 'r') { |f| parse(f) }
+    def self.parse_file(dirpath, file_path = nil)
+      file_path = Pathname.new(file_path || self.xlsx_path)
+
+      case dirpath
+      when String then
+        full_path = File.join(dirpath, file_path)
+        return nil unless File.exist?(full_path)
+        # Making sure that the file will be automatically closed immediately after it has been read
+        File.open(full_path, 'r') { |f| parse(f) }
+      when Zip::File then
+        file_path = file_path.relative_path_from(Pathname.new("/")) if file_path.absolute? # Zip doesn't like absolute paths.
+        entry = dirpath.find_entry(file_path)
+        entry && (entry.get_input_stream { |f| parse(f) })
+      end
     end
 
     # Saves the contents of the object as XML to respective location in <tt>.xslx</tt> zip container.
@@ -433,6 +442,10 @@ module RubyXL
       zipfile.get_output_stream(self.xlsx_path) { |f| f << xml_string }
     end
 
+    def file_index
+      @workbook.root.rels_hash[self.class].index{ |f| f.equal?(self) }.to_i + 1
+    end
+
   end
 
 end

data/lib/rubyXL/objects/reference.rb

@@ -87,7 +87,7 @@ module RubyXL
 
     # Converts Excel-style cell reference to +row+ and +col+ zero-based indices.
     def self.ref2ind(str)
-      return [ -1, -1 ] unless str =~ /^([A-Z]+)(\d+)$/
+      return [ -1, -1 ] unless str =~ /\A([A-Z]+)(\d+)\Z/
 
       col = 0
       $1.each_byte { |chr| col = col * 26 + (chr - 64) }

data/lib/rubyXL/objects/relationships.rb

@@ -7,9 +7,10 @@ module RubyXL
   end
 
   class Relationship < OOXMLObject
-    define_attribute(:Id,     :string)
-    define_attribute(:Type,   :string)
-    define_attribute(:Target, :string)
+    define_attribute(:Id,         :string)
+    define_attribute(:Type,       :string)
+    define_attribute(:Target,     :string)
+    define_attribute(:TargetMode, :string)
     define_element_name 'Relationship'
   end
 
@@ -18,19 +19,28 @@ module RubyXL
     define_element_name 'Relationships'
     set_namespaces('http://schemas.openxmlformats.org/package/2006/relationships' => '')
 
-    def document_relationship(target, type)
+    attr_accessor :related_files, :owner
+
+    @@debug = nil # Change to 0 to enable debug output
+
+    def new_relationship(target, type)
       RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}", 
-                               :type => "http://schemas.openxmlformats.org/officeDocument/2006/relationships/#{type}",
+                               :type => type,
                                :target => target)
     end
-    protected :document_relationship
+    protected :new_relationship
 
-    def metadata_relationship(target, type)
-      RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}", 
-                               :type => "http://schemas.openxmlformats.org/package/2006/relationships/metadata/#{type}",
-                               :target => target)
+    def add_relationship(obj)
+      return if obj.nil?
+      relationships << RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}", 
+                                                :type => obj.class::REL_TYPE,
+                                                :target => obj.xlsx_path)
+    end
+    protected :add_relationship
+
+    def self.save_order
+      0
     end
-    protected :metadata_relationship
 
     def find_by_rid(r_id)
       relationships.find { |r| r.id == r_id }
@@ -39,9 +49,70 @@ module RubyXL
     def find_by_target(target)
       relationships.find { |r| r.target == target }
     end
-  end
 
+    def self.get_class_by_rel_type(rel_type)
+      unless defined?(@@rel_hash)
+        @@rel_hash = {}
+        RubyXL.constants.each { |c|
+          klass = RubyXL.const_get(c)
+
+          if klass.is_a?(Class) && klass.const_defined?(:REL_TYPE) then
+            @@rel_hash[klass::REL_TYPE] = klass
+          end
+        }
+      end
+
+      @@rel_hash[rel_type]
+    end
+
+    def load_related_files(zipdir_path, base_file_name = '')
+      self.related_files = {}
+
+      @@debug +=2 if @@debug
+
+      self.relationships.each { |rel|
+        next if rel.target_mode == 'External'
+
+        file_path = Pathname.new(rel.target)
+
+        if !file_path.absolute? then
+          file_path = (Pathname.new(File.dirname(base_file_name)) + file_path).cleanpath
+        end
+
+        klass = RubyXL::OOXMLRelationshipsFile.get_class_by_rel_type(rel.type)
+
+        if klass.nil? then
+          puts "*** WARNING: storage class not found for #{rel.target} (#{rel.type})"
+          klass = GenericStorageObject
+        end
+
+        puts "--> DEBUG:#{'  ' * @@debug}Loading #{klass} (#{rel.id}): #{file_path}" if @@debug
+
+        obj = klass.parse_file(zipdir_path, file_path)
+        obj.load_relationships(zipdir_path, file_path) if obj.respond_to?(:load_relationships)
+        self.related_files[rel.id] = obj
+      }
+
+      @@debug -=2 if @@debug
+
+      related_files
+    end
+
+    def self.load_relationship_file(zipdir_path, base_file_path)
+      rel_file_path = Pathname.new(File.join(File.dirname(base_file_path), '_rels', File.basename(base_file_path) + '.rels')).cleanpath
+
+      puts "--> DEBUG:  #{'  ' * @@debug}Loading .rel file: #{rel_file_path}" if @@debug
+
+      parse_file(zipdir_path, rel_file_path)
+    end
+
+    def xlsx_path
+      file_path = owner.xlsx_path
+      File.join(File.dirname(file_path), '_rels', File.basename(file_path) + '.rels')
+    end
 
+  end
+	
   class WorkbookRelationships < OOXMLRelationshipsFile
 
     attr_accessor :workbook
@@ -50,51 +121,96 @@ module RubyXL
       self.relationships = []
 
       @workbook.worksheets.each_with_index { |sheet, i|
-        relationships << document_relationship(sheet.xlsx_path.gsub(/^xl\//, ''), sheet.rel_type)
+        relationships << new_relationship(sheet.xlsx_path.gsub(/\Axl\//, ''), sheet.class::REL_TYPE)
       }
 
-      @workbook.external_links.each_key { |k| 
-        relationships << document_relationship("externalLinks/#{k}", 'externalLink')
-      }
+#      @workbook.external_links.each_key { |k| 
+#        relationships << new_relationship("externalLinks/#{k}", 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink')
+#      }
 
-      relationships << document_relationship('theme/theme1.xml', 'theme') if @workbook.theme
-      relationships << document_relationship('styles.xml', 'styles') if @workbook.stylesheet
+      relationships << new_relationship('theme/theme1.xml', @workbook.theme.class::REL_TYPE) if @workbook.theme
+      relationships << new_relationship('styles.xml', @workbook.stylesheet.class::REL_TYPE) if @workbook.stylesheet
 
       if @workbook.shared_strings_container && !@workbook.shared_strings_container.strings.empty? then
-        relationships << document_relationship('sharedStrings.xml', 'sharedStrings') 
+        relationships << new_relationship('sharedStrings.xml', @workbook.shared_strings_container.class::REL_TYPE)
       end
 
       if @workbook.calculation_chain && !@workbook.calculation_chain.cells.empty? then
-        relationships << document_relationship('calcChain.xml', 'calcChain') 
+        relationships << new_relationship('calcChain.xml', @workbook.calculation_chain.class::REL_TYPE)
       end
 
       true
     end
 
-    def self.xlsx_path
-      File.join('xl', '_rels', 'workbook.xml.rels')
-    end
-
   end
 
   class RootRelationships < OOXMLRelationshipsFile
 
-    attr_accessor :workbook
-
     def before_write_xml
       self.relationships = []
 
-      relationships << document_relationship('xl/workbook.xml',   'officeDocument')
-      relationships << metadata_relationship('docProps/thumbnail.jpeg', 'thumbnail') unless @workbook.thumbnail.empty?
-      relationships << metadata_relationship('docProps/core.xml', 'core-properties') if @workbook.core_properties 
-      relationships << document_relationship('docProps/app.xml',  'extended-properties') if @workbook.document_properties
+      add_relationship(owner.workbook)
+      add_relationship(owner.thumbnail)
+      add_relationship(owner.core_properties)
+      add_relationship(owner.document_properties)
 
       true
     end
 
-    def self.xlsx_path
+    def xlsx_path
       File.join('_rels', '.rels')
     end
   end
 
+  class SheetRelationshipsFile < OOXMLRelationshipsFile
+    # Insert class specific stuff here once we get to implementing it
+  end
+
+  class DrawingRelationshipsFile < OOXMLRelationshipsFile
+    # Insert class specific stuff here once we get to implementing it
+  end
+
+  class ChartRelationshipsFile < OOXMLRelationshipsFile
+    # Insert class specific stuff here once we get to implementing it
+  end
+
+  module RelationshipSupport
+
+    attr_accessor :generic_storage, :relationship_container
+    def related_objects # Override this method
+      []
+    end
+
+    def collect_related_objects
+      res = related_objects.compact # Avoid tainting +related_objects+ array
+
+      res += generic_storage if generic_storage
+
+      if relationship_container then
+        relationship_container.owner = self
+        res << relationship_container
+      end
+
+      res.each { |o| res += o.collect_related_objects if o.respond_to?(:collect_related_objects) }
+
+      res
+    end
+
+    def store_relationship(related_file, unknown = false)
+      self.generic_storage ||= []
+      puts "WARNING: #{self.class} is not aware what to do with #{related_file.class}" if unknown
+      self.generic_storage << related_file
+    end
+
+    def load_relationships(dir_path, base_file_name = '')
+      self.relationship_container = relationship_file_class.load_relationship_file(dir_path, base_file_name)
+      return if relationship_container.nil?
+
+      relationship_container.load_related_files(dir_path, base_file_name).each_pair { |rid, related_file|
+        attach_relationship(rid, related_file) if related_file
+      }
+    end
+
+  end
+
 end