intermine 0.99.00 → 0.99.01

data/lib/intermine/query.rb

@@ -723,8 +723,11 @@ module InterMine::PathQuery
         #
         def add_sort_order(path, direction="ASC") 
             p = self.path(path)
-            if !@views.include? p
-                raise ArgumentError, "Sort order (#{p}) not in view (#{@views.map {|v| v.to_s}.inspect} in #{self.name || 'unnamed query'})"
+            selected = @views.map {|v| v.prefix}
+            selected.push(@constraints.map {|c| c.path.is_attribute? ? c.path.prefix : c.path })
+            selected.uniq!
+            if !selected.include? p.prefix
+                raise ArgumentError, "Sort order (#{p}) not on a selected class (#{selected.map {|v| v.to_s}.inspect} in #{self.name || 'unnamed query'})"
             end
             @sort_order << SortOrder.new(p, direction)
             return self

data/lib/intermine/version.rb

@@ -14,5 +14,6 @@ module Intermine
     #   0.98.08 - Added column summary support
     #   0.99.00 - Added coercion from query to lists in "IN/NOT IN" constraints
     #           - Added support for "json" format (performance) improvement
-    VERSION = "0.99.00"
+    #   0.99.01 - Added support for sort-orders on selected classes which are not in the view
+    VERSION = "0.99.01"
 end

data/test/test_query.rb

@@ -848,6 +848,12 @@ class TestQuery < Test::Unit::TestCase
 
         assert_equal(query.sort_order.last.path, "Employee.name")
         assert_equal(query.sort_order.last.direction, "DESC")
+
+        query.add_sort_order("fullTime")
+
+        assert_equal(query.sort_order.last.path, "Employee.fullTime")
+        assert_equal(query.sort_order.last.direction, "ASC")
+
     end
 
     def test_subclassed_sort_order

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: intermine
 version: !ruby/object:Gem::Version 
-  hash: 403
+  hash: 401
   prerelease: 
   segments: 
   - 0
   - 99
-  - 0
-  version: 0.99.00
+  - 1
+  version: 0.99.01
 platform: ruby
 authors: 
 - Alex Kalderimis