geoloqi 0.9.5 → 0.9.6

data/.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+*.gem

data/README.markdown

@@ -65,13 +65,20 @@ Here is a simple Sinatra example implementing the OAuth2 flow with Geoloqi:
 	GEOLOQI_REDIRECT_URI = 'http://yourwebsite.net'
 
 	enable :sessions
+	set :session_secret, 'PUT A SECRET WORD HERE' # Encrypts the cookie session.. recommended.
 
 	def geoloqi
 	  @geoloqi ||= Geoloqi::Session.new :auth => session[:geoloqi_auth],
 	                                    :config => {:client_id => 'YOUR OAUTH CLIENT ID',
 	                                                :client_secret => 'YOUR CLIENT SECRET'}
 	end
-
+	
+	# If the access token expires, Geoloqi::Session will refresh inline!
+	# This after block makes sure the session gets the updated config.
+	after do
+	  session[:geoloqi_auth] = @geoloqi.auth
+	end
+  
 	get '/?' do
 	  session[:geoloqi_auth] = geoloqi.get_auth(params[:code], GEOLOQI_REDIRECT_URI) if params[:code] && !geoloqi.access_token?
 	  redirect geoloqi.authorize_url(GEOLOQI_REDIRECT_URI) unless geoloqi.access_token?
@@ -91,6 +98,7 @@ Now, here's a power example: Uses [sinatra-synchrony](http://github.com/kyledrak
 	GEOLOQI_REDIRECT_URI = 'http://example.com'
 
 	enable :sessions
+	set :session_secret, 'PUT A SECRET WORD HERE'
 
 	configure do
 	  Geoloqi.config :client_id => 'YOUR OAUTH CLIENT ID', :client_secret => 'YOUR CLIENT SECRET', :adapter => :em_synchrony
@@ -99,6 +107,10 @@ Now, here's a power example: Uses [sinatra-synchrony](http://github.com/kyledrak
 	def geoloqi
 	  @geoloqi ||= Geoloqi::Session.new :auth => session[:geoloqi_auth]
 	end
+	
+	after do
+	  session[:geoloqi_auth] = @geoloqi.auth
+	end
 
 	get '/?' do
 	  session[:geoloqi_auth] = geoloqi.get_auth(params[:code], GEOLOQI_REDIRECT_URI) if params[:code] && !geoloqi.access_token?
@@ -114,4 +126,11 @@ Let us know! Send a pull request or a patch. Questions? Ask! We're here to help.
 Authors
 ---
 * Kyle Drake
-* Aaron Parecki
+* Aaron Parecki
+
+TODO / Possible projects
+---
+* Plugin for Sinatra
+* Rails plugin (works fine as-is, but maybe we can make it easier?)
+* More Concrete API in addition to the simple one?
+* Hashie::Mash and/or SymbolTable support out of the box

data/lib/geoloqi/session.rb

@@ -41,8 +41,9 @@ module Geoloqi
 
     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
+      renew_access_token! if auth[:expires_at] && Time.rfc2822(auth[:expires_at]) <= Time.now && !(path =~ /^\/?oauth\/token$/)
       retry_attempt = 0
+
       begin
         response = @connection.send(meth) do |req|
           req.url "/#{API_VERSION.to_s}/#{path.gsub(/^\//, '')}"
@@ -68,57 +69,40 @@ module Geoloqi
       json
     end
 
-    # TODO: DRY and refactor
     def renew_access_token!
       require 'client_id and client_secret are required to get access token' unless @config.client_id? && @config.client_secret?
-      args = {:client_id => @config.client_id,
-              :client_secret => @config.client_secret,
-              :grant_type => 'refresh_token',
-              :refresh_token => auth[:refresh_token]}
-
-      response = @connection.post do |req|
-        req.url "/#{API_VERSION.to_s}/oauth/token"
-        req.headers = headers false
-        req.body = args.to_json
-      end
-
-      auth = JSON.parse response.body
+      auth = post 'oauth/token', :client_id => @config.client_id,
+                                 :client_secret => @config.client_secret,
+                                 :grant_type => 'refresh_token',
+                                 :refresh_token => self.auth[:refresh_token]
 
       # expires_at is likely incorrect. I'm chopping 5 seconds
       # off to allow for a more graceful failover.
-      auth['expires_at'] = (Time.now + @expires_in.to_i)-5
-
-      self.auth = JSON.parse response.body
+      auth['expires_at'] = ((Time.now + auth['expires_in'].to_i)-5).rfc2822
+      self.auth = auth
       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?
-      args = {:client_id => @config.client_id,
-              :client_secret => @config.client_secret,
-              :code => code,
-              :grant_type => 'authorization_code',
-              :redirect_uri => redirect_uri}
-
-      response = @connection.post do |req|
-        req.url "/#{API_VERSION.to_s}/oauth/token"
-        req.headers = headers false
-        req.body = args.to_json
-      end
-
-      auth = JSON.parse response.body
+      auth = post 'oauth/token', :client_id => @config.client_id,
+                                 :client_secret => @config.client_secret,
+                                 :code => code,
+                                 :grant_type => 'authorization_code',
+                                 :redirect_uri => redirect_uri
 
       # expires_at is likely incorrect. I'm chopping 5 seconds
       # off to allow for a more graceful failover.
-      auth['expires_at'] = (Time.now + @expires_in.to_i)-5
-
-      self.auth = JSON.parse response.body
+      auth['expires_at'] = ((Time.now + auth['expires_in'].to_i)-5).rfc2822
+      self.auth = auth
       self.auth
     end
 
-    def headers(with_oauth=true)
+    private
+
+    def headers
       headers = {'Content-Type' => 'application/json', 'User-Agent' => "geoloqi-ruby #{Geoloqi.version}", 'Accept' => 'application/json'}
-      headers['Authorization'] = "OAuth #{access_token}" if with_oauth
+      headers['Authorization'] = "OAuth #{access_token}" if access_token
       headers
     end
   end

data/lib/geoloqi/version.rb

@@ -1,5 +1,5 @@
 module Geoloqi
   def self.version
-    '0.9.5'
+    '0.9.6'
   end
 end

data/spec/geoloqi_spec.rb

@@ -97,11 +97,11 @@ describe Geoloqi::Session do
     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
@@ -176,10 +176,15 @@ describe Geoloqi::Session do
       ensure
         WebMock.allow_net_connect!
       end
-      expect { response == {:access_token => 'access_token1234',
+
+      {:access_token => 'access_token1234',
                             :scope => nil,
                             :expires_in => '86400',
-                            :refresh_token => 'refresh_token1234'} }
+                            :refresh_token => 'refresh_token1234'}.each do |k,v|
+        expect { response[k] == v }
+      end
+
+      expect { (5..10).include? (Time.rfc2822(response[:expires_at]) - (Time.now+86400)).abs }
     end
   end
 
@@ -189,7 +194,7 @@ describe Geoloqi::Session do
                                       :auth => { :access_token => 'access_token1234',
                                                  :scope => nil,
                                                  :expires_in => '86400',
-                                                 :expires_at => Time.at(0),
+                                                 :expires_at => Time.at(0).rfc2822,
                                                  :refresh_token => 'refresh_token1234' }
     end
 

metadata

@@ -2,7 +2,7 @@
 name: geoloqi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Kyle Drake
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -07:00
+date: 2011-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geoloqi
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Powerful, flexible, lightweight interface to the awesome Geoloqi platform API