robust_excel_ole 1.14 → 1.18.1

data/spec/general_spec.rb

@@ -41,28 +41,41 @@ module RobustExcelOle
         @book1 = Workbook.open(@simple_file)
       end
 
-      it "should promote an Excel" do
+      it "should type-lift 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
+      it "should type-lift 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
+      it "should type-lift 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
+      it "should type-lift a range" do
+        range = @book1.sheet(1).range([1..2,1]).ole_range.to_reo
         range.should be_kind_of Range
-        range.Value.should == "foo"
+        range.Value.should == [["foo"],["foo"]]
+      end
+
+      it "should type-lift a cell" do
+        cell = @book1.sheet(1).range([1,1]).ole_range.to_reo
+        cell.should be_kind_of Cell
+        cell.Value.should == "foo"
+      end
+
+      it "should not do anything with a REO object" do
+        @book1.to_reo.should == @book1 
+        @book1.sheet(1).to_reo.should == @book1.sheet(1)
+        @book1.excel.to_reo.should == @book1.excel
+        @book1.sheet(1).range([1,1]).to_reo.should == @book1.sheet(1).range([1,1])
       end
 
     end
@@ -81,8 +94,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?", "workbook_class", "close", "displayalerts", "recreate", "visible", 
-          "with_displayalerts"] 
+        @excel_methods = ["alive?", "workbook_class", "close", "properties", "recreate", "with_displayalerts"] 
         @ole_sheet_methods = []
          # ["Activate", "Calculate", "Copy", "Name", "Select", "Evaluate", "Protect", "Unprotect"]
         @sheet_methods = ["workbook_class", "col_range", "each", "each_column", "each_column_with_index",
@@ -152,9 +164,8 @@ module RobustExcelOle
 
         it "should return the right absolute paths" do
           absolute_path("C:/abc").should == "C:\\abc"
-          absolute_path("C:\\abc").should == "C:\\abc"
+          #absolute_path("C:\\abc").should == "C:\\abc"
           Dir.chdir "C:/windows"
-          # does not work under jruby
           absolute_path("C:abc").downcase.should == Dir.pwd.gsub("/","\\").downcase + "\\abc"
           absolute_path("C:abc").upcase.should   == File.expand_path("abc").gsub("/","\\").upcase
         end
@@ -224,22 +235,5 @@ module RobustExcelOle
       end
     end
 
-    describe "Object methods" do
-
-      before do
-        @book = Workbook.open(@simple_file)
-        @sheet = @book.sheet(1)
-      end
-
-      before do
-        @book.close
-      end
-
-      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 Workbook")
-      end
-    end
   end
 end

data/spec/range_spec.rb

@@ -18,20 +18,74 @@ describe RobustExcelOle::Range do
     @book = Workbook.open(@dir + '/workbook.xls', :force_excel => :new)
     @sheet = @book.sheet(2)
     @range = RobustExcelOle::Range.new(@sheet.ole_worksheet.UsedRange.Rows(1))
+    @range2 = @sheet.range([1..2,1..3])
   end
 
   after do
-    @book.close
+    @book.close(:if_unsaved => :forget)
     Excel.kill_all
     rm_tmp(@dir)
   end
 
+  describe "#[]" do
+
+    it "should yield a cell" do
+      @range[0].should be_kind_of RobustExcelOle::Cell
+    end
+
+    it "should yield the value of the first cell" do
+      @range2[0].Value.should == 'simple'
+    end
+
+    it "should cash the cells in the range" do
+      cell = @range2[0]
+      cell.v.should == 'simple'
+      @range2.Cells.Item(1).Value = 'foo'
+      cell.v.should == 'foo'
+    end
+  end
+
   describe "#each" do
+  
     it "items is RobustExcelOle::Cell" do
-      @range.each do |cell|
+      @range2.each do |cell|
         cell.should be_kind_of RobustExcelOle::Cell
       end
     end
+
+    it "should work with [] doing cashing synchonized, from #[] to #each" do
+      i = 0
+      @range2.each do |cell|
+        cell.v.should == 'simple' if i == 0
+        cell.v.should == 'file' if i == 1
+        cell.v.should == 'sheet2' if i == 2
+        i += 1
+      end
+      @range2[0].Value = 'foo'
+      @range2[1].Value = 'bar'
+      @range2[2].Value = 'simple'
+      i = 0
+      @range2.each do |cell|
+        cell.v.should == 'foo' if i == 0
+        cell.v.should == 'bar' if i == 1
+        cell.v.should == 'simple' if i == 2
+        i += 1
+      end
+    end
+
+    it "should work with [] doing cashing synchonized, from #each to #[]" do
+      @range2[0].Value.should == 'simple'
+      @range2[1].Value.should == 'file'
+      @range2[2].Value.should == 'sheet2'
+      i = 0
+      @range2.each do |cell|
+        cell.Value = 'foo' if i == 0
+        cell.Value = 'bar' if i == 1
+        cell.Value = 'simple' if i == 2
+        i += 1
+      end
+    end
+
   end
 
   describe "#values" do
@@ -335,7 +389,7 @@ describe RobustExcelOle::Range do
     #end
 
     context "unknown method" do
-      it { expect { @range.hogehogefoo}.to raise_error }
+      it { expect { @range.hogehogefoo}.to raise_error(NoMethodError) }
     end
   end
 end

data/spec/workbook_spec.rb

@@ -625,16 +625,16 @@ describe Workbook do
         old_cell_value = sheet[1,1].Value
         sheet[1,1] = sheet[1,1].Value == "foo" ? "bar" : "foo"
         book.Saved.should be false
-        new_book = Workbook.open(@simple_file1, :read_only => false, :if_unsaved => :accept)
+        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 be_alive   
-        new_book.should == book 
+        book.should_not be_alive   
         new_sheet = new_book.sheet(1)
         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 Workbook' do
         Workbook.open(@simple_file) do |book|
@@ -669,7 +669,7 @@ describe Workbook do
     end
   end
 
-  describe "promoting" do
+  describe "type-lifting" do
 
     context "with standard" do
 
@@ -681,7 +681,7 @@ describe Workbook do
         @book.close
       end
 
-      it "should promote a win32ole workbook object to a workbook object with an open workbook" do
+      it "should type-lift a win32ole workbook object to a workbook object with an open workbook" do
         workbook = @book.ole_workbook
         book1 = Workbook.new(workbook)
         book1.should be_a Workbook
@@ -927,31 +927,6 @@ describe Workbook do
       after do
         @book.close
       end
-
-      it "should open unobtrusively the book in a new Excel such that the book is writable" do
-        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
-        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"
-          book.should be_alive
-          book.Saved.should be false          
-        end  
-        @book.Saved.should be true
-        @book.ReadOnly.should be true
-        @book.close
-        book2.close
-        book3 = Workbook.open(@simple_file1)
-        new_sheet = book3.sheet(1)
-        new_sheet[1,1].Value.should_not == cell_value
-        book3.close
-      end
     end
 
     context "with a virgin Workbook class" do
@@ -1001,7 +976,7 @@ describe Workbook do
 
       before do
         @book1 = Workbook.open(@simple_file1)
-        @book2 = Workbook.open(@simple_file1, :force => {:excel => :new})
+        @book2 = Workbook.open(@simple_file1, :force_excel => :new)
         @book1.Readonly.should == false
         @book2.Readonly.should == true
         old_sheet = @book1.sheet(1)
@@ -1013,9 +988,9 @@ describe Workbook do
       end
 
       it "should open unobtrusively the closed book in the most recent Excel where it was open before" do      
-        Workbook.unobtrusively(@simple_file) do |book| 
-          book.excel.should_not == @book2.excel
-          book.excel.should == @book1.excel
+        Workbook.unobtrusively(@simple_file1, :if_closed => :current) do |book| 
+          book.excel.should == @book2.excel
+          book.excel.should_not == @book1.excel
           book.ReadOnly.should == false
           sheet = book.sheet(1)
           cell = sheet[1,1]
@@ -1027,52 +1002,9 @@ describe Workbook do
         sheet[1,1].Value.should_not == @old_cell_value
       end
 
-      it "should open unobtrusively the closed book in the new hidden Excel" do
-        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"
-          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
-      end
     end
   end
-
-=begin
-    context "with :hidden" do
-
-      before do
-        @book1 = Workbook.open(@simple_file1)
-        @book1.close
-      end
     
-      it "should create a new hidden Excel instance and use this afterwards" do
-        hidden_excel = nil
-        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
-        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
-          book.excel.should == hidden_excel
-        end
-      end
-    end
-  end
-=end
-  
   describe "for_reading, for_modifying" do
 
     context "open unobtrusively for reading and modifying" do
@@ -1109,8 +1041,8 @@ describe Workbook do
           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
+          book.excel.properties[:visible].should be false
+          book.excel.properties[:displayalerts].should == :if_visible
         end
         new_book = Workbook.open(@simple_file1, :visible => true)
         sheet = new_book.sheet(1)

data/spec/workbook_specs/workbook_misc_spec.rb

@@ -59,25 +59,25 @@ describe Workbook do
       @book.Windows(@book.Name).Visible.should be true
       @book.visible.should be true
       @book.ReadOnly.should be false
-      @book.CheckCompatibility.should be false
+      @book.CheckCompatibility.should be true
       @book.for_this_workbook(:visible => false)
       @book.excel.Visible.should be true
       @book.Windows(@book.Name).Visible.should be false
       @book.visible.should be false
       @book.ReadOnly.should be false
-      @book.CheckCompatibility.should be false
+      @book.CheckCompatibility.should be true
       @book.for_this_workbook(:read_only => true)
       @book.excel.Visible.should be true
-      @book.Windows(@book.Name).Visible.should be false
-      @book.visible.should be false
+      @book.Windows(@book.Name).Visible.should be true
+      @book.visible.should be true
       @book.ReadOnly.should be true
-      @book.CheckCompatibility.should be false
+      @book.CheckCompatibility.should be true
       @book.for_this_workbook(:visible => true)
       @book.excel.Visible.should be true
       @book.Windows(@book.Name).Visible.should be true
       @book.visible.should be true
       @book.ReadOnly.should be true
-      @book.CheckCompatibility.should be false
+      @book.CheckCompatibility.should be true
       @book.for_this_workbook(:check_compatibility => true)
       @book.excel.Visible.should be true
       @book.Windows(@book.Name).Visible.should be true
@@ -106,7 +106,7 @@ describe Workbook do
 
   end
 
-  describe "excel_of" do
+  describe "to_reo.excel" do
 
     before do
       @book = Workbook.open(@simple_file)
@@ -118,19 +118,19 @@ describe Workbook do
 
     it "should access the excel" do
       workbook = @book.ole_workbook
-      excel = Workbook.excel_of(workbook)
+      excel = workbook.to_reo.excel
       excel.should be_a Excel
       excel.should == @book.excel
     end
 
     it "should access the Excel of the ole_excel" do
-      excel = Workbook.excel_of(@book.excel.ole_excel)
+      excel = @book.excel.ole_excel.to_reo.excel
       excel.should be_a Excel
       excel.should == @book.excel
     end
 
     it "should access the Excel of a Workbook" do
-      excel = Workbook.excel_of(@book)
+      excel = @book.to_reo.excel
       excel.should be_a Excel
       excel.should == @book.excel
     end
@@ -251,7 +251,7 @@ describe Workbook do
       excel2 = book1.excel
       excel2.should == excel1
       excel2.Visible.should be false
-      book2.Windows(book2.Name).Visible.should be false
+      book2.Windows(book2.Name).Visible.should be true
     end
 
     it "should keep the found Excel instance visible" do
@@ -264,7 +264,7 @@ describe Workbook do
       excel2 = book1.excel
       excel2.should == excel1
       excel2.Visible.should be true
-      book2.Windows(book2.Name).Visible.should be false
+      book2.Windows(book2.Name).Visible.should be true
     end
 
     it "should keep the found Excel instance visible with default visible true" do
@@ -292,17 +292,17 @@ describe Workbook do
       book2.Windows(book2.Name).Visible.should be true      
     end
 
-    it "should open the workbook visible if the workbook is new" do
+    it "should open the workbook not visible if the workbook is new" do
       book1 = Workbook.open(@simple_file1, :default => {:visible => true})
-      book1.excel.Visible.should be true
+      book1.excel.Visible.should be false
       book1.Windows(book1.Name).Visible.should be true
-      book1.visible.should be true      
+      book1.visible.should be false      
     end
 
     it "should open the workbook invisible if the workbook is new" do
       book1 = Workbook.open(@simple_file1, :default => {:visible => false})
       book1.excel.Visible.should be false
-      book1.Windows(book1.Name).Visible.should be false
+      book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false      
     end
 
@@ -324,13 +324,13 @@ describe Workbook do
       book2 = Workbook.open(@simple_file1, :default => {:visible => true})
       excel2 = book2.excel
       book1.Windows(book1.Name).Visible.should be true
-      excel2.Visible.should be true  
-      book2.visible.should be true
+      excel2.Visible.should be false  
+      book2.visible.should be false
     end
 
     it "should open the workbook invisible if the old Excel is closed" do
       book1 = Workbook.open(@simple_file1, :default => {:visible => true})
-      book1.visible.should be true
+      book1.visible.should be false
       excel1 = book1.excel
       excel1.Visible.should be true
       book1.Windows(book1.Name).Visible.should be true
@@ -344,7 +344,6 @@ describe Workbook do
     end
 
   end
-
 =end
 
   describe "force-visible" do
@@ -375,7 +374,7 @@ describe Workbook do
       excel1.visible = true
       book1 = Workbook.open(@simple_file)
       excel1.Visible.should be true
-      excel1.visible.should be true
+      excel1.properties[:visible].should be true
       book1.visible.should be true
     end
 
@@ -587,30 +586,30 @@ describe Workbook do
     it "should set visible and displayalerts if displayalerts => :if_visible" do
       book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be false
-      book1.excel.displayalerts.should == :if_visible
+      book1.excel.properties[:displayalerts].should == :if_visible
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
       book2 = Workbook.open(@different_file)
       book2.excel.Visible.should be false
       book2.Windows(book2.Name).Visible.should be true
       book2.visible.should be false
-      book2.excel.visible.should be false
-      book2.excel.displayalerts.should == :if_visible
+      book2.excel.properties[:visible].should be false
+      book2.excel.properties[:displayalerts].should == :if_visible
       book2.excel.DisplayAlerts.should be false
     end
 
     it "should set visible and displayalerts if displayalerts => :if_visible" do
       book1 = Workbook.open(@simple_file)
       book1.excel.Visible.should be false
-      book1.excel.displayalerts.should == :if_visible
+      book1.excel.properties[:displayalerts].should == :if_visible
       book1.Windows(book1.Name).Visible.should be true
       book1.visible.should be false
       book2 = Workbook.open(@different_file, :visible => true)
       book2.excel.Visible.should be true
       book2.Windows(book2.Name).Visible.should be true
       book2.visible.should be true
-      book2.excel.visible.should be true
-      book2.excel.displayalerts.should == :if_visible
+      book2.excel.properties[:visible].should be true
+      book2.excel.properties[:displayalerts].should == :if_visible
       book2.excel.DisplayAlerts.should be true
     end
   end
@@ -663,8 +662,8 @@ describe Workbook do
       it "should create and use a hidden Excel instance" do
         book2 = Workbook.open(@simple_file1, :force_excel => @book.bookstore.hidden_excel)
         book2.excel.should_not == @book.excel
-        book2.excel.visible.should be false
-        book2.excel.displayalerts.should == :if_visible
+        book2.excel.properties[:visible].should be false
+        book2.excel.properties[:displayalerts].should == :if_visible
         book2.close 
       end
     end
@@ -774,8 +773,7 @@ describe Workbook do
     it "should color the cell" do
       @book1.set_namevalue_glob("new", "bar")
       @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == -4142
-      @book1.color_if_modified = 4
-      @book1.set_namevalue_glob("new", "bar")
+      @book1.set_namevalue_glob("new", "bar", :color => 4)
       @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 4
       @book1["new"].should == "bar"
       @book1["new"] = "bar"
@@ -784,15 +782,6 @@ describe Workbook do
       @book1.close
     end
 
-    it "should save without color (deprecated)" do
-      @book1.set_namevalue_glob("new", "bar", :color => 4)
-      @book1.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 4
-      @book1.save(:discoloring => true)
-      @book1.close
-      #book2 = Workbook.open(@simple_file1, :visible =>  true)
-      #book2.Names.Item("new").RefersToRange.Interior.ColorIndex.should == 0
-    end
-
   end
 
   describe "rename_range" do