doorkeeper.rb in doorkeeper-1.0.0.rc2

- old
+ new
@@ -4,53 +4,45 @@
 require "doorkeeper/doorkeeper_for"
 
 require 'doorkeeper/errors'
 require 'doorkeeper/server'
 require 'doorkeeper/request'
+require "doorkeeper/validations"
 
-module Doorkeeper
-  autoload :Validations, "doorkeeper/validations"
+require "doorkeeper/oauth/authorization/code"
+require "doorkeeper/oauth/authorization/token"
+require "doorkeeper/oauth/authorization/uri_builder"
+require "doorkeeper/oauth/helpers/scope_checker"
+require "doorkeeper/oauth/helpers/uri_checker"
+require "doorkeeper/oauth/helpers/unique_token"
 
-  module OAuth
-    autoload :Scopes,                     "doorkeeper/oauth/scopes"
-    autoload :Error,                      "doorkeeper/oauth/error"
-    autoload :CodeResponse,               "doorkeeper/oauth/code_response"
-    autoload :TokenResponse,              "doorkeeper/oauth/token_response"
-    autoload :ErrorResponse,              "doorkeeper/oauth/error_response"
-    autoload :PreAuthorization,           "doorkeeper/oauth/pre_authorization"
-    autoload :AuthorizationCodeRequest,   "doorkeeper/oauth/authorization_code_request"
-    autoload :RefreshTokenRequest,        "doorkeeper/oauth/refresh_token_request"
-    autoload :PasswordAccessTokenRequest, "doorkeeper/oauth/password_access_token_request"
-    autoload :ClientCredentialsRequest,   "doorkeeper/oauth/client_credentials_request"
-    autoload :Authorization,              "doorkeeper/oauth/authorization"
-    autoload :CodeRequest,                "doorkeeper/oauth/code_request"
-    autoload :TokenRequest,               "doorkeeper/oauth/token_request"
-    autoload :Client,                     "doorkeeper/oauth/client"
-    autoload :Token,                      "doorkeeper/oauth/token"
+require "doorkeeper/oauth/scopes"
+require "doorkeeper/oauth/error"
+require "doorkeeper/oauth/code_response"
+require "doorkeeper/oauth/token_response"
+require "doorkeeper/oauth/error_response"
+require "doorkeeper/oauth/pre_authorization"
+require "doorkeeper/oauth/authorization_code_request"
+require "doorkeeper/oauth/refresh_token_request"
+require "doorkeeper/oauth/password_access_token_request"
+require "doorkeeper/oauth/client_credentials_request"
+require "doorkeeper/oauth/code_request"
+require "doorkeeper/oauth/token_request"
+require "doorkeeper/oauth/client"
+require "doorkeeper/oauth/token"
+require "doorkeeper/oauth/invalid_token_response"
 
-    module Helpers
-      autoload :ScopeChecker, "doorkeeper/oauth/helpers/scope_checker"
-      autoload :URIChecker,   "doorkeeper/oauth/helpers/uri_checker"
-      autoload :UniqueToken,  "doorkeeper/oauth/helpers/unique_token"
-    end
-  end
+require 'doorkeeper/models/scopes'
+require 'doorkeeper/models/expirable'
+require 'doorkeeper/models/revocable'
+require 'doorkeeper/models/accessible'
 
-  module Models
-    autoload :Scopes,     'doorkeeper/models/scopes'
-    autoload :Expirable,  'doorkeeper/models/expirable'
-    autoload :Revocable,  'doorkeeper/models/revocable'
-    autoload :Accessible, 'doorkeeper/models/accessible'
-  end
+require "doorkeeper/helpers/filter"
+require "doorkeeper/helpers/controller"
 
-  module Helpers
-    autoload :Filter, "doorkeeper/helpers/filter"
-    autoload :Controller, "doorkeeper/helpers/controller"
-  end
+require "doorkeeper/rails/routes"
 
-  module Rails
-    autoload :Routes, "doorkeeper/rails/routes"
-  end
-
+module Doorkeeper
   def self.configured?
     @config.present?
   end
 
   def self.database_installed?