geoloqi 0.9.15 → 0.9.16

data/examples/sinatra.rb

@@ -4,18 +4,27 @@ require 'rubygems'
 require 'sinatra'
 require 'geoloqi'
 
-GEOLOQI_REDIRECT_URI = 'http://example.com'
+GEOLOQI_REDIRECT_URI = 'http://yourwebsite.net'
 
 enable :sessions
+set :session_secret, 'PUT A SECRET WORD HERE' # Encrypts the cookie session.. recommended.
 
 def geoloqi
-  Geoloqi.config :client_id => 'YOUR OAUTH CLIENT ID', :client_secret => 'YOUR CLIENT SECRET'
-  @geoloqi ||= Geoloqi::Session.new :auth => session[:geoloqi_auth]
+  @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?
+  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?
+
   username = geoloqi.get('account/username')['username']
   "You have successfully logged in as #{username}!"
-end
+end

data/examples/sinatra_synchrony.rb

@@ -9,21 +9,31 @@ require 'sinatra'
 require 'sinatra/synchrony'
 require 'geoloqi'
 
-GEOLOQI_REDIRECT_URI = 'http://example.com'
+GEOLOQI_REDIRECT_URI = 'http://yourwebsite.net'
 
 enable :sessions
+set :session_secret, 'PUT A SECRET WORD HERE' # Encrypts the cookie session.. recommended.
 
-configure do
-  Geoloqi.config :client_id => 'YOUR OAUTH CLIENT ID', :client_secret => 'YOUR CLIENT SECRET', :adapter => :em_synchrony
+def geoloqi
+  @geoloqi ||= Geoloqi::Session.new :auth => session[:geoloqi_auth],
+                                    :config => {:client_id => 'YOUR OAUTH CLIENT ID',
+                                                :client_secret => 'YOUR CLIENT SECRET',
+                                                :adapter => :em_synchrony}
 end
 
-def geoloqi
-  @geoloqi ||= Geoloqi::Session.new :auth => session[:geoloqi_auth]
+# 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?
+  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?
+
   username = geoloqi.get('account/username')['username']
   "You have successfully logged in as #{username}!"
-end
+end
+
+# To install deps: gem install sinatra sinatra-synchrony geoloqi
+# To run from command line: ruby sinatra_synchrony.rb -s thin

data/lib/geoloqi.rb

@@ -22,8 +22,10 @@ module Geoloqi
     @@config = Config.new opts
   end
 
-  def self.authorize_url(client_id=nil, redirect_uri=@@config.redirect_uri)
+  def self.authorize_url(client_id=nil, redirect_uri=@@config.redirect_uri, opts={})
     raise "client_id required to authorize url. Pass with Geoloqi.config" unless client_id
-    "#{OAUTH_URL}?response_type=code&client_id=#{Rack::Utils.escape client_id}&redirect_uri=#{Rack::Utils.escape redirect_uri}"
+    url = "#{OAUTH_URL}?response_type=code&client_id=#{Rack::Utils.escape client_id}&redirect_uri=#{Rack::Utils.escape redirect_uri}"
+    url += "&#{Rack::Utils.build_query opts}" unless opts.empty?
+    url
   end
 end

data/lib/geoloqi/version.rb

@@ -1,5 +1,5 @@
 module Geoloqi
   def self.version
-    '0.9.15'
+    '0.9.16'
   end
 end

data/spec/geoloqi_spec.rb

@@ -24,6 +24,15 @@ describe Geoloqi do
                               "client_id=#{Rack::Utils.escape 'test'}&"+
                               "redirect_uri=#{Rack::Utils.escape 'http://blah.blah/test'}" }
   end
+
+  it 'returns authorize url with scope' do
+    authorize_url = Geoloqi.authorize_url 'test', 'http://blah.blah/test', :scope => 'can_party_hard'
+    expect { authorize_url == "#{Geoloqi::OAUTH_URL}?"+
+                              'response_type=code&'+
+                              "client_id=#{Rack::Utils.escape 'test'}&"+
+                              "redirect_uri=#{Rack::Utils.escape 'http://blah.blah/test'}&"+
+                              "scope=can_party_hard" }
+  end
 end
 
 describe Geoloqi::ApiError do

metadata

@@ -2,7 +2,7 @@
 name: geoloqi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors: 
 - Kyle Drake