devise_oauth2_providable 0.3.6 → 0.3.7

data/app/controllers/oauth2/authorizations_controller.rb

@@ -38,7 +38,9 @@ class Oauth2::AuthorizationsController < ApplicationController
             authorization_code = current_user.authorization_codes.create(:client_id => @client, :redirect_uri => @redirect_uri)
             res.code = authorization_code.token
           when :token
-            res.access_token = current_user.access_tokens.create(:client_id => @client).to_bearer_token
+            access_token = current_user.access_tokens.create(:client_id => @client).token
+            bearer_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => access_token)
+            res.access_token = bearer_token
           end
           res.approve!
         else

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  scope '/oauth2', :name_prefix => 'oauth2' do
+  scope '/oauth2', :as => 'oauth2' do
     resources :authorizations, :controller => 'oauth2/authorizations', :only => :create
     resource :token, :controller => 'oauth2/tokens', :only => :create
     match 'authorize' => 'oauth2/authorizations#new'

data/devise_oauth2_providable.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency(%q<rails>, [">= 3.0.7"])
   s.add_runtime_dependency(%q<devise>, [">= 1.3.3"])
-  s.add_runtime_dependency(%q<rack-oauth2>, ["~> 0.6.3"])
+  s.add_runtime_dependency(%q<rack-oauth2>, ["~> 0.8.2"])
   s.add_development_dependency(%q<rspec>, ['>= 2.5.0'])
 
   s.files         = `git ls-files`.split("\n")

data/lib/devise_oauth2_providable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Oauth2Providable
-    VERSION = "0.3.6"
+    VERSION = "0.3.7"
   end
 end

data/spec/rails_app/Gemfile

@@ -5,7 +5,8 @@ gem 'rspec-rails', '2.6.0'
 gem 'devise_oauth2_providable', :path => '../../'
 gem 'shoulda-matchers', '1.0.0.beta2'
 gem 'sqlite3', '1.3.3'
-gem 'ruby-debug', '0.10.4'
+gem 'ruby-debug', '0.10.4', :platform => :ruby_18
+gem 'ruby-debug19', '0.11.6', :platform => :ruby_19
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

data/spec/rails_app/spec/controllers/protected_controller_spec.rb

@@ -17,14 +17,14 @@ describe ProtectedController do
     end
     context 'with valid bearer token in query string' do
       before do
-        get :index, :bearer_token => @token.token, :format => 'json'
+        get :index, :access_token => @token.token, :format => 'json'
       end
       it { should respond_with :ok }
     end
 
     context 'with invalid bearer token in query param' do
       before do
-        get :index, :bearer_token => 'invalid', :format => 'json'
+        get :index, :access_token => 'invalid', :format => 'json'
       end
       it { should respond_with :unauthorized }
     end
@@ -34,7 +34,7 @@ describe ProtectedController do
       it 'raises error' do
         lambda {
           @request.env['HTTP_AUTHORIZATION'] = "Bearer #{@token.token}"
-          get :index, :bearer_token => @token.token, :format => 'json'
+          get :index, :access_token => @token.token, :format => 'json'
         }.should raise_error
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_oauth2_providable
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 Z
+date: 2011-07-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 59
         segments: 
         - 0
-        - 6
-        - 3
-        version: 0.6.3
+        - 8
+        - 2
+        version: 0.8.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency