robust_excel_ole 1.10 → 1.11

data/lib/robust_excel_ole/worksheet.rb

@@ -180,6 +180,12 @@ module RobustExcelOle
       RobustExcelOle::Range.new(@ole_worksheet.Range(@ole_worksheet.Cells(integer_range.min, col), @ole_worksheet.Cells(integer_range.max, col)))
     end
 
+    def == other_worksheet
+      other_worksheet.is_a?(Worksheet) && 
+        self.workbook == other_worksheet.workbook &&
+        self.Name == other_worksheet.Name
+    end
+
     # @private
     def self.workbook_class  
       @workbook_class ||= begin

data/spec/bookstore_spec.rb

@@ -54,6 +54,11 @@ describe Bookstore do
     @simple_file_other_path = @dir + '/more_data/workbook.xls'
     @simple_file1 = @simple_file
     @different_file1 = @different_file
+
+    @file_path = "spec/data/workbook.xls"
+    @absolute_file_path = "C:/gim/ats/aSrc/gems/robust_excel_ole/spec/data/workbook.xls"
+    @network_path = "N:/data/workbook.xls"
+    @hostname_share_path = "DESKTOP-A3C5CJ6/spec/workbook.xls"
   end
 
   after do
@@ -125,11 +130,96 @@ describe Bookstore do
       end
     end
 
-
   end
 
-
   describe "fetch" do
+
+    before do
+      @file_path = "spec/data/workbook.xls"
+      @absolute_file_path = "C:/gim/ats/aSrc/gems/robust_excel_ole/spec/data/workbook.xls"
+      @network_path = "N:/data/workbook.xls"
+      @hostname_share_path = "//DESKTOP-A3C5CJ6/spec/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 = "//DESKTOP-A3C5CJ6/spec_not_existing/data/workbook.xls"
+    end
+
+    context "with stored network and hostname share path" do
+
+      it "should fetch to a given network path file the stored hostname_share_path file" do
+        @book1 = Workbook.open(@hostname_share_path)
+        @bookstore.store(@book1)
+        new_book = @bookstore.fetch(@network_path)
+        new_book.should be_a Workbook
+        new_book.should be_alive
+        new_book.should == @book1
+      end
+
+      it "should not fetch anything to a not existing network path file" do
+        @book1 = Workbook.open(@hostname_share_path)
+        @bookstore.store(@book1)
+        @bookstore.fetch(@network_path_not_existing).should == nil
+      end
+
+      it "should fetch to a given network path file the stored absolute path file" do
+        @book1 = Workbook.open(@absolute_file_path)
+        @bookstore.store(@book1)
+        new_book = @bookstore.fetch(@network_path)
+        new_book.should be_a Workbook
+        new_book.should be_alive
+        new_book.should == @book1
+      end
+
+      it "should not fetch anything to a not existing network path file the stored absolute path file" do
+        @book1 = Workbook.open(@absolute_file_path)
+        @bookstore.store(@book1)
+        @bookstore.fetch(@network_path_not_existing).should == nil
+      end
+
+      it "should fetch to a given hostname share path file the stored network path file" do
+        @book1 = Workbook.open(@network_path)
+        @bookstore.store(@book1)
+        new_book = @bookstore.fetch(@hostname_share_path)
+        new_book.should be_a Workbook
+        new_book.should be_alive
+        new_book.should == @book1
+      end
+
+      it "should fetch to a given hostname_share_path the stored absolute path file" do
+        @book1 = Workbook.open(@absolute_file_path)
+        @bookstore.store(@book1)
+        new_book = @bookstore.fetch(@hostname_share_path)
+        new_book.should be_a Workbook
+        new_book.should be_alive
+        new_book.should == @book1
+      end
+
+      it "should not fetch anything to a given hostname share path file" do
+        @book1 = Workbook.open(@absolute_file_path)
+        @bookstore.store(@book1)
+        @bookstore.fetch(@hostname_not_existing_share_path).should == nil
+        @bookstore.fetch(@hostname_share_not_existing_path).should == nil
+      end
+
+      it "should fetch to a given absolute path file the stored network path file" do
+        @book1 = Workbook.open(@network_path)
+        @bookstore.store(@book1)
+        new_book = @bookstore.fetch(@absolute_file_path)
+        new_book.should be_a Workbook
+        new_book.should be_alive
+        new_book.should == @book1
+      end
+
+      it "should fetch to a given absolute path file the stored hostname share file" do
+        @book1 = Workbook.open(@hostname_share_path)
+        @bookstore.store(@book1)
+        new_book = @bookstore.fetch(@absolute_file_path)
+        new_book.should be_a Workbook
+        new_book.should be_alive
+        new_book.should == @book1
+      end
+
+    end
     
     context "with one open book" do
       

data/spec/excel_spec.rb

@@ -30,6 +30,80 @@ module RobustExcelOle
       rm_tmp(@dir)
     end
 
+    context "with connect and preserving options" do
+
+      before do
+        @ole_excel = WIN32OLE.new('Excel.Application')        
+      end
+
+      it "should preserve visible false" do
+        @ole_excel.Visible.should be false
+        excel = Excel.current
+        excel.Hwnd.should == @ole_excel.Hwnd
+        excel.Visible.should be false
+      end
+
+      it "should preserve visible true" do
+        @ole_excel.Visible = true
+        @ole_excel.Visible.should be true
+        excel = Excel.current
+        excel.Hwnd.should == @ole_excel.Hwnd
+        excel.Visible.should be true
+      end
+
+      it "should set visible true" do
+        @ole_excel.Visible.should be false
+        excel = Excel.current(:visible => true)
+        excel.Visible.should be true
+      end
+
+      it "should set visible false" do
+        excel = Excel.current(:visible => false)
+        excel.Visible.should be false
+      end
+
+      it "should set visible false, even if it was true before" do
+        @ole_excel.Visible = true
+        @ole_excel.Visible.should be true
+        excel = Excel.current(:visible => false)
+        excel.Visible.should be false
+      end
+
+      it "should preserve displayalerts true" do
+        @ole_excel.DisplayAlerts.should be true
+        excel = Excel.current
+        excel.Hwnd.should == @ole_excel.Hwnd
+        excel.DisplayAlerts.should be true
+      end
+
+      it "should preserve displayalerts false" do
+        @ole_excel.DisplayAlerts = false
+        @ole_excel.DisplayAlerts.should be false
+        excel = Excel.current
+        excel.DisplayAlerts.should be false
+      end
+
+      it "should set displayalerts true" do
+        @ole_excel.DisplayAlerts.should be true
+        excel = Excel.current(:displayalerts => true)
+        excel.DisplayAlerts.should be true
+      end
+
+      it "should set displayalerts true, even if false before" do
+        @ole_excel.DisplayAlerts = false
+        @ole_excel.DisplayAlerts.should be false
+        excel = Excel.current(:displayalerts => true)
+        excel.DisplayAlerts.should be true
+      end
+
+      it "should set displayalerts false" do
+        @ole_excel.DisplayAlerts.should be true
+        excel = Excel.current(:displayalerts => false)
+        excel.DisplayAlerts.should be false
+      end
+
+    end
+
     context "with already open Excel instances and an open unsaved workbook" do
 
       before do
@@ -196,6 +270,13 @@ module RobustExcelOle
           @excel = @book.excel          
         end
 
+        it "lifts an Excel instance given as WIN32OLE object and has same Hwnd" do
+          app = WIN32OLE.new('Excel.Application')
+          ole_excel = WIN32OLE.connect("Excel.Application")  
+          reo_excel = Excel.new(ole_excel)
+          ole_excel.Hwnd.should == reo_excel.Hwnd  
+        end
+
         it "lifts an Excel instance given as WIN32Ole object" do    
           win32ole_excel = WIN32OLE.connect(@book.ole_workbook.Fullname).Application
           excel = Excel.new(win32ole_excel)
@@ -1726,6 +1807,8 @@ module RobustExcelOle
         @excel.Visible.should be true
         @excel.ScreenUpdating.should be true
         book = Workbook.open(@simple_file)
+        book.excel.calculation = :manual
+        book.save
         @excel.Calculation.should == XlCalculationManual
         book.close
       end
@@ -2043,10 +2126,10 @@ module RobustExcelOle
       it "should raise an error if name cannot be evaluated" do
         expect{
           @excel1.set_namevalue_glob("foo", 1)
-          }.to raise_error(NameNotFound, /name "foo"/)
+          }.to raise_error(RangeNotEvaluatable, /cannot assign value to range named "foo"/)
         expect{
           @excel1["foo"] = 1
-          }.to raise_error(NameNotFound, /name "foo"/)
+          }.to raise_error(RangeNotEvaluatable, /cannot assign value to range named "foo"/)
       end
 
       it "should color the cell" do
@@ -2110,7 +2193,7 @@ module RobustExcelOle
       it "should raise an error if name cannot be evaluated" do
         expect{
           @excel1.set_namevalue_glob("foo", 1)
-        }.to raise_error(NameNotFound, /name "foo" not in/)
+        }.to raise_error(RangeNotEvaluatable, /cannot assign value to range named "foo" in/)
       end
 
       it "should color the cell" do

data/spec/range_spec.rb

@@ -313,6 +313,18 @@ describe RobustExcelOle::Range do
 
   end
 
+  describe "==" do
+
+    it "should return true for identical ranges" do
+      @sheet.range([1..2,3..4]).should == @sheet.range([1..2,3..4])  
+    end
+
+    it "should return false for non-identical ranges" do
+      @sheet.range([3..4,1..2]).should_not == @sheet.range([1..2,3..4])  
+    end
+
+  end
+
   describe "#method_missing" do
     it "can access COM method" do
       @range.Range(@range.Cells.Item(1), @range.Cells.Item(3)).v.should eq [@range.values(0..2)]

data/spec/workbook_spec.rb

@@ -71,6 +71,7 @@ describe Workbook do
 
     it "should save a file, if it is open" do
       @book = Workbook.open(@simple_file)
+      @sheet = @book.sheet(1)
       @book.add_sheet(@sheet, :as => 'a_name')
       @new_sheet_count = @book.ole_workbook.Worksheets.Count
       expect {
@@ -82,6 +83,7 @@ describe Workbook do
 
     it "should not save a file, if it is not open" do
       @book = Workbook.open(@simple_file)
+      @sheet = @book.sheet(1)
       @book.add_sheet(@sheet, :as => 'a_name')
       @new_sheet_count = @book.ole_workbook.Worksheets.Count
       @book.close(:if_unsaved => :forget)
@@ -446,6 +448,56 @@ describe Workbook do
       end
     end
 
+    context "with :if_blocked" do
+
+      for i in 1..2 do
+
+        context "with and without reopen" do
+
+          before do   
+            if i == 1 then 
+              book_before = Workbook.open(@simple_file)
+              book_before.close
+            end
+            @book = Workbook.open(@simple_file_other_path1)
+            @sheet_count = @book.ole_workbook.Worksheets.Count
+            @sheet = @book.sheet(1)
+            @book.add_sheet(@sheet, :as => 'a_name')
+          end
+
+          after do
+            @book.close(:if_unsaved => :forget)
+            @new_book.close rescue nil
+          end
+
+          it "should save the old book, close it, and open the new book, if :if_blocked is :save" do
+            @new_book = Workbook.open(@simple_file1, :if_blocked => :save)
+            @book.should_not be_alive
+            @new_book.should be_alive
+            @new_book.filename.downcase.should == @simple_file1.downcase
+            old_book = Workbook.open(@simple_file_other_path1, :if_blocked => :forget)
+            old_book.ole_workbook.Worksheets.Count.should ==  @sheet_count + 1
+            old_book.close
+          end
+
+          it "should raise an error, if the old book is unsaved, and close the old book and open the new book, 
+              if :if_blocked is :close_if_saved" do
+            expect{
+              @new_book = Workbook.open(@simple_file1, :if_blocked => :close_if_saved)
+            }.to raise_error(WorkbookBlocked, /workbook with the same name in a different path is unsaved/)
+            @book.save
+            @new_book = Workbook.open(@simple_file1, :if_blocked => :close_if_saved)
+            @book.should_not be_alive
+            @new_book.should be_alive
+            @new_book.filename.downcase.should == @simple_file1.downcase
+            old_book = Workbook.open(@simple_file_other_path1, :if_blocked => :forget)
+            old_book.ole_workbook.Worksheets.Count.should ==  @sheet_count + 1
+            old_book.close
+          end
+        end
+      end
+    end
+
     context "with :if_obstructed" do
 
       for i in 1..2 do
@@ -520,8 +572,8 @@ describe Workbook do
         File.delete @simple_save_file rescue nil
         expect {
           Workbook.open(@simple_save_file)
-        }.to raise_error(FileNotFound, "file nil not found" +
-          "\nHint: If you want to create a new file, use option :if_absent => :create or Workbook::create")
+        }.to raise_error(FileNotFound, /not found/ )
+        #  "\nHint: If you want to create a new file, use option :if_absent => :create or Workbook::create")
       end
     end
 
@@ -618,7 +670,8 @@ describe Workbook do
 
     it "should preserve :visible if they are not set" do
       excel1 = Excel.create(:visible => true)
-      book1 = Workbook.open(@different_file, :default => {:excel => :new})
+      book1 = Workbook.open(@simple_file, :default => {:excel => :new})
+      book1.excel.should_not == excel1
       book1.excel.Visible.should be false
     end
 

data/spec/workbook_specs/workbook_open_spec.rb

@@ -25,12 +25,15 @@ describe Workbook do
     @simple_file_other_path = @dir + '/more_data/workbook.xls'
     @another_simple_file = @dir + '/another_workbook.xls'
     @linked_file = @dir + '/workbook_linked.xlsm'
-    @simple_file_xlsm = @dir + '/workbook.xls'
+    @simple_file_xlsm = @dir + '/workbook.xlsm'
     @simple_file_xlsx = @dir + '/workbook.xlsx'
     @simple_file1 = @simple_file
     @different_file1 = @different_file
     @simple_file_other_path1 = @simple_file_other_path
     @another_simple_file1 = @another_simple_file
+    @simple_file_direct = File.join(File.dirname(__FILE__), 'data') + '/workbook.xls'
+    @simple_file_via_network = File.join('N:/', 'data') + '/workbook.xls'
+
   end
 
   after do
@@ -38,13 +41,176 @@ describe Workbook do
     rm_tmp(@dir)
   end
 
+  describe "connecting to unknown workbooks" do
+
+     context "with none workbook" do
+
+      it "should open one new Excel with the worbook" do
+        book1 = Workbook.open(@simple_file1)
+        book1.should be_alive
+        book1.should be_a Workbook
+        Excel.excels_number.should == 1
+        book1.ReadOnly.should be false
+        book1.excel.Visible.should be false
+        book1.CheckCompatibility.should be false
+        book1.Saved.should be true
+      end
+
+      it "should set the options" do
+        book1 = Workbook.open(@simple_file1, :force => {:visible => true}, :check_compatibility => true)
+        book1.visible.should be true
+        book1.CheckCompatibility.should be true
+      end
+
+      it "should open in the given known Excel" do
+        excel1 = Excel.create
+        book1 = Workbook.open(@simple_file1)
+        book1.should be_alive
+        book1.should be_a Workbook
+        book1.excel.should == excel1
+        Excel.excels_number.should == 1        
+        book1.excel.Visible.should be false
+      end
+
+      it "should open in the given known visible Excel" do
+        excel1 = Excel.create(:visible => true)
+        book1 = Workbook.open(@simple_file1)
+        book1.should be_alive
+        book1.should be_a Workbook
+        book1.excel.should == excel1
+        Excel.excels_number.should == 1        
+        book1.excel.Visible.should be true
+      end
+
+      it "should open in the given known Excel" do
+        excel1 = Excel.create
+        book1 = Workbook.open(@simple_file1, :force => {:excel => :new})
+        book1.should be_alive
+        book1.should be_a Workbook
+        book1.excel.should_not == excel1
+        Excel.excels_number.should == 2        
+      end
+
+      it "should set the options in a given known Excel" do
+        excel1 = Excel.create
+        book1 = Workbook.open(@simple_file1, :force => {:visible => true}, :check_compatibility => true)
+        book1.visible.should be true
+        book1.CheckCompatibility.should be true
+      end
+
+      it "should open the workbook in the given Excel if there are only unknown Excels" do
+        ole_excel1 = WIN32OLE.new('Excel.Application')
+        book1 = Workbook.open(@simple_file1)
+        book1.should be_alive
+        book1.should be_a Workbook
+        Excel.excels_number.should == 1
+        book1.excel.ole_excel.Hwnd.should == ole_excel1.Hwnd
+      end
+
+    end
+
+    context "with one unknown workbook" do
+
+      before do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws = ole_e1.Workbooks
+        abs_filename = General.absolute_path(@simple_file1).tr('/','\\')
+        @ole_wb = ws.Open(abs_filename)
+      end
+
+      it "should connect to an unknown workbook" do
+        Workbook.open(@simple_file1) do |book|
+          book.filename.should == @simple_file1
+          book.should be_alive
+          book.should be_a Workbook
+          book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
+        end
+      end
+
+      it "should raise error when connecting to a blocking workbook with :if_blocked => :raise" do
+        expect{
+          Workbook.open(@simple_file_other_path1) 
+          }.to raise_error(WorkbookBlocked, /blocked by/)
+      end
+
+      it "should close the blocking workbook and open the new workbook with :if_blocked => :forget" do
+        new_book = Workbook.open(@simple_file_other_path1, :if_blocked => :forget)
+        expect{
+          @ole_wb.Name
+        }.to raise_error 
+        new_book.should be_alive
+        new_book.should be_a Workbook
+        new_book.Fullname.should == General.absolute_path(@simple_file_other_path1)
+      end      
+
+      it "should let the workbook open, if :if_unsaved is :raise" do        
+        @ole_wb.Worksheets.Add
+        expect{
+          new_book = Workbook.open(@simple_file1, :if_unsaved => :raise)
+          }.to raise_error(WorkbookNotSaved, /workbook is already open but not saved: "workbook.xls"/)
+      end
+
+      it "should let the workbook open, if :if_unsaved is :accept" do        
+        @ole_wb.Worksheets.Add
+        sheet_num = @ole_wb.Worksheets.Count
+        new_book = Workbook.open(@simple_file1, :if_unsaved => :accept)
+        new_book.should be_alive
+        new_book.should be_a Workbook
+        new_book.Worksheets.Count.should == sheet_num
+      end
+
+      it "should close the workbook, if :if_unsaved is :forget" do        
+        @ole_wb.Worksheets.Add
+        sheet_num = @ole_wb.Worksheets.Count
+        new_book = Workbook.open(@simple_file1, :if_unsaved => :forget)
+        new_book.should be_alive
+        new_book.should be_a Workbook
+        new_book.Worksheets.Count.should == sheet_num - 1
+      end
+
+    end
+
+    context "with several unknown workbooks" do
+
+      before do
+        ole_e1 = WIN32OLE.new('Excel.Application')
+        ws1 = ole_e1.Workbooks
+        abs_filename1 = General.absolute_path(@simple_file1).tr('/','\\')
+        @ole_wb1 = ws1.Open(abs_filename1)
+        ole_e2 = WIN32OLE.new('Excel.Application')
+        ws2 = ole_e2.Workbooks
+        abs_filename2 = General.absolute_path(@different_file1).tr('/','\\')
+        @ole_wb2 = ws2.Open(abs_filename2)
+      end
+
+      it "should connect to the 1st unknown workbook in the 1st Excel instance" do
+        Workbook.open(@simple_file1) do |book|
+          book.filename.should == @simple_file1
+          book.excel.ole_excel.Hwnd.should == @ole_wb1.Application.Hwnd
+        end
+      end
+
+      it "should connect to the 2nd unknown workbook in the 2nd Excel instance" do
+        Workbook.open(@different_file1) do |book|
+          book.filename.should == @different_file1
+          book.excel.ole_excel.Hwnd.should == @ole_wb2.Application.Hwnd
+        end
+      end
+
+    end
+
+
+
+  end
+
   describe "with already open Excel instances and an open unsaved workbook" do
 
     before do
       @ole_excel1 = WIN32OLE.new('Excel.Application')
       @ole_excel2 = WIN32OLE.new('Excel.Application')
       #@ole_workbook1 = @ole_excel1.Workbooks.Open(@simple_file1, { 'ReadOnly' => false })
-      @ole_workbook1 = @ole_excel1.Workbooks.Open(@simple_file1, nil, false)
+      abs_filename = General.absolute_path(@simple_file1).tr('/','\\')
+      @ole_workbook1 = @ole_excel1.Workbooks.Open(abs_filename, nil, false)
       @ole_workbook1.Worksheets.Add
     end
 
@@ -65,7 +231,7 @@ describe Workbook do
       end
 
       it "should fetch the workbook" do
-        new_book = Workbook.new(@ole_workbook1)
+        new_book = Workbook.new(@ole_workbook1, :if_unsaved => :forget)
         new_book.should be_a Workbook
         new_book.should be_alive
         new_book.ole_workbook.should == @ole_workbook1
@@ -146,16 +312,16 @@ describe Workbook do
       end
     end
 
-    context "with :if_obstructed" do
+    context "with :if_blocked" do
 
-      it "should raise an error, if :if_obstructed is :raise" do
+      it "should raise an error, if :if_blocked is :raise" do
         expect {
           new_book = Workbook.open(@simple_file_other_path1)
-        }.to raise_error(WorkbookBlocked, /blocked by a workbook with the same name in a different path/)
+        }.to raise_error(WorkbookBlocked, /blocked by/)
       end
 
-      it "should close the other book and open the new book, if :if_obstructed is :forget" do
-        new_book = Workbook.open(@simple_file_other_path1, :if_obstructed => :forget)
+      it "should close the other book and open the new book, if :if_blocked is :forget" do
+        new_book = Workbook.open(@simple_file_other_path1, :if_blocked => :forget)
         expect{
           @ole_workbook1.Name
         }.to raise_error 
@@ -186,20 +352,81 @@ describe Workbook do
 
   end
 
+  describe "network paths" do
+
+    it "should open the workbokk via network path" do
+      book1 = Workbook.open(@simple_file)
+      expect{
+        book2 = Workbook.open(@simple_file_via_network)
+      }.to_not raise_error
+      book1.should === book2
+      book1.Fullname.should == book2.Fullname
+    end
+
+  end
+
   describe "new" do
 
-    it "should simply create a new one" do
+    context "with transparency identity" do
+
+      before do
+        @book = Workbook.open(@simple_file1)        
+        abs_filename = General.absolute_path(@simple_file1).tr('/','\\')
+        @ole_book = WIN32OLE.connect(abs_filename)
+      end
+
+      after do
+        @book.close
+      end
+
+      it "should yield identical Workbook objects for identical Excel books after uplifting" do
+        book2 = Workbook.new(@ole_book)
+        book2.should === @book
+        book2.close
+      end
+
+      it "should yield different Workbook objects for different Excel books" do
+        book3 = Workbook.open(@different_file1)
+        abs_filename2 = General.absolute_path(@different_file1).tr('/','\\')
+        ole_book2 = WIN32OLE.connect(abs_filename2)
+        book2 = Workbook.new(ole_book2)
+        book2.should_not === @book
+        book2.close
+        book3.close
+      end
+
+    end
+
+    it "should simply create a new workbook given a file" do
       book = Workbook.new(@simple_file)
       book.should be_alive
       book.should be_a Workbook
     end
 
-    it "should set options" do
-      book = Workbook.new(@simple_file, :visible => true, :read_only => true, :force => {:excel => :new})
+    it "should create a new workbook given a file and set it visible" do
+      book = Workbook.new(@simple_file, :visible => true)
       book.should be_alive
       book.should be_a Workbook
       book.excel.Visible.should be true
       book.Windows(book.Name).Visible.should be true
+    end
+
+    it "should create a new workbook given a file and set it visible and readonly" do
+      book = Workbook.new(@simple_file, :visible => true, :read_only => true)
+      book.should be_alive
+      book.should be_a Workbook
+      book.excel.Visible.should be true
+      book.Windows(book.Name).Visible.should be true
+      book.ReadOnly.should be true
+    end
+
+    it "should create a new workbook given a file and set options" do
+      book = Workbook.new(@simple_file, :visible => true, :read_only => true, :force => {:excel => :new})
+      book.should be_alive
+      book.should be_a Workbook
+      book.excel.Visible.should be true
+      book.Windows(book.Name).
+      Visible.should be true
       book.ReadOnly.should be true
       book2 = Workbook.new(@different_file, :force => {:excel => :new}, :v => true)
       book2.should be_alive
@@ -210,6 +437,83 @@ describe Workbook do
       book2.excel.should_not == book.excel
     end
 
+    it "should uplift an open known workbook" do
+      book = Workbook.open(@simple_file)
+      ole_workbook = book.ole_workbook
+      new_book = Workbook.new(ole_workbook)
+      new_book.should == book
+      new_book.Fullname.should == book.Fullname
+      new_book.excel.should == book.excel
+    end
+
+    it "should uplift 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)
+      new_book.should == book
+      new_book.Fullname.should == book.Fullname
+      new_book.excel.should == book.excel
+      new_book.excel.Visible.should == true
+      new_book.Windows(new_book.ole_workbook.Name).Visible.should == true
+    end
+
+    it "should uplift 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)
+      new_book.should == book
+      new_book.Fullname.should == book.Fullname
+      new_book.excel.should == book.excel
+      new_book.excel.Visible.should == true
+      new_book.Windows(new_book.ole_workbook.Name).Visible.should == true
+      new_book.ReadOnly.should == true
+    end
+
+    it "should uplift 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)
+      new_book.should == book
+      new_book.Fullname.should == book.Fullname
+      new_book.excel.should == book.excel
+      new_book.excel.Visible.should == true
+      new_book.Windows(new_book.ole_workbook.Name).Visible.should == true
+    end
+
+    it "should uplift an open unknown workbook" do
+      ole_excel = WIN32OLE.new('Excel.Application')
+      ws = ole_excel.Workbooks
+      abs_filename = General.absolute_path(@simple_file1).tr('/','\\')
+      ole_workbook = ws.Open(abs_filename)
+      new_book = Workbook.new(ole_workbook)
+      new_book.Fullname.should == ole_workbook.Fullname
+      new_book.excel.Hwnd.should == ole_excel.Hwnd
+    end
+
+    it "should uplift 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).tr('/','\\')
+      ole_workbook = ws.Open(abs_filename)
+      new_book = Workbook.new(ole_workbook, :visible => true)
+      new_book.Fullname.should == ole_workbook.Fullname
+      new_book.excel.Hwnd.should == ole_excel.Hwnd
+      new_book.excel.Visible.should == true
+      new_book.Windows(new_book.ole_workbook.Name).Visible.should == true
+    end
+
+    it "should uplift 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).tr('/','\\')
+      ole_workbook = ws.Open(abs_filename)
+      new_book = Workbook.new(ole_workbook, :visible => true)
+      new_book.Fullname.should == ole_workbook.Fullname
+      new_book.excel.Hwnd.should == ole_excel.Hwnd
+      new_book.excel.Visible.should == true
+      new_book.Windows(new_book.ole_workbook.Name).Visible.should == true
+    end
+
   end
 
   describe "open" do
@@ -545,48 +849,6 @@ describe Workbook do
         @book.close rescue nil
       end
 
-      it "should open not in the reserved Excel instance" do
-        Excel.kill_all
-        sleep 1
-        book2 = Workbook.open(@simple_file1, :force => {:excel => :reserved_new})
-        Excel.current.should_not == book2.excel
-        book3 = Workbook.open(@different_file1, :default => {:excel => :current})
-        book3.excel.should_not == book2.excel
-        book4 = Workbook.open(@another_simple_file1, :default => {:excel => :new})
-        book4.excel.should_not == book2.excel
-        book4.close
-        sleep 1
-        book5 = Workbook.open(@another_simple_file1, :default => {:excel => :reserved_new})
-        book5.excel.should_not == book2.excel
-      end
-
-      it "should open in the reserved Excel instance" do
-        excel1 = @book.excel
-        @book.close
-        book2 = Workbook.open(@simple_file1, :force => {:excel => :reserved_new})
-        book2.excel.should_not == excel1
-      end
-
-      it "should open in the reserved Excel instance" do
-        book2 = Workbook.open(@simple_file1, :force => {:excel => :reserved_new})
-        book3 = Workbook.open(@different_file1, :force => {:excel => :reserved_new})
-        book4 = Workbook.open(@another_simple_file1, :force => {:excel => :new})
-        book5 = Workbook.open(@another_simple_file1, :force => {:excel => :current})
-        book2.excel.should_not == @book.excel
-        book3.excel.should_not == book2.excel
-        book4.excel.should_not == @book.excel
-        book4.excel.should_not == book2.excel
-        book5.excel.should == @book.excel
-      end
-
-      it "should open in the reserved Excel instance" do
-        book2 = Workbook.open(@another_simple_file1, :force => {:excel => :new})
-        book3 = Workbook.open(@different_file1, :force => {:excel => :reserved_new})
-        book2.excel.should_not == @book.excel
-        book3.excel.should_not == @book.excel
-        book3.excel.should_not == book2.excel
-      end
-
       it "should open in a given Excel provided as Excel, Workbook, or WIN32OLE representing an Excel or Workbook" do
         book2 = Workbook.open(@another_simple_file)
         book3 = Workbook.open(@different_file)
@@ -1057,112 +1319,6 @@ describe Workbook do
         @book.close rescue nil
       end
 
-      context "with :default => {:excel => :reserved_new}" do
-
-        it "should open in the reserved Excel instance" do
-          book3 = Workbook.open(@different_file1, :default => {:excel => :reserved_new})
-          book3.excel.should_not == @book.excel
-        end
-
-        it "should open in separate Excel instances" do
-          Excel.kill_all
-          sleep 1
-          book2 = Workbook.open(@simple_file1, :default => {:excel => :reserved_new})
-          book3 = Workbook.open(@different_file1, :default => {:excel => :reserved_new})
-          book2.excel.should_not == book3.excel
-          book4 = Workbook.open(@another_simple_file1, :default => {:excel => :current})
-          book4.excel.should_not == book2.excel
-          book4.excel.should_not == book3.excel
-        end
-
-        it "should use the open book" do
-          book2 = Workbook.open(@simple_file1, :default => {:excel => :reserved_new})
-          book2.excel.should == @book.excel
-          book2.should be_alive
-          book2.should be_a Workbook
-          book2.should == @book
-          book2.close
-        end
-
-        it "should open in the old Excel instance" do
-          @book.close
-          book2 = Workbook.open(@simple_file1, :default => {:excel => :reserved_new})
-          book2.should be_alive
-          book2.should be_a Workbook
-          book2.should == @book
-          book2.excel.should == @book.excel
-        end
-
-        it "should open one book in the reserved Excel instance" do
-          book3 = Workbook.open(@different_file1, :default => {:excel => :reserved_new})
-          @book.close
-          book2 = Workbook.open(@simple_file1, :default => {:excel => :reserved_new})
-          book2.excel.should_not == book3.excel
-        end
-
-        it "should not use the reserved Excel instance" do
-          book3 = Workbook.open(@different_file1, :default => {:excel => :reserved_new})
-          @book.close
-          book2 = Workbook.open(@simple_file1, :default => {:excel => :new})
-          book2.excel.should_not == book3.excel
-        end
-
-        it "should not reopen in the reserved Excel instance" do
-          book3 = Workbook.open(@different_file1, :default => {:excel => :reserved_new})
-          @book.close
-          @book.reopen
-          @book.excel.should_not == book3.excel
-        end
-
-        it "should reopen in the reserved Excel instance" do
-          book3 = Workbook.open(@different_file1, :default => {:excel => :reserved_new})
-          @book.close
-          book3.close
-          @book.reopen
-          book3.reopen
-          @book.excel.should_not == book3.excel
-        end
-
-        it "should not reopen in the reserved Excel instance when opened the reserved Excel instance first" do
-          Excel.kill_all
-          sleep 1
-          book1 = Workbook.open(@simple_file1, :default => {:excel => :reserved_new})
-          book2 = Workbook.open(@different_file1, :default => {:excel => :new})
-          book2.excel.should_not == book1.excel
-          book3 = Workbook.open(@another_simple_file1, :default => {:excel => :current})
-          book3.excel.should_not == book1.excel
-          book2.close
-          book2.reopen
-          book2.excel.should_not == book1.excel
-          book3.close
-          book3.reopen
-          book3.excel.should_not == book1.excel
-          book1.close
-          book1.reopen
-          book1.excel.should_not == book2.excel
-          book1.excel.should_not == book3.excel
-        end
-
-        it "should open several workbooks in the reserved Excel instance" do
-          book2 = Workbook.open(@different_file1, :default => {:excel => :reserved_new})
-          book3 = Workbook.open(@another_simple_file1, :default => {:excel => :reserved_new})
-          book2.excel.should_not == @book.excel
-          book3.excel.should_not == @book.excel
-          book2.excel.should_not == book3.excel
-        end
-
-        it "should open several workbooks in the reserved Excel instance" do
-          Excel.kill_all
-          book1 = Workbook.open(@simple_file1, :default => {:excel => :reserved_new})
-          book2 = Workbook.open(@different_file1, :default => {:excel => :current})
-          book3 = Workbook.open(@another_simple_file1, :default => {:excel => :current})
-          book2.excel.should_not == book1.excel
-          book3.excel.should_not == book1.excel
-          book2.excel.should == book3.excel
-        end
-
-      end
-
       context "with :default => {:excel => :current}" do
 
         it "should use the open book" do
@@ -1753,7 +1909,7 @@ describe Workbook do
 
     it "should new_excel" do
       book = Workbook.open(@simple_file1)
-      book.sheet(1)[1,1].Value = "f"
+      book.sheet(1)[1,1].Value = "foo"
       book.Saved.should be false
       book2 = Workbook.open(@simple_file1, :if_unsaved => :new_excel)
     end
@@ -1872,7 +2028,7 @@ describe Workbook do
           it "should raise an error, if :if_obstructed is :raise" do
             expect {
               new_book = Workbook.open(@simple_file1, :if_obstructed => :raise)
-            }.to raise_error(WorkbookBlocked, /blocked by a workbook with the same name in a different path/)
+            }.to raise_error(WorkbookBlocked, /blocked by/)
           end
 
           it "should close the other book and open the new book, if :if_obstructed is :forget" do
@@ -1925,22 +2081,23 @@ describe Workbook do
             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 == @old_value
+            new_book.sheet(1)[1,1].Value.should == @book.sheet(1)[1,1].Value
           end
 
           it "should raise an error, if :if_obstructed is default" do
             expect {
               new_book = Workbook.open(@simple_file1)              
-            }.to raise_error(WorkbookBlocked, /blocked by a workbook with the same name in a different path/)
+            }.to raise_error(WorkbookBlocked, /blocked by/)
           end         
 
           it "should raise an error, if :if_obstructed is invalid option" do
             expect {
               new_book = Workbook.open(@simple_file1, :if_obstructed => :invalid_option)
-            }.to raise_error(OptionInvalid, ":if_obstructed: invalid option: :invalid_option" +
-              "\nHint: Use the option :if_obstructed with values :forget or :save,
-             to close the old workbook, without or with saving before, respectively,
-             and to open the new workbook")
+            }.to raise_error(OptionInvalid)  
+            #}.to raise_error(OptionInvalid, ":if_obstructed: invalid option: :invalid_option" +
+            #  "\nHint: Use the option :if_obstructed with values :forget or :save,
+            # to close the old workbook, without or with saving before, respectively,
+            # and to open the new workbook")
           end
         end
       end
@@ -2012,7 +2169,8 @@ describe Workbook do
         File.delete @simple_save_file rescue nil
         expect {
           Workbook.open(@simple_save_file)
-        }.to raise_error(FileNotFound, "file #{General::absolute_path(@simple_save_file).gsub("/","\\").inspect} not found")
+        }.to raise_error(FileNotFound, "file #{General::absolute_path(@simple_save_file).gsub("/","\\").inspect} not found" +
+          "\nHint: If you want to create a new file, use option :if_absent => :create or Workbook::create")
       end
 
     end
@@ -2175,15 +2333,16 @@ describe Workbook do
         book.close
       end
 
-      #it "should open xlsm file" do
-      #  book = Workbook.open(@simple_file_xlsm, :visible => true)
-      #  book.close
-      #end
+      it "should open xlsm file" do
+        book = Workbook.open(@simple_file_xlsm, :visible => true)
+        book.close
+      end
 
       it "should open xlsx file" do
         book = Workbook.open(@simple_file_xlsx, :visible => true)
         book.close
       end
+      
     end
 
 
@@ -2230,27 +2389,5 @@ describe Workbook do
         @book.should === book1
       end
     end
-  end
-
-  describe "uplifting" do
-
-    context "with standard" do
-
-      before do
-        @book = Workbook.open(@simple_file)
-      end
-
-      after do
-        @book.close
-      end
-
-      it "should uplift a workbook to a book with an open book" do
-        workbook = @book.ole_workbook
-        book1 = Workbook.new(workbook)
-        book1.should be_a Workbook
-        book1.should be_alive
-        book1.should == @book
-      end
-    end
-  end
+  end  
 end