robust_excel_ole 1.31 → 1.32

data/lib/robust_excel_ole/worksheet.rb

@@ -11,6 +11,8 @@ module RobustExcelOle
   # worksheet: see https://github.com/Thomas008/robust_excel_ole/blob/master/lib/robust_excel_ole/worksheet.rb
   class Worksheet < RangeOwners
 
+    include Enumerable
+
     using ToReoRefinement
 
     attr_reader :ole_worksheet
@@ -49,9 +51,9 @@ module RobustExcelOle
     # sheet name
     # @returns name of the sheet
     def name
-      @ole_worksheet.Name
+      @ole_worksheet.Name.encode('utf-8')
     rescue
-      raise WorksheetREOError, "name could not be determined"
+      raise WorksheetREOError, "name could not be determined\n#{$!.message}"
     end
 
     # sets sheet name
@@ -66,49 +68,69 @@ module RobustExcelOle
       end
     end
 
-    # returns a cell given the defined name or row and column
-    # @params row, column, or name
-    # @returns cell, if row and column are given
-    def [] p1, p2 = :__not_provided
-      if p2 != :__not_provided
-        x, y = p1, p2
-        xy = "#{x}_#{y}"
-        @cells = { }
-        begin
-          @cells[xy] = RobustExcelOle::Cell.new(@ole_worksheet.Cells.Item(x, y), @worksheet)
-        rescue
-          raise RangeNotEvaluatable, "cannot read cell (#{x.inspect},#{y.inspect})"
-        end
+    # value of a range given its defined name or address
+    # @params [Variant] defined name or address
+    # @returns [Variant] value (contents) of the range
+    def [](name_or_address, address2 = :__not_provided)
+      range(name_or_address, address2).value
+    end
+
+    # sets the value of a range given its defined name or address, and the value
+    # @params [Variant] defined name or address of the range
+    # @params [Variant] value (contents) of the range
+    # @returns [Variant] value (contents) of the range
+    def []=(name_or_address, value_or_address2, remaining_arg = :__not_provided) 
+      if remaining_arg != :__not_provided
+        name_or_address, value = [name_or_address, value_or_address2], remaining_arg
       else
-        name = p1
-        begin
-          namevalue_global(name)
-        rescue REOError
-          namevalue(name)
-        end
+        value = value_or_address2
+      end
+      begin
+        range(name_or_address).value = value
+      rescue #WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
+        raise RangeNotEvaluatable, "cannot assign value to range with name or address #{name_or_address.inspect}\n#{$!.message}"
       end
     end
 
-    # sets the value of a cell
-    # @params row and column, or defined name
-    def []= (p1, p2, p3 = :__not_provided)
-      if p3 != :__not_provided
-        x, y, value = p1, p2, p3
-        set_cellval(x,y,value)
-      else
-        name, value = p1, p2
-        begin
-          set_namevalue_global(name, value)
-        rescue REOError
+    # a range given a defined name or address
+    # @params [Variant] defined name or address
+    # @return [Range] a range
+    def range(name_or_address, address2 = :__not_provided)
+      if name_or_address.respond_to?(:gsub) && address2 == :__not_provided
+        name = name_or_address
+        range = get_name_object(name).RefersToRange rescue nil
+      end
+      unless range
+        address = normalize_address(name_or_address, address2)
+        workbook.retain_saved do
           begin
-            workbook.set_namevalue_global(name, value)
-          rescue REOError
-            set_namevalue(name, value)
+            self.Names.Add('__dummy001',nil,true,nil,nil,nil,nil,nil,nil,'=' + address_tool.as_r1c1(address))          
+            range = get_name_object('__dummy001').RefersToRange
+            self.Names.Item('__dummy001').Delete
+          rescue
+            address2_string = (address2.nil? || address2 == :__not_provided) ? "" : ", #{address2.inspect}"
+            raise RangeNotCreated, "cannot find name or address #{name_or_address.inspect}#{address2_string})"
           end
         end
       end
+      range.to_reo
+    end
+  
+  private
+
+    def normalize_address(address, address2)
+      address = [address,address2] unless address2 == :__not_provided     
+      address = if address.is_a?(Integer) || address.is_a?(::Range)
+        [address, nil]
+      elsif address.is_a?(Array) && address.size == 1 && (address.first.is_a?(Integer) || address.first.is_a?(::Range))
+        [address.first, nil]
+      else 
+        address
+      end
     end
 
+  public
+    
     # returns the contents of a range with a locally defined name
     # evaluates the formula if the contents is a formula
     # if the name could not be found or the range or value could not be determined,
@@ -117,7 +139,7 @@ module RobustExcelOle
     # @param  [Hash]        opts      the options
     # @option opts [Symbol] :default  the default value that is provided if no contents could be returned
     # @return [Variant] the contents of a range with given name
-    def namevalue(name, opts = { :default => :__not_provided })
+    def namevalue(name, opts = { default: :__not_provided })
       begin
         ole_range = self.Range(name)
       rescue # WIN32OLERuntimeError, VBAMethodMissingError, Java::OrgRacobCom::ComFailException 
@@ -135,11 +157,11 @@ module RobustExcelOle
         end
       rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException 
         return opts[:default] unless opts[:default] == :__not_provided
-        raise RangeNotEvaluatable, "cannot determine value of range named #{name.inspect} in #{self.inspect}"
+        raise RangeNotEvaluatable, "cannot determine value of range named #{name.inspect} in #{self.inspect}\n#{$!.message}"
       end
       if value == -2146828288 + RobustExcelOle::XlErrName
         return opts[:default] unless opts[:default] == __not_provided
-        raise RangeNotEvaluatable, "cannot evaluate range named #{name.inspect} in #{File.basename(workbook.stored_filename).inspect rescue nil}"
+        raise RangeNotEvaluatable, "cannot evaluate range named #{name.inspect} in #{File.basename(workbook.stored_filename).inspect rescue nil}\n#{$!.message}"
       end
       return opts[:default] unless (opts[:default] == :__not_provided) || value.nil?
       value
@@ -164,25 +186,23 @@ module RobustExcelOle
           row, col = address_tool.as_integer_ranges(address_r1c1)
           row.each_with_index do |r,i|
             col.each_with_index do |c,j|
-              ole_range.Cells(i+1,j+1).Value = (value.respond_to?(:first) ? value[i][j] : value)
+              ole_range.Cells(i+1,j+1).Value = (value.respond_to?(:pop) ? value[i][j] : value)
             end
           end
         end
         value
       rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
-        raise RangeNotEvaluatable, "cannot assign value to range named #{name.inspect} in #{self.inspect}"
+        raise RangeNotEvaluatable, "cannot assign value to range named #{name.inspect} in #{self.inspect}\n#{$!.message}"
       end
     end
 
     # value of a cell, if row and column are given
     # @params row and column
     # @returns value of the cell
-    def cellval(x,y)
-      begin
-        @ole_worksheet.Cells.Item(x, y).Value
-      rescue
-        raise RangeNotEvaluatable, "cannot read cell (#{x.inspect},#{y.inspect})"
-      end
+    def cellval(x,y)                         # :deprecated :#
+      @ole_worksheet.Cells.Item(x, y).Value
+    rescue
+      raise RangeNotEvaluatable, "cannot read cell (#{x.inspect},#{y.inspect})\n#{$!.message}"
     end
 
     # sets the value of a cell, if row, column and color of the cell are given
@@ -193,73 +213,93 @@ module RobustExcelOle
       cell.Interior.ColorIndex = opts[:color] unless opts[:color].nil?
       cell.Value = value
     rescue # WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException
-      raise RangeNotEvaluatable, "cannot assign value #{value.inspect} to cell (#{y.inspect},#{x.inspect})"
+      raise RangeNotEvaluatable, "cannot assign value #{value.inspect} to cell (#{y.inspect},#{x.inspect})\n#{$!.message}"
     end
 
-    # provides a 2-dimensional array that contains the values in each row
+    # @return [Array] a 2-dimensional array that contains the values in each row of the used range
     def values
       @ole_worksheet.UsedRange.Value
     end
 
-    # enumerator for accessing cells
+    # @return [Enumerator] traversing the rows values
     def each
-      each_row do |row_range|
-        row_range.each do |cell|
-          yield cell
-        end
-      end
-    end
-
-    def each_with_index(offset = 0)
-      i = offset
-      each_row do |row_range|
-        row_range.each do |cell|
-          yield cell, i
-          i += 1
+      if block_given?
+        @ole_worksheet.UsedRange.Rows.lazy.each do |ole_row|
+          row_value = ole_row.Value
+          yield (row_value.nil? ? [] : row_value.first)  
         end
+      else
+        to_enum(:each).lazy
       end
     end
 
-    # enumerator for accessing rows
+    # @return [Enumerator] traversing the rows
     def each_row(offset = 0)
-      offset += 1
-      1.upto(@end_row) do |row|
-        next if row < offset
-        yield RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(row, 1), @ole_worksheet.Cells(row, @end_column)), self)
+      if block_given?
+        offset += 1
+        1.upto(@end_row) do |row|
+          next if row < offset
+          yield RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(row, 1), @ole_worksheet.Cells(row, @end_column)), self)
+        end
+      else
+        to_enum(:each_row).lazy
       end
     end
 
-    def each_row_with_index(offset = 0)
+    def each_row_with_index(offset = 0)    # :nodoc: #   # :deprecated :#
       each_row(offset) do |row_range|
         yield RobustExcelOle::Range.new(row_range, self), (row_range.Row - 1 - offset)
       end
     end
 
-    # enumerator for accessing columns
+    # @return [Enumerator] traversing the columns
     def each_column(offset = 0)
-      offset += 1
-      1.upto(@end_column) do |column|
-        next if column < offset
-        yield RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(1, column), @ole_worksheet.Cells(@end_row, column)), self)
+      if block_given?
+        offset += 1
+        1.upto(@end_column) do |column|
+          next if column < offset
+          yield RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(1, column), @ole_worksheet.Cells(@end_row, column)), self)
+        end
+      else
+        to_enum(:each_column).lazy
       end
     end
 
-    def each_column_with_index(offset = 0)
+    def each_column_with_index(offset = 0)    # :nodoc: #    # :deprecated :#
       each_column(offset) do |column_range|
         yield RobustExcelOle::Range.new(column_range, self), (column_range.Column - 1 - offset)
       end
     end
 
+    # @return [Enumerator] traversing the cells
+    def each_cell
+      if block_given?
+        each_row do |row_range|
+          row_range.lazy.each do |cell|
+            yield cell
+          end
+        end
+      else
+        to_enum(:each_cell).lazy
+      end
+    end
+
+    def each_cell_with_index(offset = 0)   # :nodoc: #  # :deprecated :#
+      i = offset
+      each_row do |row_range|
+        row_range.each do |cell|
+          yield cell, i
+          i += 1
+        end
+      end
+    end
+
     def each_rowvalue  # :deprecated: #
       values.each do |row_values|
         yield row_values
       end
     end
 
-    def each_value   # :deprecated: #
-      each_rowvalue
-    end
-
     def each_rowvalue_with_index(offset = 0)    # :deprecated: #
       i = offset
       values.each do |row_values|
@@ -268,6 +308,8 @@ module RobustExcelOle
       end
     end
 
+    alias each_value each_rowvalue   # :deprecated: #
+     
     def row_range(row, integer_range = nil)
       integer_range ||= 1..@end_column
       RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(row, integer_range.min), @ole_worksheet.Cells(row, integer_range.max)), self)
@@ -280,44 +322,17 @@ module RobustExcelOle
 
     def == other_worksheet
       other_worksheet.is_a?(Worksheet) && 
-        self.workbook == other_worksheet.workbook &&
-        self.Name == other_worksheet.Name
-    end
-
-    # creates a range from a given defined name or address
-    # @params [Variant] defined name or address
-    # @return [Range] a range
-    def range(name_or_address, address2 = :__not_provided)
-      if name_or_address.respond_to?(:gsub) && address2 == :__not_provided
-        name = name_or_address
-        range = RobustExcelOle::Range.new(name_object(name).RefersToRange, self) rescue nil
-      end
-      unless range
-        address = name_or_address
-        address = [name_or_address,address2] unless address2 == :__not_provided         
-        workbook.retain_saved do
-          begin
-            self.Names.Add('__dummy001',nil,true,nil,nil,nil,nil,nil,nil,'=' + address_tool.as_r1c1(address))          
-            range = RobustExcelOle::Range.new(name_object('__dummy001').RefersToRange, self)
-            self.Names.Item('__dummy001').Delete
-          rescue
-            address2_string = address2.nil? ? "" : ", #{address2.inspect}"
-            raise RangeNotCreated, "cannot create range (#{name_or_address.inspect}#{address2_string})"
-          end
-        end
-      end
-      range
+      self.workbook == other_worksheet.workbook &&
+      self.Name == other_worksheet.Name
     end
 
+    
     # @params [Variant] table (listobject) name or number 
     # @return [ListObject] a table (listobject)
     def table(number_or_name)
-      begin
-        ole_listobject = @ole_worksheet.ListObjects.Item(number_or_name)
-      rescue
-        raise WorksheetREOError, "table #{number_or_name} not found"
-      end
-      ListObject.new(ole_listobject)
+      listobject_class.new(@ole_worksheet.ListObjects.Item(number_or_name))
+    rescue
+      raise WorksheetREOError, "table #{number_or_name} not found"
     end
 
     # @private
@@ -330,6 +345,29 @@ module RobustExcelOle
       false
     end
 
+    # last_row, last_column:
+    # the last row and last column in a worksheet can be determined with help of
+    # UsedRange.SpecialCells and UsedRange.Rows/Columns
+    # both values can differ in certain cases:
+    # - if the worksheet contains a table, then UsedRange starts at the table, not in the first cell
+    #   therefore we use SpecialCells.
+    # - if the worksheet contains merged cells, then SpecialCells considers the merged cells only,
+    #   therefor we use UsedRange here.
+
+    # @private
+    def last_row
+      special_last_row = @ole_worksheet.UsedRange.SpecialCells(RobustExcelOle::XlLastCell).Row
+      used_last_row = @ole_worksheet.UsedRange.Rows.Count
+      [special_last_row, used_last_row].max
+    end
+
+    # @private
+    def last_column
+      special_last_column = @ole_worksheet.UsedRange.SpecialCells(RobustExcelOle::XlLastCell).Column
+      used_last_column = @ole_worksheet.UsedRange.Columns.Count
+      [special_last_column, used_last_column].max
+    end
+
     using ParentRefinement
     using StringRefinement
 
@@ -348,9 +386,24 @@ module RobustExcelOle
       self.class.workbook_class
     end
 
+    # @private
+    def self.listobject_class  
+      @listobject_class ||= begin
+        module_name = self.parent_name
+        "#{module_name}::ListObject".constantize        
+      rescue NameError => e
+        ListObject
+      end
+    end
+
+    # @private
+    def listobject_class        
+      self.class.listobject_class
+    end
+
     # @private
     def to_s    
-      '#<Worksheet: ' + (workbook.nil? ? 'not alive ' : (name + ' ' + File.basename(workbook.stored_filename)).to_s) + ">"
+      "#<Worksheet: #{(workbook.nil? ? "not alive " : (name + ' ' + File.basename(workbook.stored_filename)))}>"
     end
 
     # @private
@@ -363,39 +416,22 @@ module RobustExcelOle
   private
 
     def method_missing(name, *args)
-      if name.to_s[0,1] =~ /[A-Z]/
-        if ::ERRORMESSAGE_JRUBY_BUG 
-          begin
-            @ole_worksheet.send(name, *args)
-          rescue Java::OrgRacobCom::ComFailException 
-            raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
-          end
-        else
-          begin
-            @ole_worksheet.send(name, *args)
-          rescue NoMethodError 
-            raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
-          end
+      super unless name.to_s[0,1] =~ /[A-Z]/
+      if ::ERRORMESSAGE_JRUBY_BUG 
+        begin
+          @ole_worksheet.send(name, *args)
+        rescue Java::OrgRacobCom::ComFailException 
+          raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
         end
       else
-        super
+        begin
+          @ole_worksheet.send(name, *args)
+        rescue NoMethodError 
+          raise VBAMethodMissingError, "unknown VBA property or method #{name.inspect}"
+        end
       end
     end
-
-    def last_row
-      special_last_row = @ole_worksheet.UsedRange.SpecialCells(RobustExcelOle::XlLastCell).Row
-      used_last_row = @ole_worksheet.UsedRange.Rows.Count
-
-      special_last_row >= used_last_row ? special_last_row : used_last_row
-    end
-
-    def last_column
-      special_last_column = @ole_worksheet.UsedRange.SpecialCells(RobustExcelOle::XlLastCell).Column
-      used_last_column = @ole_worksheet.UsedRange.Columns.Count
-
-      special_last_column >= used_last_column ? special_last_column : used_last_column
-    end
-
+    
   end
 
   public