robust_excel_ole 0.5.1 → 0.6

data/lib/robust_excel_ole/reo_common.rb

@@ -18,6 +18,10 @@ class REOCommon
     self.class.trace(text)
   end
 
+  def self.tr1(text)
+    puts :text
+  end
+
   def self.trace(text)
     if LOG_TO_STDOUT 
       puts text

data/lib/robust_excel_ole/sheet.rb

@@ -18,6 +18,10 @@ module RobustExcelOle
       end
     end
 
+    def workbook
+      book_class.new(self.Parent)
+    end
+
     # returns name of the sheet
     def name
       @worksheet.Name
@@ -48,10 +52,15 @@ module RobustExcelOle
         @cells[yx] = RobustExcelOle::Cell.new(@worksheet.Cells.Item(y, x))
       else
         name = p1
-        value = nameval(name) rescue nil
-        value = book_class.new(self.Parent).nameval(name) rescue nil unless value
-        value = rangeval(name) unless value
-        value
+        begin
+          nameval(name) 
+        rescue SheetError
+          begin
+            book_class.new(self.Parent).nameval(name)
+          rescue ExcelError
+            rangeval(name)
+          end
+        end
       end
     end
 
@@ -67,7 +76,7 @@ module RobustExcelOle
           set_nameval(name, value) 
         rescue SheetError
           begin
-            book_class.new(self.Parent).set_nameval(name, value)
+            workbook.set_nameval(name, value)
           rescue ExcelError
             set_rangeval(name, value)
           end
@@ -145,7 +154,7 @@ module RobustExcelOle
           raise SheetError, "cannot evaluate name #{name.inspect} in #{self.Name}"
         end
       end
-      if value == -2146826259
+      if value == RobustExcelOle::XlErrName  # -2146826259
         return opts[:default] if opts[:default]
         raise SheetError, "cannot evaluate name #{name.inspect} in #{self.Name}"
       end 

data/lib/robust_excel_ole/version.rb

@@ -1,3 +1,3 @@
 module RobustExcelOle
-  VERSION = "0.5.1"
+  VERSION = "0.6"
 end

data/spec/book_spec.rb

@@ -14,7 +14,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
   end
 
   before do
@@ -27,6 +27,8 @@ describe Book do
     @linked_file = @dir + '/workbook_linked.xlsm'
     @simple_file_xlsm = @dir + '/workbook.xls'
     @simple_file_xlsx = @dir + '/workbook.xlsx'
+    @simple_file1 = @simple_file
+    @simple_file_other_path1 = @simple_file_other_path
   end
 
   after do
@@ -91,15 +93,16 @@ describe Book do
 
       it "should yield an identical Book and set visible and displayalerts values" do
         workbook = @book.ole_workbook
-        new_book = Book.new(workbook, :visible => true, :displayalerts => true)
+        new_book = Book.new(workbook, :visible => true)
+        new_book.excel.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.excel.Visible.should be_true
+        new_book.excel.DisplayAlerts.should be_true
         new_book.close
       end
 
@@ -175,22 +178,22 @@ describe Book do
       end
 
       it "should open in a given Excel, provide identity transparency, because book can be readonly, such that the old and the new book are readonly" do
-        book2 = Book.open(@simple_file, :force_excel => :new)
+        book2 = Book.open(@simple_file1, :force_excel => :new)
         book2.excel.should_not == @book.excel
-        book3 = Book.open(@simple_file, :force_excel => :new)
+        book3 = Book.open(@simple_file1, :force_excel => :new)
         book3.excel.should_not == book2.excel
         book3.excel.should_not == @book.excel
         book2.close
         book3.close
         @book.close
-        book4 = Book.open(@simple_file, :force_excel => book2.excel, :read_only => true)
+        book4 = Book.open(@simple_file1, :force_excel => book2.excel, :read_only => true)
         book4.should be_alive
         book4.should be_a Book
         book4.excel.should == book2.excel
         book4.ReadOnly.should be_true
         book4.should == book2
         book4.close
-        book5 = Book.open(@simple_file, :force_excel => book2, :read_only => true)
+        book5 = Book.open(@simple_file1, :force_excel => book2, :read_only => true)
         book5.should be_alive
         book5.should be_a Book
         book5.excel.should == book2.excel
@@ -239,17 +242,18 @@ describe Book do
 
       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)
+        different_file1 = @different_file
+        book3 = Book.open(different_file1, :default_excel => book2.excel)
         book3.excel.should === book2.excel
         book3.close
-        book4 = Book.open(@different_file, :default_excel => book2) 
+        book4 = Book.open(different_file1, :default_excel => book2) 
         book4.excel.should === book2.excel
         book4.close
-        book5 = Book.open(@different_file, :default_excel => book2.ole_workbook)
+        book5 = Book.open(different_file1, :default_excel => book2.ole_workbook)
         book5.excel.should ===  book2.excel
         book5.close
         win32ole_excel1 = WIN32OLE.connect(book2.ole_workbook.Fullname).Application
-        book6 = Book.open(@different_file, :default_excel => win32ole_excel1)
+        book6 = Book.open(different_file1, :default_excel => win32ole_excel1)
         book6.excel.should === book2.excel
         book6.close
       end
@@ -297,9 +301,9 @@ describe Book do
         it "should open the new book and close the unsaved book, if user answers 'yes'" do
           # "Yes" is the  default. --> language independent
           @key_sender.puts "{enter}"
-          @new_book = Book.open(@simple_file, :if_unsaved => :alert)
+          @new_book = Book.open(@simple_file1, :if_unsaved => :alert)
           @new_book.should be_alive
-          @new_book.filename.downcase.should == @simple_file.downcase
+          @new_book.filename.downcase.should == @simple_file1.downcase
           @book.should_not be_alive
         end
 
@@ -319,9 +323,9 @@ describe Book do
         it "should open the new book and close the unsaved book, if user answers 'yes'" do
           # "Yes" is the  default. --> language independent
           @key_sender.puts "{enter}"
-          @new_book = Book.open(@simple_file, :if_unsaved => :excel)
+          @new_book = Book.open(@simple_file1, :if_unsaved => :excel)
           @new_book.should be_alive
-          @new_book.filename.downcase.should == @simple_file.downcase
+          @new_book.filename.downcase.should == @simple_file1.downcase
           @book.should_not be_alive
         end
 
@@ -352,7 +356,7 @@ describe Book do
               book_before = Book.open(@simple_file)
               book_before.close
             end
-            @book = Book.open(@simple_file_other_path)
+            @book = Book.open(@simple_file_other_path1)
             @sheet_count = @book.ole_workbook.Worksheets.Count
             @sheet = @book.sheet(1)
             @book.add_sheet(@sheet, :as => 'a_name')
@@ -364,11 +368,11 @@ describe Book do
           end
 
           it "should save the old book, close it, and open the new book, if :if_obstructed is :save" do
-            @new_book = Book.open(@simple_file, :if_obstructed => :save)
+            @new_book = Book.open(@simple_file1, :if_obstructed => :save)
             @book.should_not be_alive
             @new_book.should be_alive
-            @new_book.filename.downcase.should == @simple_file.downcase
-            old_book = Book.open(@simple_file_other_path, :if_obstructed => :forget)
+            @new_book.filename.downcase.should == @simple_file1.downcase
+            old_book = Book.open(@simple_file_other_path1, :if_obstructed => :forget)
             old_book.ole_workbook.Worksheets.Count.should ==  @sheet_count + 1
             old_book.close
           end
@@ -376,14 +380,14 @@ describe Book do
           it "should raise an error, if the old book is unsaved, and close the old book and open the new book, 
               if :if_obstructed is :close_if_saved" do
             expect{
-              @new_book = Book.open(@simple_file, :if_obstructed => :close_if_saved)
+              @new_book = Book.open(@simple_file1, :if_obstructed => :close_if_saved)
             }.to raise_error(ExcelErrorOpen, /workbook with the same name in a different path is unsaved/)
             @book.save
-            @new_book = Book.open(@simple_file, :if_obstructed => :close_if_saved)
+            @new_book = Book.open(@simple_file1, :if_obstructed => :close_if_saved)
             @book.should_not be_alive
             @new_book.should be_alive
-            @new_book.filename.downcase.should == @simple_file.downcase
-            old_book = Book.open(@simple_file_other_path, :if_obstructed => :forget)
+            @new_book.filename.downcase.should == @simple_file1.downcase
+            old_book = Book.open(@simple_file_other_path1, :if_obstructed => :forget)
             old_book.ole_workbook.Worksheets.Count.should ==  @sheet_count + 1
             old_book.close
           end
@@ -412,14 +416,14 @@ describe Book do
     context "with :read_only" do
       
       it "should reopen the book with writable (unsaved changes from readonly will not be saved)" do
-        book = Book.open(@simple_file, :read_only => true)
+        book = Book.open(@simple_file1, :read_only => true)
         book.ReadOnly.should be_true
         book.should be_alive
         sheet = book.sheet(1)
         old_cell_value = sheet[1,1].value
         sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
         book.Saved.should be_false
-        new_book = Book.open(@simple_file, :read_only => false, :if_unsaved => :accept)
+        new_book = Book.open(@simple_file1, :read_only => false, :if_unsaved => :accept)
         new_book.ReadOnly.should be_false 
         new_book.should be_alive
         book.should be_alive   
@@ -485,6 +489,52 @@ describe Book do
     end
   end
 
+  describe "visible" do
+
+    it "should preserve :visible if they are not set" do
+      excel1 = Excel.create(:visible => true)
+      book1 = Book.open(@simple_file)
+      book1.excel.Visible.should be_true
+      book1.close
+    end
+
+    it "should preserve :visible if they are not set" do
+      excel1 = Excel.create
+      book1 = Book.open(@simple_file, :visible => true)
+      book1.excel.Visible.should be_true
+    end
+
+    it "should preserve :visible if they are not set" do
+      excel1 = Excel.create(:visible => true)
+      book1 = Book.open(@different_file, :default_excel => :new)
+      book1.excel.Visible.should be_false
+    end
+
+    it "should preserve :visible if they are not set" do
+      excel1 = Excel.create(:visible => true)
+      excel2 = Excel.create(:visible => true)
+      book1 = Book.open(@different_file, :force_excel => excel2)
+      book1.excel.Visible.should be_true
+      book1.close
+    end
+
+    it "should let an open Book open" do
+      @book = Book.open(@simple_file, :visible => true)
+      Book.unobtrusively(@simple_file) do |book|
+        book.should be_a Book
+        book.should be_alive
+        book.excel.should == @book.excel
+        book.excel.Visible.should be_true
+      end        
+      @book.should be_alive
+      @book.should be_a Book
+      @book.excel.Visible.should be_true
+      @book.close(:if_unsaved => :forget)
+      @book2.close(:if_unsaved => :forget) rescue nil
+    end
+  end
+
+
   describe "unobtrusively" do
 
     def unobtrusively_ok? # :nodoc: #
@@ -546,7 +596,7 @@ describe Book do
     context "with an open book" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Book.open(@simple_file1)
       end
 
       after do
@@ -559,7 +609,7 @@ describe Book do
         @book.close
         book2.close
         @book.reopen
-        Book.unobtrusively(@simple_file) do |book|
+        Book.unobtrusively(@simple_file1) do |book|
           book.should be_a Book
           book.should be_alive
           book.excel.should == @book.excel
@@ -589,7 +639,7 @@ describe Book do
         @book.should be_alive
         @book.Saved.should be_false
         @book.close(:if_unsaved => :forget)
-        @book2 = Book.open(@simple_file)
+        @book2 = Book.open(@simple_file1)
         sheet2 = @book2.sheet(1)
         sheet2[1,1].value.should_not == old_cell_value
       end
@@ -598,7 +648,7 @@ describe Book do
     context "with a closed book" do
       
       before do
-        @book = Book.open(@simple_file)
+        @book = Book.open(@simple_file1)
       end
 
       after do
@@ -612,8 +662,8 @@ describe Book do
         @book.should_not be_alive
         unobtrusively_ok?
         @book.should_not be_alive
-        @book = Book.open(@simple_file)
-        sheet = @book.sheet(1)
+        book2 = Book.open(@simple_file1)
+        sheet = book2.sheet(1)
         sheet[1,1].Value.should_not == old_cell_value
       end
 
@@ -624,7 +674,7 @@ describe Book do
         old_cell_value = sheet[1,1].value
         @book.close
         @book.should_not be_alive
-        Book.unobtrusively(@simple_file, :keep_open => true) do |book|
+        Book.unobtrusively(@simple_file1, :keep_open => true) do |book|
           book.should be_a Book
           book.excel.should == @book.excel
           book.excel.should_not == excel
@@ -635,7 +685,7 @@ describe Book do
         end
         @book.should be_alive
         @book.close
-        new_book = Book.open(@simple_file)
+        new_book = Book.open(@simple_file1)
         sheet = new_book.sheet(1)
         sheet[1,1].value.should_not == old_cell_value
       end
@@ -647,7 +697,7 @@ describe Book do
         old_cell_value = sheet[1,1].value
         @book.close
         @book.should_not be_alive
-        Book.unobtrusively(@simple_file, :hidden) do |book|
+        Book.unobtrusively(@simple_file1, :hidden) do |book|
           book.should be_a Book
           book.should be_alive
           book.excel.should_not == @book.excel
@@ -658,40 +708,17 @@ describe Book do
           book.Saved.should be_false
         end
         @book.should_not be_alive
-        new_book = Book.open(@simple_file)
+        new_book = Book.open(@simple_file1)
         sheet = new_book.sheet(1)
         sheet[1,1].value.should_not == old_cell_value
       end
     end
 
-    context "with a visible book" do
-
-      before do
-        @book = Book.open(@simple_file, :visible => true)
-      end
-
-      after do
-        @book.close(:if_unsaved => :forget)
-        @book2.close(:if_unsaved => :forget) rescue nil
-      end
-
-      it "should let an open Book open" do
-        Book.unobtrusively(@simple_file) do |book|
-          book.should be_a Book
-          book.should be_alive
-          book.excel.should == @book.excel
-          book.excel.Visible.should be_true
-        end        
-        @book.should be_alive
-        @book.should be_a Book
-        @book.excel.Visible.should be_true
-      end
-    end
-
+    
     context "with a read_only book" do
 
       before do
-        @book = Book.open(@simple_file, :read_only => true)
+        @book = Book.open(@simple_file1, :read_only => true)
       end
 
       after do
@@ -699,12 +726,12 @@ describe Book do
       end
 
       it "should open unobtrusively the book in a new Excel such that the book is writable" do
-        book2 = Book.open(@simple_file, :force_excel => :new, :read_only => true)
+        book2 = Book.open(@simple_file1, :force_excel => :new, :read_only => true)
         @book.ReadOnly.should be_true
         book2.Readonly.should be_true
         sheet = @book.sheet(1)
         cell_value = sheet[1,1].value
-        Book.unobtrusively(@simple_file, :hidden) do |book|
+        Book.unobtrusively(@simple_file1, :hidden) do |book|
           book.should be_a Book
           book.excel.should_not == book2.excel
           book.excel.should_not == @book.excel
@@ -717,7 +744,7 @@ describe Book do
         @book.ReadOnly.should be_true
         @book.close
         book2.close
-        book3 = Book.open(@simple_file)
+        book3 = Book.open(@simple_file1)
         new_sheet = book3.sheet(1)
         new_sheet[1,1].value.should_not == cell_value
         book3.close
@@ -768,8 +795,8 @@ describe Book do
     context "with several Excel instances" do
 
       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)
         @book1.Readonly.should == false
         @book2.Readonly.should == true
         old_sheet = @book1.sheet(1)
@@ -790,7 +817,7 @@ describe Book do
           sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
           book.Saved.should be_false
         end
-        new_book = Book.open(@simple_file)
+        new_book = Book.open(@simple_file1)
         sheet = new_book.sheet(1)
         sheet[1,1].value.should_not == @old_cell_value
       end
@@ -805,7 +832,7 @@ describe Book do
           sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
           book.Saved.should be_false
         end
-        new_book = Book.open(@simple_file)
+        new_book = Book.open(@simple_file1)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should_not == @old_cell_value
       end
@@ -814,13 +841,13 @@ describe Book do
     context "with :hidden" do
 
       before do
-        @book1 = Book.open(@simple_file)
+        @book1 = Book.open(@simple_file1)
         @book1.close
       end
     
       it "should create a new hidden Excel instance and use this afterwards" do
         hidden_excel = nil
-        Book.unobtrusively(@simple_file, :hidden) do |book| 
+        Book.unobtrusively(@simple_file1, :hidden) do |book| 
           book.should be_a Book
           book.should be_alive
           book.excel.Visible.should be_false
@@ -843,7 +870,7 @@ describe Book do
     context "open unobtrusively for reading and modifying" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Book.open(@simple_file1)
         sheet = @book.sheet(1)
         @old_cell_value = sheet[1,1].value
         @book.close
@@ -860,14 +887,14 @@ describe Book do
           book.Saved.should be_false
           book.excel.should == @book.excel
         end
-        new_book = Book.open(@simple_file, :visible => true)
+        new_book = Book.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should == @old_cell_value
       end
 
       it "should not change the value and use the hidden Excel instance" do
         new_excel = Excel.new(:reuse => false)
-        Book.for_reading(@simple_file, :hidden) do |book|
+        Book.for_reading(@simple_file1, :hidden) do |book|
           sheet = book.sheet(1)
           cell = sheet[1,1]
           sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
@@ -876,19 +903,19 @@ describe Book do
           book.excel.visible.should be_false
           book.excel.displayalerts.should be_false
         end
-        new_book = Book.open(@simple_file, :visible => true)
+        new_book = Book.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should == @old_cell_value
       end
 
       it "should change the value" do
-        Book.for_modifying(@simple_file) do |book|
+        Book.for_modifying(@simple_file1) do |book|
           sheet = book.sheet(1)
           cell = sheet[1,1]
           sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
           book.excel.should == @book.excel
         end
-        new_book = Book.open(@simple_file, :visible => true)
+        new_book = Book.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should_not == @old_cell_value
       end
@@ -1050,7 +1077,7 @@ describe Book do
     end
   end
 
-  describe "alive?, filename, ==, visible, displayalerts, activate, saved" do
+  describe "alive?, filename, ==, activate, saved" do
 
     context "with alive?" do