Make gem 4.4 compatible

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "doorkeeper"]
 	path = doorkeeper
 	url = https://github.com/doorkeeper-gem/doorkeeper.git
+    branch = 4.4.0

CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+
+User-visible changes worth mentioning.
+
+## master
+
+- [#] Description here
+
+## 4.2.0
+
+- [#32] Add `confidential` field for Doorkeeper >= 4.4
+- [#34] Fixes to support Doorkeeper +. 4.4
+
+## 4.1.0
+
+- Update to upstream doorkeeper
+- Fix mixins Access Token value generation to properly process custom
+  token generator class methods
+- Lazy load ORM models using ActiveSupport hooks
+- Clear code base from the dead code
+- Refactor mixins
+
+## 4.0.1
+
+- Code refactoring
+- [#26] Lazy ORM models loading
+- [#28] Mongoid 6 and 7beta support
+- Test against Rails 5.2
+- Update to upstream of Doorkeeper

README.md

@@ -10,8 +10,17 @@
 to your Gemfile:
 
 ``` ruby
-gem 'doorkeeper', '~> 4.0'
-gem 'doorkeeper-mongodb', '~> 4.0'
+# For Doorkeeper < 4.4
+gem 'doorkeeper', '~> 4.3'
+gem 'doorkeeper-mongodb', '~> 4.1.0'
+
+# For Doorkeeper >= 4.4 && < 5.0
+gem 'doorkeeper', '~> 4.4'
+gem 'doorkeeper-mongodb', '~> 4.2'
+
+# For Doorkeeper >= 5.0
+gem 'doorkeeper', '~> 5.0'
+gem 'doorkeeper-mongodb', '~> 5.0'
 
 # or if you want to use cutting edge version:
 # gem 'doorkeeper-mongodb', github: 'doorkeeper-gem/doorkeeper-mongodb'
@@ -72,6 +81,7 @@ variables defined in `.travis.yml` file.
 To run locally, you need to choose a gemfile, with a command similar to:
 
 ```
+$ export RAILS=5.1
 $ export BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.mongoid6.rb
 ```
 

doorkeeper-mongodb.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.files      = Dir['lib/**/*', 'config/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md']
   gem.test_files = Dir['spec/**/*']
 
-  gem.add_dependency 'doorkeeper', '>= 4.4.3', '< 5.0'
+  gem.add_dependency 'doorkeeper', '>= 4.4', '< 5.0'
 
   gem.add_development_dependency 'grape'
   gem.add_development_dependency 'coveralls'

gemfiles/Gemfile.mongoid7.rb

@@ -1,4 +1,4 @@
 gemfile = File.expand_path('../Gemfile.common.rb', __FILE__)
 instance_eval IO.read(gemfile), gemfile
 
-gem 'mongoid', '~> 7.0.0'
+gem 'mongoid', '~> 7.0'

lib/doorkeeper-mongodb/mixins/mongo_mapper/application_mixin.rb

@@ -54,12 +54,8 @@ def by_uid(uid)
           end
 
           def supports_confidentiality?
-            if ENV['RAILS_ENV'] ||= 'test'
-              if respond_to?(:column_names)
-                column_names.include?("confidential")
-              else
-                fields.include?("confidential")
-              end
+            if respond_to?(:column_names)
+              column_names.include?("confidential")
             else
               fields.include?("confidential")
             end

lib/doorkeeper-mongodb/mixins/mongoid/application_mixin.rb

@@ -63,12 +63,8 @@ def by_uid(uid)
           end
 
           def supports_confidentiality?
-            if ENV['RAILS_ENV'] ||= 'test'
-              if respond_to?(:column_names)
-                column_names.include?("confidential")
-              else
-                fields.include?("confidential")
-              end
+            if respond_to?(:column_names)
+              column_names.include?("confidential")
             else
               fields.include?("confidential")
             end

lib/doorkeeper/orm/mongo_mapper/application.rb

@@ -17,7 +17,7 @@ class Application
     key :uid,          String
     key :secret,       String
     key :redirect_uri, String
-    key :confidential, Boolean
+    key :confidential, Boolean, default: true
     key :scopes,       String
 
     def self.authorized_for(resource_owner)