Fix code style issues

app/controllers/doorkeeper/applications_controller.rb

@@ -77,8 +77,8 @@ def set_application
     end
 
     def application_params
-      params.require(:doorkeeper_application).
-        permit(:name, :redirect_uri, :scopes, :confidential)
+      params.require(:doorkeeper_application)
+        .permit(:name, :redirect_uri, :scopes, :confidential)
     end
   end
 end

lib/doorkeeper/config.rb

@@ -177,7 +177,7 @@ def option(name, options = {})
             value = if attribute_builder
                       attribute_builder.new(&block).build
                     else
-                      block ? block : args.first
+                      block || args.first
                     end
 
             @config.instance_variable_set(:"@#{attribute}", value)

lib/doorkeeper/models/access_grant_mixin.rb

@@ -42,8 +42,8 @@ def by_token(token)
       def revoke_all_for(application_id, resource_owner, clock = Time)
         where(application_id: application_id,
               resource_owner_id: resource_owner.id,
-              revoked_at: nil).
-          update_all(revoked_at: clock.now.utc)
+              revoked_at: nil)
+          .update_all(revoked_at: clock.now.utc)
       end
 
       # Implements PKCE code_challenge encoding without base64 padding as described in the spec.
@@ -78,7 +78,7 @@ def revoke_all_for(application_id, resource_owner, clock = Time)
       #
       # urlsafe_encode64(bin)
       # Returns the Base64-encoded version of bin. This method complies with
-      # “Base 64 Encoding with URL and Filename Safe Alphabet” in RFC 4648.
+      # "Base 64 Encoding with URL and Filename Safe Alphabet" in RFC 4648.
       # The alphabet uses '-' instead of '+' and '_' instead of '/'.
 
       # @param code_verifier [#to_s] a one time use value (any object that responds to `#to_s`)

lib/doorkeeper/models/access_token_mixin.rb

@@ -47,8 +47,8 @@ def by_refresh_token(refresh_token)
       def revoke_all_for(application_id, resource_owner, clock = Time)
         where(application_id: application_id,
               resource_owner_id: resource_owner.id,
-              revoked_at: nil).
-          update_all(revoked_at: clock.now.utc)
+              revoked_at: nil)
+          .update_all(revoked_at: clock.now.utc)
       end
 
       # Looking for not revoked Access Token with a matching set of scopes

lib/doorkeeper/rails/routes.rb

@@ -91,11 +91,16 @@ def token_info_routes(mapping)
       end
 
       def application_routes(mapping)
-        routes.resources :doorkeeper_applications, controller: mapping[:controllers], as: :applications, path: 'applications'
+        routes.resources :doorkeeper_applications,
+                         controller: mapping[:controllers],
+                         as: :applications,
+                         path: 'applications'
       end
 
       def authorized_applications_routes(mapping)
-        routes.resources :authorized_applications, only: %i[index destroy], controller: mapping[:controllers]
+        routes.resources :authorized_applications,
+                         only: %i[index destroy],
+                         controller: mapping[:controllers]
       end
     end
   end

spec/controllers/applications_controller_spec.rb

@@ -13,12 +13,12 @@ module Doorkeeper
       it 'creates an application' do
         expect do
           post :create, params: {
-             doorkeeper_application: {
-               name: 'Example',
-               redirect_uri: 'https://example.com'
-             }, format: :json
-           }
-        end.to change { Doorkeeper::Application.count }
+            doorkeeper_application: {
+              name: 'Example',
+              redirect_uri: 'https://example.com'
+            }, format: :json
+          }
+        end.to(change { Doorkeeper::Application.count })
 
         expect(response).to be_successful
 
@@ -31,11 +31,11 @@ module Doorkeeper
       it 'returns validation errors on wrong create params' do
         expect do
           post :create, params: {
-             doorkeeper_application: {
-               name: 'Example'
-             }, format: :json
-           }
-        end.not_to change { Doorkeeper::Application.count }
+            doorkeeper_application: {
+              name: 'Example'
+            }, format: :json
+          }
+        end.not_to(change { Doorkeeper::Application.count })
 
         expect(response).to have_http_status(422)
 
@@ -108,14 +108,13 @@ module Doorkeeper
 
       it 'does not create application' do
         expect do
-          post :create,
-               params: {
-                 doorkeeper_application: {
-                   name: 'Example',
-                   redirect_uri: 'https://example.com'
-                 }
-               }
-        end.not_to change { Doorkeeper::Application.count }
+          post :create, params: {
+            doorkeeper_application: {
+              name: 'Example',
+              redirect_uri: 'https://example.com'
+            }
+          }
+        end.not_to(change { Doorkeeper::Application.count })
       end
     end
 
@@ -139,41 +138,38 @@ module Doorkeeper
 
       it 'creates application' do
         expect do
-          post :create,
-               params: {
-                 doorkeeper_application: {
-                   name: 'Example',
-                   redirect_uri: 'https://example.com'
-                 }
-               }
+          post :create, params: {
+            doorkeeper_application: {
+              name: 'Example',
+              redirect_uri: 'https://example.com'
+            }
+          }
         end.to change { Doorkeeper::Application.count }.by(1)
 
         expect(response).to be_redirect
       end
 
       it 'does not allow mass assignment of uid or secret' do
         application = FactoryBot.create(:application)
-        put :update,
-            params: {
-              id: application.id,
-              doorkeeper_application: {
-                uid: '1A2B3C4D',
-                secret: '1A2B3C4D'
-              }
-            }
+        put :update, params: {
+          id: application.id,
+          doorkeeper_application: {
+            uid: '1A2B3C4D',
+            secret: '1A2B3C4D'
+          }
+        }
 
         expect(application.reload.uid).not_to eq '1A2B3C4D'
       end
 
       it 'updates application' do
         application = FactoryBot.create(:application)
-        put :update,
-            params: {
-              id: application.id, doorkeeper_application: {
-                name: 'Example',
-                redirect_uri: 'https://example.com'
-              }
-            }
+        put :update, params: {
+          id: application.id, doorkeeper_application: {
+            name: 'Example',
+            redirect_uri: 'https://example.com'
+          }
+        }
 
         expect(application.reload.name).to eq 'Example'
       end

spec/controllers/authorizations_controller_spec.rb

@@ -49,7 +49,7 @@ def translated_error_message(key)
     end
 
     it 'redirects to client redirect uri' do
-      expect(response.location).to match(%r{^#{client.redirect_uri}})
+      expect(response.location).to match(/^#{client.redirect_uri}/)
     end
 
     it 'includes access token in fragment' do
@@ -114,7 +114,13 @@ def translated_error_message(key)
   describe 'POST #create with errors' do
     before do
       default_scopes_exist :public
-      post :create, params: { client_id: client.uid, response_type: 'token', scope: 'invalid', redirect_uri: client.redirect_uri }
+
+      post :create, params: {
+        client_id: client.uid,
+        response_type: 'token',
+        scope: 'invalid',
+        redirect_uri: client.redirect_uri
+      }
     end
 
     it 'redirects after authorization' do
@@ -146,7 +152,13 @@ def translated_error_message(key)
     before do
       allow(Doorkeeper.configuration).to receive(:api_only).and_return(true)
       default_scopes_exist :public
-      post :create, params: { client_id: client.uid, response_type: 'token', scope: 'invalid', redirect_uri: client.redirect_uri }
+
+      post :create, params: {
+        client_id: client.uid,
+        response_type: 'token',
+        scope: 'invalid',
+        redirect_uri: client.redirect_uri
+      }
     end
 
     let(:response_json_body) { JSON.parse(response.body) }
@@ -182,7 +194,12 @@ def translated_error_message(key)
       allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
 
       access_token.save!
-      post :create, params: { client_id: client.uid, response_type: 'token', redirect_uri: client.redirect_uri }
+
+      post :create, params: {
+        client_id: client.uid,
+        response_type: 'token',
+        redirect_uri: client.redirect_uri
+      }
     end
 
     it 'returns the existing access token in a fragment' do
@@ -201,15 +218,21 @@ def translated_error_message(key)
 
     describe 'when successful' do
       after do
-        post :create, params: { client_id: client.uid, response_type: 'token', redirect_uri: client.redirect_uri }
+        post :create, params: {
+          client_id: client.uid,
+          response_type: 'token',
+          redirect_uri: client.redirect_uri
+        }
       end
 
       it 'should call :before_successful_authorization callback' do
-        expect(Doorkeeper.configuration).to receive_message_chain(:before_successful_authorization, :call).with(instance_of(described_class))
+        expect(Doorkeeper.configuration)
+          .to receive_message_chain(:before_successful_authorization, :call).with(instance_of(described_class))
       end
 
       it 'should call :after_successful_authorization callback' do
-        expect(Doorkeeper.configuration).to receive_message_chain(:after_successful_authorization, :call).with(instance_of(described_class))
+        expect(Doorkeeper.configuration)
+          .to receive_message_chain(:after_successful_authorization, :call).with(instance_of(described_class))
       end
     end
 
@@ -233,13 +256,19 @@ def translated_error_message(key)
       allow(Doorkeeper.configuration).to receive(:skip_authorization).and_return(proc do
         true
       end)
+
       client.update_attribute :redirect_uri, 'urn:ietf:wg:oauth:2.0:oob'
-      get :new, params: { client_id: client.uid, response_type: 'token', redirect_uri: client.redirect_uri }
+
+      get :new, params: {
+        client_id: client.uid,
+        response_type: 'token',
+        redirect_uri: client.redirect_uri
+      }
     end
 
     it 'should redirect immediately' do
       expect(response).to be_redirect
-      expect(response.location).to match(/oauth\/token\/info\?access_token=/)
+      expect(response.location).to match(%r{/oauth/token/info\?access_token=})
     end
 
     it 'should not issue a grant' do
@@ -257,13 +286,20 @@ def translated_error_message(key)
       allow(Doorkeeper.configuration).to receive(:skip_authorization).and_return(proc do
         true
       end)
+
       client.update_attribute :redirect_uri, 'urn:ietf:wg:oauth:2.0:oob'
-      get :new, params: { client_id: client.uid, response_type: 'code', redirect_uri: client.redirect_uri }
+
+      get :new, params: {
+        client_id: client.uid,
+        response_type: 'code',
+        redirect_uri: client.redirect_uri
+      }
     end
 
     it 'should redirect immediately' do
       expect(response).to be_redirect
-      expect(response.location).to match(/oauth\/authorize\/native\?code=#{Doorkeeper::AccessGrant.first.token}/)
+      expect(response.location)
+        .to match(%r{/oauth/authorize/native\?code=#{Doorkeeper::AccessGrant.first.token}})
     end
 
     it 'should issue a grant' do
@@ -280,12 +316,17 @@ def translated_error_message(key)
       allow(Doorkeeper.configuration).to receive(:skip_authorization).and_return(proc do
         true
       end)
-      get :new, params: { client_id: client.uid, response_type: 'token', redirect_uri: client.redirect_uri }
+
+      get :new, params: {
+        client_id: client.uid,
+        response_type: 'token',
+        redirect_uri: client.redirect_uri
+      }
     end
 
     it 'should redirect immediately' do
       expect(response).to be_redirect
-      expect(response.location).to match(%r{^#{client.redirect_uri}})
+      expect(response.location).to match(/^#{client.redirect_uri}/)
     end
 
     it 'should issue a token' do
@@ -312,7 +353,12 @@ def translated_error_message(key)
   describe 'GET #new in API mode' do
     before do
       allow(Doorkeeper.configuration).to receive(:api_only).and_return(true)
-      get :new, params: { client_id: client.uid, response_type: 'token', redirect_uri: client.redirect_uri }
+
+      get :new, params: {
+        client_id: client.uid,
+        response_type: 'token',
+        redirect_uri: client.redirect_uri
+      }
     end
 
     it 'should render success' do
@@ -337,7 +383,11 @@ def translated_error_message(key)
       allow(Doorkeeper.configuration).to receive(:skip_authorization).and_return(proc { true })
       allow(Doorkeeper.configuration).to receive(:api_only).and_return(true)
 
-      get :new, params: { client_id: client.uid, response_type: 'token', redirect_uri: client.redirect_uri }
+      get :new, params: {
+        client_id: client.uid,
+        response_type: 'token',
+        redirect_uri: client.redirect_uri
+      }
     end
 
     it 'should render success' do
@@ -405,7 +455,8 @@ def translated_error_message(key)
     end
 
     it 'includes error description in body' do
-      expect(response_json_body['error_description']).to eq(translated_error_message(:unsupported_response_type))
+      expect(response_json_body['error_description'])
+        .to eq(translated_error_message(:unsupported_response_type))
     end
 
     it 'does not issue any token' do
@@ -426,11 +477,13 @@ def translated_error_message(key)
       end
 
       it 'should call :before_successful_authorization callback' do
-        expect(Doorkeeper.configuration).to receive_message_chain(:before_successful_authorization, :call).with(instance_of(described_class))
+        expect(Doorkeeper.configuration)
+          .to receive_message_chain(:before_successful_authorization, :call).with(instance_of(described_class))
       end
 
       it 'should call :after_successful_authorization callback' do
-        expect(Doorkeeper.configuration).to receive_message_chain(:after_successful_authorization, :call).with(instance_of(described_class))
+        expect(Doorkeeper.configuration)
+          .to receive_message_chain(:after_successful_authorization, :call).with(instance_of(described_class))
       end
     end
 

spec/controllers/protected_resources_controller_spec.rb

@@ -157,8 +157,7 @@ def doorkeeper_unauthorized_render_options(error: nil)
         module ControllerActions
           remove_method :doorkeeper_unauthorized_render_options
 
-          def doorkeeper_unauthorized_render_options(error: nil)
-          end
+          def doorkeeper_unauthorized_render_options(error: nil); end
         end
       end