rubyXL 3.1.2 → 3.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ffb91460026cf30dfbf10d1d1461f7e31ed08ab4
+  data.tar.gz: f2252518b4746190e8b9961de5c7e8cd7144ab06
+SHA512:
+  metadata.gz: 1547a5b7923c072f332e2ac7dbb73b0cdbd7af5ce2b1bc15f8b19552ebbfd62fd6fe1bcabb54970b73409d8eecf4fca5a3b1921b83170d736fdd11dce1b8b33f
+  data.tar.gz: d8ecbc5d39b25f04f80358c5932f09e170957d7f5f4ccc88f257a9229c3e470325ff0bcdf6883e1db98f102f1c2a70c0143528a701fe4258d9f3df1451115d98

data/VERSION

@@ -1 +1 @@
-3.1.2
+3.2.0

data/lib/rubyXL/cell.rb

@@ -255,7 +255,7 @@ module RubyXL
     end
 
     def inspect
-      str = "#<#{self.class}(#{row},#{column}): #{raw_value.inspect}" 
+      str = "#<#{self.class}(#{row},#{column}): #{raw_value.inspect}"
       str += " =#{self.formula.expression}" if self.formula
       str += ", datatype = #{self.datatype}, style_index = #{self.style_index}>"
       return str

data/lib/rubyXL/objects/calculation_chain.rb

@@ -25,7 +25,7 @@ module RubyXL
     set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
 
     def xlsx_path
-      File.join('xl', 'calcChain.xml')
+      ROOT.join('xl', 'calcChain.xml')
     end
   end
 end

data/lib/rubyXL/objects/chartsheet.rb

@@ -59,7 +59,6 @@ module RubyXL
   class Chartsheet < OOXMLTopLevelObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartsheet'
-    REL_CLASS    = RubyXL::SheetRelationshipsFile
 
     include RubyXL::RelationshipSupport
     define_relationship(RubyXL::DrawingFile)
@@ -85,7 +84,7 @@ module RubyXL
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
 
     def xlsx_path
-      File.join('xl', 'chartsheets', "sheet#{file_index}.xml")
+      ROOT.join('xl', 'chartsheets', "sheet#{file_index}.xml")
     end
 
   end

data/lib/rubyXL/objects/column_range.rb

@@ -50,7 +50,7 @@ module RubyXL
         new_range = RubyXL::ColumnRange.new(:min => col_num, :max => col_num)
         self.column_ranges << new_range
         return new_range
-      elsif old_range.min == col_num && 
+      elsif old_range.min == col_num &&
               old_range.max == col_num then # Single column range, OK to change in place
         return old_range
       else

data/lib/rubyXL/objects/comments.rb

@@ -38,7 +38,7 @@ module RubyXL
     attr_accessor :workbook
 
     def xlsx_path
-      File.join('xl', "comments#{file_index}.xml")
+      ROOT.join('xl', "comments#{file_index}.xml")
     end
 
   end

data/lib/rubyXL/objects/content_types.rb

@@ -17,8 +17,6 @@ module RubyXL
   class ContentTypes < OOXMLTopLevelObject
     SAVE_ORDER = 999  # Must be saved last, so it has time to accumulate overrides from all others.
 
-    attr_accessor :owner
-
     define_child_node(RubyXL::ContentTypeDefault,  :collection => true, :accessor => :defaults)
     define_child_node(RubyXL::ContentTypeOverride, :collection => true, :accessor => :overrides)
 
@@ -26,37 +24,54 @@ module RubyXL
     define_element_name 'Types'
 
     def self.xlsx_path
-      '[Content_Types].xml'
+      ROOT.join('[Content_Types].xml')
     end
 
     def xlsx_path
       self.class.xlsx_path
     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 = []
-      if owner.rels_hash[RubyXL::PrinterSettingsFile] then
-        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' )
-
-      # 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')
-      defaults << RubyXL::ContentTypeDefault.new(:extension => 'wmf', :content_type => 'image/x-wmf')
-      defaults << RubyXL::ContentTypeDefault.new(:extension => 'vml', :content_type => 'application/vnd.openxmlformats-officedocument.vmlDrawing')
+      content_types_by_ext = {}
+
+      # Collect all extensions and corresponding content types
+      root.rels_hash.each_pair { |klass, objects|
+        objects.each { |obj|
+          next unless klass.const_defined?(:CONTENT_TYPE)
+          ext = obj.xlsx_path.extname[1..-1]
+          next if ext.nil?
+          content_types_by_ext[ext] ||= []
+          content_types_by_ext[ext] << klass::CONTENT_TYPE 
+        }
+      }
+
+      self.defaults = [ RubyXL::ContentTypeDefault.new(:extension => 'xml', :content_type => 'application/xml') ]
+
+      # Determine which content types are used most often, and add them to the list of defaults
+      content_types_by_ext.each_pair { |ext, content_types_arr|
+        next if ext.nil? || defaults.any? { |d| d.extension == ext } 
+
+        counter = {}  # Count the number of occurrences of a given +content_type+.
+        content_types_arr.each { |ct| counter[ct] = (counter[ct] || 0) + 1 }
+        most_used_content_type = counter.to_a.max_by{ |pair| pair.last }.first
+
+        defaults << RubyXL::ContentTypeDefault.new(:extension => ext,
+                                                   :content_type => most_used_content_type)
+      }
+
+      self.overrides = []
+
+      # Add overrides for the files with known extensions but different content types.
+      root.rels_hash.each_pair { |klass, objects|
+        objects.each { |obj|
+          next unless defined?(klass::CONTENT_TYPE)
+          ext = obj.xlsx_path.extname[1..-1]
+          next if ext.nil?
+          next if defaults.any? { |d| (d.content_type == klass::CONTENT_TYPE) && (d.extension == ext) }
+          overrides << RubyXL::ContentTypeOverride.new(:part_name => obj.xlsx_path,
+                                                       :content_type => klass::CONTENT_TYPE)
+        }
+      }
 
       true
     end

data/lib/rubyXL/objects/document_properties.rb

@@ -52,27 +52,37 @@ module RubyXL
     def add_part_title(name)
       titles_of_parts.vt_vector.vt_lpstr << RubyXL::StringNode.new(:value => name)
     end
-    private :add_parts_count
+    private :add_part_title
 
     def before_write_xml
-      if @workbook then
-        self.heading_pairs = RubyXL::VectorValue.new(:vt_vector => RubyXL::Vector.new(:base_type => 'variant'))
-        self.titles_of_parts = RubyXL::VectorValue.new(:vt_vector => RubyXL::Vector.new(:base_type => 'lpstr'))
+      workbook = root.workbook
+
+      self.heading_pairs   = RubyXL::VectorValue.new(:vt_vector => RubyXL::Vector.new(:base_type => 'variant'))
+      self.titles_of_parts = RubyXL::VectorValue.new(:vt_vector => RubyXL::Vector.new(:base_type => 'lpstr'))
 
-        add_parts_count('Worksheets', @workbook.worksheets.size)
-        @workbook.worksheets.each { |sheet| add_part_title(sheet.sheet_name) }
+      worksheets = chartsheets = 0
 
-        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) }
+      workbook.worksheets.each { |sheet|
+        add_part_title(sheet.sheet_name)
+
+        case sheet
+        when RubyXL::Worksheet  then worksheets += 1
+        when RubyXL::Chartsheet then chartsheets += 1
         end
+      }
+      add_parts_count('Worksheets', worksheets) if worksheets > 0
+      add_parts_count('Charts', chartsheets) if chartsheets > 0
+
+      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
 
       true
     end
 
     def xlsx_path
-      File.join('docProps', 'app.xml')
+      ROOT.join('docProps', 'app.xml')
     end
 
   end
@@ -109,7 +119,7 @@ module RubyXL
     define_element_name 'cp:coreProperties'
 
     def xlsx_path
-      File.join('docProps', 'core.xml')
+      ROOT.join('docProps', 'core.xml')
     end
 
     def creator

data/lib/rubyXL/objects/filters.rb

@@ -27,7 +27,7 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_top10-1.html
   class Top10 < OOXMLObject
-    define_attribute(:top,       :bool,  :default  => true)	
+    define_attribute(:top,       :bool,  :default  => true)
     define_attribute(:percent,   :bool,  :default  => false)
     define_attribute(:val,       :double, :required => true)
     define_attribute(:filterVal, :double)
@@ -74,7 +74,7 @@ module RubyXL
   class AutoFilterColumn < OOXMLObject
     define_attribute(:colId,        :int,  :required => true)
     define_attribute(:hiddenButton, :bool, :default  => false)
-    define_attribute(:showButton,   :bool, :default  => true)	
+    define_attribute(:showButton,   :bool, :default  => true)
     define_child_node(RubyXL::FilterContainer)
     define_child_node(RubyXL::Top10)
     define_child_node(RubyXL::CustomFilters)

data/lib/rubyXL/objects/font.rb

@@ -101,7 +101,7 @@ module RubyXL
     define_element_name 'fonts'
 
     def self.defaults
-      self.new(:_ => [ 
+      self.new(:_ => [
                  RubyXL::Font.new(:name => RubyXL::StringValue.new(:val => 'Verdana'),
                                   :sz => RubyXL::FloatValue.new(:val => 10) ),
                  RubyXL::Font.new(:name => RubyXL::StringValue.new(:val => 'Verdana'),

data/lib/rubyXL/objects/ooxml_object.rb

@@ -4,14 +4,14 @@ module RubyXL
   module OOXMLObjectClassMethods
     # Get the value of a [sub]class variable if it exists, or create the respective variable
     # with the passed-in +default+ (or +{}+, if not specified)
-    # 
+    #
     # Throughout this class, we are setting class variables through explicit method calls
     # rather than by directly addressing the name of the variable because of context issues:
     # 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, 
+    # the setter/getter method addresses it in the context of descendant class,
     # which is what we need.
     def obtain_class_variable(var_name, default = {})
-      if class_variable_defined?(var_name) then 
+      if class_variable_defined?(var_name) then
         self.class_variable_get(var_name)
       else
         self.class_variable_set(var_name, default)
@@ -52,7 +52,7 @@ module RubyXL
       attrs[attr_name.to_s] = attr_hash
       self.send(:attr_accessor, attr_hash[:accessor]) unless attr_hash[:computed]
     end
-   
+
     # Defines a child node of OOXML object.
     # === Parameters
     # * +klass+ - Class (descendant of RubyXL::OOXMLObject) of the child nodes. Child node objects will be produced by calling +parse+ method of that class.
@@ -78,7 +78,7 @@ module RubyXL
       child_node_name = (extra_params[:node_name] || klass.class_variable_get(:@@ooxml_tag_name)).to_s
       accessor = (extra_params[:accessor] || accessorize(child_node_name)).to_sym
 
-      child_nodes[child_node_name] = { 
+      child_nodes[child_node_name] = {
         :class => klass,
         :is_array => extra_params[:collection],
         :accessor => accessor
@@ -93,9 +93,9 @@ module RubyXL
       define_attribute(:count, :uint, :required => true)
     end
     private :define_count_attribute
- 
+
     # Defines the name of the element that represents the current OOXML object. Should only be used once per object.
-    # In case of different objects represented by the same class in different parts of OOXML tree, +:node_name+ 
+    # In case of different objects represented by the same class in different parts of OOXML tree, +:node_name+
     # extra parameter can be used to override the default element name.
     # === Parameters
     # * +element_name+
@@ -145,7 +145,7 @@ module RubyXL
           prefix = known_namespaces[ns.href] || ns.prefix
 
           child_node_name = case prefix
-                            when '', nil then child_node.name 
+                            when '', nil then child_node.name
                             else "#{prefix}:#{child_node.name}"
                             end
 
@@ -196,7 +196,7 @@ module RubyXL
                 v = Integer(raw_value)
                 raise ArgumentError.new("invalid value for unsigned Integer(): \"#{raw_value}\"") if v < 0
                 v
-              end              
+              end
       obj.send("#{params[:accessor]}=", val)
     end
 
@@ -204,6 +204,9 @@ module RubyXL
 
 
   module OOXMLObjectInstanceMethods
+    def self.included(klass)
+      klass.extend RubyXL::OOXMLObjectClassMethods
+    end
 
     def obtain_class_variable(var_name, default = {})
       self.class.obtain_class_variable(var_name, default)
@@ -234,7 +237,7 @@ module RubyXL
     end
     private :init_child_nodes
 
-    # Recursively write the OOXML object and all its children out as Nokogiri::XML. Immediately before the actual 
+    # Recursively write the OOXML object and all its children out as Nokogiri::XML. Immediately before the actual
     # generation, +before_write_xml()+ is called to perform last-minute cleanup and validation operations; if it
     # returns +false+, an empty string is returned (rather than +nil+, so Nokogiri::XML's <tt>&lt;&lt;</tt> operator
     # can be used without additional +nil+ checking)
@@ -290,7 +293,7 @@ module RubyXL
         node_obj = get_node_object(child_node_params)
         next if node_obj.nil?
 
-        if node_obj.respond_to?(:write_xml) && !node_obj.equal?(self) then 
+        if node_obj.respond_to?(:write_xml) && !node_obj.equal?(self) then
           # If child node is either +OOXMLObject+, or +OOXMLContainerObject+ on its first (envelope) pass,
           # serialize that object.
           elem << node_obj.write_xml(xml, child_node_name)
@@ -310,7 +313,7 @@ module RubyXL
     end
 
     # Prototype method. For sparse collections (+Rows+, +Cells+, etc.) must return index at which this object
-    # is expected to reside in the collection. If +nil+ is returned, then object is simply added 
+    # is expected to reside in the collection. If +nil+ is returned, then object is simply added
     # to the end of the collection.
     def index_in_collection
       nil
@@ -330,7 +333,7 @@ module RubyXL
       child_nodes.each_pair { |child_node_name, child_node_params|
         self.count = self.send(child_node_params[:accessor]).size if child_node_params[:is_array] == :with_count
       }
-      true 
+      true
     end
 
   end
@@ -340,7 +343,6 @@ module RubyXL
   # and marshalling them to XML.
   class OOXMLObject
     include OOXMLObjectInstanceMethods
-    extend OOXMLObjectClassMethods
   end
 
   # Parent class for OOXML conainer objects (for example,
@@ -348,7 +350,6 @@ module RubyXL
   # that obscures the top-level container, allowing direct access to the contents as +Array+.
   class OOXMLContainerObject < Array
     include OOXMLObjectInstanceMethods
-    extend OOXMLObjectClassMethods
 
     def initialize(params = {})
       array_content = params.delete(:_)
@@ -395,6 +396,9 @@ module RubyXL
   # their own <tt>.xml</tt> files in <tt>.xslx</tt> zip container.
   class OOXMLTopLevelObject < OOXMLObject
     SAVE_ORDER = 500
+    ROOT = ::Pathname.new('/')
+
+    attr_accessor :root
 
     # 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.
@@ -417,7 +421,7 @@ module RubyXL
     # === Parameters
     # * +dirpath+ - path to the directory with the unzipped <tt>.xslx</tt> contents.
     def self.parse_file(dirpath, file_path = nil)
-      file_path = ::Pathname.new(file_path || self.xlsx_path)
+      file_path = file_path || self.xlsx_path
 
       case dirpath
       when String then
@@ -439,12 +443,12 @@ module RubyXL
     def add_to_zip(zip_stream)
       xml_string = write_xml
       return if xml_string.empty?
-      zip_stream.put_next_entry(self.xlsx_path)
+      zip_stream.put_next_entry(self.xlsx_path.relative_path_from(::Pathname.new("/")))
       zip_stream.write(xml_string)
     end
 
     def file_index
-      @workbook.root.rels_hash[self.class].index{ |f| f.equal?(self) }.to_i + 1
+      root.rels_hash[self.class].index{ |f| f.equal?(self) }.to_i + 1
     end
 
   end

data/lib/rubyXL/objects/reference.rb

@@ -19,7 +19,7 @@ module RubyXL
         from, to = params[0].split(':')
         row_from, col_from = self.class.ref2ind(from)
         row_to, col_to = self.class.ref2ind(to) unless to.nil?
-      end      
+      end
 
       @row_range = Range.new(row_from || 0, row_to || row_from || ROW_MAX)
       @col_range = Range.new(col_from || 0, col_to || col_from || COL_MAX)
@@ -50,7 +50,7 @@ module RubyXL
     end
 
     def cover?(other)
-      !other.nil? && (@row_range.cover?(other.row_range.begin) && @row_range.cover?(other.row_range.end) && 
+      !other.nil? && (@row_range.cover?(other.row_range.begin) && @row_range.cover?(other.row_range.end) &&
                       @col_range.cover?(other.col_range.begin) && @col_range.cover?(other.col_range.end))
     end
 
@@ -92,7 +92,7 @@ module RubyXL
       col = 0
       $1.each_byte { |chr| col = col * 26 + (chr - 64) }
       [ $2.to_i - 1, col - 1 ]
-    end  
+    end
 
   end
 

data/lib/rubyXL/objects/relationships.rb

@@ -15,7 +15,8 @@ module RubyXL
   end
 
   class OOXMLRelationshipsFile < OOXMLTopLevelObject
-    SAVE_ORDER = 0
+    CONTENT_TYPE = 'application/vnd.openxmlformats-package.relationships+xml'
+    SAVE_ORDER = 100
 
     define_child_node(RubyXL::Relationship, :collection => true, :accessor => :relationships)
     define_element_name 'Relationships'
@@ -26,17 +27,21 @@ module RubyXL
     @@debug = nil # Change to 0 to enable debug output
 
     def new_relationship(target, type)
-      RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}", 
+      RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}",
                                :type => type,
                                :target => target)
     end
     protected :new_relationship
 
     def add_relationship(obj)
-      return if obj.nil?
-      relationships << RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}", 
+      return if obj.nil? || !defined?(obj.class::REL_TYPE)
+
+      file_path = Pathname.new(obj.xlsx_path)
+      owner_path = Pathname.new(owner.xlsx_path)
+
+      relationships << RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}",
                                                 :type => obj.class::REL_TYPE,
-                                                :target => obj.xlsx_path)
+                                                :target => file_path.relative_path_from(owner_path.dirname))
     end
     protected :add_relationship
 
@@ -45,7 +50,9 @@ module RubyXL
     end
 
     def find_by_target(target)
-      relationships.find { |r| r.target == target }
+      relationships.find { |r|
+        (r.target == target) || (r.target == target.relative_path_from(owner.xlsx_path.dirname))
+      }
     end
 
     def self.get_class_by_rel_type(rel_type)
@@ -63,7 +70,7 @@ module RubyXL
       @@rel_hash[rel_type]
     end
 
-    def load_related_files(zipdir_path, base_file_name = '')
+    def load_related_files(zipdir_path, base_file_name)
       self.related_files = {}
 
       @@debug +=2 if @@debug
@@ -74,7 +81,7 @@ module RubyXL
         file_path = Pathname.new(rel.target)
 
         if !file_path.absolute? then
-          file_path = (Pathname.new(File.dirname(base_file_name)) + file_path).cleanpath
+          file_path = (base_file_name.dirname + file_path).cleanpath
         end
 
         klass = RubyXL::OOXMLRelationshipsFile.get_class_by_rel_type(rel.type)
@@ -97,7 +104,7 @@ module RubyXL
     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
+      rel_file_path = rel_file_path(base_file_path)
 
       puts "--> DEBUG:  #{'  ' * @@debug}Loading .rel file: #{rel_file_path}" if @@debug
 
@@ -105,72 +112,30 @@ module RubyXL
     end
 
     def xlsx_path
-      file_path = owner.xlsx_path
-      File.join(File.dirname(file_path), '_rels', File.basename(file_path) + '.rels')
+      self.class.rel_file_path(owner.xlsx_path)
     end
 
-  end
-	
-  class WorkbookRelationships < OOXMLRelationshipsFile
-
-    attr_accessor :workbook
-
     def before_write_xml
-      self.relationships = []
-
-      @workbook.worksheets.each_with_index { |sheet, i|
-        relationships << new_relationship(sheet.xlsx_path.gsub(/\Axl\//, ''), sheet.class::REL_TYPE)
-      }
-
-#      @workbook.external_links.each_key { |k| 
-#        relationships << new_relationship("externalLinks/#{k}", 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink')
-#      }
-
-      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 << new_relationship('sharedStrings.xml', @workbook.shared_strings_container.class::REL_TYPE)
+      case owner
+      when RubyXL::WorkbookRoot, RubyXL::Workbook then
+        # Fully implemented objects with no generic (unhandled) relationships -
+        #   (re)generating relationships from scratch.
+        related_objects = owner.related_objects
+        related_objects += owner.generic_storage if owner.generic_storage
+
+        self.relationships = []
+        related_objects.compact.each { |f| add_relationship(f) }
       end
-
-      if @workbook.calculation_chain && !@workbook.calculation_chain.cells.empty? then
-        relationships << new_relationship('calcChain.xml', @workbook.calculation_chain.class::REL_TYPE)
-      end
-
-      true
+      super
     end
 
-  end
-
-  class RootRelationships < OOXMLRelationshipsFile
-
-    def before_write_xml
-      self.relationships = []
-
-      add_relationship(owner.workbook)
-      add_relationship(owner.thumbnail)
-      add_relationship(owner.core_properties)
-      add_relationship(owner.document_properties)
-
-      true
-    end
-
-    def xlsx_path
-      File.join('_rels', '.rels')
+    def self.rel_file_path(base_file_path)
+      basename = base_file_path.root? ? '' : base_file_path.basename
+      base_file_path.dirname.join('_rels', "#{basename}.rels").cleanpath
     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
 
@@ -183,7 +148,7 @@ module RubyXL
 
     def self.included(klass)
       klass.class_variable_set(:@@ooxml_relationships, {})
-      klass.extend RelationshipSupport::ClassMehods
+      klass.extend RubyXL::RelationshipSupport::ClassMehods
     end
 
     attr_accessor :generic_storage, :relationship_container
@@ -194,7 +159,6 @@ module RubyXL
 
     def collect_related_objects
       res = related_objects.compact # Avoid tainting +related_objects+ array
-
       res += generic_storage if generic_storage
 
       if relationship_container then
@@ -207,8 +171,8 @@ module RubyXL
       res
     end
 
-    def load_relationships(dir_path, base_file_name = '')
-      self.relationship_container = self.class.const_get(:REL_CLASS).load_relationship_file(dir_path, base_file_name)
+    def load_relationships(dir_path, base_file_name)
+      self.relationship_container = RubyXL::OOXMLRelationshipsFile.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|
@@ -235,7 +199,7 @@ module RubyXL
         end
       else store_relationship(rf, :unknown)
       end
-    end 
+    end
 
     def store_relationship(related_file, unknown = false)
       self.generic_storage ||= []