doorkeeper 1.1.0 → 1.2.0

data/spec/controllers/tokens_controller_spec.rb

@@ -1,37 +1,37 @@
 require 'spec_helper_integration'
 
 describe Doorkeeper::TokensController do
-  describe "when authorization has succeeded" do
+  describe 'when authorization has succeeded' do
     let :token do
-      double(:token, :authorize => true)
+      double(:token, authorize: true)
     end
 
     before do
       allow(controller).to receive(:token) { token }
     end
 
-    it "returns the authorization" do
+    it 'returns the authorization' do
       pending 'verify need of these specs'
       expect(token).to receive(:authorization)
       post :create
     end
   end
 
-  describe "when authorization has failed" do
+  describe 'when authorization has failed' do
     let :token do
-      double(:token, :authorize => false)
+      double(:token, authorize: false)
     end
 
     before do
       allow(controller).to receive(:token) { token }
     end
 
-    it "returns the error response" do
+    it 'returns the error response' do
       pending 'verify need of these specs'
-      allow(token).to receive(:error_response).and_return(double(:to_json => [], :status => :unauthorized))
+      allow(token).to receive(:error_response).and_return(double(to_json: [], status: :unauthorized))
       post :create
       expect(response.status).to eq 401
-      expect(response.headers["WWW-Authenticate"]).to match(/Bearer/)
+      expect(response.headers['WWW-Authenticate']).to match(/Bearer/)
     end
   end
 end

data/spec/dummy/app/controllers/custom_authorizations_controller.rb

@@ -1,7 +1,7 @@
 class CustomAuthorizationsController < ::ApplicationController
-  %w[index show new create edit update destroy].each do |action|
+  %w(index show new create edit update destroy).each do |action|
     define_method action do
-      render :nothing => true
+      render nothing: true
     end
   end
 end

data/spec/dummy/app/controllers/full_protected_resources_controller.rb

@@ -1,12 +1,12 @@
 class FullProtectedResourcesController < ApplicationController
   doorkeeper_for :index
-  doorkeeper_for :show, :scopes => [:admin]
+  doorkeeper_for :show, scopes: [:admin]
 
   def index
-    render :text => "index"
+    render text: 'index'
   end
 
   def show
-    render :text => "show"
+    render text: 'show'
   end
 end

data/spec/dummy/app/controllers/home_controller.rb

@@ -4,14 +4,14 @@ class HomeController < ApplicationController
 
   def sign_in
     session[:user_id] = if Rails.env.development?
-      User.first || User.create!(:name => "Joe", :password => "sekret")
-    else
-      User.first
-    end
+                          User.first || User.create!(name: 'Joe', password: 'sekret')
+                        else
+                          User.first
+                        end
     redirect_to '/'
   end
 
   def callback
-    render :text => "ok"
+    render text: 'ok'
   end
 end

data/spec/dummy/app/controllers/metal_controller.rb

@@ -6,6 +6,6 @@ class MetalController < ActionController::Metal
   doorkeeper_for :all
 
   def index
-    self.response_body = { :ok => true }.to_json
+    self.response_body = { ok: true }.to_json
   end
 end

data/spec/dummy/app/controllers/semi_protected_resources_controller.rb

@@ -2,10 +2,10 @@ class SemiProtectedResourcesController < ApplicationController
   doorkeeper_for :index
 
   def index
-    render :text => "protected index"
+    render text: 'protected index'
   end
 
   def show
-    render :text => "protected show"
+    render text: 'protected show'
   end
 end

data/spec/dummy/app/models/user.rb

@@ -7,8 +7,8 @@ when :mongoid2, :mongoid3, :mongoid4
     include Mongoid::Document
     include Mongoid::Timestamps
 
-    field :name, :type => String
-    field :password, :type => String
+    field :name, type: String
+    field :password, type: String
   end
 when :mongo_mapper
   class User
@@ -26,6 +26,6 @@ class User
   end
 
   def self.authenticate!(name, password)
-    User.where(:name => name, :password => password).first
+    User.where(name: name, password: password).first
   end
 end

data/spec/dummy/config/application.rb

@@ -1,16 +1,16 @@
 require File.expand_path('../boot', __FILE__)
 
-require "action_controller/railtie"
-require "sprockets/railtie"
+require 'action_controller/railtie'
+require 'sprockets/railtie'
 
 Bundler.require :default
 
 orm = if [:mongoid2, :mongoid3, :mongoid4].include?(DOORKEEPER_ORM)
-  Mongoid.load!(File.join(File.dirname(File.expand_path(__FILE__)), "#{DOORKEEPER_ORM}.yml"))
-  :mongoid
-else
-  DOORKEEPER_ORM
-end
+        Mongoid.load!(File.join(File.dirname(File.expand_path(__FILE__)), "#{DOORKEEPER_ORM}.yml"))
+        :mongoid
+      else
+        DOORKEEPER_ORM
+      end
 
 require "#{orm}/railtie"
 
@@ -40,7 +40,7 @@ module Dummy
     # config.i18n.default_locale = :en
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
@@ -52,4 +52,3 @@ module Dummy
     config.assets.version = '1.0'
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -3,4 +3,4 @@ require 'bundler/setup'
 
 DOORKEEPER_ORM = (ENV['orm'] || :active_record).to_sym unless defined?(DOORKEEPER_ORM)
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environments/test.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   if Rails.version.to_i < 4
     # Log error messages when you accidentally call methods on nil

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.find_by_id(session[:user_id]) || redirect_to(root_url, alert: 'Needs sign in.')
   end
 
   # If you want to restrict the access to the web interface for
@@ -30,7 +30,8 @@ Doorkeeper.configure do
   use_refresh_token
 
   # Define access token scopes for your provider
-  # For more information go to https://github.com/applicake/doorkeeper/wiki/Using-Scopes
+  # For more information go to
+  # https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes
   default_scopes  :public
   optional_scopes :write, :update
 
@@ -46,7 +47,6 @@ 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
   # 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
@@ -54,6 +54,6 @@ Doorkeeper.configure do
   #
   # test_redirect_uri 'urn:ietf:wg:oauth:2.0:oob'
 
-  # WWW-Authenticate Realm (default "Doorkeeper").
-  realm "Doorkeeper"
+  # WWW-Authenticate Realm (default 'Doorkeeper').
+  realm 'Doorkeeper'
 end

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

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

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

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters :format => [:json]
+  wrap_parameters format: [:json]
 end
 
 # Disable root element in JSON by default.

data/spec/dummy/config/routes.rb

@@ -1,42 +1,42 @@
 Rails.application.routes.draw do
   use_doorkeeper
-  use_doorkeeper :scope => 'scope'
+  use_doorkeeper scope: 'scope'
 
   scope 'inner_space' do
-    use_doorkeeper :scope => 'scope' do
-      controllers :authorizations => 'custom_authorizations',
-                  :tokens => 'custom_authorizations',
-                  :applications => 'custom_authorizations',
-                  :token_info => 'custom_authorizations'
-
-      as :authorizations => 'custom_auth',
-         :tokens => 'custom_token',
-         :token_info => 'custom_token_info'
+    use_doorkeeper scope: 'scope' do
+      controllers authorizations: 'custom_authorizations',
+                  tokens: 'custom_authorizations',
+                  applications: 'custom_authorizations',
+                  token_info: 'custom_authorizations'
+
+      as authorizations: 'custom_auth',
+         tokens: 'custom_token',
+         token_info: 'custom_token_info'
     end
   end
 
   scope 'space' do
     use_doorkeeper do
-      controllers :authorizations => 'custom_authorizations',
-                  :tokens => 'custom_authorizations',
-                  :applications => 'custom_authorizations',
-                  :token_info => 'custom_authorizations'
-
-      as :authorizations => 'custom_auth',
-         :tokens => 'custom_token',
-         :token_info => 'custom_token_info'
+      controllers authorizations: 'custom_authorizations',
+                  tokens: 'custom_authorizations',
+                  applications: 'custom_authorizations',
+                  token_info: 'custom_authorizations'
+
+      as authorizations: 'custom_auth',
+         tokens: 'custom_token',
+         token_info: 'custom_token_info'
     end
   end
 
   scope 'outer_space' do
     use_doorkeeper do
-      controllers :authorizations => 'custom_authorizations',
-                  :tokens => 'custom_authorizations',
-                  :token_info => 'custom_authorizations'
+      controllers authorizations: 'custom_authorizations',
+                  tokens: 'custom_authorizations',
+                  token_info: 'custom_authorizations'
 
-      as :authorizations => 'custom_auth',
-         :tokens => 'custom_token',
-         :token_info => 'custom_token_info'
+      as authorizations: 'custom_auth',
+         tokens: 'custom_token',
+         token_info: 'custom_token_info'
 
       skip_controllers :tokens, :applications, :token_info
     end
@@ -44,9 +44,9 @@ Rails.application.routes.draw do
 
   get 'metal.json' => 'metal#index'
 
-  get '/callback', :to => "home#callback"
-  get '/sign_in',  :to => "home#sign_in"
+  get '/callback', to: 'home#callback'
+  get '/sign_in',  to: 'home#sign_in'
   resources :semi_protected_resources
   resources :full_protected_resources
-  root :to => "home#index"
+  root to: 'home#index'
 end

data/spec/dummy/db/migrate/20130902165751_create_doorkeeper_tables.rb

@@ -1,42 +1,41 @@
 class CreateDoorkeeperTables < ActiveRecord::Migration
   def change
     create_table :oauth_applications do |t|
-      t.string  :name,         :null => false
-      t.string  :uid,          :null => false
-      t.string  :secret,       :null => false
-      t.string  :redirect_uri, :null => false, :limit => 2048
+      t.string  :name,         null: false
+      t.string  :uid,          null: false
+      t.string  :secret,       null: false
+      t.string  :redirect_uri, null: false, limit: 2048
       t.timestamps
     end
 
-    add_index :oauth_applications, :uid, :unique => true
+    add_index :oauth_applications, :uid, unique: true
 
     create_table :oauth_access_grants do |t|
-      t.integer  :resource_owner_id, :null => false
-      t.integer  :application_id,    :null => false
-      t.string   :token,             :null => false
-      t.integer  :expires_in,        :null => false
-      t.string   :redirect_uri,      :null => false, :limit => 2048
-      t.datetime :created_at,        :null => false
+      t.integer  :resource_owner_id, null: false
+      t.integer  :application_id,    null: false
+      t.string   :token,             null: false
+      t.integer  :expires_in,        null: false
+      t.string   :redirect_uri,      null: false, limit: 2048
+      t.datetime :created_at,        null: false
       t.datetime :revoked_at
       t.string   :scopes
     end
 
-    add_index :oauth_access_grants, :token, :unique => true
+    add_index :oauth_access_grants, :token, unique: true
 
     create_table :oauth_access_tokens do |t|
       t.integer  :resource_owner_id
       t.integer  :application_id
-      t.string   :token,             :null => false
+      t.string   :token,             null: false
       t.string   :refresh_token
       t.integer  :expires_in
       t.datetime :revoked_at
-      t.datetime :created_at,        :null => false
+      t.datetime :created_at,        null: false
       t.string   :scopes
     end
 
-    add_index :oauth_access_tokens, :token, :unique => true
+    add_index :oauth_access_tokens, :token, unique: true
     add_index :oauth_access_tokens, :resource_owner_id
-    add_index :oauth_access_tokens, :refresh_token, :unique => true
-
+    add_index :oauth_access_tokens, :refresh_token, unique: true
   end
 end

data/spec/dummy/db/migrate/20130902175349_add_owner_to_application.rb

@@ -1,7 +1,7 @@
 class AddOwnerToApplication < ActiveRecord::Migration
   def change
-    add_column :oauth_applications, :owner_id, :integer, :null => true
-    add_column :oauth_applications, :owner_type, :string, :null => true
+    add_column :oauth_applications, :owner_id, :integer, null: true
+    add_column :oauth_applications, :owner_type, :string, null: true
     add_index :oauth_applications, [:owner_id, :owner_type]
   end
-end
+end

data/spec/dummy/db/schema.rb

@@ -11,55 +11,55 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130902175349) do
+ActiveRecord::Schema.define(version: 20130902175349) do
 
-  create_table "oauth_access_grants", :force => true do |t|
-    t.integer  "resource_owner_id",                 :null => false
-    t.integer  "application_id",                    :null => false
-    t.string   "token",                             :null => false
-    t.integer  "expires_in",                        :null => false
-    t.text     "redirect_uri",                      :null => false
-    t.datetime "created_at",                        :null => false
-    t.datetime "revoked_at"
-    t.string   "scopes"
+  create_table 'oauth_access_grants', force: true do |t|
+    t.integer  'resource_owner_id',                 null: false
+    t.integer  'application_id',                    null: false
+    t.string   'token',                             null: false
+    t.integer  'expires_in',                        null: false
+    t.text     'redirect_uri',                      null: false
+    t.datetime 'created_at',                        null: false
+    t.datetime 'revoked_at'
+    t.string   'scopes'
   end
 
-  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
+  add_index 'oauth_access_grants', ['token'], name: 'index_oauth_access_grants_on_token', unique: true
 
-  create_table "oauth_access_tokens", :force => true do |t|
-    t.integer  "resource_owner_id"
-    t.integer  "application_id"
-    t.string   "token",             :null => false
-    t.string   "refresh_token"
-    t.integer  "expires_in"
-    t.datetime "revoked_at"
-    t.datetime "created_at",        :null => false
-    t.string   "scopes"
+  create_table 'oauth_access_tokens', force: true do |t|
+    t.integer  'resource_owner_id'
+    t.integer  'application_id'
+    t.string   'token',             null: false
+    t.string   'refresh_token'
+    t.integer  'expires_in'
+    t.datetime 'revoked_at'
+    t.datetime 'created_at',        null: false
+    t.string   'scopes'
   end
 
-  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
-  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
-  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
+  add_index 'oauth_access_tokens', ['refresh_token'], name: 'index_oauth_access_tokens_on_refresh_token', unique: true
+  add_index 'oauth_access_tokens', ['resource_owner_id'], name: 'index_oauth_access_tokens_on_resource_owner_id'
+  add_index 'oauth_access_tokens', ['token'], name: 'index_oauth_access_tokens_on_token', unique: true
 
-  create_table "oauth_applications", :force => true do |t|
-    t.string   "name",                         :null => false
-    t.string   "uid",                          :null => false
-    t.string   "secret",                       :null => false
-    t.text     "redirect_uri",                 :null => false
-    t.datetime "created_at",                   :null => false
-    t.datetime "updated_at",                   :null => false
-    t.integer  "owner_id"
-    t.string   "owner_type"
+  create_table 'oauth_applications', force: true do |t|
+    t.string   'name',                         null: false
+    t.string   'uid',                          null: false
+    t.string   'secret',                       null: false
+    t.text     'redirect_uri',                 null: false
+    t.datetime 'created_at',                   null: false
+    t.datetime 'updated_at',                   null: false
+    t.integer  'owner_id'
+    t.string   'owner_type'
   end
 
-  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
-  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
+  add_index 'oauth_applications', %w(owner_id owner_type), name: 'index_oauth_applications_on_owner_id_and_owner_type'
+  add_index 'oauth_applications', ['uid'], name: 'index_oauth_applications_on_uid', unique: true
 
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "password"
+  create_table 'users', force: true do |t|
+    t.string   'name'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
+    t.string   'password'
   end
 
 end