Code style for config

nygrenh · nygrenh · commit afc0942c7b43 · 2018-09-28T20:49:04.000+03:00
diff --git a/config/application.rb b/config/application.rb
@@ -1,5 +1,7 @@
-require File.expand_path('../boot', __FILE__)
-require File.expand_path('../../app/models/site_setting.rb', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('boot', __dir__)
+require File.expand_path('../app/models/site_setting.rb', __dir__)
 
 require 'rails/all'
 
@@ -24,7 +26,7 @@ class Application < Rails::Application
     # config.i18n.default_locale = :de
 
     # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password, :session_id, :api_password, :submission_file, :return_file, :test_output, :stdout, :stderr, :vm_log]
+    config.filter_parameters += %i[password session_id api_password submission_file return_file test_output stdout stderr vm_log]
 
     config.active_record.raise_in_transactional_callbacks = true
 
@@ -33,20 +35,20 @@ class Application < Rails::Application
 
     config.relative_url_root = SiteSetting.value('base_path')
 
-    config.middleware.insert_before 0, "Rack::Cors", :debug => true, :logger => (-> { Rails.logger }) do
+    config.middleware.insert_before 0, 'Rack::Cors', debug: true, logger: (-> { Rails.logger }) do
       allow do
         origins '*'
         resource '/oauth*', headers: :any, methods: :any
         resource '/api*', headers: :any, methods: :any
       end
       allow do
         origins SiteSetting.all_settings['cors_origins']
-        resource '/auth*', headers: :any, methods: [:get, :post]
+        resource '/auth*', headers: :any, methods: %i[get post]
         resource '/paste/*', headers: :any, methods: [:get]
         resource '/courses', headers: :any, methods: [:get]
         resource '/courses/*', headers: :any, methods: [:get]
         resource '/courses/*/points*', headers: :any, methods: [:get]
-        resource '/exercises/*', headers: :any, methods: [:get, :post]
+        resource '/exercises/*', headers: :any, methods: %i[get post]
         resource '/org/*/courses.json', headers: :any, methods: [:get]
         resource '/org/*/courses/*', headers: :any, methods: [:get]
         resource '/org/*/courses/*/points*', headers: :any, methods: [:get]
diff --git a/config/boot.rb b/config/boot.rb
@@ -1,3 +1,5 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+# frozen_string_literal: true
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/environment.rb b/config/environment.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   config.logstasher.enabled = true
 
@@ -40,12 +42,12 @@
   # Use a different cache store in production.
   if ENV['REDIS_URL']
     config.cache_store = :readthis_store, {
-        expires_in: 1.weeks.to_i, #default
-        namespace: 'cache',
-        redis: { url: ENV.fetch('REDIS_URL'), driver: :hiredis }
+      expires_in: 1.week.to_i, # default
+      namespace: 'cache',
+      redis: { url: ENV.fetch('REDIS_URL'), driver: :hiredis }
     }
     Readthis.fault_tolerant = true
   else
-    config.cache_store = :memory_store, { size: 64.megabytes } #
+    config.cache_store = :memory_store, { size: 64.megabytes }
   end
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   config.logstasher.enabled = true
   #
@@ -48,21 +50,21 @@
 
   # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
-  config.log_tags = [ :uuid ]
+  config.log_tags = [:uuid]
 
   # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production.
   if ENV['REDIS_URL']
     config.cache_store = :readthis_store, {
-        expires_in: 1.weeks.to_i, #default
-        namespace: 'cache',
-        redis: { url: ENV.fetch('REDIS_URL'), driver: :hiredis }
+      expires_in: 1.week.to_i, # default
+      namespace: 'cache',
+      redis: { url: ENV.fetch('REDIS_URL'), driver: :hiredis }
     }
     Readthis.fault_tolerant = true
   else
-    config.cache_store = :memory_store, { size: 64.megabytes } #
+    config.cache_store = :memory_store, { size: 64.megabytes }
   end
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
diff --git a/config/extra_fields/user_fields.example.rb b/config/extra_fields/user_fields.example.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Configures extra user fields
 group 'Other' do
   html('<p>Please provide your full name if ...</p>')
@@ -6,6 +8,6 @@
     field_type: 'text',
     label: 'First and Last name',
     show_in_participant_list: true,
-    visible_to_if: lambda {|_user| true } # defaults to true
+    visible_to_if: ->(_user) { true } # defaults to true
   )
 end
diff --git a/config/initializers/admin.rb b/config/initializers/admin.rb
@@ -1,7 +1,9 @@
 
+# frozen_string_literal: true
+
 class CanAccessPgHero
   def self.matches?(request)
-    current_user = User.find_by_id(request.env['rack.session']['user_id'])
+    current_user = User.find_by(id: request.env['rack.session']['user_id'])
     return false if current_user.blank?
     Ability.new(current_user).can? :access_pghero, nil
   end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w( application-bare.css application-bare.js application-test.css courses.js courses.css solutions.css solutions.js submissions.css submissions.js reviews.css sessions.css reviews.js migrate_to_other_course.css migrate_to_other_course.js setup/setup.css setup/organizations.css setup/organizations.js organizations.css participants.css points.css)
+Rails.application.config.assets.precompile += %w[application-bare.css application-bare.js application-test.css courses.js courses.css solutions.css solutions.js submissions.css submissions.js reviews.css sessions.css reviews.js migrate_to_other_course.css migrate_to_other_course.js setup/setup.css setup/organizations.css setup/organizations.js organizations.css participants.css points.css]
 
 # Include vendor images
 Rails.application.config.assets.precompile << proc do |path|
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.action_dispatch.cookies_serializer = :json
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Doorkeeper.configure do
   # Change the ORM that doorkeeper will use (needs plugins)
   orm :active_record
@@ -6,20 +8,19 @@
   resource_owner_authenticator do
     # Put your resource owner authentication logic here.
     # Example implementation:
-    User.find_by_id(session[:user_id]) || redirect_to(login_url(return_to: request.url)) # TODO: make login nicer
+    User.find_by(id: session[:user_id]) || redirect_to(login_url(return_to: request.url)) # TODO: make login nicer
   end
 
   # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
   admin_authenticator do
     # Put your admin authentication logic here.
-    user = User.find_by_id(session[:user_id])
+    user = User.find_by(id: session[:user_id])
     if user.nil? || !user.administrator?
-     redirect_to(login_url(return_to: request.url)) # TODO: make login nicer
+      redirect_to(login_url(return_to: request.url)) # TODO: make login nicer
     end
-
   end
 
-  resource_owner_from_credentials do |routes|
+  resource_owner_from_credentials do |_routes|
     User.authenticate(params[:username], params[:password])
   end
 
@@ -103,7 +104,7 @@
   #   http://tools.ietf.org/html/rfc6819#section-4.4.2
   #   http://tools.ietf.org/html/rfc6819#section-4.4.3
   #
-  grant_flows %w(authorization_code client_credentials password)
+  grant_flows %w[authorization_code client_credentials password]
 
   # Under some circumstances you might want to have applications auto-approved,
   # so that the user skips the authorization step.
diff --git a/config/initializers/env_lang.rb b/config/initializers/env_lang.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 # This ensures any commands we invoke, especially javac, use UTF-8.
 ENV['LANG'] = 'en_US.UTF-8'
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections
diff --git a/config/initializers/logstasher.rb b/config/initializers/logstasher.rb
@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 if LogStasher.enabled?
   LogStasher.add_custom_fields do |fields|
     # This block is run in application_controller context,
     # so you have access to all controller methods
     begin
-      if current_user && current_user.login
-        fields[:user] = current_user.login
-      else
-        fields[:user] = 'guest'
-      end
+      fields[:user] = if current_user&.login
+                        current_user.login
+                      else
+                        'guest'
+                      end
     rescue NameError
       fields[:user] = 'pghero/api?'
     end
@@ -20,7 +22,7 @@
     rescue NameError
     end
 
-    fields[:site] = request.path =~ /^\/api/ ? 'api' : 'user'
+    fields[:site] = /^\/api/.match?(request.path) ? 'api' : 'user'
 
     # If you are using custom instrumentation, just add it to logstasher custom fields
     LogStasher.custom_fields << :myapi_runtime
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:
diff --git a/config/initializers/rack_initializer.rb b/config/initializers/rack_initializer.rb
@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 # See
 # http://stackoverflow.com/questions/12243694/getting-error-exceeded-available-parameter-key-space
 # or
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :active_record_store, key: SiteSetting.value(:session_cookie_key), httponly: false
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which
diff --git a/config/routes.rb b/config/routes.rb
diff --git a/config/site_tailoring.example.rb b/config/site_tailoring.example.rb

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`Rails.application.configure do`
`2`	`4`	`# Settings specified here will take precedence over those in config/application.rb.`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`# Be sure to restart your server when you modify this file.`
`2`	`4`
`3`	`5`	`# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.`