robust_excel_ole 1.31 → 1.32

data/spec/spec_helper.rb

@@ -4,8 +4,22 @@ require 'tmpdir'
 require "fileutils"
 require_relative '../lib/robust_excel_ole'
 
+class Object
+
+  def encode_value
+    if self.respond_to?(:gsub)
+      encode('utf-8')
+    elsif self.respond_to?(:keys)
+      transform_values!{ |value| value.respond_to?(:gsub) ? value.encode('utf-8') : value}
+    elsif self.respond_to?(:pop)
+      map{|v| v.respond_to?(:gsub) ? v.encode('utf-8') : v}
+    end
+  end
+
+end
+
 # @private
-module RobustExcelOle::SpecHelpers
+module RobustExcelOle::SpecHelpers  
 
   def create_tmpdir     
     tmpdir = Dir.mktmpdir

data/spec/workbook_spec.rb

@@ -111,7 +111,7 @@ describe Workbook do
           book.should be_alive
           book.should be_a Workbook
           book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
-          Excel.excels_number.should == 1
+          Excel.instance_count.should == 1
         end
       end
     end
@@ -467,10 +467,11 @@ describe Workbook do
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
-          expect{
+          #expect{
             Workbook.open(@simple_file, :if_unsaved => :alert)    
-            }.to raise_error(UnexpectedREOError)
+          #  }.to raise_error(UnexpectedREOError)
           @book.should be_alive
+          @book.Saved.should be false
         end
 
         it "should open the new book and close the unsaved book, if user answers 'yes'" do
@@ -489,10 +490,11 @@ describe Workbook do
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
-          expect{
+          #expect{
             Workbook.open(@simple_file, :if_unsaved => :excel)
-          }.to raise_error(UnexpectedREOError)
+          #}.to raise_error(UnexpectedREOError)
           @book.should be_alive
+          @book.Saved.should be false
         end
 
       end
@@ -634,15 +636,15 @@ describe Workbook do
         book.ReadOnly.should be true
         book.should be_alive
         sheet = book.sheet(1)
-        old_cell_value = sheet[1,1].Value
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        old_cell_value = sheet[1,1]
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         book.Saved.should be false
         new_book = Workbook.open(@simple_file1, :read_only => false, :if_unsaved => :forget)
         new_book.ReadOnly.should be false 
         new_book.should be_alive
         book.should_not be_alive   
         new_sheet = new_book.sheet(1)
-        new_cell_value = new_sheet[1,1].Value
+        new_cell_value = new_sheet[1,1]
         new_cell_value.should == old_cell_value
       end
 
@@ -757,7 +759,7 @@ describe Workbook do
       Workbook.unobtrusively(@simple_file) do |book|
         book.should be_a Workbook
         sheet = book.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         book.should be_alive
         book.Saved.should be false
       end
@@ -838,18 +840,18 @@ describe Workbook do
         @book.Saved.should be true
         @book.should be_alive
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].Value
+        old_cell_value = sheet[1,1]
         unobtrusively_ok?
         @book.Saved.should be true
         @book.should be_alive
         sheet = @book.sheet(1)
-        sheet[1,1].Value.should_not == old_cell_value
+        sheet[1,1].should_not == old_cell_value
       end
 
      it "should let the unsaved book unsaved" do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
-        old_cell_value = sheet[1,1].Value
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
+        old_cell_value = sheet[1,1]
         @book.Saved.should be false
         unobtrusively_ok?
         @book.should be_alive
@@ -857,7 +859,7 @@ describe Workbook do
         @book.close(:if_unsaved => :forget)
         @book2 = Workbook.open(@simple_file1)
         sheet2 = @book2.sheet(1)
-        sheet2[1,1].Value.should_not == old_cell_value
+        sheet2[1,1].should_not == old_cell_value
       end
     end
     
@@ -873,21 +875,21 @@ describe Workbook do
 
       it "should let the closed book closed by default" do
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].Value
+        old_cell_value = sheet[1,1]
         @book.close
         @book.should_not be_alive
         unobtrusively_ok?
         @book.should_not be_alive
         book2 = Workbook.open(@simple_file1)
         sheet = book2.sheet(1)
-        sheet[1,1].Value.should_not == old_cell_value
+        sheet[1,1].should_not == old_cell_value
       end
 
       # The bold reanimation of the @book
       it "should use the excel of the book and keep open the book" do
         excel = Excel.new(:reuse => false)
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].Value
+        old_cell_value = sheet[1,1]
         @book.close
         @book.should_not be_alive
         Workbook.unobtrusively(@simple_file1, :keep_open => true) do |book|
@@ -895,7 +897,7 @@ describe Workbook do
           book.excel.should == @book.excel
           book.excel.should_not == excel
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
@@ -903,13 +905,13 @@ describe Workbook do
         @book.close
         new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should_not == old_cell_value
+        sheet[1,1].should_not == old_cell_value
       end
 
       it "should use the excel of the book and keep open the book" do
         excel = Excel.new(:reuse => false)
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].Value
+        old_cell_value = sheet[1,1]
         @book.close
         @book.should_not be_alive
         Workbook.unobtrusively(@simple_file1, :if_closed => :current) do |book|
@@ -918,14 +920,14 @@ describe Workbook do
           book.excel.should == @book.excel
           book.excel.should_not == excel
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
         @book.should_not be_alive
         new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should_not == old_cell_value
+        sheet[1,1].should_not == old_cell_value
       end
     end
 
@@ -992,7 +994,7 @@ describe Workbook do
         @book1.Readonly.should == false
         @book2.Readonly.should == true
         old_sheet = @book1.sheet(1)
-        @old_cell_value = old_sheet[1,1].Value
+        @old_cell_value = old_sheet[1,1]
         @book1.close
         @book2.close
         @book1.should_not be_alive
@@ -1005,13 +1007,13 @@ describe Workbook do
           book.excel.should_not == @book1.excel
           book.ReadOnly.should == false
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
         new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should_not == @old_cell_value
+        sheet[1,1].should_not == @old_cell_value
       end
 
     end
@@ -1024,7 +1026,7 @@ describe Workbook do
       before do
         @book = Workbook.open(@simple_file1)
         sheet = @book.sheet(1)
-        @old_cell_value = sheet[1,1].Value
+        @old_cell_value = sheet[1,1]
         @book.close
       end
 
@@ -1034,14 +1036,14 @@ describe Workbook do
           book.should be_alive
           book.Saved.should be true  
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
           book.excel.should == @book.excel
         end
         new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should == @old_cell_value
+        sheet[1,1].should == @old_cell_value
       end
 
 
@@ -1049,7 +1051,7 @@ describe Workbook do
         new_excel = Excel.new(:reuse => false)
         Workbook.for_reading(@simple_file1, :if_closed => :new) do |book|
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
@@ -1058,19 +1060,19 @@ describe Workbook do
         end
         new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should == @old_cell_value
+        sheet[1,1].should == @old_cell_value
       end
 
       it "should change the value" do
         Workbook.for_modifying(@simple_file1) do |book|
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should == @book.excel
         end
         new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should_not == @old_cell_value
+        sheet[1,1].should_not == @old_cell_value
       end
     end
   end
@@ -1391,7 +1393,46 @@ describe Workbook do
     end
   end
 
+  describe "#names" do
+
+    before do
+      @book1 = Workbook.open(@another_simple_file)
+    end
+
+    it "should yield defined names" do
+      @book1.names.should == ["another", "Sheet1!another_formula", "empty", "Sheet1!firstcell", 
+                              "firstrow", "formula", "four", "Sheet1!localname", "Sheet2!localname", 
+                              "named_formula", "new", "one", "Sheet1!simple"]
+    end
+      
+  end
+
+  describe "each" do
+
+    before do
+      @book = Workbook.open(@simple_file)
+    end
+
+    it "should do each" do
+      @book.each do |sheet|
+        sheet.should be_kind_of Worksheet
+      end
+    end
+
+    it "should map" do
+      @book.map{|s| s}.should == [@book.sheet(1), @book.sheet(2), @book.sheet(3)]
+    end
+
+    it "should concatenate" do
+      names = ""
+      @book.each.with_index{|s,i| names << "#{s.name} #{i} " }
+      names.should == "Sheet1 0 Sheet2 1 Sheet3 2 "
+    end
+
+  end
+
   describe 'access sheet' do
+
     before do
       @book = Workbook.open(@simple_file)
     end
@@ -1435,7 +1476,7 @@ describe Workbook do
 
       it "should keep the save state 'unsaved'" do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         @book.Saved.should be false
         @book.retain_saved do
           sheet = @book.sheet(1)
@@ -1447,7 +1488,7 @@ describe Workbook do
 
       it "should keep the save state 'unsaved' even when the workbook was saved before" do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         @book.Saved.should be false
         @book.retain_saved do
           @book.save

data/spec/workbook_specs/workbook_all_spec.rb

@@ -9,5 +9,6 @@ require_relative 'workbook_close_spec'
 require_relative 'workbook_save_spec'
 require_relative 'workbook_misc_spec'
 require_relative 'workbook_sheet_spec'
-require_relative 'workbook_unobtr_spec'
+require_relative 'workbook
+_unobtr_spec'
 require_relative 'workbook_subclass_spec'

data/spec/workbook_specs/workbook_misc_spec.rb

@@ -166,7 +166,7 @@ describe Workbook do
 
     it "should keep the save state 'unsaved'" do
       sheet = @book.sheet(1)
-      sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+      sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
       @book.Saved.should be false
       @book.retain_saved do
         sheet = @book.sheet(1)
@@ -180,7 +180,7 @@ describe Workbook do
       @book.Saved.should be true
       @book.retain_saved do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         @book.Saved.should be false
       end
       @book.Saved.should be true
@@ -188,7 +188,7 @@ describe Workbook do
 
     it "should keep the save state 'unsaved' even when the workbook was saved before" do
       sheet = @book.sheet(1)
-      sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+      sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
       @book.Saved.should be false
       @book.retain_saved do
         @book.save
@@ -702,6 +702,13 @@ describe Workbook do
       @book1.namevalue_global("new").should == "bar"
     end
 
+    it "should set a range to a value with umlauts" do
+      @book1.sheet(1).add_name("lösung", [1,1])
+      @book1.namevalue_global("lösung").should == "foo"
+      @book1.set_namevalue_global("lösung","bar")
+      @book1.namevalue_global("lösung").should == "bar"
+    end
+
     it "should set value of a range via []=" do
       @book1["new"] = "bar"
       @book1.namevalue_global("new").should == "bar"
@@ -717,7 +724,7 @@ describe Workbook do
 
     it "should raise an error if name not defined and default value is not provided" do
       expect {
-        @book1.namevalue_global("foo", :default => nil)
+        @book1.namevalue_global("foo", :default => 1)
       }.to_not raise_error
       expect {
         @book1.namevalue_global("foo", :default => :__not_provided)
@@ -784,7 +791,7 @@ describe Workbook do
 
   end
 
-  describe "rename_range" do
+  describe "rename_name" do
     
     before do
       @book1 = Workbook.open(@another_simple_file)
@@ -795,11 +802,11 @@ describe Workbook do
     end
 
     it "should rename a range" do
-      @book1.rename_range("four","five")
+      @book1.rename_name("four","five")
       @book1.namevalue_global("five").should == [[1,2],[3,4]]
       expect {
-        @book1.rename_range("four","five")
-      }.to raise_error(NameNotFound, /name "four" not in "another_workbook.xls"/)
+        @book1.rename_name("four","five")
+      }.to raise_error(NameNotFound, /name "four" not in/)
     end
   end
 
@@ -901,7 +908,7 @@ describe Workbook do
 
       it "should yield false for an unsaved book" do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         @book.saved.should be false
       end
     end
@@ -1065,20 +1072,20 @@ describe Workbook do
       it "should bring a book to focus" do
         sheet = @book.sheet(2)
         sheet.Activate
-        sheet[2,3].Activate
+        sheet.range([2,3]).Activate
         sheet2 = @book2.sheet(2)
         sheet2.Activate
-        sheet2[3,2].Activate
+        sheet2.range([3,2]).Activate
         Excel.current.should == @book.excel
         @book2.focus
         @key_sender.puts "{a}{enter}"
         sleep 1
-        #sheet2[3,2].Value.should == "a"
+        #sheet2.range([3,2]).Value.should == "a"
         #Excel.current.should == @book2.excel
         @book.focus
         @key_sender.puts "{a}{enter}"
         sleep 1
-        #sheet[2,3].Value.should == "a"
+        #sheet.range([2,3]).Value.should == "a"
         Excel.current.should == @book.excel
       end
     end

data/spec/workbook_specs/workbook_open_spec.rb

@@ -138,7 +138,7 @@ describe Workbook do
           book.should be_alive
           book.should be_a Workbook
           book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
-          Excel.excels_number.should == 1
+          Excel.instance_count.should == 1
         end
       end
     end
@@ -234,7 +234,7 @@ describe Workbook do
           book.should be_alive
           book.should be_a Workbook
           book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
-          Excel.excels_number.should == 1
+          Excel.instance_count.should == 1
         end
       end
     end
@@ -451,7 +451,7 @@ describe Workbook do
           book.filename.should == @simple_file_network_path1
           book.Fullname.should == @ole_wb.Fullname
           book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
-          Excel.excels_number.should == 1
+          Excel.instance_count.should == 1
           book.excel.Workbooks.Count.should == 1
         end
       end
@@ -467,7 +467,7 @@ describe Workbook do
           book.filename.should == @simple_file_hostname_share_path1.downcase
           book.Fullname.should == @ole_wb.Fullname
           book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
-          Excel.excels_number.should == 1
+          Excel.instance_count.should == 1
           book.excel.Workbooks.Count.should == 1
         end
       end
@@ -523,7 +523,7 @@ describe Workbook do
           book.filename.should == @simple_file_network_path1
           book.Fullname.should == @ole_wb.Fullname
           book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
-          Excel.excels_number.should == 1
+          Excel.instance_count.should == 1
           book.excel.Workbooks.Count.should == 1
         end
       end
@@ -539,7 +539,7 @@ describe Workbook do
           book.filename.should == @simple_file_hostname_share_path1.downcase
           book.Fullname.should == @ole_wb.Fullname
           book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
-          Excel.excels_number.should == 1
+          Excel.instance_count.should == 1
           book.excel.Workbooks.Count.should == 1
         end
       end      
@@ -637,11 +637,11 @@ describe Workbook do
 
       it "should connect to an unknown hostname share path workbook" do
         Workbook.open(@simple_file_hostname_share_path1) do |book|
-          book.filename.should == @simple_file_hostname_share_path1.downcase
+          book.filename.should == @simple_file_network_path1
           book.should be_alive
           book.should be_a Workbook
           book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
-          Excel.excels_number.should == 1
+          Excel.instance_count.should == 1
           book.excel.Workbooks.Count.should == 1
         end
       end
@@ -660,7 +660,7 @@ describe Workbook do
         book1 = Workbook.open(@simple_file1)
         book1.should be_alive
         book1.should be_a Workbook
-        Excel.excels_number.should == 1
+        Excel.instance_count.should == 1
         book1.ReadOnly.should be false
         book1.excel.Visible.should be false
         book1.CheckCompatibility.should be true
@@ -679,7 +679,7 @@ describe Workbook do
         book1.should be_alive
         book1.should be_a Workbook
         book1.excel.should == excel1
-        Excel.excels_number.should == 1        
+        Excel.instance_count.should == 1        
         book1.excel.Visible.should be false
       end
 
@@ -689,7 +689,7 @@ describe Workbook do
         book1.should be_alive
         book1.should be_a Workbook
         book1.excel.should == excel1
-        Excel.excels_number.should == 1        
+        Excel.instance_count.should == 1        
         book1.excel.Visible.should be true
       end
 
@@ -699,7 +699,7 @@ describe Workbook do
         book1.should be_alive
         book1.should be_a Workbook
         book1.excel.should_not == excel1
-        Excel.excels_number.should == 2        
+        Excel.instance_count.should == 2        
       end
 
       it "should set the options in a given known Excel" do
@@ -714,7 +714,7 @@ describe Workbook do
         book1 = Workbook.open(@simple_file1)
         book1.should be_alive
         book1.should be_a Workbook
-        Excel.excels_number.should == 1
+        Excel.instance_count.should == 1
         book1.excel.ole_excel.Hwnd.should == ole_excel1.Hwnd
       end
 
@@ -735,7 +735,7 @@ describe Workbook do
           book.should be_alive
           book.should be_a Workbook
           book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
-          Excel.excels_number.should == 1
+          Excel.instance_count.should == 1
         end
       end
 
@@ -815,7 +815,7 @@ describe Workbook do
         Workbook.open(@simple_file1) do |book|
           book.filename.should == @simple_file1
           book.excel.ole_excel.Hwnd.should == @ole_wb1.Application.Hwnd
-          Excel.excels_number.should == 2
+          Excel.instance_count.should == 2
         end
       end
 
@@ -823,7 +823,7 @@ describe Workbook do
         Workbook.open(@different_file1) do |book|
           book.filename.should == @different_file1
           book.excel.ole_excel.Hwnd.should == @ole_wb2.Application.Hwnd
-          Excel.excels_number.should == 2
+          Excel.instance_count.should == 2
         end
       end
 
@@ -912,9 +912,9 @@ describe Workbook do
       before do
         @book = Workbook.open(@simple_file1, :if_unsaved => :accept)
         sheet = @book.sheet(1)
-        @old_value = sheet[1,1].Value
-        sheet[1,1] = (sheet[1,1].Value == "foo" ? "bar" : "foo")
-        @new_value = sheet[1,1].Value
+        @old_value = sheet[1,1]
+        sheet[1,1] = (sheet[1,1] == "foo" ? "bar" : "foo")
+        @new_value = sheet[1,1]
         @book.Saved.should be false
       end
 
@@ -928,7 +928,7 @@ describe Workbook do
         new_book.should be_alive
         new_book.Saved.should be false      
         @book.Saved.should be false  
-        new_book.sheet(1)[1,1].Value.should == @new_value
+        new_book.sheet(1)[1,1].should == @new_value
         new_book.should == @book
       end
 
@@ -2599,7 +2599,7 @@ describe Workbook do
 
     it "should new_excel" do
       book = Workbook.open(@simple_file1)
-      book.sheet(1)[1,1].Value = "foo"
+      book.sheet(1)[1,1] = "foo"
       book.Saved.should be false
       book2 = Workbook.open(@simple_file1, :if_unsaved => :new_excel)
     end
@@ -2667,10 +2667,11 @@ describe Workbook do
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
-          expect{
+          #expect{
             Workbook.open(@simple_file, :if_unsaved => :alert)    
-            }.to raise_error(UnexpectedREOError)
+          #  }.to raise_error(UnexpectedREOError)
           @book.should be_alive
+          @book.Saved.should be false
         end
 
         it "should not open the new book and not close the unsaved book, if user answers 'no'" do
@@ -2679,10 +2680,11 @@ describe Workbook do
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
-          expect{
+          #expect{
             Workbook.open(@simple_file, :if_unsaved => :excel)
-          }.to raise_error(UnexpectedREOError)
+          #}.to raise_error(UnexpectedREOError)
           @book.should be_alive
+          @book.Saved.should be false
         end
 
       end
@@ -2704,9 +2706,9 @@ describe Workbook do
             #@sheet_count = @book.ole_workbook.Worksheets.Count
             sheet = @book.sheet(1)
             #@book.add_sheet(@sheet, :as => 'a_name')
-            @old_value = sheet[1,1].Value
-            sheet[1,1] = (sheet[1,1].Value == "foo" ? "bar" : "foo")
-            @new_value = sheet[1,1].Value
+            @old_value = sheet[1,1]
+            sheet[1,1] = (sheet[1,1] == "foo" ? "bar" : "foo")
+            @new_value = sheet[1,1]
             @book.Saved.should be false
           end
 
@@ -2727,7 +2729,7 @@ describe Workbook do
             new_book.should be_alive
             new_book.filename.downcase.should == @simple_file.downcase
             old_book = Workbook.open(@simple_file_other_path1, :if_obstructed => :forget)
-            old_book.sheet(1)[1,1].Value.should == @old_value
+            old_book.sheet(1)[1,1].should == @old_value
           end
 
           it "should save the old book, close it, and open the new book, if :if_obstructed is :save" do
@@ -2736,7 +2738,7 @@ describe Workbook do
             new_book.should be_alive
             new_book.filename.downcase.should == @simple_file1.downcase
             old_book = Workbook.open(@simple_file_other_path1, :if_obstructed => :forget)
-            old_book.sheet(1)[1,1].Value.should == @new_value
+            old_book.sheet(1)[1,1].should == @new_value
             #old_book.ole_workbook.Worksheets.Count.should ==  @sheet_count + 1
             old_book.close
           end
@@ -2752,7 +2754,7 @@ describe Workbook do
             new_book.should be_alive
             new_book.filename.downcase.should == @simple_file1.downcase
             old_book = Workbook.open(@simple_file_other_path1, :if_obstructed => :forget)
-            old_book.sheet(1)[1,1].Value.should == @new_value
+            old_book.sheet(1)[1,1].should == @new_value
             #old_book.ole_workbook.Worksheets.Count.should ==  @sheet_count + 1
             old_book.close
           end
@@ -2767,11 +2769,11 @@ describe Workbook do
             new_book = Workbook.open(@simple_file1, :if_obstructed => :new_excel)
             @book.should be_alive
             @book.Saved.should be false
-            @book.sheet(1)[1,1].Value.should == @new_value
+            @book.sheet(1)[1,1].should == @new_value
             new_book.should be_alive
             new_book.filename.should_not == @book.filename
             new_book.excel.should_not == @book.excel
-            new_book.sheet(1)[1,1].Value.should == @book.sheet(1)[1,1].Value
+            new_book.sheet(1)[1,1].should == @book.sheet(1)[1,1]
           end
 
           it "should raise an error, if :if_obstructed is default" do
@@ -2917,8 +2919,8 @@ describe Workbook do
         book.ReadOnly.should be true
         book.should be_alive
         sheet = book.sheet(1)
-        old_cell_value = sheet[1,1].Value
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        old_cell_value = sheet[1,1]
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         book.Saved.should be false
         expect{
           new_book = Workbook.open(@simple_file1, :read_only => false, :if_unsaved => :accept)
@@ -2930,8 +2932,8 @@ describe Workbook do
         book.ReadOnly.should be false
         book.should be_alive
         sheet = book.sheet(1)
-        old_cell_value = sheet[1,1].Value
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        old_cell_value = sheet[1,1]
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         book.Saved.should be false
         expect{
           new_book = Workbook.open(@simple_file1, :read_only => true, :if_unsaved => :accept)
@@ -2943,8 +2945,8 @@ describe Workbook do
         book.ReadOnly.should be true
         book.should be_alive
         sheet = book.sheet(1)
-        old_cell_value = sheet[1,1].Value
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        old_cell_value = sheet[1,1]
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         book.Saved.should be false
         new_book = Workbook.open(@simple_file1, :read_only => false, :if_unsaved => :forget)
         new_book.ReadOnly.should be false 
@@ -2952,7 +2954,7 @@ describe Workbook do
         book.should_not be_alive   
         new_book.should_not == book 
         new_sheet = new_book.sheet(1)
-        new_cell_value = new_sheet[1,1].Value
+        new_cell_value = new_sheet[1,1]
         new_cell_value.should == old_cell_value
       end
 
@@ -2961,8 +2963,8 @@ describe Workbook do
         book.ReadOnly.should be false
         book.should be_alive
         sheet = book.sheet(1)
-        old_cell_value = sheet[1,1].Value        
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        old_cell_value = sheet[1,1]        
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         book.Saved.should be false
         expect{
           Workbook.open(@simple_file1, :read_only => true, :if_unsaved => :accept)
@@ -2974,13 +2976,13 @@ describe Workbook do
         book.ReadOnly.should be false
         book.should be_alive
         sheet = book.sheet(1)
-        old_cell_value = sheet[1,1].Value        
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        old_cell_value = sheet[1,1]        
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         book.Saved.should be false
         new_book = Workbook.open(@simple_file1, :read_only => true, :if_unsaved => :save)
         new_book.ReadOnly.should be true
         new_sheet = new_book.sheet(1)
-        new_cell_value = new_sheet[1,1].Value
+        new_cell_value = new_sheet[1,1]
         new_cell_value.should_not == old_cell_value
       end