robust_excel_ole 1.3 → 1.4

data/spec/bookstore_spec.rb

@@ -30,7 +30,7 @@ end
 
 $mock_bookstore = MockBookstore.new
 
-class Book
+class Workbook
   @@bookstore = $mock_bookstore
 end
 
@@ -80,8 +80,8 @@ describe Bookstore do
 
   describe "Mock-Test" do
     it "should never store any book" do
-      b1 = Book.open(@simple_file1)
-      b2 = Book.open(@simple_file1)
+      b1 = Workbook.open(@simple_file1)
+      b2 = Workbook.open(@simple_file1)
       b2.object_id.should_not == b1.object_id
     end
   end
@@ -92,7 +92,7 @@ describe Bookstore do
     context "with one open book" do
       
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -102,7 +102,7 @@ describe Bookstore do
       it "should do simple store and fetch" do        
         @bookstore.store(@book)
         new_book = @bookstore.fetch(@simple_file)
-        new_book.should be_a Book
+        new_book.should be_a Workbook
         new_book.should be_alive
         new_book.should == @book
         new_book.close
@@ -112,10 +112,10 @@ describe Bookstore do
         @bookstore.store(@book)
         book1 = @bookstore.fetch(@simple_file1)
         book2 = @bookstore.fetch(@simple_file1)
-        expect(book1).to be_a Book
+        expect(book1).to be_a Workbook
         book1.should be_alive
         book1.should == @book
-        book2.should be_a Book
+        book2.should be_a Workbook
         book2.should be_alive
         book2.should == @book
         book1.should == book2
@@ -132,7 +132,7 @@ describe Bookstore do
         @bookstore.store(@book)
         @book.close
         book1 = @bookstore.fetch(@simple_file)
-        book1.should be_a Book
+        book1.should be_a Workbook
         book1.should_not be_alive
       end
 
@@ -153,7 +153,7 @@ describe Bookstore do
     context "with several books" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @bookstore.store(@book)
       end
 
@@ -163,14 +163,14 @@ describe Bookstore do
       end
 
       it "should store and open two different books" do
-        @book2 = Book.open(@different_file1)
+        @book2 = Workbook.open(@different_file1)
         @bookstore.store(@book2)
         new_book = @bookstore.fetch(@simple_file)
         new_book2 = @bookstore.fetch(@different_file1)
-        new_book.should be_a Book
+        new_book.should be_a Workbook
         new_book.should be_alive
         new_book.should == @book
-        new_book2.should be_a Book
+        new_book2.should be_a Workbook
         new_book2.should be_alive
         new_book2.should == @book2
         new_book.should_not == new_book2
@@ -179,7 +179,7 @@ describe Bookstore do
       end
 
       it "should fetch the first, writable book" do
-        @book2 = Book.open(@simple_file1, :force_excel => :new)
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new)
         @bookstore.store(@book2)
         @book.ReadOnly.should be false
         @book2.ReadOnly.should be true
@@ -190,7 +190,7 @@ describe Bookstore do
       end
 
       it "should fetch the last book with :prefer_writeable => false" do
-        @book2 = Book.open(@simple_file1, :force_excel => :new)
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new)
         @bookstore.store(@book2)
         @book.ReadOnly.should be false
         @book2.ReadOnly.should be true
@@ -201,7 +201,7 @@ describe Bookstore do
       end
 
       it "should fetch the second, open book, if the first book is closed" do
-        @book2 = Book.open(@simple_file1, :force_excel => :new)
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new)
         @bookstore.store(@book2)
         @book.ReadOnly.should be false
         @book2.ReadOnly.should be true
@@ -217,7 +217,7 @@ describe Bookstore do
       end
 
       it "should fetch the first, open book, if the second book is closed, even with :prefer_writeable => false" do
-        @book2 = Book.open(@simple_file1, :force_excel => :new)
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new)
         @bookstore.store(@book2)
         @book.ReadOnly.should be false
         @book2.ReadOnly.should be true
@@ -237,7 +237,7 @@ describe Bookstore do
     context "with readonly book" do
 
       before do
-        @book = Book.open(@simple_file, :read_only => true)
+        @book = Workbook.open(@simple_file, :read_only => true)
         @bookstore.store(@book)
       end
 
@@ -247,7 +247,7 @@ describe Bookstore do
       end
 
       it "should fetch the second, writable book" do
-        @book2 = Book.open(@simple_file1, :force_excel => :new)
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new)
         @bookstore.store(@book2)
         @book.ReadOnly.should be true
         @book2.ReadOnly.should be false
@@ -266,7 +266,7 @@ describe Bookstore do
       end
 
       it "should fetch the recent readonly book when there are only readonly books" do
-        @book2 = Book.open(@simple_file1, :force_excel => :new, :read_only => true)
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new, :read_only => true)
         @bookstore.store(@book2)
         @book.ReadOnly.should be true
         @book2.ReadOnly.should be true
@@ -277,8 +277,8 @@ describe Bookstore do
       end
 
       it "should fetch the second, writable book, if a writable, a readonly and an unsaved readonly book exist" do
-        @book2 = Book.open(@simple_file1, :force_excel => :new)
-        @book3 = Book.open(@simple_file1, :force_excel => :new)
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new)
+        @book3 = Workbook.open(@simple_file1, :force_excel => :new)
         @bookstore.store(@book2)
         @bookstore.store(@book3)
         sheet = @book3.sheet(1)
@@ -303,10 +303,10 @@ describe Bookstore do
     context "with several closed books" do
       
       before do
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
         @bookstore.store(@book)
         @bookstore.store(@book)
-        @book2 = Book.open(@simple_file1, :force_excel => :new)
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new)
         @bookstore.store(@book2)
         @book.close
         @book2.close
@@ -323,7 +323,7 @@ describe Bookstore do
     context "with changing file name" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @book.save_as(@simple_save_file, :if_exists => :overwrite)      
         @bookstore.store(@book)
         #@bookstore = @book.book_store
@@ -347,9 +347,9 @@ describe Bookstore do
     context "with given excel instance and fetching readonly" do
       
       before do
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
         @bookstore.store(@book)
-        @book2 = Book.open(@simple_file1, :force_excel => :new)
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new)
         @bookstore.store(@book2)        
       end
 
@@ -361,7 +361,7 @@ describe Bookstore do
         @book.ReadOnly.should be false
         @book2.ReadOnly.should be true
         book_new = @bookstore.fetch(@simple_file, :prefer_excel => @book2.excel)
-        book_new.should be_a Book
+        book_new.should be_a Workbook
         book_new.should be_alive
         book_new.should == @book2
       end
@@ -373,7 +373,7 @@ describe Bookstore do
     context "with an open book" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @bookstore.store(@book)
       end
 
@@ -393,11 +393,11 @@ describe Bookstore do
       end
 
       it "should have forgotten some books if they have no reference anymore" do
-        book_new = Book.open(@different_file1)
+        book_new = Workbook.open(@different_file1)
         @bookstore.store(book_new)
         @book = nil
         @book = "Bla"
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
         @bookstore.store(@book)
         @book = nil
         GC.start
@@ -411,9 +411,9 @@ describe Bookstore do
   describe "books" do
 
     before do
-       @book = Book.open(@simple_file)
+       @book = Workbook.open(@simple_file)
        @bookstore.store(@book)
-       @book2 = Book.open(@different_file)
+       @book2 = Workbook.open(@different_file)
        @bookstore.store(@book2)
     end
 
@@ -432,9 +432,9 @@ describe Bookstore do
   describe "print" do
 
     before do
-       @book = Book.open(@simple_file)
+       @book = Workbook.open(@simple_file)
        @bookstore.store(@book)
-       @book2 = Book.open(@different_file)
+       @book2 = Workbook.open(@different_file)
        @bookstore.store(@book2)
     end
 
@@ -456,7 +456,7 @@ describe Bookstore do
     context "with some open book" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -468,7 +468,7 @@ describe Bookstore do
         h_excel1.should_not == @book.excel
         h_excel1.Visible.should be false
         h_excel1.DisplayAlerts.should be false
-        book1 = Book.open(@simple_file, :force_excel => @bookstore.hidden_excel)
+        book1 = Workbook.open(@simple_file, :force_excel => @bookstore.hidden_excel)
         book1.excel.should === h_excel1
         book1.excel.should_not === @book.excel
         Excel.close_all    
@@ -477,14 +477,14 @@ describe Bookstore do
         h_excel2.should_not == book1.excel
         h_excel2.Visible.should be false
         h_excel2.DisplayAlerts.should be false
-        book2 = Book.open(@simple_file, :force_excel => @bookstore.hidden_excel)
+        book2 = Workbook.open(@simple_file, :force_excel => @bookstore.hidden_excel)
         book2.excel.should === h_excel2
         book2.excel.should_not === @book.excel
         book2.excel.should_not === book1.excel
       end
 
       it "should exclude hidden excel" do
-        book1 = Book.open(@simple_file, :force_excel => @bookstore.hidden_excel)
+        book1 = Workbook.open(@simple_file, :force_excel => @bookstore.hidden_excel)
         @bookstore.store(book1)
         book1.close
         book2 = @bookstore.fetch(@simple_file)

data/spec/cell_spec.rb

@@ -22,7 +22,7 @@ describe Cell do
 
   context "open simple.xls" do
     before do
-      @book = Book.open(@dir + '/workbook.xls', :read_only => true)
+      @book = Workbook.open(@dir + '/workbook.xls', :read_only => true)
       @sheet = @book.sheet(2)
       @cell = @sheet[1, 1]
     end
@@ -33,14 +33,14 @@ describe Cell do
 
     describe "#value" do
       it "get cell's value" do
-        @cell.value.should eq 'simple'
+        @cell.Value.should eq 'simple'
       end
     end
 
     describe "#value=" do
       it "change cell data to 'fooooo'" do
-        @cell.value = 'fooooo'
-        @cell.value.should eq 'fooooo'
+        @cell.Value = 'fooooo'
+        @cell.Value.should eq 'fooooo'
       end
     end
 
@@ -54,7 +54,7 @@ describe Cell do
 
   context "open merge_cells.xls" do
     before do
-      @book = Book.open(@dir + '/merge_cells.xls', :read_only => true)
+      @book = Workbook.open(@dir + '/merge_cells.xls', :read_only => true)
       @sheet = @book.sheet(1)
     end
 
@@ -63,14 +63,14 @@ describe Cell do
     end
 
     it "merged cell get same value" do
-      @sheet[1, 1].value.should be_nil
-      @sheet[2, 1].value.should eq 'first merged'
+      @sheet[1, 1].Value.should be_nil
+      @sheet[2, 1].Value.should eq 'first merged'
     end
 
     it "set merged cell" do
-      @sheet[2, 1].value = "set merge cell"
-      @sheet[2, 1].value.should eq "set merge cell"
-      @sheet[2, 2].value.should eq "set merge cell"
+      @sheet[2, 1].Value = "set merge cell"
+      @sheet[2, 1].Value.should eq "set merge cell"
+      @sheet[2, 2].Value.should eq "set merge cell"
     end
   end
 end

data/spec/excel_spec.rb

@@ -131,14 +131,14 @@ module RobustExcelOle
     context "Illegal Refrence" do
 
       before do
-        book1 = Book.open(@simple_file1)
-        book2 = Book.open(@simple_file1, :force_excel => :new)
+        book1 = Workbook.open(@simple_file1)
+        book2 = Workbook.open(@simple_file1, :force_excel => :new)
         a = book1.saved 
       end
 
       it "should not cause warning 'Illegal Reference probably recycled'" do
         Excel.close_all
-        book = Book.open(@simple_file)
+        book = Workbook.open(@simple_file)
       end
     end
 
@@ -191,7 +191,7 @@ module RobustExcelOle
       context "lifting an Excel instance given as WIN32Ole object" do
 
         before do
-          @book = Book.open(@simple_file)
+          @book = Workbook.open(@simple_file)
           @excel = @book.excel          
         end
 
@@ -330,7 +330,7 @@ module RobustExcelOle
       context "with a single Excel instance" do
 
         before do
-          @book1 = Book.open(@simple_file)
+          @book1 = Workbook.open(@simple_file)
           @excel1 = @book1.excel
         end
 
@@ -396,9 +396,9 @@ module RobustExcelOle
       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)
+          @book1 = Workbook.open(@simple_file)      
+          @book2 = Workbook.open(@another_simple_file, :force_excel => @book1)
+          @book3 = Workbook.open(@different_file, :force_excel => :new)
           @excel1 = @book1.excel
           @excel3 = @book3.excel
           @excel1.visible = true
@@ -491,11 +491,11 @@ module RobustExcelOle
         context "with one Excel instance" do
 
           before do
-            book1 = Book.open(@simple_file1, :visible => true)
+            book1 = Workbook.open(@simple_file1, :visible => true)
             @excel1 = book1.excel
             sheet1 = book1.sheet(1)
-            @old_cell_value1 = sheet1[1,1].value
-            sheet1[1,1] = sheet1[1,1].value == "foo" ? "bar" : "foo"
+            @old_cell_value1 = sheet1[1,1].Value
+            sheet1[1,1] = sheet1[1,1].Value == "foo" ? "bar" : "foo"
             book1.Saved.should be false
           end
 
@@ -503,9 +503,9 @@ module RobustExcelOle
             result = Excel.close_all(:if_unsaved => :save)
             sleep 0.2
             @excel1.should_not be_alive
-            new_book1 = Book.open(@simple_file1)
+            new_book1 = Workbook.open(@simple_file1)
             new_sheet1 = new_book1.sheet(1)
-            new_sheet1[1,1].value.should_not == @old_cell_value1
+            new_sheet1[1,1].Value.should_not == @old_cell_value1
             new_book1.close
             result.should == [1,0]
           end
@@ -514,9 +514,9 @@ module RobustExcelOle
             result = Excel.close_all(:if_unsaved => :forget)
             sleep 0.2
             @excel1.should_not be_alive
-            new_book1 = Book.open(@simple_file1)
+            new_book1 = Workbook.open(@simple_file1)
             new_sheet1 = new_book1.sheet(1)
-            new_sheet1[1,1].value.should == @old_cell_value1
+            new_sheet1[1,1].Value.should == @old_cell_value1
             new_book1.close
             result.should == [1,0]
           end
@@ -525,13 +525,13 @@ module RobustExcelOle
         context "with two Excel instances" do
           
           before do          
-            book1 = Book.open(@simple_file1, :force_excel => :new)
-            book2 = Book.open(@different_file, :force_excel => :new)          
+            book1 = Workbook.open(@simple_file1, :force_excel => :new)
+            book2 = Workbook.open(@different_file, :force_excel => :new)          
             @excel1 = book1.excel
             @excel2 = book2.excel
             sheet2 = book2.sheet(1)
-            @old_cell_value2 = sheet2[1,1].value
-            sheet2[1,1] = sheet2[1,1].value == "foo" ? "bar" : "foo"
+            @old_cell_value2 = sheet2[1,1].Value
+            sheet2[1,1] = sheet2[1,1].Value == "foo" ? "bar" : "foo"
           end
 
           it "should close the first Excel without unsaved workbooks and then raise an error" do
@@ -565,9 +565,9 @@ module RobustExcelOle
             sleep 0.2
             @excel1.should_not be_alive
             @excel2.should_not be_alive
-            new_book2 = Book.open(@different_file1)
+            new_book2 = Workbook.open(@different_file1)
             new_sheet2 = new_book2.sheet(1)
-            new_sheet2[1,1].value.should_not == @old_cell_value2
+            new_sheet2[1,1].Value.should_not == @old_cell_value2
             new_book2.close
             result.should == [2,0]
           end
@@ -577,9 +577,9 @@ module RobustExcelOle
             sleep 0.2
             @excel1.should_not be_alive
             @excel2.should_not be_alive
-            new_book2 = Book.open(@different_file1)
+            new_book2 = Workbook.open(@different_file1)
             new_sheet2 = new_book2.sheet(1)
-            new_sheet2[1,1].value.should == @old_cell_value2
+            new_sheet2[1,1].Value.should == @old_cell_value2
             new_book2.close
             result.should == [2,0]
           end       
@@ -594,10 +594,10 @@ module RobustExcelOle
         context "with three Excel instances" do
 
          before do          
-            @book1 = Book.open(@simple_file1, :force_excel => :new)
-            @book2 = Book.open(@another_simple_file, :force_excel => :new) 
-            @book3 = Book.open(@different_file, :force_excel => :new)
-            old_cell_value1 = @book2.sheet(1)[1,1].value                 
+            @book1 = Workbook.open(@simple_file1, :force_excel => :new)
+            @book2 = Workbook.open(@another_simple_file, :force_excel => :new) 
+            @book3 = Workbook.open(@different_file, :force_excel => :new)
+            old_cell_value1 = @book2.sheet(1)[1,1].Value                 
             @book2.sheet(1)[1,1] = old_cell_value1 == "foo" ? "bar" : "foo"
           end
 
@@ -619,10 +619,10 @@ module RobustExcelOle
 
          before do          
             @ole_xl = WIN32OLE.new('Excel.Application')
-            @book1 = Book.open(@simple_file1, :force_excel => :new)
-            @book2 = Book.open(@another_simple_file, :force_excel => :new) 
-            @book3 = Book.open(@different_file, :force_excel => :new)
-            old_cell_value1 = @book2.sheet(1)[1,1].value                 
+            @book1 = Workbook.open(@simple_file1, :force_excel => :new)
+            @book2 = Workbook.open(@another_simple_file, :force_excel => :new) 
+            @book3 = Workbook.open(@different_file, :force_excel => :new)
+            old_cell_value1 = @book2.sheet(1)[1,1].Value                 
             @book2.sheet(1)[1,1] = old_cell_value1 == "foo" ? "bar" : "foo"
           end
 
@@ -664,7 +664,7 @@ module RobustExcelOle
 
         before do
           @excel = Excel.create
-          @book = Book.open(@simple_file)
+          @book = Workbook.open(@simple_file)
           @excel.should be_alive
         end
 
@@ -689,14 +689,14 @@ module RobustExcelOle
 
         before do
           @excel = Excel.create
-          @book = Book.open(@simple_file)
+          @book = Workbook.open(@simple_file)
           sheet = @book.sheet(1)
-          @old_cell_value = sheet[1,1].value
-          sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
-          @book2 = Book.open(@another_simple_file)
+          @old_cell_value = sheet[1,1].Value
+          sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+          @book2 = Workbook.open(@another_simple_file)
           sheet2 = @book2.sheet(1)
-          @old_cell_value2 = sheet2[1,1].value
-          sheet2[1,1] = sheet2[1,1].value == "foo" ? "bar" : "foo"
+          @old_cell_value2 = sheet2[1,1].Value
+          sheet2[1,1] = sheet2[1,1].Value == "foo" ? "bar" : "foo"
           @excel.should be_alive
           @book.should be_alive
           @book.saved.should be false
@@ -721,9 +721,9 @@ module RobustExcelOle
           sleep 0.2
           @excel.should_not be_alive
           result.should == 1
-          new_book = Book.open(@simple_file)
+          new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].value.should == @old_cell_value
+          new_sheet[1,1].Value.should == @old_cell_value
           new_book.close          
         end
         
@@ -735,9 +735,9 @@ module RobustExcelOle
           sleep 0.2
           result.should == 1
           @excel.should_not be_alive
-          new_book = Book.open(@simple_file)
+          new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].value.should == @old_cell_value
+          new_sheet[1,1].Value.should == @old_cell_value
           new_book.close          
         end
 
@@ -747,9 +747,9 @@ module RobustExcelOle
           sleep 0.2
           result.should == 1
           @excel.should_not be_alive
-          new_book = Book.open(@simple_file)
+          new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].value.should_not == @old_cell_value
+          new_sheet[1,1].Value.should_not == @old_cell_value
           new_book.close          
         end
 
@@ -765,10 +765,10 @@ module RobustExcelOle
         before do
           @key_sender = IO.popen  'ruby "' + File.join(File.dirname(__FILE__), '/helpers/key_sender.rb') + '" "Microsoft Excel" '  , "w"
           @excel = Excel.create(:visible => true)
-          @book = Book.open(@simple_file, :visible => true)
+          @book = Workbook.open(@simple_file, :visible => true)
           sheet = @book.sheet(1)
-          @old_cell_value = sheet[1,1].value
-          sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+          @old_cell_value = sheet[1,1].Value
+          sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         end
 
         after do
@@ -782,9 +782,9 @@ module RobustExcelOle
           result = @excel.close(:if_unsaved => :alert)
           @excel.should_not be_alive
           result.should == 1
-          new_book = Book.open(@simple_file)
+          new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].value.should_not == @old_cell_value
+          new_sheet[1,1].Value.should_not == @old_cell_value
           new_book.close   
         end
 
@@ -797,9 +797,9 @@ module RobustExcelOle
           @excel.should_not be_alive
           result.should == 1
           @book.should_not be_alive
-          new_book = Book.open(@simple_file)
+          new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].value.should == @old_cell_value
+          new_sheet[1,1].Value.should == @old_cell_value
           new_book.close     
         end
 
@@ -822,15 +822,15 @@ module RobustExcelOle
       context "with standard" do
         
         before do
-          @book = Book.open(@simple_file)
+          @book = Workbook.open(@simple_file)
           sheet = @book.sheet(1)
-          @old_cell_value = sheet[1,1].value
-          sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"          
-          @book3 = Book.open(@different_file, :read_only => true)
+          @old_cell_value = sheet[1,1].Value
+          sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"          
+          @book3 = Workbook.open(@different_file, :read_only => true)
           sheet3 = @book3.sheet(1)
-          sheet3[1,1] = sheet3[1,1].value == "foo" ? "bar" : "foo"
+          sheet3[1,1] = sheet3[1,1].Value == "foo" ? "bar" : "foo"
           @excel = @book.excel
-          @book2 = Book.open(@another_simple_file, :force_excel => :new)
+          @book2 = Workbook.open(@another_simple_file, :force_excel => :new)
         end
 
         it "should be ok if there are no unsaved workbooks" do
@@ -856,9 +856,9 @@ module RobustExcelOle
           sleep 0.2
           @excel.should be_alive
           @excel.Workbooks.Count.should == 0          
-          new_book = Book.open(@simple_file)
+          new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].value.should == @old_cell_value
+          new_sheet[1,1].Value.should == @old_cell_value
           new_book.close          
         end
 
@@ -867,9 +867,9 @@ module RobustExcelOle
           sleep 0.2
           @excel.should be_alive
           @excel.Workbooks.Count.should == 0          
-          new_book = Book.open(@simple_file)
+          new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].value.should_not == @old_cell_value
+          new_sheet[1,1].Value.should_not == @old_cell_value
           new_book.close          
         end
 
@@ -884,11 +884,11 @@ module RobustExcelOle
     describe "retain_saved_workbooks" do
 
       before do
-        @book1 = Book.open(@simple_file)
-        @book2 = Book.open(@another_simple_file)
-        @book3 = Book.open(@different_file)
+        @book1 = Workbook.open(@simple_file)
+        @book2 = Workbook.open(@another_simple_file)
+        @book3 = Workbook.open(@different_file)
         sheet2 = @book2.sheet(1)
-        sheet2[1,1] = sheet2[1,1].value == "foo" ? "bar" : "foo"
+        sheet2[1,1] = sheet2[1,1].Value == "foo" ? "bar" : "foo"
         @book2.Saved.should be false
         @excel = Excel.current
       end
@@ -896,10 +896,10 @@ module RobustExcelOle
       it "should retain saved workbooks" do
         @excel.retain_saved_workbooks do
           sheet1 = @book1.sheet(1)
-          sheet1[1,1] = sheet1[1,1].value == "foo" ? "bar" : "foo"
+          sheet1[1,1] = sheet1[1,1].Value == "foo" ? "bar" : "foo"
           @book1.Saved.should be false
           sheet3 = @book3.sheet(1)
-          sheet3[1,1] = sheet3[1,1].value == "foo" ? "bar" : "foo"
+          sheet3[1,1] = sheet3[1,1].Value == "foo" ? "bar" : "foo"
           @book3.Saved.should be false
         end
         @book1.Saved.should be true
@@ -913,12 +913,12 @@ module RobustExcelOle
       context "with standard" do
         
         before do
-          @book = Book.open(@simple_file)
+          @book = Workbook.open(@simple_file)
           sheet = @book.sheet(1)
-          sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"          
-          @book3 = Book.open(@different_file, :read_only => true)
+          sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"          
+          @book3 = Workbook.open(@different_file, :read_only => true)
           sheet3 = @book3.sheet(1)
-          sheet3[1,1] = sheet3[1,1].value == "foo" ? "bar" : "foo"
+          sheet3[1,1] = sheet3[1,1].Value == "foo" ? "bar" : "foo"
           @book.Saved.should be false
           @book3.Saved.should be false
         end
@@ -944,15 +944,15 @@ module RobustExcelOle
       end
 
       it "should return empty list for first Excel instance" do
-        book = Book.open(@simple_file)
+        book = Workbook.open(@simple_file)
         Excel.unsaved_known_workbooks.should == [[]]
         book.close
       end
        
       it "should return one unsaved book" do
-        book = Book.open(@simple_file)
+        book = Workbook.open(@simple_file)
         sheet = book.sheet(1)
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         # Excel.unsaved_known_workbooks.should == [[book.ole_workbook]]
         unsaved_known_wbs = Excel.unsaved_known_workbooks
         unsaved_known_wbs.size.should == 1
@@ -962,7 +962,7 @@ module RobustExcelOle
             ole_workbook.Fullname.tr('\\','/').should == @simple_file  
           end
         end
-        book2 = Book.open(@another_simple_file)
+        book2 = Workbook.open(@another_simple_file)
         # Excel.unsaved_known_workbooks.should == [[book.ole_workbook]]
         unsaved_known_wbs = Excel.unsaved_known_workbooks
         unsaved_known_wbs.size.should == 1
@@ -977,12 +977,12 @@ module RobustExcelOle
       end
 
       it "should return two unsaved books" do
-        book = Book.open(@simple_file)
+        book = Workbook.open(@simple_file)
         sheet = book.sheet(1)
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
-        book2 = Book.open(@another_simple_file)
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        book2 = Workbook.open(@another_simple_file)
         sheet2 = book2.sheet(1)
-        sheet2[1,1] = sheet2[1,1].value == "foo" ? "bar" : "foo"
+        sheet2[1,1] = sheet2[1,1].Value == "foo" ? "bar" : "foo"
         #Excel.unsaved_known_workbooks.should == [[book.ole_workbook, book2.ole_workbook]]
         unsaved_known_wbs = Excel.unsaved_known_workbooks
         unsaved_known_wbs.size.should == 1
@@ -997,13 +997,13 @@ module RobustExcelOle
       end
 
       it "should return two unsaved books" do
-        book = Book.open(@simple_file)
-        book2 = Book.open(@another_simple_file, :force_excel => :new)
+        book = Workbook.open(@simple_file)
+        book2 = Workbook.open(@another_simple_file, :force_excel => :new)
         open_books = [book, book2]
         begin 
           open_books.each do |wb|
             sheet = wb.sheet(1)
-            sheet[1,1] = (sheet[1,1].value == "foo") ? "bar" : "foo"
+            sheet[1,1] = (sheet[1,1].Value == "foo") ? "bar" : "foo"
           end 
         #Excel.unsaved_known_workbooks.should == [[book.ole_workbook], [book2.ole_workbook]]
           unsaved_known_wbs = Excel.unsaved_known_workbooks
@@ -1461,6 +1461,7 @@ module RobustExcelOle
         excel6.calculation.should == :manual
       end
 
+=begin
       it "should do with_calculation mode without workbooks" do
         @excel1 = Excel.new
         old_calculation_mode = @excel1.Calculation
@@ -1474,6 +1475,7 @@ module RobustExcelOle
           @excel1.CalculateBeforeSave.should == old_calculatebeforesave
         end
       end
+=end
 
       it "should set calculation mode without workbooks" do
         @excel1 = Excel.new
@@ -1491,7 +1493,7 @@ module RobustExcelOle
 
       it "should do with_calculation with workbook" do
         @excel1 = Excel.new
-        book = Book.open(@simple_file, :visible => true)
+        book = Workbook.open(@simple_file, :visible => true)
         old_calculation_mode = @excel1.Calculation
         @excel1.with_calculation(:manual) do
           @excel1.calculation.should == :manual
@@ -1513,7 +1515,7 @@ module RobustExcelOle
 
       it "should set calculation mode to manual with workbook" do
         @excel1 = Excel.new
-        book = Book.open(@simple_file, :visible => true)
+        book = Workbook.open(@simple_file, :visible => true)
         book.Windows(book.Name).Visible = true
         @excel1.calculation = :manual
         @excel1.calculation.should == :manual
@@ -1524,7 +1526,7 @@ module RobustExcelOle
 
       it "should set calculation mode to automatic with workbook" do
         @excel1 = Excel.new
-        book = Book.open(@simple_file, :visible => true)
+        book = Workbook.open(@simple_file, :visible => true)
         @excel1.calculation = :automatic
         @excel1.calculation.should == :automatic
         @excel1.Calculation.should == XlCalculationAutomatic
@@ -1541,7 +1543,7 @@ module RobustExcelOle
 
       it "should do Calculation to manual with workbook" do
         @excel1 = Excel.new
-        b = Book.open(@simple_file)
+        b = Workbook.open(@simple_file)
         @excel1.Calculation = XlCalculationManual
         @excel1.calculation.should == :manual
         @excel1.Calculation.should == XlCalculationManual
@@ -1549,7 +1551,7 @@ module RobustExcelOle
 
       it "should do Calculation to automatic with workbook" do
         @excel1 = Excel.new
-        b = Book.open(@simple_file)
+        b = Workbook.open(@simple_file)
         @excel1.Calculation = XlCalculationAutomatic
         @excel1.calculation.should == :automatic
         @excel1.Calculation.should == XlCalculationAutomatic
@@ -1582,7 +1584,7 @@ module RobustExcelOle
 
       before do
         @excel = Excel.new(:reuse => false)
-        book = Book.open(@simple_file)
+        book = Workbook.open(@simple_file)
         book.excel.calculation = :manual
         book.close(:if_unsaved => :save)
       end
@@ -1592,7 +1594,7 @@ module RobustExcelOle
         @excel.DisplayAlerts.should be true
         @excel.Visible.should be true
         @excel.ScreenUpdating.should be true
-        book = Book.open(@simple_file)
+        book = Workbook.open(@simple_file)
         @excel.Calculation.should == XlCalculationManual
         book.close
       end
@@ -1609,7 +1611,7 @@ module RobustExcelOle
       end
 
       it "should set options to true for a workbook" do
-        book1 = Book.open(@simple_file)
+        book1 = Workbook.open(@simple_file)
         book1.excel.for_all_workbooks(:visible => true, :read_only => true, :check_compatibility => true)
         book1.excel.Visible.should be true
         book1.Windows(book1.Name).Visible.should be true
@@ -1619,8 +1621,8 @@ module RobustExcelOle
       end
 
       it "should set options for two workbooks" do
-        book1 = Book.open(@simple_file)
-        book2 = Book.open(@different_file)
+        book1 = Workbook.open(@simple_file)
+        book2 = Workbook.open(@different_file)
         excel = book1.excel
         excel.for_all_workbooks(:visible => true, :read_only => true, :check_compatibility => true)
         excel.Visible.should be true
@@ -1766,7 +1768,7 @@ module RobustExcelOle
         end
 
         it "should generate a workbook if one is already existing" do
-          book = Book.open(@simple_file)
+          book = Workbook.open(@simple_file)
           workbook = @excel1.generate_workbook(@file_name)
           workbook.should be_a WIN32OLE
           workbook.Name.should == File.basename(@file_name)
@@ -1796,7 +1798,7 @@ module RobustExcelOle
     context "setting the name of a range" do
 
        before do
-        @book1 = Book.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
+        @book1 = Workbook.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
         @book1.excel.displayalerts = false
         @excel1 = @book1.excel
       end
@@ -1806,31 +1808,31 @@ module RobustExcelOle
       end   
 
       it "should name an unnamed range with a giving address" do
-        @excel1.add_name("foo",1,2)
+        @excel1.add_name("foo",[1,2])
         @excel1.Names.Item("foo").Name.should == "foo"
-        @excel1.Names.Item("foo").Value.should == "=Sheet1!$B$1"
+        @excel1.Names.Item("foo").Value.should == "=Sheet1!$B$1:$B$1"
       end
 
       it "should rename an already named range with a giving address" do
-        @excel1.add_name("foo",1,1)
+        @excel1.add_name("foo",[1,1])
         @excel1.Names.Item("foo").Name.should == "foo"
-        @excel1.Names.Item("foo").Value.should == "=Sheet1!$A$1"
+        @excel1.Names.Item("foo").Value.should == "=Sheet1!$A$1:$A$1"
       end
 
       it "should raise an error" do
         expect{
-          @excel1.add_name("foo", -2, 1)
-        }.to raise_error(RangeNotEvaluatable, /cannot add name "foo" to cell with row -2 and column 1/)
+          @excel1.add_name("foo", [-2, 1])
+        }.to raise_error(RangeNotEvaluatable, /cannot add name "foo" to range/)
       end
 
       it "should rename a range" do
-        @excel1.add_name("foo",1,1)
+        @excel1.add_name("foo",[1,1])
         @excel1.rename_range("foo","bar")
         @excel1.namevalue_glob("bar").should == "foo"
       end
 
       it "should delete a name of a range" do
-        @excel1.add_name("foo",1,1)
+        @excel1.add_name("foo",[1,1])
         @excel1.delete_name("foo")
         expect{
           @excel1.namevalue_glob("foo")
@@ -1838,16 +1840,22 @@ module RobustExcelOle
       end
 
       it "should add a name of a rectangular range" do
-        @excel1.add_name("foo",1,1,3,4)
+        @excel1.add_name("foo",[1..3,1..4])
+        @excel1["foo"].should == [["foo", "workbook", "sheet1", nil], ["foo", 1.0, 2.0, 4.0], ["matz", 3.0, 4.0, 4.0]] 
+      end
+
+      it "should accept the old interface" do
+        @excel1.add_name("foo",1..3,1..4)
         @excel1["foo"].should == [["foo", "workbook", "sheet1", nil], ["foo", 1.0, 2.0, 4.0], ["matz", 3.0, 4.0, 4.0]] 
       end
+
     end
   
 
     describe "nameval, set_nameval" do
 
       before do
-        @book1 = Book.open(@dir + '/another_workbook.xls')
+        @book1 = Workbook.open(@dir + '/another_workbook.xls')
         @book1.Windows(@book1.Name).Visible = true
         @excel1 = @book1.excel
       end
@@ -1916,7 +1924,7 @@ module RobustExcelOle
     describe "namevalue, set_namevalue" do
       
       before do
-        @book1 = Book.open(@dir + '/another_workbook.xls')
+        @book1 = Workbook.open(@dir + '/another_workbook.xls')
         @excel1 = @book1.excel
       end