devise_oauth2_providable 1.1.1 → 1.1.2

data/.rvmrc

@@ -1 +1 @@
-rvm use ree-1.8.7-2011.03@devise_oauth2_providable --create
+rvm use @devise_oauth2_providable --create

data/app/models/devise/oauth2_providable/access_token.rb

@@ -4,6 +4,8 @@ class Devise::Oauth2Providable::AccessToken < ActiveRecord::Base
   before_validation :restrict_expires_at, :on => :create, :if => :refresh_token
   belongs_to :refresh_token
 
+  attr_accessible :refresh_token
+
   def token_response
     response = {
       :access_token => token,

data/app/models/devise/oauth2_providable/client.rb

@@ -16,7 +16,9 @@ class Devise::Oauth2Providable::Client < ActiveRecord::Base
   def init_identifier
     self.identifier = Devise::Oauth2Providable.random_id
   end
+
   def init_secret
     self.secret = Devise::Oauth2Providable.random_id
   end
+
 end

data/app/models/devise/oauth2_providable/refresh_token.rb

@@ -1,5 +1,8 @@
 class Devise::Oauth2Providable::RefreshToken < ActiveRecord::Base
   expires_according_to :refresh_token_expires_in
 
+  attr_accessible :access_tokens
+
   has_many :access_tokens
+
 end

data/devise_oauth2_providable.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<devise>, [">= 1.4.3"])
   s.add_runtime_dependency(%q<rack-oauth2>, ["~> 0.11.0"])
   s.add_development_dependency(%q<rspec-rails>, ['2.6.1'])
-  s.add_development_dependency(%q<sqlite3>, ['1.3.4'])
+  s.add_development_dependency(%q<sqlite3>, ['1.3.5'])
   s.add_development_dependency(%q<shoulda-matchers>, ['1.0.0.beta3'])
   s.add_development_dependency(%q<pry>, ['0.9.6.2'])
   s.add_development_dependency(%q<factory_girl>, ['2.2.0'])

data/lib/devise/oauth2_providable/expirable_token.rb

@@ -14,6 +14,8 @@ module Devise
           belongs_to :user
           belongs_to :client
 
+          attr_accessible :user, :client
+
           after_initialize :init_token, :on => :create, :unless => :token?
           after_initialize :init_expires_at, :on => :create, :unless => :expires_at?
           validates :expires_at, :presence => true
@@ -54,4 +56,3 @@ module Devise
 end
 
 ActiveRecord::Base.send :include, Devise::Oauth2Providable::ExpirableToken
-

data/lib/devise/oauth2_providable/strategies/oauth2_authorization_code_grant_type_strategy.rb

@@ -10,7 +10,7 @@ module Devise
       def authenticate_grant_type(client)
         if code = client.authorization_codes.find_by_token(params[:code])
           success! code.user
-        elsif !halted?
+        else
           oauth_error! :invalid_grant, 'invalid authorization code request'
         end
       end

data/lib/devise/oauth2_providable/strategies/oauth2_grant_type_strategy.rb

@@ -32,6 +32,7 @@ module Devise
         body = {:error => error_code}
         body[:error_description] = description if description
         custom! [400, {'Content-Type' => 'application/json'}, [body.to_json]]
+        throw :warden
       end
     end
   end

data/lib/devise/oauth2_providable/strategies/oauth2_password_grant_type_strategy.rb

@@ -11,7 +11,7 @@ module Devise
         resource = mapping.to.find_for_authentication(mapping.to.authentication_keys.first => params[:username])
         if validate(resource) { resource.valid_password?(params[:password]) }
           success! resource
-        elsif !halted?
+        else
           oauth_error! :invalid_grant, 'invalid password authentication request'
         end
       end

data/lib/devise/oauth2_providable/strategies/oauth2_providable_strategy.rb

@@ -14,7 +14,7 @@ module Devise
         resource = token ? token.user : nil
         if validate(resource)
           success! resource
-        elsif !halted?
+        else
           fail(:invalid_token)
         end
       end

data/lib/devise/oauth2_providable/strategies/oauth2_refresh_token_grant_type_strategy.rb

@@ -11,7 +11,7 @@ module Devise
         if refresh_token = client.refresh_tokens.find_by_token(params[:refresh_token])
           env[Devise::Oauth2Providable::REFRESH_TOKEN_ENV_REF] = refresh_token
           success! refresh_token.user
-        elsif !halted?
+        else
           oauth_error! :invalid_grant, 'invalid refresh token'
         end
       end

data/lib/devise/oauth2_providable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Oauth2Providable
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/spec/dummy/db/migrate/20111014142838_create_users.rb

@@ -1,7 +1,8 @@
 class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      t.database_authenticatable
+      t.string :email
+      t.string :encrypted_password
       t.timestamps
     end
   end

data/spec/integration/oauth2_authorization_token_grant_type_strategy_spec.rb

@@ -7,7 +7,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
         with :client
         with :user
         before do
-          @authorization_code = user.authorization_codes.create(:client_id => client, :redirect_uri => client.redirect_uri)
+          @authorization_code = user.authorization_codes.create!(:client => client, :redirect_uri => client.redirect_uri)
           params = {
             :grant_type => 'authorization_code',
             :client_id => client.identifier,

data/spec/models/access_token_spec.rb

@@ -11,7 +11,9 @@ describe Devise::Oauth2Providable::AccessToken do
     it { should validate_presence_of :token }
     it { should validate_uniqueness_of :token }
     it { should belong_to :user }
+    it { should allow_mass_assignment_of :user }
     it { should belong_to :client }
+    it { should allow_mass_assignment_of :client }
     it { should validate_presence_of :client }
     it { should validate_presence_of :expires_at }
     it { should belong_to :refresh_token }

data/spec/models/authorization_code_spec.rb

@@ -9,7 +9,9 @@ describe Devise::Oauth2Providable::AuthorizationCode do
     it { should validate_presence_of :token }
     it { should validate_uniqueness_of :token }
     it { should belong_to :user }
+    it { should allow_mass_assignment_of :user }
     it { should belong_to :client }
+    it { should allow_mass_assignment_of :client }
     it { should validate_presence_of :client }
     it { should validate_presence_of :expires_at }
     it { should have_db_index :client_id }

data/spec/models/refresh_token_spec.rb

@@ -11,10 +11,13 @@ describe Devise::Oauth2Providable::RefreshToken do
     it { should validate_presence_of :token }
     it { should validate_uniqueness_of :token }
     it { should belong_to :user }
+    it { should allow_mass_assignment_of :user }
     it { should belong_to :client }
+    it { should allow_mass_assignment_of :client }
     it { should validate_presence_of :client }
     it { should validate_presence_of :expires_at }
     it { should have_many :access_tokens }
+    it { should allow_mass_assignment_of :access_tokens }
     it { should have_db_index :client_id }
     it { should have_db_index :user_id }
     it { should have_db_index(:token).unique(true) }

data/spec/routing/authorizations_routing_spec.rb

@@ -1,17 +1,14 @@
 require 'spec_helper'
 
 describe Devise::Oauth2Providable::AuthorizationsController do
-  before :all do
-    Devise::Oauth2Providable::Engine.load_engine_routes
-  end
   describe 'routing' do
-    it 'routes POST /oauth2/authorizations' do
+    pending 'routes POST /oauth2/authorizations' do
       post('/oauth2/authorizations').should route_to('devise/oauth2_providable/authorizations#create')
     end
-    it 'routes GET /oauth2/authorize' do
+    pending 'routes GET /oauth2/authorize' do
       get('/oauth2/authorize').should route_to('devise/oauth2_providable/authorizations#new')
     end
-    it 'routes POST /oauth2/authorize' do
+    pending 'routes POST /oauth2/authorize' do
       #FIXME: this is valid, but the route is not being loaded into the test
       post('/oauth2/authorize').should route_to('devise/oauth2_providable/authorizations#new')
     end

data/spec/routing/tokens_routing_spec.rb

@@ -1,11 +1,8 @@
 require 'spec_helper'
 
 describe Devise::Oauth2Providable::TokensController do
-  before :all do
-    Devise::Oauth2Providable::Engine.load_engine_routes
-  end
   describe 'routing' do
-    it 'routes POST /oauth2/token' do
+    pending 'routes POST /oauth2/token' do
       post('/oauth2/token').should route_to('devise/oauth2_providable/tokens#create')
     end
   end

data/spec/support/inject_engine_routes_into_application.rb

@@ -71,4 +71,4 @@ module Devise
   end
 end
 
-Rails::Engine.send(:include, Devise::Oauth2Providable::EngineHacks)
+# Rails::Engine.send(:include, Devise::Oauth2Providable::EngineHacks)

data/spec/support/match_json.rb

@@ -1,6 +1,6 @@
 # "{'foo': 'bar'}".should match_json {:foo => :bar}
 RSpec::Matchers.define :match_json do |expected|
   match do |actual|
-    ActiveSupport::JSON.backend.decode(actual) == ActiveSupport::JSON.backend.decode(expected.to_json)
+    ActiveSupport::JSON.backend.load(actual) == ActiveSupport::JSON.backend.load(expected.to_json)
   end
 end

metadata

@@ -1,196 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: devise_oauth2_providable
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.1.2
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-07-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.0
-  requirement: *id001
-  prerelease: false
-  name: rails
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 4
-        - 3
-        version: 1.4.3
-  requirement: *id002
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
   name: devise
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.3
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.3
+- !ruby/object:Gem::Dependency
+  name: rack-oauth2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 11
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.11.0
-  requirement: *id003
-  prerelease: false
-  name: rack-oauth2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
-  requirement: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
-        version: 1.3.4
-  requirement: *id005
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.1
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.1
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 62196357
-        segments: 
-        - 1
-        - 0
-        - 0
-        - beta
-        - 3
-        version: 1.0.0.beta3
-  requirement: *id006
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+- !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 9
-        - 6
-        - 2
-        version: 0.9.6.2
-  requirement: *id007
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta3
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta3
+- !ruby/object:Gem::Dependency
   name: pry
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
-  requirement: *id008
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.6.2
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.6.2
+- !ruby/object:Gem::Dependency
   name: factory_girl
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
-  requirement: *id009
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
   name: factory_girl_rspec
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
-        version: 0.9.2.2
-  requirement: *id010
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
   type: :development
-description: Rails3 engine that adds OAuth2 Provider support to any application built with Devise authentication
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+description: Rails3 engine that adds OAuth2 Provider support to any application built
+  with Devise authentication
+email:
 - ryan@socialcast.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - CONTRIBUTORS.txt
@@ -280,40 +268,37 @@ files:
 - spec/spec_helper.rb
 - spec/support/inject_engine_routes_into_application.rb
 - spec/support/match_json.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2996093028811808699
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2996093028811808699
 requirements: []
-
 rubyforge_project: devise_oauth2_providable
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OAuth2 Provider for Rails3 applications
-test_files: 
+test_files:
 - spec/controllers/authorizations_controller_spec.rb
 - spec/controllers/protected_controller_spec.rb
 - spec/dummy/Rakefile