Code refactoring

lib/doorkeeper/engine.rb

@@ -4,7 +4,7 @@ module Doorkeeper
   class Engine < Rails::Engine
     initializer "doorkeeper.params.filter" do |app|
       parameters = %w[client_secret code authentication_token access_token refresh_token]
-      app.config.filter_parameters << /^(#{Regexp.union parameters})$/
+      app.config.filter_parameters << /^(#{Regexp.union(parameters)})$/
     end
 
     initializer "doorkeeper.routes" do

lib/doorkeeper/oauth/authorization/code.rb

@@ -11,7 +11,7 @@ def initialize(pre_auth, resource_owner)
           @resource_owner = resource_owner
         end
 
-        def issue_token
+        def issue_token!
           return @token if defined?(@token)
 
           @token = Doorkeeper.config.access_grant_model.create!(access_grant_attributes)

lib/doorkeeper/oauth/authorization/token.rb

@@ -48,7 +48,7 @@ def initialize(pre_auth, resource_owner)
           @resource_owner = resource_owner
         end
 
-        def issue_token
+        def issue_token!
           return @token if defined?(@token)
 
           context = self.class.build_context(

lib/doorkeeper/oauth/code_request.rb

@@ -6,13 +6,13 @@ class CodeRequest
       attr_reader :pre_auth, :resource_owner
 
       def initialize(pre_auth, resource_owner)
-        @pre_auth       = pre_auth
+        @pre_auth = pre_auth
         @resource_owner = resource_owner
       end
 
       def authorize
         auth = Authorization::Code.new(pre_auth, resource_owner)
-        auth.issue_token
+        auth.issue_token!
         CodeResponse.new(pre_auth, auth)
       end
 

lib/doorkeeper/oauth/token.rb

@@ -32,13 +32,13 @@ def from_bearer_param(request)
 
         def from_bearer_authorization(request)
           pattern = /^Bearer /i
-          header  = request.authorization
+          header = request.authorization
           token_from_header(header, pattern) if match?(header, pattern)
         end
 
         def from_basic_authorization(request)
           pattern = /^Basic /i
-          header  = request.authorization
+          header = request.authorization
           token_from_basic_header(header, pattern) if match?(header, pattern)
         end
 
@@ -54,7 +54,7 @@ def decode_basic_credentials_token(encoded_header)
         end
 
         def token_from_header(header, pattern)
-          header.gsub pattern, ""
+          header.gsub(pattern, "")
         end
 
         def match?(header, pattern)

lib/doorkeeper/oauth/token_introspection.rb

@@ -179,11 +179,7 @@ def token_introspection_allowed?(auth_client: nil, auth_token: nil)
         allow_introspection = Doorkeeper.config.allow_token_introspection
         return allow_introspection unless allow_introspection.respond_to?(:call)
 
-        allow_introspection.call(
-          @token,
-          auth_client,
-          auth_token,
-        )
+        allow_introspection.call(@token, auth_client, auth_token)
       end
 
       # Allows to customize introspection response.

lib/doorkeeper/oauth/token_request.rb

@@ -12,7 +12,7 @@ def initialize(pre_auth, resource_owner)
 
       def authorize
         auth = Authorization::Token.new(pre_auth, resource_owner)
-        auth.issue_token
+        auth.issue_token!
         CodeResponse.new(pre_auth, auth, response_on_fragment: true)
       end
 

lib/doorkeeper/server.rb

@@ -4,7 +4,7 @@ module Doorkeeper
   class Server
     attr_reader :context
 
-    def initialize(context = nil)
+    def initialize(context)
       @context = context
     end
 

lib/doorkeeper/stale_records_cleaner.rb

@@ -13,12 +13,12 @@ def self.for(base_scope)
       raise Doorkeeper::Errors::NoOrmCleaner, "'#{configured_orm}' ORM has no cleaner!"
     end
 
-    def self.configured_orm
-      Doorkeeper.config.orm
-    end
-
     def self.new(base_scope)
       self.for(base_scope)
     end
+
+    def self.configured_orm
+      Doorkeeper.config.orm
+    end
   end
 end

spec/lib/oauth/code_response_spec.rb

@@ -21,7 +21,7 @@
 
       let :auth do
         Doorkeeper::OAuth::Authorization::Token.new(pre_auth, owner).tap do |c|
-          c.issue_token
+          c.issue_token!
           allow(c.token).to receive(:expires_in_seconds).and_return(3600)
         end
       end

spec/lib/server_spec.rb

@@ -4,9 +4,10 @@
 
 describe Doorkeeper::Server do
   let(:fake_class) { double :fake_class }
+  let(:context) { double :context }
 
   subject do
-    described_class.new
+    described_class.new(context)
   end
 
   describe ".authorization_request" do