doorkeeper 1.1.0 → 1.2.0

data/spec/requests/protected_resources/private_api_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper_integration'
 feature 'Private API' do
   background do
     @client   = FactoryGirl.create(:application)
-    @resource = User.create!(:name => "Joe", :password => "sekret")
+    @resource = User.create!(name: 'Joe', password: 'sekret')
     @token    = client_is_authorized(@client, @resource)
   end
 
   scenario 'client requests protected resource with valid token' do
     with_access_token_header @token.token
     visit '/full_protected_resources'
-    expect(page.body).to have_content("index")
+    expect(page.body).to have_content('index')
   end
 
   scenario 'client requests protected resource with disabled header authentication' do
@@ -21,7 +21,7 @@ feature 'Private API' do
   end
 
   scenario 'client attempts to request protected resource with invalid token' do
-    with_access_token_header "invalid"
+    with_access_token_header 'invalid'
     visit '/full_protected_resources'
     response_status_should_be 401
   end
@@ -37,7 +37,7 @@ feature 'Private API' do
     @token.update_column :expires_in, nil # never expires
     with_access_token_header @token.token
     visit '/full_protected_resources'
-    expect(page.body).to have_content("index")
+    expect(page.body).to have_content('index')
   end
 
   scenario 'access token with no scopes' do
@@ -53,6 +53,6 @@ feature 'Private API' do
     @token.update_column :scopes, 'admin'
     with_access_token_header @token.token
     visit '/full_protected_resources/1.json'
-    expect(page.body).to have_content("show")
+    expect(page.body).to have_content('show')
   end
 end

data/spec/routing/custom_controller_routes_spec.rb

@@ -41,6 +41,10 @@ describe 'Custom controller for routes' do
     expect(post('/space/oauth/token')).to route_to('custom_authorizations#create')
   end
 
+  it 'POST /space/oauth/revoke routes to tokens controller' do
+    post('/space/oauth/revoke').should route_to('custom_authorizations#revoke')
+  end
+
   it 'GET /space/oauth/applications routes to applications controller' do
     expect(get('/space/oauth/applications')).to route_to('custom_authorizations#index')
   end

data/spec/routing/default_routes_spec.rb

@@ -17,6 +17,10 @@ describe 'Default routes' do
     expect(post('/oauth/token')).to route_to('doorkeeper/tokens#create')
   end
 
+  it 'POST /oauth/revoke routes to tokens controller' do
+    post('/oauth/revoke').should route_to('doorkeeper/tokens#revoke')
+  end
+
   it 'GET /oauth/applications routes to applications controller' do
     expect(get('/oauth/applications')).to route_to('doorkeeper/applications#index')
   end
@@ -26,7 +30,7 @@ describe 'Default routes' do
   end
 
   it 'GET /oauth/token/info route to authorzed tokeninfo controller' do
-    expect(get('/oauth/token/info')).to route_to('doorkeeper/token_info#show')    
+    expect(get('/oauth/token/info')).to route_to('doorkeeper/token_info#show')
   end
 
 end

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "../app"))
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '../app'))

data/spec/spec_helper_integration.rb

@@ -1,9 +1,9 @@
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
 DOORKEEPER_ORM = (ENV['orm'] || :active_record).to_sym
 TABLE_NAME_PREFIX = ENV['table_name_prefix'] || nil
 TABLE_NAME_SUFFIX = ENV['table_name_suffix'] || nil
 
-$:.unshift File.dirname(__FILE__)
+$LOAD_PATH.unshift File.dirname(__FILE__)
 
 require 'dummy/config/environment'
 require 'rspec/rails'
@@ -12,13 +12,13 @@ require 'generator_spec/test_case'
 require 'timecop'
 require 'database_cleaner'
 
-puts "====> Doorkeeper.orm = #{Doorkeeper.configuration.orm.inspect}"
+Rails.logger.info "====> Doorkeeper.orm = #{Doorkeeper.configuration.orm.inspect}"
 if Doorkeeper.configuration.orm == :active_record
-  puts "======> active_record.table_name_prefix = #{Rails.configuration.active_record.table_name_prefix.inspect}"
-  puts "======> active_record.table_name_suffix = #{Rails.configuration.active_record.table_name_suffix.inspect}"
+  Rails.logger.info "======> active_record.table_name_prefix = #{Rails.configuration.active_record.table_name_prefix.inspect}"
+  Rails.logger.info "======> active_record.table_name_suffix = #{Rails.configuration.active_record.table_name_suffix.inspect}"
 end
-puts "====> Rails version: #{Rails.version}"
-puts "====> Ruby version: #{RUBY_VERSION}"
+Rails.logger.info "====> Rails version: #{Rails.version}"
+Rails.logger.info "====> Ruby version: #{RUBY_VERSION}"
 
 require "support/orm/#{Doorkeeper.configuration.orm_name}"
 
@@ -33,9 +33,7 @@ RSpec.configure do |config|
 
   config.before do
     DatabaseCleaner.start
-    Doorkeeper.configure {
-      orm DOORKEEPER_ORM
-    }
+    Doorkeeper.configure { orm DOORKEEPER_ORM }
   end
 
   config.after do

data/spec/support/helpers/access_token_request_helper.rb

@@ -1,11 +1,11 @@
 module AccessTokenRequestHelper
   def client_is_authorized(client, resource_owner, access_token_attributes = {})
     attributes = {
-      :application => client,
-      :resource_owner_id => resource_owner.id
+      application: client,
+      resource_owner_id: resource_owner.id
     }.merge(access_token_attributes)
     FactoryGirl.create(:access_token, attributes)
   end
 end
 
-RSpec.configuration.send :include, AccessTokenRequestHelper, :type => :request
+RSpec.configuration.send :include, AccessTokenRequestHelper, type: :request

data/spec/support/helpers/authorization_request_helper.rb

@@ -1,11 +1,11 @@
 module AuthorizationRequestHelper
   def resource_owner_is_authenticated(resource_owner = nil)
-    resource_owner ||= User.create!(:name => "Joe", :password => "sekret")
+    resource_owner ||= User.create!(name: 'Joe', password: 'sekret')
     Doorkeeper.configuration.instance_variable_set(:@authenticate_resource_owner, proc { resource_owner })
   end
 
   def resource_owner_is_not_authenticated
-    Doorkeeper.configuration.instance_variable_set(:@authenticate_resource_owner, proc { redirect_to("/sign_in") })
+    Doorkeeper.configuration.instance_variable_set(:@authenticate_resource_owner, proc { redirect_to('/sign_in') })
   end
 
   def default_scopes_exist(*scopes)
@@ -29,4 +29,4 @@ module AuthorizationRequestHelper
   end
 end
 
-RSpec.configuration.send :include, AuthorizationRequestHelper, :type => :request
+RSpec.configuration.send :include, AuthorizationRequestHelper, type: :request

data/spec/support/helpers/config_helper.rb

@@ -6,4 +6,4 @@ module ConfigHelper
   end
 end
 
-RSpec.configuration.send :include, ConfigHelper, :type => :request
+RSpec.configuration.send :include, ConfigHelper, type: :request

data/spec/support/helpers/model_helper.rb

@@ -4,7 +4,7 @@ module ModelHelper
   end
 
   def create_resource_owner
-    @resource_owner = User.create!(:name => "Joe", :password => "sekret")
+    @resource_owner = User.create!(name: 'Joe', password: 'sekret')
   end
 
   def authorization_code_exists(options = {})
@@ -42,4 +42,4 @@ module ModelHelper
   end
 end
 
-RSpec.configuration.send :include, ModelHelper, :type => :request
+RSpec.configuration.send :include, ModelHelper, type: :request

data/spec/support/helpers/request_spec_helper.rb

@@ -57,7 +57,7 @@ module RequestSpecHelper
 
   def sign_in
     visit '/'
-    click_on "Sign in"
+    click_on 'Sign in'
   end
 
   def i_should_see_translated_error_message(key)
@@ -65,7 +65,7 @@ module RequestSpecHelper
   end
 
   def translated_error_message(key)
-    I18n.translate key, :scope => [:doorkeeper, :errors, :messages]
+    I18n.translate key, scope: [:doorkeeper, :errors, :messages]
   end
 
   def response_status_should_be(status)
@@ -73,4 +73,4 @@ module RequestSpecHelper
   end
 end
 
-RSpec.configuration.send :include, RequestSpecHelper, :type => :request
+RSpec.configuration.send :include, RequestSpecHelper, type: :request

data/spec/support/helpers/url_helper.rb

@@ -1,51 +1,55 @@
 module UrlHelper
   def token_endpoint_url(options = {})
     parameters = {
-      :code          => options[:code],
-      :client_id     => options[:client_id]     || (options[:client] ? options[:client].uid : nil),
-      :client_secret => options[:client_secret] || (options[:client] ? options[:client].secret : nil),
-      :redirect_uri  => options[:redirect_uri]  || (options[:client] ? options[:client].redirect_uri : nil),
-      :grant_type    => options[:grant_type]    || "authorization_code",
+      code: options[:code],
+      client_id: options[:client_id]     || (options[:client] ? options[:client].uid : nil),
+      client_secret: options[:client_secret] || (options[:client] ? options[:client].secret : nil),
+      redirect_uri: options[:redirect_uri]  || (options[:client] ? options[:client].redirect_uri : nil),
+      grant_type: options[:grant_type]    || 'authorization_code'
     }
     "/oauth/token?#{build_query(parameters)}"
   end
 
   def password_token_endpoint_url(options = {})
     parameters = {
-      :code          => options[:code],
-      :client_id     => options[:client_id]     || (options[:client] ? options[:client].uid : nil),
-      :client_secret => options[:client_secret] || (options[:client] ? options[:client].secret : nil),
-      :username      => options[:resource_owner_username] || (options[:resource_owner] ? options[:resource_owner].name : nil),
-      :password      => options[:resource_owner_password] || (options[:resource_owner] ? options[:resource_owner].password : nil),
-      :grant_type    => "password",
+      code: options[:code],
+      client_id: options[:client_id]     || (options[:client] ? options[:client].uid : nil),
+      client_secret: options[:client_secret] || (options[:client] ? options[:client].secret : nil),
+      username: options[:resource_owner_username] || (options[:resource_owner] ? options[:resource_owner].name : nil),
+      password: options[:resource_owner_password] || (options[:resource_owner] ? options[:resource_owner].password : nil),
+      grant_type: 'password'
     }
     "/oauth/token?#{build_query(parameters)}"
   end
 
   def authorization_endpoint_url(options = {})
     parameters = {
-      :client_id     => options[:client_id]     || options[:client].uid,
-      :redirect_uri  => options[:redirect_uri]  || options[:client].redirect_uri,
-      :response_type => options[:response_type] || "code",
-      :scope         => options[:scope],
-      :state         => options[:state],
+      client_id: options[:client_id]     || options[:client].uid,
+      redirect_uri: options[:redirect_uri]  || options[:client].redirect_uri,
+      response_type: options[:response_type] || 'code',
+      scope: options[:scope],
+      state: options[:state]
     }.reject { |k, v| v.blank? }
     "/oauth/authorize?#{build_query(parameters)}"
   end
 
   def refresh_token_endpoint_url(options = {})
     parameters = {
-      :refresh_token => options[:refresh_token],
-      :client_id     => options[:client_id]     || options[:client].uid,
-      :client_secret => options[:client_secret] || options[:client].secret,
-      :grant_type    => options[:grant_type]    || "refresh_token",
+      refresh_token: options[:refresh_token],
+      client_id: options[:client_id]     || options[:client].uid,
+      client_secret: options[:client_secret] || options[:client].secret,
+      grant_type: options[:grant_type]    || 'refresh_token'
     }
     "/oauth/token?#{build_query(parameters)}"
   end
 
+  def revocation_token_endpoint_url
+    '/oauth/revoke'
+  end
+
   def build_query(hash)
     Rack::Utils.build_query(hash)
   end
 end
 
-RSpec.configuration.send :include, UrlHelper, :type => :request
+RSpec.configuration.send :include, UrlHelper, type: :request

data/spec/support/orm/active_record.rb

@@ -1,11 +1,11 @@
 # load schema to in memory sqlite
 ActiveRecord::Migration.verbose = false
-load Rails.root + "db/schema.rb"
+load Rails.root + 'db/schema.rb'
 
 module Doorkeeper
   module OrmHelper
-  	def mock_application_owner
-      mock_model 'User', :id => 1234
-  	end
+    def mock_application_owner
+      mock_model 'User', id: 1234
+    end
   end
 end

data/spec/support/orm/mongo_mapper.rb

@@ -13,9 +13,8 @@ module Doorkeeper
   class PlaceholderApplicationOwner
     include MongoMapper::Document
 
-    set_collection_name "placeholder_application_owners"
-    many :applications, :class => Doorkeeper::Application
-
+    set_collection_name 'placeholder_application_owners'
+    many :applications, class: Doorkeeper::Application
   end
 
   module OrmHelper

data/spec/support/orm/mongoid.rb

@@ -13,19 +13,18 @@ module Doorkeeper
   class PlaceholderApplicationOwner
     include Mongoid::Document
 
-    if ::Mongoid::VERSION >= "3"
-      self.store_in :collection => :placeholder_application_owners
+    if ::Mongoid::VERSION >= '3'
+      self.store_in collection: :placeholder_application_owners
     else
       self.store_in :placeholder_application_owners
     end
 
     has_many :applications
-
   end
 
   module OrmHelper
-  	def mock_application_owner
-  		PlaceholderApplicationOwner.new
-  	end
+    def mock_application_owner
+      PlaceholderApplicationOwner.new
+    end
   end
 end

data/spec/support/shared/controllers_shared_context.rb

@@ -1,10 +1,10 @@
-shared_context "valid token", :token => :valid do
+shared_context 'valid token', token: :valid do
   let :token_string do
-    "1A2B3C4D"
+    '1A2B3C4D'
   end
 
   let :token do
-    double(Doorkeeper::AccessToken, :accessible? => true)
+    double(Doorkeeper::AccessToken, accessible?: true)
   end
 
   before :each do
@@ -12,13 +12,13 @@ shared_context "valid token", :token => :valid do
   end
 end
 
-shared_context "invalid token", :token => :invalid do
+shared_context 'invalid token', token: :invalid do
   let :token_string do
-    "1A2B3C4D"
+    '1A2B3C4D'
   end
 
   let :token do
-    double(Doorkeeper::AccessToken, :accessible? => false, :revoked? => false, :expired? => false)
+    double(Doorkeeper::AccessToken, accessible?: false, revoked?: false, expired?: false)
   end
 
   before :each do
@@ -26,22 +26,22 @@ shared_context "invalid token", :token => :invalid do
   end
 end
 
-shared_context "authenticated resource owner" do
+shared_context 'authenticated resource owner' do
   before do
-    user = double(:resource, :id => 1)
-    allow(Doorkeeper.configuration).to receive(:authenticate_resource_owner) { proc do user end }
+    user = double(:resource, id: 1)
+    allow(Doorkeeper.configuration).to receive(:authenticate_resource_owner) { proc { user } }
   end
 end
 
-shared_context "not authenticated resource owner" do
+shared_context 'not authenticated resource owner' do
   before do
-    allow(Doorkeeper.configuration).to receive(:authenticate_resource_owner) { proc do redirect_to '/' end }
+    allow(Doorkeeper.configuration).to receive(:authenticate_resource_owner) { proc { redirect_to '/' } }
   end
 end
 
-shared_context "valid authorization request" do
+shared_context 'valid authorization request' do
   let :authorization do
-    double(:authorization, :valid? => true, :authorize => true, :success_redirect_uri => "http://something.com/cb?code=token")
+    double(:authorization, valid?: true, authorize: true, success_redirect_uri: 'http://something.com/cb?code=token')
   end
 
   before do
@@ -49,9 +49,9 @@ shared_context "valid authorization request" do
   end
 end
 
-shared_context "invalid authorization request" do
+shared_context 'invalid authorization request' do
   let :authorization do
-    double(:authorization, :valid? => false, :authorize => false, :redirect_on_error? => false)
+    double(:authorization, valid?: false, authorize: false, redirect_on_error?: false)
   end
 
   before do

data/spec/support/shared/models_shared_examples.rb

@@ -1,35 +1,35 @@
-shared_examples "an accessible token" do
+shared_examples 'an accessible token' do
   describe :accessible? do
-    it "is accessible if token is not expired" do
+    it 'is accessible if token is not expired' do
       allow(subject).to receive(:expired?).and_return(false)
       should be_accessible
     end
 
-    it "is not accessible if token is expired" do
+    it 'is not accessible if token is expired' do
       allow(subject).to receive(:expired?).and_return(true)
       should_not be_accessible
     end
   end
 end
 
-shared_examples "a revocable token" do
+shared_examples 'a revocable token' do
   describe :accessible? do
     before { subject.save! }
 
-    it "is accessible if token is not revoked" do
+    it 'is accessible if token is not revoked' do
       expect(subject).to be_accessible
     end
 
-    it "is not accessible if token is revoked" do
+    it 'is not accessible if token is revoked' do
       subject.revoke
       expect(subject).not_to be_accessible
     end
   end
 end
 
-shared_examples "an unique token" do
+shared_examples 'an unique token' do
   describe :token do
-    it "is unique" do
+    it 'is unique' do
       tokens = []
       3.times do
         token = FactoryGirl.create(factory_name).token
@@ -37,11 +37,11 @@ shared_examples "an unique token" do
       end
     end
 
-    it "is generated before validation" do
+    it 'is generated before validation' do
       expect { subject.valid? }.to change { subject.token }.from(nil)
     end
 
-    it "is not valid if token exists" do
+    it 'is not valid if token exists' do
       token1 = FactoryGirl.create factory_name
       token2 = FactoryGirl.create factory_name
       token2.token = token1.token
@@ -52,9 +52,9 @@ shared_examples "an unique token" do
       token1 = FactoryGirl.create factory_name
       token2 = FactoryGirl.create factory_name
       token2.token = token1.token
-      expect {
-        token2.save!(:validate => false)
-      }.to raise_error
+      expect do
+        token2.save!(validate: false)
+      end.to raise_error
     end
   end
 end