robust_excel_ole 0.6 → 0.6.1

data/spec/excel_spec.rb

@@ -20,6 +20,8 @@ module RobustExcelOle
       @another_simple_file = @dir + '/another_workbook.xls'
       @different_file = @dir + '/different_workbook.xls'
       @invalid_name_file = 'b/workbook.xls'
+      @simple_file1 = @simple_file
+      @different_file1 = @different_file
     end
 
     after do
@@ -31,8 +33,8 @@ module RobustExcelOle
 
       before do
 
-        book1 = Book.open(@simple_file)
-        book2 = Book.open(@simple_file, :force_excel => :new)
+        book1 = Book.open(@simple_file1)
+        book2 = Book.open(@simple_file1, :force_excel => :new)
         a = book1.saved 
       end
 
@@ -327,7 +329,6 @@ module RobustExcelOle
       end    
     end
 
-    # Error
     context "close excel instances" do
       def direct_excel_creation_helper  # :nodoc: #
         expect { WIN32OLE.connect("Excel.Application") }.to raise_error
@@ -340,13 +341,11 @@ module RobustExcelOle
       end
 
       it "simple file with default" do
-        Excel.close_all
+        Excel.kill_all
         direct_excel_creation_helper
-        sleep 3
-        puts "excels_number: #{Excel.excels_number}"
-        sleep 1
-        Excel.close_all
-        sleep 0.1
+        sleep 4
+        Excel.kill_all
+        sleep 4
         expect { WIN32OLE.connect("Excel.Application") }.to raise_error
       end
     end
@@ -380,93 +379,80 @@ module RobustExcelOle
 
       context "with unsaved_workbooks" do
         
-        before do
-          book1 = Book.open(@simple_file, :read_only => true)
-          book2 = Book.open(@simple_file, :force_excel => :new)
-          book3 = Book.open(@another_simple_file, :force_excel => book2.excel)
-          book4 = Book.open(@different_file, :force_excel => :new)
+        before do          
+          book1 = Book.open(@simple_file1, :force_excel => :new)
+          book2 = Book.open(@different_file, :force_excel => :new)          
           @excel1 = book1.excel
+          sheet1 = book1.sheet(1)
+          @old_cell_value1 = sheet1[1,1].value
+          sheet1[1,1] = sheet1[1,1].value == "foo" ? "bar" : "foo"
           @excel2 = book2.excel
-          @excel4 = book4.excel
           sheet2 = book2.sheet(1)
           @old_cell_value2 = sheet2[1,1].value
           sheet2[1,1] = sheet2[1,1].value == "foo" ? "bar" : "foo"
-          sheet3 = book3.sheet(1)
-          @old_cell_value3 = sheet3[1,1].value
-          sheet3[1,1] = sheet3[1,1].value == "foo" ? "bar" : "foo"
         end
 
         it "should close the first Excel without unsaved workbooks and then raise an error" do
           expect{
             Excel.close_all(:if_unsaved => :raise)
-          }.to raise_error(ExcelErrorClose, "Excel contains unsaved workbooks")
-          @excel1.should_not be_alive
+          }.to raise_error(UnsavedWorkbooks, "Excel contains unsaved workbooks")
+          @excel1.should be_alive
           @excel2.should be_alive
-          @excel4.should be_alive
         end
 
         it "should close the first Excel without unsaved workbooks and then raise an error per default" do
           expect{
             Excel.close_all
-          }.to raise_error(ExcelErrorClose, "Excel contains unsaved workbooks")
-          @excel1.should_not be_alive
+          }.to raise_error(UnsavedWorkbooks, "Excel contains unsaved workbooks")
+          @excel1.should be_alive
           @excel2.should be_alive
-          @excel4.should be_alive
         end
 
-        # Error
         it "should close the Excel instances with saving the unsaved workbooks" do
           Excel.close_all(:if_unsaved => :save)
           @excel1.should_not be_alive
           @excel2.should_not be_alive
-          @excel4.should_not be_alive
-          new_book2 = Book.open(@simple_file)
+          new_book1 = Book.open(@simple_file1)
+          new_sheet1 = new_book1.sheet(1)
+          new_sheet1[1,1].value.should_not == @old_cell_value1
+          new_book1.close   
+          new_book2 = Book.open(@different_file1)
           new_sheet2 = new_book2.sheet(1)
           new_sheet2[1,1].value.should_not == @old_cell_value2
-          new_book2.close   
-          new_book3 = Book.open(@another_simple_file)
-          new_sheet3 = new_book3.sheet(1)
-          new_sheet3[1,1].value.should_not == @old_cell_value3
-          new_book3.close
+          new_book2.close
         end
 
-        # Error
         it "should close the Excel instances without saving the unsaved workbooks" do          
-          @excel1.displayalerts = @excel2.displayalerts = @excel4.displayalerts = false
           Excel.close_all(:if_unsaved => :forget)
           @excel1.should_not be_alive
           @excel2.should_not be_alive
-          @excel4.should_not be_alive
-          new_book2 = Book.open(@simple_file)
+          new_book1 = Book.open(@simple_file1)
+          new_sheet1 = new_book1.sheet(1)
+          new_sheet1[1,1].value.should == @old_cell_value1
+          new_book1.close   
+          new_book2 = Book.open(@different_file1)
           new_sheet2 = new_book2.sheet(1)
           new_sheet2[1,1].value.should == @old_cell_value2
           new_book2.close   
-          new_book3 = Book.open(@another_simple_file)
-          new_sheet3 = new_book3.sheet(1)
-          new_sheet3[1,1].value.should == @old_cell_value3
-          new_book3.close   
         end       
 
         it "should raise an error for invalid option" do
           expect {
             Excel.close_all(:if_unsaved => :invalid_option)
-          }.to raise_error(ExcelErrorClose, ":if_unsaved: invalid option: :invalid_option") 
+          }.to raise_error(OptionInvalid, ":if_unsaved: invalid option: :invalid_option") 
         end
 
       end
 
-      context "unsaved_workbooks" do
+      context "with unsaved workbooks simple" do
 
-        # Error
         it "should save the unsaved workbook" do
           book1 = Book.open(@simple_file, :visible => true)
-          excel1 = book1.excel
           book1.sheet(1)[1,1] = "bar"
           book1.Saved.should be_false
           Excel.close_all(:if_unsaved => :save)
         end
 
-        # Error
         it "should forget the unsaved workbook" do
           book1 = Book.open(@simple_file, :visible => true)
           excel1 = book1.excel
@@ -526,27 +512,6 @@ module RobustExcelOle
         #  }.to raise_error(ExcelUserCanceled, "close: canceled by user")
         # end
 
-        it "should save if user answers 'yes'" do
-          @excel1.displayalerts = @excel2.displayalerts = @excel4.displayalerts = true
-          @key_sender.puts "{enter}"          
-          Excel.close_all(:if_unsaved => :forget)
-          @excel2.should_not be_alive
-          new_book2 = Book.open(@simple_file)
-          new_sheet2 = new_book2.sheet(1)
-          new_sheet2[1,1].value.should_not == @old_cell_value2
-          new_book2.close   
-        end
-
-        it "should not save if user answers 'no'" do  
-          @excel1.displayalerts = @excel2.displayalerts = @excel4.displayalerts = true        
-          @key_sender.puts "{right}{enter}"
-          @key_sender.puts "{right}{enter}"
-          Excel.close_all(:if_unsaved => :forget)
-          @excel2.should_not be_alive
-          new_book2 = Book.open(@simple_file)
-          new_sheet2 = new_book2.sheet(1)
-          new_sheet2[1,1].value.should == @old_cell_value2
-          new_book2.close   
         end
       end
     end
@@ -616,9 +581,25 @@ module RobustExcelOle
           @book2.saved.should be_false
           expect{
             @excel.close(:if_unsaved => :raise)
-          }.to raise_error(ExcelErrorClose, "Excel contains unsaved workbooks")
+          }.to raise_error(UnsavedWorkbooks, "Excel contains unsaved workbooks")
         end        
 
+        it "should close the Excel without saving the workbook even with displayalerts true" do
+          @excel.displayalerts = false
+          @excel.should be_alive
+          @excel.displayalerts = true
+          @excel.close(:if_unsaved => :forget)
+          @excel.should_not be_alive
+          new_book = Book.open(@simple_file)
+          new_sheet = new_book.sheet(1)
+          new_sheet[1,1].value.should == @old_cell_value
+          new_book.close          
+          new_book2 = Book.open(@another_simple_file)
+          new_sheet2 = new_book2.sheet(1)
+          new_sheet2[1,1].value.should == @old_cell_value2
+          new_book2.close 
+        end
+
         it "should close the Excel without saving the workbook" do
           @excel.displayalerts = false
           @excel.should be_alive
@@ -659,14 +640,14 @@ module RobustExcelOle
         it "should raise an error for invalid option" do
           expect {
             @excel.close(:if_unsaved => :invalid_option)
-          }.to raise_error(ExcelErrorClose, ":if_unsaved: invalid option: :invalid_option") 
+          }.to raise_error(OptionInvalid, ":if_unsaved: invalid option: :invalid_option") 
         end
 
         it "should raise an error by default" do
           @excel.should be_alive
           expect{
             @excel.close
-          }.to raise_error(ExcelErrorClose, "Excel contains unsaved workbooks")
+          }.to raise_error(UnsavedWorkbooks, "Excel contains unsaved workbooks")
         end
   
         it "should close the Excel without saving the workbook hard" do
@@ -742,46 +723,7 @@ module RobustExcelOle
           @key_sender.puts "{left}{enter}"
           expect{
             @excel.close(:if_unsaved => :alert)
-            }.to raise_error(ExcelUserCanceled, "close: canceled by user")
-        end
-
-        it "should save if user answers 'yes'" do
-          # "Yes" is to the left of "No", which is the  default. --> language independent
-          @excel.should be_alive
-          @excel.displayalerts = true
-          @key_sender.puts "{enter}" 
-          @excel.close(:if_unsaved => :forget)
-          @excel.should_not be_alive
-          new_book = Book.open(@simple_file)
-          new_sheet = new_book.sheet(1)
-          new_sheet[1,1].value.should_not == @old_cell_value
-          new_book.close   
-        end
-
-        it "should not save if user answers 'no'" do            
-          @excel.should be_alive
-          @excel.displayalerts = true
-          @book.should be_alive
-          @book.saved.should be_false
-          @key_sender.puts "{right}{enter}"
-          @excel.close(:if_unsaved => :forget)
-          @excel.should_not be_alive
-          @book.should_not be_alive
-          new_book = Book.open(@simple_file)
-          new_sheet = new_book.sheet(1)
-          new_sheet[1,1].value.should == @old_cell_value
-          new_book.close     
-        end
-
-        it "should not save if user answers 'cancel'" do
-          # strangely, in the "cancel" case, the question will sometimes be repeated twice            
-          @excel.should be_alive
-          @excel.displayalerts = true
-          @book.should be_alive
-          @book.saved.should be_false
-          @key_sender.puts "{left}{enter}"
-          @key_sender.puts "{left}{enter}"
-          @excel.close(:if_unsaved => :forget)
+            }.to_not raise_error
         end
 
       end
@@ -884,7 +826,29 @@ module RobustExcelOle
 
     end
 
-    context "with Visible and DisplayAlerts" do
+    context "with Visible and DisplayAlerts, foremost_window" do
+
+      it "should set Excel in foremost window" do
+        excel1 = Excel.create
+        excel2 = Excel.create
+        excel1.foremost_window
+        excel1.Visible.should be_true
+        excel1.visible.should be_true
+      end
+
+
+      it "should use values of the current Excel when reusing" do
+        excel1 = Excel.create
+        excel1.Visible.should be_false
+        excel1.DisplayAlerts.should be_false
+        excel1.Visible = true
+        excel1.DisplayAlerts = true
+        excel1.Visible.should be_true
+        excel1.DisplayAlerts.should be_true
+        excel2 = Excel.new(:reuse => true)
+        excel2.Visible.should be_true
+        excel2.DisplayAlerts.should be_true
+      end
 
       it "should set Excel visible and invisible with current" do
         excel1 = Excel.create
@@ -952,8 +916,7 @@ module RobustExcelOle
         excel4.should === excel
         excel4.Visible.should be_true
         excel4.visible.should be_true
-        #Error: 
-        #excel4.DisplayAlerts.should be_true
+        excel4.DisplayAlerts.should be_true
         excel4.displayalerts.should == :if_visible
         excel5 = Excel.current(:visible => false)
         excel5.should === excel
@@ -1247,7 +1210,7 @@ module RobustExcelOle
 
       it "should report that Excel is not alive" do
         @excel1.close
-        expect{ @excel1.Nonexisting_method }.to raise_error(ExcelError, "method missing: Excel not alive")
+        expect{ @excel1.Nonexisting_method }.to raise_error(ObjectNotAlive, "method missing: Excel not alive")
       end
 
     end
@@ -1369,8 +1332,7 @@ module RobustExcelOle
           expect{
             workbook = @excel1.generate_workbook(@invalid_name_file)
           # not always Unknown ???? ToDo #*#
-          #}.to raise_error(ExcelErrorSaveUnknown)
-          }.to raise_error(ExcelErrorSave)
+          }.to raise_error(UnexpectedError)
         end
 
       end
@@ -1404,18 +1366,18 @@ module RobustExcelOle
       it "should raise an error if name not defined" do
         expect {
           @excel1.nameval("foo")
-        }.to raise_error(ExcelError, /cannot find name "foo"/)
+        }.to raise_error(NameNotFound, /cannot find name "foo"/)
         expect {
         @excel1["foo"]
-        }.to raise_error(ExcelError, /cannot find name "foo"/)
+        }.to raise_error(NameNotFound, /cannot find name "foo"/)
         expect {
           excel2 = Excel.create
           excel2.nameval("one")
-        }.to raise_error(ExcelError, /cannot find name "one"/)
+        }.to raise_error(NameNotFound, /cannot find name "one"/)
         expect {
           excel3 = Excel.create
           excel3["one"]
-        }.to raise_error(ExcelError, /cannot find name "one"/)
+        }.to raise_error(NameNotFound, /cannot find name "one"/)
       end
 
       it "should set a range to a value" do
@@ -1429,10 +1391,10 @@ module RobustExcelOle
       it "should raise an error if name cannot be evaluated" do
         expect{
           @excel1.set_nameval("foo", 1)
-          }.to raise_error(ExcelError, /cannot find name "foo"/)
+          }.to raise_error(NameNotFound, /cannot find name "foo"/)
         expect{
           @excel1["foo"] = 1
-          }.to raise_error(ExcelError, /cannot find name "foo"/)
+          }.to raise_error(NameNotFound, /cannot find name "foo"/)
       end
     end
 
@@ -1465,14 +1427,14 @@ module RobustExcelOle
       it "should raise an error if name not defined for the sheet" do
         expect {
           @excel1.rangeval("foo")
-          }.to raise_error(ExcelError, /cannot find name "foo"/)
+          }.to raise_error(NameNotFound, /cannot find name "foo"/)
         expect {
           @excel1.rangeval("named_formula")
-          }.to raise_error(ExcelError, /cannot find name "named_formula"/)
+          }.to raise_error(NameNotFound, /cannot find name "named_formula"/)
         expect {
           excel2 = Excel.create
           excel2.rangeval("one")
-        }.to raise_error(ExcelError, /cannot find name "one"/)
+        }.to raise_error(NameNotFound, /cannot find name "one"/)
       end
     
       it "should set a range to a value" do
@@ -1484,7 +1446,7 @@ module RobustExcelOle
       it "should raise an error if name cannot be evaluated" do
         expect{
           @excel1.set_nameval("foo", 1)
-        }.to raise_error(ExcelError, /cannot find name "foo"/)
+        }.to raise_error(NameNotFound, /cannot find name "foo"/)
       end
 
     end

data/spec/general_spec.rb

@@ -151,7 +151,7 @@ module RobustExcelOle
         it "should raise an error for no strings" do
           expect{
             canonize(1)
-          }.to raise_error(ExcelError, "No string given to canonize, but 1")
+          }.to raise_error(TypeErrorREO, "No string given to canonize, but 1")
         end
 
       end
@@ -171,7 +171,7 @@ module RobustExcelOle
       it "should raise an error when asking excel of a sheet" do
         expect{
           @sheet.excel
-          }.to raise_error(ExcelError, "receiver instance is neither an Excel nor a Book")
+          }.to raise_error(TypeErrorREO, "receiver instance is neither an Excel nor a Book")
       end
     end
   end

data/spec/reo_common_spec.rb

@@ -96,7 +96,7 @@ module RobustExcelOle
       it "should raise an error when asking excel of a sheet" do
         expect{
           @sheet.excel
-          }.to raise_error(ExcelError, "receiver instance is neither an Excel nor a Book")
+          }.to raise_error(TypeErrorREO, "receiver instance is neither an Excel nor a Book")
       end
 
     end

data/spec/sheet_spec.rb

@@ -105,7 +105,7 @@ describe Sheet do
         new_sheet = @book.add_sheet @sheet
         expect{
           new_sheet.name = 'foo'
-        }.to raise_error(ExcelErrorSheet, /sheet name "foo" already exists/)
+        }.to raise_error(NameAlreadyExists, /sheet name "foo" already exists/)
       end
     end
   end
@@ -445,7 +445,7 @@ describe Sheet do
       it "should raise an error if name not defined" do
         expect {
           @sheet1["foo"]
-        }.to raise_error(SheetError, /name "foo" not in Sheet1/)        
+        }.to raise_error(NameNotFound, /name "foo" not in Sheet1/)        
       end
 
       it "should set a range to a value" do
@@ -459,7 +459,7 @@ describe Sheet do
       it "should raise an error if name cannot be evaluated" do
         expect{
           @sheet1["foo"] = 1
-          }.to raise_error(SheetError, /name "foo" not in Sheet1/)
+          }.to raise_error(NameNotFound, /name "foo" not in Sheet1/)
       end
     end
 
@@ -489,22 +489,22 @@ describe Sheet do
       it "should raise an error if name not defined" do
         expect {
           @sheet1.nameval("foo")
-        }.to raise_error(SheetError, /name "foo" not in Sheet1/)
+        }.to raise_error(NameNotFound, /name "foo" not in Sheet1/)
         expect {
           @sheet1.nameval("named_formula")
-        }.to raise_error(SheetError, /name "named_formula" not in Sheet1/)
+        }.to raise_error(NameNotFound, /name "named_formula" not in Sheet1/)
       end
 
       it "should raise an error of coordinates are given instead of a defined name" do
         expect {
           @sheet1.nameval("A1")
-        }.to raise_error(SheetError, /name "A1" not in Sheet1/)
+        }.to raise_error(NameNotFound, /name "A1" not in Sheet1/)
       end
 
       it "should raise an error for a range with empty contents" do
         expect{
           @sheet1.nameval("another")
-          }.to raise_error(SheetError, /name "another" not in Sheet1/)
+          }.to raise_error(NameNotFound, /name "another" not in Sheet1/)
       end 
 
       it "should set a range to a value" do
@@ -518,7 +518,7 @@ describe Sheet do
       it "should raise an error if name cannot be evaluated" do
         expect{
           @sheet1.set_nameval("foo", 1)
-        }.to raise_error(SheetError, /name "foo" not in Sheet1/)
+        }.to raise_error(NameNotFound, /name "foo" not in Sheet1/)
       end
     end
 
@@ -560,13 +560,13 @@ describe Sheet do
       it "should raise an error if name not defined for the sheet" do
         expect {
           @sheet1.rangeval("foo")
-          }.to raise_error(SheetError, /name "foo" not in Sheet1/)
+          }.to raise_error(NameNotFound, /name "foo" not in Sheet1/)
         expect {
           @sheet1.rangeval("named_formula")
-          }.to raise_error(SheetError, /name "named_formula" not in Sheet1/)
+          }.to raise_error(NameNotFound, /name "named_formula" not in Sheet1/)
         expect {
           @sheet2.rangeval("firstcell")
-          }.to raise_error(SheetError, /name "firstcell" not in Sheet2/)
+          }.to raise_error(NameNotFound, /name "firstcell" not in Sheet2/)
       end
     
       it "should set a range to a value" do
@@ -580,7 +580,7 @@ describe Sheet do
       it "should raise an error if name cannot be evaluated" do
         expect{
           @sheet1.set_nameval("foo", 1)
-        }.to raise_error(SheetError, /name "foo" not in Sheet1/)
+        }.to raise_error(NameNotFound, /name "foo" not in Sheet1/)
       end
 
     end
@@ -616,7 +616,7 @@ describe Sheet do
         it "should raise an error" do
           expect{
             @sheet1.set_name("foo",-2,1)
-          }.to raise_error(SheetError, /cannot add name "foo" to cell with row -2 and column 1/)
+          }.to raise_error(RangeNotEvaluatable, /cannot add name "foo" to cell with row -2 and column 1/)
         end
       end
     end
@@ -633,10 +633,6 @@ describe Sheet do
         }.to raise_error(VBAMethodMissingError, /unknown VBA property or method :Foo/)
       end
 
-  #    it "should report that worksheet is not alive" do
-  #      @book.close
-  #      expect{ @sheet.Nonexisting_method }.to raise_error(ExcelError, "method missing: worksheet nil")
-  #    end
     end
 
     describe "#method_missing" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: robust_excel_ole
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  version: "0.6"
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - traths
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-08-03 00:00:00 +02:00
+date: 2016-09-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,6 +112,9 @@ files:
 - spec/data/merge_cells.xls
 - spec/data/more_data/workbook.xls
 - spec/data/protected_sheet.xls
+- spec/data/refed_wb.xls
+- spec/data/reference_workbook.xls
+- spec/data/referencing_wb.xls
 - spec/data/workbook.xls
 - spec/data/workbook.xlsm
 - spec/data/workbook.xlsx