rubyXL 3.4.35 → 3.4.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe00b75e714374728a3ddfcc3eb597cf4adbad2ccf56ca8b7ffebfe3f136489
-  data.tar.gz: b6eb25207a43c228c64940f59913cca7d0e2dcdd4a7962839dd4eb626f43707d
+  metadata.gz: 5f504d4a98641e448f10c394c1252113799a249f4fca445125c2928e0c63f5b2
+  data.tar.gz: cd019b1c71d4448bc52ab50b1c52379eb57787dd2028f31b912599bef5039959
 SHA512:
-  metadata.gz: 68a8d4c13699db6c15393ee295d23d9990b4524eb2cd85172fc33a1b17e8df99e1c6e16047c42cfb38ff2dc74c230df59d93b55a61f5dd180f4fa9cee5b43e34
-  data.tar.gz: fd3c39b4c193ee0eb92b974e5a64db792b11c521f17aa851986fa8434dcfacebbf8693480cb91d40cc897efba6ab755cf9534f2ef6f680abaac4b303af46c460
+  metadata.gz: ff9bb0d076e9880e5b44ade2a335f0636a42deda1a80f956aa0cd10bde2583a4759a8dec5869edeb3ed9108aa8e269b2f9603a6d9cac9190293b64441b4ad2d3
+  data.tar.gz: 4048af3bc2fa9534c9519ccdd8cef0c814cecb2e6944ce0f7079ae337f95f0a0f0dac4323dc892e1c162bb78f4faee35bcf72cf61f91427c188dfec6fba31471

data/VERSION

@@ -1 +1 @@
-3.4.35
+3.4.36

data/lib/rubyXL/objects/reference.rb

@@ -3,7 +3,7 @@ module RubyXL
     ROW_MAX = 1024 * 1024
     COL_MAX = 16393
 
-    attr_reader :row_range, :col_range
+    attr_reader :row_range, :col_range, :sheet_name
 
     # RubyXL::Reference.new(row, col)
     # RubyXL::Reference.new(row_from, row_to, col_from, col_to)
@@ -20,7 +20,14 @@ 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(':')
+          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 = self.class.ref2ind(from)
           row_to, col_to = self.class.ref2ind(to) unless to.nil?
         else
@@ -57,7 +64,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,19 +76,31 @@ 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)
       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)
+        result << ':'
+        result << self.class.ind2ref(@row_range.end, @col_range.end)
       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
 
@@ -101,7 +121,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/
+      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 ]
     end

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 defined_names.find { |n| n.name = key }
+      end
+    end
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_pivotCache-1.html