oauth2 0.0.8 → 0.0.9

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.0.9 (June 18)
+
+* Support a JSON token response with swappable JSON parser via MultiJSON.
+* Add support for "expires_in" parameter and relevant methods on AccessToken.
+
 == 0.0.8 (April 27)
 
 * Change get_request_token to use POST to conform to OAuth 2.0 spec. (via jeremy)

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/intridea/oauth2"
     gem.authors = ["Michael Bleigh"]
     gem.add_dependency 'faraday', '~> 0.4.1'
+    gem.add_dependency 'multi_json'
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/oauth2/access_token.rb

@@ -1,15 +1,22 @@
 module OAuth2
   class AccessToken
-    attr_reader :client, :token, :refresh_token
+    attr_reader :client, :token, :refresh_token, :expires_in, :expires_at
 
-    def initialize(client, token, refresh_token = nil)
+    def initialize(client, token, refresh_token = nil, expires_in = nil)
       @client = client
       @token = token
       @refresh_token = refresh_token
+      @expires_in = (expires_in.nil? || expires_in == '') ? nil : expires_in.to_i
+      @expires_at = Time.now + @expires_in if @expires_in
+    end
+    
+    # True if the token in question has an expiration time.
+    def expires?
+      !!@expires_in
     end
     
     def request(verb, path, params = {}, headers = {})
-      @client.request(verb, path, params.merge('access_token' => @token), headers)
+      @client.request(verb, path, params.merge('access_token' => @token), headers.merge('Authorization' => "Token token=\"#{@token}\""))
     end
     
     def get(path, params = {}, headers = {})

data/lib/oauth2/strategy/web_server.rb

@@ -1,3 +1,5 @@
+require 'multi_json'
+
 module OAuth2
   module Strategy
     class WebServer < Base
@@ -11,10 +13,11 @@ module OAuth2
       # endpoints.
       def get_access_token(code, options = {})
         response = @client.request(:post, @client.access_token_url, access_token_params(code, options))
-        params   = Rack::Utils.parse_query(response)
+        params   = MultiJson.decode(response) rescue Rack::Utils.parse_query(response)
         access   = params['access_token']
         refresh  = params['refresh_token']
-        OAuth2::AccessToken.new(@client, access, refresh)
+        expires_in = params['expires_in']
+        OAuth2::AccessToken.new(@client, access, refresh, expires_in)
       end
       
       # <b>DEPRECATED:</b> Use #get_access_token instead.

data/oauth2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth2}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-04-27}
+  s.date = %q{2010-06-18}
   s.description = %q{A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.}
   s.email = %q{michael@intridea.com}
   s.extra_rdoc_files = [
@@ -58,13 +58,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<faraday>, ["~> 0.4.1"])
+      s.add_runtime_dependency(%q<multi_json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<faraday>, ["~> 0.4.1"])
+      s.add_dependency(%q<multi_json>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
     s.add_dependency(%q<faraday>, ["~> 0.4.1"])
+    s.add_dependency(%q<multi_json>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/spec/oauth2/access_token_spec.rb

@@ -34,4 +34,27 @@ describe OAuth2::AccessToken do
       end
     end
   end
+  
+  describe '#expires?' do
+    it 'should be false if there is no expires_at' do
+      OAuth2::AccessToken.new(client, token).should_not be_expires
+    end
+    
+    it 'should be true if there is an expires_at' do
+      OAuth2::AccessToken.new(client, token, 'abaca', 600).should be_expires
+    end
+  end
+  
+  describe '#expires_at' do
+    before do
+      @now = Time.now
+      Time.stub!(:now).and_return(@now)
+    end
+    
+    subject{ OAuth2::AccessToken.new(client, token, 'abaca', 600)}
+    
+    it 'should be a time representation of #expires_in' do
+      subject.expires_at.should == (@now + 600)
+    end
+  end
 end

data/spec/oauth2/strategy/web_server_spec.rb

@@ -6,7 +6,12 @@ describe OAuth2::Strategy::WebServer do
     cli.connection.build do |b|
       b.adapter :test do |stub|
         stub.post('/oauth/access_token') do |env| 
-          [200, {}, 'a=1&access_token=salmon&refresh_token=trout']
+          case @mode
+            when "formencoded"
+              [200, {}, 'expires_in=600&access_token=salmon&refresh_token=trout']
+            when "json"
+              [200, {}, '{"expires_in":600,"access_token":"salmon","refresh_token":"trout"}']
+          end
         end
       end
     end
@@ -30,20 +35,31 @@ describe OAuth2::Strategy::WebServer do
   end
 
   describe "#get_access_token" do
-    before do
-      @access = subject.get_access_token('sushi')
-    end
+    %w(json formencoded).each do |mode|
+      before do
+        @mode = mode
+        @access = subject.get_access_token('sushi')
+      end
 
-    it 'returns AccessToken with same Client' do
-      @access.client.should == client
-    end
+      it 'returns AccessToken with same Client' do
+        @access.client.should == client
+      end
 
-    it 'returns AccessToken with #token' do
-      @access.token.should == 'salmon'
-    end
+      it 'returns AccessToken with #token' do
+        @access.token.should == 'salmon'
+      end
 
-    it 'returns AccessToken with #refresh_token' do
-      @access.refresh_token.should == 'trout'
+      it 'returns AccessToken with #refresh_token' do
+        @access.refresh_token.should == 'trout'
+      end
+      
+      it 'returns AccessToken with #expires_in' do
+        @access.expires_in.should == 600
+      end
+      
+      it 'returns AccessToken with #expires_at' do
+        @access.expires_at.should be_kind_of(Time)
+      end
     end
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -04:00
+date: 2010-06-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,9 +32,21 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: multi_json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,7 +56,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.
 email: michael@intridea.com
 executables: []