Fixes for mixins, update to upstream

Rakefile

@@ -4,8 +4,10 @@ require 'rspec/core/rake_task'
 task :load_doorkeeper do
   `rm -rf spec/`
   `git checkout spec`
-  `git submodule init`
-  `git submodule update`
+  unless Dir.exist?('doorkeeper')
+    `git submodule init`
+    `git submodule update`
+  end
   `cp -r -n doorkeeper/spec .`
   `rm -rf spec/generators/` # we are not ActiveRecord
   `bundle exec rspec`

config/locales/en.yml

@@ -13,6 +13,7 @@ en:
               invalid_uri: 'must be a valid URI.'
               relative_uri: 'must be an absolute URI.'
               secured_uri: 'must be an HTTPS/SSL URI.'
+              forbidden_uri: 'is forbidden by the server.'
 
   mongoid:
     <<: *orm

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.0.0'
+  gem.add_dependency 'doorkeeper', '>= 4.0.0', '< 5.0'
 
   gem.add_development_dependency 'grape'
   gem.add_development_dependency 'coveralls'

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

@@ -17,6 +17,10 @@ module ApplicationMixin
           validates :redirect_uri, redirect_uri: true
 
           before_validation :generate_uid, :generate_secret, on: :create
+
+          def redirect_uri=(uris)
+            super(uris.is_a?(Array) ? uris.join("\n") : uris)
+          end
         end
 
         module ClassMethods

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

@@ -9,6 +9,7 @@ module AccessGrantMixin
         include Doorkeeper::Models::Revocable
         include Doorkeeper::Models::Accessible
         include Doorkeeper::Models::Scopes
+        include BaseMixin
 
         included do
           belongs_to_opts = {

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

@@ -9,6 +9,7 @@ module AccessTokenMixin
         include Doorkeeper::Models::Revocable
         include Doorkeeper::Models::Accessible
         include Doorkeeper::Models::Scopes
+        include BaseMixin
 
         included do
           belongs_to_opts = {

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

@@ -6,6 +6,7 @@ module ApplicationMixin
 
         include Doorkeeper::OAuth::Helpers
         include Doorkeeper::Models::Scopes
+        include BaseMixin
 
         included do
           has_many_options = {
@@ -25,6 +26,10 @@ module ApplicationMixin
           validates :redirect_uri, redirect_uri: true
 
           before_validation :generate_uid, :generate_secret, on: :create
+
+          def redirect_uri=(uris)
+            super(uris.is_a?(Array) ? uris.join("\n") : uris)
+          end
         end
 
         module ClassMethods