robust_excel_ole 1.2 → 1.3

data/spec/book_specs/book_unobtr_spec.rb

@@ -1155,14 +1155,14 @@ describe Book do
           book1 = Book.open(@simple_file1, :calculation => :manual)
           Book.unobtrusively(@simple_file1) do |book|
           end
-          book1.excel.Calculation.should == -4135
+          book1.excel.Calculation.should == XlCalculationManual
         end
 
         it "should remain calculation automatic" do
           book1 = Book.open(@simple_file1, :calculation => :automatic)
           Book.unobtrusively(@simple_file1) do |book|
           end
-          book1.excel.Calculation.should == -4105
+          book1.excel.Calculation.should == XlCalculationAutomatic
         end
        
       end

data/spec/excel_spec.rb

@@ -998,29 +998,20 @@ module RobustExcelOle
 
       it "should return two unsaved books" do
         book = Book.open(@simple_file)
-        sheet = book.sheet(1)
-        sheet[1,1] = sheet[1,1].value == "foo" ? "bar" : "foo"
         book2 = Book.open(@another_simple_file, :force_excel => :new)
-        sheet2 = book2.sheet(1)
-        sheet2[1,1] = sheet2[1,1].value == "foo" ? "bar" : "foo"
+        open_books = [book, book2]
+        begin 
+          open_books.each do |wb|
+            sheet = wb.sheet(1)
+            sheet[1,1] = (sheet[1,1].value == "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
-        ole_wb_list1, ole_wb_list2 = unsaved_known_wbs
-        ole_wb_list1.each do |ole_wb_list|
-          ole_wb_list1.size.should == 1
-          ole_wb_list1.each do |ole_workbook|
-            ole_workbook.Fullname.tr('\\','/').should == @simple_file  
-          end
-        end
-        ole_wb_list2.each do |ole_wb_list|
-          ole_wb_list2.size.should == 1
-          ole_wb_list2.each do |ole_workbook|
-            ole_workbook.Fullname.tr('\\','/').should == @another_simple_file  
-          end
+          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
+        ensure
+          open_books.each {|wb| wb.close(:if_unsaved => :forget)}
         end
-        book2.close(:if_unsaved => :forget)
-        book.close(:if_unsaved => :forget)
       end
 
     end
@@ -1504,7 +1495,7 @@ module RobustExcelOle
         old_calculation_mode = @excel1.Calculation
         @excel1.with_calculation(:manual) do
           @excel1.calculation.should == :manual
-          @excel1.Calculation.should == -4135
+          @excel1.Calculation.should == XlCalculationManual
           @excel1.CalculateBeforeSave.should be false
           book.Saved.should be true
         end
@@ -1512,7 +1503,7 @@ module RobustExcelOle
         @excel1.CalculateBeforeSave.should be false
         @excel1.with_calculation(:automatic) do
           @excel1.calculation.should == :automatic
-          @excel1.Calculation.should == -4105
+          @excel1.Calculation.should == XlCalculationAutomatic
           @excel1.CalculateBeforeSave.should be false
           book.Saved.should be false
         end
@@ -1526,7 +1517,7 @@ module RobustExcelOle
         book.Windows(book.Name).Visible = true
         @excel1.calculation = :manual
         @excel1.calculation.should == :manual
-        @excel1.Calculation.should == -4135
+        @excel1.Calculation.should == XlCalculationManual
         @excel1.CalculateBeforeSave.should be false
         book.Saved.should be true
       end
@@ -1536,7 +1527,7 @@ module RobustExcelOle
         book = Book.open(@simple_file, :visible => true)
         @excel1.calculation = :automatic
         @excel1.calculation.should == :automatic
-        @excel1.Calculation.should == -4105
+        @excel1.Calculation.should == XlCalculationAutomatic
         @excel1.CalculateBeforeSave.should be false
         book.Saved.should be false
       end
@@ -1544,24 +1535,24 @@ module RobustExcelOle
       it "should set Calculation without workbooks" do
         @excel1 = Excel.new
         expect{
-          @excel1.Calculation = -4135
+          @excel1.Calculation = XlCalculationManual
         }.to raise_error(WIN32OLERuntimeError)
       end
 
       it "should do Calculation to manual with workbook" do
         @excel1 = Excel.new
         b = Book.open(@simple_file)
-        @excel1.Calculation = -4135
+        @excel1.Calculation = XlCalculationManual
         @excel1.calculation.should == :manual
-        @excel1.Calculation.should == -4135
+        @excel1.Calculation.should == XlCalculationManual
       end
 
       it "should do Calculation to automatic with workbook" do
         @excel1 = Excel.new
         b = Book.open(@simple_file)
-        @excel1.Calculation = -4105
+        @excel1.Calculation = XlCalculationAutomatic
         @excel1.calculation.should == :automatic
-        @excel1.Calculation.should == -4105
+        @excel1.Calculation.should == XlCalculationAutomatic
       end
 
     end
@@ -1591,6 +1582,9 @@ module RobustExcelOle
 
       before do
         @excel = Excel.new(:reuse => false)
+        book = Book.open(@simple_file)
+        book.excel.calculation = :manual
+        book.close(:if_unsaved => :save)
       end
 
       it "should set options in the Excel instance" do
@@ -1599,7 +1593,7 @@ module RobustExcelOle
         @excel.Visible.should be true
         @excel.ScreenUpdating.should be true
         book = Book.open(@simple_file)
-        @excel.Calculation.should == -4135
+        @excel.Calculation.should == XlCalculationManual
         book.close
       end
 
@@ -1799,6 +1793,57 @@ module RobustExcelOle
       end
     end
 
+    context "setting the name of a range" do
+
+       before do
+        @book1 = Book.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
+        @book1.excel.displayalerts = false
+        @excel1 = @book1.excel
+      end
+
+      after do
+        @book1.close
+      end   
+
+      it "should name an unnamed range with a giving address" do
+        @excel1.add_name("foo",1,2)
+        @excel1.Names.Item("foo").Name.should == "foo"
+        @excel1.Names.Item("foo").Value.should == "=Sheet1!$B$1"
+      end
+
+      it "should rename an already named range with a giving address" do
+        @excel1.add_name("foo",1,1)
+        @excel1.Names.Item("foo").Name.should == "foo"
+        @excel1.Names.Item("foo").Value.should == "=Sheet1!$A$1"
+      end
+
+      it "should raise an error" do
+        expect{
+          @excel1.add_name("foo", -2, 1)
+        }.to raise_error(RangeNotEvaluatable, /cannot add name "foo" to cell with row -2 and column 1/)
+      end
+
+      it "should rename a range" do
+        @excel1.add_name("foo",1,1)
+        @excel1.rename_range("foo","bar")
+        @excel1.namevalue_glob("bar").should == "foo"
+      end
+
+      it "should delete a name of a range" do
+        @excel1.add_name("foo",1,1)
+        @excel1.delete_name("foo")
+        expect{
+          @excel1.namevalue_glob("foo")
+        }.to raise_error(NameNotFound, /name "foo"/)
+      end
+
+      it "should add a name of a rectangular range" do
+        @excel1.add_name("foo",1,1,3,4)
+        @excel1["foo"].should == [["foo", "workbook", "sheet1", nil], ["foo", 1.0, 2.0, 4.0], ["matz", 3.0, 4.0, 4.0]] 
+      end
+    end
+  
+
     describe "nameval, set_nameval" do
 
       before do
@@ -1812,25 +1857,25 @@ module RobustExcelOle
       end   
 
       it "should return value of a defined name" do
-        @excel1.nameval("firstcell").should == "foo"
+        @excel1.namevalue_glob("firstcell").should == "foo"
         @excel1["firstcell"].should == "foo"
       end        
 
       #it "should evaluate a formula" do
-      #  @excel1.nameval("named_formula").should == 4
+      #  @excel1.namevalue_glob("named_formula").should == 4
       #  @excel1["named_formula"].should == 4
       #end
 
       it "should raise an error if name not defined" do
         expect {
-          @excel1.nameval("foo")
+          @excel1.namevalue_glob("foo")
         }.to raise_error(NameNotFound, /name "foo"/)
         expect {
         @excel1["foo"]
         }.to raise_error(NameNotFound, /name "foo"/)
         expect {
           excel2 = Excel.create
-          excel2.nameval("one")
+          excel2.namevalue_glob("one")
         }.to raise_error(NameNotFound, /name "one"/)
         expect {
           excel3 = Excel.create(:visible => true)
@@ -1839,16 +1884,16 @@ module RobustExcelOle
       end
 
       it "should set a range to a value" do
-        @excel1.nameval("firstcell").should == "foo"
-        @excel1.set_nameval("firstcell","bar")
-        @excel1.nameval("firstcell").should == "bar"
+        @excel1.namevalue_glob("firstcell").should == "foo"
+        @excel1.set_namevalue_glob("firstcell","bar")
+        @excel1.namevalue_glob("firstcell").should == "bar"
         @excel1["firstcell"] = "foo"
-        @excel1.nameval("firstcell").should == "foo"
+        @excel1.namevalue_glob("firstcell").should == "foo"
       end
 
       it "should raise an error if name cannot be evaluated" do
         expect{
-          @excel1.set_nameval("foo", 1)
+          @excel1.set_namevalue_glob("foo", 1)
           }.to raise_error(NameNotFound, /name "foo"/)
         expect{
           @excel1["foo"] = 1
@@ -1856,9 +1901,9 @@ module RobustExcelOle
       end
 
       it "should color the cell" do
-        @excel1.set_nameval("firstcell", "foo")
+        @excel1.set_namevalue_glob("firstcell", "foo")
         @book1.Names.Item("firstcell").RefersToRange.Interior.ColorIndex.should == -4142 
-        @excel1.set_nameval("firstcell", "foo", :color => 4)
+        @excel1.set_namevalue_glob("firstcell", "foo", :color => 4)
         @book1.Names.Item("firstcell").RefersToRange.Interior.ColorIndex.should == 4
         @excel1["firstcell"].should == "foo"
         @excel1["firstcell"] = "foo"
@@ -1868,7 +1913,7 @@ module RobustExcelOle
 
     end
 
-    describe "rangeval, set_rangeval" do
+    describe "namevalue, set_namevalue" do
       
       before do
         @book1 = Book.open(@dir + '/another_workbook.xls')
@@ -1880,49 +1925,49 @@ module RobustExcelOle
       end   
 
       it "should return value of a locally defined name" do
-        @excel1.rangeval("firstcell").should == "foo"          
+        @excel1.namevalue("firstcell").should == "foo"          
       end        
 
       it "should return value of a defined name" do
-        @excel1.rangeval("new").should == "foo"         
-        @excel1.rangeval("one").should == 1.0    
-        @excel1.rangeval("four").should == [[1,2],[3,4]]
-        @excel1.rangeval("firstrow").should == [[1,2]]
+        @excel1.namevalue("new").should == "foo"         
+        @excel1.namevalue("one").should == 1.0    
+        @excel1.namevalue("four").should == [[1,2],[3,4]]
+        @excel1.namevalue("firstrow").should == [[1,2]]
       end    
 
       it "should return default value if name not defined and default value is given" do
-        @excel1.rangeval("foo", :default => 2).should == 2
+        @excel1.namevalue("foo", :default => 2).should == 2
       end
 
       it "should raise an error if name not defined for the sheet" do
         expect {
-          @excel1.rangeval("foo")
+          @excel1.namevalue("foo")
           }.to raise_error(NameNotFound, /name "foo" not in/)
         expect {
-          @excel1.rangeval("named_formula")
+          @excel1.namevalue("named_formula")
           }.to raise_error(NameNotFound, /name "named_formula" not in/)
         expect {
           excel2 = Excel.create
-          excel2.rangeval("one")
+          excel2.namevalue("one")
         }.to raise_error(NameNotFound, /name "one" not in/)
       end
     
       it "should set a range to a value" do
-        @excel1.rangeval("firstcell").should == "foo"
-        @excel1.set_rangeval("firstcell","bar")
-        @excel1.rangeval("firstcell").should == "bar"
+        @excel1.namevalue("firstcell").should == "foo"
+        @excel1.set_namevalue("firstcell","bar")
+        @excel1.namevalue("firstcell").should == "bar"
       end
 
       it "should raise an error if name cannot be evaluated" do
         expect{
-          @excel1.set_nameval("foo", 1)
+          @excel1.set_namevalue_glob("foo", 1)
         }.to raise_error(NameNotFound, /name "foo" not in/)
       end
 
       it "should color the cell" do
-        @excel1.set_rangeval("firstcell", "foo")
+        @excel1.set_namevalue("firstcell", "foo")
         @book1.Names.Item("firstcell").RefersToRange.Interior.ColorIndex.should == -4142 
-        @excel1.set_rangeval("firstcell", "foo", :color => 4)
+        @excel1.set_namevalue("firstcell", "foo", :color => 4)
         @book1.Names.Item("firstcell").RefersToRange.Interior.ColorIndex.should == 4
       end
 

data/spec/general_spec.rb

@@ -54,8 +54,8 @@ module RobustExcelOle
         @ole_sheet_methods = []
          # ["Activate", "Calculate", "Copy", "Name", "Select", "Evaluate", "Protect", "Unprotect"]
         @sheet_methods = ["book_class", "col_range", "each", "each_column", "each_column_with_index",
-                          "each_row", "each_row_with_index", "nameval", "rangeval", 
-                          "set_rangeval", "row_range", "set_nameval"]
+                          "each_row", "each_row_with_index", "nameval", "namevalue", 
+                          "set_namevalue", "row_range", "set_nameval"]
       end
 
       after do

data/spec/range_spec.rb

@@ -1,4 +1,4 @@
-# -*- cdoing: utf-8 -*-
+# -*- coding: utf-8 -*-
 require File.join(File.dirname(__FILE__), './spec_helper')
 
 include RobustExcelOle
@@ -119,6 +119,42 @@ describe RobustExcelOle::Range do
     end
   end
 
+  describe "#copy" do
+    
+    before do
+      @book2 = Book.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})
+    end
+
+    after do
+      @book.close(:if_unsaved => :forget)
+    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"]
+    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 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)
+      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"]
+    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)]

data/spec/reo_common_spec.rb

@@ -33,7 +33,94 @@ module RobustExcelOle
 
     after do
       Excel.kill_all
-      #rm_tmp(@dir)
+      rm_tmp(@dir)
+    end
+
+    describe "Address" do
+
+      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
+      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
+      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
+      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
+      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
+      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
+      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
+      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
+      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
+      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
+      end
+
+      it "should raise an error" do
+        expect{
+          Address.new("1A")
+        }.to raise_error(AddressInvalid, /address ("1A") not in A1 format/)
+        expect{
+          Address.new("A1B")
+        }.to raise_error(AddressInvalid, /address ("A1B") not in A1 format/)
+        expect{
+          Address.new("A".."B","C".."D")
+        }.to raise_error(AddressInvalid, /address ("A".."B", "C".."D") not in A1 format/)
+      end
+
+
     end
 
     describe "trace" do
@@ -57,8 +144,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", "nameval", "ole_object", 
-                         "ole_workbook", "reopen", "save", "save_as", "saved", "set_nameval"]
+        @book_methods = ["focus", "add_sheet", "alive?", "close", "filename", "namevalue", "ole_object", 
+                         "ole_workbook", "reopen", "save", "save_as", "saved", "set_namevalue"]
         @ole_excel_methods = 
           ["ActiveCell", "ActiveSheet", "ActiveWorkbook", "Application",  "Calculate", "Cells", "Columns",
             "DisplayAlerts", "Evaluate", "Hwnd", "Name", "Names", "Quit", "Range", "Ready", "Save",