#1044: refactor code

Move Orderable mixin under main models mixins.
doorkeeper-gem · Mar 2, 2018 · 07d1555 · 07d1555
1 parent de560c2
commit 07d1555
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 4 deletions.
diff --git a/lib/doorkeeper.rb b/lib/doorkeeper.rb
@@ -34,6 +34,7 @@
 require 'doorkeeper/oauth/invalid_token_response'
 require 'doorkeeper/oauth/forbidden_token_response'
 
+require 'doorkeeper/models/concerns/orderable'
 require 'doorkeeper/models/concerns/scopes'
 require 'doorkeeper/models/concerns/expirable'
 require 'doorkeeper/models/concerns/revocable'

diff --git a/lib/doorkeeper/models/access_grant_mixin.rb b/lib/doorkeeper/models/access_grant_mixin.rb
@@ -6,6 +6,7 @@ module AccessGrantMixin
     include Models::Expirable
     include Models::Revocable
     include Models::Accessible
+    include Models::Orderable
     include Models::Scopes
 
     module ClassMethods

diff --git a/lib/doorkeeper/models/access_token_mixin.rb b/lib/doorkeeper/models/access_token_mixin.rb
@@ -6,6 +6,7 @@ module AccessTokenMixin
     include Models::Expirable
     include Models::Revocable
     include Models::Accessible
+    include Models::Orderable
     include Models::Scopes
 
     module ClassMethods

diff --git a/lib/doorkeeper/models/application_mixin.rb b/lib/doorkeeper/models/application_mixin.rb
@@ -3,6 +3,7 @@ module ApplicationMixin
     extend ActiveSupport::Concern
 
     include OAuth::Helpers
+    include Models::Orderable
     include Models::Scopes
 
     module ClassMethods

diff --git a/lib/doorkeeper/orm/active_record.rb b/lib/doorkeeper/orm/active_record.rb
@@ -5,7 +5,6 @@ module Orm
     module ActiveRecord
       def self.initialize_models!
         lazy_load do
-          require 'doorkeeper/models/concerns/orderable'
           require 'doorkeeper/orm/active_record/access_grant'
           require 'doorkeeper/orm/active_record/access_token'
           require 'doorkeeper/orm/active_record/application'

diff --git a/lib/doorkeeper/orm/active_record/access_grant.rb b/lib/doorkeeper/orm/active_record/access_grant.rb
@@ -2,7 +2,6 @@ module Doorkeeper
   class AccessGrant < ActiveRecord::Base
     self.table_name = "#{table_name_prefix}oauth_access_grants#{table_name_suffix}".to_sym
 
-    include Models::Orderable
     include AccessGrantMixin
     include ActiveModel::MassAssignmentSecurity if defined?(::ProtectedAttributes)
 

diff --git a/lib/doorkeeper/orm/active_record/access_token.rb b/lib/doorkeeper/orm/active_record/access_token.rb
@@ -2,7 +2,6 @@ module Doorkeeper
   class AccessToken < ActiveRecord::Base
     self.table_name = "#{table_name_prefix}oauth_access_tokens#{table_name_suffix}".to_sym
 
-    include Models::Orderable
     include AccessTokenMixin
     include ActiveModel::MassAssignmentSecurity if defined?(::ProtectedAttributes)
 

diff --git a/lib/doorkeeper/orm/active_record/application.rb b/lib/doorkeeper/orm/active_record/application.rb
@@ -2,7 +2,6 @@ module Doorkeeper
   class Application < ActiveRecord::Base
     self.table_name = "#{table_name_prefix}oauth_applications#{table_name_suffix}".to_sym
 
-    include Models::Orderable
     include ApplicationMixin
     include ActiveModel::MassAssignmentSecurity if defined?(::ProtectedAttributes)