robust_excel_ole 0.3.6 → 0.3.7

data/lib/robust_excel_ole/version.rb

@@ -1,3 +1,3 @@
 module RobustExcelOle
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/spec/book_specs/book_close_spec.rb

@@ -29,7 +29,7 @@ describe Book do
   end
 
   after do
-    Excel.close_all
+    Excel.kill_all
     rm_tmp(@dir)
   end
 
@@ -89,6 +89,15 @@ describe Book do
         }.to raise_error(ExcelErrorClose, /workbook is unsaved: "workbook.xls"/)
       end
 
+      it "should keep the book open" do
+        ole_workbook = @book.workbook
+        excel = @book.excel
+        excel.Workbooks.Count.should == 1
+        @book.close(:if_unsaved => :keep_open)
+        excel.Workbooks.Count.should == 1
+        @book.should be_alive
+      end
+
       it "should close the book and leave its file untouched with option :forget" do
         ole_workbook = @book.workbook
         excel = @book.excel

data/spec/book_specs/book_misc_spec.rb

@@ -29,7 +29,7 @@ describe Book do
   end
 
   after do
-    Excel.close_all
+    Excel.kill_all
     rm_tmp(@dir)
   end
 

data/spec/book_specs/book_open_spec.rb

@@ -13,8 +13,7 @@ describe Book do
     excel = Excel.new(:reuse => true)
     open_books = excel == nil ? 0 : excel.Workbooks.Count
     puts "*** open books *** : #{open_books}" if open_books > 0
-    #Excel.close_all
-    Excel.kill_all
+    Excel.close_all
   end
 
   before do
@@ -31,12 +30,87 @@ describe Book do
 
   after do
     Excel.kill_all
-    #Excel.close_all
     rm_tmp(@dir)
   end
 
   describe "open" do
 
+    context "with class identifier 'Workbook'" do
+
+      before do
+        @book = Workbook.open(@simple_file)
+      end
+
+      after do
+        @book.close rescue nil
+      end
+
+      it "should open in a new Excel" do
+        book2 = Workbook.open(@simple_file, :force_excel => :new)
+        book2.should be_alive
+        book2.should be_a Book
+        book2.excel.should_not == @book.excel 
+        book2.should_not == @book
+        @book.Readonly.should be_false
+        book2.Readonly.should be_true
+        book2.close
+      end
+    end
+
+    context "lift a workbook to a Book object" do
+
+      before do
+        @book = Book.open(@simple_file)
+      end
+
+      after do
+        @book.close
+      end
+
+      it "should fetch the workbook" do
+        workbook = @book.workbook
+        new_book = Book.new(workbook)
+        new_book.should be_a Book
+        new_book.should be_alive
+        new_book.should == @book
+        new_book.filename.should == @book.filename
+        new_book.excel.should == @book.excel
+        new_book.excel.Visible.should be_false
+        new_book.excel.DisplayAlerts.should be_false
+        new_book.should === @book
+        new_book.close
+      end
+
+      it "should fetch the workbook" do
+        workbook = @book.workbook
+        new_book = Book.new(workbook, :visible => true)
+        new_book.should be_a Book
+        new_book.should be_alive
+        new_book.should == @book
+        new_book.filename.should == @book.filename
+        new_book.excel.should == @book.excel
+        new_book.excel.Visible.should be_true
+        new_book.excel.DisplayAlerts.should be_false
+        new_book.should === @book
+        new_book.close
+      end
+
+      it "should yield an identical Book and set visible and displayalerts values" do
+        workbook = @book.workbook
+        new_book = Book.new(workbook, :visible => true, :displayalerts => true)
+        new_book.should be_a Book
+        new_book.should be_alive
+        new_book.should == @book
+        new_book.filename.should == @book.filename
+        new_book.excel.should == @book.excel
+        new_book.should === @book
+        new_book.excel.visible.should be_true
+        new_book.excel.displayalerts.should be_true
+        new_book.close
+      end
+
+    end
+
     context "with standard options" do
       before do
         @book = Book.open(@simple_file)
@@ -149,6 +223,24 @@ describe Book do
         @book.close rescue nil
       end
 
+      it "should open in a given Excel provided as Excel, Book, or WIN32OLE representing an Excel or Workbook" do
+        book2 = Book.open(@another_simple_file)
+        book3 = Book.open(@different_file)
+        book3 = Book.open(@simple_file, :force_excel => book2.excel)
+        book3.excel.should === book2.excel
+        book4 = Book.open(@simple_file, :force_excel => @book) 
+        book4.excel.should === @book.excel
+        book3.close
+        book4.close
+        book5 = Book.open(@simple_file, :force_excel => book2.workbook)
+        book5.excel.should ===  book2.excel
+        win32ole_excel1 = WIN32OLE.connect(@book.workbook.Fullname).Application
+        puts "win32ole_excel1: #{win32ole_excel1}"
+        book6 = Book.open(@simple_file, :force_excel => win32ole_excel1)
+        book6.excel.should === @book.excel
+      end
+
+
       it "should open in a new Excel" do
         book2 = Book.open(@simple_file, :force_excel => :new)
         book2.should be_alive
@@ -225,12 +317,8 @@ describe Book do
       end
 
       it "should raise an error if no Excel or Book is given" do
-        book2 = Book.open(@simple_file, :force_excel => :new)
-        book2.excel.should_not == @book.excel
-        book2.close
-        @book.close
         expect{
-          Book.open(@simple_file, :force_excel => :book)
+          Book.open(@simple_file, :force_excel => :b)
           }.to raise_error(ExcelError, "receiver instance is neither an Excel nor a Book")
       end
 

data/spec/book_specs/book_save_spec.rb

@@ -29,7 +29,7 @@ describe Book do
   end
 
   after do
-    Excel.close_all
+    Excel.kill_all
     rm_tmp(@dir)
   end
 

data/spec/book_specs/book_sheet_spec.rb

@@ -29,7 +29,7 @@ describe Book do
   end
 
   after do
-    Excel.close_all
+    Excel.kill_all
     rm_tmp(@dir)
   end
 

data/spec/book_specs/book_spec.rb

@@ -29,7 +29,7 @@ describe Book do
   end
 
   after do
-    Excel.close_all
+    Excel.kill_all
     rm_tmp(@dir)
   end
 
@@ -47,6 +47,37 @@ describe Book do
 
   describe "open" do
 
+    context "with various file formats" do
+
+      it "should open linked workbook" do
+        book = Book.open(@linked_file, :visible => true)
+        book.close
+      end
+    end
+
+
+    context "with class identifier 'Workbook'" do
+
+      before do
+        @book = Workbook.open(@simple_file)
+      end
+
+      after do
+        @book.close rescue nil
+      end
+
+      it "should open in a new Excel" do
+        book2 = Workbook.open(@simple_file, :force_excel => :new)
+        book2.should be_alive
+        book2.should be_a Book
+        book2.excel.should_not == @book.excel 
+        book2.should_not == @book
+        @book.Readonly.should be_false
+        book2.Readonly.should be_true
+        book2.close
+      end
+    end
+
     context "lift a workbook to a Book object" do
 
       before do
@@ -57,27 +88,23 @@ describe Book do
         @book.close
       end
 
-      it "should yield an identical Book" do
+      it "should yield an identical Book and set visible and displayalerts values" do
         workbook = @book.workbook
-        new_book = Book.new(workbook)
+        new_book = Book.new(workbook, :visible => true, :displayalerts => true)
         new_book.should be_a Book
         new_book.should be_alive
         new_book.should == @book
         new_book.filename.should == @book.filename
         new_book.excel.should == @book.excel
         new_book.should === @book
+        new_book.excel.visible.should be_true
+        new_book.excel.displayalerts.should be_true
         new_book.close
       end
-    end
 
-    context "with various file formats" do
-
-      it "should open linked workbook" do
-        book = Book.open(@linked_file, :visible => true)
-        book.close
-      end
     end
 
+
     context "with standard options" do
       before do
         @book = Book.open(@simple_file)
@@ -208,6 +235,25 @@ describe Book do
         book2.excel.should_not == @book.excel
         book2.close
       end
+
+      it "should open in a given Excel provided as Excel, Book, or WIN32OLE representing an Excel or Workbook" do
+        book2 = Book.open(@another_simple_file)
+        book3 = Book.open(@different_file, :default_excel => book2.excel)
+        book3.excel.should === book2.excel
+        book3.close
+        book4 = Book.open(@different_file, :default_excel => book2) 
+        book4.excel.should === book2.excel
+        book4.close
+        book5 = Book.open(@different_file, :default_excel => book2.workbook)
+        book5.excel.should ===  book2.excel
+        book5.close
+        win32ole_excel1 = WIN32OLE.connect(book2.workbook.Fullname).Application
+        book6 = Book.open(@different_file, :default_excel => win32ole_excel1)
+        book6.excel.should === book2.excel
+        book6.close
+      end
+
+
     end
 
     context "with :if_unsaved" do

data/spec/book_specs/book_subclass_spec.rb

@@ -26,7 +26,7 @@ describe "subclassed Book" do
   end
 
   after do
-    RobustExcelOle::Excel.close_all
+    RobustExcelOle::Excel.kill_all
     rm_tmp(@dir)
   end
 

data/spec/book_specs/book_unobtr_spec.rb

@@ -29,7 +29,7 @@ describe Book do
   end
 
   after do
-    Excel.close_all
+    Excel.kill_all
     rm_tmp(@dir)
   end
 

data/spec/bookstore_spec.rb

@@ -55,7 +55,7 @@ describe Bookstore do
 
   after do
     begin
-      Excel.close_all
+      Excel.kill_all
     rescue WeakRef::RefError => msg
       puts "#{msg.message}"
       Excel.kill_all

data/spec/excel_spec.rb

@@ -11,8 +11,7 @@ module RobustExcelOle
   describe Excel do
 
     before(:all) do
-      Excel.kill_all
-      #Excel.close_all
+      Excel.close_all
     end
 
     before do
@@ -25,7 +24,6 @@ module RobustExcelOle
     end
 
     after do
-      #Excel.close_all
       Excel.kill_all
       rm_tmp(@dir)
     end
@@ -75,20 +73,37 @@ module RobustExcelOle
         @excel.should_not == excel
       end
 
-      it "should work with reusing (uplifting) an Excel given as WIN32Ole object" do
-        excel0 = Excel.create
-        book = Book.open(@simple_file)
-        excel = book.excel
-        win32ole_excel = WIN32OLE.connect(book.workbook.Fullname).Application
-        @excel = Excel.new(:reuse => win32ole_excel)
-        creation_ok?
-        @excel.should be_a Excel
-        @excel.should be_alive
-        @excel.should == excel
+      context "lifting an Excel instance given as WIN32Ole object" do
+
+        before do
+          @book = Book.open(@simple_file)
+          @excel = @book.excel          
+        end
+
+        it "lifts an Excel instance given as WIN32Ole object" do    
+          win32ole_excel = WIN32OLE.connect(@book.workbook.Fullname).Application
+          excel = Excel.new(win32ole_excel)
+          excel.should be_a Excel
+          excel.should be_alive
+          excel.should === @excel
+        end
+
+        it "lifts an Excel instance given as WIN32Ole object with options" do    
+          @excel.Visible = true
+          @excel.DisplayAlerts = true
+          win32ole_excel = WIN32OLE.connect(@book.workbook.Fullname).Application
+          excel = Excel.new(win32ole_excel)
+          excel.should be_a Excel
+          excel.should be_alive
+          excel.should === @excel
+          excel.Visible.should be_true
+          excel.DisplayAlerts.should be_true
+        end
+
       end
     end
 
-    context "with identity transparence" do
+    context "identity transparence" do
 
       before do
         @excel1 = Excel.create
@@ -149,52 +164,113 @@ module RobustExcelOle
 
     end
 
-    context "with recreating Excel instances" do
+    context "recreating Excel instances" do
 
-      it "should recreate a single Excel instance" do
-        book = Book.open(@simple_file)
-        excel = book.excel
-        excel.close
-        excel.should_not be_alive
-        excel.recreate
-        excel.should be_a Excel
-        excel.should be_alive
-        book.should be_alive
-        excel.close
-        excel.should_not be_alive
-      end
+      context "with a single Excel instance" do
 
-      it "should recreate several Excel instances" do  
-        book = Book.open(@simple_file)      
-        book2 = Book.open(@another_simple_file, :force_excel => book)
-        book3 = Book.open(@different_file, :force_excel => :new)
-        excel = book.excel
-        excel3 = book3.excel
-        excel.close
-        excel3.close
-        excel.should_not be_alive
-        excel3.should_not be_alive
-        excel.recreate(:visible => true)
-        excel.should be_alive
-        excel.should be_a Excel
-        excel.visible.should be_true
-        excel.displayalerts.should be_false
-        book.should be_alive
-        book2.should be_alive
-        book.excel.should == excel
-        book2.excel.should == excel
-        excel3.recreate(:visible => true, :displayalerts => true)
-        excel3.should be_alive
-        excel3.should be_a Excel
-        excel3.visible.should be_true
-        excel3.displayalerts.should be_true
-        book3.should be_alive
-        excel.close
-        excel.should_not be_alive
-        excel3.close
-        excel3.should_not be_alive
+        before do
+          @book1 = Book.open(@simple_file)
+          @excel1 = @book1.excel
+        end
+
+        it "should recreate an Excel instance" do
+          @excel1.close
+          @excel1.should_not be_alive
+          @excel1.recreate
+          @excel1.should be_a Excel
+          @excel1.should be_alive
+          @excel1.Visible.should be_false
+          @excel1.DisplayAlerts.should be_false
+          @book1.should_not be_alive
+          @book1.reopen
+          @book1.should be_alive
+          @excel1.close
+          @excel1.should_not be_alive        
+        end
+
+        it "should recreate an Excel instance with old visible and displayalerts values" do
+          @excel1.visible = true
+          @excel1.displayalerts = true
+          @excel1.close
+          @excel1.should_not be_alive
+          @excel1.recreate
+          @excel1.should be_a Excel
+          @excel1.should be_alive
+          @excel1.Visible.should be_true
+          @excel1.DisplayAlerts.should be_true
+          @book1.reopen
+          @book1.should be_alive
+          @excel1.close
+          @excel1.should_not be_alive
+        end
+
+        it "should recreate an Excel instance with new visible and displayalerts values" do
+          @excel1.close
+          @excel1.should_not be_alive
+          @excel1.recreate(:visible => true, :displayalerts => true)
+          @excel1.should be_a Excel
+          @excel1.should be_alive
+          @excel1.Visible.should be_true
+          @excel1.DisplayAlerts.should be_true
+          @book1.reopen
+          @book1.should be_alive
+          @excel1.close
+          @excel1.should_not be_alive
+        end
+
+        it "should recreate an Excel instance and reopen the book" do
+          @excel1.close
+          @excel1.should_not be_alive
+          @excel1.recreate(:reopen_workbooks => true)
+          @excel1.should be_a Excel
+          @excel1.should be_alive
+          @excel1.Visible.should be_false
+          @excel1.DisplayAlerts.should be_false
+          @book1.should be_alive
+          @excel1.close
+          @excel1.should_not be_alive
+        end
       end
-    end    
+
+      context "with several Excel instances" do
+
+        before do
+          @book1 = Book.open(@simple_file)      
+          @book2 = Book.open(@another_simple_file, :force_excel => @book1)
+          @book3 = Book.open(@different_file, :force_excel => :new)
+          @excel1 = @book1.excel
+          @excel3 = @book3.excel
+          @excel1.visible = true
+          @excel3.displayalerts = true
+        end
+
+        it "should recreate several Excel instances" do  
+          @excel1.close
+          @excel3.close
+          @excel1.should_not be_alive
+          @excel3.should_not be_alive
+          @excel1.recreate(:reopen_workbooks => true, :displayalerts => true)
+          @excel1.should be_alive
+          @excel1.should be_a Excel
+          @excel1.visible.should be_true
+          @excel1.displayalerts.should be_true
+          @book1.should be_alive
+          @book2.should be_alive
+          @excel3.recreate(:visible => true)
+          @excel3.should be_alive
+          @excel3.should be_a Excel
+          @excel3.visible.should be_true
+          @excel3.displayalerts.should be_true
+          @book3.reopen
+          @book3.should be_alive
+          @book3.excel.should == @excel3
+          @excel1.close
+          @excel1.should_not be_alive
+          @excel3.close
+          @excel3.should_not be_alive
+        end
+      end    
+    end
 
     context "close excel instances" do
       def direct_excel_creation_helper  # :nodoc: #
@@ -446,6 +522,13 @@ module RobustExcelOle
           new_book2.close   
         end
 
+        it "should close the Excel with saving the workbook" do
+          @excel.should be_alive
+          @excel.close(:if_unsaved => :keep_open)
+          @excel.should be_alive
+          @excel.close(:if_unsaved => :forget)
+        end
+
         it "should raise an error for invalid option" do
           expect {
             @excel.close(:if_unsaved => :invalid_option)
@@ -706,18 +789,19 @@ module RobustExcelOle
         
         before do
           @book = Book.open(@simple_file)
-          @book2 = Book.open(@another_simple_file)
           @book3 = Book.open(@different_file, :read_only => true)
           sheet = @book[0]
           sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
           sheet3 = @book3[0]
           sheet3[1,1] = sheet3[1,1].value == "foo" ? "bar" : "foo"
+          @book2 = Book.open(@another_simple_file, :force_excel => :new)
+          sheet2 = @book2[0]
+          sheet2[1,1] = sheet2[1,1].value == "foo" ? "bar" : "foo"
         end
 
         it "should list unsaved workbooks" do
           @book.Saved.should be_false
-          @book2.Save
-          @book2.Saved.should be_true
+          @book2.Saved.should be_false
           @book3.Saved.should be_false
           excel = @book.excel
           # unsaved_workbooks yields different WIN32OLE objects than book.workbook
@@ -726,6 +810,17 @@ module RobustExcelOle
           uw_names.should == [@book.workbook.Name]
         end
 
+        it "should list all unsaved workbooks" do
+          result = []
+          Excel.unsaved_workbooks_all.each do |unsaved_workbooks| 
+            uw_names = []
+            unsaved_workbooks.each {|uw| uw_names << uw.Name}
+            result << uw_names
+          end
+          result.include?([@book.workbook.Name]).should be_true
+          result.include?([@book2.workbook.Name]).should be_true
+        end
+
       end
     end