geoloqi 0.9.2 → 0.9.3

data/README.markdown

@@ -45,6 +45,12 @@ This returns response['place_id'], which you can use to store and/or remove the
 
 Which returns response['result'] with a value of "ok".
 
+You can send query string parameters with get requests too:
+
+	geoloqi.get 'location/history', :count => 2
+	# or
+	geoloqi.get 'location/history?count=2'
+
 Implementing OAuth2
 ---
 

data/lib/geoloqi/session.rb

@@ -31,25 +31,26 @@ module Geoloqi
       Geoloqi.authorize_url @config.client_id, redirect_uri
     end
 
-    def get(path)
-      run :get, path
+    def get(path, query=nil)
+      run :get, path, query
     end
 
-    def post(path, body=nil)
-      run :post, path, body
+    def post(path, query=nil)
+      run :post, path, query
     end
 
-    def run(meth, path, body=nil)
+    def run(meth, path, query=nil)
+      query = Rack::Utils.parse_query query if query.is_a?(String)
       renew_access_token! if auth[:expires_at] && auth[:expires_at] <= Time.now
-
-      body = body.to_json if [Hash, Array].include? body.class
-
       retry_attempt = 0
       begin
         response = @connection.send(meth) do |req|
           req.url "/#{API_VERSION.to_s}/#{path.gsub(/^\//, '')}"
           req.headers = headers
-          req.body = body if body
+
+          if query
+            meth == :get ? req.params = query : req.body = query.to_json
+          end
         end
 
         json = JSON.parse response.body

data/lib/geoloqi/version.rb

@@ -1,3 +1,3 @@
 module Geoloqi
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/spec/geoloqi_spec.rb

@@ -65,13 +65,11 @@ describe Geoloqi::Session do
     end
 
     it 'successfully makes call to api with forward slash' do
-      response = @session.get '/layer/info/Gx'
-      expect { response['layer_id'] == 'Gx' }
+      expect { @session.get('/layer/info/Gx')['layer_id'] == 'Gx' }
     end
 
     it 'successfully makes call to api without forward slash' do
-      response = @session.get 'layer/info/Gx'
-      expect { response['layer_id'] == 'Gx' }
+      expect { @session.get('layer/info/Gx')['layer_id'] == 'Gx' }
     end
 
     it 'creates a layer, reads its info, and then deletes the layer' do
@@ -84,6 +82,18 @@ describe Geoloqi::Session do
       expect { layer_info['name'] == 'Test Layer' }
       expect { layer_delete['result'] == 'ok' }
     end
+
+    it 'makes a location/history call with get and hash params' do
+      expect { @session.get('location/history', :count => 2)['points'].count == 2 }
+    end
+    
+    it 'makes a location/history call with get and query string directly in path' do
+      expect { @session.get('location/history?count=2')['points'].count == 2 }
+    end
+    
+    it 'makes a location/history call with get and query string params' do
+      expect { @session.get('location/history', 'count=2')['points'].count == 2 }
+    end
   end
 
   describe 'with oauth id, secret, and access token via Geoloqi::Config' do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: geoloqi
 version: !ruby/object:Gem::Version 
-  hash: 63
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 2
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Kyle Drake
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 -07:00
+date: 2011-06-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -41,9 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -55,11 +44,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
         version: 0.5.0
   type: :development
   version_requirements: *id003
@@ -71,11 +55,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
         version: 2.2.2
   type: :development
   version_requirements: *id004
@@ -87,11 +66,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
         version: 1.6.4
   type: :development
   version_requirements: *id005
@@ -134,20 +108,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 19
-      segments: 
-      - 1
-      - 3
-      - 4
       version: 1.3.4
 requirements: []