solvebio 1.8.0 → 1.8.1

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.8.0
+current_version = 1.8.1
 files = lib/solvebio/version.rb
 commit = True
 tag = True

data/lib/solvebio/dataset.rb

@@ -20,7 +20,7 @@ module SolveBio
         def fields(name=nil, params={})
             unless self.fields_url
                 raise Exception,
-                'Please use Dataset.retrieve({ID}) before doing looking ' +
+                'Please use Dataset.retrieve({ID}) before looking ' +
                     'up fields'
             end
 
@@ -44,7 +44,7 @@ module SolveBio
             results
         end
 
-        def query(params={})
+        def query(query=nil, params={})
             unless self.respond_to?(:data_url)
                 unless self.respond_to?(:id)
                     raise Exception,
@@ -53,7 +53,15 @@ module SolveBio
                         'object with an ID or full_name.'
                 end
                 # automatically construct the data_url from the ID
-                self.data_url = url + '/data'
+                self.data_url = self.id.to_s + '/data'
+            end
+
+            # If no query string is passed, assume it is params
+            if query.is_a?(Hash)
+                params = query
+                query = nil
+            else
+                params.merge!(:query => query)
             end
 
             params.merge!(:data_url => self.data_url)

data/lib/solvebio/version.rb

@@ -1,3 +1,3 @@
 module SolveBio
-    VERSION = '1.8.0'
+    VERSION = '1.8.1'
 end

data/test/solvebio/test_query.rb

@@ -116,6 +116,14 @@ module SolveBio
             assert_equal(results[0...results.size].to_a, [])
             assert_equal(results[0], nil)
         end
+        
+        def test_query_string
+            results = @dataset.query('omim_ids:123631')
+            assert_equal(results.size, 1)
+
+            results = @dataset.query(:query => 'omim_ids:123631')
+            assert_equal(results.size, 1)
+        end
 
         # test Filtered Query in which limit is specified but is GREATER THAN
         #    the number of total available results

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solvebio
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc