robust_excel_ole 1.27 → 1.32

data/lib/spec_helper.rb

@@ -2,7 +2,7 @@
 require 'rspec'
 require 'tmpdir'
 require 'fileutils'
-require File.join(File.dirname(__FILE__), '../lib/robust_excel_ole')
+require_relative '../lib/robust_excel_ole'
 
 # @private
 module RobustExcelOle::SpecHelpers

data/robust_excel_ole.gemspec

@@ -33,8 +33,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency "pry", '>= 0.12.1'
-  s.add_runtime_dependency "pry-bond", '>=0.0.1'
-  s.add_development_dependency "rspec", '>= 2.6.0'
+  s.add_runtime_dependency 'win32api', '~> 0.1'
+  s.add_runtime_dependency 'pry', '~> 0.12', '>= 0.12.1'
+  s.add_runtime_dependency 'pry-bond', '~> 0.0', '>= 0.0.1'
+  s.add_development_dependency 'rspec', '~> 2.6', '>= 2.6.0'
   s.required_ruby_version = '>= 2.1'
 end

data/spec/address_tool_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-require File.join(File.dirname(__FILE__), './spec_helper')
-require File.expand_path( '../../lib/robust_excel_ole/base', __FILE__)
+require_relative 'spec_helper'
+require_relative '../lib/robust_excel_ole/base'
 
 $VERBOSE = nil
 

data/spec/base_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-require File.join(File.dirname(__FILE__), './spec_helper')
-require File.expand_path( '../../lib/robust_excel_ole/base', __FILE__)
+require_relative 'spec_helper'
+require_relative '../lib/robust_excel_ole/base'
 
 $VERBOSE = nil
 
@@ -36,19 +36,6 @@ module RobustExcelOle
       rm_tmp(@dir)
     end
 
-    describe "trace" do
-
-      it "should put some number" do
-        a = 4
-        Base::trace "some text #{a}"
-      end
-
-      it "should put another text" do
-        b = Workbook.open(@simple_file)
-        Base::trace "book: #{b}"
-      end
-    end
-
     describe "own_methods" do
 
       before do
@@ -57,8 +44,8 @@ module RobustExcelOle
           ["Activate", "ActiveSheet", "Application", "Close", "FullName", "HasPassword", "Name", "Names", 
             "Password", "Protect", "ProtectSharing", "ProtectStructure", "Protect", "ReadOnly", "Save", 
             "SaveAs", "Saved", "Sheets", "Unprotect"]
-        @book_methods = ["focus", "add_sheet", "alive?", "close", "filename", "namevalue", "ole_object", 
-                         "ole_workbook", "reopen", "save", "save_as", "saved", "set_namevalue"]
+        @book_methods = ["focus", "add_sheet", "alive?", "close", "filename", "ole_object", 
+                         "ole_workbook", "reopen", "save", "save_as", "saved"]
         @ole_excel_methods = 
           ["ActiveCell", "ActiveSheet", "ActiveWorkbook", "Application",  "Calculate", "Cells", "Columns",
             "DisplayAlerts", "Evaluate", "Hwnd", "Name", "Names", "Quit", "Range", "Ready", "Save", 
@@ -82,6 +69,21 @@ module RobustExcelOle
 
     end
 
+    describe "trace" do
+
+      it "should put some number" do
+        a = 4
+        Base::trace "some text #{a}"
+      end
+
+      it "should put another text" do
+        b = Workbook.open(@simple_file)
+        Base::trace "book: #{b}"
+      end
+    end
+
+    
+
     describe "misc" do
 
       it "should" do

data/spec/bookstore_spec.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-require File.join(File.dirname(__FILE__), './spec_helper')
+require_relative 'spec_helper'
 
 =begin
 RSpec.configure do |config|
@@ -419,7 +419,7 @@ describe Bookstore do
         @bookstore.store(@book2)
         @bookstore.store(@book3)
         sheet = @book3.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         @book.ReadOnly.should be true
         @book2.ReadOnly.should be false
         @book3.ReadOnly.should be true
@@ -560,8 +560,7 @@ describe Bookstore do
     end
 
     it "should show books" do
-      expect{
-        @bookstore.books}.to_not raise_error
+      @bookstore.books.should == [@book, @book2]
     end
 
   end

data/spec/cell_spec.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.join(File.dirname(__FILE__), './spec_helper')
+require_relative 'spec_helper'
 
 include RobustExcelOle
 include General
@@ -19,7 +19,7 @@ describe Cell do
     @merge_cells_file = @dir + '/merge_cells.xls'
     @book = Workbook.open(@simple_file)
     @sheet = @book.sheet(1)
-    @cell = @sheet[1, 1]
+    @cell = @sheet.range([1, 1])
   end
 
   after do
@@ -55,7 +55,7 @@ describe Cell do
     before do
       @book1 = Workbook.open(@dir + '/workbook.xls')
       @sheet1 = @book1.sheet(1)
-      @cell1 = @sheet1[1,1]
+      @cell1 = @sheet1.range([1,1])
     end
 
     after do
@@ -76,22 +76,22 @@ describe Cell do
     end
 
     it "merged cell get same value" do
-      @sheet[1, 1].Value.should be_nil
-      @sheet[2, 1].Value.should eq 'first merged'
+      @sheet[1, 1].should be_nil
+      @sheet[2, 1].should eq 'first merged'
     end
 
     it "set merged cell" do
-      @sheet[2, 1].Value = "set merge cell"
-      @sheet[2, 1].Value.should eq "set merge cell"
-      @sheet[2, 2].Value.should eq "set merge cell"
+      @sheet[2, 1] = "set merge cell"
+      @sheet[2, 1].should eq "set merge cell"
+      @sheet[2, 2].should eq "set merge cell"
     end
   end
 
   describe "==" do
 
     it "should check equality of cells" do
-      @cell.should == @sheet[1,1]
-      @cell.should_not == @sheet[1,2]
+      @cell.should == @sheet.range([1,1])
+      @cell.should_not == @sheet.range([1,2])
     end
 
   end

data/spec/cygwin_spec.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.join(File.dirname(__FILE__), './spec_helper')
+require_relative 'spec_helper'
 
 describe "on cygwin",  :if => RUBY_PLATFORM =~ /cygwin/ do
   describe ".cygpath" do

data/spec/excel_spec.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-require File.join(File.dirname(__FILE__), './spec_helper')
+require_relative 'spec_helper'
 
 $VERBOSE = nil
 
@@ -154,7 +154,7 @@ module RobustExcelOle
         excel1.should_not be_alive
         excel2.should be_alive
         excel2.ole_excel.Hwnd.should == @ole_excel1.Hwnd
-        Excel.excels_number.should == 2
+        Excel.instance_count.should == 2
       end
 
       it "should make the Excel instance not alive if the Excel that was connected with was closed" do
@@ -219,7 +219,7 @@ module RobustExcelOle
         excel1.should be_alive
         excel1.ole_excel.Hwnd.should_not == @ole_excel1.Hwnd
         excel1.ole_excel.Hwnd.should_not == @ole_excel2.Hwnd
-        Excel.excels_number.should == 3
+        Excel.instance_count.should == 3
       end
 
     end
@@ -378,7 +378,7 @@ module RobustExcelOle
         excel2 = Excel.current
         excel1.should_not be_alive
         excel2.should be_alive
-        Excel.excels_number.should == 1
+        Excel.instance_count.should == 1
       end
 
       it "should make the Excel instance not alive if the Excel that was connected with was closed" do
@@ -389,7 +389,7 @@ module RobustExcelOle
         excel1.should_not be_alive
         excel2.should_not be_alive
         sleep 0.2
-        Excel.excels_number.should == 0
+        Excel.instance_count.should == 0
       end
 
       it "should reuse the first opened Excel instance if not the first opened Excel instance was closed" do
@@ -417,11 +417,11 @@ module RobustExcelOle
       it "should return right number of excel instances" do
         Excel.kill_all
         sleep 0.2
-        n1 = Excel.excels_number
+        n1 = Excel.instance_count
         e1 = Excel.create
-        Excel.excels_number.should == n1 + 1
+        Excel.instance_count.should == n1 + 1
         e2 = Excel.create
-        Excel.excels_number.should == n1 + 2
+        Excel.instance_count.should == n1 + 2
       end
     end
 
@@ -611,8 +611,8 @@ module RobustExcelOle
             book1 = Workbook.open(@simple_file1, :visible => true)
             @excel1 = book1.excel
             sheet1 = book1.sheet(1)
-            @old_cell_value1 = sheet1[1,1].Value
-            sheet1[1,1] = sheet1[1,1].Value == "foo" ? "bar" : "foo"
+            @old_cell_value1 = sheet1[1,1]
+            sheet1[1,1] = sheet1[1,1] == "foo" ? "bar" : "foo"
             book1.Saved.should be false
           end
 
@@ -622,7 +622,7 @@ module RobustExcelOle
             @excel1.should_not be_alive
             new_book1 = Workbook.open(@simple_file1)
             new_sheet1 = new_book1.sheet(1)
-            new_sheet1[1,1].Value.should_not == @old_cell_value1
+            new_sheet1[1,1].should_not == @old_cell_value1
             new_book1.close
             result.should == [1,0]
           end
@@ -633,7 +633,7 @@ module RobustExcelOle
             @excel1.should_not be_alive
             new_book1 = Workbook.open(@simple_file1)
             new_sheet1 = new_book1.sheet(1)
-            new_sheet1[1,1].Value.should == @old_cell_value1
+            new_sheet1[1,1].should == @old_cell_value1
             new_book1.close
             result.should == [1,0]
           end
@@ -647,8 +647,8 @@ module RobustExcelOle
             @excel1 = book1.excel
             @excel2 = book2.excel
             sheet2 = book2.sheet(1)
-            @old_cell_value2 = sheet2[1,1].Value
-            sheet2[1,1] = sheet2[1,1].Value == "foo" ? "bar" : "foo"            
+            @old_cell_value2 = sheet2[1,1]
+            sheet2[1,1] = sheet2[1,1] == "foo" ? "bar" : "foo"            
           end
 
           it "should close the first Excel without unsaved workbooks and then raise an error" do
@@ -684,7 +684,7 @@ module RobustExcelOle
             @excel2.should_not be_alive
             new_book2 = Workbook.open(@different_file1)
             new_sheet2 = new_book2.sheet(1)
-            new_sheet2[1,1].Value.should_not == @old_cell_value2
+            new_sheet2[1,1].should_not == @old_cell_value2
             new_book2.close
             result.should == [2,0]
           end
@@ -696,7 +696,7 @@ module RobustExcelOle
             @excel2.should_not be_alive
             new_book2 = Workbook.open(@different_file1)
             new_sheet2 = new_book2.sheet(1)
-            new_sheet2[1,1].Value.should == @old_cell_value2
+            new_sheet2[1,1].should == @old_cell_value2
             new_book2.close
             result.should == [2,0]
           end       
@@ -714,7 +714,7 @@ module RobustExcelOle
             @book1 = Workbook.open(@simple_file1, :force_excel => :new)
             @book2 = Workbook.open(@another_simple_file, :force_excel => :new) 
             @book3 = Workbook.open(@different_file, :force_excel => :new)
-            old_cell_value1 = @book2.sheet(1)[1,1].Value                 
+            old_cell_value1 = @book2.sheet(1)[1,1]              
             @book2.sheet(1)[1,1] = old_cell_value1 == "foo" ? "bar" : "foo"
           end
 
@@ -739,7 +739,7 @@ module RobustExcelOle
             @book1 = Workbook.open(@simple_file1, :force_excel => :new)
             @book2 = Workbook.open(@another_simple_file, :force_excel => :new) 
             @book3 = Workbook.open(@different_file, :force_excel => :new)
-            old_cell_value1 = @book2.sheet(1)[1,1].Value                 
+            old_cell_value1 = @book2.sheet(1)[1,1]                
             @book2.sheet(1)[1,1] = old_cell_value1 == "foo" ? "bar" : "foo"
           end
 
@@ -808,12 +808,12 @@ module RobustExcelOle
           @excel = Excel.create
           @book = Workbook.open(@simple_file)
           sheet = @book.sheet(1)
-          @old_cell_value = sheet[1,1].Value
-          sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+          @old_cell_value = sheet[1,1]
+          sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
           @book2 = Workbook.open(@another_simple_file)
           sheet2 = @book2.sheet(1)
-          @old_cell_value2 = sheet2[1,1].Value
-          sheet2[1,1] = sheet2[1,1].Value == "foo" ? "bar" : "foo"
+          @old_cell_value2 = sheet2[1,1]
+          sheet2[1,1] = sheet2[1,1] == "foo" ? "bar" : "foo"
           @excel.should be_alive
           @book.should be_alive
           @book.saved.should be false
@@ -840,7 +840,7 @@ module RobustExcelOle
           result.should == 1
           new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].Value.should == @old_cell_value
+          new_sheet[1,1].should == @old_cell_value
           new_book.close          
         end
         
@@ -854,7 +854,7 @@ module RobustExcelOle
           @excel.should_not be_alive
           new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].Value.should == @old_cell_value
+          new_sheet[1,1].should == @old_cell_value
           new_book.close          
         end
 
@@ -866,7 +866,7 @@ module RobustExcelOle
           @excel.should_not be_alive
           new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].Value.should_not == @old_cell_value
+          new_sheet[1,1].should_not == @old_cell_value
           new_book.close          
         end
 
@@ -884,8 +884,8 @@ module RobustExcelOle
           @excel = Excel.create(:visible => true)
           @book = Workbook.open(@simple_file, :visible => true)
           sheet = @book.sheet(1)
-          @old_cell_value = sheet[1,1].Value
-          sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+          @old_cell_value = sheet[1,1]
+          sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         end
 
         after do
@@ -903,7 +903,7 @@ module RobustExcelOle
           result.should == 1
           new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].Value.should_not == @old_cell_value
+          new_sheet[1,1].should_not == @old_cell_value
           new_book.close   
         end
 
@@ -918,7 +918,7 @@ module RobustExcelOle
           @book.should_not be_alive
           new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].Value.should == @old_cell_value
+          new_sheet[1,1].should == @old_cell_value
           new_book.close     
         end
 
@@ -944,11 +944,11 @@ module RobustExcelOle
         before do
           @book = Workbook.open(@simple_file)
           sheet = @book.sheet(1)
-          @old_cell_value = sheet[1,1].Value
-          sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"          
+          @old_cell_value = sheet[1,1]
+          sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"          
           @book3 = Workbook.open(@different_file, :read_only => true)
           sheet3 = @book3.sheet(1)
-          sheet3[1,1] = sheet3[1,1].Value == "foo" ? "bar" : "foo"
+          sheet3[1,1] = sheet3[1,1] == "foo" ? "bar" : "foo"
           @excel = @book.excel
           @book2 = Workbook.open(@another_simple_file, :force_excel => :new)
         end
@@ -978,7 +978,7 @@ module RobustExcelOle
           @excel.Workbooks.Count.should == 0          
           new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].Value.should == @old_cell_value
+          new_sheet[1,1].should == @old_cell_value
           new_book.close          
         end
 
@@ -989,7 +989,7 @@ module RobustExcelOle
           @excel.Workbooks.Count.should == 0          
           new_book = Workbook.open(@simple_file)
           new_sheet = new_book.sheet(1)
-          new_sheet[1,1].Value.should_not == @old_cell_value
+          new_sheet[1,1].should_not == @old_cell_value
           new_book.close          
         end
 
@@ -1038,10 +1038,10 @@ module RobustExcelOle
         before do
           @book = Workbook.open(@simple_file)
           sheet = @book.sheet(1)
-          sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"          
+          sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"          
           @book3 = Workbook.open(@different_file, :read_only => true)
           sheet3 = @book3.sheet(1)
-          sheet3[1,1] = sheet3[1,1].Value == "foo" ? "bar" : "foo"
+          sheet3[1,1] = sheet3[1,1] == "foo" ? "bar" : "foo"
           @book.Saved.should be false
           @book3.Saved.should be false
         end
@@ -1060,20 +1060,39 @@ module RobustExcelOle
       end
     end
 
-    describe "workbooks, each, each_with_index" do
+    describe "each, each_with_index, workbooks" do
 
-      before do
+       before do
         @excel = Excel.create
-        @book1 = Workbook.open(@simple_file)
-        @book2 = Workbook.open(@different_file)
+      end
+
+      it "should yield empty list" do
+        @excel.count.should == 0
+        @excel.workbooks.should be_empty
       end
 
       it "should list workbooks" do
+        @book1 = Workbook.open(@simple_file)
+        @book2 = Workbook.open(@different_file)
         workbooks = @excel.workbooks
         workbooks.should == [@book1,@book2]
       end
 
+      it "should concatenate" do
+        @book1 = Workbook.open(@simple_file)
+        @book2 = Workbook.open(@different_file)
+        i = 0
+        @excel.each.with_index do |workbook,i|
+          workbook.should be_alive
+          workbook.should be_a Workbook
+          workbook.filename.should == @simple_file if i == 0
+          workbook.filename.should == @different_file if i == 1
+        end
+      end
+
       it "should each_workbook" do
+        @book1 = Workbook.open(@simple_file)
+        @book2 = Workbook.open(@different_file)
         i = 0
         @excel.each_workbook do |workbook|
           workbook.should be_alive
@@ -1085,6 +1104,9 @@ module RobustExcelOle
       end
 
       it "should each_workbook_with_index" do
+        @book1 = Workbook.open(@simple_file)
+        @book2 = Workbook.open(@different_file)
+        i = 0
         @excel.each_workbook_with_index do |workbook,i|
           workbook.should be_alive
           workbook.should be_a Workbook
@@ -1094,6 +1116,8 @@ module RobustExcelOle
       end
 
       it "should each_workbook with options" do
+        @book1 = Workbook.open(@simple_file)
+        @book2 = Workbook.open(@different_file)
         i = 0
         @excel.each_workbook(:visible => true) do |workbook|
           workbook.should be_alive
@@ -1106,6 +1130,8 @@ module RobustExcelOle
       end
 
       it "should set options" do
+        @book1 = Workbook.open(@simple_file)
+        @book2 = Workbook.open(@different_file)
         @excel.each_workbook(:visible => true)
         [1,2].each do |i|
           ole_workbook = @excel.Workbooks.Item(i) 
@@ -1113,7 +1139,6 @@ module RobustExcelOle
         end
       end
 
-
     end
 
     describe "unsaved_known_workbooks" do
@@ -1124,32 +1149,24 @@ module RobustExcelOle
 
       it "should return empty list for first Excel instance" do
         book = Workbook.open(@simple_file)
-        Excel.unsaved_known_workbooks.should == [[]]
+        Excel.unsaved_known_workbooks.should be_empty
         book.close
       end
        
       it "should return one unsaved book" do
         book = Workbook.open(@simple_file)
         sheet = book.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
-        # Excel.unsaved_known_workbooks.should == [[book.ole_workbook]]
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         unsaved_known_wbs = Excel.unsaved_known_workbooks
         unsaved_known_wbs.size.should == 1
-        unsaved_known_wbs.each do |ole_wb_list|
-          ole_wb_list.size.should == 1
-          ole_wb_list.each do |ole_workbook|
-            ole_workbook.Fullname.tr('\\','/').should == @simple_file  
-          end
+        unsaved_known_wbs.each do |ole_wb|
+          ole_wb.Fullname.tr('\\','/').should == @simple_file  
         end
         book2 = Workbook.open(@another_simple_file)
-        # Excel.unsaved_known_workbooks.should == [[book.ole_workbook]]
         unsaved_known_wbs = Excel.unsaved_known_workbooks
         unsaved_known_wbs.size.should == 1
-        unsaved_known_wbs.each do |ole_wb_list|
-          ole_wb_list.size.should == 1
-          ole_wb_list.each do |ole_workbook|
-            ole_workbook.Fullname.tr('\\','/').should == @simple_file  
-          end
+        unsaved_known_wbs.each do |ole_wb|
+          ole_wb.Fullname.tr('\\','/').should == @simple_file  
         end        
         book2.close
         book.close(:if_unsaved => :forget)
@@ -1158,18 +1175,15 @@ module RobustExcelOle
       it "should return two unsaved books" do
         book = Workbook.open(@simple_file)
         sheet = book.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         book2 = Workbook.open(@another_simple_file)
         sheet2 = book2.sheet(1)
-        sheet2[1,1] = sheet2[1,1].Value == "foo" ? "bar" : "foo"
-        #Excel.unsaved_known_workbooks.should == [[book.ole_workbook, book2.ole_workbook]]
+        sheet2[1,1] = sheet2[1,1] == "foo" ? "bar" : "foo"
         unsaved_known_wbs = Excel.unsaved_known_workbooks
-        unsaved_known_wbs.size.should == 1
-        unsaved_known_wbs.each do |ole_wb_list|
-          ole_wb_list.size.should == 2
-          ole_workbook1, ole_workbook2 = ole_wb_list
-          ole_workbook1.Fullname.tr('\\','/').should == @simple_file  
-          ole_workbook2.Fullname.tr('\\','/').should == @another_simple_file  
+        unsaved_known_wbs.size.should == 2
+        unsaved_known_wbs.each_with_index do |ole_wb, ind|
+          ole_wb.Fullname.tr('\\','/').should == @simple_file if ind == 0 
+          ole_wb.Fullname.tr('\\','/').should == @another_simple_file  if ind == 1
         end        
         book2.close(:if_unsaved => :forget)
         book.close(:if_unsaved => :forget)
@@ -1182,9 +1196,8 @@ module RobustExcelOle
         begin 
           open_books.each do |wb|
             sheet = wb.sheet(1)
-            sheet[1,1] = (sheet[1,1].Value == "foo") ? "bar" : "foo"
+            sheet[1,1] = (sheet[1,1] == "foo") ? "bar" : "foo"
           end 
-        #Excel.unsaved_known_workbooks.should == [[book.ole_workbook], [book2.ole_workbook]]
           unsaved_known_wbs = Excel.unsaved_known_workbooks
           unsaved_known_wbs.size.should == 2
           unsaved_known_wbs.flatten.map{|ole_wb| ole_wb.Fullname.tr('\\','/') }.sort.should == open_books.map{|b| b.filename}.sort
@@ -1809,7 +1822,7 @@ module RobustExcelOle
 
     end
 
-    describe "for_this_instance" do
+    describe "set_options" do
 
       before do
         @excel = Excel.new(:reuse => false)
@@ -1819,7 +1832,7 @@ module RobustExcelOle
       end
 
       it "should set options in the Excel instance" do
-        @excel.for_this_instance(:displayalerts => true, :visible => true, :screenupdating => true, :calculation => :manual)
+        @excel.set_options(:displayalerts => true, :visible => true, :screenupdating => true, :calculation => :manual)
         @excel.DisplayAlerts.should be true
         @excel.Visible.should be true
         @excel.ScreenUpdating.should be true
@@ -1832,25 +1845,25 @@ module RobustExcelOle
 
     end
 
-    context "for_all_workbooks" do
+    context "each_workbook" do
 
       it "should not raise an error for an empty Excel instance" do
         excel = Excel.create
         expect{
-          excel.for_all_workbooks(:visible => true, :read_only => true, :check_compatibility => true)
+          excel.each_workbook(:visible => true, :read_only => true, :check_compatibility => true)
         }.to_not raise_error
       end
 
       it "should set options to true for a workbook" do
         book1 = Workbook.open(@simple_file1)
         excel1 = book1.excel
-        excel1.for_all_workbooks(:visible => true, :read_only => true, :check_compatibility => true)
+        excel1.each_workbook(:visible => true, :read_only => true, :check_compatibility => true)
         excel1.Visible.should be true
         ole_workbook1 = book1.ole_workbook
         ole_workbook1.Windows(ole_workbook1.Name).Visible.should be true
         ole_workbook1.ReadOnly.should be true
         ole_workbook1.CheckCompatibility.should be true
-        excel1.for_all_workbooks(:visible => false, :read_only => false, :check_compatibility => false)
+        excel1.each_workbook(:visible => false, :read_only => false, :check_compatibility => false)
         excel1.Visible.should be true
         ole_workbook1 = book1.ole_workbook
         ole_workbook1.Windows(ole_workbook1.Name).Visible.should be false
@@ -1862,7 +1875,7 @@ module RobustExcelOle
         book1 = Workbook.open(@simple_file1)
         book2 = Workbook.open(@different_file1)
         excel = book1.excel
-        excel.for_all_workbooks(:visible => true, :check_compatibility => true, :read_only => true)
+        excel.each_workbook(:visible => true, :check_compatibility => true, :read_only => true)
         excel.Visible.should be true
         ole_workbook1 = book1.ole_workbook
         ole_workbook2 = book2.ole_workbook
@@ -1872,7 +1885,7 @@ module RobustExcelOle
         ole_workbook2.CheckCompatibility.should be true
         ole_workbook1.ReadOnly.should be true
         ole_workbook2.ReadOnly.should be true    
-        excel.for_all_workbooks(:visible => false, :check_compatibility => false, :read_only => false)
+        excel.each_workbook(:visible => false, :check_compatibility => false, :read_only => false)
         excel.Visible.should be true
         ole_workbook1 = book1.ole_workbook
         ole_workbook2 = book2.ole_workbook
@@ -1886,29 +1899,46 @@ module RobustExcelOle
 
     end
 
-    describe "known_excel_instances" do
+    describe "known_running_instance" do
+
+      before do
+        @excel1 = Excel.create
+        @excel2 = Excel.create
+      end
+
+      it "should yield an Excel instance" do
+        Excel.known_running_instance.should == @excel1
+      end
+
+    end
+
+    describe "known_running_instances" do
 
       it "should return empty list" do
-        Excel.known_excel_instances.should be_empty
+        Excel.known_running_instances.size.should == 0
       end
 
       it "should return list of one Excel process" do
         excel = Excel.new
-        Excel.known_excel_instances.should == [excel]
-        excel.close
+        excel_instances = Excel.known_running_instances
+        excel_instances.size.should == 1
+        excel_instances.first.should == excel
+        excel_instances.to_a.should == [excel]
+        res = []
+        excel_instances.each.with_index{|e,i| res << [e,i]}
+        res.should == [[excel,0]]
       end
 
       it "should return list of two Excel processes" do
         excel1 = Excel.create
         excel2 = Excel.create
-        Excel.known_excel_instances.should == [excel1,excel2]
-      end
-
-      it "should return list of two Excel processes" do
-        excel1 = Excel.new
-        excel2 = Excel.current
-        excel3 = Excel.create
-        Excel.known_excel_instances.should == [excel1,excel3]
+        excel_instances = Excel.known_running_instances
+        excel_instances.size.should == 2
+        excel_instances.first.should == excel1
+        excel_instances.to_a.should == [excel1, excel2]
+        res = []
+        excel_instances.each.with_index{|e,i| res << [e,i]}
+        res.should == [[excel1,0],[excel2,1]]
       end
 
     end
@@ -1969,6 +1999,23 @@ module RobustExcelOle
       end
 =end
     end
+
+    describe "set_options" do
+
+      before do
+        workbook = Workbook.open(@simple_file1, visible: false)
+        @excel1 = workbook.excel
+      end
+
+      it "should set options" do
+        @excel1.DisplayAlerts.should be false
+        @excel1.Visible.should be false
+        @excel1.set_options(displayalerts: true, visible: true)
+        @excel1.DisplayAlerts.should be true
+        @excel1.Visible.should be true
+      end
+
+    end
     
     describe "generate workbook" do