robust_excel_ole 1.3 → 1.4

data/spec/{sheet_spec.rb → worksheet_spec.rb}

@@ -7,7 +7,7 @@ $VERBOSE = nil
 include RobustExcelOle
 include General
 
-describe Sheet do
+describe Worksheet do
  
   before(:all) do
     excel = Excel.new(:reuse => true)
@@ -22,7 +22,7 @@ describe Sheet do
     @protected_file = @dir + '/protected_sheet.xls'
     @blank_file = @dir + '/book_with_blank.xls'
     @merge_file = @dir + '/merge_cells.xls'
-    @book = Book.open(@simple_file)
+    @book = Workbook.open(@simple_file)
     @sheet = @book.sheet(1)
   end
 
@@ -36,7 +36,7 @@ describe Sheet do
     context "when open sheet protected(with password is 'protect')" do
       before do
         @key_sender = IO.popen  'ruby "' + File.join(File.dirname(__FILE__), '/helpers/key_sender.rb') + '" "Microsoft Excel" '  , "w"
-        @book_protect = Book.open(@protected_file, :visible => true, :read_only => true, :force_excel => :new)
+        @book_protect = Workbook.open(@protected_file, :visible => true, :read_only => true, :force_excel => :new)
         @book_protect.excel.displayalerts = false
         @key_sender.puts "{p}{r}{o}{t}{e}{c}{t}{enter}"
         @protected_sheet = @book_protect.sheet('protect')
@@ -60,7 +60,7 @@ describe Sheet do
 
   shared_context "sheet 'open book with blank'" do
     before do
-      @book_with_blank = Book.open(@blank_file, :read_only => true)
+      @book_with_blank = Workbook.open(@blank_file, :read_only => true)
       @sheet_with_blank = @book_with_blank.sheet(1)
     end
 
@@ -71,7 +71,7 @@ describe Sheet do
 
   describe "workbook" do
     before do
-      @book = Book.open(@simple_file)
+      @book = Workbook.open(@simple_file)
       @sheet = @book.sheet(1)
     end
 
@@ -117,21 +117,21 @@ describe Sheet do
       context "access [1,1]" do
 
         it { @sheet[1, 1].should be_kind_of Cell }
-        it { @sheet[1, 1].value.should eq 'foo' }
+        it { @sheet[1, 1].Value.should eq 'foo' }
       end
 
       context "access [1, 1], [1, 2], [3, 1]" do
         it "should get every values" do
-          @sheet[1, 1].value.should eq 'foo'
-          @sheet[1, 2].value.should eq 'workbook'
-          @sheet[3, 1].value.should eq 'matz'
+          @sheet[1, 1].Value.should eq 'foo'
+          @sheet[1, 2].Value.should eq 'workbook'
+          @sheet[3, 1].Value.should eq 'matz'
         end
       end
 
       context "supplying nil as parameter" do
         it "should access [1,1]" do
-          @sheet[1, nil].value.should eq 'foo'
-          @sheet[nil, 1].value.should eq 'foo'
+          @sheet[1, nil].Value.should eq 'foo'
+          @sheet[nil, 1].Value.should eq 'foo'
         end
       end
 
@@ -146,12 +146,12 @@ describe Sheet do
 
     it "change a cell to 'bar'" do
       @sheet[1, 1] = 'bar'
-      @sheet[1, 1].value.should eq 'bar'
+      @sheet[1, 1].Value.should eq 'bar'
     end
 
     it "should change a cell to nil" do
       @sheet[1, 1] = nil
-      @sheet[1, 1].value.should eq nil
+      @sheet[1, 1].Value.should eq nil
     end
 
     it "should raise error for bad ranges" do
@@ -175,17 +175,27 @@ describe Sheet do
     describe "range" do
 
       it "should create a range of one cell" do
-        @sheet.range(1,1).values.should == ["foo"]
+        @sheet.range([1,2]).values.should == ["workbook"]
+        @sheet.range(["B1"]).values.should == ["workbook"]
+        @sheet.range("B1").values.should == ["workbook"]
       end
 
       it "should create a rectangular range" do
+        @sheet.range([1..3,2..4]).values.should == ["workbook", "sheet1", nil, nil, "foobaaa", nil, "is", "nice", nil]
+        @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]
+      end
+
+      it "should accept old interface" do
         @sheet.range(1..3,2..4).values.should == ["workbook", "sheet1", nil, nil, "foobaaa", nil, "is", "nice", nil]
+        @sheet.range(1..3, "B".."D").values.should == ["workbook", "sheet1", nil, nil, "foobaaa", nil, "is", "nice", nil]     
       end
 
       it "should raise an error" do
         expect{
-          @sheet.range(0,0)
-          }.to raise_error(RangeNotCreated, "cannot create range (0..0,0..0)")
+          @sheet.range([0,0])
+          }.to raise_error(AddressInvalid, /not in/)
       end
 
     end
@@ -195,17 +205,17 @@ describe Sheet do
         @sheet.each_with_index do |cell, i|
           case i
           when 0
-            cell.value.should eq 'foo'
+            cell.Value.should eq 'foo'
           when 1
-            cell.value.should eq 'workbook'
+            cell.Value.should eq 'workbook'
           when 2
-            cell.value.should eq 'sheet1'
+            cell.Value.should eq 'sheet1'
           when 3
-            cell.value.should eq 'foo'
+            cell.Value.should eq 'foo'
           when 4
-            cell.value.should be_nil
+            cell.Value.should be_nil
           when 5
-            cell.value.should eq 'foobaaa'
+            cell.Value.should eq 'foobaaa'
           end
         end
       end
@@ -217,15 +227,15 @@ describe Sheet do
           @sheet_with_blank.each_with_index do |cell, i|
             case i
             when 5
-              cell.value.should be_nil
+              cell.Value.should be_nil
             when 6
-              cell.value.should eq 'simple'
+              cell.Value.should eq 'simple'
             when 7
-              cell.value.should be_nil
+              cell.Value.should be_nil
             when 8
-              cell.value.should eq 'workbook'
+              cell.Value.should eq 'workbook'
             when 9
-              cell.value.should eq 'sheet1'
+              cell.Value.should eq 'sheet1'
             end
           end
         end
@@ -243,7 +253,7 @@ describe Sheet do
       context "with argument 1" do
         it 'should read from second row' do
           @sheet.each_row(1) do |rows|
-            case rows.row
+            case rows.Row
             when 2
               rows.values.should eq ['foo', nil, 'foobaaa']
             when 3
@@ -258,7 +268,7 @@ describe Sheet do
 
         it 'should get from ["A1"]' do
           @sheet_with_blank.each_row do |rows|
-            case rows.row - 1
+            case rows.Row - 1
             when 0
               rows.values.should eq [nil, nil, nil, nil, nil]
             when 1
@@ -315,7 +325,7 @@ describe Sheet do
       context "with argument 1" do
         it "should read from second column" do
           @sheet.each_column(1) do |columns|
-            case columns.column
+            case columns.Column
             when 2
               columns.values.should eq ['workbook', nil, 'is']
             when 3
@@ -330,7 +340,7 @@ describe Sheet do
 
         it 'should get from ["A1"]' do
           @sheet_with_blank.each_column do |columns|
-            case columns.column- 1
+            case columns.Column- 1
             when 0
               columns.values.should eq [nil, nil, nil, nil, nil]
             when 1
@@ -348,7 +358,7 @@ describe Sheet do
 
       context "read sheet which last cell is merged" do
         before do
-          @book_merge_cells = Book.open(@merge_file)
+          @book_merge_cells = Workbook.open(@merge_file)
           @sheet_merge_cell = @book_merge_cells.sheet(1)
         end
 
@@ -450,7 +460,7 @@ describe Sheet do
 
     describe "[], []=" do
       before do
-        @book1 = Book.open(@dir + '/another_workbook.xls')
+        @book1 = Workbook.open(@dir + '/another_workbook.xls')
         @sheet1 = @book1.sheet(1)
       end
 
@@ -488,7 +498,7 @@ describe Sheet do
       it "should raise an error if name not defined" do
         expect {
           @sheet1["foo"]
-        }.to raise_error(NameNotFound, /name "foo" not in #<Sheet: Sheet1/)        
+        }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1/)        
       end
 
       it "should set a range to a value" do
@@ -502,14 +512,14 @@ describe Sheet do
       it "should raise an error if name cannot be evaluated" do
         expect{
           @sheet1["foo"] = 1
-          }.to raise_error(NameNotFound, /name "foo" not in #<Sheet: Sheet1/)
+          }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1/)
       end
     end
 
     describe "namevalue_glob, set_namevalue_glob" do
 
       before do
-        @book1 = Book.open(@dir + '/another_workbook.xls')
+        @book1 = Workbook.open(@dir + '/another_workbook.xls')
         @sheet1 = @book1.sheet(1)
       end
 
@@ -534,7 +544,7 @@ describe Sheet do
       it "should raise an error of coordinates are given instead of a defined name" do
         expect {
           @sheet1.namevalue_glob("A1")
-        }.to raise_error(NameNotFound, /name "A1" not in #<Sheet: Sheet1/)
+        }.to raise_error(NameNotFound, /name "A1" not in #<Worksheet: Sheet1/)
       end
 
       it "should return default value for a range with empty contents" do
@@ -552,7 +562,7 @@ describe Sheet do
       it "should raise an error if name cannot be evaluated" do
         expect{
           @sheet1.set_namevalue_glob("foo", 1)
-        }.to raise_error(NameNotFound, /name "foo" not in #<Sheet: Sheet1/)
+        }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1/)
       end
 
       it "should color the cell" do
@@ -567,7 +577,7 @@ describe Sheet do
     describe "namevalue, set_namevalue" do
       
       before do
-        @book1 = Book.open(@dir + '/another_workbook.xls')
+        @book1 = Workbook.open(@dir + '/another_workbook.xls')
         @sheet1 = @book1.sheet(1)
         @sheet2 = @book1.sheet(2)
       end
@@ -602,13 +612,13 @@ describe Sheet do
       it "should raise an error if name not defined for the sheet" do
         expect {
           @sheet1.namevalue("foo")
-          }.to raise_error(NameNotFound, /name "foo" not in #<Sheet: Sheet1/)
+          }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1/)
         expect {
           @sheet1.namevalue("named_formula")
-          }.to raise_error(NameNotFound, /name "named_formula" not in #<Sheet: Sheet1/)
+          }.to raise_error(NameNotFound, /name "named_formula" not in #<Worksheet: Sheet1/)
         expect {
           @sheet2.namevalue("firstcell")
-          }.to raise_error(NameNotFound, /name "firstcell" not in #<Sheet: Sheet2/)
+          }.to raise_error(NameNotFound, /name "firstcell" not in #<Worksheet: Sheet2/)
       end
     
       it "should set a range to a value" do
@@ -622,7 +632,7 @@ describe Sheet do
       it "should raise an error if name cannot be evaluated" do
         expect{
           @sheet1.set_namevalue_glob("foo", 1)
-        }.to raise_error(NameNotFound, /name "foo" not in #<Sheet: Sheet1/)
+        }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1/)
       end
 
       it "should raise an error if name not defined and default value is not provided" do
@@ -631,10 +641,10 @@ describe Sheet do
         }.to_not raise_error
         expect {
           @sheet1.namevalue("foo", :default => :__not_provided)
-        }.to raise_error(NameNotFound, /name "foo" not in #<Sheet: Sheet1 another_workbook/)
+        }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1 another_workbook/)
         expect {
           @sheet1.namevalue("foo")
-        }.to raise_error(NameNotFound, /name "foo" not in #<Sheet: Sheet1 another_workbook/)
+        }.to raise_error(NameNotFound, /name "foo" not in #<Worksheet: Sheet1 another_workbook/)
         @sheet1.namevalue("foo", :default => nil).should be_nil
         @sheet1.namevalue("foo", :default => 1).should == 1
         @sheet1.namevalue_glob("empty", :default => 1).should be_nil
@@ -654,7 +664,7 @@ describe Sheet do
       context "adding, renaming, deleting the name of a range" do
 
          before do
-          @book1 = Book.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
+          @book1 = Workbook.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
           @book1.excel.displayalerts = false
           @sheet1 = @book1.sheet(1)
         end
@@ -667,30 +677,30 @@ describe Sheet do
           expect{
             @sheet1[1,2].Name.Name
           }.to raise_error          
-          @sheet1.add_name("foo",1,2)
-          @sheet1[1,2].Name.Name.should == "Sheet1!foo"
+          @sheet1.add_name("foo",[1,2])
+          @sheet1.Range("foo").Address.should == "$B$1"
         end
 
         it "should rename an already named range with a giving address" do
           @sheet1[1,1].Name.Name.should == "Sheet1!firstcell"
-          @sheet1.add_name("foo",1,1)
-          @sheet1[1,1].Name.Name.should == "Sheet1!foo"
+          @sheet1.add_name("foo",[1..2,3..4])
+          @sheet1.Range("foo").Address.should == "$C$1:$D$2"
         end
 
         it "should raise an error" do
           expect{
-            @sheet1.add_name("foo", -2, 1)
-          }.to raise_error(RangeNotEvaluatable, /cannot add name "foo" to cell with row -2 and column 1/)
+            @sheet1.add_name("foo", [-2, 1])
+          }.to raise_error(RangeNotEvaluatable, /cannot add name "foo" to range/)
         end
 
         it "should rename a range" do
-          @sheet1.add_name("foo",1,1)
+          @sheet1.add_name("foo",[1,1])
           @sheet1.rename_range("foo","bar")
           @sheet1.namevalue_glob("bar").should == "foo"
         end
 
         it "should delete a name of a range" do
-          @sheet1.add_name("foo",1,1)
+          @sheet1.add_name("foo",[1,1])
           @sheet1.delete_name("foo")
           expect{
             @sheet1.namevalue_glob("foo")
@@ -698,7 +708,27 @@ describe Sheet do
         end
 
         it "should add a name of a rectangular range" do
-          @sheet1.add_name("foo",1..3,1..4)
+          @sheet1.add_name("foo",[1..3,1..4])
+          @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 a rectangular range" do
+          @sheet1.add_name("foo","A1:D3")
+          @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 a rectangular range" do
+          @sheet1.add_name("foo",["A1:D3"])
+          @sheet1["foo"].should == [["foo", "workbook", "sheet1", nil], ["foo", 1.0, 2.0, 4.0], ["matz", 3.0, 4.0, 4.0]] 
+        end
+
+        it "should use the old interface" do
+          @sheet1.add_name("foo",1..3,"A".."D")
+          @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 a rectangular range" do
+          @sheet1.add_name("foo",[1..3, "A".."D"])
           @sheet1["foo"].should == [["foo", "workbook", "sheet1", nil], ["foo", 1.0, 2.0, 4.0], ["matz", 3.0, 4.0, 4.0]] 
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robust_excel_ole
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - traths
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,14 +52,17 @@ files:
 - docs/README_ranges.rdoc
 - docs/README_save_close.rdoc
 - docs/README_sheet.rdoc
-- examples/edit_sheets/example_access_sheets_and_cells.rb
-- examples/edit_sheets/example_adding_sheets.rb
-- examples/edit_sheets/example_concating.rb
-- examples/edit_sheets/example_copying.rb
-- examples/edit_sheets/example_expanding.rb
-- examples/edit_sheets/example_naming.rb
-- examples/edit_sheets/example_ranges.rb
-- examples/edit_sheets/example_saving.rb
+- examples/introducing_examples/example_introducing.rb
+- 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_adding_sheets.rb
+- examples/modifying_sheets/example_concating.rb
+- examples/modifying_sheets/example_copying.rb
+- examples/modifying_sheets/example_expanding.rb
+- examples/modifying_sheets/example_naming.rb
+- examples/modifying_sheets/example_ranges.rb
+- examples/modifying_sheets/example_saving.rb
 - examples/open_save_close/example_control_to_excel.rb
 - examples/open_save_close/example_default_excel.rb
 - examples/open_save_close/example_force_excel.rb
@@ -76,7 +79,6 @@ files:
 - examples/open_save_close/example_unobtrusively.rb
 - lib/reo_console.rb
 - lib/robust_excel_ole.rb
-- lib/robust_excel_ole/book.rb
 - lib/robust_excel_ole/bookstore.rb
 - lib/robust_excel_ole/cell.rb
 - lib/robust_excel_ole/cygwin.rb
@@ -86,20 +88,12 @@ files:
 - 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/sheet.rb
 - lib/robust_excel_ole/version.rb
+- lib/robust_excel_ole/workbook.rb
+- lib/robust_excel_ole/worksheet.rb
 - lib/spec_helper.rb
 - reo.bat
 - robust_excel_ole.gemspec
-- spec/book_spec.rb
-- spec/book_specs/book_all_spec.rb
-- spec/book_specs/book_close_spec.rb
-- spec/book_specs/book_misc_spec.rb
-- spec/book_specs/book_open_spec.rb
-- spec/book_specs/book_save_spec.rb
-- spec/book_specs/book_sheet_spec.rb
-- spec/book_specs/book_subclass_spec.rb
-- spec/book_specs/book_unobtr_spec.rb
 - spec/bookstore_spec.rb
 - spec/cell_spec.rb
 - spec/cygwin_spec.rb
@@ -123,8 +117,17 @@ files:
 - spec/helpers/key_sender.rb
 - spec/range_spec.rb
 - spec/reo_common_spec.rb
-- spec/sheet_spec.rb
 - spec/spec_helper.rb
+- spec/workbook_spec.rb
+- spec/workbook_specs/workbook_all_spec.rb
+- spec/workbook_specs/workbook_close_spec.rb
+- spec/workbook_specs/workbook_misc_spec.rb
+- spec/workbook_specs/workbook_open_spec.rb
+- spec/workbook_specs/workbook_save_spec.rb
+- spec/workbook_specs/workbook_sheet_spec.rb
+- spec/workbook_specs/workbook_subclass_spec.rb
+- spec/workbook_specs/workbook_unobtr_spec.rb
+- spec/worksheet_spec.rb
 - version.rb
 homepage: https://github.com/Thomas008/robust_excel_ole
 licenses: