robust_excel_ole 1.14 → 1.15

data/spec/general_spec.rb

@@ -41,25 +41,25 @@ module RobustExcelOle
         @book1 = Workbook.open(@simple_file)
       end
 
-      it "should promote an Excel" do
+      it "should type-lift an Excel" do
         excel = @book1.excel.ole_excel.to_reo
         excel.class.should == RobustExcelOle::Excel
         excel.should be_alive
       end
 
-      it "should promote a workbook" do
+      it "should type-lift a workbook" do
         workbook = @book1.ole_workbook.to_reo
         workbook.should be_a Workbook
         workbook.should be_alive
       end
 
-      it "should promote a worksheet" do
+      it "should type-lift a worksheet" do
         worksheet = @book1.sheet(1).ole_worksheet.to_reo
         worksheet.should be_kind_of Worksheet
         worksheet.name.should == "Sheet1"
       end
 
-      it "should promote a range" do
+      it "should type-lift a range" do
         range = @book1.sheet(1).range([1,1]).ole_range.to_reo
         range.should be_kind_of Range
         range.Value.should == "foo"

data/spec/reo_common_spec.rb

@@ -103,22 +103,26 @@ module RobustExcelOle
 
     describe "misc" do
 
-      LOG_TO_STDOUT = true
-      REOCommon::trace "foo"
+      it "should" do
 
-      LOG_TO_STDOUT = false
-      REOCommon::trace "foo"
+        LOG_TO_STDOUT = true
+        REOCommon::trace "foo"
 
-      REO_LOG_DIR = ""
-      REOCommon::trace "foo"
+        LOG_TO_STDOUT = false
+        REOCommon::trace "foo"
 
-      REO_LOG_DIR = "C:"
-      REOCommon::trace "foo"
+        REO_LOG_DIR = ""
+        REOCommon::trace "foo"
 
-      REOCommon::tr1 "foo"
+        #REO_LOG_DIR = "C:"
+        #REOCommon::trace "foo"
 
-      h = {:a => {:c => 4}, :b => 2}
-      REOCommon::puts_hash(h)
+        REOCommon::tr1 "foo"
+
+        h = {:a => {:c => 4}, :b => 2}
+        REOCommon::puts_hash(h)
+
+      end
  
     end
   end

data/spec/workbook_spec.rb

@@ -669,7 +669,7 @@ describe Workbook do
     end
   end
 
-  describe "promoting" do
+  describe "type-lifting" do
 
     context "with standard" do
 
@@ -681,7 +681,7 @@ describe Workbook do
         @book.close
       end
 
-      it "should promote a win32ole workbook object to a workbook object with an open workbook" do
+      it "should type-lift a win32ole workbook object to a workbook object with an open workbook" do
         workbook = @book.ole_workbook
         book1 = Workbook.new(workbook)
         book1.should be_a Workbook
@@ -1109,8 +1109,8 @@ describe Workbook do
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
-          book.excel.visible.should be false
-          book.excel.displayalerts.should == :if_visible
+          book.excel.properties[:visible].should be false
+          book.excel.properties[:displayalerts].should == :if_visible
         end
         new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)

data/spec/workbook_specs/workbook_misc_spec.rb

@@ -251,7 +251,7 @@ describe Workbook do
       excel2 = book1.excel
       excel2.should == excel1
       excel2.Visible.should be false
-      book2.Windows(book2.Name).Visible.should be false
+      book2.Windows(book2.Name).Visible.should be true
     end
 
     it "should keep the found Excel instance visible" do
@@ -264,7 +264,7 @@ describe Workbook do
       excel2 = book1.excel
       excel2.should == excel1
       excel2.Visible.should be true
-      book2.Windows(book2.Name).Visible.should be false
+      book2.Windows(book2.Name).Visible.should be true
     end
 
     it "should keep the found Excel instance visible with default visible true" do
@@ -292,17 +292,17 @@ describe Workbook do
       book2.Windows(book2.Name).Visible.should be true      
     end
 
-    it "should open the workbook visible if the workbook is new" do
+    it "should open the workbook not visible if the workbook is new" do
       book1 = Workbook.open(@simple_file1, :default => {:visible => true})
-      book1.excel.Visible.should be true
+      book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
-      book1.visible.should be true      
+      book1.visible.should be false      
     end
 
     it "should open the workbook invisible if the workbook is new" do
       book1 = Workbook.open(@simple_file1, :default => {:visible => false})
       book1.excel.Visible.should be false
-      book1.Windows(book1.Name).Visible.should be false
+      book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false      
     end
 
@@ -324,13 +324,13 @@ describe Workbook do
       book2 = Workbook.open(@simple_file1, :default => {:visible => true})
       excel2 = book2.excel
       book1.Windows(book1.Name).Visible.should be true
-      excel2.Visible.should be true  
-      book2.visible.should be true
+      excel2.Visible.should be false  
+      book2.visible.should be false
     end
 
     it "should open the workbook invisible if the old Excel is closed" do
       book1 = Workbook.open(@simple_file1, :default => {:visible => true})
-      book1.visible.should be true
+      book1.visible.should be false
       excel1 = book1.excel
       excel1.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
@@ -344,7 +344,6 @@ describe Workbook do
     end
 
   end
-
 =end
 
   describe "force-visible" do
@@ -375,7 +374,7 @@ describe Workbook do
       excel1.visible = true
       book1 = Workbook.open(@simple_file)
       excel1.Visible.should be true
-      excel1.visible.should be true
+      excel1.properties[:visible].should be true
       book1.visible.should be true
     end
 
@@ -587,30 +586,30 @@ describe Workbook do
     it "should set visible and displayalerts if displayalerts => :if_visible" do
       book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be false
-      book1.excel.displayalerts.should == :if_visible
+      book1.excel.properties[:displayalerts].should == :if_visible
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
       book2 = Workbook.open(@different_file)
       book2.excel.Visible.should be false
       book2.Windows(book2.Name).Visible.should be true
       book2.visible.should be false
-      book2.excel.visible.should be false
-      book2.excel.displayalerts.should == :if_visible
+      book2.excel.properties[:visible].should be false
+      book2.excel.properties[:displayalerts].should == :if_visible
       book2.excel.DisplayAlerts.should be false
     end
 
     it "should set visible and displayalerts if displayalerts => :if_visible" do
       book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be false
-      book1.excel.displayalerts.should == :if_visible
+      book1.excel.properties[:displayalerts].should == :if_visible
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
       book2 = Workbook.open(@different_file, :visible => true)
       book2.excel.Visible.should be true
       book2.Windows(book2.Name).Visible.should be true
       book2.visible.should be true
-      book2.excel.visible.should be true
-      book2.excel.displayalerts.should == :if_visible
+      book2.excel.properties[:visible].should be true
+      book2.excel.properties[:displayalerts].should == :if_visible
       book2.excel.DisplayAlerts.should be true
     end
   end
@@ -663,8 +662,8 @@ describe Workbook do
       it "should create and use a hidden Excel instance" do
         book2 = Workbook.open(@simple_file1, :force_excel => @book.bookstore.hidden_excel)
         book2.excel.should_not == @book.excel
-        book2.excel.visible.should be false
-        book2.excel.displayalerts.should == :if_visible
+        book2.excel.properties[:visible].should be false
+        book2.excel.properties[:displayalerts].should == :if_visible
         book2.close 
       end
     end

data/spec/workbook_specs/workbook_open_spec.rb

@@ -510,7 +510,7 @@ describe Workbook do
       book2.excel.should_not == book.excel
     end
 
-    it "should promote an open known workbook" do
+    it "should type-lift an open known workbook" do
       book = Workbook.open(@simple_file)
       ole_workbook = book.ole_workbook
       new_book = Workbook.new(ole_workbook)
@@ -520,7 +520,7 @@ describe Workbook do
       new_book.excel.should == book.excel
     end
 
-    it "should promote an open known workbook and let it be visible" do
+    it "should type-lift an open known workbook and let it be visible" do
       book = Workbook.open(@simple_file, :visible => true)
       ole_workbook = book.ole_workbook
       new_book = Workbook.new(ole_workbook)
@@ -532,7 +532,7 @@ describe Workbook do
       new_book.Windows(new_book.ole_workbook.Name).Visible.should == true
     end
 
-    it "should promote an open known workbook and let it be visible and readonly" do
+    it "should type-lift an open known workbook and let it be visible and readonly" do
       book = Workbook.open(@simple_file, :visible => true, :read_only => true)
       ole_workbook = book.ole_workbook
       new_book = Workbook.new(ole_workbook)
@@ -545,7 +545,7 @@ describe Workbook do
       new_book.ReadOnly.should == true
     end
 
-    it "should promote an open known workbook and make it visible" do
+    it "should type-lift an open known workbook and make it visible" do
       book = Workbook.open(@simple_file)
       ole_workbook = book.ole_workbook
       new_book = Workbook.new(ole_workbook, :visible => true)
@@ -557,7 +557,7 @@ describe Workbook do
       new_book.Windows(new_book.ole_workbook.Name).Visible.should == true
     end
 
-    it "should promote an open unknown workbook" do
+    it "should type-lift an open unknown workbook" do
       ole_excel = WIN32OLE.new('Excel.Application')
       ws = ole_excel.Workbooks
       abs_filename = General.absolute_path(@simple_file1)
@@ -567,7 +567,7 @@ describe Workbook do
       new_book.excel.Hwnd.should == ole_excel.Hwnd
     end
 
-    it "should promote an open unknown workbook and make it visible" do
+    it "should type-lift an open unknown workbook and make it visible" do
       ole_excel = WIN32OLE.new('Excel.Application')
       ws = ole_excel.Workbooks
       abs_filename = General.absolute_path(@simple_file1)
@@ -579,7 +579,7 @@ describe Workbook do
       new_book.Windows(new_book.ole_workbook.Name).Visible.should == true
     end
 
-    it "should promote an open unknown workbook and make it visible and readonly" do
+    it "should type-lift an open unknown workbook and make it visible and readonly" do
       ole_excel = WIN32OLE.new('Excel.Application')
       ws = ole_excel.Workbooks
       abs_filename = General.absolute_path(@simple_file1)

data/spec/workbook_specs/workbook_unobtr_spec.rb

@@ -35,8 +35,239 @@ describe Workbook do
     rm_tmp(@dir)
   end
 
+  describe "Workbook#for_reading, #for_modifying" do
+    
+    context "with standard" do
+
+      before do
+        @book = Workbook.open(@simple_file1)
+        @old_value = @book.sheet(1)[1,1].Value
+      end
+
+      after do
+        @book.close(:if_unsaved => :forget) if @book && @book.alive?
+      end
+
+      it "should not change the value" do
+        @book.for_reading do |book|
+          book.should be_a Workbook
+          book.should be_alive
+          book.Saved.should be true  
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+          book.Saved.should be false
+        end
+        @book.close(:if_unsaved => :forget)
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should == @old_value
+      end
+
+      it "should change the value" do
+        @book.for_modifying do |book|
+          book.should be_a Workbook
+          book.should be_alive
+          book.Saved.should be true  
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+          book.Saved.should be false
+        end
+        @book.close(:if_unsaved => :forget)
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should_not == @old_value
+      end
+
+      it "should not change the value and make visible" do
+        @book.for_reading(:visible => true) do |book|
+          book.should be_a Workbook
+          book.should be_alive
+          book.visible.should be true
+          book.Saved.should be true  
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+          book.Saved.should be false
+        end
+        @book.close(:if_unsaved => :forget)
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should == @old_value
+      end
+
+      it "should change the value and make visible" do
+        @book.for_modifying(:visible => true) do |book|
+          book.should be_a Workbook
+          book.should be_alive
+          book.visible.should be true
+          book.Saved.should be true  
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+          book.Saved.should be false
+        end
+        @book.close(:if_unsaved => :forget)
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should_not == @old_value
+      end
+
+    end
+ 
+  end
+
+  describe "Workbook#unobtrusively" do
+
+    context "with a writable saved workbook" do
+
+      before do
+        @book = Workbook.open(@simple_file1, :visible => true)
+        @old_value = @book.sheet(1)[1,1].Value
+      end
+
+      after do
+        @book.close(:if_unsaved => :forget) if @book && @book.alive?
+      end
+
+      it "should unobtrusively open, modify, and retain the status" do
+        @book.unobtrusively do |book|
+          book.saved.should be true
+          book.visible.should be true
+          book.writable.should be true
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+        end
+        @book.saved.should be true
+        @book.visible.should be true
+        @book.writable.should be true
+        @book.sheet(1)[1,1].Value.should_not == @old_value
+        @book.close
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should_not == @old_value
+      end
+
+      it "should unobtrusively open, modify, and not save the changes" do
+        @book.unobtrusively(:writable => false) do |book|
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+        end
+        @book.saved.should be true
+        @book.visible.should be true
+        @book.writable.should be true
+        @book.sheet(1)[1,1].Value.should_not == @old_value
+        @book.close
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should == @old_value
+      end
+
+      it "should unobtrusively open, modify, and save the changes" do
+        @book.unobtrusively(:writable => true) do |book|
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+        end
+        @book.saved.should be true
+        @book.visible.should be true
+        @book.writable.should be true
+        @book.sheet(1)[1,1].Value.should_not == @old_value
+        @book.close
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should_not == @old_value
+      end
+
+    end
+
+    context "with an writable unsaved workbook" do
+
+      before do
+        @book = Workbook.open(@simple_file1, :visible => true)
+        @old_value = @book.sheet(1)[1,1].Value
+        sheet = @book.sheet(1)
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+      end
+
+      after do
+        @book.close(:if_unsaved => :forget) if @book && @book.alive?
+      end
+
+      it "should unobtrusively open, modify, and retain the status" do
+        @book.unobtrusively do |book|
+          book.saved.should be false
+          book.visible.should be true
+          book.writable.should be true
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+        end
+        @book.saved.should be false
+        @book.visible.should be true
+        @book.writable.should be true
+        @book.sheet(1)[1,1].Value.should == @old_value
+        @book.close(:if_unsaved => :forget)
+        @book = Workbook.open(@simple_file1)
+        @book.sheet(1)[1,1].Value.should == @old_value
+      end
+
+      it "should unobtrusively open, modify, and not save the changes" do
+        @book.unobtrusively(:writable => false) do |book|
+          book.sheet(1)[1,1] = "bla"
+        end
+        @book.saved.should be false
+        @book.visible.should be true
+        @book.writable.should be true
+        @book.sheet(1)[1,1].Value.should == "bla"
+        @book.close(:if_unsaved => :forget)
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should == @old_value
+      end
+
+      it "should unobtrusively open, modify, and save the changes" do
+        @book.unobtrusively(:writable => true) do |book|
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+        end
+        @book.saved.should be false
+        @book.visible.should be true
+        @book.writable.should be true
+        @book.sheet(1)[1,1].Value.should == @old_value
+        @book.close(:if_unsaved => :forget)
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should == @old_value
+      end
+
+    end
+
+    context "with a closed workbook" do
+
+      before do
+        @book = Workbook.open(@simple_file1, :visible => true)
+        @old_value = @book.sheet(1)[1,1].Value
+        @book.close
+      end
+
+      after do
+        @book.close(:if_unsaved => :forget) if @book && @book.alive?
+      end
+
+      it "should unobtrusively open and close the workbook" do
+        @book.unobtrusively do |book|
+          book.should be_alive
+          book.saved.should be true
+          book.visible.should be true
+          book.writable.should be true
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+        end
+        @book.should_not be_alive
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should_not == @old_value
+      end
+
+      it "should unobtrusively open and and not close the workbook" do
+        @book.unobtrusively(:visible => true, :keep_open => true) do |book|
+          book.should be_alive
+          book.saved.should be true
+          book.visible.should be true
+          book.writable.should be true
+          book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+        end
+        @book.should be_alive
+        @book.saved.should be true
+        @book.visible.should be true
+        @book.writable.should be true
+        @book.sheet(1)[1,1].Value.should_not == @old_value
+        @book.close
+        new_book = Workbook.open(@simple_file1)
+        new_book.sheet(1)[1,1].Value.should_not == @old_value
+      end
+
+    end
+
+  end
   
-  describe "unobtrusively" do
+  describe "Workbook.unobtrusively" do
 
     # @private
     def unobtrusively_ok?
@@ -88,13 +319,13 @@ describe Workbook do
           @ole_e1 = WIN32OLE.new('Excel.Application')
           ws = @ole_e1.Workbooks
           @abs_filename = General.absolute_path(@simple_file1)
-          @ole_wb = ws.Open(abs_filename)
+          @ole_wb = ws.Open(@abs_filename)
           @old_value = @ole_wb.Worksheets.Item(1).Cells.Item(1,1).Value
         end
 
         it "should connect" do
-          Workbooks.unobtrusively(@simple_file1) do |book|
-            book.excel.Workbook.Count.should == 1
+          Workbook.unobtrusively(@simple_file1) do |book|
+            book.excel.Workbooks.Count.should == 1
             Excel.excels_number.should == 1
             book.FullName.should == General.absolute_path(@simple_file1)
             book.saved.should be true
@@ -108,22 +339,24 @@ describe Workbook do
         end
 
         it "should set visible => true and remain invisiblity" do
-          Workbooks.unobtrusively(@simple_file1, :visible => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :visible => true) do |book|
             book.saved.should be true
             book.visible.should be true
             book.writable.should be true
           end
           ole_wb = WIN32OLE.connect(@abs_filename)
           ole_wb.Saved.should be true
-          @ole_e1.Visible.should be false
+          @ole_e1.Visible.should be true
+          ole_wb.Windows(ole_wb.Name).Visible.should be false
           ole_wb.ReadOnly.should be false
         end
 
         it "should set read_only => true and remain writability" do
-          Workbooks.unobtrusively(@simple_file1, :read_only => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => true) do |book|
             book.saved.should be true
             book.visible.should be false
-            book.writable.should be false
+            book.ReadOnly.should be true
+            book.writable.should be false            
           end
           ole_wb = WIN32OLE.connect(@abs_filename)
           ole_wb.Saved.should be true
@@ -132,19 +365,21 @@ describe Workbook do
         end
 
         it "should set visible => true, read_only => true" do
-          Workbooks.unobtrusively(@simple_file1, :visible => true, :read_only => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :visible => true, :read_only => true) do |book|
             book.saved.should be true
             book.visible.should be true
+            book.ReadOnly.should be true
             book.writable.should be false
           end
           ole_wb = WIN32OLE.connect(@abs_filename)
           ole_wb.Saved.should be true
-          @ole_e1.Visible.should be false
+          @ole_e1.Visible.should be true
+          ole_wb.Windows(ole_wb.Name).Visible.should be false
           ole_wb.ReadOnly.should be false
         end
 
         it "should modify and remain saved-status" do
-          Workbooks.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             book.saved.should be true
             book.visible.should be false
             book.writable.should be true
@@ -163,7 +398,7 @@ describe Workbook do
         end
 
         it "should modify and remain saved-status and not save the new value when writable => false" do
-          Workbooks.unobtrusively(@simple_file1, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
             book.saved.should be true
             book.visible.should be false
             book.writable.should be true
@@ -189,13 +424,13 @@ describe Workbook do
           @ole_e1 = WIN32OLE.new('Excel.Application')
           ws = @ole_e1.Workbooks
           @abs_filename = General.absolute_path(@simple_file1)
-          @ole_wb = ws.Open(abs_filename)
+          @ole_wb = ws.Open(@abs_filename)
           @ole_e1.Visible = true
           @ole_wb.Windows(@ole_wb.Name).Visible = true
         end
 
         it "should remain visibility" do
-          Workbooks.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             book.saved.should be true
             book.visible.should be true
             book.writable.should be true
@@ -207,7 +442,7 @@ describe Workbook do
         end
 
         it "should set visible => false and remain visibility" do
-          Workbooks.unobtrusively(@simple_file1, :visible => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :visible => false) do |book|
             book.saved.should be true
             book.visible.should be false
             book.writable.should be true
@@ -226,17 +461,17 @@ describe Workbook do
           @ole_e1 = WIN32OLE.new('Excel.Application')
           ws = @ole_e1.Workbooks
           @abs_filename = General.absolute_path(@simple_file1)
-          @ole_wb = ws.Open(abs_filename)
+          @ole_wb = ws.Open(@abs_filename)
           @ole_e1.Visible = true
           @ole_wb.Windows(@ole_wb.Name).Visible = true
           @old_value = @ole_wb.Worksheets.Item(1).Cells.Item(1,1).Value
-          @ole_wb.Worksheets.Item(name).Cells.Item(1,1).Value = @old_value == "foo" ? "bar" : "foo"
+          @ole_wb.Worksheets.Item(1).Cells.Item(1,1).Value = @old_value = "foo" #== "foo" ? "bar" : "foo"
           @new_value = @ole_wb.Worksheets.Item(1).Cells.Item(1,1).Value
           @ole_wb.Saved.should be false
         end
 
         it "should connect and remain unsaved" do
-          Workbooks.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             book.saved.should be false
             book.visible.should be true
             book.writable.should be true
@@ -247,9 +482,19 @@ describe Workbook do
           ole_wb.ReadOnly.should be false
         end
 
+        it "should raise error" do
+          expect{
+            Workbook.unobtrusively(@simple_file1, :read_only => true) do |book|
+              book.saved.should be false
+              book.visible.should be true
+              book.writable.should be false
+            end
+          }.to raise_error(WorkbookNotSaved)
+        end
+
         it "should remain writable" do
-          Workbooks.unobtrusively(@simple_file1, :read_only => true) do |book|
-            book.saved.should be false
+          Workbook.unobtrusively(@simple_file1, :read_only => true, :if_unsaved => :save) do |book|
+            book.saved.should be true
             book.visible.should be true
             book.writable.should be false
           end
@@ -260,8 +505,8 @@ describe Workbook do
         end
 
         it "should remain unsaved when modifying" do
-          Workbooks.unobtrusively(@simple_file1) do |book|
-            book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+          Workbook.unobtrusively(@simple_file1) do |book|
+            book.sheet(1)[1,1] = "bar" #book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             @new_value = book.sheet(1)[1,1].Value
             book.saved.should be false
             book.visible.should be true
@@ -271,15 +516,18 @@ describe Workbook do
           ole_wb.Saved.should be false
           @ole_e1.Visible.should be true
           ole_wb.ReadOnly.should be false
-          ole_wb.Close
+          Excel.kill_all
           book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].value.should_not == @old_value
           book2.sheet(1)[1,1].value.should == @new_value
         end
 
         it "should not write with :writable => false" do
-          Workbooks.unobtrusively(@simple_file1, :writable => false) do |book|
-            book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+          @ole_wb.Worksheets.Item(1).Cells.Item(1,1).Value = @old_value = "foo" 
+          @ole_wb.Save
+          @ole_wb.Worksheets.Item(1).Cells.Item(1,1).Value = @old_value = "foo" 
+          Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
+            book.sheet(1)[1,1] = "bar" #book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             @new_value = book.sheet(1)[1,1].Value
             book.saved.should be false
             book.visible.should be true
@@ -289,7 +537,7 @@ describe Workbook do
           ole_wb.Saved.should be false
           @ole_e1.Visible.should be true
           ole_wb.ReadOnly.should be false
-          ole_wb.Close
+          Excel.kill_all
           book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].value.should == @old_value
           book2.sheet(1)[1,1].value.should_not == @new_value
@@ -303,14 +551,15 @@ describe Workbook do
           @ole_e1 = WIN32OLE.new('Excel.Application')
           ws = @ole_e1.Workbooks
           @abs_filename = General.absolute_path(@simple_file1)
-          @ole_wb = ws.Open(abs_filename, RobustExcelOle::XlUpdateLinksNever, true)
+          @ole_wb = ws.Open(@abs_filename, RobustExcelOle::XlUpdateLinksNever, true)
+          @old_value = @ole_wb.Worksheets.Item(1).Cells.Item(1,1).Value
           @ole_e1.Visible = true
           @ole_wb.Windows(@ole_wb.Name).Visible = true
           @ole_wb.ReadOnly.should be true
         end
 
         it "should connect and remain read-only" do
-          Workbooks.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             book.saved.should be true
             book.visible.should be true
             book.writable.should be false
@@ -322,8 +571,8 @@ describe Workbook do
         end
 
         it "should remain read-only" do
-          Workbooks.unobtrusively(@simple_file1, :read_only => false) do |book|
-            book.saved.should be false
+          Workbook.unobtrusively(@simple_file1, :read_only => false) do |book|
+            book.saved.should be true
             book.visible.should be true
             book.writable.should be true
           end
@@ -334,7 +583,25 @@ describe Workbook do
         end
 
         it "should remain read-only when modifying" do
-          Workbooks.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
+            book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+            @new_value = book.sheet(1)[1,1].Value
+            book.saved.should be false
+            book.visible.should be true
+            book.writable.should be false
+          end
+          ole_wb = WIN32OLE.connect(@abs_filename)
+          ole_wb.Saved.should be true
+          @ole_e1.Visible.should be true
+          ole_wb.ReadOnly.should be true
+          ole_wb.Close
+          book2 = Workbook.open(@simple_file1)
+          book2.sheet(1)[1,1].value.should == @old_value
+          book2.sheet(1)[1,1].value.should_not == @new_value
+        end
+
+        it "should remain read-only when modifying" do
+          Workbook.unobtrusively(@simple_file1, :read_only => false) do |book|
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             @new_value = book.sheet(1)[1,1].Value
             book.saved.should be false
@@ -352,7 +619,7 @@ describe Workbook do
         end
 
         it "should remain read-only when modifying" do
-          Workbooks.unobtrusively(@simple_file1, :read_only => false, :writable => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => false, :writable => true) do |book|
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             @new_value = book.sheet(1)[1,1].Value
             book.saved.should be false
@@ -370,7 +637,7 @@ describe Workbook do
         end
 
         it "should remain read-only when modifying and not save changes, when :writable => false" do
-          Workbooks.unobtrusively(@simple_file1, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => false, :read_only => false) do |book|
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             @new_value = book.sheet(1)[1,1].Value
             book.saved.should be false
@@ -388,7 +655,26 @@ describe Workbook do
         end
 
         it "should remain read-only when modifying and not save changes, when :writable => false" do
-          Workbooks.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
+            book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+            @new_value = book.sheet(1)[1,1].Value
+            book.saved.should be false
+            book.visible.should be true
+            book.writable.should be true
+          end
+          ole_wb = WIN32OLE.connect(@abs_filename)
+          ole_wb.Saved.should be true
+          @ole_e1.Visible.should be true
+          ole_wb.ReadOnly.should be true
+          ole_wb.Close
+          book2 = Workbook.open(@simple_file1)
+          book2.sheet(1)[1,1].value.should == @old_value
+          book2.sheet(1)[1,1].value.should_not == @new_value
+        end
+
+
+        it "should remain read-only when modifying and not save changes, when :writable => false" do
+          Workbook.unobtrusively(@simple_file1, :writable => false, :read_only => false) do |book|
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             @new_value = book.sheet(1)[1,1].Value
             book.saved.should be false
@@ -405,6 +691,43 @@ describe Workbook do
           book2.sheet(1)[1,1].value.should_not == @new_value
         end
 
+        it "should remain read-only when modifying and not save changes, even if :writable => true" do
+          Workbook.unobtrusively(@simple_file1, :writable => true) do |book|
+            book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+            @new_value = book.sheet(1)[1,1].Value
+            book.saved.should be false
+            book.visible.should be true
+            book.writable.should be false
+          end
+          ole_wb = WIN32OLE.connect(@abs_filename)
+          ole_wb.Saved.should be true
+          @ole_e1.Visible.should be true
+          ole_wb.ReadOnly.should be true
+          ole_wb.Close
+          book2 = Workbook.open(@simple_file1)
+          book2.sheet(1)[1,1].value.should == @old_value
+          book2.sheet(1)[1,1].value.should_not == @new_value
+        end
+
+        it "should remain read-only when modifying and not save changes, when :writable => false" do
+          Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
+            book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+            @new_value = book.sheet(1)[1,1].Value
+            book.saved.should be false
+            book.visible.should be true
+            book.writable.should be false
+          end
+          ole_wb = WIN32OLE.connect(@abs_filename)
+          ole_wb.Saved.should be true
+          @ole_e1.Visible.should be true
+          ole_wb.ReadOnly.should be true
+          Excel.kill_all
+          book2 = Workbook.open(@simple_file1)
+          book2.sheet(1)[1,1].value.should == @old_value
+          book2.sheet(1)[1,1].value.should_not == @new_value
+        end
+
+
       end
 
     end
@@ -464,7 +787,7 @@ describe Workbook do
           end
           Excel.current.Workbooks.Count.should == 0
           b1 = Workbook.open(@simple_file1)
-          b1.sheet(1)[1,1].Value.should_not == @old_value
+          b1.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should open as read-write" do
@@ -495,8 +818,8 @@ describe Workbook do
           Workbook.unobtrusively(@simple_file, :read_only => true) do |book|            
             book.ReadOnly.should be true
             @old_value = book.sheet(1)[1,1].Value
-            book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
-            book.Saved.should be false
+            #book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
+            #book.Saved.should be false
           end
           Excel.current.Workbooks.Count.should == 0
           b1 = Workbook.open(@simple_file1)
@@ -577,7 +900,7 @@ describe Workbook do
           end
           @book.close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].Value.should_not == @old_value
+          book2.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should open as read-write" do
@@ -607,18 +930,20 @@ describe Workbook do
         end
 
         it "should force to read-only" do
-          Workbook.unobtrusively(@simple_file1, :read_only => true) do |book|            
-            book.ReadOnly.should be true
-            book.should == @book
-            book.filename.should == @book.filename
-            book.excel.should == @book.excel
-            book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
-          end
-          @book.close
-          book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].Value.should == @old_value
+          expect{
+            Workbook.unobtrusively(@simple_file1, :if_unsaved => :forget, :read_only => true) do |book|            
+              book.ReadOnly.should be true
+              book.should == @book
+              book.filename.should == @book.filename
+              book.excel.should == @book.excel
+              book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
+            end
+            }.to raise_error(WorkbookReadOnly)
         end
 
+
+
+
         it "should force to read-only" do
           Workbook.unobtrusively(@simple_file1, :read_only => true, :writable => false) do |book|            
             book.ReadOnly.should be true
@@ -685,7 +1010,7 @@ describe Workbook do
 
         it "should open as read-write" do
           Workbook.unobtrusively(@simple_file1, :read_only => false) do |book|
-            book.Readonly.should be true
+            book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
             book.excel.should == @book.excel
@@ -693,7 +1018,7 @@ describe Workbook do
           end
           @book.close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].Value.should == @old_value
+          book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-write" do
@@ -709,9 +1034,9 @@ describe Workbook do
           book2.sheet(1)[1,1].Value.should == @old_value
         end
 
-        it "should force to read-write" do
+        it "should remain read-only even if writeble => true" do
           Workbook.unobtrusively(@simple_file1, :writable => true) do |book|
-            book.ReadOnly.should be false
+            book.ReadOnly.should be true
             book.should == @book
             book.filename.should == @book.filename
             book.excel.should == @book.excel
@@ -719,7 +1044,7 @@ describe Workbook do
           end
           @book.close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].Value.should_not == @old_value
+          book2.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should force to read-write" do
@@ -897,7 +1222,7 @@ describe Workbook do
         end
 
         it "should force to read-only" do
-          Workbook.unobtrusively(@simple_file1, :read_only => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => true, :if_unsaved => :save) do |book|
             book.ReadOnly.should be true
           end
           @book.Saved.should be false
@@ -906,7 +1231,7 @@ describe Workbook do
         end
 
         it "should force to read-only with writable false" do
-          Workbook.unobtrusively(@simple_file1, :read_only => true, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :if_unsaved => :save, :read_only => true, :writable => false) do |book|
             book.ReadOnly.should be true
           end
           @book.Saved.should be false
@@ -955,48 +1280,23 @@ describe Workbook do
         end
 
         it "should open as read-only" do
-          Workbook.unobtrusively(@simple_file1, :read_only => false) do |book|
-            book.Readonly.should be false
-            book.should == @book
-            book.filename.should == @book.filename
-            book.excel.should == @book.excel
-            book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
-          end
-          @book.Saved.should be false
-          @book.ReadOnly.should be true
-          @book.sheet(1)[1,1].Value.should_not == @old_value
-          @book.close
-          book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].Value.should_not == @old_value
+          expect{
+            Workbook.unobtrusively(@simple_file1, :if_unsaved => :accept, :read_only => false, :writable => false)
+          }.to raise_error(OptionInvalid)
         end
 
-        it "should open as read-only" do
-          Workbook.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
-            book.Readonly.should be false
-            book.should == @book
-            book.filename.should == @book.filename
-            book.excel.should == @book.excel
+        it "should remain read-only and not write, even with :writable => true" do
+          Workbook.unobtrusively(@simple_file1, :writable => true) do |book|
+            book.Readonly.should be true
+            book.Saved.should be false
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
-          @book.Saved.should be false
           @book.ReadOnly.should be true
           @book.sheet(1)[1,1].Value.should_not == @old_value
           @book.close
           book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
-    
-        it "should raise an error" do
-          expect{
-            Workbook.unobtrusively(@simple_file1, :writable => true)
-            }.to raise_error(NotImplementedREOError, "unsaved read-only workbook shall be written")
-        end
-
-        it "should raise an error" do
-           expect{
-            Workbook.unobtrusively(@simple_file1, :writable => true)
-            }.to raise_error(NotImplementedREOError, "unsaved read-only workbook shall be written")
-        end
 
         it "should force to read-only" do
           Workbook.unobtrusively(@simple_file1, :read_only => true) do |book|            
@@ -1097,21 +1397,20 @@ describe Workbook do
           book = Workbook.open(@simple_file1)
           book.sheet(1)[1,1].Value.should == @old_value 
         end
-
+=begin  
         it "should write in the outer and not in the inner block" do
-          Workbook.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1, :if_unsaved => :forget) do |book|
             @old_value = book.sheet(1)[1,1].Value
             book.ReadOnly.should be false
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
             book.Saved.should be false
             book.sheet(1)[1,1].Value.should_not == @old_value
-            Workbook.unobtrusively(@simple_file1, :read_only => true) do |book2|
+            Workbook.unobtrusively(@simple_file1, :if_unsaved => :forget, :read_only => true) do |book2|
               book2.should == book
               book2.ReadOnly.should be true
-              book2.Saved.should be false
-              book2.sheet(1)[1,1].Value.should_not == @old_value
+              book2.Saved.should be true
               book2.sheet(1)[1,1] = book2.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
-              book2.sheet(1)[1,1].Value.should == @old_value
+              #book2.sheet(1)[1,1].Value.should_not == @old_value
             end
             book.should be_alive
             book.Saved.should be false
@@ -1120,7 +1419,7 @@ describe Workbook do
           book = Workbook.open(@simple_file1)
           book.sheet(1)[1,1].Value.should_not == @old_value
         end
-
+=end        
         it "should write in the outer and not in the inner block" do
           Workbook.unobtrusively(@simple_file1) do |book|
             @old_value = book.sheet(1)[1,1].Value
@@ -1143,15 +1442,15 @@ describe Workbook do
           book = Workbook.open(@simple_file1)
           book.sheet(1)[1,1].Value.should == @old_value
         end
-
+=begin
         it "should be read-only in the outer and write in the inner block" do
-          Workbook.unobtrusively(@simple_file1, :read_only => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => true, :if_unsaved => :save) do |book|
             @old_value = book.sheet(1)[1,1].Value
             book.ReadOnly.should be true
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
             book.Saved.should be false
             book.sheet(1)[1,1].Value.should_not == @old_value
-            Workbook.unobtrusively(@simple_file1) do |book2|
+            Workbook.unobtrusively(@simple_file1, :if_unsaved => :save) do |book2|
               book2.should == book
               book2.ReadOnly.should be true
               book2.Saved.should be false
@@ -1167,7 +1466,7 @@ describe Workbook do
           book = Workbook.open(@simple_file1)
           book.sheet(1)[1,1].Value.should == @old_value
         end
-
+=end
       end
 
     end
@@ -1235,7 +1534,7 @@ describe Workbook do
           book1.ReadOnly.should be true
           book1.close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].Value.should_not == old_value
+          book2.sheet(1)[1,1].Value.should == old_value
         end
 
       end
@@ -1263,6 +1562,7 @@ describe Workbook do
 
         it "should remain check-compatibility false" do
           book1 = Workbook.open(@simple_file1, :check_compatibility => false)
+          book1.CheckCompatibility.should be false
           Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.CheckCompatibility.should be false
@@ -1270,6 +1570,7 @@ describe Workbook do
 
         it "should remain check-compatibility true" do
           book1 = Workbook.open(@simple_file1, :check_compatibility => true)
+          book1.CheckCompatibility.should be true
           Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.CheckCompatibility.should be true
@@ -1651,16 +1952,16 @@ describe Workbook do
         Workbook.unobtrusively(@simple_file1, :if_closed => :new) do |book|
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
-          book.excel.visible.should be false
-          book.excel.displayalerts.should == :if_visible
+          book.excel.properties[:visible].should be false
+          book.excel.properties[:displayalerts].should == :if_visible
           @another_excel = book.excel
         end
         Workbook.unobtrusively(@simple_file1, :if_closed => :current) do |book|
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
           book.excel.should == @another_excel
-          book.excel.visible.should be false
-          book.excel.displayalerts.should == :if_visible
+          book.excel.properties[:visible].should be false
+          book.excel.properties[:displayalerts].should == :if_visible
         end
       end
 
@@ -2011,7 +2312,7 @@ describe Workbook do
     end
   end
 
-  describe "promoting" do
+  describe "type-lifting" do
 
     context "with standard" do
 
@@ -2024,7 +2325,7 @@ describe Workbook do
         @book.close
       end
 
-      it "should promote" do
+      it "should type-lift" do
         Workbook.unobtrusively(@ole_workbook) do |book|
           book.should === @book
           book.equal?(@book).should be true
@@ -2057,7 +2358,8 @@ describe Workbook do
           book.Saved.should be false
           book.excel.should == @book.excel
         end
-        new_book = Workbook.open(@simple_file1, :visible => true)
+        Excel.kill_all
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should == @old_cell_value
       end
@@ -2071,7 +2373,8 @@ describe Workbook do
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should == another_excel
         end
-        new_book = Workbook.open(@simple_file1, :visible => true)
+        Excel.kill_all
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should == @old_cell_value
       end
@@ -2084,10 +2387,11 @@ describe Workbook do
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
-          book.excel.visible.should be false
-          book.excel.displayalerts.should == :if_visible
+          book.excel.properties[:visible].should be false
+          book.excel.properties[:displayalerts].should == :if_visible
         end
-        new_book = Workbook.open(@simple_file1, :visible => true)
+        Excel.kill_all
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should == @old_cell_value
       end
@@ -2126,8 +2430,8 @@ describe Workbook do
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
-          book.excel.visible.should be false
-          book.excel.displayalerts.should == :if_visible
+          book.excel.properties[:visible].should be false
+          book.excel.properties[:displayalerts].should == :if_visible
         end
         new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)