geoloqi 0.9.21 → 0.9.22

data/lib/geoloqi.rb

@@ -10,14 +10,23 @@ require 'geoloqi/session'
 require 'geoloqi/version'
 
 module Geoloqi
-  API_VERSION = 1
-  API_URL = 'https://api.geoloqi.com'
-  OAUTH_URL = 'https://beta.geoloqi.com/oauth/authorize'
   @@adapter = :net_http
   @@enable_logging = false
   @@config = Config.new
 
   class << self
+    def api_version
+      1
+    end
+
+    def api_url
+      'https://api.geoloqi.com'
+    end
+
+    def oauth_url
+      'https://beta.geoloqi.com/oauth/authorize'
+    end
+    
     def config(opts=nil)
       return @@config if opts.nil?
       @@config = Config.new opts
@@ -37,7 +46,7 @@ module Geoloqi
 
     def 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
-      url = "#{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

data/lib/geoloqi/session.rb

@@ -9,7 +9,7 @@ module Geoloqi
       self.auth = opts[:auth] || {}
       self.auth[:access_token] = opts[:access_token] if opts[:access_token]
 
-      @connection = Faraday.new(:url => API_URL) do |builder|
+      @connection = Faraday.new(:url => Geoloqi.api_url) do |builder|
         builder.response :logger if @config.enable_logging
         builder.adapter  @config.adapter || :net_http
       end
@@ -65,7 +65,7 @@ module Geoloqi
     def execute(meth, path, query=nil)
       query = Rack::Utils.parse_query query if query.is_a?(String)
       raw = @connection.send(meth) do |req|
-        req.url "/#{API_VERSION.to_s}/#{path.gsub(/^\//, '')}"
+        req.url "/#{Geoloqi.api_version.to_s}/#{path.gsub(/^\//, '')}"
         req.headers = headers
 
         if query

data/lib/geoloqi/version.rb

@@ -1,5 +1,5 @@
 module Geoloqi
   def self.version
-    '0.9.21'
+    '0.9.22'
   end
 end

data/spec/geoloqi_spec.rb

@@ -17,7 +17,7 @@ def auth_headers(access_token='access_token1234')
    'Authorization' => "OAuth #{access_token}"}
 end
 
-def api_url(path); "#{Geoloqi::API_URL}/#{Geoloqi::API_VERSION}/#{path}" end
+def api_url(path); "#{Geoloqi.api_url}/#{Geoloqi.api_version}/#{path}" end
 
 Wrong.config.alias_assert :expect
 include WebMock::API
@@ -33,7 +33,7 @@ describe Geoloqi do
   describe 'authorize_url' do
     it 'is valid' do
       authorize_url = Geoloqi.authorize_url 'test', 'http://blah.blah/test'
-      expect { authorize_url == "#{Geoloqi::OAUTH_URL}?"+
+      expect { authorize_url == "#{Geoloqi.oauth_url}?"+
                                 'response_type=code&'+
                                 "client_id=#{Rack::Utils.escape 'test'}&"+
                                 "redirect_uri=#{Rack::Utils.escape 'http://blah.blah/test'}" }
@@ -41,7 +41,7 @@ describe Geoloqi do
 
     it 'is valid with scope' do
       authorize_url = Geoloqi.authorize_url 'test', 'http://blah.blah/test', :scope => 'can_party_hard'
-      expect { authorize_url == "#{Geoloqi::OAUTH_URL}?"+
+      expect { authorize_url == "#{Geoloqi.oauth_url}?"+
                                 'response_type=code&'+
                                 "client_id=#{Rack::Utils.escape 'test'}&"+
                                 "redirect_uri=#{Rack::Utils.escape 'http://blah.blah/test'}&"+
@@ -84,7 +84,7 @@ describe Geoloqi::Config do
     it 'returns authorize url' do
       Geoloqi.config :client_id => CLIENT_ID, :client_secret => CLIENT_SECRET, :redirect_uri => 'http://blah.blah/test'
       authorize_url = Geoloqi.authorize_url 'test'
-      expect { authorize_url == "#{Geoloqi::OAUTH_URL}?"+
+      expect { authorize_url == "#{Geoloqi.oauth_url}?"+
                                 'response_type=code&'+
                                 "client_id=#{Rack::Utils.escape 'test'}&"+
                                 "redirect_uri=#{Rack::Utils.escape 'http://blah.blah/test'}" }
@@ -269,7 +269,7 @@ describe Geoloqi::Session do
 
     it 'gets authorize url' do
       authorize_url = @session.authorize_url 'http://blah.blah/test'
-      expect { authorize_url == "#{Geoloqi::OAUTH_URL}?"+
+      expect { authorize_url == "#{Geoloqi.oauth_url}?"+
                                 "response_type=code&"+
                                 "client_id=#{Rack::Utils.escape CLIENT_ID}&"+
                                 "redirect_uri=#{Rack::Utils.escape 'http://blah.blah/test'}" }
@@ -277,7 +277,7 @@ describe Geoloqi::Session do
 
     it 'gets authorize url with scope' do
       authorize_url = @session.authorize_url 'http://blah.blah/test', :scope => 'party_hard'
-      expect { authorize_url == "#{Geoloqi::OAUTH_URL}?"+
+      expect { authorize_url == "#{Geoloqi.oauth_url}?"+
                                 "response_type=code&"+
                                 "client_id=#{Rack::Utils.escape CLIENT_ID}&"+
                                 "redirect_uri=#{Rack::Utils.escape 'http://blah.blah/test'}&"+

metadata

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