intermine 0.99.02 → 0.99.03

data/lib/intermine/model.rb

@@ -580,8 +580,11 @@ module Metadata
                         klass.class_eval do 
                             define_method(fd.name) do 
                                 if instance_variable_get("@" + fd.name).nil?
-                                    q = __cd__.select(fd.name + ".*").where(:id => objectId)
-                                    instance_var = q.results.first[fd.name]
+                                    q = __cd__.select("id", fd.name + ".*").where(:id => objectId).outerjoin(fd.name)
+                                    instance_var = q.results.first.instance_variable_get('@' + fd.name)
+                                    if fd.is_a?(CollectionDescriptor) and instance_var.nil?
+                                        instance_var = []
+                                    end
                                     instance_variable_set("@" + fd.name, instance_var)
                                 end
                                 return instance_variable_get("@" + fd.name)
@@ -611,14 +614,16 @@ module Metadata
                                 type = fd.referencedType
                                 if fd.is_a?(CollectionDescriptor)
                                     instance_var = []
-                                    val.each do |item|
-                                        if item.is_a?(Hash)
-                                            item = type.model.make_new(type.name, item)
-                                        end
-                                        if !item.is_a?(type)
-                                            raise ArgumentError, "Arguments to #{fd.name} in #{@name} must be #{type.name}s"
+                                    if not val.nil?
+                                        val.each do |item|
+                                            if item.is_a?(Hash)
+                                                item = type.model.make_new(type.name, item)
+                                            end
+                                            if !item.is_a?(type)
+                                                raise ArgumentError, "Arguments to #{fd.name} in #{@name} must be #{type.name}s"
+                                            end
+                                            instance_var << item
                                         end
-                                        instance_var << item
                                     end
                                     instance_variable_set("@" + fd.name, instance_var)
                                 else

data/lib/intermine/version.rb

@@ -16,5 +16,6 @@ module Intermine
     #           - Added support for "json" format (performance) improvement
     #   0.99.01 - Added support for sort-orders on selected classes which are not in the view
     #   0.99.02 - Fixed bug with null values in new result rows (resulting commonly from outer joins)
-    VERSION = "0.99.02"
+    #   0.99.03 - Fixed handling of null references and empty collections in lazy reference fetching.
+    VERSION = "0.99.03"
 end

data/test/live_test.rb

@@ -76,10 +76,10 @@ class LiveDemoTest <  Test::Unit::TestCase
     def testLazyCollectionFetching
         list = @service.list("My-Favourite-Employees")
         emps = list.map {|manager| manager.department.employees.map {|employee| employee.age} }
-        exp = [[34, 36, 41, 55, 61, 61],
+        exp = [[41, 36, 55, 34, 61, 61],
               [44, 49, 62],
-              [30, 37, 45, 46, 58, 64],
-              [36, 37, 39, 49, 57, 59]]
+              [37, 45, 30, 64, 46, 58],
+              [37, 49, 39, 57, 36, 59]]
         assert_equal(exp, emps)
 
         sum = list.reduce(0) {|m, manager| m + manager.department.employees.reduce(0) {|n, emp| n + emp.age}}

metadata

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