robust_excel_ole 1.19.10 → 1.21

data/lib/robust_excel_ole/version.rb

@@ -1,3 +1,3 @@
 module RobustExcelOle
-  VERSION = "1.19.10"
+  VERSION = "1.21"
 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
@@ -1001,7 +1004,7 @@ module RobustExcelOle
 
     # @private
     def inspect    
-      '#<Workbook: ' + ('not alive ' unless alive?).to_s + (File.basename(self.filename) if alive?).to_s + " #{@ole_workbook} #{@excel}" + '>'
+      '#<Workbook: ' + ('not alive ' unless alive?).to_s + (File.basename(self.filename) if alive?).to_s + " #{@excel}" + '>'
     end
 
     # @private

data/lib/robust_excel_ole/worksheet.rb

@@ -14,6 +14,8 @@ module RobustExcelOle
     attr_reader :ole_worksheet
     attr_reader :workbook
 
+    alias ole_object ole_worksheet
+
     def initialize(win32_worksheet)
       @ole_worksheet = win32_worksheet
       if @ole_worksheet.ProtectContents
@@ -224,6 +226,16 @@ module RobustExcelOle
         self.Name == other_worksheet.Name
     end
 
+    # @private
+    # returns true, if the worksheet object responds to VBA methods, false otherwise
+    def alive?
+      @ole_worksheet.UsedRange
+      true
+    rescue
+      # trace $!.message
+      false
+    end
+
     # @private
     def self.workbook_class  
       @workbook_class ||= begin
@@ -249,6 +261,8 @@ module RobustExcelOle
       self.to_s
     end
 
+    include MethodHelpers
+
   private
 
     def method_missing(name, *args)

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
@@ -103,20 +103,27 @@ describe ListObject do
     context "with new table" do
 
       before do
-        @table = Table.new(@sheet, "table_name", [1,1], 3, ["Person","Amount"])
+        @table = Table.new(@sheet, "table_name", [1,1], 3, ["Person","Amo%untSales"])
         @table_row1 = @table[1]
       end
 
-      it "should set and read values" do
+      it "should read and set values via alternative column names" do
         @table_row1.person.should be nil
         @table_row1.person = "John"
         @table_row1.person.should == "John"
         @sheet[2,1].Value.should == "John"
-        @table_row1.amount.should be nil
-        @table_row1.amount = 42
-        @table_row1.amount.should == 42
+        @table_row1.amount_sales.should be nil
+        @table_row1.amount_sales = 42
+        @table_row1.amount_sales.should == 42
         @sheet[2,2].Value.should == 42
+        @table_row1.Person = "Herbert"
+        @table_row1.Person.should == "Herbert"
+        @sheet[2,1].Value.should == "Herbert"
+        @table_row1.AmountSales = 80
+        @table_row1.AmountSales.should == 80
+        @sheet[2,2].Value.should == 80
       end
+
     end
 
     context "with type-lifted ole list object" do
@@ -132,12 +139,218 @@ 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
+      puts "cells[0]: #{[cells[0]]}"
+      p "cells[0]: #{[cells[0]]}"
+    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.10
+  version: '1.21'
 platform: ruby
 authors:
 - traths
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-12 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -49,7 +49,7 @@ email:
 - Thomas.Raths@gmx.net
 executables:
 - jreo
-- reo_old
+- reo
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -79,7 +79,7 @@ files:
 - benchmarking/simple_xlsx_reader_example.rb
 - benchmarking/spreadsheet_example.rb
 - bin/jreo
-- bin/reo_old
+- bin/reo
 - docs/README_excel.rdoc
 - docs/README_open.rdoc
 - docs/README_ranges.rdoc