oauth2 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oauth2 (0.0.14)
+    oauth2 (0.1.1)
       faraday (~> 0.5.0)
       multi_json (~> 0.0.4)
 
@@ -20,16 +20,14 @@ GEM
     rack (1.2.1)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
 
 PLATFORMS
   ruby
@@ -41,4 +39,4 @@ DEPENDENCIES
   oauth2!
   rake (~> 0.8)
   rcov (~> 0.9)
-  rspec (~> 2.0)
+  rspec (~> 2.4.0)

data/Rakefile

@@ -25,7 +25,7 @@ task :default => :spec
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "oauth2 #{Oauth2::VERSION}"
+  rdoc.title = "oauth2 #{OAuth2::VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/oauth2/access_token.rb

@@ -1,13 +1,20 @@
 module OAuth2
   class AccessToken
     attr_reader :client, :token, :refresh_token, :expires_in, :expires_at
+    attr_accessor :token_param
 
-    def initialize(client, token, refresh_token = nil, expires_in = nil)
+    def initialize(client, token, refresh_token = nil, expires_in = nil, params = {})
       @client = client
-      @token = token
-      @refresh_token = refresh_token
+      @token = token.to_s
+      @refresh_token = refresh_token.to_s
       @expires_in = (expires_in.nil? || expires_in == '') ? nil : expires_in.to_i
       @expires_at = Time.now + @expires_in if @expires_in
+      @params = params
+      @token_param = 'access_token'
+    end
+
+    def [](key)
+      @params[key]
     end
 
     # True if the token in question has an expiration time.
@@ -16,7 +23,9 @@ module OAuth2
     end
 
     def request(verb, path, params = {}, headers = {})
-      @client.request(verb, path, params.merge('access_token' => @token), headers.merge('Authorization' => "Token token=\"#{@token}\""))
+      params = params.merge token_param => @token
+      headers = headers.merge 'Authorization' => "OAuth #{@token}"
+      @client.request(verb, path, params, headers)
     end
 
     def get(path, params = {}, headers = {})

data/lib/oauth2/client.rb

@@ -64,7 +64,7 @@ module OAuth2
       end
       
       case resp.status
-        when 200...201
+        when 200..299
           if json?
             return ResponseObject.from(resp)
           else

data/lib/oauth2/strategy/web_server.rb

@@ -24,7 +24,7 @@ module OAuth2
         access   = params['access_token']
         refresh  = params['refresh_token']
         expires_in = params['expires_in']
-        OAuth2::AccessToken.new(@client, access, refresh, expires_in)
+        OAuth2::AccessToken.new(@client, access, refresh, expires_in, params)
       end
 
       # <b>DEPRECATED:</b> Use #get_access_token instead.

data/lib/oauth2/version.rb

@@ -1,3 +1,3 @@
-module Oauth2
-  VERSION = "0.1.0"
+module OAuth2
+  VERSION = "0.1.1"
 end

data/oauth2.gemspec

@@ -3,7 +3,8 @@ require File.expand_path("../lib/oauth2/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = "oauth2"
-  s.version = Oauth2::VERSION
+  s.version = OAuth2::VERSION
+  s.rubyforge_project = 'oauth2'
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
   s.description = %q{A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.}
@@ -21,5 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("json_pure", "~> 1.4.6")
   s.add_development_dependency("rake", "~> 0.8")
   s.add_development_dependency("rcov", "~> 0.9")
-  s.add_development_dependency("rspec", "~> 2.0")
+  s.add_development_dependency("rspec", "~> 2.4.0")
 end

data/spec/oauth2/strategy/web_server_spec.rb

@@ -8,9 +8,9 @@ describe OAuth2::Strategy::WebServer do
         stub.post('/oauth/access_token') do |env|
           case @mode
             when "formencoded"
-              [200, {}, 'expires_in=600&access_token=salmon&refresh_token=trout']
+              [200, {}, 'expires_in=600&access_token=salmon&refresh_token=trout&extra_param=steve']
             when "json"
-              [200, {}, '{"expires_in":600,"access_token":"salmon","refresh_token":"trout"}']
+              [200, {}, '{"expires_in":600,"access_token":"salmon","refresh_token":"trout","extra_param":"steve"}']
           end
         end
       end
@@ -60,6 +60,10 @@ describe OAuth2::Strategy::WebServer do
       it 'returns AccessToken with #expires_at' do
         @access.expires_at.should be_kind_of(Time)
       end
+
+      it 'returns AccessToken with params accessible via []' do
+        @access['extra_param'].should == 'steve'
+      end
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: oauth2
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -05:00
+date: 2011-01-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 5
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 0
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 4
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 0
         - 8
@@ -89,7 +84,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 9
@@ -104,11 +98,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
+        - 4
         - 0
-        version: "2.0"
+        version: 2.4.0
   type: :development
   version_requirements: *id006
 description: A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.
@@ -158,7 +152,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -167,7 +160,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -175,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: oauth2
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3