robust_excel_ole 1.19.11 → 1.22

data/lib/robust_excel_ole/range.rb

@@ -8,14 +8,26 @@ module RobustExcelOle
   # See https://docs.microsoft.com/en-us/office/vba/api/excel.worksheet#methods
 
   class Range < VbaObjects
+
     include Enumerable
+    
     attr_reader :ole_range
     attr_reader :worksheet
 
+    alias ole_object ole_range
+
+
     def initialize(win32_range, worksheet = nil)
       @ole_range = win32_range
-      @worksheet = worksheet ? worksheet : worksheet_class.new(self.Parent)
-      #@worksheet = worksheet_class.new(self.Parent)
+      @worksheet = worksheet ? worksheet.to_reo : worksheet_class.new(self.Parent)
+    end
+
+    def rows
+      @rows ||= (1..@ole_range.Rows.Count)
+    end
+
+    def columns
+      @columns ||= (1..@ole_range.Columns.Count)
     end
 
     def each
@@ -43,7 +55,6 @@ module RobustExcelOle
     # @params [Range] a range
     # @returns [Array] the values
     def values(range = nil)
-      #result = map { |x| x.Value }.flatten
       result_unflatten = if !::RANGES_JRUBY_BUG
         map { |x| x.v }
       else
@@ -64,12 +75,10 @@ module RobustExcelOle
         if !::RANGES_JRUBY_BUG
           self.Value
         else
-          address_r1c1 = self.AddressLocal(true,true,XlR1C1)
-          row, col = address_tool.as_integer_ranges(address_r1c1)
           values = []
-          row.each do |r|
+          rows.each do |r|
             values_col = []
-            col.each{ |c| values_col << worksheet.Cells(r,c).Value}
+            columns.each{ |c| values_col << worksheet.Cells(r,c).Value}
             values << values_col
           end
           values
@@ -85,10 +94,8 @@ module RobustExcelOle
         if !::RANGES_JRUBY_BUG
           ole_range.Value = value
         else
-          address_r1c1 = ole_range.AddressLocal(true,true,XlR1C1)
-          row, col = address_tool.as_integer_ranges(address_r1c1)
-          row.each_with_index do |r,i|
-            col.each_with_index do |c,j|
+          rows.each_with_index do |r,i|
+            columns.each_with_index do |c,j|
               ole_range.Cells(i+1,j+1).Value = (value.respond_to?(:first) ? value[i][j] : value)
             end
           end
@@ -106,128 +113,58 @@ module RobustExcelOle
     # @params [Address or Address-Array] address or upper left position of the destination range
     # @options [Worksheet] the destination worksheet
     # @options [Hash] options: :transpose, :values_only
-    def copy(dest_address1, sheet_or_dest_address2 = :__not_provided, options_or_sheet = :__not_provided, not_provided_or_options = :__not_provided)
-      dest_address = if sheet_or_dest_address2.is_a?(Object::Range) or sheet_or_dest_address2.is_a?(Integer)
-        [dest_address1,sheet_or_dest_address2] 
-      else
-        dest_address1
-      end
-      dest_sheet = if sheet_or_dest_address2.is_a?(Worksheet)
-        sheet_or_dest_address2
-      else
-        if options_or_sheet.is_a?(Worksheet)
-          options_or_sheet
-        else
-          @worksheet
-        end
-      end
-      options = if options_or_sheet.is_a?(Hash)
-        options_or_sheet 
-      else
-        if not_provided_or_options.is_a?(Hash)
-          not_provided_or_options
-        else
-          { }
+    def copy(dest_address, *remaining_args)
+      dest_sheet = @worksheet
+      options = { }
+      remaining_args.each do |arg|
+        case arg
+        when Object::Range, Integer then dest_address = [dest_address,arg]
+        when Worksheet, WIN32OLE    then dest_sheet = arg.to_reo
+        when Hash                   then options = arg
+        else raise RangeNotCopied, "cannot copy range: argument error: #{remaining_args.inspect}"
         end
       end
-      rows, columns = address_tool.as_integer_ranges(dest_address)
-      dest_address_is_position = (rows.min == rows.max && columns.min == columns.max)
-      dest_range_address = if (not dest_address_is_position) 
+      begin
+        rows, columns = address_tool.as_integer_ranges(dest_address)
+        dest_address_is_position = (rows.min == rows.max && columns.min == columns.max)
+        dest_range_address = if (not dest_address_is_position) 
           [rows.min..rows.max,columns.min..columns.max]
         else
           if (not options[:transpose])
-            [rows.min..rows.min+self.Rows.Count-1,
-             columns.min..columns.min+self.Columns.Count-1]
+            [rows.min..rows.min+self.Rows.Count-1, columns.min..columns.min+self.Columns.Count-1]
           else
-            [rows.min..rows.min+self.Columns.Count-1,
-             columns.min..columns.min+self.Rows.Count-1]
+            [rows.min..rows.min+self.Columns.Count-1, columns.min..columns.min+self.Rows.Count-1]
           end
         end
-      dest_range = dest_sheet.range(dest_range_address)
-      begin
+        dest_range = dest_sheet.range(dest_range_address)
         if options[:values_only]
-          # dest_range.Value = options[:transpose] ? self.Value.transpose : self.Value
           dest_range.v = options[:transpose] ? self.v.transpose : self.v
         else
           if dest_range.worksheet.workbook.excel == @worksheet.workbook.excel 
             if options[:transpose]
               self.Copy              
-              #dest_range.PasteSpecial('transpose' => true) 
               dest_range.PasteSpecial(XlPasteAll,XlPasteSpecialOperationNone,false,true)
             else
-              #self.Copy('destination' => dest_range.ole_range)
               self.Copy(dest_range.ole_range)
             end            
           else
             if options[:transpose]
               added_sheet = @worksheet.workbook.add_sheet
-              self.copy_special(dest_address, added_sheet, :transpose => true)
-              added_sheet.range(dest_range_address).copy_special(dest_address,dest_sheet)
+              self.copy(dest_address, added_sheet, :transpose => true)
+              added_sheet.range(dest_range_address).copy(dest_address,dest_sheet)
               @worksheet.workbook.excel.with_displayalerts(false) {added_sheet.Delete}
             else
               self.Copy
-              #dest_sheet.Paste('destination' => dest_range.ole_range)
               dest_sheet.Paste(dest_range.ole_range)
             end
           end
         end
+        dest_range
       rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg
         raise RangeNotCopied, 'cannot copy range'
       end
     end
 
-    # becomes copy
-    # copies a range
-    # @params [Address or Address-Array] address or upper left position of the destination range
-    # @options [Worksheet] the destination worksheet
-    # @options [Hash] options: :transpose, :values_only
-    def copy_special(dest_address, dest_sheet = :__not_provided, options = { })
-      rows, columns = address_tool.as_integer_ranges(dest_address)
-      dest_sheet = @worksheet if dest_sheet == :__not_provided
-      dest_address_is_position = (rows.min == rows.max && columns.min == columns.max)
-      dest_range_address = if (not dest_address_is_position) 
-          [rows.min..rows.max,columns.min..columns.max]
-        else
-          if (not options[:transpose])
-            [rows.min..rows.min+self.Rows.Count-1,
-             columns.min..columns.min+self.Columns.Count-1]
-          else
-            [rows.min..rows.min+self.Columns.Count-1,
-             columns.min..columns.min+self.Rows.Count-1]
-          end
-        end
-      dest_range = dest_sheet.range(dest_range_address)
-      begin
-        if options[:values_only]
-          dest_range.Value = options[:transpose] ? self.Value.transpose : self.Value
-        else
-          if dest_range.worksheet.workbook.excel == @worksheet.workbook.excel     
-            if options[:transpose]
-              self.Copy
-              #dest_range.PasteSpecial('transpose' => true) 
-              dest_range.PasteSpecial(XlPasteAll,XlPasteSpecialOperationNone,false,true)
-            else
-              #self.Copy('destination' => dest_range.ole_range)
-              self.Copy(dest_range.ole_range)
-            end            
-          else
-            if options[:transpose]
-              added_sheet = @worksheet.workbook.add_sheet
-              self.copy_special(dest_address, added_sheet, :transpose => true)
-              added_sheet.range(dest_range_address).copy_special(dest_address,dest_sheet)
-              @worksheet.workbook.excel.with_displayalerts(false) {added_sheet.Delete}
-            else
-              self.Copy
-              #dest_sheet.Paste('destination' => dest_range.ole_range)
-              dest_sheet.Paste(dest_range.ole_range)
-            end
-          end
-        end
-      rescue WIN32OLERuntimeError, Java::OrgRacobCom::ComFailException => msg 
-        raise RangeNotCopied, 'cannot copy range'
-      end
-    end
-
     def == other_range
       other_range.is_a?(Range) &&
         self.worksheet == other_range.worksheet
@@ -239,6 +176,27 @@ module RobustExcelOle
       @worksheet.workbook.excel
     end
 
+    # @private
+    # returns true, if the Range object responds to VBA methods, false otherwise
+    def alive?
+      @ole_range.Row
+      true
+    rescue
+      # trace $!.message
+      false
+    end
+
+    # @private
+    def to_s
+      "#<REO::Range: " + "#{@ole_range.Address('External' => true).gsub(/\$/,'')} " + ">"
+      # "#<REO::Range: " + "#{@ole_range.Address.gsub(/\$/,'')} " + "#{worksheet.Name} " + ">"
+    end
+
+    # @private
+    def inspect
+      to_s # [0..-2] + "#{worksheet.workbook.Name} " + ">"
+    end
+
     # @private
     def self.worksheet_class   
       @worksheet_class ||= begin
@@ -254,6 +212,8 @@ module RobustExcelOle
       self.class.worksheet_class
     end
 
+    include MethodHelpers
+
   private
 
     def method_missing(name, *args) 

data/lib/robust_excel_ole/version.rb

@@ -1,3 +1,3 @@
 module RobustExcelOle
-  VERSION = "1.19.11"
+  VERSION = "1.22"
 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
@@ -820,11 +823,12 @@ module RobustExcelOle
         opts = sheet
         sheet = nil
       end
-      new_sheet_name = opts.delete(:as)
-      last_sheet_local = last_sheet
-      after_or_before, base_sheet = opts.to_a.first || [:after, last_sheet_local]
-      base_sheet_ole = base_sheet.ole_worksheet
       begin
+        sheet = sheet.to_reo unless sheet.nil?
+        new_sheet_name = opts.delete(:as)
+        last_sheet_local = last_sheet
+        after_or_before, base_sheet = opts.to_a.first || [:after, last_sheet_local]
+        base_sheet_ole = base_sheet.to_reo.ole_worksheet
         if !::COPYSHEETS_JRUBY_BUG          
           add_or_copy_sheet_simple(sheet, { after_or_before.to_s => base_sheet_ole })
         else
@@ -840,7 +844,7 @@ module RobustExcelOle
             end
           end
         end
-      rescue WIN32OLERuntimeError, NameNotFound, Java::OrgRacobCom::ComFailException
+      rescue # WIN32OLERuntimeError, NameNotFound, Java::OrgRacobCom::ComFailException
         raise WorksheetREOError, "could not add given worksheet #{sheet.inspect}"
       end
       new_sheet = worksheet_class.new(ole_workbook.Activesheet)
@@ -889,7 +893,7 @@ module RobustExcelOle
     # @param [String]  name  the name of the range
     # @param [Variant] value the contents of the range
     def []= (name, value)
-      set_namevalue_glob(name, value, :color => 42)   
+      set_namevalue_glob(name, value)   
     end
 
     # sets options
@@ -918,7 +922,7 @@ module RobustExcelOle
 
     # returns the full file name of the workbook
     def filename
-      @ole_workbook.Fullname.tr('\\','/') rescue nil
+      General.canonize(@ole_workbook.Fullname.tr('\\','/')) rescue nil
     end
 
     # @private
@@ -1001,7 +1005,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
@@ -94,7 +96,7 @@ module RobustExcelOle
       else
         name, value = p1, p2
         begin
-          set_namevalue_glob(name, value, :color => 42)
+          set_namevalue_glob(name, value)
         rescue REOError
           begin
             workbook.set_namevalue_glob(name, value)
@@ -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
@@ -246,9 +258,11 @@ module RobustExcelOle
 
     # @private
     def inspect  
-      self.to_s
+      self.to_s[0..-2] + "#{workbook.Name} " + ">"
     end
 
+    include MethodHelpers
+
   private
 
     def method_missing(name, *args)

data/reo.bat

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

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
@@ -48,7 +52,7 @@ module RobustExcelOle
         ole_table = worksheet.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
         worksheet[3,4].Value.should == "Number"
       end
@@ -147,13 +151,11 @@ module RobustExcelOle
       end
 
       it "should do methods for sheet" do
-        # ((@ole_sheet_methods + @sheet_methods) - @book1.sheet(1).methods).should be_empty
-        (Object.instance_methods.select{|m| m =~ /^(?!\_)/}  - @book1.sheet(1).methods).sort.should be_empty       
+        ((@ole_sheet_methods + @sheet_methods) - @book1.sheet(1).methods).should be_empty
       end
 
       it "should do own_methods with popular ole_excel and excel methods" do
-        # ((@ole_sheet_methods + @sheet_methods) - @book1.sheet(1).own_methods).should == [] #be_empty
-         (Object.instance_methods - @book1.sheet(1).own_methods).should == Object.instance_methods
+        ((@ole_sheet_methods + @sheet_methods) - @book1.sheet(1).own_methods).should == [] #be_empty
       end
 
       it "should respond to popular sheet methods" do
@@ -186,7 +188,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
@@ -219,10 +221,12 @@ module RobustExcelOle
           canonize("this../.i.s/.../..the/..../pa.th/").should == "this../.i.s/.../..the/..../pa.th"
         end
 
+=begin
         it "should downcase" do
           canonize("/This/IS/tHe/path").should == "/this/is/the/path"
           canonize("///THIS/.///./////iS//the/../PatH/////").should == "/this/is/path"
         end
+=end
 
         it "should raise an error for no strings" do
           expect{
@@ -230,6 +234,13 @@ module RobustExcelOle
           }.to raise_error(TypeREOError, "No string given to canonize, but 1")
         end
 
+        it "should yield the network path" do
+          General.canonize(@hostname_share_path).should == @network_path
+          General.canonize(@network_path).should == @network_path
+          General.canonize(@simple_file).should == @simple_file
+          General.canonize(@simple_file_extern).should == @simple_file_extern
+        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