geoloqi 0.9.11 → 0.9.12

data/lib/geoloqi/session.rb

@@ -69,12 +69,10 @@ module Geoloqi
       @config.use_hashie_mash ? Hashie::Mash.new(hash) : hash
     end
 
-    def renew_access_token!
+    def establish(opts={})
       require 'client_id and client_secret are required to get access token' unless @config.client_id? && @config.client_secret?
-      auth = post 'oauth/token', :client_id => @config.client_id,
-                                 :client_secret => @config.client_secret,
-                                 :grant_type => 'refresh_token',
-                                 :refresh_token => self.auth[:refresh_token]
+      auth = post 'oauth/token', {:client_id => @config.client_id,
+                                  :client_secret => @config.client_secret}.merge!(opts)
 
       # expires_at is likely incorrect. I'm chopping 5 seconds
       # off to allow for a more graceful failover.
@@ -83,19 +81,12 @@ module Geoloqi
       self.auth
     end
 
-    def get_auth(code, redirect_uri=@config.redirect_uri)
-      require 'client_id and client_secret are required to get access token' unless @config.client_id? && @config.client_secret?
-      auth = post 'oauth/token', :client_id => @config.client_id,
-                                 :client_secret => @config.client_secret,
-                                 :code => code,
-                                 :grant_type => 'authorization_code',
-                                 :redirect_uri => redirect_uri
+    def renew_access_token!
+      establish :grant_type => 'refresh_token', :refresh_token => self.auth[:refresh_token]
+    end
 
-      # expires_at is likely incorrect. I'm chopping 5 seconds
-      # off to allow for a more graceful failover.
-      auth['expires_at'] = auth_expires_at auth['expires_in']
-      self.auth = auth
-      self.auth
+    def get_auth(code, redirect_uri=@config.redirect_uri)
+      establish :grant_type => 'authorization_code', :code => code, :redirect_uri => redirect_uri
     end
 
     private

data/lib/geoloqi/version.rb

@@ -1,5 +1,5 @@
 module Geoloqi
   def self.version
-    '0.9.11'
+    '0.9.12'
   end
 end

data/spec/geoloqi_spec.rb

@@ -266,8 +266,8 @@ include WebMock::API
 stub_request(:post, "https://api.geoloqi.com/1/oauth/token").
   with(:body => {:client_id => ARGV[0],
                  :client_secret => ARGV[1],
-                 :code => "1234",
                  :grant_type => "authorization_code",
+                 :code => "1234",
                  :redirect_uri => "http://neverexpires.example.com/"}.to_json).
   to_return(:status => 200,
             :body => {:access_token => 'access_token1234',
@@ -278,8 +278,8 @@ stub_request(:post, "https://api.geoloqi.com/1/oauth/token").
 stub_request(:post, "https://api.geoloqi.com/1/oauth/token").
   with(:body => {:client_id => ARGV[0],
                  :client_secret => ARGV[1],
-                 :code => "1234",
                  :grant_type => "authorization_code",
+                 :code => "1234",
                  :redirect_uri => "http://test.site/"}.to_json).
   to_return(:status => 200,
             :body => {:access_token => 'access_token1234',

metadata

@@ -2,7 +2,7 @@
 name: geoloqi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors: 
 - Kyle Drake
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -07:00
+date: 2011-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency