intermine 0.98.04 → 0.98.05

data/lib/intermine/query.rb

@@ -356,6 +356,17 @@ module InterMine::PathQuery
             return doc
         end
 
+        # Return true if the other query has exactly
+        # the same configuration, and belongs to the same
+        # service.
+        def eql?(other)
+            if other.is_a? Query
+                return self.service == other.service && self.to_xml_to_s == other.to_xml.to_s
+            else
+                return false
+            end
+        end
+
         # Get your own result reader for handling the results at a low level.
         # If no columns have been selected for output before requesting results, 
         # all attribute columns will be selected.
@@ -498,11 +509,16 @@ module InterMine::PathQuery
         # Any columns ending in "*" will be interpreted as a request to add
         # all attribute columns from that table to the query
         #
+        # Any columns that name a class or reference will add the id of that
+        # object to the query. This is helpful for creating lists and other 
+        # specialist services.
+        #
         #   query = service.query("Gene")
         #   query.add_views("*")
         #   query.add_to_select("*")
         #   query.add_views("proteins.*")
         #   query.add_views("pathways.*", "organism.shortName")
+        #   query.add_views("proteins", "exons")
         #
         def add_views(*views)
             views.flatten.map do |x| 
@@ -514,6 +530,7 @@ module InterMine::PathQuery
                     add_views(attrs)
                 else
                     path = InterMine::Metadata::Path.new(y, @model, subclasses)
+                    path = InterMine::Metadata::Path.new(y.to_s + ".id", @model, subclasses) unless path.is_attribute?
                     if @root.nil?
                         @root = path.rootClass
                     end

data/lib/intermine/results.rb

@@ -333,7 +333,7 @@ module InterMine::Results
 
 
         # Get the parameters for this request, given the specified format.
-        def params(format)
+        def params(format="tab")
             p = @query.params.merge("start" => @start, "format" => format)
             p["size"] = @size unless @size.nil?
             return p

data/lib/intermine/service.rb

@@ -92,6 +92,7 @@ module InterMine
         extend Forwardable
 
         VERSION_PATH = "/version"
+        RELEASE_PATH = "/version/release"
         MODEL_PATH = "/model/json"
         TEMPLATES_PATH = "/templates"
         QUERY_RESULTS_PATH = "/query/results"
@@ -162,6 +163,11 @@ module InterMine
             @list_manager = InterMine::Lists::ListManager.new(self)
         end
 
+        # Return the release string
+        def release
+            return @release ||= fetch(@root + RELEASE_PATH)
+        end
+
         # call-seq:
         #   model() => Model
         #

data/lib/intermine/version.rb

@@ -1,3 +1,3 @@
 module Intermine
-  VERSION = "0.98.04"
+  VERSION = "0.98.05"
 end

data/test/live_test.rb

@@ -3,7 +3,28 @@ require File.dirname(__FILE__) + "/test_helper.rb"
 require "test/unit"
 require "intermine/service"
 
-class LiveTest < Test::Unit::TestCase
+class LiveDemoTest <  Test::Unit::TestCase
+
+    def setup
+        @service = Service.new("http://localhost:8080/intermine-test")
+    end
+
+    def testVersion
+        assert(@service.version >= 6)
+    end
+
+    def testRelease
+        assert_match(/test/i, @service.release)
+    end
+
+    def testCount
+        assert_equal(7, @service.query("Company").count)
+        assert_equal(3, @service.query("Department").where(:name => "Sales").count)
+    end
+
+end
+
+class LiveFlyMineTest < Test::Unit::TestCase
 
     def setup
         @service = Service.new("www.flymine.org/query")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: intermine
 version: !ruby/object:Gem::Version 
-  hash: 415
+  hash: 413
   prerelease: false
   segments: 
   - 0
   - 98
-  - 4
-  version: 0.98.04
+  - 5
+  version: 0.98.05
 platform: ruby
 authors: 
 - Alex Kalderimis