geoloqi 0.9.3 → 0.9.4

data/geoloqi.gemspec

@@ -1,7 +1,7 @@
 require './lib/geoloqi/version.rb'
 Gem::Specification.new do |s|
   s.name = 'geoloqi'
-  s.version = Geoloqi::VERSION
+  s.version = Geoloqi.version
   s.authors = ['Kyle Drake', 'Aaron Parecki']
   s.email = ['kyledrake@gmail.com', 'aaron@parecki.com']
   s.homepage = 'https://github.com/kyledrake/geoloqi-ruby'
@@ -20,4 +20,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'wrong', '= 0.5.0'
   s.add_development_dependency 'minitest', '= 2.2.2'
   s.add_development_dependency 'webmock', '= 1.6.4'
-end
+end

data/lib/geoloqi.rb

@@ -14,15 +14,15 @@ module Geoloqi
   OAUTH_URL = 'https://beta.geoloqi.com/oauth/authorize'
   @@adapter = :net_http
   @@enable_logging = false
-  @@config = nil
+  @@config = Config.new
 
   def self.config(opts=nil)
     return @@config if opts.nil?
     @@config = Config.new opts
   end
 
-  def self.authorize_url(client_id=nil, redirect_uri=nil)
+  def self.authorize_url(client_id=nil, redirect_uri=@@config.redirect_uri)
     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}"
   end
-end
+end

data/lib/geoloqi/config.rb

@@ -1,6 +1,6 @@
 module Geoloqi
   class Config
-    attr_accessor :client_id, :client_secret, :adapter, :enable_logging
+    attr_accessor :client_id, :client_secret, :adapter, :enable_logging, :redirect_uri
     def initialize(opts={})
       opts.each {|k,v| send("#{k}=", v)}
       self.enable_logging ||= false
@@ -15,4 +15,4 @@ module Geoloqi
       !client_secret.nil? && !client_secret.empty?
     end
   end
-end
+end

data/lib/geoloqi/session.rb

@@ -27,7 +27,7 @@ module Geoloqi
       !access_token.nil?
     end
 
-    def authorize_url(redirect_uri)
+    def authorize_url(redirect_uri=@config.redirect_uri)
       Geoloqi.authorize_url @config.client_id, redirect_uri
     end
 
@@ -91,7 +91,7 @@ module Geoloqi
       self.auth
     end
 
-    def get_auth(code, redirect_uri)
+    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,
@@ -116,7 +116,7 @@ module Geoloqi
     end
 
     def headers(with_oauth=true)
-      headers = {'Content-Type' => 'application/json', 'User-Agent' => "geoloqi-ruby #{Geoloqi::VERSION}", 'Accept' => 'application/json'}
+      headers = {'Content-Type' => 'application/json', 'User-Agent' => "geoloqi-ruby #{Geoloqi.version}", 'Accept' => 'application/json'}
       headers['Authorization'] = "OAuth #{access_token}" if with_oauth
       headers
     end

data/lib/geoloqi/version.rb

@@ -1,3 +1,5 @@
 module Geoloqi
-  VERSION = '0.9.3'
+  def self.version
+    '0.9.4'
+  end
 end

data/spec/geoloqi_spec.rb

@@ -27,6 +27,17 @@ describe Geoloqi do
 end
 
 describe Geoloqi::Config do
+  describe 'with redirect_uri' do
+    it 'returns authorize url' do
+      Geoloqi.config :client_id => ARGV[0], :client_secret => ARGV[1], :redirect_uri => 'http://blah.blah/test'
+      authorize_url = Geoloqi.authorize_url 'test'
+      expect { authorize_url == "#{Geoloqi::OAUTH_URL}?"+
+                                'response_type=code&'+
+                                "client_id=#{Rack::Utils.escape 'test'}&"+
+                                "redirect_uri=#{Rack::Utils.escape 'http://blah.blah/test'}" }
+    end
+  end
+
   it 'throws exception if non-boolean value is fed to logging' do
     expect { rescuing { Geoloqi.config(:client_id => '', :client_secret => '', :enable_logging => :cats )}.class == ArgumentError }
   end

metadata

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