robust_excel_ole 1.9 → 1.10

data/spec/range_spec.rb

@@ -55,7 +55,7 @@ describe RobustExcelOle::Range do
         @sheet = @book.sheet(1)
         @range = RobustExcelOle::Range.new(@sheet.ole_worksheet.UsedRange.Columns(1))
       end
-      it { @range.values.should eq ['foo', 'foo', 'matz'] }
+      it { @range.values.should eq ['foo', 'foo', 'matz', nil] }
     end
 
     context "read 'merge_cells.xls'" do
@@ -103,32 +103,53 @@ describe RobustExcelOle::Range do
   describe "#[]" do
     context "access [0]" do
       it { @range[0].should be_kind_of RobustExcelOle::Cell }
-      it { @range[0].Value.should eq 'simple' }
+      it { @range[0].v.should eq 'simple' }
     end
 
     context "access [2]" do
-      it { @range[2].Value.should eq 'sheet2' }
+      it { @range[2].v.should eq 'sheet2' }
     end
 
     context "access [0] and [1] and [2]" do
       it "should get every values" do
-        @range[0].Value.should eq 'simple'
-        @range[1].Value.should eq 'file'
-        @range[2].Value.should eq 'sheet2'
+        @range[0].v.should eq 'simple'
+        @range[1].v.should eq 'file'
+        @range[2].v.should eq 'sheet2'
       end
     end
   end
 
   describe "#v" do
 
-    context "v" do
+    context "v, v=" do
+
+      before do
+        @sheet1 = @book.sheet(1)
+      end
+
+      after do
+        @book.close(:if_unsaved => :forget)
+      end
 
       it "should return value" do
         @sheet[1,1].v.should == 'simple'
         @sheet.range(1..2,3..4).v.should == [["sheet2", nil], [nil, nil]] 
       end 
-    end
 
+      it "should set value of a cell and return its value" do
+        @sheet1[2,3].v.should == "foobaaa"
+        @sheet1[2,3].Value.should == "foobaaa"
+        @sheet1[2,3].v = "bar"
+        @sheet1[2,3].v.should == "bar"
+        @sheet1[2,3].Value.should == "bar"
+      end
+
+      it "should set value and return value of a rectangular range" do
+        @sheet1.range([1..2,3..5]).v.should == [["sheet1",nil,nil],["foobaaa",nil,nil]]
+        @sheet1.range([1..2,3..5]).v = [[1,2,3],[4,5,6]]
+        @sheet1.range([1..2,3..5]).v.should == [[1,2,3],[4,5,6]]
+      end
+    end
   end
 
   describe "#copy" do
@@ -152,61 +173,61 @@ describe RobustExcelOle::Range do
 
     it "should copy range" do
       @range1.copy([4,2])
-      @sheet1.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet1.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet1[4,2].Interior.ColorIndex.should == 4
     end
 
     it "should copy range when giving an address" do
       @range1.copy([4..5,2..4])
-      @sheet1.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet1.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet1[4,2].Interior.ColorIndex.should == 4
     end
 
     it "should copy range to another worksheet of another workbook" do
       @range1.copy([4,2], @sheet2)
-      @sheet2.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet2.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet2[4,2].Interior.ColorIndex.should == 4
     end
 
     it "should copy range to another worksheet of another workbook of another Excel instance" do
       @range1.copy([4,2], @sheet3)
-      @sheet3.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet3.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet3[4,2].Interior.ColorIndex.should == 4
     end
 
     it "should copy values only" do
       @range1.copy([4,2], @sheet1, :values_only => true)
-      @sheet1.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet1.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet1[4,2].Interior.ColorIndex.should == -4142
     end
 
     it "should copy values only to another worksheet of another Excel instance" do
       @range1.copy([4,2], @sheet3, :values_only => true)
-      @sheet3.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet3.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet3[4,2].Interior.ColorIndex.should == -4142
     end
 
     it "should copy and transpose with values only" do
       @range1.copy([4,2], @sheet1, :values_only => true, :transpose => true)
-      @sheet1.range([4..6,2..3]).Value.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
+      @sheet1.range([4..6,2..3]).v.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
       @sheet1[4,2].Interior.ColorIndex.should == -4142
     end
 
     it "should copy and transpose with values only into another Excel instance" do
       @range1.copy([4,2], @sheet3, :values_only => true, :transpose => true)
-      @sheet3.range([4..6,2..3]).Value.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
+      @sheet3.range([4..6,2..3]).v.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
       @sheet3[4,2].Interior.ColorIndex.should == -4142
     end
 
     it "should copy and transpose" do
       @range1.copy([4,2], @sheet1, :transpose => true)
-      @sheet1.range([4..6,2..3]).Value.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
+      @sheet1.range([4..6,2..3]).v.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
       @sheet1[4,2].Interior.ColorIndex.should == 4
     end
 
     it "should copy and transpose into another Excel instance" do
       @range1.copy([4,2], @sheet3, :transpose => true)
-      @sheet3.range([4..6,2..3]).Value.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
+      @sheet3.range([4..6,2..3]).v.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
       @sheet3[4,2].Interior.ColorIndex.should == 4
     end
   end
@@ -232,61 +253,61 @@ describe RobustExcelOle::Range do
 
     it "should copy range" do
       @range1.copy(4,2)
-      @sheet1.range(4..5,2..4).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet1.range(4..5,2..4).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet1[4,2].Interior.ColorIndex.should == 4
     end
 
     it "should copy range when giving an address" do
       @range1.copy(4..5,2..4)
-      @sheet1.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet1.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet1[4,2].Interior.ColorIndex.should == 4
     end
 
     it "should copy range to another worksheet of another workbook" do
       @range1.copy(4,2, @sheet2)
-      @sheet2.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet2.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet2[4,2].Interior.ColorIndex.should == 4
     end
 
     it "should copy range to another worksheet of another workbook of another Excel instance" do
       @range1.copy(4,2, @sheet3)
-      @sheet3.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet3.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet3[4,2].Interior.ColorIndex.should == 4
     end
 
     it "should copy values only" do
       @range1.copy(4,2, @sheet1, :values_only => true)
-      @sheet1.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet1.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet1[4,2].Interior.ColorIndex.should == -4142
     end
 
     it "should copy values only to another worksheet of another Excel instance" do
       @range1.copy(4,2, @sheet3, :values_only => true)
-      @sheet3.range([4..5,2..4]).Value.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
+      @sheet3.range([4..5,2..4]).v.should == [["foo", "workbook", "sheet1"],["foo", nil, "foobaaa"]]
       @sheet3[4,2].Interior.ColorIndex.should == -4142
     end
 
     it "should copy and transpose with values only" do
       @range1.copy(4,2, @sheet1, :values_only => true, :transpose => true)
-      @sheet1.range([4..6,2..3]).Value.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
+      @sheet1.range([4..6,2..3]).v.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
       @sheet1[4,2].Interior.ColorIndex.should == -4142
     end
 
     it "should copy and transpose with values only into another Excel instance" do
       @range1.copy(4,2, @sheet3, :values_only => true, :transpose => true)
-      @sheet3.range([4..6,2..3]).Value.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
+      @sheet3.range([4..6,2..3]).v.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
       @sheet3[4,2].Interior.ColorIndex.should == -4142
     end
 
     it "should copy and transpose" do
       @range1.copy(4,2, @sheet1, :transpose => true)
-      @sheet1.range([4..6,2..3]).Value.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
+      @sheet1.range([4..6,2..3]).v.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
       @sheet1[4,2].Interior.ColorIndex.should == 4
     end
 
     it "should copy and transpose into another Excel instance" do
       @range1.copy(4,2, @sheet3, :transpose => true)
-      @sheet3.range([4..6,2..3]).Value.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
+      @sheet3.range([4..6,2..3]).v.should == [["foo", "foo"],["workbook", nil],["sheet1","foobaaa"]]
       @sheet3[4,2].Interior.ColorIndex.should == 4
     end
 
@@ -294,7 +315,7 @@ describe RobustExcelOle::Range do
 
   describe "#method_missing" do
     it "can access COM method" do
-      @range.Range(@range.Cells.Item(1), @range.Cells.Item(3)).Value.should eq [@range.values(0..2)]
+      @range.Range(@range.Cells.Item(1), @range.Cells.Item(3)).v.should eq [@range.values(0..2)]
     end
 
     context "unknown method" do

data/spec/reo_common_spec.rb

@@ -121,6 +121,5 @@ module RobustExcelOle
       REOCommon::puts_hash(h)
  
     end
-
   end
 end

data/spec/workbook_spec.rb

@@ -669,7 +669,7 @@ describe Workbook do
 
     context "with two running excel instances" do
       before :all do
-        Excel.close_all
+        Excel.kill_all
       end
 
       before do
@@ -691,17 +691,17 @@ describe Workbook do
         Workbook.unobtrusively(@simple_file, :if_closed => :current) do |book|
           book.should be_a Workbook
           book.should be_alive
-            book.excel.should == @excel1
-            book.excel.should_not == @excel2
-          end
+          book.excel.should == @excel1
+          book.excel.should_not == @excel2
+        end
       end
 
       it "should open unobtrusively in a given Excel" do
         Workbook.unobtrusively(@simple_file, :if_closed => @excel2) do |book|
           book.should be_a Workbook
           book.should be_alive
-            book.excel.should_not == @excel1
-            book.excel.should     == @excel2
+          book.excel.should_not == @excel1
+          book.excel.should     == @excel2
         end
       end
     end

data/spec/workbook_specs/workbook_open_spec.rb

@@ -43,7 +43,8 @@ describe Workbook do
     before do
       @ole_excel1 = WIN32OLE.new('Excel.Application')
       @ole_excel2 = WIN32OLE.new('Excel.Application')
-      @ole_workbook1 = @ole_excel1.Workbooks.Open(@simple_file1, { 'ReadOnly' => false })
+      #@ole_workbook1 = @ole_excel1.Workbooks.Open(@simple_file1, { 'ReadOnly' => false })
+      @ole_workbook1 = @ole_excel1.Workbooks.Open(@simple_file1, nil, false)
       @ole_workbook1.Worksheets.Add
     end
 
@@ -401,7 +402,7 @@ describe Workbook do
       it "should yield identical Workbook objects when reopening and the Excel is closed" do
         @book.should be_alive
         @book.close
-        Excel.close_all
+        Excel.kill_all
         book2 = Workbook.open(@simple_file1)
         book2.should be_alive
         book2.should === @book
@@ -1192,7 +1193,7 @@ describe Workbook do
           excel2 = @book.excel
           fn = @book.filename
           @book.close
-          Excel.close_all
+          Excel.kill_all
           book2 = Workbook.open(@simple_file1, :default => {:excel => :current})
           book2.should be_alive
           book2.should be_a Workbook
@@ -1204,7 +1205,7 @@ describe Workbook do
 
         it "should reopen a book in the first opened Excel if the old Excel is closed" do
           excel = @book.excel
-          Excel.close_all
+          Excel.kill_all
           new_excel = Excel.new(:reuse => false)
           new_excel2 = Excel.new(:reuse => false)
           book2 = Workbook.open(@simple_file1, :default => {:excel => :current})
@@ -1220,7 +1221,7 @@ describe Workbook do
 
         it "should reopen a book in the first opened excel, if the book cannot be reopened" do
           @book.close
-          Excel.close_all
+          Excel.kill_all
           excel1 = Excel.new(:reuse => false)
           excel2 = Excel.new(:reuse => false)
           book2 = Workbook.open(@different_file, :default => {:excel => :current})
@@ -1384,7 +1385,7 @@ describe Workbook do
         excel2 = @book.excel
         fn = @book.filename
         @book.close
-        Excel.close_all
+        Excel.kill_all
         book2 = Workbook.open(@simple_file1, :default_excel => :current)
         book2.should be_alive
         book2.should be_a Workbook
@@ -1396,7 +1397,7 @@ describe Workbook do
 
       it "should reopen a book in the first opened Excel if the old Excel is closed" do
         excel = @book.excel
-        Excel.close_all
+        Excel.kill_all
         new_excel = Excel.new(:reuse => false)
         new_excel2 = Excel.new(:reuse => false)
         book2 = Workbook.open(@simple_file1, :default_excel => :current)
@@ -1412,7 +1413,7 @@ describe Workbook do
 
       it "should reopen a book in the first opened excel, if the book cannot be reopened" do
         @book.close
-        Excel.close_all
+        Excel.kill_all
         excel1 = Excel.new(:reuse => false)
         excel2 = Excel.new(:reuse => false)
         book2 = Workbook.open(@different_file, :default_excel => :current)
@@ -1584,7 +1585,7 @@ describe Workbook do
         excel2 = @book.excel
         fn = @book.filename
         @book.close
-        Excel.close_all
+        Excel.kill_all
         book2 = Workbook.open(@simple_file1, :default => {:excel => :active})
         book2.should be_alive
         book2.should be_a Workbook
@@ -1596,7 +1597,7 @@ describe Workbook do
 
       it "should reopen a book in the first opened Excel if the old Excel is closed" do
         excel = @book.excel
-        Excel.close_all
+        Excel.kill_all
         new_excel = Excel.new(:reuse => false)
         new_excel2 = Excel.new(:reuse => false)
         book2 = Workbook.open(@simple_file1, :default => {:excel => :active})
@@ -1612,7 +1613,7 @@ describe Workbook do
 
       it "should reopen a book in the first opened excel, if the book cannot be reopened" do
         @book.close
-        Excel.close_all
+        Excel.kill_all
         excel1 = Excel.new(:reuse => false)
         excel2 = Excel.new(:reuse => false)
         book2 = Workbook.open(@different_file, :default => {:excel => :active})
@@ -1695,7 +1696,7 @@ describe Workbook do
         excel2 = @book.excel
         fn = @book.filename
         @book.close
-        Excel.close_all
+        Excel.kill_all
         book2 = Workbook.open(@simple_file1, :default => {:excel => :reuse})
         book2.should be_alive
         book2.should be_a Workbook
@@ -1707,7 +1708,7 @@ describe Workbook do
 
       it "should reopen a book in the first opened Excel if the old Excel is closed" do
         excel = @book.excel
-        Excel.close_all
+        Excel.kill_all
         new_excel = Excel.new(:reuse => false)
         new_excel2 = Excel.new(:reuse => false)
         book2 = Workbook.open(@simple_file1, :default => {:excel => :reuse})
@@ -1723,7 +1724,7 @@ describe Workbook do
 
       it "should reopen a book in the first opened excel, if the book cannot be reopened" do
         @book.close
-        Excel.close_all
+        Excel.kill_all
         excel1 = Excel.new(:reuse => false)
         excel2 = Excel.new(:reuse => false)
         book2 = Workbook.open(@different_file, :default => {:excel => :reuse})

data/spec/workbook_specs/workbook_sheet_spec.rb

@@ -27,6 +27,7 @@ describe Workbook do
     @linked_file = @dir + '/workbook_linked.xlsm'
     @simple_file_xlsm = @dir + '/workbook.xls'
     @simple_file_xlsx = @dir + '/workbook.xlsx'
+    @file_with_references = @dir + '/test_add_sheet.xlsx'
   end
 
   after do
@@ -229,7 +230,8 @@ describe Workbook do
   describe "copy_sheet" do
 
     before do
-      @book = Workbook.open(@simple_file)
+      #@book = Workbook.open(@simple_file)
+      @book = Workbook.open(@file_with_references)
       @sheet = @book.sheet(1)
       @another_book = Workbook.open(@another_simple_file)
     end
@@ -239,6 +241,13 @@ describe Workbook do
       @another_book.close(:if_unsaved => :forget)
     end
 
+    it "should copy the second sheet, append it and leave the references so far" do
+      @book.add_sheet(@book.sheet(2), :after => @book.sheet(3))
+      @book.sheet(1)[2,1].Value.should == "x"
+      @book.sheet(1)[2,2].Value.should == "y"
+      @book.sheet(1)[2,3].Value.should == "z"
+    end
+
     it "should copy and append a given sheet" do
       @book.ole_workbook.Worksheets.Count.should == 3
       @book.copy_sheet @sheet

data/spec/workbook_specs/workbook_unobtr_spec.rb

@@ -1168,7 +1168,7 @@ describe Workbook do
     context "with no open book" do
 
       it "should open unobtrusively if no Excel is open" do
-        Excel.close_all
+        Excel.kill_all
         Workbook.unobtrusively(@simple_file) do |book|
           book.should be_a Workbook
           book.excel.Visible.should be false
@@ -1185,7 +1185,7 @@ describe Workbook do
     context "with two running excel instances" do
       
       before :all do
-        Excel.close_all
+        Excel.kill_all
       end
 
       before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust_excel_ole
 version: !ruby/object:Gem::Version
-  version: '1.9'
+  version: '1.10'
 platform: ruby
 authors:
 - traths
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -79,6 +79,8 @@ files:
 - examples/open_save_close/example_reuse.rb
 - examples/open_save_close/example_simple.rb
 - examples/open_save_close/example_unobtrusively.rb
+- jreo.bat
+- lib/jreo_console.rb
 - lib/reo_console.rb
 - lib/robust_excel_ole.rb
 - lib/robust_excel_ole/address.rb
@@ -110,6 +112,7 @@ files:
 - spec/data/protected_sheet.xls
 - spec/data/reference_workbook.xls
 - spec/data/referencing_wb.xls
+- spec/data/test_add_sheet.xlsx
 - spec/data/workbook.xls
 - spec/data/workbook.xlsm
 - spec/data/workbook.xlsx