robust_excel_ole 1.3 → 1.4

data/spec/{book_specs/book_save_spec.rb → workbook_specs/workbook_save_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)
@@ -44,7 +44,7 @@ describe Book do
     context "with simple save" do
       
       it "should save for a file opened without :read_only" do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @book.add_sheet(@sheet, :as => 'a_name')
         @new_sheet_count = @book.ole_workbook.Worksheets.Count
         expect {
@@ -55,7 +55,7 @@ describe Book do
       end
 
       it "should raise error with read_only" do
-        @book = Book.open(@simple_file, :read_only => true)
+        @book = Workbook.open(@simple_file, :read_only => true)
         expect {
           @book.save
         }.to raise_error(WorkbookReadOnly, "Not opened for writing (opened with :read_only option)")
@@ -63,7 +63,7 @@ describe Book do
       end
 
       it "should raise error if workbook is not alive" do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @book.close
         expect{
           @book.save
@@ -74,7 +74,7 @@ describe Book do
 
     context "with open with read only" do
       before do
-        @book = Book.open(@simple_file, :read_only => true)
+        @book = Workbook.open(@simple_file, :read_only => true)
       end
 
       after do
@@ -92,21 +92,21 @@ describe Book do
     context "with save_as" do
 
       it "should save to 'simple_save_file.xls'" do
-        Book.open(@simple_file) do |book|
+        Workbook.open(@simple_file) do |book|
           book.save_as(@simple_save_file1, :if_exists => :overwrite)
         end
         File.exist?(@simple_save_file1).should be true
       end
 
       it "should raise error if filename is nil" do
-        book = Book.open(@simple_file)
+        book = Workbook.open(@simple_file)
         expect{
           book.save_as(@wrong_name)
         }.to raise_error(FileNameNotGiven, "filename is nil")
       end
 
       it "should raise error if workbook is not alive" do
-        book = Book.open(@simple_file)
+        book = Workbook.open(@simple_file)
         book.close
         expect{
           book.save_as(@simple_save_file)
@@ -116,7 +116,7 @@ describe Book do
 
     context "with different extensions" do
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -130,8 +130,8 @@ describe Book do
           File.delete simple_save_file rescue nil
           @book.save_as(simple_save_file, :if_exists => :overwrite)
           File.exist?(simple_save_file).should be true
-          new_book = Book.open(simple_save_file)
-          new_book.should be_a Book
+          new_book = Workbook.open(simple_save_file)
+          new_book.should be_a Workbook
           new_book.close
         end
       end
@@ -140,7 +140,7 @@ describe Book do
     context "with saving with the same name in another directory" do
 
       before do
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
       end
 
       it "should save with the same name in another directory" do
@@ -157,8 +157,8 @@ describe Book do
     context "with blocked by another file" do
 
       before do
-        @book = Book.open(@simple_file1)
-        @book2 = Book.open(@another_simple_file)
+        @book = Workbook.open(@simple_file1)
+        @book2 = Workbook.open(@another_simple_file)
       end
 
       after do
@@ -185,8 +185,8 @@ describe Book do
         @book2.save_as(@simple_file_other_path1, :if_exists => :overwrite, :if_obstructed => :forget)
         @book.should_not be_alive
         File.exist?(@simple_file_other_path1).should be true
-        new_book = Book.open(@simple_file_other_path1)
-        new_book.should be_a Book
+        new_book = Workbook.open(@simple_file_other_path1)
+        new_book.should be_a Workbook
         new_book.close
       end
 
@@ -196,19 +196,19 @@ describe Book do
           file.puts "garbage"
         end
         sheet = @book.sheet(1)
-        cell_value = sheet[1,1].value
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+        cell_value = sheet[1,1].Value
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         @book.Saved.should be false
         @book2.save_as(@simple_file_other_path1, :if_exists => :overwrite, :if_obstructed => :forget)
         @book.should_not be_alive
         @book2.should be_alive
         File.exist?(@simple_file_other_path1).should be true
-        new_book = Book.open(@simple_file_other_path1)
-        new_book.should be_a Book
+        new_book = Workbook.open(@simple_file_other_path1)
+        new_book.should be_a Workbook
         new_book.close
-        old_book = Book.open(@simple_file1)
+        old_book = Workbook.open(@simple_file1)
         old_sheet = old_book.sheet(1)
-        old_sheet[1,1].value.should == cell_value
+        old_sheet[1,1].Value.should == cell_value
         old_book.close
       end
 
@@ -218,19 +218,19 @@ describe Book do
           file.puts "garbage"
         end
         sheet = @book.sheet(1)
-        cell_value = sheet[1,1].value
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+        cell_value = sheet[1,1].Value
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         @book.Saved.should be false
         @book2.save_as(@simple_file_other_path1, :if_exists => :overwrite, :if_obstructed => :save)
         @book.should_not be_alive
         @book2.should be_alive
         File.exist?(@simple_file_other_path1).should be true
-        new_book = Book.open(@simple_file_other_path1)
-        new_book.should be_a Book
+        new_book = Workbook.open(@simple_file_other_path1)
+        new_book.should be_a Workbook
         new_book.close
-        old_book = Book.open(@simple_file1)
+        old_book = Workbook.open(@simple_file1)
         old_sheet = old_book.sheet(1)
-        old_sheet[1,1].value.should_not == cell_value
+        old_sheet[1,1].Value.should_not == cell_value
         old_book.close
       end
 
@@ -244,15 +244,15 @@ describe Book do
         @book.should_not be_alive
         @book2.should be_alive
         File.exist?(@simple_file_other_path1).should be true
-        new_book = Book.open(@simple_file_other_path1)
-        new_book.should be_a Book
+        new_book = Workbook.open(@simple_file_other_path1)
+        new_book.should be_a Workbook
         new_book.close
       end
 
       it "should raise an error if the blocking workbook was unsaved with :if_obstructed => :close_if_saved" do
         sheet = @book.sheet(1)
-        cell_value = sheet[1,1].value
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+        cell_value = sheet[1,1].Value
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         @book.Saved.should be false      
         expect{
           @book2.save_as(@simple_file_other_path1, :if_exists => :overwrite, :if_obstructed => :close_if_saved)
@@ -308,7 +308,7 @@ describe Book do
     possible_displayalerts.each do |displayalert_value|
       context "with displayalerts=#{displayalert_value}" do
         before do
-          @book = Book.open(@simple_file)
+          @book = Workbook.open(@simple_file)
           @book.excel.displayalerts = displayalert_value
         end
 
@@ -319,7 +319,7 @@ describe Book do
         it "should raise an error if the book is open" do
           File.delete @simple_save_file1 rescue nil
           FileUtils.copy @simple_file, @simple_save_file1
-          book_save = Book.open(@simple_save_file1, :excel => :new)
+          book_save = Workbook.open(@simple_save_file1, :excel => :new)
           expect{
             @book.save_as(@simple_save_file1, :if_exists => :overwrite)
             }.to raise_error(WorkbookBeingUsed, "workbook is open and used in Excel")
@@ -333,19 +333,19 @@ describe Book do
           end
           @book.save_as(@simple_save_file1, :if_exists => :overwrite)
           File.exist?(@simple_save_file1).should be true
-          new_book = Book.open(@simple_save_file1)
-          new_book.should be_a Book
+          new_book = Workbook.open(@simple_save_file1)
+          new_book.should be_a Workbook
           new_book.close
         end
 
         it "should simple save if file name is equal to the old one with :if_exists => :overwrite" do
           sheet = @book.sheet(1)
-          sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
-          new_value = sheet[1,1].value
+          sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+          new_value = sheet[1,1].Value
           @book.save_as(@simple_file1, :if_exists => :overwrite)
-          new_book = Book.open(@simple_file1)
+          new_book = Workbook.open(@simple_file1)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].value.should == new_value
+          new_sheet[1,1].Value.should == new_value
           new_book.close
         end
 
@@ -387,8 +387,8 @@ describe Book do
             File.exist?(@simple_save_file1).should be true
             File.size?(@simple_save_file1).should > @garbage_length
             @book.excel.DisplayAlerts.should == displayalert_value
-            new_book = Book.open(@simple_save_file1, :excel => :new)
-            new_book.should be_a Book
+            new_book = Workbook.open(@simple_save_file1, :excel => :new)
+            new_book.should be_a Workbook
             new_book.close
             @book.excel.DisplayAlerts.should == displayalert_value
           end
@@ -441,8 +441,8 @@ describe Book do
             File.exist?(@simple_save_file1).should be true
             File.size?(@simple_save_file1).should > @garbage_length
             @book.excel.DisplayAlerts.should == displayalert_value
-            new_book = Book.open(@simple_save_file1, :excel => :new)
-            new_book.should be_a Book
+            new_book = Workbook.open(@simple_save_file1, :excel => :new)
+            new_book.should be_a Workbook
             new_book.close
  
             @book.excel.DisplayAlerts.should == displayalert_value

data/spec/{book_specs/book_sheet_spec.rb → workbook_specs/workbook_sheet_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)
@@ -36,7 +36,7 @@ describe Book do
 
   describe 'access sheet' do
     before do
-      @book = Book.open(@simple_file)
+      @book = Workbook.open(@simple_file)
     end
 
     after do
@@ -44,25 +44,25 @@ describe Book do
     end
 
     it 'with sheet name' do
-      @book.sheet("Sheet1").should be_kind_of Sheet
+      @book.sheet("Sheet1").should be_kind_of Worksheet
       @book.sheet("Sheet1").name.should == "Sheet1"
     end
 
     it 'with integer' do
-      @book.sheet(1).should be_kind_of Sheet
+      @book.sheet(1).should be_kind_of Worksheet
       @book.sheet(1).name.should == "Sheet1"
     end
 
     it 'with block' do
       @book.each do |sheet|
-        sheet.should be_kind_of Sheet
+        sheet.should be_kind_of Worksheet
       end
     end
 
     context 'open with block' do
       it {
-        Book.open(@simple_file) do |book|
-          @book.sheet("Sheet1").should be_a Sheet
+        Workbook.open(@simple_file) do |book|
+          @book.sheet("Sheet1").should be_a Worksheet
           @book.sheet("Sheet1").name.should == "Sheet1"
         end
       }
@@ -71,18 +71,18 @@ describe Book do
 
   describe 'access first and last sheet' do
     before do
-      @book = Book.open(@simple_file)
+      @book = Workbook.open(@simple_file)
     end
 
     it "should access the first sheet" do
       first_sheet = @book.first_sheet
-      first_sheet.name.should == Sheet.new(@book.Worksheets.Item(1)).Name
+      first_sheet.name.should == Worksheet.new(@book.Worksheets.Item(1)).Name
       first_sheet.name.should == @book.sheet(1).Name
     end
 
     it "should access the last sheet" do
       last_sheet = @book.last_sheet
-      last_sheet.name.should == Sheet.new(@book.Worksheets.Item(3)).Name
+      last_sheet.name.should == Worksheet.new(@book.Worksheets.Item(3)).Name
       last_sheet.name.should == @book.sheet(3).Name
     end
   end
@@ -92,7 +92,7 @@ describe Book do
     context "with no given sheet" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @sheet = @book.sheet(1)
       end
 
@@ -129,9 +129,9 @@ describe Book do
     context "with copying a given sheet" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @sheet = @book.sheet(1)
-        @another_book = Book.open(@another_simple_file)
+        @another_book = Workbook.open(@another_simple_file)
       end
 
       after do
@@ -193,7 +193,7 @@ describe Book do
   describe "add_empty_sheet" do
     
     before do
-      @book = Book.open(@simple_file)
+      @book = Workbook.open(@simple_file)
       @sheet = @book.sheet(1)
     end
 
@@ -229,9 +229,9 @@ describe Book do
   describe "copy_sheet" do
 
     before do
-      @book = Book.open(@simple_file)
+      @book = Workbook.open(@simple_file)
       @sheet = @book.sheet(1)
-      @another_book = Book.open(@another_simple_file)
+      @another_book = Workbook.open(@another_simple_file)
     end
 
     after do
@@ -294,7 +294,7 @@ describe Book do
     context "with no given sheet" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @sheet = @book.sheet(1)
       end
 
@@ -331,9 +331,9 @@ describe Book do
     context "with copying a given sheet" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @sheet = @book.sheet(1)
-        @another_book = Book.open(@another_simple_file)
+        @another_book = Workbook.open(@another_simple_file)
       end
 
       after do

data/spec/{book_specs/book_subclass_spec.rb → workbook_specs/workbook_subclass_spec.rb}

@@ -7,12 +7,12 @@ module My # :nodoc: #
   class Excel < RobustExcelOle::Excel # :nodoc: #
   end
 
-  class Book < RobustExcelOle::Book   # :nodoc: #
+  class Workbook < RobustExcelOle::Workbook   # :nodoc: #
   end
 
 end
 
-describe "subclassed Book" do
+describe "subclassed Workbook" do
 
   before(:all) do
     excel = RobustExcelOle::Excel.new(:reuse => true)
@@ -35,10 +35,9 @@ describe "subclassed Book" do
   describe "open" do
 
     it "should use the subclassed Excel" do
-      #REO::Book.open(@simple_file) do |book|
-      My::Book.open(@simple_file) do |book|
-        book.should be_a RobustExcelOle::Book
-        book.should be_a My::Book
+      My::Workbook.open(@simple_file) do |book|
+        book.should be_a RobustExcelOle::Workbook
+        book.should be_a My::Workbook
         book.excel.should be_a RobustExcelOle::Excel
         book.excel.class.should == My::Excel
         book.excel.should be_a My::Excel

data/spec/{book_specs/book_unobtr_spec.rb → workbook_specs/workbook_unobtr_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,10 +39,10 @@ describe Book do
   describe "unobtrusively" do
 
     def unobtrusively_ok? # :nodoc: #
-      Book.unobtrusively(@simple_file) do |book|
-        book.should be_a Book
+      Workbook.unobtrusively(@simple_file) do |book|
+        book.should be_a Workbook
         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.should be_alive
         book.Saved.should be false
       end
@@ -63,7 +63,7 @@ describe Book do
       context "with open unsaved workbook" do
 
         before do        
-          @book1 = Book.open(@simple_file1)
+          @book1 = Workbook.open(@simple_file1)
           @book1.sheet(1)[1,1] = "foo"
           #@ole_workbook1 = @ole_excel1.Workbooks.Open(@simple_file1, { 'ReadOnly' => false })
           #@old_value = @ole_workbook1.Worksheets.Item(1).Cells.Item(1, 1).Value
@@ -74,7 +74,7 @@ describe Book do
         context "with writability" do
 
           it "should open as read-write by default" do
-            Book.unobtrusively(@simple_file1) do |book|
+            Workbook.unobtrusively(@simple_file1) do |book|
               book.Readonly.should be false
               #book.filename.should == @ole_workbook1.Fullname.tr('\\','/')
               #book.excel.ole_excel.Hwnd.should == @ole_excel1.Hwnd
@@ -83,12 +83,12 @@ describe Book do
             #@ole_workbook1.Saved.should be false
             Excel.kill_all
             sleep 1
-            book2 = Book.open(@simple_file1)
+            book2 = Workbook.open(@simple_file1)
             #book2.sheet(1)[1,1].Value.should == @old_value
           end
 
           it "should open not writable" do
-            Book.unobtrusively(@simple_file1, :writable => false) do |book|
+            Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
               book.ReadOnly.should be false
               book.filename.should == @ole_workbook1.Fullname.tr('\\','/')
               book.excel.ole_excel.Hwnd.should == @ole_excel1.Hwnd
@@ -98,7 +98,7 @@ describe Book do
             @book.sheet(1)[1,1].Value.should_not == @old_value
             Excel.kill_all
             sleep 1
-            book2 = Book.open(@simple_file1)
+            book2 = Workbook.open(@simple_file1)
             book2.sheet(1)[1,1].Value.should_not == @old_value
           end
         end
@@ -106,13 +106,13 @@ describe Book do
         context "further tests" do
 
           it "should write in the outer and not in the inner block" do
-            Book.unobtrusively(@simple_file1) do |book|
+            Workbook.unobtrusively(@simple_file1) do |book|
               @old_value = book.sheet(1)[1,1].Value
               book.ReadOnly.should be false
               book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
               book.Saved.should be false
               book.sheet(1)[1,1].Value.should_not == @old_value
-              Book.unobtrusively(@simple_file1, :writable => false) do |book2|
+              Workbook.unobtrusively(@simple_file1, :writable => false) do |book2|
                 book2.should == book
                 book2.ReadOnly.should be false
                 book2.Saved.should be false
@@ -124,62 +124,62 @@ describe Book do
               book.Saved.should be false
               book.sheet(1)[1,1].Value.should == @old_value            
             end
-            book = Book.open(@simple_file1)
+            book = Workbook.open(@simple_file1)
             book.sheet(1)[1,1].Value.should == @old_value
           end
 
           it "should use the excel of the book and keep open the book" do
-            @book = Book.open(@simple_file1)
+            @book = Workbook.open(@simple_file1)
             excel = Excel.new(:reuse => false)
             sheet = @book.sheet(1)
-            old_cell_value = sheet[1,1].value
+            old_cell_value = sheet[1,1].Value
             @book.close
             @book.should_not be_alive
-            Book.unobtrusively(@simple_file, :keep_open => true) do |book|
-              book.should be_a Book
+            Workbook.unobtrusively(@simple_file, :keep_open => true) do |book|
+              book.should be_a Workbook
               book.excel.should == @book.excel
               book.excel.should_not == excel
               sheet = book.sheet(1)
               cell = sheet[1,1]
-              sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+              sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
               book.Saved.should be false
             end
             @book.should be_alive
             @book.close
-            new_book = Book.open(@simple_file1)
+            new_book = Workbook.open(@simple_file1)
             sheet = new_book.sheet(1)
-            sheet[1,1].value.should_not == old_cell_value
+            sheet[1,1].Value.should_not == old_cell_value
           end
 
           it "should use the excel of the book and keep open the book" do
-            @book = Book.open(@simple_file1)
+            @book = Workbook.open(@simple_file1)
             excel = Excel.new(:reuse => false)
             sheet = @book.sheet(1)
-            old_cell_value = sheet[1,1].value
+            old_cell_value = sheet[1,1].Value
             @book.close
             @book.should_not be_alive
-            Book.unobtrusively(@simple_file, :if_closed => :new) do |book|
-              book.should be_a Book
+            Workbook.unobtrusively(@simple_file, :if_closed => :new) do |book|
+              book.should be_a Workbook
               book.should be_alive
               book.excel.should_not == @book.excel
               book.excel.should_not == excel
               sheet = book.sheet(1)
               cell = sheet[1,1]
-              sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+              sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
               book.Saved.should be false
             end
             @book.should_not be_alive
-            new_book = Book.open(@simple_file1)
+            new_book = Workbook.open(@simple_file1)
             sheet = new_book.sheet(1)
-            sheet[1,1].value.should_not == old_cell_value
+            sheet[1,1].Value.should_not == old_cell_value
           end
 
           it "should use a given Excel" do
-            @book = Book.open(@simple_file1)
+            @book = Workbook.open(@simple_file1)
             @book.close
             new_excel = Excel.new(:reuse => false)
             another_excel = Excel.new(:reuse => false)
-            Book.unobtrusively(@simple_file1, :if_closed => another_excel) do |book|
+            Workbook.unobtrusively(@simple_file1, :if_closed => another_excel) do |book|
               book.excel.should_not == @book.excel
               book.excel.should_not == new_excel
               book.excel.should == another_excel
@@ -188,34 +188,34 @@ describe Book do
 
           it "should reuse Excel" do
             new_excel = Excel.new(:reuse => false)
-            Book.unobtrusively(@simple_file1, :if_closed => :reuse) do |book|
+            Workbook.unobtrusively(@simple_file1, :if_closed => :reuse) do |book|
             book.excel.should == @book.excel
             book.excel.should_not == new_excel
           end
 
           it "should open unobtrusively the closed book in the most recent Excel where it was open 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)
             @book1.Readonly.should == false
             @book2.Readonly.should == true
             old_sheet = @book1.sheet(1)
-            @old_cell_value = old_sheet[1,1].value
+            @old_cell_value = old_sheet[1,1].Value
             @book1.close
             @book2.close
             @book1.should_not be_alive
             @book2.should_not be_alive
-            Book.unobtrusively(@simple_file1) do |book| 
+            Workbook.unobtrusively(@simple_file1) do |book| 
               book.excel.should_not == @book2.excel
               book.excel.should == @book1.excel
               book.ReadOnly.should == false
               sheet = book.sheet(1)
               cell = sheet[1,1]
-              sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+              sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
               book.Saved.should be false
             end
-            new_book = Book.open(@simple_file1)
+            new_book = Workbook.open(@simple_file1)
             sheet = new_book.sheet(1)
-            sheet[1,1].value.should_not == @old_cell_value
+            sheet[1,1].Value.should_not == @old_cell_value
           end
         end
       end
@@ -232,7 +232,7 @@ describe Book do
         context "with writability" do
 
           it "should open as read-only by default" do
-            Book.unobtrusively(@simple_file1) do |book|
+            Workbook.unobtrusively(@simple_file1) do |book|
               book.Readonly.should be true
               book.filename.should == @ole_workbook1.Fullname.tr('\\','/')
               book.excel.ole_excel.Hwnd.should == @ole_excel1.Hwnd
@@ -243,12 +243,12 @@ describe Book do
             @ole_workbook1.Worksheets.Item(1).Cells.Item(1, 1).Value.should_not == @old_value
             Excel.kill_all
             sleep 1
-            book2 = Book.open(@simple_file1)
+            book2 = Workbook.open(@simple_file1)
             book2.sheet(1)[1,1].Value.should_not == @old_value
           end
 
           it "should open not writable" do
-            Book.unobtrusively(@simple_file1, :writable => false) do |book|
+            Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
               book.ReadOnly.should be true
               book.filename.should == @ole_workbook1.Fullname.tr('\\','/')
               book.excel.ole_excel.Hwnd.should == @ole_excel1.Hwnd
@@ -259,7 +259,7 @@ describe Book do
             @ole_workbook1.Worksheets.Item(1).Cells.Item(1, 1).Value.should_not == @old_value
             Excel.kill_all
             sleep 1
-            book2 = Book.open(@simple_file1)
+            book2 = Workbook.open(@simple_file1)
             book2.sheet(1)[1,1].Value.should == @old_value
           end
         end
@@ -271,14 +271,14 @@ describe Book do
     describe "block transparency" do
 
       it "should return correct value of the block" do
-        (Book.unobtrusively(@simple_file1) do |book| 
+        (Workbook.unobtrusively(@simple_file1) do |book| 
           22
          end).should == 22
       end
 
       it "should return value of the last block" do
-        (Book.unobtrusively(@simple_file1) do |book|
-          Book.unobtrusively(@different_file) do |book2|
+        (Workbook.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@different_file) do |book2|
             11
           end
           22
@@ -286,8 +286,8 @@ describe Book do
       end
 
       it "should return correct value in several blocks" do
-        (Book.unobtrusively(@simple_file1) do |book|
-          Book.unobtrusively(@different_file) do |book2|
+        (Workbook.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@different_file) do |book2|
             22
           end
         end).should == 22
@@ -300,104 +300,104 @@ describe Book do
       context "with no book" do
 
         it "should open read-write" do
-          Book.unobtrusively(@simple_file1) do |book|            
+          Workbook.unobtrusively(@simple_file1) do |book|            
             book.ReadOnly.should be false
             @old_value = book.sheet(1)[1,1].Value
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             book.Saved.should be false
           end          
           Excel.current.Workbooks.Count.should == 0
-          b1 = Book.open(@simple_file1)
+          b1 = Workbook.open(@simple_file1)
           b1.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file, :read_only => false) do |book|
+          Workbook.unobtrusively(@simple_file, :read_only => false) do |book|
             book.ReadOnly.should be false
             @old_value = book.sheet(1)[1,1].Value
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             book.Saved.should be false
           end
           Excel.current.Workbooks.Count.should == 0
-          b1 = Book.open(@simple_file1)
+          b1 = Workbook.open(@simple_file1)
           b1.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file, :read_only => false, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file, :read_only => false, :writable => false) do |book|
             book.ReadOnly.should be false
             @old_value = book.sheet(1)[1,1].Value
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             book.Saved.should be false
           end
           Excel.current.Workbooks.Count.should == 0
-          b1 = Book.open(@simple_file1)
+          b1 = Workbook.open(@simple_file1)
           b1.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file, :writable => true) do |book|
+          Workbook.unobtrusively(@simple_file, :writable => true) do |book|
             book.ReadOnly.should be false
             @old_value = book.sheet(1)[1,1].Value
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             book.Saved.should be false
           end
           Excel.current.Workbooks.Count.should == 0
-          b1 = Book.open(@simple_file1)
+          b1 = Workbook.open(@simple_file1)
           b1.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file, :writable => true, :read_only => false) do |book|
+          Workbook.unobtrusively(@simple_file, :writable => true, :read_only => false) do |book|
             book.ReadOnly.should be false
             @old_value = book.sheet(1)[1,1].Value
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             book.Saved.should be false
           end
           Excel.current.Workbooks.Count.should == 0
-          b1 = Book.open(@simple_file1)
+          b1 = Workbook.open(@simple_file1)
           b1.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open read-only" do
-          Book.unobtrusively(@simple_file, :read_only => true) do |book|            
+          Workbook.unobtrusively(@simple_file, :read_only => true) do |book|            
             book.ReadOnly.should be true
             @old_value = book.sheet(1)[1,1].Value
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             book.Saved.should be false
           end
           Excel.current.Workbooks.Count.should == 0
-          b1 = Book.open(@simple_file1)
+          b1 = Workbook.open(@simple_file1)
           b1.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should open read-only" do
-          Book.unobtrusively(@simple_file, :read_only => true, :writable => false) do |book|            
+          Workbook.unobtrusively(@simple_file, :read_only => true, :writable => false) do |book|            
             book.ReadOnly.should be true
             @old_value = book.sheet(1)[1,1].Value
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             book.Saved.should be false
           end
           Excel.current.Workbooks.Count.should == 0
-          b1 = Book.open(@simple_file1)
+          b1 = Workbook.open(@simple_file1)
           b1.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should open not writable" do
-          Book.unobtrusively(@simple_file, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file, :writable => false) do |book|
             book.ReadOnly.should be true
             @old_value = book.sheet(1)[1,1].Value
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             book.Saved.should be false            
           end
           Excel.current.Workbooks.Count.should == 0          
-          b1 = Book.open(@simple_file1)
+          b1 = Workbook.open(@simple_file1)
           b1.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should raise error if both options are true" do          
           expect{
-            Book.unobtrusively(@simple_file, :writable => true, :read_only => true) {|book|}
+            Workbook.unobtrusively(@simple_file, :writable => true, :read_only => true) {|book|}
           }.to raise_error(OptionInvalid, "contradicting options")
         end
       end
@@ -405,12 +405,12 @@ describe Book do
       context "with open writable book" do
 
         before do
-           @book = Book.open(@simple_file1)
+           @book = Workbook.open(@simple_file1)
            @old_value = @book.sheet(1)[1,1].Value
         end
 
         it "should open as read-write by default" do
-          Book.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -418,12 +418,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file1, :read_only => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => false) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -431,12 +431,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -444,12 +444,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file1, :writable => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -457,12 +457,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-write" do          
-          Book.unobtrusively(@simple_file1, :writable => true, :read_only => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true, :read_only => false) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -470,12 +470,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should force to read-only" do
-          Book.unobtrusively(@simple_file1, :read_only => true) do |book|            
+          Workbook.unobtrusively(@simple_file1, :read_only => true) do |book|            
             book.ReadOnly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -483,12 +483,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should force to read-only" do
-          Book.unobtrusively(@simple_file1, :read_only => true, :writable => false) do |book|            
+          Workbook.unobtrusively(@simple_file1, :read_only => true, :writable => false) do |book|            
             book.ReadOnly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -496,12 +496,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should open not writable" do
-          Book.unobtrusively(@simple_file1, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
             book.ReadOnly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -509,7 +509,7 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should == @old_value
         end
       end
@@ -517,27 +517,27 @@ describe Book do
       context "with open read-only book" do
 
         before do
-          @book = Book.open(@simple_file1, :read_only => true)
+          @book = Workbook.open(@simple_file1, :read_only => true)
           @old_value = @book.sheet(1)[1,1].Value 
         end
 
         it "should not write" do
-          Book.unobtrusively(@simple_file1, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
             book.Readonly.should be true
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
             book.sheet(1)[1,1].Value.should_not == @old_value
           end
           @book.close
-          Book.unobtrusively(@simple_file1, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
             book.sheet(1)[1,1].Value.should == @old_value
           end
           #@book.close
-          #book2 = Book.open(@simple_file1)
+          #book2 = Workbook.open(@simple_file1)
           #book2.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should not change the read_only mode" do
-          Book.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             book.Readonly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -545,12 +545,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file1, :read_only => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => false) do |book|
             book.Readonly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -558,12 +558,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
             book.Readonly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -571,12 +571,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should force to read-write" do
-          Book.unobtrusively(@simple_file1, :writable => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -584,12 +584,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should force to read-write" do
-          Book.unobtrusively(@simple_file1, :writable => true, :read_only => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true, :read_only => false) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -597,25 +597,25 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should force to read-write" do
           e1 = Excel.create
-          Book.unobtrusively(@simple_file1, :writable => true, :rw_change_excel => e1) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true, :rw_change_excel => e1) do |book|
             book.Readonly.should be false
             book.filename.should == @book.filename
             book.excel.should == e1
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should force to read-write" do
-          Book.unobtrusively(@simple_file1, :writable => true, :rw_change_excel => :current) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true, :rw_change_excel => :current) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -623,24 +623,24 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should force to read-write" do
-          Book.unobtrusively(@simple_file1, :writable => true, :rw_change_excel => :new) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true, :rw_change_excel => :new) do |book|
             book.Readonly.should be false
             book.filename.should == @book.filename
             book.excel.should_not == @book.excel
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should force to read-write" do
-          Book.unobtrusively(@simple_file1, :writable => true, :read_only => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true, :read_only => false) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -648,12 +648,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should force to read-only" do
-          Book.unobtrusively(@simple_file1, :read_only => true) do |book|            
+          Workbook.unobtrusively(@simple_file1, :read_only => true) do |book|            
             book.ReadOnly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -661,12 +661,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should force to read-only" do
-          Book.unobtrusively(@simple_file1, :read_only => true, :writable => false) do |book|            
+          Workbook.unobtrusively(@simple_file1, :read_only => true, :writable => false) do |book|            
             book.ReadOnly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -674,12 +674,12 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should open not writable" do
-          Book.unobtrusively(@simple_file1, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
             book.ReadOnly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -687,7 +687,7 @@ describe Book do
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should == @old_value
         end
       end
@@ -695,13 +695,13 @@ describe Book do
       context "with open unsaved writable book" do
 
         before do
-           @book = Book.open(@simple_file1)           
+           @book = Workbook.open(@simple_file1)           
            @book.sheet(1)[1,1] = @book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"           
            @old_value = @book.sheet(1)[1,1].Value
         end
 
         it "should open as read-write by default" do
-          Book.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -713,7 +713,7 @@ describe Book do
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file1, :read_only => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => false) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -725,7 +725,7 @@ describe Book do
         end
 
         it "should open as read-write" do
-          Book.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -737,7 +737,7 @@ describe Book do
         end
 
         it "should force to read-write" do
-          Book.unobtrusively(@simple_file1, :writable => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -749,7 +749,7 @@ describe Book do
         end
 
         it "should force to read-write" do          
-          Book.unobtrusively(@simple_file1, :writable => true, :read_only => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true, :read_only => false) do |book|
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -762,18 +762,18 @@ describe Book do
 
         it "should force to read-only (not implemented)" do
           expect{
-            Book.unobtrusively(@simple_file1, :read_only => true) 
+            Workbook.unobtrusively(@simple_file1, :read_only => true) 
           }.to raise_error(NotImplementedREOError)
         end
 
         it "should force to read-only (not implemented)" do
           expect{
-            Book.unobtrusively(@simple_file1, :read_only => true, :writable => false) 
+            Workbook.unobtrusively(@simple_file1, :read_only => true, :writable => false) 
           }.to raise_error(NotImplementedREOError)
         end
 
         it "should open not writable" do
-          Book.unobtrusively(@simple_file1, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
             book.ReadOnly.should be false
             book.should == @book
             book.filename.should == @book.filename
@@ -783,7 +783,7 @@ describe Book do
           @book.Saved.should be false
           @book.sheet(1)[1,1].Value.should_not == @old_value
           @book.close(:if_unsaved => :forget)
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
       end
@@ -791,13 +791,13 @@ describe Book do
       context "with open unsaved read-only book" do
 
         before do
-          @book = Book.open(@simple_file1, :read_only => true)          
+          @book = Workbook.open(@simple_file1, :read_only => true)          
           @book.sheet(1)[1,1] = @book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           @old_value = @book.sheet(1)[1,1].Value
         end
 
         it "should open as read-only by default" do
-          Book.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             book.Readonly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -808,12 +808,12 @@ describe Book do
           @book.ReadOnly.should be true
           @book.sheet(1)[1,1].Value.should_not == @old_value
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-only" do
-          Book.unobtrusively(@simple_file1, :read_only => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => false) do |book|
             book.Readonly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -824,12 +824,12 @@ describe Book do
           @book.ReadOnly.should be true
           @book.sheet(1)[1,1].Value.should_not == @old_value
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open as read-only" do
-          Book.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => false, :writable => false) do |book|
             book.Readonly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -840,24 +840,24 @@ describe Book do
           @book.ReadOnly.should be true
           @book.sheet(1)[1,1].Value.should_not == @old_value
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
     
         it "should raise an error" do
           expect{
-            Book.unobtrusively(@simple_file1, :writable => true)
+            Workbook.unobtrusively(@simple_file1, :writable => true)
             }.to raise_error(NotImplementedREOError, "unsaved read-only workbook shall be written")
         end
 
         it "should raise an error" do
            expect{
-            Book.unobtrusively(@simple_file1, :writable => true)
+            Workbook.unobtrusively(@simple_file1, :writable => true)
             }.to raise_error(NotImplementedREOError, "unsaved read-only workbook shall be written")
         end
 
         it "should force to read-only" do
-          Book.unobtrusively(@simple_file1, :read_only => true) do |book|            
+          Workbook.unobtrusively(@simple_file1, :read_only => true) do |book|            
             book.ReadOnly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -868,12 +868,12 @@ describe Book do
           @book.ReadOnly.should be true
           @book.sheet(1)[1,1].Value.should_not == @old_value
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should force to read-only" do
-          Book.unobtrusively(@simple_file1, :read_only => true, :writable => false) do |book|            
+          Workbook.unobtrusively(@simple_file1, :read_only => true, :writable => false) do |book|            
             book.ReadOnly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -884,12 +884,12 @@ describe Book do
           @book.ReadOnly.should be true
           @book.sheet(1)[1,1].Value.should_not == @old_value
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
 
         it "should open not writable" do
-          Book.unobtrusively(@simple_file1, :writable => false) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
             book.ReadOnly.should be true
             book.should == @book
             book.filename.should == @book.filename
@@ -900,7 +900,7 @@ describe Book do
           @book.ReadOnly.should be true
           @book.sheet(1)[1,1].Value.should_not == @old_value
           @book.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == @old_value
         end
       end
@@ -912,12 +912,12 @@ describe Book do
       context "with no book" do
       
         it "should not close the book in the outer block" do
-          Book.unobtrusively(@simple_file1) do |book|
-            Book.unobtrusively(@simple_file1) do |book2|
+          Workbook.unobtrusively(@simple_file1) do |book|
+            Workbook.unobtrusively(@simple_file1) do |book2|
               book2.should == book
             end
             book.should be_alive
-            Book.unobtrusively(@simple_file1) do |book3|
+            Workbook.unobtrusively(@simple_file1) do |book3|
               book3.should == book
             end
             book.should be_alive
@@ -925,26 +925,22 @@ describe Book do
         end
 
         it "should not close the book in the outer block with writable false" do
-          Book.unobtrusively(@simple_file1, :writable => false) do |book|
-            Book.unobtrusively(@simple_file1, :writable => false) do |book2|
+          Workbook.unobtrusively(@simple_file1, :writable => false) do |book|
+            Workbook.unobtrusively(@simple_file1, :writable => false) do |book2|
               book2.should == book
             end
             book.should be_alive
-            #Book.unobtrusively(@simple_file1, :writable => false) do |book3|
-            #  book3.should == book
-            #end
-            #book.should be_alive
           end
         end
 
         it "should write in the outer and inner block" do
-          Book.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             @old_value = book.sheet(1)[1,1].Value
             book.ReadOnly.should be false
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
             book.Saved.should be false
             book.sheet(1)[1,1].Value.should_not == @old_value
-            Book.unobtrusively(@simple_file1) do |book2|
+            Workbook.unobtrusively(@simple_file1) do |book2|
               book2.should == book
               book2.ReadOnly.should be false
               book2.Saved.should be false
@@ -956,19 +952,19 @@ describe Book do
             book.Saved.should be false
             book.sheet(1)[1,1].Value.should == @old_value            
           end
-          book = Book.open(@simple_file1)
+          book = Workbook.open(@simple_file1)
           book.sheet(1)[1,1].Value.should == @old_value 
         end
 
         it "should write in the outer and not in the inner block" do
           expect{
-          Book.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             @old_value = book.sheet(1)[1,1].Value
             book.ReadOnly.should be false
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
             book.Saved.should be false
             book.sheet(1)[1,1].Value.should_not == @old_value
-            Book.unobtrusively(@simple_file1, :read_only => true) do |book2|
+            Workbook.unobtrusively(@simple_file1, :read_only => true) do |book2|
               book2.should == book
               book2.ReadOnly.should be true
               #book2.Saved.should be false
@@ -980,19 +976,19 @@ describe Book do
             book.Saved.should be false
             book.sheet(1)[1,1].Value.should_not == @old_value            
           end
-          book = Book.open(@simple_file1)
+          book = Workbook.open(@simple_file1)
           book.sheet(1)[1,1].Value.should_not == @old_value
           }.to raise_error(NotImplementedREOError)
         end
 
         it "should write in the outer and not in the inner block" do
-          Book.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             @old_value = book.sheet(1)[1,1].Value
             book.ReadOnly.should be false
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
             book.Saved.should be false
             book.sheet(1)[1,1].Value.should_not == @old_value
-            Book.unobtrusively(@simple_file1, :writable => false) do |book2|
+            Workbook.unobtrusively(@simple_file1, :writable => false) do |book2|
               book2.should == book
               book2.ReadOnly.should be false
               book2.Saved.should be false
@@ -1004,18 +1000,18 @@ describe Book do
             book.Saved.should be false
             book.sheet(1)[1,1].Value.should == @old_value            
           end
-          book = Book.open(@simple_file1)
+          book = Workbook.open(@simple_file1)
           book.sheet(1)[1,1].Value.should == @old_value
         end
 
         it "should be read-only in the outer and write in the inner block" do
-          Book.unobtrusively(@simple_file1, :read_only => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :read_only => true) do |book|
             @old_value = book.sheet(1)[1,1].Value
             book.ReadOnly.should be true
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
             book.Saved.should be false
             book.sheet(1)[1,1].Value.should_not == @old_value
-            Book.unobtrusively(@simple_file1) do |book2|
+            Workbook.unobtrusively(@simple_file1) do |book2|
               book2.should == book
               book2.ReadOnly.should be true
               book2.Saved.should be false
@@ -1028,7 +1024,7 @@ describe Book do
             book.ReadOnly.should be true
             book.sheet(1)[1,1].Value.should == @old_value            
           end
-          book = Book.open(@simple_file1)
+          book = Workbook.open(@simple_file1)
           book.sheet(1)[1,1].Value.should == @old_value
         end
 
@@ -1041,15 +1037,15 @@ describe Book do
       context "with openess" do
 
         it "should remain closed" do
-          Book.unobtrusively(@simple_file) do |book|
+          Workbook.unobtrusively(@simple_file) do |book|
           end
           Excel.current.Workbooks.Count.should == 0
         end
 
         it "should remain open" do
-          book1 = Book.open(@simple_file1)
-          Book.unobtrusively(@simple_file1) do |book|
-            book.should be_a Book
+          book1 = Workbook.open(@simple_file1)
+          Workbook.unobtrusively(@simple_file1) do |book|
+            book.should be_a Workbook
             book.should be_alive
           end
           book1.should be_alive
@@ -1060,45 +1056,45 @@ describe Book do
       context "with writability" do
 
         it "should remain read_only" do
-          book1 = Book.open(@simple_file1, :read_only => true)
-          Book.unobtrusively(@simple_file1) do |book|
+          book1 = Workbook.open(@simple_file1, :read_only => true)
+          Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.ReadOnly.should be true
         end
 
         it "should remain writable" do
-          book1 = Book.open(@simple_file1, :read_only => false)
-          Book.unobtrusively(@simple_file1) do |book|
+          book1 = Workbook.open(@simple_file1, :read_only => false)
+          Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.ReadOnly.should be false
         end
 
         it "should write and remain read_only and open the workbook in another Excel" do
-          book1 = Book.open(@simple_file1, :read_only => true)
+          book1 = Workbook.open(@simple_file1, :read_only => true)
           old_value = book1.sheet(1)[1,1].Value
-          Book.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
             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.excel.should == book1.excel
           end
           book1.ReadOnly.should be true
           book1.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should == old_value
         end
 
         it "should write and remain read_only and open the workbook in the same Excel" do
-          book1 = Book.open(@simple_file1, :read_only => true)
+          book1 = Workbook.open(@simple_file1, :read_only => true)
           old_value = book1.sheet(1)[1,1].Value
-          Book.unobtrusively(@simple_file1, :writable => true) do |book|
+          Workbook.unobtrusively(@simple_file1, :writable => true) do |book|
             book.ReadOnly.should be false
             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.excel.should == book1.excel
           end
           book1.ReadOnly.should be true
           book1.close
-          book2 = Book.open(@simple_file1)
+          book2 = Workbook.open(@simple_file1)
           book2.sheet(1)[1,1].Value.should_not == old_value
         end
 
@@ -1107,15 +1103,15 @@ describe Book do
       context "with visibility" do
 
         it "should remain invisible" do
-          book1 = Book.open(@simple_file1, :visible => false)
-          Book.unobtrusively(@simple_file1) do |book|
+          book1 = Workbook.open(@simple_file1, :visible => false)
+          Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.excel.Visible.should be false
         end
 
         it "should remain visible" do
-          book1 = Book.open(@simple_file1, :visible => true)
-          Book.unobtrusively(@simple_file1) do |book|
+          book1 = Workbook.open(@simple_file1, :visible => true)
+          Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.excel.Visible.should be true
           book1.Windows(book1.Name).Visible.should be true
@@ -1126,15 +1122,15 @@ describe Book do
       context "with check-compatibility" do
 
         it "should remain check-compatibility false" do
-          book1 = Book.open(@simple_file1, :check_compatibility => false)
-          Book.unobtrusively(@simple_file1) do |book|
+          book1 = Workbook.open(@simple_file1, :check_compatibility => false)
+          Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.CheckCompatibility.should be false
         end
 
         it "should remain check-compatibility true" do
-          book1 = Book.open(@simple_file1, :check_compatibility => true)
-          Book.unobtrusively(@simple_file1) do |book|
+          book1 = Workbook.open(@simple_file1, :check_compatibility => true)
+          Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.CheckCompatibility.should be true
         end
@@ -1144,23 +1140,23 @@ describe Book do
       context "with calculation" do
 
         it "should remain the calculation mode" do
-          book1 = Book.open(@simple_file1)
+          book1 = Workbook.open(@simple_file1)
           old_calculation = book1.excel.calculation
-          Book.unobtrusively(@simple_file1) do |book|
+          Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.excel.calculation.should == old_calculation
         end
       
         it "should remain calculation manual" do
-          book1 = Book.open(@simple_file1, :calculation => :manual)
-          Book.unobtrusively(@simple_file1) do |book|
+          book1 = Workbook.open(@simple_file1, :calculation => :manual)
+          Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.excel.Calculation.should == XlCalculationManual
         end
 
         it "should remain calculation automatic" do
-          book1 = Book.open(@simple_file1, :calculation => :automatic)
-          Book.unobtrusively(@simple_file1) do |book|
+          book1 = Workbook.open(@simple_file1, :calculation => :automatic)
+          Workbook.unobtrusively(@simple_file1) do |book|
           end
           book1.excel.Calculation.should == XlCalculationAutomatic
         end
@@ -1172,8 +1168,8 @@ describe Book do
 
       it "should open unobtrusively if no Excel is open" do
         Excel.close_all
-        Book.unobtrusively(@simple_file) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file) do |book|
+          book.should be_a Workbook
           book.excel.Visible.should be false
           book.CheckCompatibility.should be false
           book.ReadOnly.should be false
@@ -1201,15 +1197,15 @@ describe Book do
       end
 
       it "should open unobtrusively in the first opened Excel" do
-        Book.unobtrusively(@simple_file) do |book|
+        Workbook.unobtrusively(@simple_file) do |book|
           book.excel.should     == @excel1
           book.excel.should_not == @excel2
         end
       end
 
       it "should open unobtrusively in a new Excel" do
-        Book.unobtrusively(@simple_file, :if_closed => :new) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file, :if_closed => :new) do |book|
+          book.should be_a Workbook
           book.should be_alive
           book.excel.should_not == @excel1
           book.excel.should_not == @excel2
@@ -1217,8 +1213,8 @@ describe Book do
       end
 
       it "should open unobtrusively in a given Excel" do
-        Book.unobtrusively(@simple_file, :if_closed => @excel2) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file, :if_closed => @excel2) do |book|
+          book.should be_a Workbook
           book.should be_alive
           book.excel.should_not == @excel1
           book.excel.should     == @excel2
@@ -1229,7 +1225,7 @@ describe Book do
         Excel.kill_all
         sleep 2
         expect{
-          Book.unobtrusively(@simple_file, :if_closed => @excel2) do |book|
+          Workbook.unobtrusively(@simple_file, :if_closed => @excel2) do |book|
             book.should be_alive
           end
         }.to_not raise_error
@@ -1237,7 +1233,7 @@ describe Book do
 
       it "should raise an error if the option is invalid" do
         expect{
-          Book.unobtrusively(@simple_file, :if_closed => :invalid_option) do |book|
+          Workbook.unobtrusively(@simple_file, :if_closed => :invalid_option) do |book|
           end
         }.to raise_error(TypeREOError, "given object is neither an Excel, a Workbook, nor a Win32ole")
       end
@@ -1247,7 +1243,7 @@ describe Book do
     context "with an open book" do
 
       before do
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
       end
 
       after do
@@ -1255,37 +1251,36 @@ describe Book do
         @book2.close(:if_unsaved => :forget) rescue nil
       end
 
-      it "should let an open Book open if it has been closed and opened again" do
+      it "should let an open Workbook open if it has been closed and opened again" do
         @book.close
         @book.reopen
-        Book.unobtrusively(@simple_file1) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file1) do |book|
+          book.should be_a Workbook
           book.should be_alive
           book.excel.should == @book.excel
         end        
         @book.should be_alive
-        @book.should be_a Book
+        @book.should be_a Workbook
       end
 
-      it "should let an open Book open if two books have been opened and one has been closed and opened again" do
-        book2 = Book.open(@different_file, :force_excel => :new)
+      it "should let an open Workbook open if two books have been opened and one has been closed and opened again" do
+        book2 = Workbook.open(@different_file, :force_excel => :new)
         @book.close
         book2.close
         @book.reopen
-        Book.unobtrusively(@simple_file1) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file1) do |book|
+          book.should be_a Workbook
           book.should be_alive
           book.excel.should == @book.excel
         end        
         @book.should be_alive
-        @book.should be_a Book
+        @book.should be_a Workbook
       end
 
-      it "should open in the Excel of the given Book" do
-        #book1 = Book.open(@different_file)
-        @book2 = Book.open(@another_simple_file, :force_excel => :new)
-        Book.unobtrusively(@different_file, :if_closed => @book2) do |book|
-          book.should be_a Book
+      it "should open in the Excel of the given Workbook" do
+        @book2 = Workbook.open(@another_simple_file, :force_excel => :new)
+        Workbook.unobtrusively(@different_file, :if_closed => @book2) do |book|
+          book.should be_a Workbook
           book.should be_alive
           book.excel.should_not == @book.excel
           book.excel.should     == @book2.excel
@@ -1296,43 +1291,43 @@ describe Book do
         @book.Saved.should be true
         @book.should be_alive
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].value
+        old_cell_value = sheet[1,1].Value
         unobtrusively_ok?
         @book.Saved.should be true
         @book.should be_alive
         sheet = @book.sheet(1)
-        sheet[1,1].value.should_not == old_cell_value
+        sheet[1,1].Value.should_not == old_cell_value
       end
 
      it "should let the unsaved book unsaved" do
         sheet = @book.sheet(1)
-        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"
+        old_cell_value = sheet[1,1].Value
         @book.Saved.should be false
         unobtrusively_ok?
         @book.should be_alive
         @book.Saved.should be false
         @book.close(:if_unsaved => :forget)
-        @book2 = Book.open(@simple_file1)
+        @book2 = Workbook.open(@simple_file1)
         sheet2 = @book2.sheet(1)
-        sheet2[1,1].value.should_not == old_cell_value
+        sheet2[1,1].Value.should_not == old_cell_value
       end
 
       it "should modify unobtrusively the second, writable book" do
-        @book2 = Book.open(@simple_file1, :force_excel => :new)
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new)
         @book.ReadOnly.should be false
         @book2.ReadOnly.should be true
         sheet = @book2.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"
         unobtrusively_ok?
         @book2.should be_alive
         @book2.Saved.should be false
         @book2.close(:if_unsaved => :forget)
         @book.close
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         sheet2 = new_book.sheet(1)
-        sheet2[1,1].value.should_not == old_cell_value
+        sheet2[1,1].Value.should_not == old_cell_value
       end    
     end
 
@@ -1340,7 +1335,7 @@ describe Book do
     context "with a closed book" do
       
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -1349,12 +1344,12 @@ describe Book do
 
       it "should let the closed book closed by default" do
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].value
+        old_cell_value = sheet[1,1].Value
         @book.close
         @book.should_not be_alive
         unobtrusively_ok?
         @book.should_not be_alive
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should_not == old_cell_value
       end
@@ -1363,105 +1358,105 @@ describe Book do
       it "should use the excel of the book and keep open the book" do
         excel = Excel.new(:reuse => false)
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].value
+        old_cell_value = sheet[1,1].Value
         @book.close
         @book.should_not be_alive
-        Book.unobtrusively(@simple_file, :keep_open => true) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file, :keep_open => true) do |book|
+          book.should be_a Workbook
           book.excel.should == @book.excel
           book.excel.should_not == excel
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
         @book.should be_alive
         @book.close
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].value.should_not == old_cell_value
+        sheet[1,1].Value.should_not == old_cell_value
       end
 
       # book shall be reanimated
       it "should use the excel of the book and keep open the book" do
         excel = Excel.new(:reuse => false)
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].value
+        old_cell_value = sheet[1,1].Value
         @book.close
         @book.should_not be_alive
-        Book.unobtrusively(@simple_file, :if_closed => :new) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file, :if_closed => :new) do |book|
+          book.should be_a Workbook
           book.should be_alive
           book.excel.should_not == @book.excel
           book.excel.should_not == excel
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
         @book.should_not be_alive
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].value.should_not == old_cell_value
+        sheet[1,1].Value.should_not == old_cell_value
       end
 
       it "should use another excel if the Excels are closed" do
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].value
+        old_cell_value = sheet[1,1].Value
         @book.close
         @book.should_not be_alive
-        Book.unobtrusively(@simple_file, :keep_open => true) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file, :keep_open => true) do |book|
+          book.should be_a Workbook
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
         @book.should be_alive
         @book.close
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].value.should_not == old_cell_value
+        sheet[1,1].Value.should_not == old_cell_value
       end
 
       it "should use another excel if the Excels are closed" do
         excel = Excel.new(:reuse => false)
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].value
+        old_cell_value = sheet[1,1].Value
         @book.close
         @book.should_not be_alive
         Excel.kill_all
-        Book.unobtrusively(@simple_file, :if_closed => :new, :keep_open => true) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file, :if_closed => :new, :keep_open => true) do |book|
+          book.should be_a Workbook
           book.excel.should_not == @book.excel
           book.excel.should_not == excel
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
         @book.should_not be_alive
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].value.should_not == old_cell_value
+        sheet[1,1].Value.should_not == old_cell_value
       end      
 
       it "should modify unobtrusively the copied file" do
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].value
+        old_cell_value = sheet[1,1].Value
         File.delete simple_save_file rescue nil
         @book.save_as(@simple_save_file)
         @book.close
-        Book.unobtrusively(@simple_save_file) do |book|
+        Workbook.unobtrusively(@simple_save_file) do |book|
           sheet = book.sheet(1)
           cell = sheet[1,1]
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
         end
-        old_book = Book.open(@simple_file1)
+        old_book = Workbook.open(@simple_file1)
         old_sheet = old_book.sheet(1)
         old_sheet[1,1].Value.should == old_cell_value
         old_book.close
-        new_book = Book.open(@simple_save_file)
+        new_book = Workbook.open(@simple_save_file)
         new_sheet = new_book.sheet(1)
         new_sheet[1,1].Value.should_not == old_cell_value
         new_book.close
@@ -1471,7 +1466,7 @@ describe Book do
     context "with a visible book" do
 
       before do
-        @book = Book.open(@simple_file1, :visible => true)
+        @book = Workbook.open(@simple_file1, :visible => true)
       end
 
       after do
@@ -1479,15 +1474,15 @@ describe Book do
         @book2.close(:if_unsaved => :forget) rescue nil
       end
 
-      it "should let an open Book open" do
-        Book.unobtrusively(@simple_file1) do |book|
-          book.should be_a Book
+      it "should let an open Workbook open" do
+        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
       end
       
@@ -1496,14 +1491,14 @@ describe Book do
     context "with various options for an Excel instance in which to open a closed book" do
 
       before do
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
         @book.close
       end
 
       it "should use a given Excel" do
         new_excel = Excel.new(:reuse => false)
         another_excel = Excel.new(:reuse => false)
-        Book.unobtrusively(@simple_file1, :if_closed => another_excel) do |book|
+        Workbook.unobtrusively(@simple_file1, :if_closed => another_excel) do |book|
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
           book.excel.should == another_excel
@@ -1512,14 +1507,14 @@ describe Book do
 
       it "should use another Excel" do
         new_excel = Excel.new(:reuse => false)
-        Book.unobtrusively(@simple_file1, :if_closed => :new) do |book|
+        Workbook.unobtrusively(@simple_file1, :if_closed => :new) do |book|
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
           book.excel.visible.should be false
           book.excel.displayalerts.should == :if_visible
           @another_excel = book.excel
         end
-        Book.unobtrusively(@simple_file1, :if_closed => :reuse) do |book|
+        Workbook.unobtrusively(@simple_file1, :if_closed => :reuse) do |book|
           book.excel.should == @book.excel
           book.excel.should_not == new_excel
           book.excel.visible.should be false
@@ -1530,7 +1525,7 @@ describe Book do
 
       it "should reuse Excel" do
         new_excel = Excel.new(:reuse => false)
-        Book.unobtrusively(@simple_file1, :if_closed => :reuse) do |book|
+        Workbook.unobtrusively(@simple_file1, :if_closed => :reuse) do |book|
           book.excel.should == @book.excel
           book.excel.should_not == new_excel
         end
@@ -1538,7 +1533,7 @@ describe Book do
 
       it "should reuse Excel by default" do
         new_excel = Excel.new(:reuse => false)
-        Book.unobtrusively(@simple_file1) do |book|
+        Workbook.unobtrusively(@simple_file1) do |book|
           book.excel.should == @book.excel
           book.excel.should_not == new_excel
         end
@@ -1549,7 +1544,7 @@ describe Book do
     context "with a read_only book" do
 
       before do
-        @book = Book.open(@simple_file1, :read_only => true)
+        @book = Workbook.open(@simple_file1, :read_only => true)
       end
 
       after do
@@ -1560,27 +1555,27 @@ describe Book do
         @book.ReadOnly.should be true
         @book.Saved.should be true
         sheet = @book.sheet(1)
-        old_cell_value = sheet[1,1].value
+        old_cell_value = sheet[1,1].Value
         unobtrusively_ok?
         @book.should be_alive
         @book.Saved.should be true
         @book.ReadOnly.should be true
         @book.close
-        book2 = Book.open(@simple_file1)
+        book2 = Workbook.open(@simple_file1)
         sheet2 = book2.sheet(1)
-        sheet2[1,1].value.should == old_cell_value
+        sheet2[1,1].Value.should == old_cell_value
       end
 
       it "should let the unsaved book unsaved" do
         @book.ReadOnly.should be true
         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.should be_alive
-        Book.unobtrusively(@simple_file1) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file1) do |book|
+          book.should be_a Workbook
           sheet = book.sheet(1)
-          sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+          sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
           @cell_value = sheet[1,1].Value
           book.should be_alive
           book.Saved.should be false
@@ -1589,24 +1584,24 @@ describe Book do
         @book.Saved.should be false
         @book.ReadOnly.should be true
         @book.close
-        book2 = Book.open(@simple_file1)
+        book2 = Workbook.open(@simple_file1)
         sheet2 = book2.sheet(1)
         # modifies unobtrusively the saved version, not the unsaved version
-        sheet2[1,1].value.should == @cell_value        
+        sheet2[1,1].Value.should == @cell_value        
       end
 
       it "should open unobtrusively by default the writable book" do
-        book2 = Book.open(@simple_file1, :force_excel => :new, :read_only => false)
+        book2 = Workbook.open(@simple_file1, :force_excel => :new, :read_only => false)
         @book.ReadOnly.should be true
         book2.Readonly.should be false
         sheet = @book.sheet(1)
-        cell_value = sheet[1,1].value
-        Book.unobtrusively(@simple_file1, :if_closed => :new) do |book|
-          book.should be_a Book
+        cell_value = sheet[1,1].Value
+        Workbook.unobtrusively(@simple_file1, :if_closed => :new) do |book|
+          book.should be_a Workbook
           book.excel.should == book2.excel
           book.excel.should_not == @book.excel
           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.should be_alive
           book.Saved.should be false          
         end  
@@ -1614,29 +1609,29 @@ describe Book do
         @book.ReadOnly.should be true
         @book.close
         book2.close
-        book3 = Book.open(@simple_file1)
+        book3 = Workbook.open(@simple_file1)
         new_sheet = book3.sheet(1)
-        new_sheet[1,1].value.should_not == cell_value
+        new_sheet[1,1].Value.should_not == cell_value
         book3.close
       end
 
       it "should open unobtrusively the book in a new Excel to open the book writable" do
         excel1 = Excel.new(:reuse => false)
         excel2 = Excel.new(:reuse => false)
-        book2 = Book.open(@simple_file1, :force_excel => :new, :read_only => true)
+        book2 = Workbook.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_file1, :writable => true, :if_closed => :new, :rw_change_excel => :new) do |book|
-          book.should be_a Book
+        cell_value = sheet[1,1].Value
+        Workbook.unobtrusively(@simple_file1, :writable => true, :if_closed => :new, :rw_change_excel => :new) do |book|
+          book.should be_a Workbook
           book.ReadOnly.should be false
           book.excel.should_not == book2.excel
           book.excel.should_not == @book.excel
           book.excel.should_not == excel1
           book.excel.should_not == excel2
           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.should be_alive
           book.Saved.should be false          
         end  
@@ -1644,26 +1639,26 @@ describe Book do
         @book.ReadOnly.should be true
         @book.close
         book2.close
-        book3 = Book.open(@simple_file1)
+        book3 = Workbook.open(@simple_file1)
         new_sheet = book3.sheet(1)
-        new_sheet[1,1].value.should_not == cell_value
+        new_sheet[1,1].Value.should_not == cell_value
         book3.close
       end
 
       it "should open unobtrusively the book in the same Excel to open the book writable" do
         excel1 = Excel.new(:reuse => false)
         excel2 = Excel.new(:reuse => false)
-        book2 = Book.open(@simple_file1, :force_excel => :new, :read_only => true)
+        book2 = Workbook.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_file1, :writable => true, :if_closed => :new, :rw_change_excel => :current) do |book|
-          book.should be_a Book
+        cell_value = sheet[1,1].Value
+        Workbook.unobtrusively(@simple_file1, :writable => true, :if_closed => :new, :rw_change_excel => :current) do |book|
+          book.should be_a Workbook
           book.excel.should == book2.excel
           book.ReadOnly.should be false
           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.should be_alive
           book.Saved.should be false          
         end  
@@ -1671,20 +1666,20 @@ describe Book do
         book2.ReadOnly.should be true
         @book.close
         book2.close
-        book3 = Book.open(@simple_file1)
+        book3 = Workbook.open(@simple_file1)
         new_sheet = book3.sheet(1)
-        new_sheet[1,1].value.should_not == cell_value
+        new_sheet[1,1].Value.should_not == cell_value
         book3.close
       end
 
       it "should open unobtrusively the book in the Excel where it was opened most recently" do
-        book2 = Book.open(@simple_file1, :force_excel => :new, :read_only => true)
+        book2 = Workbook.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_file1, :if_closed => :new, :read_only => true) do |book|
-          book.should be_a Book
+        cell_value = sheet[1,1].Value
+        Workbook.unobtrusively(@simple_file1, :if_closed => :new, :read_only => true) do |book|
+          book.should be_a Workbook
           book.excel.should == book2.excel
           book.excel.should_not == @book.excel
           book.should be_alive
@@ -1698,9 +1693,9 @@ describe Book do
 
     end
 
-    context "with a virgin Book class" do
+    context "with a virgin Workbook class" do
       before do
-        class Book
+        class Workbook
           @@bookstore = nil
         end
       end
@@ -1711,10 +1706,10 @@ describe Book do
 
     context "with a book never opened before" do
       before do
-        class Book
+        class Workbook
           @@bookstore = nil
         end
-        other_book = Book.open(@different_file)
+        other_book = Workbook.open(@different_file)
       end
       it "should open the book" do
         expect{ unobtrusively_ok? }.to_not raise_error
@@ -1724,7 +1719,7 @@ describe Book do
     context "with a saved book" do
 
       before do
-        @book1 = Book.open(@simple_file1)
+        @book1 = Workbook.open(@simple_file1)
       end
 
       after do
@@ -1733,12 +1728,12 @@ describe Book do
 
       it "should save if the book was modified during unobtrusively" do
         m_time = File.mtime(@book1.stored_filename)
-        Book.unobtrusively(@simple_file1, :if_closed => :new) do |book|
+        Workbook.unobtrusively(@simple_file1, :if_closed => :new) do |book|
           @book1.Saved.should be true
           book.Saved.should be true  
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           @book1.Saved.should be false
           book.Saved.should be false
           sleep 1
@@ -1750,7 +1745,7 @@ describe Book do
 
       it "should not save the book if it was not modified during unobtrusively" do
         m_time = File.mtime(@book1.stored_filename)
-        Book.unobtrusively(@simple_file1) do |book|
+        Workbook.unobtrusively(@simple_file1) do |book|
           @book1.Saved.should be true
           book.Saved.should be true 
           sleep 1
@@ -1762,7 +1757,7 @@ describe Book do
 
     context "with block result" do
       before do
-        @book1 = Book.open(@simple_file1)
+        @book1 = Workbook.open(@simple_file1)
       end
 
       after do
@@ -1771,7 +1766,7 @@ describe Book do
 
       it "should yield the block result true" do
         result = 
-          Book.unobtrusively(@simple_file1) do |book| 
+          Workbook.unobtrusively(@simple_file1) do |book| 
             @book1.Saved.should be true
           end
         result.should == true
@@ -1779,18 +1774,18 @@ describe Book do
 
       it "should yield the block result nil" do
         result = 
-          Book.unobtrusively(@simple_file1) do |book| 
+          Workbook.unobtrusively(@simple_file1) do |book| 
           end
         result.should == nil
       end
 
       it "should yield the block result with an unmodified book" do
         sheet1 = @book1.sheet(1)
-        cell1 = sheet1[1,1].value
+        cell1 = sheet1[1,1].Value
         result = 
-          Book.unobtrusively(@simple_file1) do |book| 
+          Workbook.unobtrusively(@simple_file1) do |book| 
             sheet = book.sheet(1)
-            cell = sheet[1,1].value
+            cell = sheet[1,1].Value
           end
         result.should == cell1
       end
@@ -1799,7 +1794,7 @@ describe Book do
         sheet1 = @book1.sheet(1)
         @book1.save
         result = 
-          Book.unobtrusively(@simple_file1) do |book| 
+          Workbook.unobtrusively(@simple_file1) do |book| 
             sheet = book.sheet(1)
             sheet[1,1] = 22
             @book1.Saved.should be false
@@ -1813,12 +1808,12 @@ describe Book do
     context "with several Excel instances" 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)
         @book1.Readonly.should == false
         @book2.Readonly.should == true
         old_sheet = @book1.sheet(1)
-        @old_cell_value = old_sheet[1,1].value
+        @old_cell_value = old_sheet[1,1].Value
         @book1.close
         @book2.close
         @book1.should_not be_alive
@@ -1826,47 +1821,47 @@ describe Book do
       end
 
       it "should open unobtrusively the closed book in the most recent Excel where it was open before" do      
-        Book.unobtrusively(@simple_file1) do |book| 
+        Workbook.unobtrusively(@simple_file1) do |book| 
           book.excel.should_not == @book2.excel
           book.excel.should == @book1.excel
           book.ReadOnly.should == false
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].value.should_not == @old_cell_value
+        sheet[1,1].Value.should_not == @old_cell_value
       end
 
       it "should open unobtrusively the closed book in the new Excel" do
-        Book.unobtrusively(@simple_file1, :if_closed => :new) do |book| 
+        Workbook.unobtrusively(@simple_file1, :if_closed => :new) do |book| 
           book.excel.should_not == @book2.excel
           book.excel.should_not == @book1.excel
           book.ReadOnly.should == false
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should_not == @old_cell_value
       end
 
       it "should open unobtrusively the closed book in a new Excel if the Excel is not alive anymore" do
         Excel.kill_all
-        Book.unobtrusively(@simple_file1, :if_closed => :new) do |book| 
+        Workbook.unobtrusively(@simple_file1, :if_closed => :new) do |book| 
           book.ReadOnly.should == false
           book.excel.should_not == @book1.excel
           book.excel.should_not == @book2.excel
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
-        new_book = Book.open(@simple_file1)
+        new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should_not == @old_cell_value
       end
@@ -1878,24 +1873,24 @@ describe Book do
     context "open unobtrusively for reading and modifying" do
 
       before do
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
         sheet = @book.sheet(1)
-        @old_cell_value = sheet[1,1].value
+        @old_cell_value = sheet[1,1].Value
         @book.close
       end
 
       it "should not change the value" do
-        Book.for_reading(@simple_file1) do |book|
-          book.should be_a Book
+        Workbook.for_reading(@simple_file1) do |book|
+          book.should be_a Workbook
           book.should be_alive
           book.Saved.should be true  
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
           book.excel.should == @book.excel
         end
-        new_book = Book.open(@simple_file1, :visible => true)
+        new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should == @old_cell_value
       end
@@ -1903,41 +1898,41 @@ describe Book do
       it "should not change the value and use a given Excel" do
         new_excel = Excel.new(:reuse => false)
         another_excel = Excel.new(:reuse => false)
-        Book.for_reading(@simple_file1, :if_closed => another_excel) do |book|
+        Workbook.for_reading(@simple_file1, :if_closed => another_excel) do |book|
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should == another_excel
         end
-        new_book = Book.open(@simple_file1, :visible => true)
+        new_book = Workbook.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 new Excel instance" do
         new_excel = Excel.new(:reuse => false)
-        Book.for_reading(@simple_file1, :if_closed => :new) do |book|
+        Workbook.for_reading(@simple_file1, :if_closed => :new) do |book|
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
           book.excel.visible.should be false
           book.excel.displayalerts.should == :if_visible
         end
-        new_book = Book.open(@simple_file1, :visible => true)
+        new_book = Workbook.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_file1) do |book|
+        Workbook.for_modifying(@simple_file1) do |book|
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should == @book.excel
         end
-        new_book = Book.open(@simple_file, :visible => true)
+        new_book = Workbook.open(@simple_file, :visible => true)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should_not == @old_cell_value
       end
@@ -1945,29 +1940,29 @@ describe Book do
       it "should change the value and use a given Excel" do
         new_excel = Excel.new(:reuse => false)
         another_excel = Excel.new(:reuse => false)
-        Book.for_modifying(@simple_file1, :if_closed => another_excel) do |book|
+        Workbook.for_modifying(@simple_file1, :if_closed => another_excel) do |book|
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should == another_excel
         end
-        new_book = Book.open(@simple_file1, :visible => true)
+        new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should_not == @old_cell_value
       end
 
       it "should change the value and use the new Excel instance" do
         new_excel = Excel.new(:reuse => false)
-        Book.for_modifying(@simple_file1, :if_closed => :new) do |book|
+        Workbook.for_modifying(@simple_file1, :if_closed => :new) do |book|
           sheet = book.sheet(1)
           cell = sheet[1,1]
-          sheet[1,1] = cell.value == "foo" ? "bar" : "foo"
+          sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
           book.excel.visible.should be false
           book.excel.displayalerts.should == :if_visible
         end
-        new_book = Book.open(@simple_file1, :visible => true)
+        new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
         sheet[1,1].Value.should_not == @old_cell_value
       end