rubyXL 3.4.16 → 3.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9327bd67cd3fe0e2cdd599929207e83fbeee4b2125e7f45d5b1c8c8145e8a9
-  data.tar.gz: 12b4e09b2a6502679c81b95909e3fd59d287880cc9d4cf0fd0705968e68d858d
+  metadata.gz: 12e985784e083124a9fbf411ca9649b415f4983baf05cf33ba6fd573e21f44ef
+  data.tar.gz: 881eb5ae6b5b435344388b55dee2081d4d6ebda1b3e0025a3d3cff2534e9d6c0
 SHA512:
-  metadata.gz: 5e74cdd0607641eb9b17a5cc60410de79da04a6cef796f1e31a96673176e740c2fc76bd26fd229a2d06e150b1adf8105a13516fb192787892ae895c3251b6500
-  data.tar.gz: 06036705f47f89cee9b769d5eb642d44741f714db4c53caedc0fbac7822d3e24968291a2dea2dba908955c798ca6d729d9101157b854266640202bf3e6504499
+  metadata.gz: 2ec687847b5e6932aea29db28c58c9c578595fe2a84d1dbd539b59d4c9371a4b1e798ee2a136cad5803553dabb745035da9d1a0601825436c4e6118256f6f070
+  data.tar.gz: 8cc0ee2cebe9a6beee5dbb9556553931b27b0063131a4f76283ab50d3747618866c69b55c03f035a6b809410b791830d81ad9ac8767c2868d82dd904cb2dc05f

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.16
+3.4.21

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/font.rb

@@ -21,7 +21,7 @@ module RubyXL
     define_child_node(RubyXL::BooleanValue, :node_name => :extend)
     define_child_node(RubyXL::Color)
     define_child_node(RubyXL::FloatValue,   :node_name => :sz)
-    define_child_node(RubyXL::BooleanValue, :node_name => :u)
+    define_child_node(RubyXL::StringValue,  :node_name => :u) # ST_UnderlineValues (http://www.datypic.com/sc/ooxml/e-ssml_u-1.html)
     define_child_node(RubyXL::StringValue,  :node_name => :vertAlign)
     define_child_node(RubyXL::StringValue,  :node_name => :scheme)
     define_element_name 'font'

data/lib/rubyXL/objects/ooxml_object.rb

@@ -12,10 +12,10 @@ module RubyXL
     # 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,
     # which is what we need.
-    def obtain_class_variable(var_name, default = {})
+    def obtain_class_variable(var_name, default = nil)
       self.class_variable_get(var_name)
     rescue NameError
-      self.class_variable_set(var_name, default)
+      self.class_variable_set(var_name, default || {})
     end
 
     # Defines an attribute of OOXML object.
@@ -45,9 +45,10 @@ module RubyXL
     # The value of the element will be accessible as a <tt>String</tt> by calling +obj.expression+
     #   define_attribute(:errorStyle, %w{ stop warning information }, :default => 'stop',)
     # A <tt>String</tt> attribute named 'errorStyle' will be accessible as +obj.error_style+, valid values are <tt>"stop"</tt>, <tt>"warning"</tt>, <tt>"information"</tt>
-    def define_attribute(attr_name, attr_type, extra_params = {})
+    def define_attribute(attr_name, attr_type, extra_params = nil)
       attrs = obtain_class_variable(:@@ooxml_attributes)
-      attr_hash = extra_params.merge({ :attr_type => attr_type })
+      attr_hash = { :attr_type => attr_type }
+      attr_hash.merge!(extra_params) if extra_params
       attr_hash[:accessor] ||= accessorize(attr_name)
       attrs[attr_name.to_s] = attr_hash
       self.send(:attr_accessor, attr_hash[:accessor]) unless attr_hash[:computed]
@@ -224,8 +225,9 @@ module RubyXL
     end
     private :obtain_class_variable
 
-    def initialize(params = {})
+    def initialize(params = nil)
       @local_namespaces = nil
+      params ||= {}
 
       obtain_class_variable(:@@ooxml_attributes).each_value { |v|
         instance_variable_set("@#{v[:accessor]}", params[v[:accessor]]) unless v[:computed]

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/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/simple_types.rb

@@ -223,6 +223,8 @@ module RubyXL
 
   ST_TextUnderlineType    = %w{ none words sng dbl heavy dotted dottedHeavy dash dashHeavy dashLong dashLongHeavy
                                 dotDash dotDashHeavy dotDotDash dotDotDashHeavy wavy wavyHeavy wavyDbl }
+  ST_UnderlineValues      = %w{ single double singleAccounting doubleAccounting none }
+
   ST_TextStrikeType       = %w{ noStrike sngStrike dblStrike }
   ST_TextCapsType         = %w{ none small all }
 

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/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.4.16</title>
+<title>README - rubyXL 3.4.21</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -21,8 +21,6 @@
 <link href="./css/rdoc.css" rel="stylesheet">
 
 
-
-
 <body id="top" role="document" class="file">
 <nav role="navigation">
   <div id="project-navigation">
@@ -98,7 +96,7 @@
     <li><a href="#label-I-2FO">I/O</a>
     <li><a href="#label-Miscellaneous">Miscellaneous</a>
     <li><a href="#label-Suppress+warnings+about+malformed+input+files">Suppress warnings about malformed input files</a>
-    <li><a href="#label-Data+validation+-28-22dropdown+list-22-29">Data validation (“dropdown list”)</a>
+    <li><a href="#label-Data+validation+-28colloquially+referred+to+as+-22dropdown+list-22-29">Data validation (colloquially referred to as “dropdown list”)</a>
     <li><a href="#label-For+more+information">For more information</a>
     <li><a href="#label-Contributing+to+rubyXL">Contributing to rubyXL</a>
     <li><a href="#label-Copyright">Copyright</a>
@@ -107,13 +105,12 @@
 
 
   <div id="project-metadata">
-    <div id="fileindex-section" class="nav-section">
+    
+<div id="fileindex-section" class="nav-section">
   <h3>Pages</h3>
 
   <ul class="link-list">
-  
     <li><a href="./README_rdoc.html">README</a>
-  
   </ul>
 </div>
 
@@ -191,6 +188,10 @@
 <pre class="ruby"><span class="ruby-identifier">worksheet</span> = <span class="ruby-identifier">workbook</span>[<span class="ruby-value">0</span>]
 <span class="ruby-identifier">worksheet</span>.<span class="ruby-identifier">sheet_data</span>[<span class="ruby-value">0</span>][<span class="ruby-value">0</span>] <span class="ruby-comment"># Returns cell A1 in the worksheet</span>
 <span class="ruby-identifier">worksheet</span>[<span class="ruby-value">0</span>][<span class="ruby-value">0</span>]            <span class="ruby-comment"># Returns cell A1 in the worksheet</span>
+
+<span class="ruby-identifier">cell</span> = <span class="ruby-identifier">worksheet</span>[<span class="ruby-value">0</span>][<span class="ruby-value">0</span>]
+<span class="ruby-identifier">cell</span>.<span class="ruby-identifier">value</span>                 <span class="ruby-comment"># Returns a properly converted value in the cell (if the file claims that the cell</span>
+                           <span class="ruby-comment"># is holding a number, returns a respective Integer or Float, and so on).</span>
 </pre>
 
 <h4 id="label-Wrappers+for+accessing+Cell+properties">Wrappers for accessing Cell properties<span><a href="#label-Wrappers+for+accessing+Cell+properties">&para;</a> <a href="#top">&uarr;</a></span></h4>
@@ -434,7 +435,7 @@
 <pre class="ruby"><span class="ruby-constant">RubyXL</span>.<span class="ruby-identifier">class_variable_set</span>(<span class="ruby-value">:@@suppress_warnings</span>, <span class="ruby-keyword">true</span>)
 </pre>
 
-<h2 id="label-Data+validation+-28-22dropdown+list-22-29">Data validation (“dropdown list”)<span><a href="#label-Data+validation+-28-22dropdown+list-22-29">&para;</a> <a href="#top">&uarr;</a></span></h2>
+<h2 id="label-Data+validation+-28colloquially+referred+to+as+-22dropdown+list-22-29">Data validation (colloquially referred to as “dropdown list”)<span><a href="#label-Data+validation+-28colloquially+referred+to+as+-22dropdown+list-22-29">&para;</a> <a href="#top">&uarr;</a></span></h2>
 
 <pre class="ruby"><span class="ruby-identifier">worksheet</span>.<span class="ruby-identifier">add_validation_list</span>(<span class="ruby-string">&quot;A1&quot;</span>, [ <span class="ruby-string">&quot;value1&quot;</span>, <span class="ruby-string">&quot;value2&quot;</span> ])
 </pre>
@@ -445,9 +446,9 @@
 
 <h2 id="label-Contributing+to+rubyXL">Contributing to rubyXL<span><a href="#label-Contributing+to+rubyXL">&para;</a> <a href="#top">&uarr;</a></span></h2>
 <ul><li>
-<p>Check out the latest master to make sure the feature hasn&#39;t been implemented or the bug hasn&#39;t been fixed yet</p>
+<p>Check out the latest master to make sure the feature hasn’t been implemented or the bug hasn’t been fixed yet</p>
 </li><li>
-<p>Check out the issue tracker to make sure someone already hasn&#39;t requested it and/or contributed it</p>
+<p>Check out the issue tracker to make sure someone already hasn’t requested it and/or contributed it</p>
 </li><li>
 <p>Fork the project</p>
 </li><li>
@@ -455,14 +456,14 @@
 </li><li>
 <p>Commit and push until you are happy with your contribution</p>
 </li><li>
-<p>Make sure to add tests for it. This is important so I don&#39;t break it in a future version unintentionally.</p>
+<p>Make sure to add tests for it. This is important so I don’t break it in a future version unintentionally.</p>
 </li><li>
 <p>Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.</p>
 </li></ul>
 
 <h2 id="label-Copyright">Copyright<span><a href="#label-Copyright">&para;</a> <a href="#top">&uarr;</a></span></h2>
 
-<p>Copyright © 2011 Vivek Bhagwat, 2013-2020 Wesha. See LICENSE.txt for further details.</p>
+<p>Copyright © 2011 Vivek Bhagwat, 2013-2021 Wesha. See LICENSE.txt for further details.</p>
 
 </main>
 
@@ -470,7 +471,7 @@
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="https://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.2.1.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.4.0.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>