robust_excel_ole 1.19.9 → 1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7148da566c7571df574a54fe8f1fe027f93bcf216e9060951e1ab9318aa68f2b
-  data.tar.gz: 3c859955ee4ef1a6b3bc71159173c9074388f6bba7a11f071fa253dd520d4521
+  metadata.gz: 1cbad43d74758e37eb8e8d17e0297ead9f7cda838f5a157832145d41bacb743a
+  data.tar.gz: 80a112947a96132e8f8bb5ccccdccace4b7c1227418475aac51d6aa771b2e876
 SHA512:
-  metadata.gz: 7030d95eb00cdc12f2b9d762fbf924422b7a6ffe2f098bbd9c03b8e7acad560c9828756e0cc09ca384af8bb625cf3efacb9ec51b56aa1479d7f383eade83baa8
-  data.tar.gz: c4c61ae7e2122e8ab98d77f32b188b28f7c230f60fd3be4287e55d35cb9966b30f7492aaa0c8af87e89c048280fbca3de44966e52c83ccc83a9884429e1eb40d
+  metadata.gz: 4983b1d7e31e09873bf70e9903e3bdcd7a438e238283c5f2bae9198b5ed53c83fd5726f55b7e9ad4559b820dca65f2c82cb82f85091b199f4b58adfa98064c6b
+  data.tar.gz: 6c1c920de4c68699a10e87241121a01e66884317f06ad8ce9962b049c024658b797e014ef0aaaa297287065e80d85514d384925f24412bf1175aa8d97c252865

data/Changelog

@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 
 
-## [1.20] 2020-12-07
+## [1.20] 2020-14-07
 
 ### Changed
   - using pry in console

data/README.rdoc

@@ -11,7 +11,7 @@ It supports handling workbooks across Excel instances by keeping track of workbo
 
 Library references are supported.
 
-RobustExcelOle works by sending VBA methods via Win32OlE. 
+RobustExcelOle works by sending VBA methods via WIN32OlE. 
 Therefore, it runs on Windows only.
 
 == Features
@@ -77,10 +77,10 @@ Let's open a workbook.
 
   workbook = Workbook.open 'spec/data/workbook.xls'
 
-Now we have a Workbook object that wraps a WIN32OLE object. That is, you can send any WIN32OLE (VBA) method to it. See 
+Now we have a Workbook object that wraps a WIN32OLE object. That is, we can send any WIN32OLE (VBA) method to it. See 
 https://docs.microsoft.com/en-us/office/vba/api/excel.workbook#methods.
 
-For example, you can determine the name of the workbook.
+For example, we can determine the name of the workbook.
 
   workbook.Name 
   # => "workbook.xls"
@@ -122,11 +122,11 @@ RobustExcelOle allows unobtrusively reading and modifying workbooks, i.e. access
     # do something
   end
 
-You can also create a new, empty workbook. 
+We can also create a new, empty workbook. 
 
   Workbook.create('spec/data/new_workbook.xls', :visible => true)
 
-Moreover, you can open the workbook using a block, similar to, e.g., +File.open+. 
+Moreover, we can open the workbook using a block, similar to, e.g., +File.open+. 
 
   Workbook.open('spec/data/workbook.xls') do |workbook|
     # do something
@@ -318,7 +318,9 @@ and set another value to that range.
 
 For more details about reading and writing contents of cells and ranges see {README_ranges}[https://github.com/Thomas008/robust_excel_ole/blob/master/docs/README_ranges.rdoc]
 
-=== Reading and writing list objects
+=== List Objects
+
+=== Creating list objects
 
 We can define a list object (or table) from scratch.
 
@@ -326,25 +328,115 @@ We can define a list object (or table) from scratch.
 
 This command creates a list object in worksheet named "table 1", with upper left corner at position [1,1] (first cell), with 3 rows and the columns "Person" and "Amount".
 
-A row in this table can be accessed with help of [], e.g.
+Likewise we can get a RobustExcelOle list object with help of an existing WIN32OlE list object.
+
+  ole_listobject = worksheet.ListObjects.Item("Table 1")
+  table = ListObject.new(ole_listobject)
+
+or
+
+  table = ole_listobject.to_reo
 
-  table[1]
+Now we have a RobustExcelOle ListObject that wraps a WIN32OLE ListObject. So we can send any WIN32OLE (VBA) method to it. See 
+https://docs.microsoft.com/en-us/office/vba/api/excel.listobject#methods.
 
-Now we can set and get the value of a cell of the table, e.g.
+A row in this table can be accessed with help of #[], e.g.
 
-  table[1].person = "John"
-  table[1].person
+  row1 = table[1]
+
+=== Reading and setting values
+
+Now we can set and get the value of a cell of the table with help of methods that are underscored versions of the column names, e.g.
+
+  row1.person = "John"
+  row1.person
   # => "John"
 
-Likewise we can get a table with help of an existing Win32OlE table.
+We can also read and set values in a whole row, e.g.
 
-  ole_listobject = worksheet.ListObjects.Item("Table 1")
-  table = ListObject.new(ole_listobject)
+  table.row_values(1)
+  # => ["John", 40]
+
+or
+
+  table[1].values
+  # => ["John", 40]
+
+and
+
+  table.set_row_values(1, ["Herbert", 80])
+  # => ["Herbert", 80]
+
+or
+
+  table[1].set_values(["Herbert", 80])
+
+If the number of given values is less than the number of cells in the row, only the first values are written. The remaining values keep their value.  
+
+Similarly, we can read and set the values in a whole column, e.g.
+
+  table.column_values("Person")
+  # => ["John", "Peter"]
+
+and 
+
+  table.set_column_values(1, ["Herbert","Paul"])
+
+The column names we can get with help of
+
+  table.column_names
+
+A column can be renamed.
+
+  table.rename_column("Person", "Enterprise")
+
+or 
+
+  table.rename_column(1, "Enterprise")
+
+=== Adding and Deleting rows and columns
+
+We can add rows and columns, supplying optionally their name, the position and contents. 
+
+  table.add_column("column_name")
+  table.add_column("column_name", 3)
+  table.add_column("column_name", 3, ["John", "Paul"])
+  
+  table.add_row(3)
+  table.add_row(3, ["John", 40, 2, 2004])
+
+Deleting columns and rows is done by
+
+  table.delete_column("column_name")
+  table.delete_row(3)
+
+We can delete only the contents of a column
+
+  table.delete_column_values("column_name")
+
+Similarly can delete only the contents of a row.
+
+  table.delete_row_values(2)
+
+or 
+
+  table[2].delete_values
+
+Finally we can delete empty rows and columns.
+
+  table.delete_empty_rows
+  table.delete_empty_columns
+
+=== Finding values and sorting 
+
+You can find all cells containing a given value, e.g.
+
+  table.find_value(value)
+  #=> [#<Cell: (5,8)>#, #<Cell: (9,6)>#]
+
+You can sort a table according to a given column and sort order, e.g.
 
-   r4 = t4[1]
-r4.person
-# =>
-r.person = "John"
+  table.sort("Person", :ascending)
 
 === More things
 

data/bin/jreo

@@ -1,3 +1,24 @@
-@echo off
+#!/usr/bin/env jruby
+# -*- jruby -*-
 
-jruby ../lib/reo_console.rb
+require 'pry'
+require 'robust_excel_ole'
+
+include REO
+include General
+
+puts 'REO console started'
+puts 
+
+# some pry configuration
+Pry.config.windows_console_warning = false
+Pry.config.history.should_save = true
+Pry.config.color = false
+#Pry.editor = 'notepad'  # 'subl', 'vi'
+#Pry.config.prompt =
+#  [
+#    ->(_obj, _nest_level, _) { ">> " },
+#    ->(*) { "  " }
+#  ]
+
+pry

data/bin/{reo.rb → reo}

@@ -1,5 +1,8 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+
 require 'pry'
-require '../lib/robust_excel_ole'
+require 'robust_excel_ole'
 
 include REO
 include General

data/lib/reo_console.rb

@@ -1,5 +1,5 @@
 require 'pry'
-require 'robust_excel_ole'
+require '../robust_excel_ole/lib/robust_excel_ole'
 
 include REO
 include General

data/lib/robust_excel_ole/cell.rb

@@ -24,6 +24,16 @@ module RobustExcelOle
       @ole_range = @ole_range.MergeArea.Item(1,1) if @ole_range.MergeCells
     end
 
+    # @private
+    def to_s    
+      @ole_table.Name.to_s
+    end
+
+    # @private
+    def inspect    
+      "#<Cell:" + " (#{@ole_range.Row},#{@ole_range.Column})" + ">#" 
+    end
+
   private
 
     # @private

data/lib/robust_excel_ole/general.rb

@@ -10,28 +10,77 @@ module General
   ::CONNECT_EXCEL_JRUBY_BUG      = IS_JRUBY_PLATFORM && true
   ::RANGES_JRUBY_BUG       = IS_JRUBY_PLATFORM && true
 
+  NetworkDrive = Struct.new(:drive_letter, :network_name) do
+
+    def self.get_all(drives)
+      ndrives = []
+      count = drives.Count
+      (0..(count - 1)).step(2) do |i|
+        ndrives << NetworkDrive.new( drives.Item(i), drives.Item(i + 1))
+      end
+      ndrives
+    end
+
+  end
+
   @private
   def network2hostnamesharepath(filename)
     network = WIN32OLE.new('WScript.Network')
     drives = network.enumnetworkdrives
-    drive_letter, filename_after_drive_letter = filename.split(':') 
-    # if filename starts with a drive letter not c and this drive exists,
-    # then determine the corresponding host_share_path
-    default_drive = File.absolute_path(".")[0]
-    if drive_letter != default_drive && drive_letter != filename  
-      for i in 0 .. drives.Count-1
-        next if i % 2 == 1
-        if drives.Item(i).gsub(':','') == drive_letter
-          hostname_share = drives.Item(i+1)  #.gsub('\\','/').gsub('//','')
-          break
-        end
-      end
-      hostname_share + filename_after_drive_letter if hostname_share
-    else
-      return filename
+    drive_letter, filename_after_drive_letter = filename.split(':')
+    drive_letter = normalize_drive_letter(drive_letter)
+    network_drives = NetworkDrive.get_all(drives)
+    network_drive = network_drives.find{ |d| d.drive_letter == drive_letter }
+    return filename unless network_drive
+    return network_drive.network_name + filename_after_drive_letter
+  end
+
+  def self.normalize_drive_letter(drive)
+    drive.upcase.end_with?(':') ? drive : "#{drive}:"
+  end
+
+  
+=begin
+  NetworkDrive = Struct.new(:drive_letter, :network_name)
+
+  @private
+  def network2hostnamesharepath(filename)
+    puts "network2hostnamesharepath:"
+    puts "filename: #{filename}"
+    network = WIN32OLE.new('WScript.Network')
+    drives = network.enumnetworkdrives
+    puts "drives: #{drives.inspect}"
+    drive_letter, filename_after_drive_letter = filename.split(':')
+    puts "drive_letter: #{drive_letter.inspect}"
+    puts "filename_after_drive_letter: #{filename_after_drive_letter.inspect}"
+    drive_letter = normalize_drive_letter(drive_letter)
+    puts "drive_letter: #{drive_letter.inspect}"
+    network_drives = get_network_drives
+    puts "network_drives: #{network_drives.inspect}"
+    network_drive = network_drives.find{ |d| d.drive_letter == drive_letter }
+    puts "network_drive: #{network_drive.inspect}"
+    return filename unless network_drive
+    #return (File.exists?(filename) ? filename : nil) unless network_drive 
+    return network_drive.network_name + filename_after_drive_letter
+  end
+
+  def get_network_drives
+    network = WIN32OLE.new('WScript.Network')
+    drives = network.enumnetworkdrives
+    ndrives = []
+    count = drives.Count
+    (0..(count - 1)).step(2) do |i|
+      ndrives << NetworkDrive.new( drives.Item(i), drives.Item(i + 1))
     end
+    ndrives
   end
 
+  def normalize_drive_letter(drive)
+    drive.upcase.end_with?(':') ? drive : "#{drive}:"
+  end
+
+=end
+
   # @private
   def absolute_path(file)     
     file[0,2] = './' if ::EXPANDPATH_JRUBY_BUG && file  =~ /[A-Z]:[^\/]/
@@ -44,11 +93,12 @@ module General
   def canonize(filename)
     raise TypeREOError, "No string given to canonize, but #{filename.inspect}" unless filename.is_a?(String)
     filename = network2hostnamesharepath(filename)
-    normalize(filename).downcase
+    normalize(filename).downcase if filename
   end
 
   # @private
-  def normalize(path)      
+  def normalize(path)  
+    return unless path    
     path = path.gsub('/./', '/') + '/'
     path = path.gsub(/[\/\\]+/, '/')
     nil while path.gsub!(/(\/|^)(?!\.\.?)([^\/]+)\/\.\.\//, '\1')
@@ -90,9 +140,19 @@ class Array
     end
   end
 
+  def find_each_index find
+    found, index, q = -1, -1, []
+    while found
+      found = self[index+1..-1].index(find)
+      if found
+        index = index + found + 1
+        q << index
+      end
+    end
+    q
+  end
 end
 
-
 # @private
 class WIN32OLE
 
@@ -113,7 +173,7 @@ class WIN32OLE
       begin
         self.send(method)
         if classname == RobustExcelOle::Range && self.Rows.Count == 1 && self.Columns.Count == 1
-          return Cell.new(self)
+          return Cell.new(self, self.Parent)
         else
           return classname.new(self)
         end

data/lib/robust_excel_ole/list_object.rb

@@ -58,6 +58,63 @@ module RobustExcelOle
         def initialize(row_number)
           @ole_listrow = @@ole_table.ListRows.Item(row_number)
         end
+
+        # returns the value of the cell with given column name or number
+        # @param [Variant]  column number or column name
+        # @return [Variant] value of the cell 
+        def [] column_number_or_name
+          begin
+            ole_cell = @@ole_table.Application.Intersect(
+              @ole_listrow.Range, @@ole_table.ListColumns.Item(column_number_or_name).Range)
+            ole_cell.Value
+          rescue WIN32OLERuntimeError
+            raise TableRowError, "could not determine the value at column #{column_number_or_name}"
+          end
+        end
+
+
+        def []=(column_number_or_name, value)
+          begin
+            ole_cell = @@ole_table.Application.Intersect(
+              @ole_listrow.Range, @@ole_table.ListColumns.Item(column_number_or_name).Range)
+            ole_cell.Value = value
+          rescue WIN32OLERuntimeError
+            raise TableRowError, "could not assign value #{value.inspect} to cell at column #{column_number_or_name}"
+          end
+        end
+
+        # values of the row
+        # @return [Array] values of the row
+        def values
+          begin
+            @ole_listrow.Range.Value.first
+          rescue WIN32OLERuntimeError
+            raise TableError, "could not read values"
+          end
+        end
+
+        # sets the values of the row
+        # @param [Array] values of the row
+        def set_values values
+          begin
+            updated_values = self.values
+            updated_values[0,values.length] = values
+            @ole_listrow.Range.Value = [updated_values]
+            values
+          rescue WIN32OLERuntimeError
+            raise TableError, "could not set values #{values.inspect}"
+          end
+        end
+
+        # deletes the values of the row
+        def delete_values
+          begin
+            @ole_listrow.Range.Value = [[].fill(nil,0..(@@ole_table.ListColumns.Count)-1)]
+            nil
+          rescue WIN32OLERuntimeError
+            raise TableError, "could not delete values"
+          end
+        end
        
         def method_missing(name, *args)
           name_before_last_equal = name.to_s.split('=').first
@@ -66,7 +123,7 @@ module RobustExcelOle
           column_name = column_names[method_names.index(name_before_last_equal)]
           if column_name
             ole_cell = @@ole_table.Application.Intersect(
-              @ole_listrow.Range, @@ole_table.ListColumns(column_name).Range)
+              @ole_listrow.Range, @@ole_table.ListColumns.Item(column_name).Range)
             define_getting_setting_method(ole_cell,name.to_s)            
             self.send(name, *args)
           else
@@ -98,8 +155,198 @@ module RobustExcelOle
 
     end
 
+    # @return [Array] a list of column names
     def column_names
-      @ole_table.HeaderRowRange.Value.first
+      begin
+        @ole_table.HeaderRowRange.Value.first
+      rescue WIN32OLERuntimeError
+        raise TableError, "could not determine column names"
+      end
+    end
+
+    # adds a row
+    # @param [Integer] position of the new row
+    # @param [Array]   values of the column
+    def add_row(position = nil, contents = nil)
+      begin
+        @ole_table.ListRows.Add(position)
+        set_row_values(position, contents) if contents
+      rescue WIN32OLERuntimeError
+        raise TableError, ("could not add row" + (" at position #{position.inspect}" if position))
+      end
+    end
+
+    # adds a column    
+    # @param [String]  name of the column
+    # @param [Integer] position of the new column
+    # @param [Array]   values of the column
+    def add_column(column_name = nil, position = nil, contents = nil)
+      begin
+        new_column = @ole_table.ListColumns.Add(position)
+        new_column.Name = column_name if column_name
+        set_column_values(column_name, contents) if contents
+      rescue WIN32OLERuntimeError, TableError
+        raise TableError, ("could not add column"+ ("at position #{position.inspect} with name #{column_name.inspect}" if position))
+      end
+    end
+
+    # deletes a row
+    # @param [Integer] position of the old row
+    def delete_row(row_number)
+      begin
+        @ole_table.ListRows.Item(row_number).Delete
+      rescue WIN32OLERuntimeError
+        raise TableError, "could not delete row #{row_number.inspect}"
+      end
+    end
+
+    # deletes a column
+    # @param [Variant] column number or column name
+    def delete_column(column_number_or_name)
+      begin
+        @ole_table.ListColumns.Item(column_number_or_name).Delete
+      rescue WIN32OLERuntimeError
+        raise TableError, "could not delete column #{column_number_or_name.inspect}"
+      end
+    end
+
+    # deletes the contents of a row
+    # @param [Integer] row number
+    def delete_row_values(row_number)
+      begin
+        @ole_table.ListRows.Item(row_number).Range.Value = [[].fill(nil,0..(@ole_table.ListColumns.Count-1))]
+        nil
+      rescue WIN32OLERuntimeError
+        raise TableError, "could not delete contents of row #{row_number.inspect}"
+      end
+    end
+
+    # deletes the contents of a column
+    # @param [Variant] column number or column name
+    def delete_column_values(column_number_or_name)
+      begin
+        column_name = @ole_table.ListColumns.Item(column_number_or_name).Range.Value.first
+        @ole_table.ListColumns.Item(column_number_or_name).Range.Value = [column_name] + [].fill([nil],0..(@ole_table.ListRows.Count-1))
+        nil
+      rescue WIN32OLERuntimeError
+        raise TableError, "could not delete contents of column #{column_number_or_name.inspect}"
+      end
+    end
+
+    # renames a row
+    # @param [String] previous name or number of the column
+    # @param [String] new name of the column   
+    def rename_column(name_or_number, new_name)
+      begin
+        @ole_table.ListColumns.Item(name_or_number).Name = new_name
+      rescue
+        raise TableError, "could not rename column #{name_or_number.inspect} to #{new_name.inspect}"
+      end
+    end
+
+    # contents of a row
+    # @param [Integer] row number
+    # @return [Array] contents of a row
+    def row_values(row_number)
+      begin
+        @ole_table.ListRows.Item(row_number).Range.Value.first
+      rescue WIN32OLERuntimeError
+        raise TableError, "could not read the values of row #{row_number.inspect}"
+      end
+    end
+
+    # sets the contents of a row
+    # @param [Integer] row number
+    # @param [Array]   values of the row
+    def set_row_values(row_number, values)
+      begin
+        updated_values = row_values(row_number)
+        updated_values[0,values.length] = values
+        @ole_table.ListRows.Item(row_number).Range.Value = [updated_values]
+        values
+      rescue WIN32OLERuntimeError
+        raise TableError, "could not set the values of row #{row_number.inspect}"
+      end
+    end
+
+    # @return [Array] contents of a column
+    def column_values(column_number_or_name)
+      begin
+        @ole_table.ListColumns.Item(column_number_or_name).Range.Value[1,@ole_table.ListRows.Count].flatten
+      rescue WIN32OLERuntimeError
+        raise TableError, "could not read the values of column #{column_number_or_name.inspect}"
+      end
+    end
+
+    # sets the contents of a column
+    # @param [Integer] column name or column number
+    # @param [Array]   contents of the column
+    def set_column_values(column_number_or_name, values)
+      begin
+        updated_values = column_values(column_number_or_name)
+        updated_values[0,values.length] = values
+        column_name = @ole_table.ListColumns.Item(column_number_or_name).Range.Value.first
+        @ole_table.ListColumns.Item(column_number_or_name).Range.Value = column_name + updated_values.map{|v| [v]}
+        values
+      rescue WIN32OLERuntimeError
+        raise TableError, "could not read the values of column #{column_number_or_name.inspect}"
+      end
+    end
+
+    # deletes rows that have an empty contents
+    def delete_empty_rows
+      listrows = @ole_table.ListRows
+      nil_array = [[].fill(nil,0..(@ole_table.ListColumns.Count-1))]
+      i = 1
+      while i <= listrows.Count do 
+        row = listrows.Item(i)
+        if row.Range.Value == nil_array
+          row.Delete
+        else
+          i = i+1
+        end
+      end
+    end
+
+    # deletes columns that have an empty contents
+    def delete_empty_columns
+      listcolumns = @ole_table.ListColumns
+      nil_array = [].fill([nil],0..(@ole_table.ListRows.Count-1))
+      i = 1
+      while i <= listcolumns.Count do 
+        column = listcolumns.Item(i)
+        if column.Range.Value[1..-1] == nil_array
+          column.Delete
+        else
+          i = i+1
+        end
+      end
+    end
+
+    # finds all cells containing a given value
+    # @param[Variant] value to find
+    # @return [Array] win32ole cells containing the given value
+    def find_cells(value)
+      listrows = @ole_table.ListRows      
+      result = []
+      (1..listrows.Count).each do |row_number|
+        row_values(row_number).find_each_index(value).each do |col_number|
+          result << @ole_table.Application.Intersect(listrows.Item(row_number).Range, 
+                                                     @ole_table.ListColumns.Item(col_number+1).Range).to_reo
+        end
+      end
+      result
+    end
+
+    # sorts the rows of the list object according to the given column
+    # @param [Variant] column number or name
+    # @option opts [Symbol]   sort order
+    def sort(column_number_or_name, sort_order = :ascending)
+      key_range = @ole_table.ListColumns.Item(column_number_or_name).Range
+      @ole_table.Sort.SortFields.Clear
+      sort_order_option = sort_order == :ascending ? XlAscending : XlDescending
+      @ole_table.Sort.SortFields.Add(key_range, XlSortOnValues,sort_order_option,XlSortNormal)
+      @ole_table.Sort.Apply
     end
 
     # @private
@@ -110,8 +357,8 @@ module RobustExcelOle
     # @private
     def inspect    
       "#<ListObject:" + "#{@ole_table.Name}" + 
-      " size:#{@ole_table.ListRows.Count}x#{@ole_table.ListColumns.Count}" +
-      " worksheet:#{@ole_table.Parent.Name}" + " workbook:#{@ole_table.Parent.Parent.Name}" + ">"
+      " #{@ole_table.ListRows.Count}x#{@ole_table.ListColumns.Count}" +
+      " #{@ole_table.Parent.Name}" + " #{@ole_table.Parent.Parent.Name}" + ">"
     end
 
   private
@@ -141,6 +388,10 @@ module RobustExcelOle
   class TableError < WorksheetREOError
   end
 
+  # @private
+  class TableRowError < WorksheetREOError
+  end
+
   Table = ListObject
   TableRow = ListRow
 

data/lib/robust_excel_ole/version.rb

@@ -1,3 +1,3 @@
 module RobustExcelOle
-  VERSION = "1.19.9"
+  VERSION = "1.20"
 end

data/lib/robust_excel_ole/workbook.rb

@@ -97,6 +97,9 @@ module RobustExcelOle
       when String
         file = file_or_workbook
         raise FileNotFound, "file #{General.absolute_path(file).inspect} is a directory" if File.directory?(file)
+      when ->(n){ n.respond_to? :to_path }
+        file = file_or_workbook.to_path
+        raise FileNotFound, "file #{General.absolute_path(file).inspect} is a directory" if File.directory?(file)
       else
         raise TypeREOError, 'given object is neither a filename, a Win32ole, nor a Workbook object'
       end

data/spec/bookstore_spec.rb

@@ -59,7 +59,7 @@ describe Bookstore do
     @file_path = "spec/data/workbook.xls"
     @absolute_file_path = "C:/gim/ats/aSrc/gems/robust_excel_ole/spec/data/workbook.xls"
     @network_path = "N:/data/workbook.xls"
-    @hostname_share_path = "DESKTOP-A3C5CJ6/spec/workbook.xls"
+    @hostname_share_path = "DESKTOP-A3C5CJ6/spec/data/workbook.xls"
   end
 
   after do

data/spec/general_spec.rb

@@ -29,6 +29,10 @@ module RobustExcelOle
       @linked_file = @dir + '/workbook_linked.xlsm'
       @simple_file_xlsm = @dir + '/workbook.xls'
       @simple_file_xlsx = @dir + '/workbook.xlsx'
+      @network_path = "N:/data/workbook.xls"
+      @hostname_share_path = "//DESKTOP-A3C5CJ6/spec/data/workbook.xls"
+      @simple_file_extern = "D:/data/workbook.xls"
+      @hostname_share_path = "//DESKTOP-A3C5CJ6/spec/data/workbook.xls"
     end
 
     after do
@@ -186,7 +190,7 @@ module RobustExcelOle
           filename = 'C:/Dokumente und Einstellungen/Zauberthomas/Eigene Dateien/robust_excel_ole/spec/book_spec.rb'
           absolute_path(filename).gsub("\\","/").should == filename
         end
-      end
+      end      
     end
 
     describe "canonize" do
@@ -230,6 +234,14 @@ module RobustExcelOle
           }.to raise_error(TypeREOError, "No string given to canonize, but 1")
         end
 
+        it "should yield the hostname share path" do
+          General.canonize(@network_path).should == normalize(@hostname_share_path).downcase
+          General.canonize(@hostname_share_path).should == normalize(@hostname_share_path).downcase
+          General.canonize(@simple_file).should == normalize(@simple_file).downcase
+          General.canonize(@simple_file_extern).should == normalize(@simple_file_extern).downcase
+        end
+
+
       end
     end
 

data/spec/list_object_spec.rb

@@ -45,7 +45,7 @@ describe ListObject do
         ole_table = @sheet.ListObjects.Item(1)
         table = Table.new(ole_table)
         table.Name.should == "table3"
-        table.HeaderRowRange.Value.first.should == ["Number","Person","Amount","Time","Date"]
+        table.HeaderRowRange.Value.first.should == ["Number","Person","Amount","Time","Price"]
         table.ListRows.Count.should == 6
         @sheet[3,4].Value.should == "Number"
       end
@@ -54,7 +54,7 @@ describe ListObject do
         ole_table = @sheet.ListObjects.Item(1)
         table = Table.new(@sheet, "table3")
         table.Name.should == "table3"
-        table.HeaderRowRange.Value.first.should == ["Number","Person","Amount","Time","Date"]
+        table.HeaderRowRange.Value.first.should == ["Number","Person","Amount","Time","Price"]
         table.ListRows.Count.should == 6
         @sheet[3,4].Value.should == "Number"
       end
@@ -63,7 +63,7 @@ describe ListObject do
         ole_table = @sheet.ListObjects.Item(1)
         table = Table.new(@sheet, 1)
         table.Name.should == "table3"
-        table.HeaderRowRange.Value.first.should == ["Number","Person","Amount","Time","Date"]
+        table.HeaderRowRange.Value.first.should == ["Number","Person","Amount","Time","Price"]
         table.ListRows.Count.should == 6
         @sheet[3,4].Value.should == "Number"
       end
@@ -80,7 +80,7 @@ describe ListObject do
         ole_table = @sheet.ListObjects.Item(1)
         table = Table.new(@sheet.ole_worksheet, "table3")
         table.Name.should == "table3"
-        table.HeaderRowRange.Value.first.should == ["Number","Person","Amount","Time","Date"]
+        table.HeaderRowRange.Value.first.should == ["Number","Person","Amount","Time","Price"]
         table.ListRows.Count.should == 6
         @sheet[3,4].Value.should == "Number"
       end
@@ -89,7 +89,7 @@ describe ListObject do
         ole_table = @sheet.ListObjects.Item(1)
         table = Table.new(@sheet.ole_worksheet, 1)
         table.Name.should == "table3"
-        table.HeaderRowRange.Value.first.should == ["Number","Person","Amount","Time","Date"]
+        table.HeaderRowRange.Value.first.should == ["Number","Person","Amount","Time","Price"]
         table.ListRows.Count.should == 6
         @sheet[3,4].Value.should == "Number"
       end
@@ -117,6 +117,7 @@ describe ListObject do
         @table_row1.amount.should == 42
         @sheet[2,2].Value.should == 42
       end
+
     end
 
     context "with type-lifted ole list object" do
@@ -132,12 +133,216 @@ describe ListObject do
         @table_row1.number = 1
         @table_row1.number.should == 1
         @sheet[4,4].Value.should == 1
-        @table_row1.person.should == "Herbert"
-        @table_row1.person = "John"
         @table_row1.person.should == "John"
-        @sheet[4,5].Value.should == "John"
+        @table_row1.person = "Herbert"
+        @table_row1.person.should == "Herbert"
+        @sheet[4,5].Value.should == "Herbert"
       end
     end
 
   end
+
+  describe "reading and setting contents of rows and columns" do
+
+    before do
+      ole_table = @sheet.ListObjects.Item(1)
+      @table = Table.new(ole_table)
+    end
+
+    it "should read contents of a column" do
+      @table.column_values("Person").should == ["John","Fred",nil,"Angel",nil,"Werner"]
+      expect{
+        @table.column_values("P")
+      }.to raise_error(TableError)
+    end
+
+    it "should set contents of a column" do
+      @table.set_column_values("Person",["H",nil,nil,nil,"G","W"])
+      @table.ListColumns.Item(2).Range.Value.should == [["Person"],["H"],[nil],[nil],[nil],["G"],["W"]]
+      @table.set_column_values("Person",["T","Z"])
+      @table.ListColumns.Item(2).Range.Value.should == [["Person"],["T"],["Z"],[nil],[nil],["G"],["W"]]
+      expect{
+        @table.set_column_values("P",["H",nil,nil,nil,"G","W"])
+      }.to raise_error(TableError)
+    end
+
+    it "should read contents of a row" do
+      @table.row_values(1).should == [3.0, "John", 50.0, 0.5, 30]
+      @table[1].values.should == [3.0, "John", 50.0, 0.5, 30]
+      expect{
+        @table.row_values(9)
+      }.to raise_error(TableError)
+    end
+
+    it "should set contents of a row" do
+      @table.set_row_values(1, [5, "George", 30.0, 0.2, 50])
+      @table.ListRows.Item(1).Range.Value.first.should == [5, "George", 30.0, 0.2, 50]
+      @table.set_row_values(1, [6, "Martin"])
+      @table.ListRows.Item(1).Range.Value.first.should == [6, "Martin", 30.0, 0.2, 50]
+      @table[1].set_values([2, "Merlin", 20.0, 0.1, 40])
+      @table[1].set_values([4, "John"])
+      @table.ListRows.Item(1).Range.Value.first.should == [4, "John", 20.0, 0.1, 40]
+      expect{
+        @table.set_row_values(9, [5, "George", 30.0, 0.2, 50])
+      }.to raise_error(TableError)
+    end
+
+  end
+
+  describe "renaming, adding and deleting columns and rows" do
+
+    before do
+      ole_table = @sheet.ListObjects.Item(1)
+      @table = Table.new(ole_table)
+    end
+
+    it "should list column names" do
+      @table.column_names.should == @table.HeaderRowRange.Value.first
+    end
+
+    it "should rename a column name" do
+      @table.rename_column("Person", "P")
+      @table.HeaderRowRange.Value.first.should == ["Number","P","Amount","Time","Price"]
+    end
+
+    it "should append a column" do
+      @table.add_column("column_name")
+      column_names = @table.HeaderRowRange.Value.first.should == ["Number","Person", "Amount","Time","Price", "column_name"]
+    end
+
+    it "should add a column" do
+      @table.add_column("column_name", 3)
+      column_names = @table.HeaderRowRange.Value.first.should == ["Number","Person","column_name","Amount","Time","Price"]
+      expect{
+        @table.add_column(8, "column_name")
+      }.to raise_error(TableError)
+    end
+
+    it "should add a column with contents" do
+      @table.add_column("column_name", 3, ["a","b","c","d","e","f"])
+      column_names = @table.HeaderRowRange.Value.first.should == ["Number","Person","column_name","Amount","Time","Price"]
+      @table.ListColumns.Item(3).Range.Value.should == [["column_name"],["a"],["b"],["c"],["d"],["e"],["f"]]
+    end
+
+    it "should delete a column" do
+      @table.delete_column(4)
+      @table.HeaderRowRange.Value.first.should == ["Number","Person", "Amount","Price"]
+      expect{
+        @table.delete_column(6)
+      }.to raise_error(TableError)
+    end
+
+    it "should append a row" do
+      @table.add_row
+      listrows = @table.ListRows
+      listrows.Item(listrows.Count).Range.Value.first.should == [nil,nil,nil,nil,nil]
+    end
+
+    it "should add a row" do
+      @table.add_row(2)
+      listrows = @table.ListRows
+      listrows.Item(1).Range.Value.first.should == [3.0, "John", 50.0, 0.5, 30]
+      listrows.Item(2).Range.Value.first.should == [nil,nil,nil,nil,nil]
+      listrows.Item(3).Range.Value.first.should == [2.0, "Fred", nil, 0.5416666666666666, 40]
+      expect{
+        @table.add_row(9)
+      }.to raise_error(TableError)
+    end
+
+    it "should add a row with contents" do
+      @table.add_row(2, [2.0, "Herbert", 30.0, 0.25, 40])
+      listrows = @table.ListRows
+      listrows.Item(1).Range.Value.first.should == [3.0, "John", 50.0, 0.5, 30]
+      listrows.Item(2).Range.Value.first.should == [2.0, "Herbert", 30.0, 0.25, 40]
+      listrows.Item(3).Range.Value.first.should == [2.0, "Fred", nil, 0.5416666666666666, 40]
+    end
+
+    it "should delete a row" do
+      @table.delete_row(4)
+      listrows = @table.ListRows
+      listrows.Item(5).Range.Value.first.should == [1,"Werner",40,0.5, 80]
+      listrows.Item(4).Range.Value.first.should == [nil,nil,nil,nil,nil]
+      expect{
+        @table.delete_row(8)
+      }.to raise_error(TableError)
+    end
+
+    it "should delete the contents of a column" do
+      @table.ListColumns.Item(3).Range.Value.should == [["Amount"],[50],[nil],[nil],[100],[nil],[40]]
+      @table.delete_column_values(3)
+      @table.HeaderRowRange.Value.first.should == ["Number","Person", "Amount", "Time","Price"]
+      @table.ListColumns.Item(3).Range.Value.should == [["Amount"],[nil],[nil],[nil],[nil],[nil],[nil]]
+      @table.ListColumns.Item(1).Range.Value.should == [["Number"],[3],[2],[nil],[3],[nil],[1]]
+      @table.delete_column_values("Number")
+      @table.ListColumns.Item(1).Range.Value.should == [["Number"],[nil],[nil],[nil],[nil],[nil],[nil]]
+      expect{
+        @table.delete_column_values("N")
+      }.to raise_error(TableError)
+    end
+
+    it "should delete the contents of a row" do
+      @table.ListRows.Item(2).Range.Value.first.should == [2.0, "Fred", nil, 0.5416666666666666, 40]
+      @table.delete_row_values(2)
+      @table.ListRows.Item(2).Range.Value.first.should == [nil,nil,nil,nil,nil]
+      @table.ListRows.Item(1).Range.Value.first.should == [3.0, "John", 50.0, 0.5, 30]
+      @table[1].delete_values
+      @table.ListRows.Item(1).Range.Value.first.should == [nil,nil,nil,nil,nil]
+      expect{
+        @table.delete_row_values(9)
+      }.to raise_error(TableError)
+    end
+
+    it "should delete empty rows" do
+      @table.delete_empty_rows
+      @table.ListRows.Count.should == 4
+      @table.ListRows.Item(1).Range.Value.first.should == [3.0, "John", 50.0, 0.5, 30]
+      @table.ListRows.Item(2).Range.Value.first.should == [2.0, "Fred", nil, 0.5416666666666666, 40]
+      @table.ListRows.Item(3).Range.Value.first.should == [3, "Angel", 100, 0.6666666666666666, 60]
+      @table.ListRows.Item(4).Range.Value.first.should == [1,"Werner",40,0.5, 80]
+    end
+
+    it "should delete empty columns" do
+      @table.delete_column_values(4)
+      @table.ListColumns.Count.should == 5
+      @table.HeaderRowRange.Value.first.should == ["Number","Person", "Amount", "Time","Price"]
+      @table.delete_empty_columns
+      @table.ListColumns.Count.should == 4
+      @table.HeaderRowRange.Value.first.should == ["Number","Person", "Amount","Price"]
+    end
+  end
+
+  describe "find all cells of a given value" do
+
+    before do
+      ole_table = @sheet.ListObjects.Item(1)
+      @table = Table.new(ole_table)
+    end
+
+    it "should find all cells" do
+      cells = @table.find_cells(40)
+      cells[0].Row.should == 5
+      cells[0].Column.should == 8
+      cells[1].Row.should == 9
+      cells[1].Column.should == 6
+    end
+  
+  end
+
+  describe "sort the table" do
+
+    before do
+      ole_table = @sheet.ListObjects.Item(1)
+      @table = Table.new(ole_table)
+    end
+
+    it "should sort the table according to first table" do
+      @table.sort("Number")
+      @table.ListRows.Item(1).Range.Value.first.should == [1,"Werner",40,0.5, 80]
+      @table.ListRows.Item(2).Range.Value.first.should == [2, "Fred", nil, 0.5416666666666666, 40]     
+      @table.ListRows.Item(3).Range.Value.first.should == [3, "John", 50.0, 0.5, 30]
+      @table.ListRows.Item(4).Range.Value.first.should == [3, "Angel", 100, 0.6666666666666666, 60]
+    end
+
+  end
+
 end

data/spec/workbook_spec.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require File.join(File.dirname(__FILE__), './spec_helper')
+require 'pathname'
 
 $VERBOSE = nil
 
@@ -20,6 +21,7 @@ describe Workbook do
   before do
     @dir = create_tmpdir
     @simple_file = @dir + '/workbook.xls'
+    @pathname_file = Pathname(@dir) + 'workbook.xls'
     @simple_save_file = @dir + '/workbook_save.xls'
     @different_file = @dir + '/different_workbook.xls'
     @simple_file_other_path = @dir + '/more_data/workbook.xls'
@@ -47,6 +49,16 @@ describe Workbook do
         @book.close
       end
     end
+
+    context "with pathname" do
+      it "open an existing file" do
+        expect {
+          @book = Workbook.open(@pathname_file)
+        }.to_not raise_error
+        @book.should be_a Workbook
+        @book.close
+      end
+    end
   end
 
   describe "Book" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust_excel_ole
 version: !ruby/object:Gem::Version
-  version: 1.19.9
+  version: '1.20'
 platform: ruby
 authors:
 - traths
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-12 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -49,8 +49,7 @@ email:
 - Thomas.Raths@gmx.net
 executables:
 - jreo
-- reo.rb
-- reo_old
+- reo
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -80,8 +79,7 @@ files:
 - benchmarking/simple_xlsx_reader_example.rb
 - benchmarking/spreadsheet_example.rb
 - bin/jreo
-- bin/reo.rb
-- bin/reo_old
+- bin/reo
 - docs/README_excel.rdoc
 - docs/README_open.rdoc
 - docs/README_ranges.rdoc

data/bin/reo_old

@@ -1,3 +0,0 @@
-@echo off
-
-ruby ../lib/reo_console.rb