robust_excel_ole 0.4 → 0.5

data/spec/sheet_spec.rb

@@ -23,7 +23,7 @@ describe Sheet do
     @blank_file = @dir + '/book_with_blank.xls'
     @merge_file = @dir + '/merge_cells.xls'
     @book = Book.open(@simple_file)
-    @sheet = @book[0]
+    @sheet = @book.sheet(1)
   end
 
   after do
@@ -38,7 +38,7 @@ describe Sheet do
         @key_sender = IO.popen  'ruby "' + File.join(File.dirname(__FILE__), '/helpers/key_sender.rb') + '" "Microsoft Office Excel" '  , "w"
         @book_protect = Book.open(@protected_file, :visible => true, :read_only => true, :force_excel => :new)
         @key_sender.puts "{p}{r}{o}{t}{e}{c}{t}{enter}"
-        @protected_sheet = @book_protect['protect']
+        @protected_sheet = @book_protect.sheet('protect')
       end
 
       after do
@@ -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)
-      @sheet_with_blank = @book_with_blank[0]
+      @sheet_with_blank = @book_with_blank.sheet(1)
     end
 
     after do
@@ -289,7 +289,7 @@ describe Sheet do
       context "read sheet which last cell is merged" do
         before do
           @book_merge_cells = Book.open(@merge_file)
-          @sheet_merge_cell = @book_merge_cells[0]
+          @sheet_merge_cell = @book_merge_cells.sheet(1)
         end
 
         after do
@@ -388,73 +388,114 @@ describe Sheet do
       end
     end
 
-    describe "nvalue" do
+    describe "nameval, set_nameval, [], []=" do
 
-      context "returning the value of a range" do
-      
-        before do
-          @book1 = Book.open(@dir + '/another_workbook.xls')
-          @sheet1 = @book1[0]
-        end
-
-        after do
-          @book1.close
-        end   
+      before do
+        @book1 = Book.open(@dir + '/another_workbook.xls')
+        @sheet1 = @book1.sheet(1)
+      end
 
-        it "should return value of a range with nvalue and brackets operator" do
-          @sheet1.nvalue("firstcell").should == "foo"
-          @sheet1["firstcell"].should == "foo"
-        end
+      after do
+        @book1.close(:if_unsaved => :forget)
+      end   
 
-        it "should raise an error if name not defined" do
-          expect {
-            value = @sheet1.nvalue("foo")
-          }.to raise_error(SheetError, /cannot evaluate name "foo" in sheet/)
-          expect {
-            @sheet1["foo"]
-          }.to raise_error(SheetError, /cannot evaluate name "foo" in sheet/)
-        end
+      it "should return value of a defined name" do
+        @sheet1.nameval("firstcell").should == "foo"
+        @sheet1["firstcell"].should == "foo"
+      end        
 
-        it "should return default value if name not defined and default value is given" do
-          @sheet1.nvalue("foo", :default => 2).should == 2
-        end
+      it "should return default value if name not defined and default value is given" do
+        @sheet1.nameval("foo", :default => 2).should == 2
+      end
 
-        it "should evaluate a formula" do
-          @sheet1.nvalue("named_formula").should == 4
-        end
+      it "should evaluate a formula" do
+        @sheet1.nameval("named_formula").should == 4
+        @sheet1["named_formula"].should == 4
       end
-    end
 
-    describe "set_nvalue" do
+      it "should raise an error if name not defined" do
+        expect {
+          @sheet1.nameval("foo")
+        }.to raise_error(SheetError, /cannot find or evaluate name "foo" in Sheet1/)
+        expect {
+          @sheet1["foo"]
+        }.to raise_error(SheetError, /cannot find or evaluate name "foo" in Sheet1/)
+      end
 
-      context "setting the value of a range" do
-      
-        before do
-          @book1 = Book.open(@dir + '/another_workbook.xls', :read_only => true)
-          @sheet1 = @book1[0]
-        end
+      it "should set a range to a value" do
+        @sheet1.nameval("firstcell").should == "foo"
+        @sheet1[1,1].Value.should == "foo"
+        @sheet1.set_nameval("firstcell","bar")
+        @sheet1.nameval("firstcell").should == "bar"
+        @sheet1[1,1].Value.should == "bar"
+        @sheet1["firstcell"] = "foo"
+        @sheet1.nameval("firstcell").should == "foo"
+        @sheet1[1,1].Value.should == "foo"
+      end
 
-        after do
-          @book1.close
-        end   
+      it "should raise an error if name cannot be evaluated" do
+        expect{
+          @sheet1.set_nameval("foo", 1)
+          }.to raise_error(SheetError, /name "foo" not in Sheet1/)
+        expect{
+          @sheet1["foo"] = 1
+          }.to raise_error(SheetError, /name "foo" not in Sheet1/)
+      end
+    end
 
-        it "should set a range to a value" do
-          @sheet1.nvalue("firstcell").should == "foo"
-          @sheet1[1,1].Value.should == "foo"
-          @sheet1.set_nvalue("firstcell","foo")
-          @sheet1.nvalue("firstcell").should == "foo"
-          @sheet1[1,1].Value.should == "foo"
-          @sheet1["firstcell"] = "bar"
-          @sheet1.nvalue("firstcell").should == "bar"
-          @sheet1[1,1].Value.should == "bar"
-        end
+    describe "rangeval, set_rangeval" do
+      
+      before do
+        @book1 = Book.open(@dir + '/another_workbook.xls')
+        @sheet1 = @book1.sheet(1)
+        @sheet2 = @book1.sheet(2)
+      end
 
-        it "should raise an error" do
-          expect{
-            @sheet1.nvalue("foo")
-            }.to raise_error(SheetError, /cannot evaluate name "foo" in sheet/)
-        end
+      after do
+        @book1.close(:if_unsaved => :forget)
+      end   
+
+      it "should return value of a locally defined name" do
+        @sheet1.rangeval("firstcell").should == "foo"          
+      end        
+
+      it "should return value of a defined name" do
+        @sheet1.rangeval("new").should == "foo"         
+        @sheet1.rangeval("one").should == 1.0    
+        @sheet1.rangeval("four").should == [[1,2],[3,4]]
+        @sheet1.rangeval("firstrow").should == [[1,2]]
+      end    
+
+      it "should return default value if name not defined and default value is given" do
+        @sheet1.rangeval("foo", :default => 2).should == 2
+      end
+
+      it "should raise an error if name not defined for the sheet" do
+        expect {
+          @sheet1.rangeval("foo")
+          }.to raise_error(SheetError, /name "foo" not in Sheet1/)
+        expect {
+          @sheet1.rangeval("named_formula")
+          }.to raise_error(SheetError, /name "named_formula" not in Sheet1/)
+        expect {
+          @sheet2.rangeval("firstcell")
+          }.to raise_error(SheetError, /name "firstcell" not in Sheet2/)
+      end
+    
+      it "should set a range to a value" do
+        @sheet1.rangeval("firstcell").should == "foo"
+        @sheet1[1,1].Value.should == "foo"
+        @sheet1.set_rangeval("firstcell","bar")
+        @sheet1.rangeval("firstcell").should == "bar"
+        @sheet1[1,1].Value.should == "bar"          
+      end
+
+      it "should raise an error if name cannot be evaluated" do
+        expect{
+          @sheet1.set_nameval("foo", 1)
+        }.to raise_error(SheetError, /name "foo" not in Sheet1/)
       end
+
     end
 
     describe "set_name" do
@@ -463,7 +504,7 @@ describe Sheet do
 
          before do
           @book1 = Book.open(@dir + '/another_workbook.xls', :read_only => true, :visible => true)
-          @sheet1 = @book1[0]
+          @sheet1 = @book1.sheet(1)
         end
 
         after do

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: robust_excel_ole
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
-  - 4
-  version: "0.4"
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - traths
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-03-16 00:00:00 +01:00
+date: 2016-06-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - lib/robust_excel_ole/excel.rb
 - lib/robust_excel_ole/general.rb
 - lib/robust_excel_ole/range.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/sheet.rb
@@ -121,6 +122,7 @@ files:
 - spec/helpers/create_temporary_dir.rb
 - spec/helpers/key_sender.rb
 - spec/range_spec.rb
+- spec/reo_common_spec.rb
 - spec/sheet_spec.rb
 - spec/spec_helper.rb
 - version.rb