rubyXL 3.2.0 → 3.2.1

data/lib/rubyXL/objects/reference.rb

@@ -1,110 +1,110 @@
-module RubyXL
-  class Reference
-    ROW_MAX = 1024*1024
-    COL_MAX = 16393
-
-    attr_reader :row_range, :col_range
-
-    # RubyXL::Reference.new(row, col)
-    # RubyXL::Reference.new(row_from, row_to, col_from, col_to)
-    # RubyXL::Reference.new(reference_string)
-    def initialize(*params)
-      row_from = row_to = col_from = col_to = nil
-
-      case params.size
-      when 4 then row_from, row_to, col_from, col_to = params
-      when 2 then row_from, col_from = params
-      when 1 then
-        raise ArgumentError.new("invalid value for #{self.class}: #{params[0].inspect}") unless params[0].is_a?(String)
-        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
-
-      @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)
-    end
-
-    def single_cell?
-      (@row_range.begin == @row_range.end) && (@col_range.begin == @col_range.end)
-    end
-
-    def first_row
-      @row_range.begin
-    end
-
-    def last_row
-      @row_range.end
-    end
-
-    def first_col
-      @col_range.begin
-    end
-
-    def last_col
-      @col_range.end
-    end
-
-    def ==(other)
-      !other.nil? && (@row_range == other.row_range) && (@col_range == other.col_range)
-    end
-
-    def cover?(other)
-      !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
-
-    def to_s
-      if single_cell? then
-        self.class.ind2ref(@row_range.begin, @col_range.begin)
-      else
-        self.class.ind2ref(@row_range.begin, @col_range.begin) + ':' + self.class.ind2ref(@row_range.end, @col_range.end)
-      end
-    end
-
-    def inspect
-      if single_cell? then
-        "#<#{self.class} @row=#{@row_range.begin} @col=#{@col_range.begin}>"
-      else
-        "#<#{self.class} @row_range=#{@row_range} @col_range=#{@col_range}>"
-      end
-    end
-
-    # Converts +row+ and +col+ zero-based indices to Excel-style cell reference
-    # (0) A...Z, AA...AZ, BA... ...ZZ, AAA... ...AZZ, BAA... ...XFD (16383)
-    def self.ind2ref(row = 0, col = 0)
-      str = ''
-
-      loop do
-        x = col % 26
-        str = ('A'.ord + x).chr + str
-        col = (col / 26).floor - 1
-        break if col < 0
-      end
-
-      str += (row + 1).to_s
-    end
-
-    # Converts Excel-style cell reference to +row+ and +col+ zero-based indices.
-    def self.ref2ind(str)
-      return [ -1, -1 ] unless str =~ /\A([A-Z]+)(\d+)\Z/
-
-      col = 0
-      $1.each_byte { |chr| col = col * 26 + (chr - 64) }
-      [ $2.to_i - 1, col - 1 ]
-    end
-
-  end
-
-  class Sqref < Array
-
-    def initialize(str)
-      str.split.each { |ref_str| self << RubyXL::Reference.new(ref_str) }
-    end
-
-    def to_s
-      self.collect{ |ref| ref.to_s }.join(' ')
-    end
-
-  end
-end
+module RubyXL
+  class Reference
+    ROW_MAX = 1024*1024
+    COL_MAX = 16393
+
+    attr_reader :row_range, :col_range
+
+    # RubyXL::Reference.new(row, col)
+    # RubyXL::Reference.new(row_from, row_to, col_from, col_to)
+    # RubyXL::Reference.new(reference_string)
+    def initialize(*params)
+      row_from = row_to = col_from = col_to = nil
+
+      case params.size
+      when 4 then row_from, row_to, col_from, col_to = params
+      when 2 then row_from, col_from = params
+      when 1 then
+        raise ArgumentError.new("invalid value for #{self.class}: #{params[0].inspect}") unless params[0].is_a?(String)
+        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
+
+      @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)
+    end
+
+    def single_cell?
+      (@row_range.begin == @row_range.end) && (@col_range.begin == @col_range.end)
+    end
+
+    def first_row
+      @row_range.begin
+    end
+
+    def last_row
+      @row_range.end
+    end
+
+    def first_col
+      @col_range.begin
+    end
+
+    def last_col
+      @col_range.end
+    end
+
+    def ==(other)
+      !other.nil? && (@row_range == other.row_range) && (@col_range == other.col_range)
+    end
+
+    def cover?(other)
+      !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
+
+    def to_s
+      if single_cell? then
+        self.class.ind2ref(@row_range.begin, @col_range.begin)
+      else
+        self.class.ind2ref(@row_range.begin, @col_range.begin) + ':' + self.class.ind2ref(@row_range.end, @col_range.end)
+      end
+    end
+
+    def inspect
+      if single_cell? then
+        "#<#{self.class} @row=#{@row_range.begin} @col=#{@col_range.begin}>"
+      else
+        "#<#{self.class} @row_range=#{@row_range} @col_range=#{@col_range}>"
+      end
+    end
+
+    # Converts +row+ and +col+ zero-based indices to Excel-style cell reference
+    # (0) A...Z, AA...AZ, BA... ...ZZ, AAA... ...AZZ, BAA... ...XFD (16383)
+    def self.ind2ref(row = 0, col = 0)
+      str = ''
+
+      loop do
+        x = col % 26
+        str = ('A'.ord + x).chr + str
+        col = (col / 26).floor - 1
+        break if col < 0
+      end
+
+      str += (row + 1).to_s
+    end
+
+    # Converts Excel-style cell reference to +row+ and +col+ zero-based indices.
+    def self.ref2ind(str)
+      return [ -1, -1 ] unless str =~ /\A([A-Z]+)(\d+)\Z/
+
+      col = 0
+      $1.each_byte { |chr| col = col * 26 + (chr - 64) }
+      [ $2.to_i - 1, col - 1 ]
+    end
+
+  end
+
+  class Sqref < Array
+
+    def initialize(str)
+      str.split.each { |ref_str| self << RubyXL::Reference.new(ref_str) }
+    end
+
+    def to_s
+      self.collect{ |ref| ref.to_s }.join(' ')
+    end
+
+  end
+end

data/lib/rubyXL/objects/relationships.rb

@@ -35,13 +35,9 @@ module RubyXL
 
     def add_relationship(obj)
       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 => file_path.relative_path_from(owner_path.dirname))
+                                                :target => obj.xlsx_path.relative_path_from(owner.xlsx_path.dirname))
     end
     protected :add_relationship
 
@@ -78,11 +74,8 @@ module RubyXL
       self.relationships.each { |rel|
         next if rel.target_mode == 'External'
 
-        file_path = Pathname.new(rel.target)
-
-        if !file_path.absolute? then
-          file_path = (base_file_name.dirname + file_path).cleanpath
-        end
+        file_path = ::Pathname.new(rel.target)
+        file_path = (base_file_name.dirname + file_path).cleanpath if file_path.relative?
 
         klass = RubyXL::OOXMLRelationshipsFile.get_class_by_rel_type(rel.type)
 

data/lib/rubyXL/objects/root.rb

@@ -1,81 +1,81 @@
-require 'zip'
-require 'rubyXL/objects/relationships'
-require 'rubyXL/objects/document_properties'
-require 'rubyXL/objects/content_types'
-require 'rubyXL/objects/workbook'
-
-module RubyXL
-
-  class WorkbookRoot
-    @@debug = nil
-
-    attr_accessor :filepath
-    attr_accessor :thumbnail, :core_properties, :document_properties, :custom_properties, :workbook
-    attr_accessor :content_types, :rels_hash
-
-    include RubyXL::RelationshipSupport
-
-    define_relationship(RubyXL::ThumbnailFile,          :thumbnail)
-    define_relationship(RubyXL::CorePropertiesFile,     :core_properties)
-    define_relationship(RubyXL::DocumentPropertiesFile, :document_properties)
-    define_relationship(RubyXL::CustomPropertiesFile,   :custom_properties)
-    define_relationship(RubyXL::Workbook,               :workbook)
-
-    def related_objects
-      [ content_types, thumbnail, core_properties, document_properties, custom_properties, workbook ]
-    end
-
-    def self.default
-      obj = self.new
-      obj.document_properties    = RubyXL::DocumentPropertiesFile.new
-      obj.core_properties        = RubyXL::CorePropertiesFile.new
-      obj.relationship_container = RubyXL::OOXMLRelationshipsFile.new
-      obj.content_types          = RubyXL::ContentTypes.new
-      obj
-    end
-
-    def stream
-      stream = Zip::OutputStream.write_buffer { |zipstream|
-        self.rels_hash = {}
-        self.relationship_container.owner = self
-        collect_related_objects.compact.each { |obj|
-          puts "<-- DEBUG: adding relationship to #{obj.class}" if @@debug
-          obj.root = self if obj.respond_to?(:root=)
-          self.rels_hash[obj.class] ||= []
-          self.rels_hash[obj.class] << obj
-        }
-
-        self.rels_hash.keys.sort_by{ |c| c::SAVE_ORDER }.each { |klass|
-          puts "<-- DEBUG: saving related #{klass} files" if @@debug
-          self.rels_hash[klass].each { |obj|
-            puts "<-- DEBUG:   > #{obj.xlsx_path}" if @@debug
-            obj.add_to_zip(zipstream)
-          }
-        }
-      }
-      stream.rewind
-      stream
-    end
-
-    def xlsx_path
-      OOXMLTopLevelObject::ROOT
-    end
-
-    def self.parse_file(xl_file_path, opts)
-      begin
-        ::Zip::File.open(xl_file_path) { |zip_file|
-          root = self.new
-          root.filepath = xl_file_path
-          root.content_types = RubyXL::ContentTypes.parse_file(zip_file)
-          root.load_relationships(zip_file, OOXMLTopLevelObject::ROOT)
-          root.workbook.root = root
-          root
-        }
-      rescue ::Zip::Error => e
-        raise e, "XLSX file format error: #{e}", e.backtrace
-      end
-    end
-
-  end
-
-end
+require 'zip'
+require 'rubyXL/objects/relationships'
+require 'rubyXL/objects/document_properties'
+require 'rubyXL/objects/content_types'
+require 'rubyXL/objects/workbook'
+
+module RubyXL
+
+  class WorkbookRoot
+    @@debug = nil
+
+    attr_accessor :filepath
+    attr_accessor :thumbnail, :core_properties, :document_properties, :custom_properties, :workbook
+    attr_accessor :content_types, :rels_hash
+
+    include RubyXL::RelationshipSupport
+
+    define_relationship(RubyXL::ThumbnailFile,          :thumbnail)
+    define_relationship(RubyXL::CorePropertiesFile,     :core_properties)
+    define_relationship(RubyXL::DocumentPropertiesFile, :document_properties)
+    define_relationship(RubyXL::CustomPropertiesFile,   :custom_properties)
+    define_relationship(RubyXL::Workbook,               :workbook)
+
+    def related_objects
+      [ content_types, thumbnail, core_properties, document_properties, custom_properties, workbook ]
+    end
+
+    def self.default
+      obj = self.new
+      obj.document_properties    = RubyXL::DocumentPropertiesFile.new
+      obj.core_properties        = RubyXL::CorePropertiesFile.new
+      obj.relationship_container = RubyXL::OOXMLRelationshipsFile.new
+      obj.content_types          = RubyXL::ContentTypes.new
+      obj
+    end
+
+    def stream
+      stream = Zip::OutputStream.write_buffer { |zipstream|
+        self.rels_hash = {}
+        self.relationship_container.owner = self
+        collect_related_objects.compact.each { |obj|
+          puts "<-- DEBUG: adding relationship to #{obj.class}" if @@debug
+          obj.root = self if obj.respond_to?(:root=)
+          self.rels_hash[obj.class] ||= []
+          self.rels_hash[obj.class] << obj
+        }
+
+        self.rels_hash.keys.sort_by{ |c| c::SAVE_ORDER }.each { |klass|
+          puts "<-- DEBUG: saving related #{klass} files" if @@debug
+          self.rels_hash[klass].each { |obj|
+            puts "<-- DEBUG:   > #{obj.xlsx_path}" if @@debug
+            obj.add_to_zip(zipstream)
+          }
+        }
+      }
+      stream.rewind
+      stream
+    end
+
+    def xlsx_path
+      OOXMLTopLevelObject::ROOT
+    end
+
+    def self.parse_file(xl_file_path, opts)
+      begin
+        ::Zip::File.open(xl_file_path) { |zip_file|
+          root = self.new
+          root.filepath = xl_file_path
+          root.content_types = RubyXL::ContentTypes.parse_file(zip_file, ContentTypes::XLSX_PATH)
+          root.load_relationships(zip_file, OOXMLTopLevelObject::ROOT)
+          root.workbook.root = root
+          root
+        }
+      rescue ::Zip::Error => e
+        raise e, "XLSX file format error: #{e}", e.backtrace
+      end
+    end
+
+  end
+
+end

data/lib/rubyXL/objects/shared_strings.rb

@@ -1,60 +1,60 @@
-require 'rubyXL/objects/ooxml_object'
-require 'rubyXL/objects/text'
-require 'rubyXL/objects/extensions'
-
-module RubyXL
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sst.html
-  class SharedStringsTable < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings'
-
-    # According to http://msdn.microsoft.com/en-us/library/office/gg278314.aspx,
-    # +count+ and +uniqueCount+ may be either both missing, or both present. Need to validate.
-    define_attribute(:uniqueCount,  :int)
-    define_child_node(RubyXL::RichText, :collection => :with_count, :node_name => 'si', :accessor => :strings)
-    define_child_node(RubyXL::ExtensionStorageArea)
-    define_element_name 'sst'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
-
-    def initialize(*params)
-      super
-      # So far, going by the structure that the original creator had in mind. However,
-      # since the actual implementation is now extracted into a separate class,
-      # we will be able to transparrently change it later if needs be.
-      @index_by_content = {}
-    end
-
-    def before_write_xml
-      super
-      self.unique_count = self.count
-      self.count > 0
-    end
-
-    def [](index)
-      strings[index]
-    end
-
-    def empty?
-      strings.empty?
-    end
-
-    def add(str, index = nil)
-      index ||= strings.size
-      strings[index] = RubyXL::Text.new(:value => str)
-      @index_by_content[str] = index
-    end
-
-    def get_index(str, add_if_missing = false)
-      index = @index_by_content[str]
-      index = add(str) if index.nil? && add_if_missing
-      index
-    end
-
-    def xlsx_path
-      ROOT.join('xl', 'sharedStrings.xml')
-    end
-
-  end
-
-end
+require 'rubyXL/objects/ooxml_object'
+require 'rubyXL/objects/text'
+require 'rubyXL/objects/extensions'
+
+module RubyXL
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_sst.html
+  class SharedStringsTable < OOXMLTopLevelObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings'
+
+    # According to http://msdn.microsoft.com/en-us/library/office/gg278314.aspx,
+    # +count+ and +uniqueCount+ may be either both missing, or both present. Need to validate.
+    define_attribute(:uniqueCount,  :int)
+    define_child_node(RubyXL::RichText, :collection => :with_count, :node_name => 'si', :accessor => :strings)
+    define_child_node(RubyXL::ExtensionStorageArea)
+    define_element_name 'sst'
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
+
+    def initialize(*params)
+      super
+      # So far, going by the structure that the original creator had in mind. However,
+      # since the actual implementation is now extracted into a separate class,
+      # we will be able to transparrently change it later if needs be.
+      @index_by_content = {}
+    end
+
+    def before_write_xml
+      super
+      self.unique_count = self.count
+      self.count > 0
+    end
+
+    def [](index)
+      strings[index]
+    end
+
+    def empty?
+      strings.empty?
+    end
+
+    def add(str, index = nil)
+      index ||= strings.size
+      strings[index] = RubyXL::Text.new(:value => str)
+      @index_by_content[str] = index
+    end
+
+    def get_index(str, add_if_missing = false)
+      index = @index_by_content[str]
+      index = add(str) if index.nil? && add_if_missing
+      index
+    end
+
+    def xlsx_path
+      ROOT.join('xl', 'sharedStrings.xml')
+    end
+
+  end
+
+end