intermine 1.01.01 → 1.02.00

data/lib/intermine/model.rb

@@ -32,6 +32,9 @@ module Metadata
         BOOL_TYPES = ["Boolean", "boolean"]
         NUMERIC_TYPES = FLOAT_TYPES | INT_TYPES
 
+        # Whether this is a lazy model
+        attr_accessor :is_lazy
+
         # The name of the model
         attr_reader :name
 
@@ -52,6 +55,7 @@ module Metadata
         def initialize(model_data, service=nil) 
             result = JSON.parse(model_data)
             @model = result["model"]
+            @is_lazy = false
             @service = service
             @name = @model["name"]
             @classes = {}
@@ -544,7 +548,8 @@ module Metadata
                     if fd.is_a?(ReferenceDescriptor)
                         klass.class_eval do 
                             define_method(fd.name) do 
-                                if instance_variable_get("@" + fd.name).nil? and not instance_variable_get("@" + fd.name + "_ISNULL")
+                                instance_var = instance_variable_get("@" + fd.name)
+                                if fd.referencedType.model.is_lazy and instance_var.nil? and not instance_variable_get("@" + fd.name + "_ISNULL")
                                     q = __cd__.select(:id, fd.name + ".*").where(:id => objectId).outerjoin(fd.name)
                                     first_result = q.results.first
                                     unless first_result.nil?
@@ -559,7 +564,11 @@ module Metadata
                                         instance_variable_set("@" + fd.name, instance_var)
                                     end
                                 end
-                                return instance_variable_get("@" + fd.name)
+                                if instance_var.nil? and fd.is_a?(CollectionDescriptor)
+                                    return []
+                                else
+                                    return instance_var
+                                end
                             end
                         end
                     end

data/lib/intermine/version.rb

@@ -3,7 +3,8 @@ module Intermine
     # Webservice Client Version number
     #
     # Changes:
-    #   1.01.01 - Inproved lazy reference fetching
+    #   1.02.00 - Allow the lazy fetching to be optional
+    #   1.01.01 - Improved lazy reference fetching
     #   1.01.00 - Test compatibility with 1.8.7, 1.9.2, 2.0.0-rc1
     #             Numerous bug fixes.
     #   1.00.00 - Up to make use of new features of the InterMine 1.0 API
@@ -19,5 +20,5 @@ module Intermine
     #   0.98.09 - Major changes to results - now with thorough-going Enumerable support
     #   0.98.08 - Added column summary support
     #
-    VERSION = "1.01.01"
+    VERSION = "1.02.00"
 end

data/test/live_test.rb

@@ -59,6 +59,7 @@ class LiveDemoTest <  Test::Unit::TestCase
     end
 
     def testLazyReferenceFetching
+        @service.model.is_lazy = true
         list = @service.list("My-Favourite-Employees")
 
         deps = list.map {|emp| emp.department.name }
@@ -71,6 +72,7 @@ class LiveDemoTest <  Test::Unit::TestCase
     end
 
     def testLazyCollectionFetching
+        @service.model.is_lazy = true
         list = @service.list("My-Favourite-Employees")
         emps = list.map {|manager| manager.department.employees.map{|employee| employee.age}.sort }
         exp = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intermine
 version: !ruby/object:Gem::Version
-  version: 1.01.01
+  version: 1.02.00
   prerelease: 
 platform: ruby
 authors: