robust_excel_ole 1.16 → 1.17

data/spec/workbook_specs/workbook_unobtr_spec.rb

@@ -384,7 +384,7 @@ describe Workbook do
             book.visible.should be false
             book.writable.should be true
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
-            @new_value = book.sheet(1)[1,1].value
+            @new_value = book.sheet(1)[1,1].Value
             book.Saved.should be false
           end
           ole_wb = WIN32OLE.connect(@abs_filename)
@@ -393,8 +393,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be false
           ole_wb.Close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should_not == @old_value
-          book2.sheet(1)[1,1].value.should == @new_value
+          book2.sheet(1)[1,1].Value.should_not == @old_value
+          book2.sheet(1)[1,1].Value.should == @new_value
         end
 
         it "should modify and remain saved-status and not save the new value when writable => false" do
@@ -403,7 +403,7 @@ describe Workbook do
             book.visible.should be false
             book.writable.should be true
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
-            @new_value = book.sheet(1)[1,1].value
+            @new_value = book.sheet(1)[1,1].Value
             book.Saved.should be false
           end
           ole_wb = WIN32OLE.connect(@abs_filename)
@@ -412,8 +412,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be false
           ole_wb.Close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should == @old_value
-          book2.sheet(1)[1,1].value.should_not == @new_value
+          book2.sheet(1)[1,1].Value.should == @old_value
+          book2.sheet(1)[1,1].Value.should_not == @new_value
         end
 
       end
@@ -518,8 +518,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be false
           Excel.kill_all
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should_not == @old_value
-          book2.sheet(1)[1,1].value.should == @new_value
+          book2.sheet(1)[1,1].Value.should_not == @old_value
+          book2.sheet(1)[1,1].Value.should == @new_value
         end
 
         it "should not write with :writable => false" do
@@ -539,8 +539,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be false
           Excel.kill_all
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should == @old_value
-          book2.sheet(1)[1,1].value.should_not == @new_value
+          book2.sheet(1)[1,1].Value.should == @old_value
+          book2.sheet(1)[1,1].Value.should_not == @new_value
         end
 
       end
@@ -596,8 +596,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be true
           ole_wb.Close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should == @old_value
-          book2.sheet(1)[1,1].value.should_not == @new_value
+          book2.sheet(1)[1,1].Value.should == @old_value
+          book2.sheet(1)[1,1].Value.should_not == @new_value
         end
 
         it "should remain read-only when modifying" do
@@ -614,8 +614,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be true
           ole_wb.Close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should_not == @old_value
-          book2.sheet(1)[1,1].value.should == @new_value
+          book2.sheet(1)[1,1].Value.should_not == @old_value
+          book2.sheet(1)[1,1].Value.should == @new_value
         end
 
         it "should remain read-only when modifying" do
@@ -632,8 +632,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be true
           ole_wb.Close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should_not == @old_value
-          book2.sheet(1)[1,1].value.should == @new_value
+          book2.sheet(1)[1,1].Value.should_not == @old_value
+          book2.sheet(1)[1,1].Value.should == @new_value
         end
 
         it "should remain read-only when modifying and not save changes, when :writable => false" do
@@ -650,8 +650,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be true
           ole_wb.Close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should == @old_value
-          book2.sheet(1)[1,1].value.should_not == @new_value
+          book2.sheet(1)[1,1].Value.should == @old_value
+          book2.sheet(1)[1,1].Value.should_not == @new_value
         end
 
         it "should remain read-only when modifying and not save changes, when :writable => false" do
@@ -668,8 +668,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be true
           ole_wb.Close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should == @old_value
-          book2.sheet(1)[1,1].value.should_not == @new_value
+          book2.sheet(1)[1,1].Value.should == @old_value
+          book2.sheet(1)[1,1].Value.should_not == @new_value
         end
 
 
@@ -687,8 +687,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be true
           ole_wb.Close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should == @old_value
-          book2.sheet(1)[1,1].value.should_not == @new_value
+          book2.sheet(1)[1,1].Value.should == @old_value
+          book2.sheet(1)[1,1].Value.should_not == @new_value
         end
 
         it "should remain read-only when modifying and not save changes, even if :writable => true" do
@@ -705,8 +705,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be true
           ole_wb.Close
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should == @old_value
-          book2.sheet(1)[1,1].value.should_not == @new_value
+          book2.sheet(1)[1,1].Value.should == @old_value
+          book2.sheet(1)[1,1].Value.should_not == @new_value
         end
 
         it "should remain read-only when modifying and not save changes, when :writable => false" do
@@ -723,8 +723,8 @@ describe Workbook do
           ole_wb.ReadOnly.should be true
           Excel.kill_all
           book2 = Workbook.open(@simple_file1)
-          book2.sheet(1)[1,1].value.should == @old_value
-          book2.sheet(1)[1,1].value.should_not == @new_value
+          book2.sheet(1)[1,1].Value.should == @old_value
+          book2.sheet(1)[1,1].Value.should_not == @new_value
         end
 
 
@@ -935,7 +935,7 @@ describe Workbook do
               book.ReadOnly.should be true
               book.should == @book
               book.filename.should == @book.filename
-              book.excel.should == @book.excel
+              book.excel.should_not == @book.excel
               book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo" 
             end
             }.to raise_error(WorkbookReadOnly)
@@ -1013,7 +1013,7 @@ describe Workbook do
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
-            book.excel.should == @book.excel
+            book.excel.should_not == @book.excel
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
@@ -1026,7 +1026,7 @@ describe Workbook do
             book.Readonly.should be false
             book.should == @book
             book.filename.should == @book.filename
-            book.excel.should == @book.excel
+            book.excel.should_not == @book.excel
             book.sheet(1)[1,1] = book.sheet(1)[1,1].Value == "foo" ? "bar" : "foo"
           end
           @book.close
@@ -1612,7 +1612,7 @@ describe Workbook do
         Workbook.unobtrusively(@simple_file) do |book|
           book.should be_a Workbook
           book.excel.Visible.should be false
-          book.CheckCompatibility.should be false
+          book.CheckCompatibility.should be true
           book.ReadOnly.should be false
         end
       end
@@ -1677,7 +1677,7 @@ describe Workbook do
         expect{
           Workbook.unobtrusively(@simple_file, :if_closed => :invalid_option) do |book|
           end
-        }.to raise_error(TypeREOError, "given object is neither an Excel, a Workbook, nor a Win32ole")
+        }.to raise_error(TypeREOError, "provided Excel option value is neither an Excel object nor a valid option")
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust_excel_ole
 version: !ruby/object:Gem::Version
-  version: '1.16'
+  version: '1.17'
 platform: ruby
 authors:
 - traths
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -85,7 +85,8 @@ files:
 - lib/jreo_console.rb
 - lib/reo_console.rb
 - lib/robust_excel_ole.rb
-- lib/robust_excel_ole/address.rb
+- lib/robust_excel_ole/address_tool.rb
+- lib/robust_excel_ole/base.rb
 - lib/robust_excel_ole/bookstore.rb
 - lib/robust_excel_ole/cell.rb
 - lib/robust_excel_ole/cygwin.rb
@@ -93,7 +94,6 @@ files:
 - lib/robust_excel_ole/general.rb
 - lib/robust_excel_ole/range.rb
 - lib/robust_excel_ole/range_owners.rb
-- lib/robust_excel_ole/reo_common.rb
 - lib/robust_excel_ole/robustexcelole.sublime-project
 - lib/robust_excel_ole/robustexcelole.sublime-workspace
 - lib/robust_excel_ole/version.rb
@@ -102,7 +102,8 @@ files:
 - lib/spec_helper.rb
 - reo.bat
 - robust_excel_ole.gemspec
-- spec/address_spec.rb
+- spec/address_tool_spec.rb
+- spec/base_spec.rb
 - spec/bookstore_spec.rb
 - spec/cell_spec.rb
 - spec/cygwin_spec.rb
@@ -126,7 +127,6 @@ files:
 - spec/helpers/create_temporary_dir.rb
 - spec/helpers/key_sender.rb
 - spec/range_spec.rb
-- spec/reo_common_spec.rb
 - spec/spec_helper.rb
 - spec/workbook_spec.rb
 - spec/workbook_specs/workbook_all_spec.rb

data/spec/address_spec.rb

@@ -1,174 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require File.join(File.dirname(__FILE__), './spec_helper')
-require File.expand_path( '../../lib/robust_excel_ole/reo_common', __FILE__)
-
-$VERBOSE = nil
-
-include General
-include RobustExcelOle
-
-module RobustExcelOle
-
-  describe Address do
-
-    before(:all) do
-      excel = Excel.new(:reuse => true)
-      open_books = excel == nil ? 0 : excel.Workbooks.Count
-      puts "*** open books *** : #{open_books}" if open_books > 0
-      Excel.kill_all
-      @dir = create_tmpdir
-      @simple_file = @dir + '/workbook.xls'
-      @book = Workbook.open(@simple_file)
-    end
-
-    after(:all) do
-      @book.close
-    end
-
-    it "should transform relative r1c1-reference into r1c1-format" do
-      Address.r1c1("Z1S[2]:Z[-1]S4").should == "Z1S(2):Z(-1)S4"
-      Address.r1c1("Z[1]S2:Z3S[4]").should == "Z(1)S2:Z3S(4)"
-      Address.r1c1("Z1S[2]").should == "Z1S(2)"
-      Address.r1c1("Z[-1]S4").should == "Z(-1)S4"
-      Address.r1c1("Z[3]").should == "Z(3)"
-      Address.r1c1("S[-2]").should == "S(-2)"
-    end
-
-    # test for 1.8.6
-    it "should transform relative int_range-reference into r1c1-format" do
-      Address.r1c1([1..2,[3]..4]).should == "Z1S(3):Z2S4"
-      Address.r1c1([[1]..2,3..4]).should == "Z(1)S3:Z2S4"
-      Address.r1c1([[1]..2,nil]).should == "Z(1):Z2"
-      Address.r1c1([nil,[1]..2]).should == "S(1):S2"
-      Address.r1c1([nil,[1]]).should == "S(1):S(1)"
-    end
-
-    it "should transform relative int_range-reference into r1c1-format" do
-      Address.r1c1([1..[-2],[3]..4]).should == "Z1S(3):Z(-2)S4"
-      Address.r1c1([[1]..2,3..[4]]).should == "Z(1)S3:Z2S(4)"
-      Address.r1c1([1..[-2],nil]).should == "Z1:Z(-2)"
-      Address.r1c1([nil,[-1]..2]).should == "S(-1):S2"
-      Address.r1c1([[3]..[3],nil]).should == "Z(3):Z(3)"
-      Address.r1c1([nil,[-2]..[-2]]).should == "S(-2):S(-2)"
-      Address.r1c1([[3],nil]).should == "Z(3):Z(3)"
-    end
-
-    it "should transform relative r1c1-reference into r1c1-format" do
-      Address.int_range("Z1S[2]:Z[3]S4").should == [1..[3],[2]..4]
-      Address.int_range("Z[1]S2:Z3S[4]").should == [[1]..3,2..[4]]
-      Address.int_range("Z1S[2]").should == [1..1,[2]..[2]]
-      Address.int_range("Z[3]S4").should == [[3]..[3],4..4]
-    end
-
-    it "should transform a1-format" do
-      Address.a1("A2").should == "A2"
-      Address.r1c1("A2").should == "Z2S1:Z2S1"
-      Address.int_range("A2").should == [2..2,1..1]
-    end
-
-    it "should transform several-letter-a1-format" do
-      Address.a1("ABO15").should == "ABO15"
-      Address.r1c1("ABO15").should == "Z15S743:Z15S743"
-      Address.int_range("ABO15").should == [15..15,743..743]
-    end
-
-    it "should transform complex a1-format" do
-      Address.a1("A2:B3").should == "A2:B3"
-      Address.r1c1("A2:B3").should == "Z2S1:Z3S2"
-      Address.int_range("A2:B3").should == [2..3,1..2]
-      Address.a1("S1:DP2").should == "S1:DP2"
-      Address.r1c1("S1:DP2").should == "Z1S19:Z2S120"
-      Address.int_range("S1:DP2").should == [1..2,19..120]
-    end
-
-    it "should transform infinite a1-format" do
-      Address.a1("A:B").should == "A:B"
-      Address.r1c1("A:B").should == "S1:S2"
-      Address.int_range("A:B").should == [nil,1..2]
-      Address.a1("1:3").should == "1:3"
-      Address.r1c1("1:3").should == "Z1:Z3"
-      Address.int_range("1:3").should == [1..3,nil]
-      Address.a1("B").should == "B"
-      Address.r1c1("B").should == "S2:S2"
-      Address.int_range("B").should == [nil,2..2]
-      Address.a1("3").should == "3"
-      Address.r1c1("3").should == "Z3:Z3"
-      Address.int_range("3").should == [3..3,nil]
-    end
-
-    it "should transform r1c1-format" do
-      Address.r1c1("Z2S1").should == "Z2S1"
-      Address.int_range("Z2S1").should == [2..2,1..1]
-      expect{
-        Address.a1("Z2S1")
-      }.to raise_error(NotImplementedREOError)
-    end
-
-    it "should transform complex r1c1-format" do
-      Address.r1c1("Z2S1:Z3S2").should == "Z2S1:Z3S2"
-      Address.int_range("Z2S1:Z3S2").should == [2..3,1..2]
-    end
-
-    it "should transform int_range format" do
-      Address.int_range([2..2,1..1]).should == [2..2,1..1]
-      Address.r1c1([2..2,1..1]).should == "Z2S1:Z2S1"
-      expect{
-        Address.a1([2..2,1..1])
-      }.to raise_error(NotImplementedREOError)
-    end
-
-    it "should transform simple int_range format" do
-      Address.int_range([2,1]).should == [2..2,1..1]
-      Address.r1c1([2,1]).should == "Z2S1:Z2S1"
-    end
-
-    it "should transform complex int_range format" do
-      Address.int_range([2,"A"]).should == [2..2,1..1]
-      Address.r1c1([2,"A"]).should == "Z2S1:Z2S1"
-      Address.int_range([2,"A".."B"]).should == [2..2,1..2]
-      Address.r1c1([2,"A".."B"]).should == "Z2S1:Z2S2"
-      Address.int_range([1..2,"C"]).should == [1..2,3..3]
-      Address.r1c1([1..2,"C"]).should == "Z1S3:Z2S3"
-      Address.int_range([1..2,"C".."E"]).should == [1..2,3..5]
-      Address.r1c1([1..2,"C".."E"]).should == "Z1S3:Z2S5"
-      Address.int_range([2,3..5]).should == [2..2,3..5]
-      Address.r1c1([2,3..5]).should == "Z2S3:Z2S5"
-      Address.int_range([1..2,3..5]).should == [1..2,3..5]
-      Address.r1c1([1..2,3..5]).should == "Z1S3:Z2S5"
-    end
-
-    it "should transform infinite int_range format" do
-      Address.int_range([nil,1..2]).should == [nil,1..2]
-      Address.r1c1([nil,1..2]).should == "S1:S2"
-      Address.int_range([1..3,nil]).should == [1..3,nil]
-      Address.r1c1([1..3,nil]).should == "Z1:Z3"
-      Address.int_range([nil,2]).should == [nil,2..2]
-      Address.r1c1([nil,2]).should == "S2:S2"
-      Address.int_range([3,nil]).should == [3..3,nil]
-      Address.r1c1([3,nil]).should == "Z3:Z3"
-    end
-  
-    it "should raise an error" do
-      expect{
-        Address.a1("1A")
-      }.to raise_error(AddressInvalid, /format not correct/)
-      expect{
-        Address.r1c1("A1B")
-      }.to raise_error(AddressInvalid, /format not correct/)
-      #expect{
-      #  Address.int_range(["A".."B","C".."D"])
-      #}.to raise_error(AddressInvalid, /format not correct/)
-      #expect{
-      #  Address.int_range(["A".."B",1..2])
-      #}.to raise_error(AddressInvalid, /format not correct/)
-      #expect{
-      #  Address.int_range(["A".."B",nil])
-      #}.to raise_error(AddressInvalid, /format not correct/)
-      expect{
-        Address.int_range(["A",1,2])
-      }.to raise_error(AddressInvalid, /more than two components/)
-    end
-
-  end
-end