robust_excel_ole 1.3 → 1.4

data/spec/general_spec.rb

@@ -35,10 +35,42 @@ module RobustExcelOle
       rm_tmp(@dir)
     end
 
+    describe "to_reo" do
+
+      before do
+        @book1 = Workbook.open(@simple_file)
+      end
+
+      it "should promote an Excel" do
+        excel = @book1.excel.ole_excel.to_reo
+        excel.class.should == RobustExcelOle::Excel
+        excel.should be_alive
+      end
+
+      it "should promote a workbook" do
+        workbook = @book1.ole_workbook.to_reo
+        workbook.should be_a Workbook
+        workbook.should be_alive
+      end
+
+      it "should promote a worksheet" do
+        worksheet = @book1.sheet(1).ole_worksheet.to_reo
+        worksheet.should be_kind_of Worksheet
+        worksheet.name.should == "Sheet1"
+      end
+
+      it "should promote a range" do
+        range = @book1.sheet(1).range([1,1]).ole_range.to_reo
+        range.should be_kind_of Range
+        range.Value.should == "foo"
+      end
+
+    end
+
     describe "methods, own_methods, respond_to?" do
 
       before do
-        @book1 = Book.open(@simple_file)
+        @book1 = Workbook.open(@simple_file)
         @ole_workbook_methods = 
           ["Activate", "ActiveSheet", "Application", "Close", "FullName", "HasPassword", "Name", "Names", 
             "Password", "Protect", "ProtectSharing", "ProtectStructure", "Protect", "ReadOnly", "Save", 
@@ -49,11 +81,11 @@ module RobustExcelOle
           ["ActiveCell", "ActiveSheet", "ActiveWorkbook", "Application",  "Calculate", "Cells", "Columns",
             "DisplayAlerts", "Evaluate", "Hwnd", "Name", "Names", "Quit", "Range", "Ready", "Save", 
             "Sheets", "UserName", "Value", "Visible", "Workbooks", "Worksheets"]
-        @excel_methods = ["alive?", "book_class", "close", "displayalerts", "recreate", "visible", 
+        @excel_methods = ["alive?", "workbook_class", "close", "displayalerts", "recreate", "visible", 
           "with_displayalerts"] 
         @ole_sheet_methods = []
          # ["Activate", "Calculate", "Copy", "Name", "Select", "Evaluate", "Protect", "Unprotect"]
-        @sheet_methods = ["book_class", "col_range", "each", "each_column", "each_column_with_index",
+        @sheet_methods = ["workbook_class", "col_range", "each", "each_column", "each_column_with_index",
                           "each_row", "each_row_with_index", "nameval", "namevalue", 
                           "set_namevalue", "row_range", "set_nameval"]
       end
@@ -194,7 +226,7 @@ module RobustExcelOle
     describe "Object methods" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @sheet = @book.sheet(1)
       end
 
@@ -205,7 +237,7 @@ module RobustExcelOle
       it "should raise an error when asking excel of a sheet" do
         expect{
           @sheet.excel
-          }.to raise_error(TypeREOError, "receiver instance is neither an Excel nor a Book")
+          }.to raise_error(TypeREOError, "receiver instance is neither an Excel nor a Workbook")
       end
     end
   end

data/spec/range_spec.rb

@@ -14,7 +14,7 @@ describe RobustExcelOle::Range do
 
   before do
     @dir = create_tmpdir
-    @book = Book.open(@dir + '/workbook.xls', :force_excel => :new)
+    @book = Workbook.open(@dir + '/workbook.xls', :force_excel => :new)
     @sheet = @book.sheet(2)
     @range = RobustExcelOle::Range.new(@sheet.ole_worksheet.UsedRange.Rows(1))
   end
@@ -60,7 +60,7 @@ describe RobustExcelOle::Range do
 
     context "read 'merge_cells.xls'" do
       before do
-        @merge_cells_book = Book.open("#{@dir}/merge_cells.xls", :force_excel => :new)
+        @merge_cells_book = Workbook.open("#{@dir}/merge_cells.xls", :force_excel => :new)
         @merge_cells_sheet = @merge_cells_book.sheet(1)
       end
 
@@ -103,18 +103,18 @@ describe RobustExcelOle::Range do
   describe "#[]" do
     context "access [0]" do
       it { @range[0].should be_kind_of RobustExcelOle::Cell }
-      it { @range[0].value.should eq 'simple' }
+      it { @range[0].Value.should eq 'simple' }
     end
 
     context "access [2]" do
-      it { @range[2].value.should eq 'sheet2' }
+      it { @range[2].Value.should eq 'sheet2' }
     end
 
     context "access [0] and [1] and [2]" do
       it "should get every values" do
-        @range[0].value.should eq 'simple'
-        @range[1].value.should eq 'file'
-        @range[2].value.should eq 'sheet2'
+        @range[0].Value.should eq 'simple'
+        @range[1].Value.should eq 'file'
+        @range[2].Value.should eq 'sheet2'
       end
     end
   end
@@ -122,10 +122,10 @@ describe RobustExcelOle::Range do
   describe "#copy" do
     
     before do
-      @book2 = Book.open(@dir + '/different_workbook.xls')
+      @book2 = Workbook.open(@dir + '/different_workbook.xls')
       @sheet2 = @book.sheet(1)
-      @range2 = @sheet2.range(1..2,1..3)
-      @book3 = Book.open(@dir + '/another_workbook.xls', :force => {:excel => :new})
+      @range2 = @sheet2.range([1..2,1..3])
+      @book3 = Workbook.open(@dir + '/another_workbook.xls', :force => {:excel => :new})
     end
 
     after do
@@ -133,31 +133,46 @@ describe RobustExcelOle::Range do
     end
 
     it "should copy range at a cell" do
-      @range2.copy(4,4)
-      @sheet2.range(4..5,4..6).values.should == ["foo", "workbook", "sheet1", "foo", nil, "foobaaa"]
+      @range2.copy([4,4])
+      @sheet2.range([4..5,4..6]).values.should == ["foo", "workbook", "sheet1", "foo", nil, "foobaaa"]
+    end
+
+    it "should copy range at a cell" do
+      @range2.copy(["D4"])
+      @sheet2.range([4..5,4..6]).values.should == ["foo", "workbook", "sheet1", "foo", nil, "foobaaa"]
+    end
+
+    it "should copy range at a cell" do
+      @range2.copy("D4")
+      @sheet2.range([4..5,4..6]).values.should == ["foo", "workbook", "sheet1", "foo", nil, "foobaaa"]
     end
 
     it "should copy range into a certain worksheet of another workbook" do
+      @range2.copy([4,4],@book2.sheet(3))
+      @book2.sheet(3).range([4..5,4..6]).values.should == ["foo", "workbook", "sheet1", "foo", nil, "foobaaa"]
+    end
+
+    it "should accept old interface" do
       @range2.copy(4,4,@book2.sheet(3))
-      @book2.sheet(3).range(4..5,4..6).values.should == ["foo", "workbook", "sheet1", "foo", nil, "foobaaa"]
+      @book2.sheet(3).range([4..5,4..6]).values.should == ["foo", "workbook", "sheet1", "foo", nil, "foobaaa"]
     end
 
     it "should copy range at a cell into a worksheet in another Excel instance" do
       Excel.kill_all
       sleep 1
-      book1 = Book.open(@dir + '/workbook.xls', :force_excel => :new)
-      book2 = Book.open(@dir + '/different_workbook.xls', :force_excel => :new)
+      book1 = Workbook.open(@dir + '/workbook.xls', :force_excel => :new)
+      book2 = Workbook.open(@dir + '/different_workbook.xls', :force_excel => :new)
       sheet1 = book1.sheet(1)
-      range1 = sheet1.range(1..2,1..3)
-      range1.copy(4,4,book2.sheet(1))
-      book2.sheet(1).range(4..5,4..6).values.should == ["foo", "workbook", "sheet1", "foo", nil, "foobaaa"]
+      range1 = sheet1.range([1..2,1..3])
+      range1.copy([4,4],book2.sheet(1))
+      book2.sheet(1).range([4..5,4..6]).values.should == ["foo", "workbook", "sheet1", "foo", nil, "foobaaa"]
     end
 
   end
 
   describe "#method_missing" do
     it "can access COM method" do
-      @range.Range(@range.Cells.Item(1), @range.Cells.Item(3)).value.should eq [@range.values(0..2)]
+      @range.Range(@range.Cells.Item(1), @range.Cells.Item(3)).Value.should eq [@range.values(0..2)]
     end
 
     context "unknown method" do

data/spec/reo_common_spec.rb

@@ -40,87 +40,97 @@ module RobustExcelOle
 
       it "should read a1-format" do
         address = Address.new("A1")
-        address.rows.should == 1 .. 1
-        address.columns.should == "A" .."A"
-        address.a1format.should be_true
+        address.rows.should == (1..1)
+        address.columns.should == (1..1)
+      end
+
+      it "should read a1-format with brackets" do
+        address = Address.new(["A1"])
+        address.rows.should == (1..1)
+        address.columns.should == (1..1)
       end
 
       it "should read a1-format" do
         address = Address.new("ABO15")
-        address.rows.should == 15..15
-        address.columns.should == "ABO".."ABO"
-        address.a1format.should be_true
+        address.columns.should == (743..743)
+        address.rows.should == (15..15)
       end
 
       it "should read a1-format when row and column are given separated" do
-        address = Address.new("A",1)
-        address.rows.should == 1..1
-        address.columns.should == "A".."A"
-        address.a1format.should be_true
+        address = Address.new([1,"A"])
+        address.rows.should == (1..1)
+        address.columns.should == (1..1)
       end
 
       it "should read a1-format with rows as integer range" do
-        address = Address.new("AB", 2..4)
-        address.rows.should == 2..4
-        address.columns.should == "AB".."AB"
-        address.a1format.should be_true
+        address = Address.new([2..4, "AB"])
+        address.rows.should == (2..4)
+        address.columns.should == (28..28)
       end
 
       it "should read a1-format with columns as string range" do
-        address = Address.new("A".."C", 2)
-        address.rows.should == 2
-        address.columns.should == "A".."C"
-        address.a1format.should be_true
+        address = Address.new([2, "A".."C"])
+        address.rows.should == (2..2)
+        address.columns.should == (1..3)
       end
 
       it "should read a1-format with rows and columns as string range" do
-        address = Address.new("A".."C", 2..6)
-        address.rows.should == 2..6
-        address.columns.should == "A".."C"
-        address.a1format.should be_true
+        address = Address.new([2..6, "A" .. "C"])
+        address.rows.should == (2..6)
+        address.columns.should == (1..3)
       end
 
       it "should read r1c1-format" do
-        address = Address.new(1,2)
-        address.rows.should == 1 .. 1
-        address.columns.should == 2 .. 2
-        address.a1format.should be_false
+        address = Address.new([1,2])
+        address.rows.should == (1..1)
+        address.columns.should == (2..2)
       end
 
       it "should read r1c1-format with rows as integer range" do
-        address = Address.new(1..2,3)
-        address.rows.should == 1..2
-        address.columns.should == 3..3
-        address.a1format.should be_false
+        address = Address.new([1..2,3])
+        address.rows.should == (1..2)
+        address.columns.should == (3..3)
       end
      
       it "should read r1c1-format with columns as integer range" do
-        address = Address.new(1,3..5)
-        address.rows.should == 1..1
-        address.columns.should == 3..5
-        address.a1format.should be_false
+        address = Address.new([1,3..5])
+        address.rows.should == (1..1)
+        address.columns.should == (3..5)
       end
 
       it "should read r1c1-format with rows and columns as integer range" do
-        address = Address.new(1..4,3..5)
-        address.rows.should == 1..4
-        address.columns.should == 3..5
-        address.a1format.should be_false
+        address = Address.new([1..4,3..5])
+        address.rows.should == (1..4)
+        address.columns.should == (3..5)
+      end
+
+      it "should read a1-format for a rectangular range" do
+        address = Address.new(["A1:B3"])
+        address.rows.should == (1..3)
+        address.columns.should == (1..2)
+      end
+
+      it "should read a1-format for a rectangular range without brackets" do
+        address = Address.new("A1:B3")
+        address.rows == (1..3)
+        address.columns == (1..2)
       end
 
       it "should raise an error" do
         expect{
           Address.new("1A")
-        }.to raise_error(AddressInvalid, /address ("1A") not in A1 format/)
+        }.to raise_error(AddressInvalid, /not in A1/)
         expect{
           Address.new("A1B")
-        }.to raise_error(AddressInvalid, /address ("A1B") not in A1 format/)
+        }.to raise_error(AddressInvalid, /not in A1/)
         expect{
-          Address.new("A".."B","C".."D")
-        }.to raise_error(AddressInvalid, /address ("A".."B", "C".."D") not in A1 format/)
+          Address.new(["A".."B","C".."D"])
+        }.to raise_error(AddressInvalid, /not in A1/)
+        expect{
+          Address.new(["A",1,2])
+        }.to raise_error(AddressInvalid, /more than two components/)
       end
 
-
     end
 
     describe "trace" do
@@ -131,7 +141,7 @@ module RobustExcelOle
       end
 
       it "should put another text" do
-        b = Book.open(@simple_file)
+        b = Workbook.open(@simple_file)
         REOCommon::trace "book: #{b}"
       end
     end
@@ -139,7 +149,7 @@ module RobustExcelOle
     describe "own_methods" do
 
       before do
-        @book1 = Book.open(@simple_file)
+        @book1 = Workbook.open(@simple_file)
         @ole_workbook_methods = 
           ["Activate", "ActiveSheet", "Application", "Close", "FullName", "HasPassword", "Name", "Names", 
             "Password", "Protect", "ProtectSharing", "ProtectStructure", "Protect", "ReadOnly", "Save", 
@@ -150,7 +160,7 @@ module RobustExcelOle
           ["ActiveCell", "ActiveSheet", "ActiveWorkbook", "Application",  "Calculate", "Cells", "Columns",
             "DisplayAlerts", "Evaluate", "Hwnd", "Name", "Names", "Quit", "Range", "Ready", "Save", 
             "Sheets", "UserName", "Value", "Visible", "Workbooks", "Worksheets"]
-        @excel_methods = ["alive?", "book_class", "close", "displayalerts", "recreate", "visible", "with_displayalerts"] 
+        @excel_methods = ["alive?", "workbook_class", "close", "displayalerts", "recreate", "visible", "with_displayalerts"] 
       end
 
       after do
@@ -172,7 +182,7 @@ module RobustExcelOle
     describe "Object methods" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @sheet = @book.sheet(1)
       end
 
@@ -183,7 +193,7 @@ module RobustExcelOle
       it "should raise an error when asking excel of a sheet" do
         expect{
           @sheet.excel
-          }.to raise_error(TypeREOError, "receiver instance is neither an Excel nor a Book")
+          }.to raise_error(TypeREOError, "receiver instance is neither an Excel nor a Workbook")
       end
 
     end

data/spec/{book_spec.rb → workbook_spec.rb}

@@ -8,7 +8,7 @@ include General
 
 module RobustExcelOle
 
-describe Book do
+describe Workbook do
 
   before(:all) do
     excel = Excel.new(:reuse => true)
@@ -41,89 +41,89 @@ describe Book do
     context "with standard" do
       it "open an existing file" do
         expect {
-          @book = Book.open(@simple_file)
+          @book = Workbook.open(@simple_file)
         }.to_not raise_error
-        @book.should be_a Book
+        @book.should be_a Workbook
         @book.close
       end
     end
   end
 
-  describe "Book::save" do
+  describe "Workbook::save" do
 
     it "should save a file, if it is open" 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 {
-        Book.save(@simple_file)
+        Workbook.save(@simple_file)
       }.to_not raise_error
       @book.ole_workbook.Worksheets.Count.should ==  @new_sheet_count
       @book.close
     end
 
     it "should not save a file, if it is not open" 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
       @book.close(:if_unsaved => :forget)
       expect {
-        Book.save(@simple_file)
+        Workbook.save(@simple_file)
       }.to_not raise_error
     end
 
   end
 
-  describe "Book::save_as" do
+  describe "Workbook::save_as" do
     
     it "should save to 'simple_save_file.xls'" do
-      book = Book.open(@simple_file1)
-      Book.save_as(@simple_file1, @simple_save_file1, :if_exists => :overwrite)
+      book = Workbook.open(@simple_file1)
+      Workbook.save_as(@simple_file1, @simple_save_file1, :if_exists => :overwrite)
       File.exist?(@simple_save_file1).should be true
     end
   end
 
-  describe "Book::close" do
+  describe "Workbook::close" do
 
     it "should close the book if it is open" do
-      book = Book.open(@simple_file1)
-      Book.close(@simple_file1)
+      book = Workbook.open(@simple_file1)
+      Workbook.close(@simple_file1)
       book.should_not be_alive
     end
 
     it "should not close the book if it is not open" do
-      book = Book.open(@simple_file1, :visible => true)
+      book = Workbook.open(@simple_file1, :visible => true)
       book.close
-      Book.close(@simple_file1)
+      Workbook.close(@simple_file1)
       book.should_not be_alive
     end
 
     it "should raise error if the book is unsaved and open" do
-      book = Book.open(@simple_file1)
+      book = Workbook.open(@simple_file1)
       sheet = book.sheet(1)
       book.add_sheet(sheet, :as => 'a_name')
       expect{
-        Book.close(@simple_file1)
+        Workbook.close(@simple_file1)
       }.to raise_error(WorkbookNotSaved, /workbook is unsaved: "workbook.xls"/)
       expect{
-        Book.close(@simple_file, :if_unsaved => :raise)
+        Workbook.close(@simple_file, :if_unsaved => :raise)
       }.to raise_error(WorkbookNotSaved, /workbook is unsaved: "workbook.xls"/)
     end
 
     it "should save and close the book" do
-      book = Book.open(@simple_file1)
+      book = Workbook.open(@simple_file1)
       sheet_count = book.ole_workbook.Worksheets.Count
       sheet = book.sheet(1)
       book.add_sheet(sheet, :as => 'a_name')
       ole_workbook = book.ole_workbook
       excel = book.excel
       excel.Workbooks.Count.should == 1
-      Book.close(@simple_file1, {:if_unsaved => :save})
+      Workbook.close(@simple_file1, {:if_unsaved => :save})
       excel.Workbooks.Count.should == 0
       book.ole_workbook.should == nil
       book.should_not be_alive
       #expect{ole_workbook.Name}.to raise_error(WIN32OLERuntimeError)
-      new_book = Book.open(@simple_file1)
+      new_book = Workbook.open(@simple_file1)
       begin
         new_book.ole_workbook.Worksheets.Count.should == sheet_count + 1
       ensure
@@ -137,7 +137,7 @@ describe Book do
     context "with various file formats" do
 
       it "should open linked workbook" do
-        book = Book.open(@linked_file, :visible => true)
+        book = Workbook.open(@linked_file, :visible => true)
         book.close
       end
     end
@@ -156,7 +156,7 @@ describe Book do
       it "should open in a new Excel" do
         book2 = Workbook.open(@simple_file, :force => {:excel => :new})
         book2.should be_alive
-        book2.should be_a Book
+        book2.should be_a Workbook
         book2.excel.should_not == @book.excel 
         book2.should_not == @book
         @book.Readonly.should be false
@@ -165,21 +165,21 @@ describe Book do
       end
     end
 
-    context "lift a workbook to a Book object" do
+    context "lift a workbook to a Workbook object" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
         @book.close
       end
 
-      it "should yield an identical Book and set visible and displayalerts values" do
+      it "should yield an identical Workbook and set visible and displayalerts values" do
         workbook = @book.ole_workbook
-        new_book = Book.new(workbook, :visible => true)
+        new_book = Workbook.new(workbook, :visible => true)
         new_book.excel.displayalerts = true
-        new_book.should be_a Book
+        new_book.should be_a Workbook
         new_book.should be_alive
         new_book.should == @book
         new_book.filename.should == @book.filename
@@ -195,7 +195,7 @@ describe Book do
 
     context "with standard options" do
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -210,29 +210,29 @@ describe Book do
     context "with identity transperence" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
         @book.close
       end
 
-      it "should yield identical Book objects for identical Excel books when reopening" do
+      it "should yield identical Workbook objects for identical Excel books when reopening" do
         @book.should be_alive
         @book.close
         @book.should_not be_alive
-        book2 = Book.open(@simple_file)
+        book2 = Workbook.open(@simple_file)
         book2.should === @book
         book2.should be_alive
         book2.close
       end
 
-      it "should yield different Book objects when reopening in a new Excel" do
+      it "should yield different Workbook objects when reopening in a new Excel" do
         @book.should be_alive
         old_excel = @book.excel
         @book.close
         @book.should_not be_alive
-        book2 = Book.open(@simple_file, :force => {:excel => :new})
+        book2 = Workbook.open(@simple_file, :force => {:excel => :new})
         book2.should_not === @book
         book2.should be_alive
         book2.excel.should_not == old_excel
@@ -243,7 +243,7 @@ describe Book do
     context "with :force_excel" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -251,9 +251,9 @@ describe Book do
       end
 
       it "should open in a new Excel" do
-        book2 = Book.open(@simple_file, :force => {:excel => :new})
+        book2 = Workbook.open(@simple_file, :force => {:excel => :new})
         book2.should be_alive
-        book2.should be_a Book
+        book2.should be_a Workbook
         book2.excel.should_not == @book.excel 
         book2.should_not == @book
         @book.Readonly.should be false
@@ -262,24 +262,24 @@ describe Book do
       end
 
       it "should open in a given Excel, provide identity transparency, because book can be readonly, such that the old and the new book are readonly" do
-        book2 = Book.open(@simple_file1, :force => {:excel => :new})
+        book2 = Workbook.open(@simple_file1, :force => {:excel => :new})
         book2.excel.should_not == @book.excel
-        book3 = Book.open(@simple_file1, :force => {:excel => :new})
+        book3 = Workbook.open(@simple_file1, :force => {:excel => :new})
         book3.excel.should_not == book2.excel
         book3.excel.should_not == @book.excel
         book2.close
         book3.close
         @book.close
-        book4 = Book.open(@simple_file1, :force => {:excel => book2.excel}, :read_only => true)
+        book4 = Workbook.open(@simple_file1, :force => {:excel => book2.excel}, :read_only => true)
         book4.should be_alive
-        book4.should be_a Book
+        book4.should be_a Workbook
         book4.excel.should == book2.excel
         book4.ReadOnly.should be true
         book4.should == book2
         book4.close
-        book5 = Book.open(@simple_file1, :force => {:excel => book2}, :read_only => true)
+        book5 = Workbook.open(@simple_file1, :force => {:excel => book2}, :read_only => true)
         book5.should be_alive
-        book5.should be_a Book
+        book5.should be_a Workbook
         book5.excel.should == book2.excel
         book5.ReadOnly.should be true
         book5.should == book2
@@ -292,7 +292,7 @@ describe Book do
 
       before do
         excel = Excel.new(:reuse => false)
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -302,9 +302,9 @@ describe Book do
       it "should reopen the book in the excel instance where it was opened before" do
         excel = Excel.new(:reuse => false)
         @book.close
-        book2 = Book.open(@simple_file)
+        book2 = Workbook.open(@simple_file)
         book2.should be_alive
-        book2.should be_a Book
+        book2.should be_a Workbook
         book2.excel.should == @book.excel
         book2.excel.should_not == excel
         book2.filename.should == @book.filename
@@ -316,28 +316,28 @@ describe Book do
       it "should open a new excel, if the book cannot be reopened" do
         @book.close
         new_excel = Excel.new(:reuse => false)
-        book2 = Book.open(@different_file, :default => {:excel => :new})
+        book2 = Workbook.open(@different_file, :default => {:excel => :new})
         book2.should be_alive
-        book2.should be_a Book
+        book2.should be_a Workbook
         book2.excel.should_not == new_excel
         book2.excel.should_not == @book.excel
         book2.close
       end
 
-      it "should open in a given Excel provided as Excel, Book, or WIN32OLE representing an Excel or Workbook" do
-        book2 = Book.open(@another_simple_file)
+      it "should open in a given Excel provided as Excel, Workbook, or WIN32OLE representing an Excel or Workbook" do
+        book2 = Workbook.open(@another_simple_file)
         different_file1 = @different_file
-        book3 = Book.open(different_file1, :default => {:excel => book2.excel})
+        book3 = Workbook.open(different_file1, :default => {:excel => book2.excel})
         book3.excel.should === book2.excel
         book3.close
-        book4 = Book.open(different_file1, :default => {:excel => book2}) 
+        book4 = Workbook.open(different_file1, :default => {:excel => book2}) 
         book4.excel.should === book2.excel
         book4.close
-        book5 = Book.open(different_file1, :default_excel => book2.ole_workbook)
+        book5 = Workbook.open(different_file1, :default_excel => book2.ole_workbook)
         book5.excel.should ===  book2.excel
         book5.close
         win32ole_excel1 = WIN32OLE.connect(book2.ole_workbook.Fullname).Application
-        book6 = Book.open(different_file1, :default => {:excel => win32ole_excel1})
+        book6 = Workbook.open(different_file1, :default => {:excel => win32ole_excel1})
         book6.excel.should === book2.excel
         book6.close
       end
@@ -348,7 +348,7 @@ describe Book do
     context "with :if_unsaved" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @sheet = @book.sheet(1)
         @book.add_sheet(@sheet, :as => 'a_name')
       end
@@ -360,13 +360,13 @@ describe Book do
 
       it "should raise an error, if :if_unsaved is :raise" do
         expect {
-          @new_book = Book.open(@simple_file, :if_unsaved => :raise)
+          @new_book = Workbook.open(@simple_file, :if_unsaved => :raise)
         }.to raise_error(WorkbookNotSaved, /workbook is already open but not saved: "workbook.xls"/)
       end
 
       it "should let the book open, if :if_unsaved is :accept" do
         expect {
-          @new_book = Book.open(@simple_file, :if_unsaved => :accept)
+          @new_book = Workbook.open(@simple_file, :if_unsaved => :accept)
           }.to_not raise_error
         @book.should be_alive
         @new_book.should be_alive
@@ -385,7 +385,7 @@ describe Book do
         it "should open the new book and close the unsaved book, if user answers 'yes'" do
           # "Yes" is the  default. --> language independent
           @key_sender.puts "{enter}"
-          @new_book = Book.open(@simple_file1, :if_unsaved => :alert)
+          @new_book = Workbook.open(@simple_file1, :if_unsaved => :alert)
           @new_book.should be_alive
           @new_book.filename.downcase.should == @simple_file1.downcase
           @book.should_not be_alive
@@ -399,7 +399,7 @@ describe Book do
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
           expect{
-            Book.open(@simple_file, :if_unsaved => :alert)    
+            Workbook.open(@simple_file, :if_unsaved => :alert)    
             }.to raise_error(UnexpectedREOError)
           @book.should be_alive
         end
@@ -407,7 +407,7 @@ describe Book do
         it "should open the new book and close the unsaved book, if user answers 'yes'" do
           # "Yes" is the  default. --> language independent
           @key_sender.puts "{enter}"
-          @new_book = Book.open(@simple_file1, :if_unsaved => :excel)
+          @new_book = Workbook.open(@simple_file1, :if_unsaved => :excel)
           @new_book.should be_alive
           @new_book.filename.downcase.should == @simple_file1.downcase
           #@book.should_not be_alive
@@ -421,7 +421,7 @@ describe Book do
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
           expect{
-            Book.open(@simple_file, :if_unsaved => :excel)
+            Workbook.open(@simple_file, :if_unsaved => :excel)
           }.to raise_error(UnexpectedREOError)
           @book.should be_alive
         end
@@ -437,10 +437,10 @@ describe Book do
 
           before do   
             if i == 1 then 
-              book_before = Book.open(@simple_file)
+              book_before = Workbook.open(@simple_file)
               book_before.close
             end
-            @book = Book.open(@simple_file_other_path1)
+            @book = Workbook.open(@simple_file_other_path1)
             @sheet_count = @book.ole_workbook.Worksheets.Count
             @sheet = @book.sheet(1)
             @book.add_sheet(@sheet, :as => 'a_name')
@@ -452,11 +452,11 @@ describe Book do
           end
 
           it "should save the old book, close it, and open the new book, if :if_obstructed is :save" do
-            @new_book = Book.open(@simple_file1, :if_obstructed => :save)
+            @new_book = Workbook.open(@simple_file1, :if_obstructed => :save)
             @book.should_not be_alive
             @new_book.should be_alive
             @new_book.filename.downcase.should == @simple_file1.downcase
-            old_book = Book.open(@simple_file_other_path1, :if_obstructed => :forget)
+            old_book = Workbook.open(@simple_file_other_path1, :if_obstructed => :forget)
             old_book.ole_workbook.Worksheets.Count.should ==  @sheet_count + 1
             old_book.close
           end
@@ -464,14 +464,14 @@ describe Book do
           it "should raise an error, if the old book is unsaved, and close the old book and open the new book, 
               if :if_obstructed is :close_if_saved" do
             expect{
-              @new_book = Book.open(@simple_file1, :if_obstructed => :close_if_saved)
+              @new_book = Workbook.open(@simple_file1, :if_obstructed => :close_if_saved)
             }.to raise_error(WorkbookBlocked, /workbook with the same name in a different path is unsaved/)
             @book.save
-            @new_book = Book.open(@simple_file1, :if_obstructed => :close_if_saved)
+            @new_book = Workbook.open(@simple_file1, :if_obstructed => :close_if_saved)
             @book.should_not be_alive
             @new_book.should be_alive
             @new_book.filename.downcase.should == @simple_file1.downcase
-            old_book = Book.open(@simple_file_other_path1, :if_obstructed => :forget)
+            old_book = Workbook.open(@simple_file_other_path1, :if_obstructed => :forget)
             old_book.ole_workbook.Worksheets.Count.should ==  @sheet_count + 1
             old_book.close
           end
@@ -483,8 +483,8 @@ describe Book do
 
       it "should create a workbook" do
         File.delete @simple_save_file rescue nil
-        book = Book.open(@simple_save_file, :if_absent => :create)
-        book.should be_a Book
+        book = Workbook.open(@simple_save_file, :if_absent => :create)
+        book.should be_a Workbook
         book.close
         File.exist?(@simple_save_file).should be true
       end
@@ -492,7 +492,7 @@ describe Book do
       it "should raise an exception by default" do
         File.delete @simple_save_file rescue nil
         expect {
-          Book.open(@simple_save_file)
+          Workbook.open(@simple_save_file)
         }.to raise_error(FileNotFound, "file #{General::absolute_path(@simple_save_file).gsub("/","\\").inspect} not found")
       end
     end
@@ -500,27 +500,27 @@ describe Book do
     context "with :read_only" do
       
       it "should reopen the book with writable (unsaved changes from readonly will not be saved)" do
-        book = Book.open(@simple_file1, :read_only => true)
+        book = Workbook.open(@simple_file1, :read_only => true)
         book.ReadOnly.should be true
         book.should be_alive
         sheet = book.sheet(1)
-        old_cell_value = sheet[1,1].value
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+        old_cell_value = sheet[1,1].Value
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         book.Saved.should be false
-        new_book = Book.open(@simple_file1, :read_only => false, :if_unsaved => :accept)
+        new_book = Workbook.open(@simple_file1, :read_only => false, :if_unsaved => :accept)
         new_book.ReadOnly.should be false 
         new_book.should be_alive
         book.should be_alive   
         new_book.should == book 
         new_sheet = new_book.sheet(1)
-        new_cell_value = new_sheet[1,1].value
+        new_cell_value = new_sheet[1,1].Value
         new_cell_value.should == old_cell_value
       end
 
     context "with block" do
-      it 'block parameter should be instance of Book' do
-        Book.open(@simple_file) do |book|
-          book.should be_a Book
+      it 'block parameter should be instance of Workbook' do
+        Workbook.open(@simple_file) do |book|
+          book.should be_a Workbook
         end
       end
     end
@@ -531,7 +531,7 @@ describe Book do
     context "with standard" do
       
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -544,7 +544,7 @@ describe Book do
         @book.close
         @book.should_not be_alive
         @book.reopen
-        @book.should be_a Book
+        @book.should be_a Workbook
         @book.should be_alive
         @book.should === book1
       end
@@ -556,7 +556,7 @@ describe Book do
     context "with standard" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -565,8 +565,8 @@ describe Book do
 
       it "should uplift a workbook to a book with an open book" do
         workbook = @book.ole_workbook
-        book1 = Book.new(workbook)
-        book1.should be_a Book
+        book1 = Workbook.new(workbook)
+        book1.should be_a Workbook
         book1.should be_alive
         book1.should == @book
       end
@@ -577,41 +577,41 @@ describe Book do
 
     it "should preserve :visible if they are not set" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@simple_file)
+      book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be true
       book1.close
     end
 
     it "should preserve :visible if they are not set" do
       excel1 = Excel.create
-      book1 = Book.open(@simple_file, :visible => true)
+      book1 = Workbook.open(@simple_file, :visible => true)
       book1.excel.Visible.should be true
     end
 
     it "should preserve :visible if they are not set" do
       excel1 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :default => {:excel => :new})
+      book1 = Workbook.open(@different_file, :default => {:excel => :new})
       book1.excel.Visible.should be false
     end
 
     it "should preserve :visible if they are not set" do
       excel1 = Excel.create(:visible => true)
       excel2 = Excel.create(:visible => true)
-      book1 = Book.open(@different_file, :force => {:excel => excel2})
+      book1 = Workbook.open(@different_file, :force => {:excel => excel2})
       book1.excel.Visible.should be true
       book1.close
     end
 
-    it "should let an open Book open" do
-      @book = Book.open(@simple_file, :visible => true)
-      Book.unobtrusively(@simple_file) do |book|
-        book.should be_a Book
+    it "should let an open Workbook open" do
+      @book = Workbook.open(@simple_file, :visible => true)
+      Workbook.unobtrusively(@simple_file) do |book|
+        book.should be_a Workbook
         book.should be_alive
         book.excel.should == @book.excel
         book.excel.Visible.should be true
       end        
       @book.should be_alive
-      @book.should be_a Book
+      @book.should be_a Workbook
       @book.excel.Visible.should be true
       @book.close(:if_unsaved => :forget)
       @book2.close(:if_unsaved => :forget) rescue nil
@@ -622,10 +622,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
@@ -659,8 +659,8 @@ describe Book do
       end
 
       it "should open unobtrusively in a new Excel" do
-        Book.unobtrusively(@simple_file, :if_closed => :current) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file, :if_closed => :current) do |book|
+          book.should be_a Workbook
           book.should be_alive
             book.excel.should == @excel1
             book.excel.should_not == @excel2
@@ -668,8 +668,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
@@ -680,7 +680,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
@@ -688,51 +688,51 @@ describe Book do
         @book2.close(:if_unsaved => :forget) rescue nil
       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 workbooks 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 let a saved book saved" 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
     end
     
     context "with a closed book" do
       
       before do
-        @book = Book.open(@simple_file1)
+        @book = Workbook.open(@simple_file1)
       end
 
       after do
@@ -741,12 +741,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
-        book2 = Book.open(@simple_file1)
+        book2 = Workbook.open(@simple_file1)
         sheet = book2.sheet(1)
         sheet[1,1].Value.should_not == old_cell_value
       end
@@ -755,45 +755,45 @@ 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_file1, :keep_open => true) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file1, :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
         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_file1, :if_closed => :current) do |book|
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file1, :if_closed => :current) do |book|
+          book.should be_a Workbook
           book.should be_alive
           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_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
     end
 
@@ -801,7 +801,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
@@ -809,17 +809,17 @@ describe Book do
       end
 
       it "should open unobtrusively the book in a new Excel such that the book is writable" do
-        book2 = Book.open(@simple_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, :rw_change_excel => :new, :if_closed => :current, :writable => true) do |book|
-          book.should be_a Book
+        cell_value = sheet[1,1].Value
+        Workbook.unobtrusively(@simple_file1, :rw_change_excel => :new, :if_closed => :current, :writable => true) do |book|
+          book.should be_a Workbook
           book.excel.should_not == 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  
@@ -827,16 +827,16 @@ 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
     end
 
-    context "with a virgin Book class" do
+    context "with a virgin Workbook class" do
       before do
-        class Book  # :nodoc: #
+        class Workbook  # :nodoc: #
           @@bookstore = nil
         end
       end
@@ -847,10 +847,10 @@ describe Book do
 
     context "with a book never opened before" do
       before do
-        class Book   # :nodoc: #
+        class Workbook   # :nodoc: #
           @@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
@@ -859,7 +859,7 @@ describe Book do
 
     context "with block result" do
       before do
-        @book1 = Book.open(@simple_file)
+        @book1 = Workbook.open(@simple_file)
       end
 
       after do
@@ -868,7 +868,7 @@ describe Book do
 
       it "should yield the block result true" do
         result = 
-          Book.unobtrusively(@simple_file) do |book| 
+          Workbook.unobtrusively(@simple_file) do |book| 
             @book1.Saved.should be true
           end
         result.should == true
@@ -878,12 +878,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
@@ -891,31 +891,31 @@ 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_file) do |book| 
+        Workbook.unobtrusively(@simple_file) 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 hidden Excel" do
-        Book.unobtrusively(@simple_file, :if_closed => :current) do |book| 
+        Workbook.unobtrusively(@simple_file, :if_closed => :current) 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
       end
@@ -926,21 +926,21 @@ describe Book do
     context "with :hidden" do
 
       before do
-        @book1 = Book.open(@simple_file1)
+        @book1 = Workbook.open(@simple_file1)
         @book1.close
       end
     
       it "should create a new hidden Excel instance and use this afterwards" do
         hidden_excel = nil
-        Book.unobtrusively(@simple_file1, :hidden) do |book| 
-          book.should be_a Book
+        Workbook.unobtrusively(@simple_file1, :hidden) do |book| 
+          book.should be_a Workbook
           book.should be_alive
           book.excel.Visible.should be false
           book.excel.DisplayAlerts.should be false
           hidden_excel = book.excel
         end
-        Book.unobtrusively(@different_file, :hidden) do |book| 
-          book.should be_a Book
+        Workbook.unobtrusively(@different_file, :hidden) do |book| 
+          book.should be_a Workbook
           book.should be_alive
           book.excel.Visible.should be false
           book.excel.DisplayAlerts.should be false
@@ -956,24 +956,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_file) do |book|
-          book.should be_a Book
+        Workbook.for_reading(@simple_file) 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
@@ -981,28 +981,28 @@ describe Book do
 
       it "should not change the value and use the hidden 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_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
@@ -1013,7 +1013,7 @@ describe Book do
 
     context "with standard" do
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -1029,7 +1029,7 @@ describe Book do
   describe "nameval, set_nameval, [], []=" do
   
     before do
-      @book1 = Book.open(@another_simple_file)
+      @book1 = Workbook.open(@another_simple_file)
     end
 
     after do
@@ -1082,7 +1082,7 @@ describe Book do
 
     context "with unsaved read_only book" do
       before do
-        @book = Book.open(@simple_file, :read_only => true)
+        @book = Workbook.open(@simple_file, :read_only => true)
         @sheet_count = @book.ole_workbook.Worksheets.Count
         @book.add_sheet(@sheet, :as => 'a_name')
       end
@@ -1091,7 +1091,7 @@ describe Book do
         expect{
           @book.close
           }.to_not raise_error
-        new_book = Book.open(@simple_file)
+        new_book = Workbook.open(@simple_file)
         new_book.ole_workbook.Worksheets.Count.should ==  @sheet_count
         new_book.close
       end
@@ -1099,7 +1099,7 @@ describe Book do
 
     context "with unsaved book" do
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
         @sheet_count = @book.ole_workbook.Worksheets.Count
         @book.add_sheet(@sheet, :as => 'a_name')
         @sheet = @book.sheet(1)
@@ -1125,7 +1125,7 @@ describe Book do
         @book.should_not be_alive
         #expect{
          # ole_workbook.Name}.to raise_error(WIN32OLERuntimeError)
-        new_book = Book.open(@simple_file)
+        new_book = Workbook.open(@simple_file)
         begin
           new_book.ole_workbook.Worksheets.Count.should == @sheet_count + 1
         ensure
@@ -1140,7 +1140,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 {
@@ -1153,7 +1153,7 @@ describe Book do
 
     context "with argument" do
       before do
-        Book.open(@simple_file) do |book|
+        Workbook.open(@simple_file) do |book|
           book.save_as(@simple_save_file, :if_exists => :overwrite)
         end
       end
@@ -1169,7 +1169,7 @@ describe Book do
     context "with alive?" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -1190,7 +1190,7 @@ describe Book do
     context "with filename" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -1206,7 +1206,7 @@ describe Book do
     context "with ==" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -1215,7 +1215,7 @@ describe Book do
       end
 
       it "should be true with two identical books" do
-        @new_book = Book.open(@simple_file)
+        @new_book = Workbook.open(@simple_file)
         @new_book.should == @book
       end
     end
@@ -1224,8 +1224,8 @@ describe Book do
 
       before do
         @key_sender = IO.popen  'ruby "' + File.join(File.dirname(__FILE__), '/helpers/key_sender.rb') + '" "Microsoft Excel" '  , "w"        
-        @book = Book.open(@simple_file, :visible => true)
-        @book2 = Book.open(@another_simple_file, :visible => true)
+        @book = Workbook.open(@simple_file, :visible => true)
+        @book2 = Workbook.open(@another_simple_file, :visible => true)
       end
 
       after do
@@ -1262,7 +1262,7 @@ describe Book do
 
   describe "#add_sheet" do
     before do
-      @book = Book.open(@simple_file)
+      @book = Workbook.open(@simple_file)
       @sheet = @book.sheet(1)
     end
 
@@ -1327,7 +1327,7 @@ describe Book do
 
   describe 'access sheet' do
     before do
-      @book = Book.open(@simple_file)
+      @book = Workbook.open(@simple_file)
     end
 
     after do
@@ -1337,22 +1337,22 @@ describe Book do
     context "standard" do
 
       it 'with sheet name' do
-        @book.sheet('Sheet1').should be_kind_of Sheet
+        @book.sheet('Sheet1').should be_kind_of Worksheet
       end
 
       it 'with integer' do
-        @book.sheet(1).should be_kind_of Sheet
+        @book.sheet(1).should be_kind_of Worksheet
       end
 
       it 'with block' do
         @book.each do |sheet|
-          sheet.should be_kind_of Sheet
+          sheet.should be_kind_of Worksheet
         end
       end
 
       it 'with each_with_index' do
         @book.each_with_index do |sheet,i|
-          sheet.should be_kind_of Sheet
+          sheet.should be_kind_of Worksheet
         end
       end
     end
@@ -1360,7 +1360,7 @@ describe Book do
     describe "with retain_saved" do
 
       before do
-        @book = Book.open(@simple_file)
+        @book = Workbook.open(@simple_file)
       end
 
       after do
@@ -1369,7 +1369,7 @@ describe Book do
 
       it "should keep the save state 'unsaved'" do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         @book.Saved.should be false
         @book.retain_saved do
           sheet = @book.sheet(1)
@@ -1381,7 +1381,7 @@ describe Book do
 
       it "should keep the save state 'unsaved' even when the workbook was saved before" do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         @book.Saved.should be false
         @book.retain_saved do
           @book.save
@@ -1395,16 +1395,16 @@ describe Book do
     context "with test what happens with save-status when setting calculation status" do
 
       it "should keep the save status" do
-        book1 = Book.open(@simple_file, :visible => true)
+        book1 = Workbook.open(@simple_file, :visible => true)
         book1.Saved.should be true
-        book2 = Book.open(@another_simple_file, :visible => true)
+        book2 = Workbook.open(@another_simple_file, :visible => true)
         book1.Saved.should be true
         book2.Saved.should be true
         sheet2 = book2.sheet(1)
-        sheet2[1,1] = sheet2[1,1].value == "foo" ? "bar" : "foo"
+        sheet2[1,1] = sheet2[1,1].Value == "foo" ? "bar" : "foo"
         book1.Saved.should be true
         book2.Saved.should be false
-        book3 = Book.open(@different_file, :visible => true)
+        book3 = Workbook.open(@different_file, :visible => true)
         book1.Saved.should be true
         book2.Saved.should be false
         book3.Saved.should be true
@@ -1414,8 +1414,8 @@ describe Book do
 
     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
         end
       }
     end