doorkeeper 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1938eaf21efdea722af36789d561f304efeff2b
-  data.tar.gz: fe6f991a4629c210d625f525908d5f404add55b9
+  metadata.gz: cf9f87edf2bb97b62628659cd77adbf6b8efb103
+  data.tar.gz: d5481740fd13dc62cc157deb6cb2c75890612e82
 SHA512:
-  metadata.gz: 5f61954327e10dffc33b76e8bffed89df45f8bf54bbf127ca0ccac328a63749f09853b40647ff2d848190434a102d2eeac3a582d2056f4ed99f05084d78a8402
-  data.tar.gz: 9204913127b42e8f7fc8dcc9c351145ad5fb9e04ec2b9e07398eeec96631cef127fcbbd4102fdb4b90f73fc76a3337df57f5f4ce5f110ef3b0dd00e89c0d5bd7
+  metadata.gz: daac8f9ffc3dc10f4a3a7f5836641958b5a079569e09e7a623f1119169e93cef1db5f534d9dfbfa1bf355728f9e119158d10de215a0cc45f9eaa19e435df9d91
+  data.tar.gz: 66b9b8c90fe75e89d6831f034bfb580ca6d1a2f20157de569bdb67168e15f1e5f9c0b1b26b6b37cc6d11e550deb3b7da621d62a3411a6292f5973d333d328dfa

data/.travis.yml

@@ -4,16 +4,17 @@ sudo: false
 
 rvm:
   - 2.1
-  - 2.2.2
+  - 2.2.4
+  - 2.3.0
   - jruby-head
 
 env:
   - rails=4.2.0
-  - rails=5.0.0.beta1
+  - rails=5.0.0.beta3
 
 matrix:
   exclude:
-    - env: rails=5.0.0.beta1
+    - env: rails=5.0.0.beta3
       rvm: 2.1
-    - env: rails=5.0.0.beta1
+    - env: rails=5.0.0.beta3
       rvm: jruby-head

data/NEWS.md

@@ -4,6 +4,10 @@ User-visible changes worth mentioning.
 
 ---
 
+## 4.0.0.rc2
+
+- Fix optional belongs_to for Rails 5
+
 ## 4.0.0.rc1
 
 ### Backward incompatible changes

data/lib/doorkeeper/models/access_grant_mixin.rb

@@ -10,7 +10,15 @@ module Doorkeeper
     include ActiveModel::MassAssignmentSecurity if defined?(::ProtectedAttributes)
 
     included do
-      belongs_to :application, class_name: 'Doorkeeper::Application', inverse_of: :access_grants
+      belongs_to_options = {
+        class_name: 'Doorkeeper::Application',
+        inverse_of: :access_grants
+      }
+      if defined?(ActiveRecord::Base) && ActiveRecord::VERSION::MAJOR >= 5
+        belongs_to_options.merge!(optional: true)
+      end
+
+      belongs_to :application, belongs_to_options
 
       if respond_to?(:attr_accessible)
         attr_accessible :resource_owner_id, :application_id, :expires_in, :redirect_uri, :scopes

data/lib/doorkeeper/models/access_token_mixin.rb

@@ -15,7 +15,7 @@ module Doorkeeper
         inverse_of: :access_tokens
       }
       if defined?(ActiveRecord::Base) && ActiveRecord::VERSION::MAJOR >= 5
-        belongs_to_options.merge(optional: true)
+        belongs_to_options.merge!(optional: true)
       end
 
       belongs_to :application, belongs_to_options

data/lib/doorkeeper/models/concerns/ownership.rb

@@ -4,7 +4,12 @@ module Doorkeeper
       extend ActiveSupport::Concern
 
       included do
-        belongs_to :owner, polymorphic: true
+        belongs_to_options = { polymorphic: true }
+        if defined?(ActiveRecord::Base) && ActiveRecord::VERSION::MAJOR >= 5
+          belongs_to_options.merge!(optional: true)
+        end
+
+        belongs_to :owner, belongs_to_options
         validates :owner, presence: true, if: :validate_owner?
       end
 

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "4.0.0.rc1"
+  VERSION = "4.0.0.rc2"
 end

data/spec/dummy/config/application.rb

@@ -1,9 +1,8 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'action_controller/railtie'
-require 'sprockets/railtie'
+require 'rails/all'
 
-Bundler.require :default
+Bundler.require(*Rails.groups)
 
 require 'yaml'
 
@@ -20,38 +19,5 @@ module Dummy
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    if defined?(ActiveRecord) && Rails.version.to_i < 4
-      config.active_record.whitelist_attributes = true
-    end
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    config.i18n.load_path += Dir[Rails.root.join('../../', 'config/locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :en
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = 'utf-8'
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
-
-    I18n.enforce_available_locales = false
   end
 end

data/spec/dummy/config/environment.rb

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-Dummy::Application.initialize!
+Rails.application.initialize!

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

@@ -10,18 +10,10 @@ Dummy::Application.configure do
   # Configure static asset server for tests with Cache-Control for performance
   config.static_cache_control = 'public, max-age=3600'
 
-  if Rails.version.to_i < 4
-    # Log error messages when you accidentally call methods on nil
-    config.whiny_nils = true
-  end
-
-  if Rails.version.to_i >= 4
-    # Do not eager load code on boot. This avoids loading your whole application
-    # just for the purpose of running a single test. If you are using a tool that
-    # preloads Rails for running tests, you may have to set it to true.
-    config.eager_load = false
-    config.i18n.enforce_available_locales = true
-  end
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

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

@@ -0,0 +1,6 @@
+# Require `belongs_to` associations by default. This is a new Rails 5.0
+# default, so it is introduced as a configuration option to ensure that apps
+# made on earlier versions of Rails are not affected when upgrading.
+if Rails.version.to_i >= 5
+  Rails.application.config.active_record.belongs_to_required_by_default = true
+end

data/spec/models/doorkeeper/access_token_spec.rb

@@ -143,6 +143,12 @@ module Doorkeeper
         subject.resource_owner_id = nil
         expect(subject).to be_valid
       end
+
+      it 'is valid without resource_owner_id' do
+        # For resource owner credentials flow
+        subject.application_id = nil
+        expect(subject).to be_valid
+      end
     end
 
     describe '#same_credential?' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -249,6 +249,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
@@ -390,6 +391,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