robust_excel_ole 1.8 → 1.9

data/spec/reo_common_spec.rb

@@ -36,109 +36,6 @@ module RobustExcelOle
       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 == (1..1)
-      end
-
-      it "should read a1-format with brackets" do
-        address = Address.new(["A1"])
-        address.rows.should == (1..1)
-        address.columns.should == (1..1)
-      end
-
-      it "should read a1-format" do
-        address = Address.new("ABO15")
-        address.columns.should == (743..743)
-        address.rows.should == (15..15)
-      end
-
-      it "should read a1-format when row and column are given separated" do
-        address = Address.new([1,"A"])
-        address.rows.should == (1..1)
-        address.columns.should == (1..1)
-      end
-
-      it "should read a1-format with rows as integer range" do
-        address = Address.new([2..4, "AB"])
-        address.rows.should == (2..4)
-        address.columns.should == (28..28)
-      end
-
-      it "should read a1-format with columns as string range" do
-        address = Address.new([2, "A".."C"])
-        address.rows.should == (2..2)
-        address.columns.should == (1..3)
-      end
-
-      it "should read a1-format with rows and columns as string range" do
-        address = Address.new([2..6, "A" .. "C"])
-        address.rows.should == (2..6)
-        address.columns.should == (1..3)
-      end
-
-      it "should read r1c1-format" do
-        address = Address.new([1,2])
-        address.rows.should == (1..1)
-        address.columns.should == (2..2)
-      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)
-      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)
-      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)
-      end
-
-      it "should read a1-format for a rectangular range" do
-        address = Address.new(["A1:B3"])
-        address.rows.should == (1..3)
-        address.columns.should == (1..2)
-      end
-
-      it "should read a1-format for a rectangular range without brackets" do
-        address = Address.new("A1:B3")
-        address.rows == (1..3)
-        address.columns == (1..2)
-      end
-
-      it "should read a1-format for a rectangular range with several letters" do
-        address = Address.new(["S1:DP2"])
-        address.rows.should == (1..2)
-        address.columns.should == (19..120)
-      end
-
-      it "should raise an error" do
-        expect{
-          Address.new("1A")
-        }.to raise_error(AddressInvalid, /not in A1/)
-        expect{
-          Address.new("A1B")
-        }.to raise_error(AddressInvalid, /not in A1/)
-        expect{
-          Address.new(["A".."B","C".."D"])
-        }.to raise_error(AddressInvalid, /not in A1/)
-        expect{
-          Address.new(["A",1,2])
-        }.to raise_error(AddressInvalid, /more than two components/)
-      end
-
-    end
-
     describe "trace" do
 
       it "should put some number" do

data/spec/workbook_spec.rb

@@ -210,7 +210,6 @@ describe Workbook do
 
     end
 
-
     context "with standard options" do
       before do
         @book = Workbook.open(@simple_file)
@@ -499,10 +498,20 @@ describe Workbook do
 
     context "with non-existing file" do
 
+      it "should create a workbook" do
+        File.delete @simple_save_file rescue nil
+        book = Workbook.create(@simple_save_file)
+        book.should be_a Workbook
+        book.ReadOnly.should be false
+        book.close
+        File.exist?(@simple_save_file).should be true
+      end
+
       it "should create a workbook" do
         File.delete @simple_save_file rescue nil
         book = Workbook.open(@simple_save_file, :if_absent => :create)
         book.should be_a Workbook
+        book.ReadOnly.should be false
         book.close
         File.exist?(@simple_save_file).should be true
       end
@@ -511,7 +520,8 @@ describe Workbook do
         File.delete @simple_save_file rescue nil
         expect {
           Workbook.open(@simple_save_file)
-        }.to raise_error(FileNotFound, "file #{General::absolute_path(@simple_save_file).gsub("/","\\").inspect} not found")
+        }.to raise_error(FileNotFound, "file nil not found" +
+          "\nHint: If you want to create a new file, use option :if_absent => :create or Workbook::create")
       end
     end
 

data/spec/workbook_specs/workbook_close_spec.rb

@@ -142,7 +142,8 @@ describe Workbook do
       it "should raise an error for invalid option" do
         expect {
           @book.close(:if_unsaved => :invalid_option)
-        }.to raise_error(OptionInvalid, ":if_unsaved: invalid option: :invalid_option") 
+        }.to raise_error(OptionInvalid, ":if_unsaved: invalid option: :invalid_option" +
+          "\nHint: Valid values are :raise, :save, :keep_open, :alert, :excel") 
       end
 
 

data/spec/workbook_specs/workbook_misc_spec.rb

@@ -1081,12 +1081,12 @@ describe Workbook do
     context "range" do
 
       before do
-        @book1 = Workbook.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
-        @book1.excel.displayalerts = false
+        @book1 = Workbook.open(@dir + '/another_workbook.xls', :visible => true)
       end
 
       it "should create a range from the name" do
         @book1.add_name("foo",[1..3,1..4])
+        @book1.save
         range = @book1.range("foo")
         range.Address.should == "$A$1:$D$3"
       end
@@ -1108,12 +1108,36 @@ describe Workbook do
         @book1.add_name("foo",[1,2])
         @book1.Names.Item("foo").Name.should == "foo"
         @book1.Names.Item("foo").Value.should == "=Sheet1!$B$1:$B$1"
-      end
-
-      it "should rename an already named range with a giving address" do
-        @book1.add_name("foo",[1,1])
+        @book1.add_name("foo",[1..2,2..4])
+        @book1.Names.Item("foo").Name.should == "foo"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$B$1:$D$2"
+        @book1.add_name("foo","B1")
+        @book1.Names.Item("foo").Name.should == "foo"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$B$1:$B$1"
+        @book1.add_name("foo","B1:D2")
+        @book1.Names.Item("foo").Name.should == "foo"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$B$1:$D$2"
+        @book1.add_name("foo","Z1S2")
+        @book1.Names.Item("foo").Name.should == "foo"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$B$1"
+        @book1.add_name("foo","Z1S2:Z2S4")
         @book1.Names.Item("foo").Name.should == "foo"
-        @book1.Names.Item("foo").Value.should == "=Sheet1!$A$1:$A$1"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$B$1:$D$2"
+        @book1.add_name("foo","A:B")
+        @book1.Names.Item("foo").Name.should == "foo"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$A:$B"
+        @book1.add_name("foo","1:2")
+        @book1.Names.Item("foo").Name.should == "foo"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$1:$2"
+        @book1.add_name("foo",[1..2,nil])
+        @book1.Names.Item("foo").Name.should == "foo"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$1:$2"
+        @book1.add_name("foo",[nil,1..2])
+        @book1.Names.Item("foo").Name.should == "foo"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$A:$B"
+        @book1.add_name("foo",[nil,"A".."B"])
+        @book1.Names.Item("foo").Name.should == "foo"
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$A:$B"
       end
 
       it "should raise an error" do
@@ -1140,6 +1164,16 @@ describe Workbook do
         @book1["foo"].should == [["foo", "workbook", "sheet1", nil], ["foo", 1.0, 2.0, 4.0], ["matz", 3.0, 4.0, 4.0]] 
       end
 
+      it "should add a name of an infinite row range" do
+        @book1.add_name("foo",[1..3, nil])
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$1:$3"
+      end
+
+      it "should add a name of an infinite column range" do
+        @book1.add_name("foo",[nil, "A".."C"])
+        @book1.Names.Item("foo").Value.should == "=Sheet1!$A:$C"
+      end
+
     end
   
     context "with compatibility" do      

data/spec/workbook_specs/workbook_open_spec.rb

@@ -1936,7 +1936,10 @@ describe Workbook do
           it "should raise an error, if :if_obstructed is invalid option" do
             expect {
               new_book = Workbook.open(@simple_file1, :if_obstructed => :invalid_option)
-            }.to raise_error(OptionInvalid, ":if_obstructed: invalid option: :invalid_option")
+            }.to raise_error(OptionInvalid, ":if_obstructed: invalid option: :invalid_option" +
+              "\nHint: Use the option :if_obstructed with values :forget or :save,
+             to close the old workbook, without or with saving before, respectively,
+             and to open the new workbook")
           end
         end
       end
@@ -1992,7 +1995,8 @@ describe Workbook do
         File.delete @simple_save_file rescue nil
         expect {
           Workbook.open(@simple_save_file, :if_absent => :raise)
-        }.to raise_error(FileNotFound, "file #{General::absolute_path(@simple_save_file).gsub("/","\\").inspect} not found")
+        }.to raise_error(FileNotFound, "file #{General::absolute_path(@simple_save_file).gsub("/","\\").inspect} not found" +
+          "\nHint: If you want to create a new file, use option :if_absent => :create or Workbook::create")
       end
 
       it "should create a workbook" do
@@ -2196,7 +2200,8 @@ describe Workbook do
         expected_path = Regexp.new(File.expand_path(path).gsub(/\//, "."))
         expect {
           Workbook.open(path)
-        }.to raise_error(FileNotFound, "file #{General::absolute_path(path).gsub("/","\\").inspect} not found")
+        }.to raise_error(FileNotFound, "file #{General::absolute_path(path).gsub("/","\\").inspect} not found" +
+          "\nHint: If you want to create a new file, use option :if_absent => :create or Workbook::create")
       end
     end
   end

data/spec/workbook_specs/workbook_save_spec.rb

@@ -267,7 +267,8 @@ describe Workbook do
         File.exist?(@simple_file_other_path1).should be true
         expect{
           @book2.save_as(@simple_file_other_path1, :if_exists => :overwrite, :if_obstructed => :invalid)
-        }.to raise_error(OptionInvalid, ":if_obstructed: invalid option: :invalid")
+        }.to raise_error(OptionInvalid, ":if_obstructed: invalid option: :invalid" +
+          "\nHint: Valid values are :raise, :overwrite, :alert, :excel")
       end
 
       it "should raise an error by default" do
@@ -322,7 +323,7 @@ describe Workbook do
           book_save = Workbook.open(@simple_save_file1, :excel => :new)
           expect{
             @book.save_as(@simple_save_file1, :if_exists => :overwrite)
-            }.to raise_error(WorkbookBeingUsed, "workbook is open and used in Excel")
+            }.to raise_error(WorkbookBeingUsed, "workbook is open and being used in an Excel instance")
           book_save.close
         end        
 
@@ -506,7 +507,8 @@ describe Workbook do
           @book.save_as(@simple_save_file1)
           expect {
             @book.save_as(@simple_save_file1, :if_exists => :invalid)
-            }.to raise_error(OptionInvalid, ':if_exists: invalid option: :invalid')
+            }.to raise_error(OptionInvalid, ':if_exists: invalid option: :invalid' +
+              "\nHint: Valid values are :raise, :overwrite, :alert, :excel")
         end
       end
     end

data/spec/worksheet_spec.rb

@@ -192,10 +192,21 @@ describe Worksheet do
 
     describe "range" do
 
+      it "should a range with relative r1c1-reference" do
+        @sheet.range(["Z1S[3]:Z[2]S8"]).Address.should == "$D$1:$H$3"
+        @sheet.range(["Z1S3:Z2S8"]).Address.should == "$C$1:$H$2"
+      end
+
+      it "should a range with relative integer-range-reference" do
+        @sheet.range([1..[2],[3]..8]).Address.should == "$D$1:$H$3"
+      end
+
       it "should create a range of one cell" do
         @sheet.range([1,2]).values.should == ["workbook"]
         @sheet.range(["B1"]).values.should == ["workbook"]
         @sheet.range("B1").values.should == ["workbook"]
+        @sheet.range(["Z1S2"]).values.should == ["workbook"]
+        @sheet.range("Z1S2").values.should == ["workbook"]
       end
 
       it "should create a rectangular range" do
@@ -203,6 +214,8 @@ describe Worksheet do
         @sheet.range([1..3, "B".."D"]).values.should == ["workbook", "sheet1", nil, nil, "foobaaa", nil, "is", "nice", nil]     
         @sheet.range(["B1:D3"]).values.should == ["workbook", "sheet1", nil, nil, "foobaaa", nil, "is", "nice", nil]
         @sheet.range("B1:D3").values.should == ["workbook", "sheet1", nil, nil, "foobaaa", nil, "is", "nice", nil]
+        @sheet.range(["Z1S2:Z3S4"]).values.should == ["workbook", "sheet1", nil, nil, "foobaaa", nil, "is", "nice", nil]
+        @sheet.range("Z1S2:Z3S4").values.should == ["workbook", "sheet1", nil, nil, "foobaaa", nil, "is", "nice", nil]
       end
 
       it "should accept old interface" do
@@ -210,10 +223,17 @@ describe Worksheet do
         @sheet.range(1..3, "B".."D").values.should == ["workbook", "sheet1", nil, nil, "foobaaa", nil, "is", "nice", nil]     
       end
 
+      it "should create infinite ranges" do
+        @sheet.range([1..3,nil]).Address.should == "$1:$3"
+        @sheet.range(nil,"B".."D").Address.should == "$B:$D"
+        @sheet.range("1:3").Address.should == "$1:$3"
+        @sheet.range("B:D").Address.should == "$B:$D"
+      end
+
       it "should raise an error" do
         expect{
           @sheet.range([0,0])
-          }.to raise_error(AddressInvalid, /not in/)
+          }.to raise_error(RangeNotCreated, /cannot create/)
       end
 
     end
@@ -659,10 +679,10 @@ describe Worksheet do
         }.to_not raise_error
         expect {
           @sheet1.namevalue("foo", :default => :__not_provided)
-        }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1 another_workbook/)
+        }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1/)
         expect {
           @sheet1.namevalue("foo")
-        }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1 another_workbook/)
+        }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1/)
         @sheet1.namevalue("foo", :default => nil).should be_nil
         @sheet1.namevalue("foo", :default => 1).should == 1
         @sheet1.namevalue_glob("empty", :default => 1).should be_nil
@@ -681,20 +701,28 @@ describe Worksheet do
 
       context "adding, renaming, deleting the name of a range" do
 
-         before do
-          @book1 = Workbook.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
-          @book1.excel.displayalerts = false
+        before do
+          @book1 = Workbook.open(@dir + '/another_workbook.xls', :visible => true)
           @sheet1 = @book1.sheet(1)
         end
 
         after do
-          @book1.close
+          @book1.close(:if_unsaved => :forget)
+        end
+
+        it "should add a name of a rectangular range using relative int-range-reference" do
+          @sheet1.add_name("foo",[[1]..3,1..[2]])
+          @sheet1.range("foo").Address.should == "$A$3:$D$5"
         end   
 
+        it "should add a name of a rectangular range using relative r1c1-reference" do
+          @sheet1.add_name("foo","Z[1]S3:Z1S[2]")
+          @sheet1.range("foo").Address.should == "$C$1:$D$5"
+          @sheet1.add_name("bar","Z[-3]S[-2]")
+          @sheet1.range("bar").Address.should == "$IV$1"
+        end  
+
         it "should name an unnamed range with a giving address" do
-          expect{
-            @sheet1[1,2].Name.Name
-          }.to raise_error          
           @sheet1.add_name("foo",[1,2])
           @sheet1.Range("foo").Address.should == "$B$1"
         end
@@ -750,6 +778,51 @@ describe Worksheet do
           @sheet1["foo"].should == [["foo", "workbook", "sheet1", nil], ["foo", 1.0, 2.0, 4.0], ["matz", 3.0, 4.0, 4.0]] 
         end
 
+        it "should add a name of another rectangular range" do
+          @sheet1.add_name("foo",[1..3, "A"])
+          @sheet1["foo"].should == [["foo"], ["foo"],["matz"]]
+          @sheet1.Range("foo").Address.should == "$A$1:$A$3"
+        end
+
+        it "should add a name of an infinite row range" do
+          @sheet1.add_name("foo",[1..3, nil])
+          @sheet1.Range("foo").Address.should == "$1:$3"
+        end
+
+        it "should add a name of an infinite column range" do
+          @sheet1.add_name("foo",[nil, "A".."C"])
+          @sheet1.Range("foo").Address.should == "$A:$C"
+        end
+
+        it "should add a name of an infinite column range" do
+          @sheet1.add_name("foo",[nil, 1..3])
+          @sheet1.Range("foo").Address.should == "$A:$C"
+        end
+
+        it "should add a name of an infinite column range" do
+          @sheet1.add_name("foo","A:C")
+          @sheet1.Range("foo").Address.should == "$A:$C"
+        end
+
+        it "should add a name of an infinite column range" do
+          @sheet1.add_name("foo","1:2")
+          @sheet1.Range("foo").Address.should == "$1:$2"
+        end
+
+        it "should name an range with a relative columns" do
+          @sheet1.add_name("foo",[1,2])
+          @sheet1.Range("foo").Address.should == "$B$1"
+          @sheet1.add_name("bar","Z3S[4]")
+          @sheet1.Range("bar").Address.should == "$E$3"
+        end
+
+        it "should name an range with a relative row" do
+          @sheet1.add_name("foo",[1,2])
+          @sheet1.Range("foo").Address.should == "$B$1"
+          @sheet1.add_name("bar","Z[3]S4")
+          @sheet1.Range("bar").Address.should == "$D$4"
+        end
+
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust_excel_ole
 version: !ruby/object:Gem::Version
-  version: '1.8'
+  version: '1.9'
 platform: ruby
 authors:
 - traths
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-31 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -57,6 +57,7 @@ files:
 - examples/introducing_examples/example_open.rb
 - examples/introducing_examples/example_range.rb
 - examples/modifying_sheets/example_access_sheets_and_cells.rb
+- examples/modifying_sheets/example_add_names.rb
 - examples/modifying_sheets/example_adding_sheets.rb
 - examples/modifying_sheets/example_concating.rb
 - examples/modifying_sheets/example_copying.rb
@@ -80,12 +81,14 @@ files:
 - examples/open_save_close/example_unobtrusively.rb
 - lib/reo_console.rb
 - lib/robust_excel_ole.rb
+- lib/robust_excel_ole/address.rb
 - lib/robust_excel_ole/bookstore.rb
 - lib/robust_excel_ole/cell.rb
 - lib/robust_excel_ole/cygwin.rb
 - lib/robust_excel_ole/excel.rb
 - 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
@@ -95,6 +98,7 @@ files:
 - lib/spec_helper.rb
 - reo.bat
 - robust_excel_ole.gemspec
+- spec/address_spec.rb
 - spec/bookstore_spec.rb
 - spec/cell_spec.rb
 - spec/cygwin_spec.rb
@@ -154,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: robust_excel_ole
-rubygems_version: 2.4.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: RobustExcelOle automates processing Excel workbooks in Windows by using the