rubyXL 3.4.34 → 3.4.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cb660b3e6110d1d10406c1081cdfee6b3b129bd41c5d3cbb5aaf6a2413bd325
-  data.tar.gz: b049b63628e8c146f65c9afebcc3847b99cdf21b82107074f20da731cb579e7c
+  metadata.gz: 653d773015a0aca3439878d0e16a4e91517cf07cf3c3a0ff62d72c56ebd307b6
+  data.tar.gz: 7c58595e70a5be7e8ae8f9ecb5ced1eea4721a78f62653bd494b82ef5957d19f
 SHA512:
-  metadata.gz: da197a8e9cfedd42890c8edcc53cbd2d21c91a2c0ce81dec68633b899f87c64a6a2bd5e1dc516cf4999bfe0089c376b94fca6d4a3e106a5bfe6855fd11c1d290
-  data.tar.gz: 801162af8071bfe1c9fb028d1b4ce6a9a756f3bd9d40baccbc5908cf3884b3f0c61b6c29098957e81fe758d3588824b2fcf167282814c63059b78b9af15022c6
+  metadata.gz: 216a635924307eb9180227ecda2b3817786985b40987826a74f031e7b99a4dba045d9fb97e6e5fedb5ffb87544c75852d82300f2a652627ecae7ad5f224f0802
+  data.tar.gz: f7ec19093979640748284eda348c6bf49de9543003ef63e6454fc8e04c4fdcf06ef8a52ce45c09d8dbb60f7b00435884351412f98e83de7c1538829842756fc7

data/.circleci/config.yml

@@ -2,12 +2,15 @@
 #
 # Check https://circleci.com/docs/2.0/language-ruby/ for more details
 #
-version: 2
+version: 2.1
+
 jobs:
   build:
+    parameters:
+      ruby-version:
+        type: string
     docker:
-      # specify the version you desire here
-      - image: cimg/ruby:3.1.4
+      - image: cimg/ruby:<< parameters.ruby-version >>
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -30,7 +33,7 @@ jobs:
           name: install dependencies
           command: |
             gem install bundler
-            bundle install --jobs=4 --retry=3 --path vendor/bundle
+            bundle install --jobs=4 --retry=3
 
       #- save_cache:
       #    paths:
@@ -58,3 +61,11 @@ jobs:
       - store_artifacts:
           path: /tmp/test-results
           destination: test-results
+
+workflows:
+  test:
+    jobs:
+      - build:
+          matrix:
+            parameters:
+              ruby-version: ["3.0", "3.1", "3.2", "3.3", "3.4", "4.0"]

data/Gemfile

@@ -1,8 +1,8 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Dependencies required to run this gem.
 gem 'nokogiri', '>= 1.10.8'
-gem "rubyzip", "~> 2.4", require: "zip" # Locking because #473
+gem 'rubyzip', '>= 3.2.2', require: 'zip'
 
 # Development dependencies.
 group :development, :test do

data/README.rdoc

@@ -132,13 +132,25 @@ Please note: these methods are being phased out in favor of the OOXML object mod
   worksheet.change_column_fill(0, '0ba53d')         # Sets first column to have fill #0ba53d
 
 ==== Changing Borders
+===== Border Styles
   # Possible weights: hairline, thin, medium, thick
   # Possible "directions": top, bottom, left, right, diagonal
-  worksheet.sheet_data[0][0].change_border(:top, 'thin')  # Sets A1 to have a top, thin border
+  cell = worksheet.add_cell(1, 1, 'B2')
+  cell.change_border(:top, 'thin')  # Sets the cell to have a top, thin border
+  # Note that with diagonals, you have to specify which one of the diagonals (or both) you need.
+  cell.change_border( :diagonal, 'thick', [ :diagonal_down ])  # Sets A1 to have a thin diagonal going from top left to bottom right
+  # You can turn on both diagonals, but then they both will share the same style and color:
+  cell.change_border( :diagonal, 'thick', [ :diagonal_down, :diagonal_up ])
+
+===== Border Colors
+  # Make sure you set the border style first so there's something to color.
+  cell.change_border_color(:top, '0ba53d')      # Sets top border color to green
+  cell.change_border_color(:diagonal, 'dd0000') # Sets diaginal border color to red
+
+===== Changing whole row or column
+
   worksheet.change_row_border(0, :left, 'hairline')       # Sets first row to have a left, hairline border
   worksheet.change_column_border(0, :diagonal, 'medium')  # Sets first column to have diagonal, medium border
-
-  # Set the border style first so there's something to color.
   worksheet.change_row_border_color(0, :top, '0ba53d')    # Sets first row to have a green top border
   worksheet.change_column_border_color(0, :top, '0ba53d') # Sets first column to have a green top border
 
@@ -265,5 +277,5 @@ Take a look at the files in spec/lib/ for rspecs on most methods
 
 == Copyright
 
-Copyright (c) 2011 Vivek Bhagwat, 2013-2022 Wesha.
+Copyright (c) 2011 Vivek Bhagwat, 2013-2026 Wesha.
 See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-3.4.34
+3.4.38

data/lib/rubyXL/convenience_methods/cell.rb

@@ -68,9 +68,9 @@ module RubyXL
       self.style_index = workbook.modify_alignment(self.style_index) { |a| a.indent = indent }
     end
 
-    def change_border(direction, weight)
+    def change_border(direction, weight, diagonals = nil)
       validate_worksheet
-      self.style_index = workbook.modify_border(self.style_index, direction, weight)
+      self.style_index = workbook.modify_border(self.style_index, direction, weight, diagonals)
     end
 
     def change_border_color(direction, color)

data/lib/rubyXL/convenience_methods/workbook.rb

@@ -72,14 +72,14 @@ module RubyXL
       register_new_xf(register_new_fill(new_fill, xf))
     end
 
-    def modify_border(style_index, direction, weight)
+    def modify_border(style_index, direction, weight, diagonals = nil)
       xf = cell_xfs[style_index || 0].dup
       new_border = borders[xf.border_id || 0].dup
 
       edge = new_border.send(direction)
       new_border.send("#{direction}=", edge.dup) if edge
 
-      new_border.set_edge_style(direction, weight)
+      new_border.set_edge_style(direction, weight, diagonals)
 
       xf.border_id = borders.find_index { |x| x == new_border } # Reuse existing border, if it exists
       xf.border_id ||= borders.size # If this border has never existed before, add it to collection.

data/lib/rubyXL/objects/border.rb

@@ -34,13 +34,18 @@ module RubyXL
       edge && edge.style
     end
 
-    def set_edge_style(direction, style)
+    def set_edge_style(direction, style, diagonals = nil)
       edge = self.send(direction)
       if edge
         edge.style = style
       else
         self.send("#{direction}=", RubyXL::BorderEdge.new(:style => style))
       end
+
+      if diagonals then
+        self.diagonal_up = true if diagonals.index(:diagonal_up)
+        self.diagonal_down = true if diagonals.index(:diagonal_down)
+      end
     end
 
     def get_edge_color(direction)

data/lib/rubyXL/objects/reference.rb

@@ -3,7 +3,8 @@ module RubyXL
     ROW_MAX = 1024 * 1024
     COL_MAX = 16393
 
-    attr_reader :row_range, :col_range
+    attr_reader :row_range, :col_range, :sheet_name
+    attr_reader :row_from_absolute, :row_to_absolute, :col_from_absolute, :col_to_absolute
 
     # RubyXL::Reference.new(row, col)
     # RubyXL::Reference.new(row_from, row_to, col_from, col_to)
@@ -11,6 +12,7 @@ module RubyXL
     # RubyXL::Reference.new(row_from:, row_to:, col_from:, col_to:)
     def initialize(*params)
       row_from = row_to = col_from = col_to = nil
+      @row_from_absolute = @row_to_absolute = @col_from_absolute = @col_to_absolute = false
 
       case params.size
       when 4 then row_from, row_to, col_from, col_to = params
@@ -20,9 +22,16 @@ module RubyXL
         when Hash then
           row_from, row_to, col_from, col_to = params.first.fetch_values(:row_from, :row_to, :col_from, :col_to)
         when String then
-          from, to = params[0].split(':')
-          row_from, col_from = self.class.ref2ind(from)
-          row_to, col_to = self.class.ref2ind(to) unless to.nil?
+          str = params.first
+          match_data = str.match(/^('(?<sheet_name1>[^']+)'|(?<sheet_name2>[^']+))!/)
+          if match_data then
+            @sheet_name = match_data['sheet_name1'] || match_data['sheet_name2']
+            str = str[match_data[0].size..-1]
+          end
+
+          from, to = str.split(':')
+          row_from, col_from, @row_from_absolute, @col_from_absolute = self.class.ref2ind(from)
+          row_to, col_to, @row_to_absolute, @col_to_absolute = self.class.ref2ind(to) unless to.nil?
         else
           raise ArgumentError.new("invalid value for #{self.class}: #{params[0].inspect}") unless params[0].is_a?(String)
         end
@@ -57,7 +66,8 @@ module RubyXL
     end
 
     def ==(other)
-      !other.nil? && (@row_range == other.row_range) && (@col_range == other.col_range)
+      !other.nil? && (@sheet_name == other.sheet_name) &&
+        (@row_range == other.row_range) && (@col_range == other.col_range)
     end
 
     def cover?(other)
@@ -68,42 +78,57 @@ module RubyXL
     end
 
     def to_s
+      result = +''
+
+      if @sheet_name then
+        if @sheet_name.index(' ') then
+          result << "'#{@sheet_name}'"
+        else
+          result << @sheet_name
+        end
+        result << '!'
+      end
+
       if single_cell? then
-        self.class.ind2ref(@row_range.begin, @col_range.begin)
+        result << self.class.ind2ref(@row_range.begin, @col_range.begin, @row_from_absolute, @col_from_absolute)
       else
-        self.class.ind2ref(@row_range.begin, @col_range.begin) + ':' +
-                           self.class.ind2ref(@row_range.end, @col_range.end)
+        result << self.class.ind2ref(@row_range.begin, @col_range.begin, @row_from_absolute, @col_from_absolute)
+        result << ':'
+        result << self.class.ind2ref(@row_range.end, @col_range.end, @row_to_absolute, @col_to_absolute)
       end
     end
 
     def inspect
       if single_cell? then
-        "#<#{self.class} @row=#{@row_range.begin} @col=#{@col_range.begin}>"
+        "#<#{self.class} @sheet_name=#{@sheet_name} @row=#{@row_range.begin} @col=#{@col_range.begin}>"
       else
-        "#<#{self.class} @row_range=#{@row_range} @col_range=#{@col_range}>"
+        "#<#{self.class} @sheet_name=#{@sheet_name} @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 = ''
+    def self.ind2ref(row = 0, col = 0, row_abs = false, col_abs = false)
+      col_ref = ''
 
       loop do
         x = col % 26
-        str = ('A'.ord + x).chr + str
+        col_ref = ('A'.ord + x).chr + col_ref
         col = (col / 26).floor - 1
         break if col < 0
       end
 
-      str += (row + 1).to_s
+      "#{col_abs ? '$' : ''}#{col_ref}#{row_abs ? '$' : ''}#{row + 1}"
     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/
-      [ Regexp.last_match(2).to_i - 1,
-        Regexp.last_match(1).each_byte.inject(0) { |col, chr| (col * 26) + (chr - 64) } - 1 ]
+      matchdata = str.match(/\A(?<cabs>\$?)(?<col>[A-Z]+)(?<rabs>\$?)(?<row>\d+)\Z/)
+      return [ -1, -1 ] unless matchdata
+      [  matchdata['row'].to_i - 1,
+         matchdata['col'].each_byte.inject(0) { |col, chr| (col * 26) + (chr - 64) } - 1,
+         !matchdata['rabs'].empty?,
+         !matchdata['cabs'].empty? ]
     end
   end
 

data/lib/rubyXL/objects/root.rb

@@ -33,7 +33,7 @@ module RubyXL
 
     # Write <tt>.xlsx</tt> to a stream (useful for sending over HTTP)
     def stream
-      stream = Zip::OutputStream.write_buffer { |zipstream|
+      stream = Zip::OutputStream.write_buffer(suppress_extra_fields: true) { |zipstream|
         self.rels_hash = {}
         self.relationship_container.owner = self
         collect_related_objects.compact.each { |obj|

data/lib/rubyXL/objects/sheet_data.rb

@@ -111,6 +111,7 @@ module RubyXL
       when RubyXL::DataType::INLINE_STRING then is.to_s
       when RubyXL::DataType::RAW_STRING    then raw_value
       when RubyXL::DataType::DATE          then raw_value && DateTime.parse(raw_value)
+      when RubyXL::DataType::ERROR         then nil
       else
         if is then is.to_s
         elsif is_date? then workbook.num_to_date(r.to_f)
@@ -123,6 +124,10 @@ module RubyXL
       end
     end
 
+    def error?
+      datatype == RubyXL::DataType::ERROR
+    end
+
     def inspect
       str = "#<#{self.class}(#{row},#{column}): #{raw_value.inspect}"
       str << " =#{self.formula.expression}" if self.formula

data/lib/rubyXL/objects/workbook.rb

@@ -146,6 +146,13 @@ module RubyXL
   class DefinedNames < OOXMLContainerObject
     define_child_node(RubyXL::DefinedName, :collection => true)
     define_element_name 'definedNames'
+
+    def [](key)
+      case key
+      when Integer then super
+      when String then self.find { |n| n.name.eql?(key) }
+      end
+    end
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_pivotCache-1.html