rubyXL 3.4.15 → 3.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 113f3b9a4f79ca55897dc0b41c3ea90b79fe22de8cfe477977a0fde79587ee9c
-  data.tar.gz: 31887b622133cb5aa7f1fa9b807edc4a24fe678b3ada67212d20ce8d67e2cf3b
+  metadata.gz: 116ee9428a4b233645c4b8fc1d33c0589158230b8a070a274e2dfcbf5c4599cb
+  data.tar.gz: c297883a5589040468eed44560482569452c953266f46877828d85d3a2b45828
 SHA512:
-  metadata.gz: 30aedef1cdd170c64c08b03ed501d165d31e457c2676e1939598d35952cd3c22c2f0033b1310ff4bcc83402cfd4e1ff9332a0e130dc55703c5695c63d936e4af
-  data.tar.gz: 113ba583b359143c2c1366ac8ff8f5fa235b081ae896f0374c5b27e85ed31722226c331a869d9007025989c1961d6c2d4a9755e374ec2840fe41dc576dd2e2de
+  metadata.gz: f508111555352f1868242db8491675d4aee3d1da93212049ae08db937f89857e29f15ca76fd985aca300d8400deda9b7a8032cbc5c0f0ec903121fb1cabbbbed
+  data.tar.gz: ddd0250526862e617effdb282ee3361a0c81c662841a16c207dabc8d4a0d41405693b92c1187685ef66d71b8b9cf5899ffa635f63531daa482597c38ec4fe20f

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:2.4.1-node-browsers
+      - image: circleci/ruby:2.6.6-buster
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -29,6 +29,7 @@ jobs:
       - run:
           name: install dependencies
           command: |
+            gem install bundler
             bundle install --jobs=4 --retry=3 --path vendor/bundle
 
       - save_cache:

data/Gemfile

@@ -8,7 +8,7 @@ gem "rubyzip", ">= 1.3.0" , :require => 'zip'
 group :development, :test do
   gem "bundler"
   gem "rake"
-  gem "jeweler"
+  gem "juwelier"
   gem "rspec"
   gem "simplecov"
 

data/Gemfile.lock

@@ -1,77 +1,109 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
-    faraday (0.9.2)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    faraday (1.9.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
-    git (1.7.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    git (1.10.2)
       rchardet (~> 1.8)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
+    github_api (0.19.0)
+      addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
+      faraday (>= 0.8, < 2)
+      hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    hashie (4.1.0)
+    hashie (3.6.0)
     highline (2.0.3)
-    jeweler (2.3.9)
+    juwelier (2.4.9)
       builder
       bundler
-      git (>= 1.2.5)
-      github_api (~> 0.16.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
+      git
+      github_api
+      highline
+      kamelcase (~> 0)
+      nokogiri
       psych
       rake
       rdoc
       semver2
-    jwt (2.2.1)
-    mime-types (2.99.3)
-    mini_portile2 (2.4.0)
+    jwt (2.3.0)
+    kamelcase (0.0.2)
+      semver2 (~> 3)
+    mini_portile2 (2.7.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
+      racc (~> 1.4)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.2.0)
+    psych (4.0.3)
+      stringio
+    public_suffix (4.0.6)
+    racc (1.6.0)
     rack (2.2.3)
-    rake (13.0.1)
+    rake (13.0.6)
     rchardet (1.8.0)
-    rdoc (6.2.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rspec_junit_formatter (0.4.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby-prof (1.4.1)
-    rubyzip (2.3.0)
+    ruby-prof (1.4.3)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
     semver2 (3.4.2)
-    simplecov (0.18.5)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    stringio (3.0.1)
     thread_safe (0.3.6)
 
 PLATFORMS
@@ -79,7 +111,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  jeweler
+  juwelier
   nokogiri (>= 1.10.8)
   rake
   rspec
@@ -89,4 +121,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.1.4
+   2.2.29

data/README.rdoc

@@ -55,6 +55,10 @@ Please note that row is a _sparse_ array of cells. Your code *must* expect that
   worksheet.sheet_data[0][0] # Returns cell A1 in the worksheet
   worksheet[0][0]            # Returns cell A1 in the worksheet
 
+  cell = worksheet[0][0]
+  cell.value                 # Returns a properly converted value in the cell (if the file claims that the cell
+                             # is holding a number, returns a respective Integer or Float, and so on).
+
 ==== Wrappers for accessing Cell properties
   cell = workbook[0][0][0]
   cell.is_struckthrough  # Returns +true+ if the cell is struckthrough, other boolean properties have same syntax
@@ -229,11 +233,10 @@ It can also operate on +StringIO+ objects, thus eliminating the need to save the
 
   RubyXL.class_variable_set(:@@suppress_warnings, true)
 
-== Data validation ("dropdown list")
+== Data validation (colloquially referred to as "dropdown list")
 
   worksheet.add_validation_list("A1", [ "value1", "value2" ])
 
-
 == For more information
 Take a look at the files in spec/lib/ for rspecs on most methods
 
@@ -249,5 +252,5 @@ Take a look at the files in spec/lib/ for rspecs on most methods
 
 == Copyright
 
-Copyright (c) 2011 Vivek Bhagwat, 2013-2020 Wesha.
+Copyright (c) 2011 Vivek Bhagwat, 2013-2021 Wesha.
 See LICENSE.txt for further details.

data/Rakefile

@@ -10,8 +10,8 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "rubyXL"
   gem.homepage = "http://github.com/gilt/rubyXL"
@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
 #  gem.required_ruby_version = '>2.1'
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new 
+Juwelier::RubygemsDotOrgTasks.new 
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/VERSION

@@ -1 +1 @@
-3.4.15
+3.4.20

data/lib/rubyXL/convenience_methods/cell.rb

@@ -253,7 +253,7 @@ module RubyXL
     def add_hyperlink(l)
       worksheet.hyperlinks ||= RubyXL::Hyperlinks.new
       worksheet.hyperlinks << RubyXL::Hyperlink.new(:ref => self.r, :location => l)
-#    define_attribute(:'r:id',   :string)
+#    define_relationship
 #    define_attribute(:location, :string)
 #    define_attribute(:tooltip,  :string)
 #    define_attribute(:display,  :string)

data/lib/rubyXL/convenience_methods/worksheet.rb

@@ -106,6 +106,21 @@ module RubyXL
         }
       }
 
+      # Update merged cells for all rows below
+      if self.merged_cells then
+        merged_cells.each { |mc|
+          next if mc.ref.row_range.last < row_index
+
+          in_merged_cell = mc.ref.row_range.first < row_index
+          mc.ref = RubyXL::Reference.new(
+            mc.ref.row_range.first + (in_merged_cell ? 0 : 1),
+            mc.ref.row_range.last + 1,
+            mc.ref.col_range.first,
+            mc.ref.col_range.last,
+          )
+        }
+      end
+
       return new_row
     end
 
@@ -121,6 +136,23 @@ module RubyXL
         row && row.cells.each{ |c| c.row -= 1 unless c.nil? }
       }
 
+      # Update row number of merged cells
+      if self.merged_cells then
+        merged_cells.delete_if { |mc| mc.ref.row_range == (row_index..row_index) }
+        merged_cells.each { |mc|
+          next if mc.ref.row_range.last < row_index
+
+          in_merged_cell = mc.ref.row_range.first <= row_index
+          mc.ref = RubyXL::Reference.new(
+            mc.ref.row_range.first - (in_merged_cell ? 0 : 1),
+            mc.ref.row_range.last - 1,
+            mc.ref.col_range.first,
+            mc.ref.col_range.last,
+          )
+        }
+        merged_cells.delete_if { |mc| mc.ref.single_cell? }
+      end
+
       return deleted
     end
 
@@ -152,6 +184,21 @@ module RubyXL
 
       cols.insert_column(column_index)
 
+      # Update merged cells for all rows below
+      if self.merged_cells then
+        merged_cells.each { |mc|
+          next if mc.ref.col_range.last < column_index
+
+          in_merged_cell = mc.ref.row_range.first < column_index
+          mc.ref = RubyXL::Reference.new(
+            mc.ref.row_range.first,
+            mc.ref.row_range.last,
+            mc.ref.col_range.first + (in_merged_cell ? 0 : 1),
+            mc.ref.col_range.last + 1,
+          )
+        }
+      end
+
       # TODO: update column numbers
     end
 
@@ -171,6 +218,24 @@ module RubyXL
       }
 
       cols.each { |range| range.delete_column(column_index) }
+
+      # Update row number of merged cells
+      return unless self.merged_cells
+
+      merged_cells.delete_if { |mc| mc.ref.col_range == (column_index..column_index) }
+      merged_cells.each { |mc|
+        next if mc.ref.col_range.last < column_index
+
+        in_merged_cell = mc.ref.col_range.first <= column_index
+        mc.ref = RubyXL::Reference.new(
+          mc.ref.row_range.first,
+          mc.ref.row_range.last,
+          mc.ref.col_range.first - (in_merged_cell ? 0 : 1),
+          mc.ref.col_range.last - 1,
+        )
+      }
+
+      merged_cells.delete_if { |mc| mc.ref.single_cell? }
     end
 
     def get_row_style(row_index)

data/lib/rubyXL/objects/chartsheet.rb

@@ -34,7 +34,7 @@ module RubyXL
     define_attribute(:horizontalDpi,      :int,    :default => 600)
     define_attribute(:verticalDpi,        :int,    :default => 600)
     define_attribute(:copies,             :int,    :default => 1)
-    define_attribute(:'r:id',             :string)
+    define_relationship
     define_element_name 'pageSetup'
   end
 

data/lib/rubyXL/objects/external_links.rb

@@ -61,16 +61,40 @@ module RubyXL
     define_child_node(RubyXL::SheetNames)
     define_child_node(RubyXL::DefinedNamesExt)
     define_child_node(RubyXL::SheetDataSet)
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'externalBook'
   end
 
+  # http://www.datypic.com/sc/ooxml/e-ssml_oleItem-1.html
+  class OleItem < OOXMLObject
+    define_attribute(:name,      :string, :required => true)
+    define_attribute(:icon,      :bool)
+    define_attribute(:advise,    :bool)
+    define_attribute(:preferPic, :bool)
+    define_element_name 'oleItem'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_oleItems-1.html
+  class OleItems < OOXMLContainerObject
+    define_child_node(RubyXL::OleItem)
+    define_element_name 'oleItems'
+  end
+
+  # http://www.datypic.com/sc/ooxml/t-ssml_CT_OleLink.html
+  class OleLink < OOXMLObject
+    define_child_node(RubyXL::OleItems, :collection => true)
+    define_relationship(:required => true)
+    define_attribute(:progId, :string, :required => true)
+    define_element_name 'oleLink'
+  end
+
   class ExternalLinksFile < OOXMLTopLevelObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink'
 
     include RubyXL::RelationshipSupport
     define_child_node(RubyXL::ExternalBook)
+    define_child_node(RubyXL::OleLink)
 
     define_element_name 'externalLink'
     set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,

data/lib/rubyXL/objects/ooxml_object.rb

@@ -53,6 +53,11 @@ module RubyXL
       self.send(:attr_accessor, attr_hash[:accessor]) unless attr_hash[:computed]
     end
 
+    # Defines a `r:id` attribute
+    def define_relationship(extra_params = {})
+      define_attribute(:'r:id', :string, extra_params)
+    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.

data/lib/rubyXL/objects/reference.rb

@@ -71,7 +71,7 @@ module RubyXL
     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)
+    # <0> A...Z, AA...AZ, BA... ...ZZ, AAA... ...AZZ, BAA... ...XFD <16383>
     def self.ind2ref(row = 0, col = 0)
       str = ''
 
@@ -88,10 +88,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([A-Z]+)(\d+)\Z/
-
-      col = 0
-      $1.each_byte { |chr| col = col * 26 + (chr - 64) }
-      [ $2.to_i - 1, col - 1 ]
+      [ $2.to_i - 1, $1.each_byte.inject(0) { |col, chr| col * 26 + (chr - 64) } - 1 ]
     end
 
   end

data/lib/rubyXL/objects/relationships.rb

@@ -4,7 +4,7 @@ require 'rubyXL/objects/ooxml_object'
 module RubyXL
 
   class RID < OOXMLObject
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
   end
 
   class Relationship < OOXMLObject

data/lib/rubyXL/objects/sheet_data.rb

@@ -113,7 +113,8 @@ module RubyXL
       when RubyXL::DataType::INLINE_STRING then is.to_s
       when RubyXL::DataType::RAW_STRING    then raw_value
       else
-        if is_date? then workbook.num_to_date(r.to_f)
+        if is then is.to_s
+        elsif is_date? then workbook.num_to_date(r.to_f)
         elsif r.is_a?(String) && (r =~ NUMBER_REGEXP) then # Numeric
           if $1 != '' then r.to_f
           else r.to_i

data/lib/rubyXL/objects/text.rb

@@ -85,7 +85,8 @@ module RubyXL
     define_element_name 'is'
 
     def to_s
-      str = if t.nil? then '' else t.to_s end
+      # `dup` here unfreezes the string since it's not a constant but initial value
+      str = if t.nil? then ''.dup else t.to_s end
       r && r.each { |rtr| str << rtr.to_s if rtr }
       str
     end

data/lib/rubyXL/objects/theme.rb

@@ -1164,7 +1164,7 @@ module RubyXL
   class CT_Hyperlink < OOXMLObject
     define_child_node(RubyXL::CT_EmbeddedWAVAudioFile)
     define_child_node(RubyXL::AExtensionStorageArea)
-    define_attribute(:'r:id',         :string)
+    define_relationship
     define_attribute(:invalidUrl,     :string, :default => '')
     define_attribute(:action,         :string, :default => '')
     define_attribute(:tgtFrame,       :string, :default => '')

data/lib/rubyXL/objects/workbook.rb

@@ -98,7 +98,7 @@ module RubyXL
     define_attribute(:name,            :string, :required => true)
     define_attribute(:sheetId,         :int,    :required => true)
     define_attribute(:state,           RubyXL::ST_Visibility, :default => 'visible')
-    define_attribute(:'r:id',          :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'sheet'
   end
 
@@ -110,7 +110,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_externalReference-1.html
   class ExternalReference < OOXMLObject
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'externalReference'
   end
 
@@ -153,7 +153,7 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_pivotCache-1.html
   class PivotCache < OOXMLObject
     define_attribute(:cacheId, :int,    :required => true)
-    define_attribute(:'r:id',  :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'pivotCache'
   end
 
@@ -427,12 +427,15 @@ module RubyXL
     end
 
     def num_to_date(num)
+      return nil if num.nil?
+
       # Bug-for-bug Excel compatibility (https://support.microsoft.com/kb/214058/)
-      if num && num < MARCH_1_1900 then
+      if num < MARCH_1_1900 then
         num += 1 unless workbook_properties && workbook_properties.date1904
       end
 
-      num && (base_date + num)
+      dateparts = num.divmod(1)
+      base_date + (dateparts[0] + (dateparts[1] * 86400).round(6) / 86400)
     end
 
     include Enumerable

data/lib/rubyXL/objects/worksheet.rb

@@ -88,7 +88,7 @@ module RubyXL
     define_attribute(:horizontalDpi,      :int,    :default => 600)
     define_attribute(:verticalDpi,        :int,    :default => 600)
     define_attribute(:copies,             :int,    :default => 1)
-    define_attribute(:'r:id',             :string)
+    define_relationship
     define_element_name 'pageSetup'
   end
 
@@ -302,7 +302,7 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_hyperlink-1.html
   class Hyperlink < OOXMLObject
     define_attribute(:ref,      :ref,    :required => true)
-    define_attribute(:'r:id',   :string)
+    define_relationship
     define_attribute(:location, :string)
     define_attribute(:tooltip,  :string)
     define_attribute(:display,  :string)
@@ -323,7 +323,7 @@ module RubyXL
     define_attribute(:oleUpdate, RubyXL::ST_OleUpdate)
     define_attribute(:autoLoad,  :bool, :default => false)
     define_attribute(:shapeId,   :int,  :required => true)
-    define_attribute(:'r:id',    :string)
+    define_relationship
     define_element_name 'oleObject'
   end
 
@@ -339,7 +339,7 @@ module RubyXL
     define_attribute(:ref,    :ref)
     define_attribute(:name,   :string)
     define_attribute(:sheet,  :string)
-    define_attribute(:'r:id', :string)
+    define_relationship
     define_element_name 'dataRef'
   end
 
@@ -434,7 +434,7 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_control-1.html
   class EmbeddedControl < OOXMLObject
     define_attribute(:shapeId, :int,    :required => true)
-    define_attribute(:'r:id',  :string, :required => true)
+    define_relationship(:required => true)
     define_attribute(:name,    :string)
     define_element_name 'control'
   end
@@ -490,7 +490,7 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_customPr-1.html
   class CustomProperty < OOXMLObject
     define_attribute(:name,   :string, :required => true)
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'customPr'
   end
 
@@ -572,7 +572,7 @@ module RubyXL
     define_attribute(:previousRow, :uint, :default => 0)
     define_attribute(:previousCol, :uint, :default => 0)
     define_attribute(:click,       :uint, :default => 0)
-    define_attribute(:'r:id',      :string)
+    define_relationship
     define_child_node(RubyXL::PivotArea)
     define_element_name 'pivotSelection'
   end