doorkeeper 3.1.0 → 4.0.0

data/spec/support/shared/controllers_shared_context.rb

@@ -4,11 +4,15 @@ shared_context 'valid token', token: :valid do
   end
 
   let :token do
-    double(Doorkeeper::AccessToken, accessible?: true, includes_scope?: true, acceptable?: true)
+    double(Doorkeeper::AccessToken,
+           accessible?: true, includes_scope?: true, acceptable?: true,
+           previous_refresh_token: "", revoke_previous_refresh_token!: true)
   end
 
   before :each do
-    allow(Doorkeeper::AccessToken).to receive(:by_token).with(token_string).and_return(token)
+    allow(
+      Doorkeeper::AccessToken
+    ).to receive(:by_token).with(token_string).and_return(token)
   end
 end
 
@@ -18,11 +22,16 @@ shared_context 'invalid token', token: :invalid do
   end
 
   let :token do
-    double(Doorkeeper::AccessToken, accessible?: false, revoked?: false, expired?: false, includes_scope?: false, acceptable?: false)
+    double(Doorkeeper::AccessToken,
+           accessible?: false, revoked?: false, expired?: false,
+           includes_scope?: false, acceptable?: false,
+           previous_refresh_token: "", revoke_previous_refresh_token!: true)
   end
 
   before :each do
-    allow(Doorkeeper::AccessToken).to receive(:by_token).with(token_string).and_return(token)
+    allow(
+      Doorkeeper::AccessToken
+    ).to receive(:by_token).with(token_string).and_return(token)
   end
 end
 

data/spec/support/shared/models_shared_examples.rb

@@ -46,7 +46,7 @@ shared_examples 'a unique token' do
       token2.token = token1.token
       expect do
         token2.save!(validate: false)
-      end.to raise_error(ActiveRecord::RecordNotUnique)
+      end.to raise_error(uniqueness_error)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,42 +17,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -68,47 +82,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.7.0
 description: Doorkeeper is an OAuth 2 provider for Rails and Grape.
 email:
 - tutecosta@gmail.com
@@ -216,12 +230,12 @@ files:
 - lib/doorkeeper/validations.rb
 - lib/doorkeeper/version.rb
 - lib/generators/doorkeeper/application_owner_generator.rb
-- lib/generators/doorkeeper/application_scopes_generator.rb
 - lib/generators/doorkeeper/install_generator.rb
 - lib/generators/doorkeeper/migration_generator.rb
+- lib/generators/doorkeeper/previous_refresh_token_generator.rb
 - lib/generators/doorkeeper/templates/README
 - lib/generators/doorkeeper/templates/add_owner_to_application_migration.rb
-- lib/generators/doorkeeper/templates/add_scopes_to_oauth_applications.rb
+- lib/generators/doorkeeper/templates/add_previous_refresh_token_to_access_tokens.rb
 - lib/generators/doorkeeper/templates/initializer.rb
 - lib/generators/doorkeeper/templates/migration.rb
 - lib/generators/doorkeeper/views_generator.rb
@@ -249,6 +263,7 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/active_record_belongs_to_required_by_default.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/doorkeeper.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -258,9 +273,9 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
-- spec/dummy/db/migrate/20130902165751_create_doorkeeper_tables.rb
-- spec/dummy/db/migrate/20130902175349_add_owner_to_application.rb
-- spec/dummy/db/migrate/20141209001746_add_scopes_to_oauth_applications.rb
+- spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb
+- spec/dummy/db/migrate/20151223200000_add_owner_to_application.rb
+- spec/dummy/db/migrate/20160320211015_add_previous_refresh_token_to_access_tokens.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -290,6 +305,7 @@ files:
 - spec/lib/oauth/client_credentials_request_spec.rb
 - spec/lib/oauth/client_spec.rb
 - spec/lib/oauth/code_request_spec.rb
+- spec/lib/oauth/code_response_spec.rb
 - spec/lib/oauth/error_response_spec.rb
 - spec/lib/oauth/error_spec.rb
 - spec/lib/oauth/forbidden_token_response_spec.rb
@@ -336,6 +352,7 @@ files:
 - spec/support/helpers/model_helper.rb
 - spec/support/helpers/request_spec_helper.rb
 - spec/support/helpers/url_helper.rb
+- spec/support/http_method_shim.rb
 - spec/support/orm/active_record.rb
 - spec/support/shared/controllers_shared_context.rb
 - spec/support/shared/models_shared_examples.rb
@@ -361,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: OAuth 2 provider for Rails and Grape
@@ -390,6 +407,7 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/active_record_belongs_to_required_by_default.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/doorkeeper.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -399,9 +417,9 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
-- spec/dummy/db/migrate/20130902165751_create_doorkeeper_tables.rb
-- spec/dummy/db/migrate/20130902175349_add_owner_to_application.rb
-- spec/dummy/db/migrate/20141209001746_add_scopes_to_oauth_applications.rb
+- spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb
+- spec/dummy/db/migrate/20151223200000_add_owner_to_application.rb
+- spec/dummy/db/migrate/20160320211015_add_previous_refresh_token_to_access_tokens.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -431,6 +449,7 @@ test_files:
 - spec/lib/oauth/client_credentials_request_spec.rb
 - spec/lib/oauth/client_spec.rb
 - spec/lib/oauth/code_request_spec.rb
+- spec/lib/oauth/code_response_spec.rb
 - spec/lib/oauth/error_response_spec.rb
 - spec/lib/oauth/error_spec.rb
 - spec/lib/oauth/forbidden_token_response_spec.rb
@@ -477,6 +496,7 @@ test_files:
 - spec/support/helpers/model_helper.rb
 - spec/support/helpers/request_spec_helper.rb
 - spec/support/helpers/url_helper.rb
+- spec/support/http_method_shim.rb
 - spec/support/orm/active_record.rb
 - spec/support/shared/controllers_shared_context.rb
 - spec/support/shared/models_shared_examples.rb

data/lib/generators/doorkeeper/application_scopes_generator.rb

@@ -1,34 +0,0 @@
-require 'rails/generators/active_record'
-
-class Doorkeeper::ApplicationScopesGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
-  source_root File.expand_path('../templates', __FILE__)
-  desc 'Copies ActiveRecord migrations to handle upgrade to doorkeeper 2'
-
-  def self.next_migration_number(path)
-    ActiveRecord::Generators::Base.next_migration_number(path)
-  end
-
-  def application_scopes
-    if oauth_applications_exists? && !scopes_column_exists?
-      migration_template(
-        'add_scopes_to_oauth_applications.rb',
-        'db/migrate/add_scopes_to_oauth_applications.rb'
-      )
-    end
-  end
-
-  private
-
-  def scopes_column_exists?
-    ActiveRecord::Base.connection.column_exists?(
-      :oauth_applications,
-      :scopes
-    )
-  end
-
-  # Might be running this before install
-  def oauth_applications_exists?
-    ActiveRecord::Base.connection.table_exists? :oauth_applications
-  end
-end

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

@@ -1,5 +0,0 @@
-class AddScopesToOauthApplications < ActiveRecord::Migration
-  def change
-    add_column :oauth_applications, :scopes, :string, null: false, default: ''
-  end
-end

data/spec/dummy/db/migrate/20141209001746_add_scopes_to_oauth_applications.rb

@@ -1,5 +0,0 @@
-class AddScopesToOauthApplications < ActiveRecord::Migration
-  def change
-    add_column :oauth_applications, :scopes, :string, null: false, default: ''
-  end
-end