robust_excel_ole 1.3 → 1.4

data/spec/workbook_specs/workbook_all_spec.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+require File.join(File.dirname(__FILE__), './../spec_helper')
+
+$VERBOSE = nil
+
+require File.expand_path("workbook_open_spec", File.dirname(__FILE__)) 
+require File.expand_path("workbook_close_spec", File.dirname(__FILE__))
+require File.expand_path("workbook_save_spec", File.dirname(__FILE__))
+require File.expand_path("workbook_misc_spec", File.dirname(__FILE__))
+require File.expand_path("workbook_sheet_spec", File.dirname(__FILE__))
+require File.expand_path("workbook_unobtr_spec", File.dirname(__FILE__))
+require File.expand_path("workbook_subclass_spec", File.dirname(__FILE__))
+
+=begin
+$VERBOSE = nil
+
+include General
+
+unless Object.method_defined?(:require_relative)
+  def require_relative path
+    require File.expand_path(path, File.dirname(__FILE__))  
+  end
+end
+
+require_relative "workbook_open_spec"
+require_relative "workbook_close_spec"
+require_relative "workbook_save_spec"
+require_relative "workbook_misc_spec"
+require_relative "workbook_sheet_spec"
+require_relative "workbook_unobtr_spec"
+require_relative "workbook_subclass_spec"
+=end

data/spec/{book_specs/book_close_spec.rb → workbook_specs/workbook_close_spec.rb}

@@ -9,7 +9,7 @@ $VERBOSE = nil
 include RobustExcelOle
 include General
 
-describe Book do
+describe Workbook do
 
   before(:all) do
     excel = Excel.new(:reuse => true)
@@ -40,7 +40,7 @@ describe Book do
 
     context "with saved book" do
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       it "should close book" do
@@ -53,7 +53,7 @@ describe Book do
 
     context "with unsaved read_only book" do
       before do
-        @book = Book.open(@simple_file1, :read_only => true)
+        @book = Workbook.open(@simple_file1, :read_only => true)
         @sheet_count = @book.ole_workbook.Worksheets.Count
         @book.add_sheet(@sheet, :as => 'a_name')
       end
@@ -62,7 +62,7 @@ describe Book do
         expect{
           @book.close
           }.to_not raise_error
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
  
         new_book.ole_workbook.Worksheets.Count.should ==  @sheet_count
         new_book.close
@@ -71,7 +71,7 @@ describe Book do
 
     context "with unsaved book" do
       before do
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
         @sheet_count = @book.ole_workbook.Worksheets.Count
         @book.add_sheet(@sheet, :as => 'a_name')
         @sheet = @book.sheet(1)
@@ -112,7 +112,7 @@ describe Book do
         @book.should_not be_alive
         #expect{
         #  ole_workbook.Name}.to raise_error(WIN32OLERuntimeError)
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         begin
           new_book.ole_workbook.Worksheets.Count.should ==  @sheet_count
         ensure
@@ -131,7 +131,7 @@ describe Book do
         @book.should_not be_alive
         #expect{
         #  ole_workbook.Name}.to raise_error(WIN32OLERuntimeError)
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         begin
           new_book.ole_workbook.Worksheets.Count.should ==  @sheet_count
         ensure
@@ -156,7 +156,7 @@ describe Book do
         @book.should_not be_alive
         #expect{
         #  ole_workbook.Name}.to raise_error(WIN32OLERuntimeError)
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         begin
           new_book.ole_workbook.Worksheets.Count.should == @sheet_count + 1
         ensure
@@ -196,7 +196,7 @@ describe Book do
               @book.should_not be_alive
              # expect{ole_workbook.Name}.to raise_error(WIN32OLERuntimeError)
             end
-            new_book = Book.open(@simple_file1, :if_unsaved => :forget)
+            new_book = Workbook.open(@simple_file1, :if_unsaved => :forget)
             begin
               new_book.ole_workbook.Worksheets.Count.should == @sheet_count + (answer==:yes ? 1 : 0)
               new_book.excel.DisplayAlerts.should == displayalert_value
@@ -239,7 +239,7 @@ describe Book do
               @book.should_not be_alive
               #expect{ole_workbook.Name}.to raise_error(WIN32OLERuntimeError)
             end
-            new_book = Book.open(@simple_file1, :if_unsaved => :forget)
+            new_book = Workbook.open(@simple_file1, :if_unsaved => :forget)
             begin
               new_book.ole_workbook.Worksheets.Count.should == @sheet_count + (answer==:yes ? 1 : 0)
               new_book.excel.DisplayAlerts.should == displayalert_value

data/spec/{book_specs/book_misc_spec.rb → workbook_specs/workbook_misc_spec.rb}

@@ -8,7 +8,7 @@ $VERBOSE = nil
 include RobustExcelOle
 include General
 
-describe Book do
+describe Workbook do
 
   before(:all) do
     excel = Excel.new(:reuse => true)
@@ -39,9 +39,9 @@ describe Book do
     context "with standard" do
       it "open an existing file" do
         expect {
-          @book = Book.new(@simple_file)
+          @book = Workbook.new(@simple_file)
         }.to_not raise_error
-        @book.should be_a Book
+        @book.should be_a Workbook
         @book.close
       end
     end
@@ -50,7 +50,7 @@ describe Book do
   describe "for_this_workbook" do
 
     before do
-      @book = Book.open(@simple_file)
+      @book = Workbook.open(@simple_file)
     end
 
     it "should set options" do
@@ -90,13 +90,13 @@ describe Book do
       @book.visible.should be false
       @book.ReadOnly.should be true
       @book.CheckCompatibility.should be false
-      @book.for_this_workbook(:calculation => true)
       @book.excel.Visible.should be true
       @book.Windows(@book.Name).Visible.should be false
       @book.visible.should be false
       @book.ReadOnly.should be true
       @book.CheckCompatibility.should be false
-      @book.excel.calculation.should be true    
+      #@book.for_this_workbook(:calculation => true)
+      #@book.excel.calculation.should be true    
     end
 
     it "should set options" do
@@ -109,7 +109,7 @@ describe Book do
   describe "excel_of" do
 
     before do
-      @book = Book.open(@simple_file)
+      @book = Workbook.open(@simple_file)
     end
 
     after do
@@ -118,19 +118,19 @@ describe Book do
 
     it "should access the excel" do
       workbook = @book.ole_workbook
-      excel = Book.excel_of(workbook)
+      excel = Workbook.excel_of(workbook)
       excel.should be_a Excel
       excel.should == @book.excel
     end
 
     it "should access the Excel of the ole_excel" do
-      excel = Book.excel_of(@book.excel.ole_excel)
+      excel = Workbook.excel_of(@book.excel.ole_excel)
       excel.should be_a Excel
       excel.should == @book.excel
     end
 
-    it "should access the Excel of a Book" do
-      excel = Book.excel_of(@book)
+    it "should access the Excel of a Workbook" do
+      excel = Workbook.excel_of(@book)
       excel.should be_a Excel
       excel.should == @book.excel
     end
@@ -140,7 +140,7 @@ describe Book do
   describe "with retain_saved" do
 
     before do
-      @book = Book.open(@simple_file)
+      @book = Workbook.open(@simple_file)
     end
 
     after do
@@ -166,7 +166,7 @@ describe Book do
 
     it "should keep the save state 'unsaved'" do
       sheet = @book.sheet(1)
-      sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+      sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
       @book.Saved.should be false
       @book.retain_saved do
         sheet = @book.sheet(1)
@@ -180,7 +180,7 @@ describe Book do
       @book.Saved.should be true
       @book.retain_saved do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         @book.Saved.should be false
       end
       @book.Saved.should be true
@@ -188,7 +188,7 @@ describe Book do
 
     it "should keep the save state 'unsaved' even when the workbook was saved before" do
       sheet = @book.sheet(1)
-      sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+      sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
       @book.Saved.should be false
       @book.retain_saved do
         @book.save
@@ -201,16 +201,16 @@ describe Book do
   describe "default-visible" do
 
     it "should keep the visibility of the open workbook" do
-      book1 = Book.open(@simple_file1)
+      book1 = Workbook.open(@simple_file1)
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
-      book2 = Book.open(@simple_file1, :default => {:visible => true})
+      book2 = Workbook.open(@simple_file1, :default => {:visible => true})
       book2.visible.should be false      
       book2.excel.Visible.should be false
       book2.Windows(book2.Name).Visible.should be true
       book1.visible.should be false
-      book2 = Book.open(@simple_file1, :default => {:visible => false})
+      book2 = Workbook.open(@simple_file1, :default => {:visible => false})
       book2.visible.should be false      
       book2.excel.Visible.should be false
       book2.Windows(book2.Name).Visible.should be true
@@ -218,11 +218,11 @@ describe Book do
     end
 
     it "should keep the visibility of the open workbook per default" do
-      book1 = Book.open(@simple_file1)
+      book1 = Workbook.open(@simple_file1)
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
-      book2 = Book.open(@simple_file1)
+      book2 = Workbook.open(@simple_file1)
       book2.visible.should be false      
       book2.excel.Visible.should be false
       book2.Windows(book2.Name).Visible.should be true
@@ -230,11 +230,11 @@ describe Book do
     end
 
     it "should keep the found Excel instance invisible" do
-      book1 = Book.open(@simple_file1)
+      book1 = Workbook.open(@simple_file1)
       excel1 = book1.excel
       excel1.Visible.should be false
       book1.close
-      book2 = Book.open(@simple_file1, :default => {:visible => true})
+      book2 = Workbook.open(@simple_file1, :default => {:visible => true})
       excel2 = book2.excel
       excel2.should == excel1
       excel2.Visible.should be false
@@ -242,11 +242,11 @@ describe Book do
     end
 
     it "should keep the found Excel instance invisible with default invisible" do
-      book1 = Book.open(@simple_file1)
+      book1 = Workbook.open(@simple_file1)
       excel1 = book1.excel
       excel1.Visible.should be false
       book1.close
-      book2 = Book.open(@simple_file1, :default => {:visible => false})
+      book2 = Workbook.open(@simple_file1, :default => {:visible => false})
       excel2 = book1.excel
       excel2.should == excel1
       excel2.Visible.should be false
@@ -254,12 +254,12 @@ describe Book do
     end
 
     it "should keep the found Excel instance visible" do
-      book1 = Book.open(@simple_file1, :visible => true)
+      book1 = Workbook.open(@simple_file1, :visible => true)
       excel1 = book1.excel
       book1.Windows(book1.Name).Visible.should be true
       excel1.Visible.should be true
       book1.close
-      book2 = Book.open(@simple_file1, :default => {:visible => false})
+      book2 = Workbook.open(@simple_file1, :default => {:visible => false})
       excel2 = book1.excel
       excel2.should == excel1
       excel2.Visible.should be true
@@ -267,12 +267,12 @@ describe Book do
     end
 
     it "should keep the found Excel instance visible with default visible true" do
-      book1 = Book.open(@simple_file1, :visible => true)
+      book1 = Workbook.open(@simple_file1, :visible => true)
       excel1 = book1.excel
       book1.Windows(book1.Name).Visible.should be true
       excel1.Visible.should be true
       book1.close
-      book2 = Book.open(@simple_file1, :default => {:visible => true})
+      book2 = Workbook.open(@simple_file1, :default => {:visible => true})
       excel2 = book1.excel
       excel2.should == excel1
       excel2.Visible.should be true
@@ -280,11 +280,11 @@ describe Book do
     end
 
     it "should keep the found Excel instance invisible per default" do
-      book1 = Book.open(@simple_file1)
+      book1 = Workbook.open(@simple_file1)
       excel1 = book1.excel
       excel1.Visible.should be false
       book1.close
-      book2 = Book.open(@simple_file1)
+      book2 = Workbook.open(@simple_file1)
       excel2 = book1.excel
       excel2.should == excel1
       excel2.Visible.should be false
@@ -292,35 +292,35 @@ describe Book do
     end
 
     it "should open the workbook visible if the workbook is new" do
-      book1 = Book.open(@simple_file1, :default => {:visible => true})
+      book1 = Workbook.open(@simple_file1, :default => {:visible => true})
       book1.visible.should be true
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
     end
 
     it "should open the workbook invisible if the workbook is new" do
-      book1 = Book.open(@simple_file1, :default => {:visible => false})
+      book1 = Workbook.open(@simple_file1, :default => {:visible => false})
       book1.visible.should be false
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be false
     end
 
     it "should open the workbook invisible per default if the workbook is new" do
-      book1 = Book.open(@simple_file1)
+      book1 = Workbook.open(@simple_file1)
       book1.visible.should be false
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
     end
 
     it "should open the workbook visible if the old Excel is closed" do
-      book1 = Book.open(@simple_file1)
+      book1 = Workbook.open(@simple_file1)
       book1.visible.should be false
       excel1 = book1.excel
       excel1.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
       book1.close
       excel1.close
-      book2 = Book.open(@simple_file1, :default => {:visible => true})
+      book2 = Workbook.open(@simple_file1, :default => {:visible => true})
       excel2 = book2.excel
       book2.visible.should be true
       excel2.Visible.should be true
@@ -328,14 +328,14 @@ describe Book do
     end
 
     it "should open the workbook invisible if the old Excel is closed" do
-      book1 = Book.open(@simple_file1, :default => {:visible => true})
+      book1 = Workbook.open(@simple_file1, :default => {:visible => true})
       book1.visible.should be true
       excel1 = book1.excel
       excel1.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
       book1.close
       excel1.close
-      book2 = Book.open(@simple_file1, :default => {:visible => false})
+      book2 = Workbook.open(@simple_file1, :default => {:visible => false})
       excel2 = book2.excel
       book2.visible.should be false
       excel2.Visible.should be false
@@ -347,16 +347,16 @@ describe Book do
   describe "force-visible" do
 
     it "should change the visibility of the workbooks" do
-      book1 = Book.open(@simple_file)
+      book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
-      book2 = Book.open(@simple_file, :visible => true)
+      book2 = Workbook.open(@simple_file, :visible => true)
       book2.visible.should be true      
       book2.excel.Visible.should be true
       book2.Windows(book2.Name).Visible.should be true
       book1.visible.should be true
-      book2 = Book.open(@simple_file, :visible => false)
+      book2 = Workbook.open(@simple_file, :visible => false)
       book2.visible.should be false      
       book2.excel.Visible.should be true
       book2.Windows(book2.Name).Visible.should be false
@@ -370,28 +370,28 @@ describe Book do
     it "should adapt its default value at the visible value of the Excel" do
       excel1 = Excel.create
       excel1.visible = true
-      book1 = Book.open(@simple_file)
+      book1 = Workbook.open(@simple_file)
       excel1.Visible.should be true
       excel1.visible.should be true
       book1.visible.should be true
     end
 
     it "should preserve :visible if it is not set" do
-      book1 = Book.open(@simple_file)
+      book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
     end
 
     it "should set :visible to false" do
-      book1 = Book.open(@simple_file, :visible => false)
+      book1 = Workbook.open(@simple_file, :visible => false)
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be false
       book1.visible.should be false
     end
 
     it "should set :visible to true" do
-      book1 = Book.open(@simple_file, :visible => true)
+      book1 = Workbook.open(@simple_file, :visible => true)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be true
@@ -399,7 +399,7 @@ describe Book do
 
     it "should preserve :visible if they are set to visible" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@simple_file)
+      book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be true
@@ -407,7 +407,7 @@ describe Book do
 
     it "should preserve :visible" do
       excel1 = Excel.create
-      book1 = Book.open(@simple_file)
+      book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
@@ -416,7 +416,7 @@ describe Book do
 
     it "should preserve :visible if it is set to false" do
       excel1 = Excel.create
-      book1 = Book.open(@simple_file, :visible => false)
+      book1 = Workbook.open(@simple_file, :visible => false)
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be false
       book1.visible.should be false
@@ -424,7 +424,7 @@ describe Book do
 
     it "should preserve :visible if it is not set" do
       excel1 = Excel.create
-      book1 = Book.open(@simple_file)
+      book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
@@ -432,7 +432,7 @@ describe Book do
 
     it "should overwrite :visible to false" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@simple_file, :visible => false)
+      book1 = Workbook.open(@simple_file, :visible => false)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be false
       book1.visible.should be false
@@ -440,7 +440,7 @@ describe Book do
 
     it "should overwrite :visible to true" do
       excel1 = Excel.create(:visible => false)
-      book1 = Book.open(@simple_file, :visible => true)
+      book1 = Workbook.open(@simple_file, :visible => true)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be true
@@ -448,8 +448,8 @@ describe Book do
 
     it "should preserve :visible if it is not set with default_excel" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@simple_file)
-      book2 = Book.open(@different_file, :default_excel => :new)
+      book1 = Workbook.open(@simple_file)
+      book2 = Workbook.open(@different_file, :default_excel => :new)
       book2.excel.Visible.should be false
       book2.Windows(book2.Name).Visible.should be true
       book2.visible.should be false
@@ -457,8 +457,8 @@ describe Book do
 
     it "should set :visible to true with default_excel" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@simple_file)
-      book2 = Book.open(@different_file, :default_excel => :new, :visible => true)
+      book1 = Workbook.open(@simple_file)
+      book2 = Workbook.open(@different_file, :default_excel => :new, :visible => true)
       book2.excel.Visible.should be true
       book2.Windows(book2.Name).Visible.should be true
       book2.visible.should be true
@@ -466,8 +466,8 @@ describe Book do
 
     it "should set :visible to false with default_excel" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@simple_file)
-      book2 = Book.open(@different_file, :default_excel => :new, :visible => false)
+      book1 = Workbook.open(@simple_file)
+      book2 = Workbook.open(@different_file, :default_excel => :new, :visible => false)
       book2.excel.Visible.should be false
       book2.Windows(book2.Name).Visible.should be false
       book2.visible.should be false
@@ -476,7 +476,7 @@ describe Book do
     it "should preserve :visible if it is set to true with default_excel" do
       excel1 = Excel.create(:visible => true)
       excel2 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :default_excel => excel2)
+      book1 = Workbook.open(@different_file, :default_excel => excel2)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be true
@@ -485,7 +485,7 @@ describe Book do
     it "should overwrite :visible to false with default_excel" do
       excel1 = Excel.create(:visible => true)
       excel2 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :default_excel => excel2, :visible => false)
+      book1 = Workbook.open(@different_file, :default_excel => excel2, :visible => false)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be false
       book1.visible.should be false
@@ -493,7 +493,7 @@ describe Book do
 
     it "should preserve :visible if it is not set with force_excel => new" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :force_excel => :new)
+      book1 = Workbook.open(@different_file, :force_excel => :new)
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
@@ -501,7 +501,7 @@ describe Book do
 
     it "should set :visible to true with force_excel" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :force_excel => :new, :visible => true)
+      book1 = Workbook.open(@different_file, :force_excel => :new, :visible => true)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be true
@@ -510,7 +510,7 @@ describe Book do
     it "should preserve :visible if it is not set with force_excel => excel" do
       excel1 = Excel.create(:visible => true)
       excel2 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :force_excel => excel2)
+      book1 = Workbook.open(@different_file, :force_excel => excel2)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be true
@@ -519,7 +519,7 @@ describe Book do
     it "should set visible to false with force_excel => excel" do
       excel1 = Excel.create(:visible => true)
       excel2 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :force_excel => excel2, :visible => false)
+      book1 = Workbook.open(@different_file, :force_excel => excel2, :visible => false)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be false
       book1.visible.should be false
@@ -528,7 +528,7 @@ describe Book do
     it "should set visible to true with force_excel => excel" do
       excel1 = Excel.create(:visible => true)
       excel2 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :force_excel => excel2, :visible => true)
+      book1 = Workbook.open(@different_file, :force_excel => excel2, :visible => true)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be true
@@ -536,7 +536,7 @@ describe Book do
 
     it "should preserve :visible if it is set to true with force_excel => current" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :force_excel => :current)      
+      book1 = Workbook.open(@different_file, :force_excel => :current)      
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be true
@@ -544,7 +544,7 @@ describe Book do
 
     it "should set :visible to false with force_excel => current" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :force_excel => :current, :visible => false)
+      book1 = Workbook.open(@different_file, :force_excel => :current, :visible => false)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be false
       book1.visible.should be false
@@ -552,7 +552,7 @@ describe Book do
 
     it "should preserve :visible if it is set to false with force_excel => current" do
       excel1 = Excel.create(:visible => false)
-      book1 = Book.open(@simple_file, :force_excel => :current)
+      book1 = Workbook.open(@simple_file, :force_excel => :current)
       book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
@@ -560,34 +560,34 @@ describe Book do
 
     it "should set :visible to false with force_excel => current" do
       excel1 = Excel.create(:visible => false)
-      book1 = Book.open(@simple_file, :force_excel => :current, :visible => true)
+      book1 = Workbook.open(@simple_file, :force_excel => :current, :visible => true)
       book1.excel.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be true
     end
 
-    it "should let an open Book open" do
-      @book = Book.open(@simple_file1, :visible => true)
-      Book.unobtrusively(@simple_file1) do |book|
-        book.should be_a Book
+    it "should let an open Workbook open" do
+      @book = Workbook.open(@simple_file1, :visible => true)
+      Workbook.unobtrusively(@simple_file1) do |book|
+        book.should be_a Workbook
         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.should be_a Workbook
       @book.excel.Visible.should be true
       @book.close(:if_unsaved => :forget)
       @book2.close(:if_unsaved => :forget) rescue nil
     end
 
     it "should set visible and displayalerts if displayalerts => :if_visible" do
-      book1 = Book.open(@simple_file)
+      book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be false
       book1.excel.displayalerts.should == :if_visible
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
-      book2 = Book.open(@different_file)
+      book2 = Workbook.open(@different_file)
       book2.excel.Visible.should be false
       book2.Windows(book2.Name).Visible.should be true
       book2.visible.should be false
@@ -597,12 +597,12 @@ describe Book do
     end
 
     it "should set visible and displayalerts if displayalerts => :if_visible" do
-      book1 = Book.open(@simple_file)
+      book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be false
       book1.excel.displayalerts.should == :if_visible
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
-      book2 = Book.open(@different_file, :visible => true)
+      book2 = Workbook.open(@different_file, :visible => true)
       book2.excel.Visible.should be true
       book2.Windows(book2.Name).Visible.should be true
       book2.visible.should be true
@@ -616,7 +616,7 @@ describe Book do
 
     context "with standard" do
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -650,7 +650,7 @@ describe Book do
     context "with some open book" do
 
       before do
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
       end
 
       after do
@@ -658,7 +658,7 @@ describe Book do
       end
 
       it "should create and use a hidden Excel instance" do
-        book2 = Book.open(@simple_file1, :force_excel => @book.bookstore.hidden_excel)
+        book2 = Workbook.open(@simple_file1, :force_excel => @book.bookstore.hidden_excel)
         book2.excel.should_not == @book.excel
         book2.excel.visible.should be false
         book2.excel.displayalerts.should == :if_visible
@@ -670,7 +670,7 @@ describe Book do
   describe "nameval, set_nameval, [], []=" do
   
     before do
-      @book1 = Book.open(@another_simple_file)
+      @book1 = Workbook.open(@another_simple_file)
     end
 
     after do
@@ -719,28 +719,28 @@ describe Book do
       }.to_not raise_error
       expect {
         @book1.namevalue_glob("foo", :default => :__not_provided)
-      }.to raise_error(NameNotFound, /name "foo" not in #<Book: another_workbook/)
+      }.to raise_error(NameNotFound, /name "foo" not in #<Workbook: another_workbook/)
       expect {
         @book1.namevalue_glob("foo")
-      }.to raise_error(NameNotFound, /name "foo" not in #<Book: another_workbook/)
+      }.to raise_error(NameNotFound, /name "foo" not in #<Workbook: another_workbook/)
       @book1.namevalue_glob("foo", :default => nil).should be_nil
       @book1.namevalue_glob("foo", :default => 1).should == 1
       expect {
           @book1.set_namevalue_glob("foo","bar")
-      }.to raise_error(NameNotFound, /name "foo" not in #<Book: another_workbook/)
+      }.to raise_error(NameNotFound, /name "foo" not in #<Workbook: another_workbook/)
       expect {
           @book1["foo"] = "bar"
-      }.to raise_error(NameNotFound, /name "foo" not in #<Book: another_workbook/)
+      }.to raise_error(NameNotFound, /name "foo" not in #<Workbook: another_workbook/)
       @book1.namevalue_glob("empty", :default => 1).should be_nil
     end    
 
     it "should raise an error if name was defined but contents is calcuated" do
       expect {
         @book1.set_namevalue_glob("named_formula","bar")
-      }.to raise_error(RangeNotEvaluatable, /cannot assign value to range named "named_formula" in #<Book: another_workbook/)
+      }.to raise_error(RangeNotEvaluatable, /cannot assign value to range named "named_formula" in #<Workbook: another_workbook/)
       expect {
         @book1["named_formula"] = "bar"
-      }.to raise_error(RangeNotEvaluatable, /cannot assign value to range named "named_formula" in #<Book: another_workbook/)
+      }.to raise_error(RangeNotEvaluatable, /cannot assign value to range named "named_formula" in #<Workbook: another_workbook/)
     end
 
     # Excel Bug: for local names without uqifier: takes the first sheet as default even if another sheet is activated
@@ -764,7 +764,7 @@ describe Book do
       @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 42
       @book1.save
       @book1.close
-      #book2 = Book.open(@simple_file1, :visible =>  true)
+      #book2 = Workbook.open(@simple_file1, :visible =>  true)
       #book2.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 42
     end
 
@@ -773,7 +773,7 @@ describe Book do
       @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 4
       @book1.save(:discoloring => true)
       @book1.close
-      #book2 = Book.open(@simple_file1, :visible =>  true)
+      #book2 = Workbook.open(@simple_file1, :visible =>  true)
       #book2.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 0
     end
 
@@ -782,7 +782,7 @@ describe Book do
   describe "rename_range" do
     
     before do
-      @book1 = Book.open(@another_simple_file)
+      @book1 = Workbook.open(@another_simple_file)
     end
 
     after do
@@ -803,7 +803,7 @@ describe Book do
     context "with alive?" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -824,7 +824,7 @@ describe Book do
     context "with filename" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -845,7 +845,7 @@ describe Book do
     context "with ==" do
 
       before do
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
       end
 
       after do
@@ -854,26 +854,26 @@ describe Book do
       end
 
       it "should be true with two identical books" do
-        @new_book = Book.open(@simple_file1)
+        @new_book = Workbook.open(@simple_file1)
         @new_book.should == @book
       end
 
       it "should be false with two different books" do
-        @new_book = Book.new(@different_file)
+        @new_book = Workbook.new(@different_file)
         @new_book.should_not == @book
       end
 
       it "should be false with same book names but different paths" do       
-        @new_book = Book.new(@simple_file_other_path, :force_excel => :new)
+        @new_book = Workbook.new(@simple_file_other_path, :force_excel => :new)
         @new_book.should_not == @book
       end
 
       it "should be false with same book names but different excel instances" do
-        @new_book = Book.new(@simple_file, :force_excel => :new)
+        @new_book = Workbook.new(@simple_file, :force_excel => :new)
         @new_book.should_not == @book
       end
 
-      it "should be false with non-Books" do
+      it "should be false with non-Workbooks" do
         @book.should_not == "hallo"
         @book.should_not == 7
         @book.should_not == nil
@@ -883,7 +883,7 @@ describe Book do
     context "with saved" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -896,7 +896,7 @@ describe Book do
 
       it "should yield false for an unsaved book" do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         @book.saved.should be false
       end
     end
@@ -906,7 +906,7 @@ describe Book do
 
       it "should leave the excel invisible when opening with default option" do
         excel1 = Excel.new(:reuse => false, :visible => false)
-        book1 = Book.open(@simple_file)
+        book1 = Workbook.open(@simple_file)
         excel1.Visible.should be false
         book1.Windows(book1.Name).Visible.should be true
         book1.visible.should be false
@@ -914,7 +914,7 @@ describe Book do
 
       it "should leave the excel invisible when opening with :visible => false" do
         excel1 = Excel.new(:reuse => false, :visible => false)
-        book1 = Book.open(@simple_file, :visible => false)
+        book1 = Workbook.open(@simple_file, :visible => false)
         excel1.Visible.should be false
         book1.Windows(book1.Name).Visible.should be false
         book1.visible.should be false
@@ -922,15 +922,15 @@ describe Book do
 
       it "should leave the excel visible" do
         excel1 = Excel.new(:reuse => false, :visible => false)
-        book1 = Book.open(@simple_file, :visible => true)
+        book1 = Workbook.open(@simple_file, :visible => true)
         excel1.Visible.should be true
         book1.Windows(book1.Name).Visible.should be true
         book1.visible.should be true
-        book2 = Book.open(@another_simple_file)
+        book2 = Workbook.open(@another_simple_file)
         excel1.Visible.should be true
         book2.Windows(book2.Name).Visible.should be true
         book2.visible.should be true
-        book3 = Book.open(@different_file, :visible => false)
+        book3 = Workbook.open(@different_file, :visible => false)
         excel1.Visible.should be true
         book3.Windows(book3.Name).Visible.should be false
         book3.visible.should be false
@@ -938,7 +938,7 @@ describe Book do
 
       it "should leave the excel visible when opening with default option" do
         excel1 = Excel.new(:reuse => false, :visible => true)
-        book1 = Book.open(@simple_file)
+        book1 = Workbook.open(@simple_file)
         excel1.Visible.should be true
         book1.Windows(book1.Name).Visible.should be true
         book1.visible.should be true
@@ -946,11 +946,11 @@ describe Book do
 
       it "should leave the excel visible when opening with :visible => false" do
         excel1 = Excel.new(:reuse => false, :visible => true)
-        book1 = Book.open(@simple_file, :visible => false)
+        book1 = Workbook.open(@simple_file, :visible => false)
         excel1.Visible.should be true
         book1.Windows(book1.Name).Visible.should be false
         book1.visible.should be false
-        book2 = Book.open(@another_simple_file)
+        book2 = Workbook.open(@another_simple_file)
         excel1.Visible.should be true
         book2.Windows(book2.Name).Visible.should be true
         book2.visible.should be true
@@ -958,11 +958,11 @@ describe Book do
 
       it "should leave the excel visible" do
         excel1 = Excel.new(:reuse => false, :visible => true)
-        book1 = Book.open(@simple_file, :visible => true)
+        book1 = Workbook.open(@simple_file, :visible => true)
         excel1.Visible.should be true
         book1.Windows(book1.Name).Visible.should be true
         book1.visible.should be true
-        book2 = Book.open(@different_file, :visible => false)
+        book2 = Workbook.open(@different_file, :visible => false)
         excel1.Visible.should be true
         book2.Windows(book2.Name).Visible.should be false
         book2.visible.should be false
@@ -970,12 +970,12 @@ describe Book do
 
       it "should leave the visibility of Excel" do
         excel1 = Excel.new(:reuse => false, :visible => false)
-        book1 = Book.open(@simple_file, :visible => true)
+        book1 = Workbook.open(@simple_file, :visible => true)
         excel1.Visible.should be true
         book1.Windows(book1.Name).Visible.should be true
         book1.visible.should be true
         excel1.visible = false
-        book2 = Book.open(@different_file)
+        book2 = Workbook.open(@different_file)
         excel1.Visible.should be false
         book2.Windows(book2.Name).Visible.should be true
         book2.visible.should be false
@@ -983,12 +983,12 @@ describe Book do
 
       it "should leave the visibility of Excel" do
         excel1 = Excel.new(:reuse => false, :visible => false)
-        book1 = Book.open(@simple_file, :visible => false)
+        book1 = Workbook.open(@simple_file, :visible => false)
         excel1.Visible.should be false
         book1.Windows(book1.Name).Visible.should be false
         book1.visible.should be false
         excel1.visible = true
-        book2 = Book.open(@different_file)
+        book2 = Workbook.open(@different_file)
         excel1.Visible.should be true
         book2.Windows(book2.Name).Visible.should be true
         book2.visible.should be true
@@ -998,8 +998,8 @@ describe Book do
     context "with visible, visible=" do
 
       before do
-        @book1 = Book.open(@simple_file)
-        @book2 = Book.open(@different_file, :force_excel => :new, :visible => true)
+        @book1 = Workbook.open(@simple_file)
+        @book2 = Workbook.open(@different_file, :force_excel => :new, :visible => true)
       end
 
       after do
@@ -1045,9 +1045,9 @@ describe Book do
 
       before do
         @key_sender = IO.popen  'ruby "' + File.join(File.dirname(__FILE__), '../helpers/key_sender.rb') + '" "Microsoft Excel" '  , "w"        
-        @book = Book.open(@simple_file, :visible => true)
+        @book = Workbook.open(@simple_file, :visible => true)
         @book.excel.displayalerts = false
-        @book2 = Book.open(@another_simple_file, :visible => true)
+        @book2 = Workbook.open(@another_simple_file, :visible => true)
         @book2.excel.displayalerts = false
       end
 
@@ -1078,10 +1078,25 @@ describe Book do
       end
     end
 
+    context "name2range" do
+
+      before do
+        @book1 = Workbook.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
+        @book1.excel.displayalerts = false
+      end
+
+      it "should create a range from the name" do
+        @book1.add_name("foo",[1..3,1..4])
+        range = @book1.name2range("foo")
+        range.Address.should == "$A$1:$D$3"
+      end
+
+    end
+
     context "adding and deleting 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
       end
 
@@ -1090,25 +1105,25 @@ describe Book do
       end   
 
       it "should name an unnamed range with a giving address" do
-        @book1.add_name("foo",1,2)
+        @book1.add_name("foo",[1,2])
         @book1.Names.Item("foo").Name.should == "foo"
-        @book1.Names.Item("foo").Value.should == "=Sheet1!$B$1"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$B$1:$B$1"
       end
 
       it "should rename an already named range with a giving address" do
-        @book1.add_name("foo",1,1)
+        @book1.add_name("foo",[1,1])
         @book1.Names.Item("foo").Name.should == "foo"
-        @book1.Names.Item("foo").Value.should == "=Sheet1!$A$1"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$A$1:$A$1"
       end
 
       it "should raise an error" do
         expect{
-          @book1.add_name("foo", -2, 1)
-        }.to raise_error(RangeNotEvaluatable, /cannot add name "foo" to cell with row -2 and column 1/)
+          @book1.add_name("foo", [-2, 1])
+        }.to raise_error(RangeNotEvaluatable, /cannot add name "foo" to range/)
       end
 
       it "should delete a name of a range" do
-        @book1.add_name("foo",1,1)
+        @book1.add_name("foo",[1,1])
         @book1.delete_name("foo")
         expect{
           @book1.namevalue_glob("foo")
@@ -1116,7 +1131,12 @@ describe Book do
       end
 
       it "should add a name of a rectangular range" do
-        @book1.add_name("foo",1,1,3,4)
+        @book1.add_name("foo",[1..3,1..4])
+        @book1["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
+        @book1.add_name("foo",1..3,1..4)
         @book1["foo"].should == [["foo", "workbook", "sheet1", nil], ["foo", 1.0, 2.0, 4.0], ["matz", 3.0, 4.0, 4.0]] 
       end
 
@@ -1125,12 +1145,12 @@ describe Book do
     context "with compatibility" do      
 
       it "should open with checking compatibility" do
-        book = Book.open(@simple_file, :visible => true, :check_compatibility => true)
+        book = Workbook.open(@simple_file, :visible => true, :check_compatibility => true)
         book.CheckCompatibility.should be true
       end
 
       it "should open without checking compatibility" do
-        book = Book.open(@simple_file, :visible => true, :check_compatibility => false)
+        book = Workbook.open(@simple_file, :visible => true, :check_compatibility => false)
         book.CheckCompatibility.should be false
       end
     end