rubyXL 3.4.17 → 3.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51db2d850a23f726d765f58fdaad378dd910becb0e468216095a1473a5770b9c
-  data.tar.gz: 56fbd84fb09a54fe29dcdb6f734c6ade11737d11dbe2130633dccc35999e85cd
+  metadata.gz: 333f7f90125b86bfef6f8f87b70009a2e77cd44e70eb84fc22d9c3a820e69b5b
+  data.tar.gz: eead0bf9e502b9df52536d9f34582f2637071d8b4cb1d8902f57f79a95badbc1
 SHA512:
-  metadata.gz: e8a733f1ba635667d621ae7f02990c0ac4aeac8554b554ed9474c0b28b0e265c2a5e1071be43d6cc968911da58887a78dcedbe6fbae18d79be0fddc9093e1c4c
-  data.tar.gz: 4ac723e0a0508a9f6235e57c702c453dfa01a7941a1a27fe072f4a411bd186cfc76de15150f8a4a4cf80779885e7623012f2d9c3ba6fa30e48bedff262f94bbf
+  metadata.gz: 533d23c78736a6320243772d38b0a322bb071005f34448903a1f93da7ab5c4ee51f10dd47419a4bd18f192f44b1d90df0d38ce77bd16dbc7e362e02faab6c971
+  data.tar.gz: 10a36c58a4b4d74f3d6d63c58e24c4e90664487337d049bfabf36b7ddb40032538d78271faf614d246983e50de0f9502369ee434ed47e11160039e38658548f8

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,57 +1,77 @@
 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.5)
-    faraday (0.9.2)
+    docile (1.4.0)
+    faraday (1.6.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    git (1.8.1)
+      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-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    git (1.9.1)
       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.2)
-    mime-types (2.99.3)
-    mini_portile2 (2.5.0)
+    jwt (2.2.3)
+    kamelcase (0.0.2)
+      semver2 (~> 3)
+    mini_portile2 (2.6.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.1)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    oauth2 (1.4.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.3.0)
+    psych (4.0.1)
+    public_suffix (4.0.6)
     racc (1.5.2)
     rack (2.2.3)
-    rake (13.0.3)
+    rake (13.0.6)
     rchardet (1.8.0)
-    rdoc (6.3.0)
+    rdoc (6.3.2)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -67,15 +87,16 @@ GEM
     rspec-support (3.10.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby-prof (1.4.2)
-    rubyzip (2.3.0)
+    ruby-prof (1.4.3)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
     semver2 (3.4.2)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     thread_safe (0.3.6)
 
 PLATFORMS
@@ -83,7 +104,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  jeweler
+  juwelier
   nokogiri (>= 1.10.8)
   rake
   rspec
@@ -93,4 +114,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.1.4
+   2.2.25

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.17
+3.4.18

data/lib/rubyXL/convenience_methods/worksheet.rb

@@ -107,18 +107,19 @@ module RubyXL
       }
 
       # Update merged cells for all rows below
-      self.merged_cells ||= RubyXL::MergedCells.new
-      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,
-        )
-      }
+      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
@@ -136,20 +137,21 @@ module RubyXL
       }
 
       # Update row number of merged cells
-      self.merged_cells ||= RubyXL::MergedCells.new
-      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? }
+      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
@@ -183,18 +185,19 @@ module RubyXL
       cols.insert_column(column_index)
 
       # Update merged cells for all rows below
-      self.merged_cells ||= RubyXL::MergedCells.new
-      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,
-        )
-      }
+      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
@@ -217,7 +220,8 @@ module RubyXL
       cols.each { |range| range.delete_column(column_index) }
 
       # Update row number of merged cells
-      self.merged_cells ||= RubyXL::MergedCells.new
+      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
@@ -230,6 +234,7 @@ module RubyXL
           mc.ref.col_range.last - 1,
         )
       }
+
       merged_cells.delete_if { |mc| mc.ref.single_cell? }
     end
 

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.4.17</title>
+<title>README - rubyXL 3.4.18</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -96,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>
@@ -188,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>
@@ -431,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>
@@ -459,7 +463,7 @@
 
 <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>
 
@@ -467,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.3.0.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.3.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 3.4.17</title>
+<title>module RubyXL - rubyXL 3.4.18</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -328,7 +328,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.3.0.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.3.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 3.4.17</title>
+<title>class RubyXL::AExtension - rubyXL 3.4.18</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";
@@ -177,7 +177,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.3.0.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.3.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/rdoc/RubyXL/AExtensionStorageArea.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtensionStorageArea - rubyXL 3.4.17</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 3.4.18</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";
@@ -91,7 +91,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.3.0.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.3.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/rdoc/RubyXL/ActiveX.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::ActiveX - rubyXL 3.4.17</title>
+<title>class RubyXL::ActiveX - rubyXL 3.4.18</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";
@@ -148,7 +148,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.3.0.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.3.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>