intermine 0.99.01 → 0.99.02

data/lib/intermine/results.rb

@@ -101,7 +101,7 @@ module InterMine::Results
 
             cell = @results[idx]
 
-            raise IndexError, "Argument out of range" if cell.nil?
+            raise IndexError, "Argument out of range" if @columns[idx].nil?
 
             return value_of(cell)
         end

data/lib/intermine/version.rb

@@ -15,5 +15,6 @@ module Intermine
     #   0.99.00 - Added coercion from query to lists in "IN/NOT IN" constraints
     #           - Added support for "json" format (performance) improvement
     #   0.99.01 - Added support for sort-orders on selected classes which are not in the view
-    VERSION = "0.99.01"
+    #   0.99.02 - Fixed bug with null values in new result rows (resulting commonly from outer joins)
+    VERSION = "0.99.02"
 end

data/test/test_result_row.rb

@@ -12,9 +12,14 @@ class TestResults < Test::Unit::TestCase
         super
         file = File.new(
             File.dirname(__FILE__) + "/data/resultrow.json", "r")
+        file2 = File.new(
+            File.dirname(__FILE__) + "/data/resultrow_new.json", "r")
         @data = file.read
+        @data2 = file2.read
         @json = JSON.parse(@data)
+        @json2 = JSON.parse(@data2)
         @view = ["Company.departments.name","Company.departments.manager.name", "Company.departments.manager.age"]
+        @view2 = ["Company.departments.name","Company.departments.manager.name", "Company.departments.manager.age", "Company.address.address"]
         @bad_view = ["Company.departments.name","Company.departments.manager.name"]
     end
 
@@ -42,6 +47,31 @@ class TestResults < Test::Unit::TestCase
         end
     end
 
+    def test_array_access2
+
+        rr = NewResultRow.new(@data2, @view2)
+
+        assert_equal(rr[0], "DepartmentA1")
+        assert_equal(rr[1], "EmployeeA1")
+
+        rr = NewResultRow.new(@json2, @view2)
+
+        assert_equal(rr[0], "DepartmentA1")
+        assert_equal(rr[1], "EmployeeA1")
+
+        assert_equal(rr[1..2], ["EmployeeA1", 33])
+        assert_equal(rr[0, 2], ["DepartmentA1", "EmployeeA1"])
+
+        assert_equal(rr.first, "DepartmentA1")
+        assert_equal(rr[3], nil)
+        assert_equal(rr.last, nil)
+
+        assert_raise IndexError do
+            rr[4]
+        end
+
+    end
+
     def test_array_access
 
         rr = ResultsRow.new(@data, @view)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: intermine
 version: !ruby/object:Gem::Version 
-  hash: 401
+  hash: 407
   prerelease: 
   segments: 
   - 0
   - 99
-  - 1
-  version: 0.99.01
+  - 2
+  version: 0.99.02
 platform: ruby
 authors: 
 - Alex Kalderimis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-12 00:00:00 Z
+date: 2011-12-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json