rubyXL 3.4.35 → 3.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe00b75e714374728a3ddfcc3eb597cf4adbad2ccf56ca8b7ffebfe3f136489
-  data.tar.gz: b6eb25207a43c228c64940f59913cca7d0e2dcdd4a7962839dd4eb626f43707d
+  metadata.gz: 369a7b8221bd71f47c4be2200a6fd6d8dc034c6385f9c8a7131676ab79ee4ea5
+  data.tar.gz: aed698564f5298300084c00ee8564a6cbd5eb71b87c35d570d1fd3057e880c1b
 SHA512:
-  metadata.gz: 68a8d4c13699db6c15393ee295d23d9990b4524eb2cd85172fc33a1b17e8df99e1c6e16047c42cfb38ff2dc74c230df59d93b55a61f5dd180f4fa9cee5b43e34
-  data.tar.gz: fd3c39b4c193ee0eb92b974e5a64db792b11c521f17aa851986fa8434dcfacebbf8693480cb91d40cc897efba6ab755cf9534f2ef6f680abaac4b303af46c460
+  metadata.gz: 0ed8b03c95452b2d936cc3d01be1cfdab61021b9b57b88bc6c55d494c65bc4b3456613f89838c2a25f2a76e8207abc4aa512b460e21f354a3a848eb3625e21e6
+  data.tar.gz: 3aae9a886e7926ceaad2eefc828ed66f5ecc719f74cf0d5d165a946d89941b710d5058a70fa8ef92a37f6d299a045d3239daa824bbc52d18817ced77215c4118

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/README.rdoc

@@ -265,5 +265,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.35
+3.4.37

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/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