doorkeeper 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 598bf74d593976f9ffe96a0e511f9b75b0e6f1e4
-  data.tar.gz: cddda3ef65df20171860bba9cbecb8097873f039
+  metadata.gz: 1cf5353e6f59ed9314bed48b00fee6eef151e62e
+  data.tar.gz: e9fbdfa650708ab9e9fdea68e96ab2c712910308
 SHA512:
-  metadata.gz: 8b66fe347a4767a45fe3ede635b53de57ca8a20e201a03872d5e80295d5a3701f33fdc78ba5437e3e8e13b2c7ba3eb7f04f87ff52708a9d04ea29ca2ae819984
-  data.tar.gz: 74a12fac73bb6e735bb16a3eea2d050299e6204a4f095fab95c605d178ebaec0f47871e4d815b30a873b5a7bc4e1dadeaaf7c9c23cc1ea3d15fc598569114530
+  metadata.gz: 5492059f736ca023683d8b9227dbe61648501742ae4d3d1aa6b8ec302906d57764760814647e06105f1b20e2eb902c3c934ef7d216c5600dc470fa356e1572ca
+  data.tar.gz: 871bc1c1cd6a7adc602e1d929f4f546cf95a89ef454a767719ad2a559d156c9e34121268aa11fde46c02d080be5d08992f2c57a130cd0a87691cb9aee9d1e5aa

data/.hound.yml

@@ -0,0 +1,3 @@
+LineLength:
+  Exclude:
+    - app/spec/**/*

data/.travis.yml

@@ -1,16 +1,13 @@
 language: ruby
-before_install:
-  - gem install bundler -v '= 1.5.1'
 rvm:
   - 1.9.3
   - 2.0
   - 2.1
 env:
-  - rails=3.1.8
-  - rails=3.2.8
-  - rails=3.2.16
-  - rails=4.0.2
-  - rails=4.1.0.beta1
+  - rails=3.1.12
+  - rails=3.2.18
+  - rails=4.0.5
+  - rails=4.1.1
   - orm=mongoid2
   - orm=mongoid3
   - orm=mongoid4

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.3.1
+
+- enhancements
+  - [#405] Adds facade to more easily get the token from a request in a route
+    constraint.
+  - [#415] Extend Doorkeeper TokenResponse with an `after_successful_response`
+    callback that allows handling of `response` object.
+- internals
+  - [#409] Deprecates `test_redirect_uri` in favor of `native_redirect_uri`.
+    See discussion in: [#351].
+  - [#411] Clean rspec deprecations. General test improvements.
+  - [#412] rspec line width can go longer than 80 (hound CI config).
+- bug
+  - [#413] fixes #340, routing scope is now taken into account in redirect.
+  - [#401] and [#425] application is not required any longer for access_token.
+
 ## 1.3.0
 
 - enhancements

data/README.md

@@ -112,8 +112,10 @@ end
 
 This will mount following routes:
 
+    GET       /oauth/authorize/:code
     GET       /oauth/authorize
     POST      /oauth/authorize
+    PUT       /oauth/authorize
     DELETE    /oauth/authorize
     POST      /oauth/token
     POST      /oauth/revoke
@@ -189,7 +191,7 @@ class Api::V1::ProductsController < Api::V1::ApiController
 end
 ```
 
-### ActionController::Metal integration and other integrations
+### ActionController::Metal integration
 
 The `doorkeeper_for` filter is intended to work with ActionController::Metal
 too. You only need to include the required `ActionController` modules:
@@ -204,6 +206,25 @@ class MetalController < ActionController::Metal
 end
 ```
 
+### Route Constraints and other integrations
+
+You can leverage the `Doorkeeper.authenticate` facade to easily extract a
+`Doorkeeper::OAuth::Token` based on the current request. You can then ensure
+that token is still good, find its associated `#resource_owner_id`, etc.
+
+```ruby
+module Constraint
+  class Authenticated
+
+    def matches?(request)
+      token = Doorkeeper.authenticate(request)
+      token && token.accessible?
+    end
+
+  end
+end
+```
+
 For more information about integration and other integrations, check out [the
 related wiki
 page](https://github.com/doorkeeper-gem/doorkeeper/wiki/ActionController::Metal-with-doorkeeper).
@@ -222,7 +243,7 @@ Doorkeeper.configure do
 end
 ```
 
-The in your controllers:
+And in your controllers:
 
 ```ruby
 class Api::V1::ProductsController < Api::V1::ApiController

data/app/validators/redirect_uri_validator.rb

@@ -1,8 +1,8 @@
 require 'uri'
 
 class RedirectUriValidator < ActiveModel::EachValidator
-  def self.test_redirect_uri
-    Doorkeeper.configuration.test_redirect_uri
+  def self.native_redirect_uri
+    Doorkeeper.configuration.native_redirect_uri
   end
 
   def validate_each(record, attribute, value)
@@ -11,7 +11,7 @@ class RedirectUriValidator < ActiveModel::EachValidator
     else
       value.split.each do |val|
         uri = ::URI.parse(val)
-        return if test_redirect_uri?(uri)
+        return if native_redirect_uri?(uri)
         record.errors.add(attribute, :fragment_present) unless uri.fragment.nil?
         record.errors.add(attribute, :relative_uri) if uri.scheme.nil? || uri.host.nil?
         record.errors.add(attribute, :has_query_parameter) unless uri.query.nil?
@@ -23,7 +23,7 @@ class RedirectUriValidator < ActiveModel::EachValidator
 
   private
 
-  def test_redirect_uri?(uri)
-    self.class.test_redirect_uri.present? && uri.to_s == self.class.test_redirect_uri.to_s
+  def native_redirect_uri?(uri)
+    self.class.native_redirect_uri.present? && uri.to_s == self.class.native_redirect_uri.to_s
   end
 end

data/app/views/doorkeeper/applications/_form.html.erb

@@ -19,9 +19,9 @@
       <span class="help-block">
          Use one line per URI
         </span>
-      <% if Doorkeeper.configuration.test_redirect_uri %>
+      <% if Doorkeeper.configuration.native_redirect_uri %>
           <span class="help-block">
-            Use <code><%= Doorkeeper.configuration.test_redirect_uri %></code> for local tests
+            Use <code><%= Doorkeeper.configuration.native_redirect_uri %></code> for local tests
           </span>
       <% end %>
     </div>

data/doorkeeper.gemspec

@@ -19,11 +19,12 @@ Gem::Specification.new do |s|
   s.add_dependency "railties", ">= 3.1"
 
   s.add_development_dependency "sqlite3", "~> 1.3.5"
-  s.add_development_dependency "rspec-rails", ">= 2.11.4"
-  s.add_development_dependency "capybara", "~> 1.1.2"
+  s.add_development_dependency "rspec-rails", "~> 2.99.0"
+  s.add_development_dependency "capybara", "~> 2.3.0"
   s.add_development_dependency "generator_spec", "~> 0.9.0"
-  s.add_development_dependency "factory_girl", "~> 2.6.4"
-  s.add_development_dependency "timecop", "~> 0.5.2"
-  s.add_development_dependency "database_cleaner", "~> 0.9.1"
+  s.add_development_dependency "factory_girl", "~> 4.4.0"
+  s.add_development_dependency "timecop", "~> 0.7.0"
+  s.add_development_dependency "database_cleaner", "~> 1.3.0"
+  s.add_development_dependency "rspec-activemodel-mocks", "~> 1.0.0"
   s.add_development_dependency "bcrypt-ruby", "~> 3.0.1"
 end

data/lib/doorkeeper.rb

@@ -54,4 +54,8 @@ module Doorkeeper
   def self.installed?
     configured? && database_installed?
   end
+
+  def self.authenticate(request, methods = Doorkeeper.configuration.access_token_methods)
+    OAuth::Token.authenticate(request, *methods)
+  end
 end

data/lib/doorkeeper/config.rb

@@ -85,6 +85,14 @@ module Doorkeeper
       def reuse_access_token
         @config.instance_variable_set("@reuse_access_token", true)
       end
+
+      def test_redirect_uri(uri)
+        warn <<-TEXT
+          DEPRECATION: test_redirect_uri has renamed to native_redirect_uri. use "native_redirect_uri '#{uri}'".
+        TEXT
+
+        @config.instance_variable_set('@native_redirect_uri', uri)
+      end
     end
 
     module Option
@@ -168,7 +176,7 @@ module Doorkeeper
     option :access_token_expires_in,       default: 7200
     option :authorization_code_expires_in, default: 600
     option :orm,                           default: :active_record
-    option :test_redirect_uri,             default: 'urn:ietf:wg:oauth:2.0:oob'
+    option :native_redirect_uri,           default: 'urn:ietf:wg:oauth:2.0:oob'
     option :active_record_options,         default: {}
     option :realm,                         default: 'Doorkeeper'
     option :wildcard_redirect_uri,         default: false

data/lib/doorkeeper/models/access_token.rb

@@ -46,7 +46,7 @@ module Doorkeeper
                           else
                             resource_owner_or_id
                           end
-      token = last_authorized_token_for(application.id, resource_owner_id)
+      token = last_authorized_token_for(application.try(:id), resource_owner_id)
       token if token && ScopeChecker.matches?(token.scopes, scopes)
     end
 
@@ -79,7 +79,7 @@ module Doorkeeper
         resource_owner_id: resource_owner_id,
         scopes: scopes,
         expires_in_seconds: expires_in_seconds,
-        application: { uid: application.uid }
+        application: { uid: application.try(:uid) }
       }
     end
 

data/lib/doorkeeper/oauth/authorization_code_request.rb

@@ -20,7 +20,7 @@ module Doorkeeper
 
       private
 
-      def on_successful_authorization
+      def before_successful_response
         grant.revoke
         find_or_create_access_token(grant.application,
                                     grant.resource_owner_id,

data/lib/doorkeeper/oauth/code_response.rb

@@ -17,8 +17,8 @@ module Doorkeeper
 
       # TODO: configure the test oauth path?
       def redirect_uri
-        if URIChecker.test_uri? pre_auth.redirect_uri
-          "/oauth/authorize/#{auth.token.token}"
+        if URIChecker.native_uri? pre_auth.redirect_uri
+          { action: :show, code: auth.token.token }
         else
           if response_on_fragment
             uri_with_fragment(

data/lib/doorkeeper/oauth/error_response.rb

@@ -31,7 +31,7 @@ module Doorkeeper
 
       def redirectable?
         name != :invalid_redirect_uri && name != :invalid_client &&
-          !URIChecker.test_uri?(@redirect_uri)
+          !URIChecker.native_uri?(@redirect_uri)
       end
 
       def redirect_uri

data/lib/doorkeeper/oauth/helpers/uri_checker.rb

@@ -28,8 +28,8 @@ module Doorkeeper
           URI.parse(url)
         end
 
-        def self.test_uri?(url)
-          url == Doorkeeper.configuration.test_redirect_uri
+        def self.native_uri?(url)
+          url == Doorkeeper.configuration.native_redirect_uri
         end
       end
     end

data/lib/doorkeeper/oauth/password_access_token_request.rb

@@ -26,7 +26,7 @@ module Doorkeeper
 
       private
 
-      def on_successful_authorization
+      def before_successful_response
         find_or_create_access_token(client, resource_owner.id, scopes, server)
       end
 

data/lib/doorkeeper/oauth/pre_authorization.rb

@@ -54,7 +54,7 @@ module Doorkeeper
       # TODO: test uri should be matched against the client's one
       def validate_redirect_uri
         return false unless redirect_uri.present?
-        Helpers::URIChecker.test_uri?(redirect_uri) ||
+        Helpers::URIChecker.native_uri?(redirect_uri) ||
           Helpers::URIChecker.valid_for_authorization?(redirect_uri, client.redirect_uri)
       end
     end

data/lib/doorkeeper/oauth/refresh_token_request.rb

@@ -27,7 +27,7 @@ module Doorkeeper
 
       private
 
-      def on_successful_authorization
+      def before_successful_response
         refresh_token.revoke
         create_access_token
       end

data/lib/doorkeeper/oauth/request_concern.rb

@@ -4,8 +4,10 @@ module Doorkeeper
       def authorize
         validate
         if valid?
-          on_successful_authorization
+          before_successful_response
           @response = TokenResponse.new(access_token)
+          after_successful_response
+          @response
         else
           @response = ErrorResponse.from_request(self)
         end
@@ -36,7 +38,10 @@ module Doorkeeper
           server.refresh_token_enabled?)
       end
 
-      def on_successful_authorization
+      def before_successful_response
+      end
+
+      def after_successful_response
       end
     end
   end

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/lib/generators/doorkeeper/templates/initializer.rb

@@ -56,12 +56,12 @@ Doorkeeper.configure do
   # Check out the wiki for more information on customization
   # access_token_methods :from_bearer_authorization, :from_access_token_param, :from_bearer_param
 
-  # Change the test redirect uri for client apps
+  # Change the native redirect uri for client apps
   # When clients register with the following redirect uri, they won't be redirected to any server and the authorization code will be displayed within the provider
   # The value can be any string. Use nil to disable this feature. When disabled, clients must provide a valid URL
   # (Similar behaviour: https://developers.google.com/accounts/docs/OAuth2InstalledApp#choosingredirecturi)
   #
-  # test_redirect_uri 'urn:ietf:wg:oauth:2.0:oob'
+  # native_redirect_uri 'urn:ietf:wg:oauth:2.0:oob'
 
   # Specify what grant flows are enabled in array of Strings. The valid
   # strings and the flows they enable are:

data/script/rails

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-#!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 ENGINE_PATH = File.expand_path('../..',  __FILE__)

data/spec/controllers/tokens_controller_spec.rb

@@ -11,7 +11,7 @@ describe Doorkeeper::TokensController do
     end
 
     it 'returns the authorization' do
-      pending 'verify need of these specs'
+      skip 'verify need of these specs'
       expect(token).to receive(:authorization)
       post :create
     end
@@ -27,7 +27,7 @@ describe Doorkeeper::TokensController do
     end
 
     it 'returns the error response' do
-      pending 'verify need of these specs'
+      skip 'verify need of these specs'
       allow(token).to receive(:error_response).and_return(double(to_json: [], status: :unauthorized))
       post :create
       expect(response.status).to eq 401

data/spec/dummy/config/initializers/doorkeeper.rb

@@ -8,7 +8,7 @@ Doorkeeper.configure do
   resource_owner_authenticator do
     # Put your resource owner authentication logic here.
     # e.g. User.find_by_id(session[:user_id]) || redirect_to(new_user_session_url)
-    User.find_by_id(session[:user_id]) || redirect_to(root_url, alert: 'Needs sign in.')
+    User.where(id: session[:user_id]).first || redirect_to(root_url, alert: 'Needs sign in.')
   end
 
   # If you want to restrict the access to the web interface for
@@ -47,12 +47,12 @@ Doorkeeper.configure do
   # Check out the wiki for mor information on customization
   # access_token_methods :from_bearer_authorization, :from_access_token_param, :from_bearer_param
 
-  # Change the test redirect uri for client apps
+  # Change the native redirect uri for client apps
   # When clients register with the following redirect uri, they won't be redirected to any server and the authorization code will be displayed within the provider
   # The value can be any string. Use nil to disable this feature. When disabled, clients must provide a valid URL
   # (Similar behaviour: https://developers.google.com/accounts/docs/OAuth2InstalledApp#choosingredirecturi)
   #
-  # test_redirect_uri 'urn:ietf:wg:oauth:2.0:oob'
+  # native_redirect_uri 'urn:ietf:wg:oauth:2.0:oob'
 
   # WWW-Authenticate Realm (default 'Doorkeeper').
   realm 'Doorkeeper'

data/spec/dummy/config/mongoid4.yml

@@ -5,7 +5,8 @@ development:
       hosts:
         - localhost:27017
       options:
-        w: 1
+        write:
+          w: 1
 
 test:
   sessions:

data/spec/lib/config_spec.rb

@@ -76,7 +76,7 @@ describe Doorkeeper, 'configuration' do
 
   describe 'use_refresh_token' do
     it 'is false by default' do
-      expect(subject.refresh_token_enabled?).to be_false
+      expect(subject.refresh_token_enabled?).to be_falsey
     end
 
     it 'can change the value' do
@@ -84,7 +84,7 @@ describe Doorkeeper, 'configuration' do
         orm DOORKEEPER_ORM
         use_refresh_token
       end
-      expect(subject.refresh_token_enabled?).to be_true
+      expect(subject.refresh_token_enabled?).to be_truthy
     end
 
     it "does not includes 'refresh_token' in authorization_response_types" do
@@ -135,7 +135,7 @@ describe Doorkeeper, 'configuration' do
 
   describe 'enable_application_owner' do
     it 'is disabled by default' do
-      expect(Doorkeeper.configuration.enable_application_owner?).not_to be_true
+      expect(Doorkeeper.configuration.enable_application_owner?).not_to be_truthy
     end
 
     context 'when enabled without confirmation' do
@@ -149,7 +149,7 @@ describe Doorkeeper, 'configuration' do
         expect(Doorkeeper::Application.new).to respond_to :owner
       end
       it 'Doorkeeper.configuration.confirm_application_owner? returns false' do
-        expect(Doorkeeper.configuration.confirm_application_owner?).not_to be_true
+        expect(Doorkeeper.configuration.confirm_application_owner?).not_to be_truthy
       end
     end
 
@@ -164,14 +164,14 @@ describe Doorkeeper, 'configuration' do
         expect(Doorkeeper::Application.new).to respond_to :owner
       end
       it 'Doorkeeper.configuration.confirm_application_owner? returns true' do
-        expect(Doorkeeper.configuration.confirm_application_owner?).to be_true
+        expect(Doorkeeper.configuration.confirm_application_owner?).to be_truthy
       end
     end
   end
 
   describe 'wildcard_redirect_uri' do
     it 'is disabled by default' do
-      Doorkeeper.configuration.wildcard_redirect_uri.should be_false
+      Doorkeeper.configuration.wildcard_redirect_uri.should be_falsey
     end
   end
 
@@ -264,6 +264,16 @@ describe Doorkeeper, 'configuration' do
     end
   end
 
+  describe 'test_redirect_uri' do
+    it 'can change the native_redirect_uri value' do
+      Doorkeeper.configure do
+        orm DOORKEEPER_ORM
+        test_redirect_uri 'foo'
+      end
+      expect(subject.native_redirect_uri).to eq('foo')
+    end
+  end
+
   it 'raises an exception when configuration is not set' do
     old_config = Doorkeeper.configuration
     Doorkeeper.module_eval do

data/spec/lib/doorkeeper_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper_integration'
+
+describe Doorkeeper do
+  describe 'authenticate' do
+    let(:token) { double('Token') }
+    let(:request) { double('ActionDispatch::Request') }
+    before do
+      allow(Doorkeeper::OAuth::Token).to receive(:authenticate).
+        with(request, *token_strategies) { token }
+    end
+
+    context 'with specific access token strategies' do
+      let(:token_strategies) { [:first_way, :second_way] }
+
+      it 'authenticates the token from the request' do
+        expect(Doorkeeper.authenticate(request, token_strategies)).to eq(token)
+      end
+    end
+
+    context 'with default access token strategies' do
+      let(:token_strategies) { Doorkeeper.configuration.access_token_methods }
+
+      it 'authenticates the token from the request' do
+        expect(Doorkeeper.authenticate(request)).to eq(token)
+      end
+    end
+  end
+end

data/spec/lib/oauth/client_credentials/creator_spec.rb

@@ -14,7 +14,7 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
     it 'returns false if creation fails' do
       expect(Doorkeeper::AccessToken).to receive(:create).and_return(false)
       created = subject.call(client, scopes)
-      expect(created).to be_false
+      expect(created).to be_falsey
     end
   end
 end

data/spec/lib/oauth/client_credentials/issuer_spec.rb

@@ -52,7 +52,7 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
         end
 
         it 'returns false' do
-          expect(subject.create(client, scopes, creator)).to be_false
+          expect(subject.create(client, scopes, creator)).to be_falsey
         end
       end
     end

data/spec/lib/oauth/helpers/scope_checker_spec.rb

@@ -12,30 +12,30 @@ module Doorkeeper::OAuth::Helpers
     it 'true if scopes matches' do
       scopes = new_scope :public
       scopes_to_match = new_scope :public
-      expect(ScopeChecker.matches?(scopes, scopes_to_match)).to be_true
+      expect(ScopeChecker.matches?(scopes, scopes_to_match)).to be_truthy
     end
 
     it 'is false when scopes differs' do
       scopes = new_scope :public
       scopes_to_match = new_scope :write
-      expect(ScopeChecker.matches?(scopes, scopes_to_match)).to be_false
+      expect(ScopeChecker.matches?(scopes, scopes_to_match)).to be_falsey
     end
 
     it 'is false when scope in array is missing' do
       scopes = new_scope :public
       scopes_to_match = new_scope :public, :write
-      expect(ScopeChecker.matches?(scopes, scopes_to_match)).to be_false
+      expect(ScopeChecker.matches?(scopes, scopes_to_match)).to be_falsey
     end
 
     it 'is false when scope in string is missing' do
       scopes = new_scope :public, :write
       scopes_to_match = new_scope :public
-      expect(ScopeChecker.matches?(scopes, scopes_to_match)).to be_false
+      expect(ScopeChecker.matches?(scopes, scopes_to_match)).to be_falsey
     end
 
     it 'is false when any of attributes is nil' do
-      expect(ScopeChecker.matches?(nil, double)).to be_false
-      expect(ScopeChecker.matches?(double, nil)).to be_false
+      expect(ScopeChecker.matches?(nil, double)).to be_falsey
+      expect(ScopeChecker.matches?(double, nil)).to be_falsey
     end
   end
 
@@ -44,31 +44,31 @@ module Doorkeeper::OAuth::Helpers
 
     it 'is valid if scope is present' do
       server_scopes.add :scope
-      expect(ScopeChecker.valid?('scope', server_scopes)).to be_true
+      expect(ScopeChecker.valid?('scope', server_scopes)).to be_truthy
     end
 
     it 'is invalid if includes tabs space' do
-      expect(ScopeChecker.valid?("\tsomething", server_scopes)).to be_false
+      expect(ScopeChecker.valid?("\tsomething", server_scopes)).to be_falsey
     end
 
     it 'is invalid if scope is not present' do
-      expect(ScopeChecker.valid?(nil, server_scopes)).to be_false
+      expect(ScopeChecker.valid?(nil, server_scopes)).to be_falsey
     end
 
     it 'is invalid if scope is blank' do
-      expect(ScopeChecker.valid?(' ', server_scopes)).to be_false
+      expect(ScopeChecker.valid?(' ', server_scopes)).to be_falsey
     end
 
     it 'is invalid if includes return space' do
-      expect(ScopeChecker.valid?("scope\r", server_scopes)).to be_false
+      expect(ScopeChecker.valid?("scope\r", server_scopes)).to be_falsey
     end
 
     it 'is invalid if includes new lines' do
-      expect(ScopeChecker.valid?("scope\nanother", server_scopes)).to be_false
+      expect(ScopeChecker.valid?("scope\nanother", server_scopes)).to be_falsey
     end
 
     it 'is invalid if any scope is not included in server scopes' do
-      expect(ScopeChecker.valid?('scope another', server_scopes)).to be_false
+      expect(ScopeChecker.valid?('scope another', server_scopes)).to be_falsey
     end
   end
 end

data/spec/lib/oauth/helpers/uri_checker_spec.rb

@@ -7,50 +7,50 @@ module Doorkeeper::OAuth::Helpers
     describe '.valid?' do
       it 'is valid for valid uris' do
         uri = 'http://app.co'
-        expect(URIChecker.valid?(uri)).to be_true
+        expect(URIChecker.valid?(uri)).to be_truthy
       end
 
       it 'is valid if include path param' do
         uri = 'http://app.co/path'
-        expect(URIChecker.valid?(uri)).to be_true
+        expect(URIChecker.valid?(uri)).to be_truthy
       end
 
       it 'is valid if include query param' do
         uri = 'http://app.co/?query=1'
-        expect(URIChecker.valid?(uri)).to be_true
+        expect(URIChecker.valid?(uri)).to be_truthy
       end
 
       it 'is invalid if uri includes fragment' do
         uri = 'http://app.co/test#fragment'
-        expect(URIChecker.valid?(uri)).to be_false
+        expect(URIChecker.valid?(uri)).to be_falsey
       end
 
       it 'is invalid if scheme is missing' do
         uri = 'app.co'
-        expect(URIChecker.valid?(uri)).to be_false
+        expect(URIChecker.valid?(uri)).to be_falsey
       end
 
       it 'is invalid if is a relative uri' do
         uri = '/abc/123'
-        expect(URIChecker.valid?(uri)).to be_false
+        expect(URIChecker.valid?(uri)).to be_falsey
       end
 
       it 'is invalid if is not a url' do
         uri = 'http://'
-        expect(URIChecker.valid?(uri)).to be_false
+        expect(URIChecker.valid?(uri)).to be_falsey
       end
     end
 
     describe '.matches?' do
       it 'is true if both url matches' do
         uri = client_uri = 'http://app.co/aaa'
-        expect(URIChecker.matches?(uri, client_uri)).to be_true
+        expect(URIChecker.matches?(uri, client_uri)).to be_truthy
       end
 
       it 'ignores query parameter on comparsion' do
         uri = 'http://app.co/?query=hello'
         client_uri = 'http://app.co'
-        expect(URIChecker.matches?(uri, client_uri)).to be_true
+        expect(URIChecker.matches?(uri, client_uri)).to be_truthy
       end
 
       context 'allows wildcard redirect_uri' do
@@ -81,25 +81,25 @@ module Doorkeeper::OAuth::Helpers
     describe '.valid_for_authorization?' do
       it 'is true if valid and matches' do
         uri = client_uri = 'http://app.co/aaa'
-        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_true
+        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_truthy
       end
 
       it 'is false if valid and mismatches' do
         uri = 'http://app.co/aaa'
         client_uri = 'http://app.co/bbb'
-        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_false
+        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_falsey
       end
 
       it 'is true if valid and included in array' do
         uri = 'http://app.co/aaa'
         client_uri = "http://example.com/bbb\nhttp://app.co/aaa"
-        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_true
+        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_truthy
       end
 
       it 'is false if valid and not included in array' do
         uri = 'http://app.co/aaa'
         client_uri = "http://example.com/bbb\nhttp://app.co/cc"
-        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_false
+        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_falsey
       end
 
       it 'is true if valid and matches' do

data/spec/lib/oauth/scopes_spec.rb

@@ -5,7 +5,7 @@ require 'doorkeeper/oauth/scopes'
 
 module Doorkeeper::OAuth
   describe Scopes do
-    describe :add do
+    describe '#add' do
       it 'allows you to add scopes with symbols' do
         subject.add :public
         expect(subject.all).to eq(['public'])
@@ -23,22 +23,22 @@ module Doorkeeper::OAuth
       end
     end
 
-    describe :exists do
+    describe '#exists' do
       before do
         subject.add :public
       end
 
       it 'returns true if scope with given name is present' do
-        expect(subject.exists?('public')).to be_true
+        expect(subject.exists?('public')).to be_truthy
       end
 
       it 'returns false if scope with given name does not exist' do
-        expect(subject.exists?('other')).to be_false
+        expect(subject.exists?('other')).to be_falsey
       end
 
       it 'handles symbols' do
-        expect(subject.exists?(:public)).to be_true
-        expect(subject.exists?(:other)).to be_false
+        expect(subject.exists?(:public)).to be_truthy
+        expect(subject.exists?(:other)).to be_falsey
       end
     end
 
@@ -59,7 +59,7 @@ module Doorkeeper::OAuth
       end
     end
 
-    describe :+ do
+    describe '#+' do
       it 'can add to another scope object' do
         scopes = Scopes.from_string('public') + Scopes.from_string('admin')
         expect(scopes.all).to eq(%w(public admin))
@@ -78,7 +78,7 @@ module Doorkeeper::OAuth
       end
     end
 
-    describe :== do
+    describe '#==' do
       it 'is equal to another set of scopes' do
         expect(Scopes.from_string('public')).to eq(Scopes.from_string('public'))
       end
@@ -92,31 +92,31 @@ module Doorkeeper::OAuth
       end
     end
 
-    describe :has_scopes? do
+    describe '#has_scopes?' do
       subject { Scopes.from_string('public admin') }
 
       it 'returns true when at least one scope is included' do
-        expect(subject.has_scopes?(Scopes.from_string('public'))).to be_true
+        expect(subject.has_scopes?(Scopes.from_string('public'))).to be_truthy
       end
 
       it 'returns true when all scopes are included' do
-        expect(subject.has_scopes?(Scopes.from_string('public admin'))).to be_true
+        expect(subject.has_scopes?(Scopes.from_string('public admin'))).to be_truthy
       end
 
       it 'is true if all scopes are included in any order' do
-        expect(subject.has_scopes?(Scopes.from_string('admin public'))).to be_true
+        expect(subject.has_scopes?(Scopes.from_string('admin public'))).to be_truthy
       end
 
       it 'is false if no scopes are included' do
-        expect(subject.has_scopes?(Scopes.from_string('notexistent'))).to be_false
+        expect(subject.has_scopes?(Scopes.from_string('notexistent'))).to be_falsey
       end
 
       it 'returns false when any scope is not included' do
-        expect(subject.has_scopes?(Scopes.from_string('public nope'))).to be_false
+        expect(subject.has_scopes?(Scopes.from_string('public nope'))).to be_falsey
       end
 
       it 'is false if no scopes are included even for existing ones' do
-        expect(subject.has_scopes?(Scopes.from_string('public admin notexistent'))).to be_false
+        expect(subject.has_scopes?(Scopes.from_string('public admin notexistent'))).to be_falsey
       end
     end
   end

data/spec/models/doorkeeper/access_token_spec.rb

@@ -62,7 +62,7 @@ module Doorkeeper
         context 'the second token has the same owner and same app' do
           let(:access_token2) { FactoryGirl.create :access_token, default_attributes }
           it 'success' do
-            expect(access_token1.same_credential?(access_token2)).to be_true
+            expect(access_token1.same_credential?(access_token2)).to be_truthy
           end
         end
 
@@ -71,7 +71,7 @@ module Doorkeeper
           let(:access_token2) { FactoryGirl.create :access_token, application: other_application, resource_owner_id: resource_owner_id }
 
           it 'fail' do
-            expect(access_token1.same_credential?(access_token2)).to be_false
+            expect(access_token1.same_credential?(access_token2)).to be_falsey
           end
         end
 
@@ -81,7 +81,7 @@ module Doorkeeper
           let(:access_token2) { FactoryGirl.create :access_token, application: other_application, resource_owner_id: 42 }
 
           it 'fail' do
-            expect(access_token1.same_credential?(access_token2)).to be_false
+            expect(access_token1.same_credential?(access_token2)).to be_falsey
           end
         end
 
@@ -89,7 +89,7 @@ module Doorkeeper
           let(:access_token2) { FactoryGirl.create :access_token, application: application, resource_owner_id: 42 }
 
           it 'fail' do
-            expect(access_token1.same_credential?(access_token2)).to be_false
+            expect(access_token1.same_credential?(access_token2)).to be_falsey
           end
         end
       end

data/spec/models/doorkeeper/application_spec.rb

@@ -76,8 +76,8 @@ module Doorkeeper
     end
 
     it 'checks uniqueness of uid' do
-      app1 = Factory(:application)
-      app2 = Factory(:application)
+      app1 = FactoryGirl.create(:application)
+      app2 = FactoryGirl.create(:application)
       app2.uid = app1.uid
       expect(app2).not_to be_valid
     end

data/spec/requests/applications/applications_request_spec.rb

@@ -55,7 +55,7 @@ feature 'Edit application' do
   end
 
   scenario 'updating a valid app' do
-    fill_in :name, with: 'Serious app'
+    fill_in 'application[name]', with: 'Serious app'
     click_button 'Submit'
     i_should_see 'Application updated'
     i_should_see 'Serious app'
@@ -63,7 +63,7 @@ feature 'Edit application' do
   end
 
   scenario 'updating an invalid app' do
-    fill_in :name, with: ''
+    fill_in 'application[name]', with: ''
     click_button 'Submit'
     i_should_see 'Whoops! Check your form for possible errors'
   end

data/spec/requests/flows/authorization_code_spec.rb

@@ -22,7 +22,7 @@ feature 'Authorization Code Flow' do
   end
 
   scenario 'resource owner authorizes using test url' do
-    @client.redirect_uri = Doorkeeper.configuration.test_redirect_uri
+    @client.redirect_uri = Doorkeeper.configuration.native_redirect_uri
     @client.save!
     visit authorization_endpoint_url(client: @client)
     click_on 'Authorize'

data/spec/requests/flows/password_spec.rb

@@ -13,7 +13,7 @@ feature 'Resource Owner Password Credentials Flow inproperly set up' do
 
   context 'with valid user credentials' do
     scenario 'should issue new token' do
-      pending 'Check a way to supress warnings here (or handle config better)'
+      skip 'Check a way to supress warnings here (or handle config better)'
       expect do
         post password_token_endpoint_url(client: @client, resource_owner: @resource_owner)
       end.to_not change { Doorkeeper::AccessToken.count }

data/spec/requests/flows/revoke_token_spec.rb

@@ -45,8 +45,8 @@ feature 'Revoke Token Flow' do
         authorization_access_token.reload
 
         expect(response).to be_success
-        expect(token_to_revoke.revoked?).to be_true
-        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_true
+        expect(token_to_revoke.revoked?).to be_truthy
+        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_truthy
 
       end
 
@@ -59,9 +59,9 @@ feature 'Revoke Token Flow' do
         authorization_access_token.reload
 
         expect(response).to be_success
-        expect(token_to_revoke.revoked?).to be_false
-        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_false
-        expect(authorization_access_token.revoked?).to be_false
+        expect(token_to_revoke.revoked?).to be_falsey
+        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_falsey
+        expect(authorization_access_token.revoked?).to be_falsey
 
       end
 
@@ -84,9 +84,9 @@ feature 'Revoke Token Flow' do
         authorization_access_token.reload
 
         expect(response).to be_success
-        expect(token_to_revoke.revoked?).to be_true
-        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_true
-        expect(authorization_access_token.revoked?).to be_false
+        expect(token_to_revoke.revoked?).to be_truthy
+        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_truthy
+        expect(authorization_access_token.revoked?).to be_falsey
 
       end
     end
@@ -109,9 +109,9 @@ feature 'Revoke Token Flow' do
         authorization_access_token.reload
 
         expect(response).to be_success
-        expect(token_to_revoke.revoked?).to be_false
-        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_false
-        expect(authorization_access_token.revoked?).to be_false
+        expect(token_to_revoke.revoked?).to be_falsey
+        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_falsey
+        expect(authorization_access_token.revoked?).to be_falsey
 
       end
     end
@@ -133,9 +133,9 @@ feature 'Revoke Token Flow' do
         authorization_access_token.reload
 
         expect(response).to be_success
-        expect(token_to_revoke.revoked?).to be_false
-        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_false
-        expect(authorization_access_token.revoked?).to be_false
+        expect(token_to_revoke.revoked?).to be_falsey
+        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_falsey
+        expect(authorization_access_token.revoked?).to be_falsey
 
       end
     end
@@ -156,7 +156,7 @@ feature 'Revoke Token Flow' do
         token_to_revoke.reload
 
         expect(response).to be_success
-        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_true
+        expect(Doorkeeper::AccessToken.by_refresh_token(token_to_revoke.refresh_token).revoked?).to be_truthy
         expect(authorization_access_token).to_not be_revoked
 
       end

data/spec/spec_helper_integration.rb

@@ -5,6 +5,8 @@ TABLE_NAME_SUFFIX = ENV['table_name_suffix'] || nil
 
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
+require 'capybara/rspec'
+require 'rspec/active_model/mocks'
 require 'dummy/config/environment'
 require 'rspec/rails'
 require 'rspec/autorun'
@@ -27,6 +29,7 @@ ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
 Dir["#{File.dirname(__FILE__)}/support/{dependencies,helpers,shared}/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
+  config.infer_spec_type_from_file_location!
   config.mock_with :rspec
 
   config.infer_base_class_for_anonymous_controllers = false

data/spec/support/helpers/authorization_request_helper.rb

@@ -17,7 +17,7 @@ module AuthorizationRequestHelper
   end
 
   def client_should_be_authorized(client)
-    expect(client).to have(1).access_grants
+    expect(client.access_grants.size).to eq(1)
   end
 
   def client_should_not_be_authorized(client)

data/spec/validators/redirect_uri_validator_spec.rb

@@ -10,13 +10,13 @@ describe RedirectUriValidator do
     expect(subject).to be_valid
   end
 
-  it 'accepts test redirect uri' do
+  it 'accepts native redirect uri' do
     subject.redirect_uri = 'urn:ietf:wg:oauth:2.0:oob'
     expect(subject).to be_valid
   end
 
   it 'rejects if test uri is disabled' do
-    allow(RedirectUriValidator).to receive(:test_redirect_uri).and_return(nil)
+    allow(RedirectUriValidator).to receive(:native_redirect_uri).and_return(nil)
     subject.redirect_uri = 'urn:some:test'
     expect(subject).not_to be_valid
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -43,30 +43,30 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -87,42 +87,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec-activemodel-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +160,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
@@ -315,6 +330,7 @@ files:
 - spec/generators/templates/routes.rb
 - spec/generators/views_generator_spec.rb
 - spec/lib/config_spec.rb
+- spec/lib/doorkeeper_spec.rb
 - spec/lib/models/expirable_spec.rb
 - spec/lib/models/revocable_spec.rb
 - spec/lib/models/scopes_spec.rb
@@ -405,3 +421,4 @@ signing_key:
 specification_version: 4
 summary: Doorkeeper is an OAuth 2 provider for Rails.
 test_files: []
+has_rdoc: