rubyXL 3.4.11 → 3.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1b04f515e5389f84549bd151482024475fda99ee8c2184f9e54a42b16f8179a
-  data.tar.gz: b8e5c9e69831ec49303a3a2a59d719cbda4c26486cd84d78d13c5be401ee50d5
+  metadata.gz: 51db2d850a23f726d765f58fdaad378dd910becb0e468216095a1473a5770b9c
+  data.tar.gz: 56fbd84fb09a54fe29dcdb6f734c6ade11737d11dbe2130633dccc35999e85cd
 SHA512:
-  metadata.gz: a216a03be415d7c6eb735718f4c78e51185cb443881f87ecd41c08d5a994146cf2a0432537a5554a8c9f7d638d726cb0e733e9650421bf84d31eab9f0b638637
-  data.tar.gz: 9511ff073542c85c0fc61c4408b6f9bc35c36a4854c90b945c193225c96cf2a68929bc588f7bff882b1e1a7790e367fd759576f9d78e64e4848ee821f69251c6
+  metadata.gz: e8a733f1ba635667d621ae7f02990c0ac4aeac8554b554ed9474c0b28b0e265c2a5e1071be43d6cc968911da58887a78dcedbe6fbae18d79be0fddc9093e1c4c
+  data.tar.gz: 4ac723e0a0508a9f6235e57c702c453dfa01a7941a1a27fe072f4a411bd186cfc76de15150f8a4a4cf80779885e7623012f2d9c3ba6fa30e48bedff262f94bbf

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

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 # Dependencies required to run this gem.
-gem "nokogiri", ">= 1.4.4"
+gem "nokogiri", ">= 1.10.8"
 gem "rubyzip", ">= 1.3.0" , :require => 'zip'
 
 # Development dependencies.

data/Gemfile.lock

@@ -5,11 +5,12 @@ GEM
     builder (3.2.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.5.0)
+    git (1.8.1)
+      rchardet (~> 1.8)
     github_api (0.16.0)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
@@ -17,7 +18,7 @@ GEM
       hashie (>= 3.4)
       mime-types (>= 1.16, < 3.0)
       oauth2 (~> 1.0)
-    hashie (4.0.0)
+    hashie (4.1.0)
     highline (2.0.3)
     jeweler (2.3.9)
       builder
@@ -30,48 +31,51 @@ GEM
       rake
       rdoc
       semver2
-    json (2.3.0)
-    jwt (2.2.1)
+    jwt (2.2.2)
     mime-types (2.99.3)
-    mini_portile2 (2.4.0)
-    multi_json (1.14.1)
+    mini_portile2 (2.5.0)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.7)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.2)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.1.0)
-    rack (2.0.8)
-    rake (13.0.1)
-    rdoc (6.2.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    psych (3.3.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rake (13.0.3)
+    rchardet (1.8.0)
+    rdoc (6.3.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.0)
+      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.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby-prof (1.1.0)
-    rubyzip (2.0.0)
+    ruby-prof (1.4.2)
+    rubyzip (2.3.0)
     semver2 (3.4.2)
-    simplecov (0.17.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     thread_safe (0.3.6)
 
 PLATFORMS
@@ -80,7 +84,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler
-  nokogiri (>= 1.4.4)
+  nokogiri (>= 1.10.8)
   rake
   rspec
   rspec_junit_formatter
@@ -89,4 +93,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Vivek Bhagwat, 2013-2014 Wesha
+Copyright (c) 2011 Vivek Bhagwat, 2013-2020 Wesha
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -229,6 +229,11 @@ 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")
+
+  worksheet.add_validation_list("A1", [ "value1", "value2" ])
+
+
 == For more information
 Take a look at the files in spec/lib/ for rspecs on most methods
 
@@ -244,5 +249,5 @@ Take a look at the files in spec/lib/ for rspecs on most methods
 
 == Copyright
 
-Copyright (c) 2011 Vivek Bhagwat, 2013-2016 Wesha.
+Copyright (c) 2011 Vivek Bhagwat, 2013-2020 Wesha.
 See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-3.4.11
+3.4.17

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

@@ -72,9 +72,11 @@ module RubyXL
       end
 
       def to_s
-        str = r.to_s(16) + g.to_s(16) + b.to_s(16)
-        str += a.to_s(16) if a && a != 0
-        str
+        if a && a != 0 then
+          "%02x%02x%02x%02x" % [ r, g, b, a ]
+        else
+          "%02x%02x%02x" % [ r, g, b ]
+        end
       end
 
     end

data/lib/rubyXL/convenience_methods/worksheet.rb

@@ -106,6 +106,20 @@ 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,
+        )
+      }
+
       return new_row
     end
 
@@ -121,6 +135,22 @@ module RubyXL
         row && row.cells.each{ |c| c.row -= 1 unless c.nil? }
       }
 
+      # 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? }
+
       return deleted
     end
 
@@ -152,6 +182,20 @@ 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,
+        )
+      }
+
       # TODO: update column numbers
     end
 
@@ -171,6 +215,22 @@ module RubyXL
       }
 
       cols.each { |range| range.delete_column(column_index) }
+
+      # Update row number of merged cells
+      self.merged_cells ||= RubyXL::MergedCells.new
+      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)
@@ -632,6 +692,18 @@ module RubyXL
       # TODO: add validation to make sure ranges are not intersecting with existing ones
       merged_cells << RubyXL::MergedCell.new(:ref => RubyXL::Reference.new(start_row, end_row, start_col, end_col))
     end
+
+    def add_validation_list(ref, list_arr)
+      # "Any double quote characters in the value should be escaped with another double quote.
+      # If the value does not contain a comma, newline or double quote, then the String value should be returned unchanged.
+      # If the value contains a comma, newline or double quote, then the String value should be returned enclosed in double quotes."
+      expr = '"' + list_arr.collect{|str| str.gsub('"', '""')}.join(',') + '"'
+      self.data_validations ||= RubyXL::DataValidations.new
+      self.data_validations <<
+        RubyXL::DataValidation.new({:sqref => RubyXL::Reference.new(ref),
+                                    :formula1 => RubyXL::Formula.new(:expression => expr),
+                                    :type => 'list'})
+    end
   end
 
   RubyXL::Worksheet.send(:include, RubyXL::WorksheetConvenienceMethods) # ruby 2.1 compat

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

@@ -11,6 +11,8 @@ module RubyXL
     define_attribute(:imeMode,          RubyXL::ST_DataValidationImeMode,    :default => 'noControl')
     define_attribute(:operator,         RubyXL::ST_DataValidationOperator,   :default => 'between')
     define_attribute(:allowBlank,       :bool, :default => false)
+    # Documentation lies. This property should have been called "HIDE dropdown",
+    #   since that's what happens when it is set to true.
     define_attribute(:showDropDown,     :bool, :default => false)
     define_attribute(:showInputMessage, :bool, :default => false)
     define_attribute(:showErrorMessage, :bool, :default => false)

data/lib/rubyXL/objects/document_properties.rb

@@ -127,7 +127,7 @@ module RubyXL
     end
 
     def creator=(v)
-      self.dc_creator = v && RubyXL::StringNodeW3C.new(:value => v)
+      self.dc_creator = v && RubyXL::StringNode.new(:value => v)
     end
 
     def modifier
@@ -135,7 +135,7 @@ module RubyXL
     end
 
     def modifier=(v)
-      self.cp_last_modified_by = v && RubyXL::StringNodeW3C.new(:value => v)
+      self.cp_last_modified_by = v && RubyXL::StringNode.new(:value => v)
     end
 
     def created_at

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.
@@ -272,6 +277,11 @@ module RubyXL
       if xml.nil? then
         seed_xml = Nokogiri::XML('<?xml version = "1.0" standalone ="yes"?>')
         seed_xml.encoding = 'UTF-8'
+
+        if Nokogiri.jruby? then # Issue 188 workaround for JRuby
+          seed_xml.to_java.strict_error_checking = false
+        end
+
         result = self.write_xml(seed_xml)
         return result if result == ''
         seed_xml << result

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