doorkeeper-openid_connect 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 566a3678dd53056632685419826a124ee76a17b29606be3de9ada204c44b8c2e
-  data.tar.gz: 49ec3634d3be81fb98be0f94ad6eb9f550adf8d13a8c2abbf2332f6e5bc3405b
+  metadata.gz: 19eb794bd5e95ffce94e66f31408dd28466a80b4e282a0e2ac6ad5cecdd39882
+  data.tar.gz: a76b2f91648df1f2ca2a3e2951163b4727e43121beeda3c7cdceb2c16b1b8827
 SHA512:
-  metadata.gz: 76d674cc0218cbceaa942f0b4716fe3680cf02228d166deb9df21e55291a2fd6189803ddd81adfac91708b1310e8bee764599b7968582a9c178fddb5619f2d33
-  data.tar.gz: 460eee7bb2ebf59e356d1ac21c7eb0b1bac3dba97b24204ef8a70ab6e16490cf0e02b9c6d75fdf6d1a315ee1661c09af9cea5fa5652906ea9bdc359f98212d9d
+  metadata.gz: cfb1372220f224e7f1aa37539aea5d4d02b9be19b1dbb793c9ad34a29cceb701adecc11cab883054d2d22424ff16659096dc758079179a7f1454e854b3a5f447
+  data.tar.gz: 0a6475882e55fe7baf685ceb45d038f8d66d59ed6013faade643e296c94cc83aa30b2278ab9a766b29b9ba42f249140f92bf2f36a107281eae0f54c6f3a9278c

data/.gitignore

@@ -1,7 +1,8 @@
 /.bundle
 /Gemfile.lock
-/spec/dummy/db/*.sqlite3
+/spec/dummy/db/*.sqlite3*
+/spec/dummy/db/migrate/*doorkeeper_openid_connect*
 /spec/dummy/log/*.log
 /spec/dummy/tmp/
 /spec/examples.txt
-/pkg
+/pkg

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.6.0

data/.travis.yml

@@ -1,13 +1,18 @@
-sudo: false
 language: ruby
 cache: bundler
+sudo: false
 
 before_install:
   - gem update --system
-  - gem install bundler
+  # Bundler 2.0 is not compatible with Rails 4.2
+  # https://docs.travis-ci.com/user/languages/ruby/#bundler-20
+  - "find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete"
+  - rvm @global do gem uninstall bundler -a -x -I || true
+  - gem install bundler -v '< 2'
 
 before_script:
   - bundle update
+  - bundle exec rake migrate
 
 script:
   - bundle exec rake spec
@@ -15,8 +20,15 @@ script:
 env:
   - rails=4.2.0
   - rails=5.0.0
+  - rails=5.2.0
 
 rvm:
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
+
+matrix:
+  exclude:
+    - env: rails=4.2.0
+      rvm: 2.6

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 No changes yet.
 
+## v1.5.3 (2019-01-19)
+
+### Changes
+
+- Use versioned migrations for Rails 5.x (thanks to @tvongaza)
+
 ## v1.5.2 (2018-09-04)
 
 ### Changes

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # use Rails version specified by environment
-ENV['rails'] ||= '5.0.0'
+ENV['rails'] ||= '5.2.0'
 gem 'rails', "~> #{ENV['rails']}"
 
 gemspec

data/README.md

@@ -253,14 +253,19 @@ Run `bundle install` to setup all development dependencies.
 To run all specs:
 
 ```sh
-bundle exec rspec
+bundle exec rake spec
+```
+
+To generate and run migrations in the test application:
+
+```sh
+bundle exec rake migrate
 ```
 
 To run the local engine server:
 
 ```sh
-cd spec/dummy
-bundle exec rails server
+bundle exec rake server
 ```
 
 By default, the latest Rails version is used. To use a specific version run:

data/Rakefile

@@ -1,3 +1,5 @@
+ENV['RAILS_ENV'] ||= 'test'
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
@@ -5,3 +7,18 @@ RSpec::Core::RakeTask.new
 
 task default: :spec
 task test: :spec
+
+desc 'Generate and run migrations in the test application'
+task :migrate do
+  Dir.chdir('spec/dummy') do
+    system('bin/rails generate doorkeeper:openid_connect:migration')
+    system('bin/rake db:migrate')
+  end
+end
+
+desc 'Run server in the test application'
+task :server do
+  Dir.chdir('spec/dummy') do
+    system('bin/rails server')
+  end
+end

data/doorkeeper-openid_connect.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'json-jwt', '~> 1.6'
 
   spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'factory_girl'
+  spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'conventional-changelog', '~> 1.2'

data/lib/doorkeeper/openid_connect/helpers/controller.rb

@@ -7,7 +7,7 @@ module Doorkeeper
         def authenticate_resource_owner!
           super.tap do |owner|
             next unless respond_to?(:pre_auth, true)
-            next unless pre_auth.scopes.include? 'openid'
+            next unless pre_auth.client && pre_auth.scopes.include?('openid')
 
             handle_prompt_param!(owner)
             handle_max_age_param!(owner)

data/lib/doorkeeper/openid_connect/version.rb

@@ -1,5 +1,5 @@
 module Doorkeeper
   module OpenidConnect
-    VERSION = '1.5.2'.freeze
+    VERSION = '1.5.3'.freeze
   end
 end

data/lib/generators/doorkeeper/openid_connect/migration_generator.rb

@@ -8,12 +8,24 @@ module Doorkeeper
       desc 'Installs Doorkeeper OpenID Connect migration file.'
 
       def install
-        migration_template 'migration.rb', 'db/migrate/create_doorkeeper_openid_connect_tables.rb'
+        migration_template(
+          'migration.rb.erb',
+          'db/migrate/create_doorkeeper_openid_connect_tables.rb',
+          migration_version: migration_version
+        )
       end
 
       def self.next_migration_number(dirname)
         ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
+
+      private
+
+      def migration_version
+        if ActiveRecord::VERSION::MAJOR >= 5
+          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+        end
+      end
     end
   end
 end

data/lib/generators/doorkeeper/openid_connect/templates/{migration.rb → migration.rb.erb}

@@ -1,4 +1,4 @@
-class CreateDoorkeeperOpenidConnectTables < ActiveRecord::Migration
+class CreateDoorkeeperOpenidConnectTables < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :oauth_openid_requests do |t|
       t.integer :access_grant_id, null: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Sam Dengler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2019-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -167,7 +167,7 @@ files:
 - lib/generators/doorkeeper/openid_connect/install_generator.rb
 - lib/generators/doorkeeper/openid_connect/migration_generator.rb
 - lib/generators/doorkeeper/openid_connect/templates/initializer.rb
-- lib/generators/doorkeeper/openid_connect/templates/migration.rb
+- lib/generators/doorkeeper/openid_connect/templates/migration.rb.erb
 homepage: https://github.com/doorkeeper-gem/doorkeeper-openid_connect
 licenses:
 - MIT
@@ -187,8 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: OpenID Connect extension for Doorkeeper.