intermine 1.01.00 → 1.01.01

data/lib/intermine/model.rb

@@ -544,10 +544,20 @@ module Metadata
                     if fd.is_a?(ReferenceDescriptor)
                         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]
-                                    instance_variable_set("@" + fd.name, instance_var)
+                                if instance_variable_get("@" + fd.name).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?
+                                        instance_var = first_result[fd.name]
+                                        if instance_var.nil?
+                                            if fs.is_a?(CollectionDescriptor) and instance_var.nil?
+                                                instance_var = []
+                                            else
+                                                instance_variable_set("@" + fd.name + "_ISNULL", true)
+                                            end
+                                        end
+                                        instance_variable_set("@" + fd.name, instance_var)
+                                    end
                                 end
                                 return instance_variable_get("@" + fd.name)
                             end
@@ -576,18 +586,22 @@ 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"
+                                    unless 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
-                                    if val.is_a?(Hash)
+                                    if val.nil?
+                                        instance_variable_set("@" + fd.name + "_ISNULL", true)
+                                    elsif val.is_a?(Hash)
                                         val = type.model.make_new(type.name, val)
                                     end
                                     if !val.is_a?(type)

data/lib/intermine/version.rb

@@ -3,6 +3,7 @@ module Intermine
     # Webservice Client Version number
     #
     # Changes:
+    #   1.01.01 - Inproved 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
@@ -18,5 +19,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.00"
+    VERSION = "1.01.01"
 end

data/test/live_results.rb

@@ -8,7 +8,7 @@ require "intermine/results"
 class LiveResultsTest < Test::Unit::TestCase
 
     def setup
-        @service = Service.new("http://localhost/intermine-test")
+        @service = Service.new("http://localhost:8080/intermine-test")
         @max = 50
         @q = @service.query("Employee").select("*", "department.*").where(:age => {:lt => @max})
         @empty = @service.query("Employee").where(:name => "some-non-existant-value")
@@ -141,7 +141,7 @@ end
 class LiveTemplateResultsTest < LiveResultsTest 
 
     def setup
-        @service = Service.new("http://localhost/intermine-test")
+        @service = Service.new("http://localhost:8080/intermine-test")
         @q = @service.template("employeesOverACertainAgeFromDepartmentA")
         @empty = @q
         @exp_count = 18

data/test/live_summary_test.rb

@@ -6,7 +6,7 @@ require "intermine/service"
 class LiveSummaryTest < Test::Unit::TestCase
 
     def setup
-        @service = Service.new("http://localhost/intermine-test")
+        @service = Service.new("http://localhost:8080/intermine-test")
         @query = @service.query("Employee").where(:age => {:lt => 50})
     end
 

data/test/live_test.rb

@@ -6,7 +6,7 @@ require "intermine/service"
 class LiveDemoTest <  Test::Unit::TestCase
 
     def setup
-        @service = Service.new("http://localhost/intermine-test", "test-user-token")
+        @service = Service.new("http://localhost:8080/intermine-test", "test-user-token")
         @temp_lists = []
     end
 
@@ -72,7 +72,7 @@ class LiveDemoTest <  Test::Unit::TestCase
 
     def testLazyCollectionFetching
         list = @service.list("My-Favourite-Employees")
-        emps = list.map {|manager| manager.department.employees.map {|employee| employee.age} }
+        emps = list.map {|manager| manager.department.employees.map{|employee| employee.age}.sort }
         exp = [
             [34, 36, 41, 55, 61, 61],
             [44, 49, 62],

data/test/test_results.rb

@@ -11,7 +11,7 @@ q.add_views("name", "age")
 q.add_constraint({:path => "age", :op => ">", :value => 40})
 q.add_sort_order("age")
 params = {"query" => q.to_xml, "format" => "jsonrows"}
-uri = "http://squirrel.flymine.org/intermine-test/service/query/results"
+uri = "http://localhost:8080/intermine-test/service/query/results"
 rr = Results::ResultsReader.new(uri, params, q.views)
 sum, total = 0, 0
 rr.each_row {|emp| 

data/test/test_service.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH << File.expand_path( File.dirname(__FILE__) + '/../lib' )
 require "intermine/service"
 
-service = Service.new("http://squirrel.flymine.org/intermine-test/service")
+service = Service.new("http://localhost:8080/intermine-test/service")
 
 p service.version
 p service.model.name
@@ -20,7 +20,7 @@ end
 puts "Average => #{sum/total} - #{total} employees"
 puts
 
-tok_service = Service.new("http://squirrel.flymine.org/intermine-test/service", "a1v3V1X0f3hdmaybq0l6b7Z4eVG")
+tok_service = Service.new("http://localhost:8080/intermine-test/service", "a1v3V1X0f3hdmaybq0l6b7Z4eVG")
 
 q = tok_service.new_query("Employee")
 q.add_views("name", "age")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intermine
 version: !ruby/object:Gem::Version
-  version: 1.01.00
+  version: 1.01.01
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -90,11 +90,11 @@ files:
 - test/test_service.rb
 - test/test_sugar.rb
 - test/unit_tests.rb
-- MANIFEST
 - LICENCE
-- Rakefile
-- README.rdoc
 - Gemfile
+- MANIFEST
+- README.rdoc
+- Rakefile
 - contact_header.rdoc
 homepage: http://www.intermine.org
 licenses:
@@ -114,21 +114,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 150304175
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 150304175
 requirements: []
 rubyforge_project: intermine
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Webservice Client Library for InterMine Data-Warehouses