robust_excel_ole 1.35 → 1.36

data/lib/robust_excel_ole/workbook.rb

@@ -68,22 +68,23 @@ module RobustExcelOle
     #  :visible true, false, or nil (default)
     #  alternatives: :default_excel, :force_excel, :visible, :d, :f, :e, :v
     # :if_unsaved     if an unsaved workbook with the same name is open, then
-    #                  :raise               -> raises an exception
-    #                  :forget              -> close the unsaved workbook, open the new workbook
-    #                  :accept              -> lets the unsaved workbook open
-    #                  :alert or :excel     -> gives control to Excel
-    #                  :new_excel           -> opens the new workbook in a new Excel instance
+    #                  :raise               -> raise an exception
+    #                  :forget              -> close the unsaved workbook, re-open the workbook
+    #                  :accept              -> let the unsaved workbook open
+    #                  :alert or :excel     -> give control to Excel
+    #                  :new_excel           -> open the workbook in a new Excel instance
     # :if_obstructed  if a workbook with the same name in a different path is open, then
-    # or               :raise               -> raises an exception
-    # :if_blocked      :forget              -> closes the old workbook, open the new workbook
-    #                  :save                -> saves the old workbook, close it, open the new workbook
-    #                  :close_if_saved      -> closes the old workbook and open the new workbook, if the old workbook is saved,
-    #                                          otherwise raises an exception.
-    #                  :new_excel           -> opens the new workbook in a new Excel instance
-    # :if_absent       :raise               -> raises an exception     , if the file does not exists
-    #                  :create              -> creates a new Excel file, if it does not exists
-    # :read_only            true -> opens in read-only mode
-    # :visible              true -> makes the workbook visible
+    # or               :raise               -> raise an exception
+    # :if_blocked      :forget              -> close the workbook, re-open the workbook
+    #                  :accept              -> let the blocked workbook open
+    #                  :save                -> save the blocked workbook, close it, re-open the workbook
+    #                  :close_if_saved      -> close the blocked workbook and re-open the workbook, if the blocked workbook is saved,
+    #                                          otherwise raise an exception.
+    #                  :new_excel           -> open the workbook in a new Excel instance
+    # :if_absent       :raise               -> raise an exception     , if the file does not exists
+    #                  :create              -> create a new Excel file, if it does not exists
+    # :read_only            true -> open in read-only mode
+    # :visible              true -> make the workbook visible
     # :check_compatibility  true -> check compatibility when saving
     # :update_links         true -> user is being asked how to update links, false -> links are never updated
     # @return [Workbook] a representation of a workbook   
@@ -259,8 +260,9 @@ module RobustExcelOle
       @ole_workbook = workbooks.Item(File.basename(filename)) rescue nil if @ole_workbook.nil?
       if @ole_workbook && alive?
         set_was_open options, true
+        #open_or_create_workbook(filename,options) if (!options[:read_only].nil?) && options[:read_only] 
+        manage_changing_readonly_mode(options) if (!options[:read_only].nil?) && options[:read_only] != @ole_workbook.ReadOnly
         manage_blocking_or_unsaved_workbook(filename,options)
-        open_or_create_workbook(filename,options) if (!options[:read_only].nil?) && options[:read_only] != @ole_workbook.ReadOnly
       else
         if (excel_option.nil? || excel_option == :current) &&  
           !(::CONNECT_JRUBY_BUG && filename[0] == '/')
@@ -277,8 +279,8 @@ module RobustExcelOle
     def apply_options(filename, options)
       # changing read-only mode      
       if (!options[:read_only].nil?) && options[:read_only] != @ole_workbook.ReadOnly
-        ensure_workbook(filename, options) 
-        raise WorkbookReadOnly, "could not change read-only mode" if options[:read_only] != @ole_workbook.ReadOnly
+        # ensure_workbook(filename, options) 
+        manage_changing_readonly_mode(options)
       end
       retain_saved do
         self.visible = options[:force][:visible].nil? ? @excel.Visible : options[:force][:visible]
@@ -312,6 +314,45 @@ module RobustExcelOle
       @excel = excel_class.new(ole_excel)
     end
 
+    def manage_changing_readonly_mode(options)
+      if !ole_workbook.Saved && options[:read_only]      
+        manage_unsaved_workbook_when_changing_readonly_mode(options) 
+      end
+      change_readonly_mode(options)
+    end
+
+    def change_readonly_mode(options)
+      read_write_value = options[:read_only] ? RobustExcelOle::XlReadOnly : RobustExcelOle::XlReadWrite
+      give_control_to_excel = !ole_workbook.Saved && options[:read_only] && 
+                              (options[:if_unsaved] == :excel || options[:if_unsaved] == :alert)
+      displayalerts = give_control_to_excel ? true : @excel.Displayalerts
+      @excel.with_displayalerts(displayalerts) {
+        @ole_workbook.ChangeFileAccess('Mode' => read_write_value)
+      }
+    end
+
+    def manage_unsaved_workbook_when_changing_readonly_mode(options)
+      case options[:if_unsaved] 
+      when :raise
+        if options[:read_only]        
+          raise WorkbookNotSaved, "workbook is not saved" +
+          "\nHint: Use the option :if_unsaved with values :forget or :save,
+          to allow changing to ReadOnly mode (with discarding or saving the workbook before, respectively),
+          or option :excel to give control to Excel."
+        end
+      when :save 
+        save
+      when :forget
+        @ole_workbook.Saved = true
+      when :alert, :excel
+        # displayalerts = true
+        # nothing
+      else
+        raise OptionInvalid, ":if_unsaved: invalid option: #{options[:if_unsaved].inspect}" +
+        "\nHint: Valid values are :raise, :forget, :save, :excel"
+      end
+    end
+
     def manage_nonexisting_file(filename, options)   
       return if File.exist?(filename)
       abs_filename = General.absolute_path(filename)
@@ -354,10 +395,12 @@ module RobustExcelOle
         raise WorkbookBlocked, "can't open workbook #{filename},
         because it is being blocked by #{blocked_filename.call} with the same name in a different path." +
         "\nHint: Use the option :if_blocked with values :forget or :save,
-         to allow automatic closing of the old workbook (without or with saving before, respectively),
-         before the new workbook is being opened."
+         to allow automatic closing of the blocking workbook (without or with saving before, respectively),
+         before reopening the workbook."
       when :forget
         manage_forgetting_workbook(filename, options)       
+      when :accept
+        # do nothing
       when :save
         manage_saving_workbook(filename, options)        
       when :close_if_saved
@@ -378,12 +421,7 @@ module RobustExcelOle
     def manage_unsaved_workbook(filename, options)
       case options[:if_unsaved]
       when :raise
-        msg = if !options[:read_only].nil? && @ole_workbook.ReadOnly != options[:read_only]
-          "cannot change read-only mode of the workbook #{File.basename(filename).inspect}, because it contains unsaved changes"
-        else
-          "workbook is already open but not saved: #{File.basename(filename).inspect}"
-        end
-        raise WorkbookNotSaved, msg +
+        raise WorkbookNotSaved, "workbook is already open but not saved: #{File.basename(filename).inspect}" +
         "\nHint: Use the option :if_unsaved with values :forget to close the unsaved workbook, 
          :accept to let it open, or :save to save it, respectivly"
       when :forget
@@ -410,7 +448,7 @@ module RobustExcelOle
 
     def manage_saving_workbook(filename, options)
       save unless @ole_workbook.Saved
-      manage_forgetting_workbook(filename, options)
+      manage_forgetting_workbook(filename, options) if options[:if_obstructed] == :save
     end
 
     def manage_new_excel(filename, options)
@@ -507,11 +545,11 @@ module RobustExcelOle
     # @option opts [Symbol] :if_unsaved :raise (default), :save, :forget, :keep_open, or :alert
     # options:
     #  :if_unsaved    if the workbook is unsaved
-    #                      :raise           -> raises an exception
-    #                      :save            -> saves the workbook before it is closed
-    #                      :forget          -> closes the workbook
+    #                      :raise           -> raise an exception
+    #                      :save            -> save the workbook before it is closed
+    #                      :forget          -> close the workbook
     #                      :keep_open       -> keep the workbook open
-    #                      :alert or :excel -> gives control to excel
+    #                      :alert or :excel -> give control to excel
     # @raise WorkbookNotSaved if the option :if_unsaved is :raise and the workbook is unsaved
     # @raise OptionInvalid if the options is invalid
     def close(opts = {if_unsaved: :raise})
@@ -622,7 +660,10 @@ module RobustExcelOle
         was_saved = book.saved
         was_check_compatibility = book.check_compatibility
         was_calculation = book.excel.properties[:calculation]
-        opts[:read_only] = !opts[:writable] unless (!opts[:read_only].nil? || opts[:writable].nil? || open_opts[:was_open])
+        #opts[:read_only] = !opts[:writable] unless (!opts[:read_only].nil? || opts[:writable].nil? || open_opts[:was_open])
+        if (opts[:read_only].nil? && !opts[:writable].nil? && !open_opts[:was_open] && (was_saved || opts[:if_unsaved]==:save))
+          opts[:read_only] = !opts[:writable]
+        end
         book.send :apply_options, file, opts
         yield book
       ensure
@@ -649,12 +690,14 @@ module RobustExcelOle
 
     # reopens a closed workbook
     # @options options
-    def reopen(options = { })
+    def open(options = { })
       book = self.class.open(@stored_filename, options)
       raise WorkbookREOError("cannot reopen workbook\n#{$!.message}") unless book && book.alive?
       book
     end
 
+    alias reopen open   # :deprecated: #
+
     # simple save of a workbook.
     # @return [Boolean] true, if successfully saved, nil otherwise
     def save(opts = { })  # option opts is deprecated #
@@ -683,10 +726,10 @@ module RobustExcelOle
     #               :overwrite -> writes the file, delete the old file
     #               :alert or :excel -> gives control to Excel
     #  :if_obstructed   if a workbook with the same name and different path is already open and blocks the saving, then
-    #  or              :raise               -> raises an exception
-    #  :if_blocked     :forget              -> closes the blocking workbook
-    #                  :save                -> saves the blocking workbook and closes it
-    #                  :close_if_saved      -> closes the blocking workbook, if it is saved,
+    #  or              :raise               -> raise an exception
+    #  :if_blocked     :forget              -> close the blocking workbook
+    #                  :save                -> save the blocking workbook and close it
+    #                  :close_if_saved      -> close the blocking workbook, if it is saved,
     #                                          otherwise raises an exception   
     # @return [Workbook], the book itself, if successfully saved, raises an exception otherwise
     def save_as(file, options = { })
@@ -900,12 +943,12 @@ module RobustExcelOle
   public
 
     # for compatibility to older versions
-    def add_sheet(sheet = nil, opts = { })
+    def add_sheet(sheet = nil, opts = { })  # :deprecated: #
       add_or_copy_sheet(sheet, opts)
     end
 
-    # for compatibility to older versions
-    def copy_sheet(sheet, opts = { })
+    # for compatibility to older versions    
+    def copy_sheet(sheet, opts = { })       # :deprecated: #
       add_or_copy_sheet(sheet, opts)
     end
 
@@ -975,14 +1018,36 @@ module RobustExcelOle
 
     # returns the full file name of the workbook
     def filename
-      General.canonize(@ole_workbook.Fullname.tr('\\','/')) rescue nil
+      @filename ||= General.canonize(@ole_workbook.Fullname.tr('\\','/')) rescue nil
     end
 
-    # @private
+    # @returns true, if the workbook is not in read-only mode
     def writable   
       !@ole_workbook.ReadOnly if @ole_workbook
     end
 
+    # sets the writable mode
+    # @param [Bool] writable mode (true: read-write-mode, false: read-only mode)
+    # @options [Symbol] :if_unsaved     if the workbook is unsaved, then
+    #                    :raise               -> raise an exception (default)
+    #                    :forget              -> close the unsaved workbook, re-open the workbook
+    #                    :accept              -> let the unsaved workbook open
+    #                    :alert or :excel     -> give control to Excel
+    def writable=(value_and_opts)
+      writable_value, unsaved_opts = *value_and_opts
+      if @ole_workbook && !value_and_opts.nil?
+        options = {:if_unsaved => :raise}
+        options = options.merge(unsaved_opts) if unsaved_opts
+        options = {:read_only => !writable_value}.merge(options)
+        if options[:read_only] != @ole_workbook.ReadOnly
+          manage_changing_readonly_mode(options) 
+          manage_unsaved_workbook(filename,options) if !@ole_workbook.Saved && unsaved_opts
+        end
+      end
+      writable_value
+    end
+
+
     # @private
     def saved  
       @ole_workbook.Saved if @ole_workbook

data/lib/robust_excel_ole/worksheet.rb

@@ -119,7 +119,7 @@ module RobustExcelOle
             end
           rescue
             address2_string = (address2.nil? || address2 == :__not_provided) ? "" : ", #{address2.inspect}"
-            raise RangeNotCreated, "cannot find name or address #{name_or_address.inspect}#{address2_string})"
+            raise RangeNotCreated, "cannot find name or address #{name_or_address.inspect}#{address2_string}"
           end
         end
       end

data/robust_excel_ole.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency 'win32api', '~> 0.1'
   s.add_runtime_dependency 'pry', '~> 0.12', '>= 0.12.1'
   s.add_runtime_dependency 'pry-bond', '~> 0.0', '>= 0.0.1'
   s.add_development_dependency 'rspec', '~> 2.6', '>= 2.6.0'

data/spec/bookstore_spec.rb

@@ -60,8 +60,7 @@ describe Bookstore do
     @network_path = "N:/data/workbook.xls"
     network = WIN32OLE.new('WScript.Network')
     computer_name = network.ComputerName
-    #@hostname_share_path = "DESKTOP-A3C5CJ6/spec/data/workbook.xls"
-    @hostname_share_path = "//#{computer_name}/#{absolute_path('spec/data/workbook.xls').tr('\\','/').gsub('C:','c$')}"
+    @hostname_share_path = "//#{computer_name}/spec/data/workbook.xls"
     @network_path_not_existing = "M:/data/workbook.xls"
     @hostname_not_existing_share_path = "//DESKTOP_not_existing/spec/data/workbook.xls"
     @hostname_share_not_existing_path = "//#{computer_name}/c$/gim/ats/aSrc/gems/robust_excel_ole/spec_not_existing/data/workbook.xls"

data/spec/excel_spec.rb

@@ -457,7 +457,7 @@ module RobustExcelOle
           @excel1.Visible.should be false
           @excel1.DisplayAlerts.should be false
           @book1.should_not be_alive
-          @book1.reopen
+          @book1.open
           @book1.should be_alive
           @excel1.close
           @excel1.should_not be_alive        
@@ -473,7 +473,7 @@ module RobustExcelOle
           @excel1.should be_alive
           @excel1.Visible.should be true
           @excel1.DisplayAlerts.should be true
-          @book1.reopen
+          @book1.open
           @book1.should be_alive
           @excel1.close
           @excel1.should_not be_alive
@@ -487,7 +487,7 @@ module RobustExcelOle
           @excel1.should be_alive
           @excel1.Visible.should be true
           @excel1.DisplayAlerts.should be true
-          @book1.reopen
+          @book1.open
           @book1.should be_alive
           @excel1.close
           @excel1.should_not be_alive
@@ -539,7 +539,7 @@ module RobustExcelOle
           @excel3.should be_a Excel
           @excel3.Visible.should be true
           @excel3.DisplayAlerts.should be true
-          @book3.reopen
+          @book3.open
           @book3.should be_alive
           @book3.excel.should == @excel3
           @excel1.close(:if_unsaved => :forget)

data/spec/general_spec.rb

@@ -45,8 +45,7 @@ module RobustExcelOle
       @simple_file_xlsx = @dir + '/workbook.xlsx'
       @network_path = "N:/data/workbook.xls"
       computer_name = NETWORK.ComputerName
-      #@hostname_share_path = "//#{computer_name}/spec/data/workbook.xls"
-      @hostname_share_path = "//#{computer_name}/#{absolute_path('spec/data/workbook.xls').tr('\\','/').gsub('C:','c$')}"
+      @hostname_share_path = "//#{computer_name}/spec/data/workbook.xls"
       @network_path_downcase = @network_path.downcase
       @hostname_share_path_downcase = @hostname_share_path.downcase
       @simple_file_extern = "D:/data/workbook.xls"

data/spec/list_object_spec.rb

@@ -128,6 +128,15 @@ describe ListObject do
 
   end
 
+  describe "workbook" do
+
+    it "should access the workbook" do
+      table = @sheet.table(1)
+      table.workbook.should == @book
+    end
+
+  end
+
   describe "each" do
 
     before do
@@ -137,7 +146,7 @@ describe ListObject do
     it "should traverse through list rows" do
       @table1.each.with_index do |listrow, i|
         listrow.values.should == [3.0, "John", 50.0, 0.5, 30] if i == 0        
-        listrow.values.should == [2.0, "Fred", nil, 0.5416666666666666, 40] if i == 1
+        listrow.values.should == [2.0, "Fred", 0.0, 0.5416666666666666, 40] if i == 1
         listrow.values.should == [nil, nil, nil, nil, nil] if i == 2
       end
     end
@@ -173,7 +182,7 @@ describe ListObject do
     it "should access a listrow given its number" do
       listrow = @table1[2]
       listrow.should be_a ListRow
-      listrow.values.should == [2.0, "Fred", nil, 0.5416666666666666, 40]
+      listrow.values.should == [2.0, "Fred", 0.0, 0.5416666666666666, 40]
     end   
 
     it "should access a listrow via a multiple-column key" do
@@ -189,6 +198,14 @@ describe ListObject do
       @table1[{:person => "Angel"}].values.should == [3.0, "Angel", 100, 0.6666666666666666, 60]
     end
 
+    it "should access a listrow with key value which constitutes a number, type-independent" do
+      @table1[{"Amount" => 100}].values.should == [3.0, "Angel", 100, 0.6666666666666666, 60]
+      @table1[{"Amount" => "100"}].values.should == [3.0, "Angel", 100, 0.6666666666666666, 60]
+      @table1[{"Amount" => 0}].values.should == [2.0, "Fred", 0, 0.5416666666666666, 40.0]
+      @table1[{"Amount" => "0"}].values.should == [2.0, "Fred", 0, 0.5416666666666666, 40.0]
+      @table1[{"Amount" => "hello"}].should == nil
+    end
+
     it "should yield nil if there is no match" do
       @table1[{"Number" => 5, "Person" => "Angel"}].should == nil
       @table1[{"Number" => 5, "Person" => "Angel"}, limit: :first].should == nil
@@ -252,7 +269,7 @@ describe ListObject do
       table_value = [
         ["Number", "Person", "Amount", "Time", "Price"],
         [3.0, "John", 50.0, 0.5, 30.0],
-        [2.0, "Fred", nil, 0.5416666666666666, 40.0],
+        [2.0, "Fred", 0.0, 0.5416666666666666, 40.0],
         [nil, nil, nil, nil, nil],
         [3.0, "Angel", 100.0, 0.6666666666666666, 60.0],
         [nil, nil, nil, nil, nil],
@@ -387,7 +404,7 @@ describe ListObject do
       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]
+      listrows.Item(3).Range.Value.first.should == [2.0, "Fred", 0.0, 0.5416666666666666, 40]
       expect{
         @table.add_row(16)
       }.to raise_error(TableError)
@@ -398,7 +415,7 @@ describe ListObject do
       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]
+      listrows.Item(3).Range.Value.first.should == [2.0, "Fred", 0.0, 0.5416666666666666, 40]
     end
 
     it "should add a row with contents with umlauts" do
@@ -417,7 +434,7 @@ describe ListObject do
     end
 
     it "should delete the contents of a column" do
-      @table.ListColumns.Item(3).Range.Value.should == [["Amount"],[50],[nil],[nil],[100],[nil],[40],[50],[nil],[nil],[nil],[nil],[40],[20]]
+      @table.ListColumns.Item(3).Range.Value.should == [["Amount"],[50],[0],[nil],[100],[nil],[40],[50],[nil],[nil],[nil],[nil],[40],[20]]
       @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],[nil],[nil],[nil],[nil],[nil],[nil],[nil]]
@@ -430,7 +447,7 @@ describe ListObject do
     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.ListRows.Item(2).Range.Value.first.should == [2.0, "Fred", 0.0, 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]
@@ -445,7 +462,7 @@ describe ListObject do
       @table.delete_empty_rows
       @table.ListRows.Count.should == 9
       @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(2).Range.Value.first.should == [2.0, "Fred", 0.0, 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
@@ -525,7 +542,7 @@ describe ListObject 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 == [1, "Napoli", 20.0, 0.4166666666666667, 70.0]
-      @table.ListRows.Item(3).Range.Value.first.should == [2, "Fred", nil, 0.5416666666666666, 40]     
+      @table.ListRows.Item(3).Range.Value.first.should == [2, "Fred", 0.0, 0.5416666666666666, 40]     
       @table.ListRows.Item(4).Range.Value.first.should == [3, "John", 50.0, 0.5, 30]
       @table.ListRows.Item(5).Range.Value.first.should == [3, "Angel", 100, 0.6666666666666666, 60]
       @table.ListRows.Item(6).Range.Value.first.should == [3, "Eiffel", 50.0, 0.5, 30]

data/spec/list_row_spec.rb

@@ -29,6 +29,34 @@ describe ListRow do
     rm_tmp(@dir)
   end
 
+  describe "accessing several tables" do
+
+    it "should preserve ole_table" do
+      table1 = @sheet.table(1)
+      table1[1].values.should == [3.0, "John", 50.0, 0.5, 30.0]
+      table2 = Table.new(@sheet, "table_name", [1,1], 3, ["Person","Amount"])
+      table2[1].values.should == [nil, nil]
+      table1[1].values.should == [3.0, "John", 50.0, 0.5, 30.0]
+    end
+
+  end
+
+  describe "#methods, #respond_to?" do
+
+    before do
+      @table1 = @sheet.table(1)
+      @tablerow1 = @table1[2]
+    end
+
+    it "should contain column name as methods" do
+      column_names_both_cases = @table1.column_names + @table1.column_names.map{|c| c.downcase}
+      column_names_both_cases.map{|c| c.to_sym}.each do |column_name_method|
+        @tablerow1.methods.include?(column_name_method).should be true
+        @tablerow1.respond_to?(column_name_method)
+      end
+    end
+  end
+
   describe "==" do
 
     before do
@@ -45,27 +73,14 @@ describe ListRow do
 
   end
 
-  describe "accessing several tables" do
-
-    it "should preserve the table when accessing table rows in several tables" do
-      table1 = @sheet.table(1)
-      values1 = table1[1].values
-      table2 = Table.new(@sheet, "table_name", [1,1], 3, ["Person","Amount"])
-      values2 = table2[1].values
-      table1[1].values.should == values1
-      table1[1].values.should_not == values2
-    end
-
-  end
-
   describe "promote" do
 
      it "should promote a win32ole tablerow" do
       table1 = @sheet.table(1)
       tablerow1 = table1[2]
       ole_tablerow1 = tablerow1.ole_tablerow
-      ListRow.new(ole_tablerow1).values.should == [2.0, "Fred", nil, 0.5416666666666666, 40]
-      ListRow.new(tablerow1).values.should == [2.0, "Fred", nil, 0.5416666666666666, 40]
+      ListRow.new(ole_tablerow1).values.should == [2.0, "Fred", 0, 0.5416666666666666, 40]
+      ListRow.new(tablerow1).values.should == [2.0, "Fred", 0, 0.5416666666666666, 40]
     end 
   end
 
@@ -76,13 +91,13 @@ describe ListRow do
     end
 
     it "should yield values of a row" do
-      @table1[2].to_a.should == [2.0, "Fred", nil, 0.5416666666666666, 40]
-      @table1[2].values.should == [2.0, "Fred", nil, 0.5416666666666666, 40]
+      @table1[2].to_a.should == [2.0, "Fred", 0, 0.5416666666666666, 40]
+      @table1[2].values.should == [2.0, "Fred", 0, 0.5416666666666666, 40]
     end
 
     it "should yield key-value pairs of a row" do
-      @table1[2].to_h.should == {"Number" => 2.0, "Person" => "Fred", "Amount" => nil, "Time" => 0.5416666666666666, "Price" => 40}
-      @table1[2].keys_values.should == {"Number" => 2.0, "Person" => "Fred", "Amount" => nil, "Time" => 0.5416666666666666, "Price" => 40}
+      @table1[2].to_h.should == {"Number" => 2.0, "Person" => "Fred", "Amount" => 0, "Time" => 0.5416666666666666, "Price" => 40}
+      @table1[2].keys_values.should == {"Number" => 2.0, "Person" => "Fred", "Amount" => 0, "Time" => 0.5416666666666666, "Price" => 40}
     end
 
     it "should yield values and key-value pairs of a row with umlauts" do
@@ -187,7 +202,6 @@ describe ListRow do
           @table_row1.verkaeufer.should be nil
           @table_row1.verkaeufer = "John"
           @table_row1.verkaeufer.should == "John"
-          @table_row1.verkäufer.should == "John"
           @sheet[2,1].should == "John"
           @table_row1.Verkaeufer = "Herbert"
           @table_row1.Verkaeufer.should == "Herbert"

data/spec/range_spec.rb

@@ -47,6 +47,15 @@ describe RobustExcelOle::Range do
     end
   end
 
+  describe "#workbook, worksheet" do
+
+    it "should access workbook" do
+      @range2.worksheet.should == @sheet
+      @range2.workbook.should == @book
+    end
+
+  end
+
   describe "#each" do
   
     it "items is RobustExcelOle::Cell" do

data/spec/workbook_spec.rb

@@ -675,7 +675,7 @@ describe Workbook do
         book1 = @book
         @book.close
         @book.should_not be_alive
-        @book.reopen
+        @book.open
         @book.should be_a Workbook
         @book.should be_alive
         @book.should === book1
@@ -826,7 +826,7 @@ describe Workbook do
         book2 = Workbook.open(@different_file, :force => {:excel => :new})
         @book.close
         book2.close
-        @book.reopen
+        @book.open
         Workbook.unobtrusively(@simple_file1) do |book|
           book.should be_a Workbook
           book.should be_alive