robust_excel_ole 1.27 → 1.32

data/spec/spec_helper.rb

@@ -2,10 +2,24 @@
 require "rspec"
 require 'tmpdir'
 require "fileutils"
-require File.join(File.dirname(__FILE__), '../lib/robust_excel_ole')
+require_relative '../lib/robust_excel_ole'
+
+class Object
+
+  def encode_value
+    if self.respond_to?(:gsub)
+      encode('utf-8')
+    elsif self.respond_to?(:keys)
+      transform_values!{ |value| value.respond_to?(:gsub) ? value.encode('utf-8') : value}
+    elsif self.respond_to?(:pop)
+      map{|v| v.respond_to?(:gsub) ? v.encode('utf-8') : v}
+    end
+  end
+
+end
 
 # @private
-module RobustExcelOle::SpecHelpers
+module RobustExcelOle::SpecHelpers  
 
   def create_tmpdir     
     tmpdir = Dir.mktmpdir

data/spec/workbook_spec.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-require File.join(File.dirname(__FILE__), './spec_helper')
+require_relative 'spec_helper'
 require 'pathname'
 
 $VERBOSE = nil
@@ -111,7 +111,7 @@ describe Workbook do
           book.should be_alive
           book.should be_a Workbook
           book.excel.ole_excel.Hwnd.should == @ole_wb.Application.Hwnd
-          Excel.excels_number.should == 1
+          Excel.instance_count.should == 1
         end
       end
     end
@@ -467,10 +467,11 @@ describe Workbook do
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
-          expect{
+          #expect{
             Workbook.open(@simple_file, :if_unsaved => :alert)    
-            }.to raise_error(UnexpectedREOError)
+          #  }.to raise_error(UnexpectedREOError)
           @book.should be_alive
+          @book.Saved.should be false
         end
 
         it "should open the new book and close the unsaved book, if user answers 'yes'" do
@@ -489,10 +490,11 @@ describe Workbook do
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
           @key_sender.puts "{right}{enter}"
-          expect{
+          #expect{
             Workbook.open(@simple_file, :if_unsaved => :excel)
-          }.to raise_error(UnexpectedREOError)
+          #}.to raise_error(UnexpectedREOError)
           @book.should be_alive
+          @book.Saved.should be false
         end
 
       end
@@ -634,15 +636,15 @@ describe Workbook do
         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]
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         book.Saved.should be false
         new_book = Workbook.open(@simple_file1, :read_only => false, :if_unsaved => :forget)
         new_book.ReadOnly.should be false 
         new_book.should be_alive
         book.should_not be_alive   
         new_sheet = new_book.sheet(1)
-        new_cell_value = new_sheet[1,1].Value
+        new_cell_value = new_sheet[1,1]
         new_cell_value.should == old_cell_value
       end
 
@@ -757,7 +759,7 @@ describe Workbook do
       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] == "foo" ? "bar" : "foo"
         book.should be_alive
         book.Saved.should be false
       end
@@ -838,18 +840,18 @@ describe Workbook 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]
         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].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] == "foo" ? "bar" : "foo"
+        old_cell_value = sheet[1,1]
         @book.Saved.should be false
         unobtrusively_ok?
         @book.should be_alive
@@ -857,7 +859,7 @@ describe Workbook do
         @book.close(:if_unsaved => :forget)
         @book2 = Workbook.open(@simple_file1)
         sheet2 = @book2.sheet(1)
-        sheet2[1,1].Value.should_not == old_cell_value
+        sheet2[1,1].should_not == old_cell_value
       end
     end
     
@@ -873,21 +875,21 @@ describe Workbook 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]
         @book.close
         @book.should_not be_alive
         unobtrusively_ok?
         @book.should_not be_alive
         book2 = Workbook.open(@simple_file1)
         sheet = book2.sheet(1)
-        sheet[1,1].Value.should_not == old_cell_value
+        sheet[1,1].should_not == old_cell_value
       end
 
       # The bold reanimation of the @book
       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]
         @book.close
         @book.should_not be_alive
         Workbook.unobtrusively(@simple_file1, :keep_open => true) do |book|
@@ -895,7 +897,7 @@ describe Workbook do
           book.excel.should == @book.excel
           book.excel.should_not == excel
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
@@ -903,13 +905,13 @@ describe Workbook do
         @book.close
         new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should_not == old_cell_value
+        sheet[1,1].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]
         @book.close
         @book.should_not be_alive
         Workbook.unobtrusively(@simple_file1, :if_closed => :current) do |book|
@@ -918,14 +920,14 @@ describe Workbook do
           book.excel.should == @book.excel
           book.excel.should_not == excel
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
         @book.should_not be_alive
         new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should_not == old_cell_value
+        sheet[1,1].should_not == old_cell_value
       end
     end
 
@@ -992,7 +994,7 @@ describe Workbook do
         @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]
         @book1.close
         @book2.close
         @book1.should_not be_alive
@@ -1005,13 +1007,13 @@ describe Workbook do
           book.excel.should_not == @book1.excel
           book.ReadOnly.should == false
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
         end
         new_book = Workbook.open(@simple_file1)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should_not == @old_cell_value
+        sheet[1,1].should_not == @old_cell_value
       end
 
     end
@@ -1024,7 +1026,7 @@ describe Workbook do
       before do
         @book = Workbook.open(@simple_file1)
         sheet = @book.sheet(1)
-        @old_cell_value = sheet[1,1].Value
+        @old_cell_value = sheet[1,1]
         @book.close
       end
 
@@ -1034,14 +1036,14 @@ describe Workbook do
           book.should be_alive
           book.Saved.should be true  
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.Saved.should be false
           book.excel.should == @book.excel
         end
         new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should == @old_cell_value
+        sheet[1,1].should == @old_cell_value
       end
 
 
@@ -1049,7 +1051,7 @@ describe Workbook do
         new_excel = Excel.new(:reuse => false)
         Workbook.for_reading(@simple_file1, :if_closed => :new) do |book|
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should_not == @book.excel
           book.excel.should_not == new_excel
@@ -1058,19 +1060,19 @@ describe Workbook do
         end
         new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should == @old_cell_value
+        sheet[1,1].should == @old_cell_value
       end
 
       it "should change the value" do
         Workbook.for_modifying(@simple_file1) do |book|
           sheet = book.sheet(1)
-          cell = sheet[1,1]
+          cell = sheet.range([1,1])
           sheet[1,1] = cell.Value == "foo" ? "bar" : "foo"
           book.excel.should == @book.excel
         end
         new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)
-        sheet[1,1].Value.should_not == @old_cell_value
+        sheet[1,1].should_not == @old_cell_value
       end
     end
   end
@@ -1103,12 +1105,12 @@ describe Workbook do
     end   
 
     it "should return value of a range" do
-      @book1.namevalue_glob("new").should == "foo"
-      @book1.namevalue_glob("one").should == 1
-      @book1.namevalue_glob("firstrow").should == [[1,2]]        
-      @book1.namevalue_glob("four").should == [[1,2],[3,4]]
-      @book1.namevalue_glob("firstrow").should_not == "12"
-      @book1.namevalue_glob("firstcell").should == "foo"        
+      @book1.namevalue_global("new").should == "foo"
+      @book1.namevalue_global("one").should == 1
+      @book1.namevalue_global("firstrow").should == [[1,2]]        
+      @book1.namevalue_global("four").should == [[1,2],[3,4]]
+      @book1.namevalue_global("firstrow").should_not == "12"
+      @book1.namevalue_global("firstcell").should == "foo"        
     end
 
     it "should return value of a range via []" do
@@ -1121,17 +1123,17 @@ describe Workbook do
     end
 
     it "should set value of a range" do
-      @book1.set_namevalue_glob("new", "bar")
-      @book1.namevalue_glob("new").should == "bar"
+      @book1.set_namevalue_global("new", "bar")
+      @book1.namevalue_global("new").should == "bar"
     end
 
     it "should set value of a range via []=" do
       @book1["new"] = "bar"
-      @book1.namevalue_glob("new").should == "bar"
+      @book1.namevalue_global("new").should == "bar"
     end
 
     #it "should evaluate a formula" do
-    #  @book1.namevalue_glob("named_formula").should == 4      
+    #  @book1.namevalue_global("named_formula").should == 4      
     #end
 
     #it "should evaluate a formula via []" do
@@ -1139,7 +1141,7 @@ describe Workbook do
     #end
 
     #it "should return default value if name not defined" do
-    #  @book1.namevalue_glob("foo", :default => 2).should == 2
+    #  @book1.namevalue_global("foo", :default => 2).should == 2
     #end
 
   end
@@ -1391,7 +1393,46 @@ describe Workbook do
     end
   end
 
+  describe "#names" do
+
+    before do
+      @book1 = Workbook.open(@another_simple_file)
+    end
+
+    it "should yield defined names" do
+      @book1.names.should == ["another", "Sheet1!another_formula", "empty", "Sheet1!firstcell", 
+                              "firstrow", "formula", "four", "Sheet1!localname", "Sheet2!localname", 
+                              "named_formula", "new", "one", "Sheet1!simple"]
+    end
+      
+  end
+
+  describe "each" do
+
+    before do
+      @book = Workbook.open(@simple_file)
+    end
+
+    it "should do each" do
+      @book.each do |sheet|
+        sheet.should be_kind_of Worksheet
+      end
+    end
+
+    it "should map" do
+      @book.map{|s| s}.should == [@book.sheet(1), @book.sheet(2), @book.sheet(3)]
+    end
+
+    it "should concatenate" do
+      names = ""
+      @book.each.with_index{|s,i| names << "#{s.name} #{i} " }
+      names.should == "Sheet1 0 Sheet2 1 Sheet3 2 "
+    end
+
+  end
+
   describe 'access sheet' do
+
     before do
       @book = Workbook.open(@simple_file)
     end
@@ -1435,7 +1476,7 @@ describe Workbook 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] == "foo" ? "bar" : "foo"
         @book.Saved.should be false
         @book.retain_saved do
           sheet = @book.sheet(1)
@@ -1447,7 +1488,7 @@ describe Workbook 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] == "foo" ? "bar" : "foo"
         @book.Saved.should be false
         @book.retain_saved do
           @book.save

data/spec/workbook_specs/workbook_all_spec.rb

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

data/spec/workbook_specs/workbook_close_spec.rb

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

data/spec/workbook_specs/workbook_misc_spec.rb

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 
-require File.join(File.dirname(__FILE__), './../spec_helper')
-
+require_relative '../spec_helper'
 
 $VERBOSE = nil
 
 include RobustExcelOle
 include General
 
+using ToReoRefinement
+
 describe Workbook do
 
   before(:all) do
@@ -24,7 +25,6 @@ describe Workbook do
     @different_file = @dir + '/different_workbook.xls'
     @simple_file_other_path = @dir + '/more_data/workbook.xls'
     @another_simple_file = @dir + '/another_workbook.xls'
-    @linked_file = @dir + '/workbook_linked.xlsm'
     @simple_file_xlsm = @dir + '/workbook.xls'
     @simple_file_xlsx = @dir + '/workbook.xlsx'
     @simple_file1 = @simple_file
@@ -166,7 +166,7 @@ describe Workbook 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] == "foo" ? "bar" : "foo"
       @book.Saved.should be false
       @book.retain_saved do
         sheet = @book.sheet(1)
@@ -180,7 +180,7 @@ describe Workbook do
       @book.Saved.should be true
       @book.retain_saved do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         @book.Saved.should be false
       end
       @book.Saved.should be true
@@ -188,7 +188,7 @@ describe Workbook 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] == "foo" ? "bar" : "foo"
       @book.Saved.should be false
       @book.retain_saved do
         @book.save
@@ -669,7 +669,7 @@ describe Workbook do
     end
   end
 
-  describe "namevalue_glob, set_namevalue_glob, [], []=" do
+  describe "namevalue_global, set_namevalue_global, [], []=" do
   
     before do
       @book1 = Workbook.open(@another_simple_file)
@@ -680,12 +680,12 @@ describe Workbook do
     end   
 
     it "should return value of a range" do
-      @book1.namevalue_glob("new").should == "foo"
-      @book1.namevalue_glob("one").should == 1
-      @book1.namevalue_glob("firstrow").should == [[1,2]]        
-      @book1.namevalue_glob("four").should == [[1,2],[3,4]]
-      @book1.namevalue_glob("firstrow").should_not == "12"
-      @book1.namevalue_glob("firstcell").should == "foo"        
+      @book1.namevalue_global("new").should == "foo"
+      @book1.namevalue_global("one").should == 1
+      @book1.namevalue_global("firstrow").should == [[1,2]]        
+      @book1.namevalue_global("four").should == [[1,2],[3,4]]
+      @book1.namevalue_global("firstrow").should_not == "12"
+      @book1.namevalue_global("firstcell").should == "foo"        
     end
 
     it "should return value of a range via []" do
@@ -698,17 +698,24 @@ describe Workbook do
     end
 
     it "should set value of a range" do
-      @book1.set_namevalue_glob("new", "bar")
-      @book1.namevalue_glob("new").should == "bar"
+      @book1.set_namevalue_global("new", "bar")
+      @book1.namevalue_global("new").should == "bar"
+    end
+
+    it "should set a range to a value with umlauts" do
+      @book1.sheet(1).add_name("lösung", [1,1])
+      @book1.namevalue_global("lösung").should == "foo"
+      @book1.set_namevalue_global("lösung","bar")
+      @book1.namevalue_global("lösung").should == "bar"
     end
 
     it "should set value of a range via []=" do
       @book1["new"] = "bar"
-      @book1.namevalue_glob("new").should == "bar"
+      @book1.namevalue_global("new").should == "bar"
     end
 
     #it "should evaluate a formula" do
-    #  @book1.namevalue_glob("named_formula").should == 4      
+    #  @book1.namevalue_global("named_formula").should == 4      
     #end
 
     #it "should evaluate a formula via []" do
@@ -717,28 +724,28 @@ describe Workbook do
 
     it "should raise an error if name not defined and default value is not provided" do
       expect {
-        @book1.namevalue_glob("foo", :default => nil)
+        @book1.namevalue_global("foo", :default => 1)
       }.to_not raise_error
       expect {
-        @book1.namevalue_glob("foo", :default => :__not_provided)
+        @book1.namevalue_global("foo", :default => :__not_provided)
       }.to raise_error(NameNotFound, /name "foo" not in #<Workbook: another_workbook/)
       expect {
-        @book1.namevalue_glob("foo")
+        @book1.namevalue_global("foo")
       }.to raise_error(NameNotFound, /name "foo" not in #<Workbook: another_workbook/)
-      @book1.namevalue_glob("foo", :default => nil).should be_nil
-      @book1.namevalue_glob("foo", :default => 1).should == 1
+      @book1.namevalue_global("foo", :default => nil).should be_nil
+      @book1.namevalue_global("foo", :default => 1).should == 1
       expect {
-          @book1.set_namevalue_glob("foo","bar")
+          @book1.set_namevalue_global("foo","bar")
       }.to raise_error(RangeNotEvaluatable, /cannot assign value to range named "foo"/)
       expect {
           @book1["foo"] = "bar"
       }.to raise_error(RangeNotEvaluatable, /cannot assign value to range named "foo"/)
-      @book1.namevalue_glob("empty", :default => 1).should be_nil
+      @book1.namevalue_global("empty", :default => 1).should be_nil
     end    
 
     it "should raise an error if name was defined but contents is calcuated" do
       expect {
-        @book1.set_namevalue_glob("named_formula","bar")
+        @book1.set_namevalue_global("named_formula","bar")
       }.to raise_error(RangeNotEvaluatable, /cannot assign value to range named "named_formula" in #<Workbook: another_workbook/)
       expect {
         @book1["named_formula"] = "bar"
@@ -747,19 +754,19 @@ describe Workbook do
 
     # Excel Bug: for local names without uqifier: takes the first sheet as default even if another sheet is activated
     it "should take the first sheet as default even if the second sheet is activated" do
-      @book1.namevalue_glob("Sheet1!localname").should == "bar"
-      @book1.namevalue_glob("Sheet2!localname").should == "simple"
-      @book1.namevalue_glob("localname").should == "bar"
+      @book1.namevalue_global("Sheet1!localname").should == "bar"
+      @book1.namevalue_global("Sheet2!localname").should == "simple"
+      @book1.namevalue_global("localname").should == "bar"
       @book1.Worksheets.Item(2).Activate
-      @book1.namevalue_glob("localname").should == "bar"
+      @book1.namevalue_global("localname").should == "bar"
       @book1.Worksheets.Item(1).Delete
-      @book1.namevalue_glob("localname").should == "simple"
+      @book1.namevalue_global("localname").should == "simple"
     end
 
     it "should color the cell (deprecated)" do
-      @book1.set_namevalue_glob("new", "bar")
+      @book1.set_namevalue_global("new", "bar")
       @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == -4142
-      @book1.set_namevalue_glob("new", "bar", :color => 4)
+      @book1.set_namevalue_global("new", "bar", :color => 4)
       @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 4
       @book1["new"].should == "bar"
       @book1["new"] = "bar"
@@ -771,9 +778,9 @@ describe Workbook do
     end
 
     it "should color the cell" do
-      @book1.set_namevalue_glob("new", "bar")
+      @book1.set_namevalue_global("new", "bar")
       @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == -4142
-      @book1.set_namevalue_glob("new", "bar", :color => 4)
+      @book1.set_namevalue_global("new", "bar", :color => 4)
       @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 4
       @book1["new"].should == "bar"
       @book1["new"] = "bar"
@@ -784,7 +791,7 @@ describe Workbook do
 
   end
 
-  describe "rename_range" do
+  describe "rename_name" do
     
     before do
       @book1 = Workbook.open(@another_simple_file)
@@ -795,11 +802,11 @@ describe Workbook do
     end
 
     it "should rename a range" do
-      @book1.rename_range("four","five")
-      @book1.namevalue_glob("five").should == [[1,2],[3,4]]
+      @book1.rename_name("four","five")
+      @book1.namevalue_global("five").should == [[1,2],[3,4]]
       expect {
-        @book1.rename_range("four","five")
-      }.to raise_error(NameNotFound, /name "four" not in "another_workbook.xls"/)
+        @book1.rename_name("four","five")
+      }.to raise_error(NameNotFound, /name "four" not in/)
     end
   end
 
@@ -901,7 +908,7 @@ describe Workbook do
 
       it "should yield false for an unsaved book" do
         sheet = @book.sheet(1)
-        sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
+        sheet[1,1] = sheet[1,1] == "foo" ? "bar" : "foo"
         @book.saved.should be false
       end
     end
@@ -1065,20 +1072,20 @@ describe Workbook do
       it "should bring a book to focus" do
         sheet = @book.sheet(2)
         sheet.Activate
-        sheet[2,3].Activate
+        sheet.range([2,3]).Activate
         sheet2 = @book2.sheet(2)
         sheet2.Activate
-        sheet2[3,2].Activate
+        sheet2.range([3,2]).Activate
         Excel.current.should == @book.excel
         @book2.focus
         @key_sender.puts "{a}{enter}"
         sleep 1
-        #sheet2[3,2].Value.should == "a"
+        #sheet2.range([3,2]).Value.should == "a"
         #Excel.current.should == @book2.excel
         @book.focus
         @key_sender.puts "{a}{enter}"
         sleep 1
-        #sheet[2,3].Value.should == "a"
+        #sheet.range([2,3]).Value.should == "a"
         Excel.current.should == @book.excel
       end
     end
@@ -1165,7 +1172,7 @@ describe Workbook do
         @book1.add_name("foo",[1,1])
         @book1.delete_name("foo")
         expect{
-          @book1.namevalue_glob("foo")
+          @book1.namevalue_global("foo")
         }.to raise_error(NameNotFound, /name "foo"/)
       end