rack-oauth2 0.8.1 → 0.8.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-oauth2 (0.8.0)
+    rack-oauth2 (0.8.1)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)
@@ -12,25 +12,25 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.7)
+    activesupport (3.0.9)
     addressable (2.2.6)
     attr_required (0.0.3)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    httpclient (2.2.0.2)
-    i18n (0.5.0)
-    json (1.5.1)
-    rack (1.2.2)
-    rake (0.8.7)
+    httpclient (2.2.1)
+    i18n (0.6.0)
+    json (1.5.3)
+    rack (1.3.0)
+    rake (0.9.2)
     rcov (0.9.9)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.2)
-    rspec-expectations (2.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.6.0)
     webmock (1.6.4)
       addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
@@ -40,7 +40,7 @@ PLATFORMS
 
 DEPENDENCIES
   rack-oauth2!
-  rake (< 0.9, >= 0.8)
+  rake (>= 0.8)
   rcov (>= 0.9)
-  rspec (< 2.6, >= 2)
+  rspec (>= 2)
   webmock (>= 1.6.2)

data/Rakefile

@@ -9,12 +9,4 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov_opts = ['-Ilib -Ispec --exclude spec,gems']
 end
 
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rack-oauth2 #{File.read('VERSION')}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/lib/rack/oauth2/server/resource/bearer.rb

@@ -35,7 +35,7 @@ module Rack
             end
 
             def access_token_in_payload
-              params['bearer_token']
+              params['access_token']
             end
           end
         end

data/rack-oauth2.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "activesupport", ">= 2.3"
   s.add_runtime_dependency "i18n"
   s.add_runtime_dependency "attr_required", ">= 0.0.3"
-  s.add_development_dependency "rake", ">= 0.8", "< 0.9"
+  s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "rcov", ">= 0.9"
-  s.add_development_dependency "rspec", ">= 2", "< 2.6"
+  s.add_development_dependency "rspec", ">= 2"
   s.add_development_dependency "webmock", ">= 1.6.2"
 end

data/spec/rack/oauth2/server/resource/bearer_spec.rb

@@ -56,7 +56,7 @@ describe Rack::OAuth2::Server::Resource::Bearer do
     end
 
     context 'when token is in params' do
-      let(:env) { Rack::MockRequest.env_for('/protected_resource', :params => {:bearer_token => 'valid_token'}) }
+      let(:env) { Rack::MockRequest.env_for('/protected_resource', :params => {:access_token => 'valid_token'}) }
       it_behaves_like :authenticated_bearer_request
     end
   end
@@ -69,7 +69,7 @@ describe Rack::OAuth2::Server::Resource::Bearer do
     end
 
     context 'when token is in params' do
-      let(:env) { Rack::MockRequest.env_for('/protected_resource', :params => {:bearer_token => 'invalid_token'}) }
+      let(:env) { Rack::MockRequest.env_for('/protected_resource', :params => {:access_token => 'invalid_token'}) }
       it_behaves_like :unauthorized_bearer_request
     end
 
@@ -103,7 +103,7 @@ describe Rack::OAuth2::Server::Resource::Bearer do
         Rack::MockRequest.env_for(
           '/protected_resource',
           'HTTP_AUTHORIZATION' => 'Bearer valid_token',
-          :params => {:bearer_token => 'valid_token'}
+          :params => {:access_token => 'valid_token'}
         )
       end
       it_behaves_like :bad_bearer_request

metadata

@@ -2,7 +2,7 @@
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 Z
+date: 2011-06-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -87,9 +87,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0.8"
-    - - <
-      - !ruby/object:Gem::Version 
-        version: "0.9"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -112,9 +109,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "2"
-    - - <
-      - !ruby/object:Gem::Version 
-        version: "2.6"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency