normalizes indentation and whitespace across the project

15 files changed, 109 insertions, 115 deletions

diff --git a/activejob/lib/active_job/logging.rb b/activejob/lib/active_job/logging.rb
index fd77c94d4f..9900e10181 100644
--- a/activejob/lib/active_job/logging.rb
+++ b/activejob/lib/active_job/logging.rb
@@ -51,70 +51,70 @@ module ActiveJob
         logger.formatter.current_tags.include?("ActiveJob")
       end
 
-    class LogSubscriber < ActiveSupport::LogSubscriber #:nodoc:
-      def enqueue(event)
-        info do
-          job = event.payload[:job]
-          "Enqueued #{job.class.name} (Job ID: #{job.job_id}) to #{queue_name(event)}" + args_info(job)
+      class LogSubscriber < ActiveSupport::LogSubscriber #:nodoc:
+        def enqueue(event)
+          info do
+            job = event.payload[:job]
+            "Enqueued #{job.class.name} (Job ID: #{job.job_id}) to #{queue_name(event)}" + args_info(job)
+          end
         end
-      end
 
-      def enqueue_at(event)
-        info do
-          job = event.payload[:job]
-          "Enqueued #{job.class.name} (Job ID: #{job.job_id}) to #{queue_name(event)} at #{scheduled_at(event)}" + args_info(job)
+        def enqueue_at(event)
+          info do
+            job = event.payload[:job]
+            "Enqueued #{job.class.name} (Job ID: #{job.job_id}) to #{queue_name(event)} at #{scheduled_at(event)}" + args_info(job)
+          end
         end
-      end
 
-      def perform_start(event)
-        info do
-          job = event.payload[:job]
-          "Performing #{job.class.name} from #{queue_name(event)}" + args_info(job)
+        def perform_start(event)
+          info do
+            job = event.payload[:job]
+            "Performing #{job.class.name} from #{queue_name(event)}" + args_info(job)
+          end
         end
-      end
 
-      def perform(event)
-        info do
-          job = event.payload[:job]
-          "Performed #{job.class.name} from #{queue_name(event)} in #{event.duration.round(2)}ms"
+        def perform(event)
+          info do
+            job = event.payload[:job]
+            "Performed #{job.class.name} from #{queue_name(event)} in #{event.duration.round(2)}ms"
+          end
         end
-      end
 
-      private
-        def queue_name(event)
-          event.payload[:adapter].class.name.demodulize.remove("Adapter") + "(#{event.payload[:job].queue_name})"
-        end
+        private
+          def queue_name(event)
+            event.payload[:adapter].class.name.demodulize.remove("Adapter") + "(#{event.payload[:job].queue_name})"
+          end
 
-        def args_info(job)
-          if job.arguments.any?
-            " with arguments: " +
-              job.arguments.map { |arg| format(arg).inspect }.join(", ")
-          else
-            ""
+          def args_info(job)
+            if job.arguments.any?
+              " with arguments: " +
+                job.arguments.map { |arg| format(arg).inspect }.join(", ")
+            else
+              ""
+            end
           end
-        end
 
-        def format(arg)
-          case arg
-          when Hash
-            arg.transform_values { |value| format(value) }
-          when Array
-            arg.map { |value| format(value) }
-          when GlobalID::Identification
-            arg.to_global_id rescue arg
-          else
-            arg
+          def format(arg)
+            case arg
+            when Hash
+              arg.transform_values { |value| format(value) }
+            when Array
+              arg.map { |value| format(value) }
+            when GlobalID::Identification
+              arg.to_global_id rescue arg
+            else
+              arg
+            end
           end
-        end
 
-        def scheduled_at(event)
-          Time.at(event.payload[:job].scheduled_at).utc
-        end
+          def scheduled_at(event)
+            Time.at(event.payload[:job].scheduled_at).utc
+          end
 
-        def logger
-          ActiveJob::Base.logger
-        end
-    end
+          def logger
+            ActiveJob::Base.logger
+          end
+      end
   end
 end
 
diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb
index b651b30134..7f9a2da4b0 100644
--- a/activejob/lib/active_job/queue_adapter.rb
+++ b/activejob/lib/active_job/queue_adapter.rb
@@ -30,34 +30,34 @@ module ActiveJob
 
       private
 
-      def interpret_adapter(name_or_adapter_or_class)
-        case name_or_adapter_or_class
-        when Symbol, String
-          ActiveJob::QueueAdapters.lookup(name_or_adapter_or_class).new
-        else
-          if queue_adapter?(name_or_adapter_or_class)
-            name_or_adapter_or_class
-          elsif queue_adapter_class?(name_or_adapter_or_class)
-            ActiveSupport::Deprecation.warn "Passing an adapter class is deprecated " \
-              "and will be removed in Rails 5.1. Please pass an adapter name " \
-              "(.queue_adapter = :#{name_or_adapter_or_class.name.demodulize.remove('Adapter').underscore}) " \
-              "or an instance (.queue_adapter = #{name_or_adapter_or_class.name}.new) instead."
-              name_or_adapter_or_class.new
+        def interpret_adapter(name_or_adapter_or_class)
+          case name_or_adapter_or_class
+          when Symbol, String
+            ActiveJob::QueueAdapters.lookup(name_or_adapter_or_class).new
           else
-            raise ArgumentError
+            if queue_adapter?(name_or_adapter_or_class)
+              name_or_adapter_or_class
+            elsif queue_adapter_class?(name_or_adapter_or_class)
+              ActiveSupport::Deprecation.warn "Passing an adapter class is deprecated " \
+                "and will be removed in Rails 5.1. Please pass an adapter name " \
+                "(.queue_adapter = :#{name_or_adapter_or_class.name.demodulize.remove('Adapter').underscore}) " \
+                "or an instance (.queue_adapter = #{name_or_adapter_or_class.name}.new) instead."
+              name_or_adapter_or_class.new
+            else
+              raise ArgumentError
+            end
           end
         end
-      end
 
-      QUEUE_ADAPTER_METHODS = [:enqueue, :enqueue_at].freeze
+        QUEUE_ADAPTER_METHODS = [:enqueue, :enqueue_at].freeze
 
-      def queue_adapter?(object)
-        QUEUE_ADAPTER_METHODS.all? { |meth| object.respond_to?(meth) }
-      end
+        def queue_adapter?(object)
+          QUEUE_ADAPTER_METHODS.all? { |meth| object.respond_to?(meth) }
+        end
 
-      def queue_adapter_class?(object)
-        object.is_a?(Class) && QUEUE_ADAPTER_METHODS.all? { |meth| object.public_method_defined?(meth) }
-      end
+        def queue_adapter_class?(object)
+          object.is_a?(Class) && QUEUE_ADAPTER_METHODS.all? { |meth| object.public_method_defined?(meth) }
+        end
     end
   end
 end
diff --git a/activejob/lib/active_job/queue_adapters/qu_adapter.rb b/activejob/lib/active_job/queue_adapters/qu_adapter.rb
index c5521bc7ea..20cc97ebc7 100644
--- a/activejob/lib/active_job/queue_adapters/qu_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/qu_adapter.rb
@@ -20,7 +20,7 @@ module ActiveJob
         qu_job = Qu::Payload.new(klass: JobWrapper, args: [job.serialize]).tap do |payload|
           payload.instance_variable_set(:@queue, job.queue_name)
         end.push
-        
+
         # qu_job can be nil depending on the configured backend
         job.provider_job_id = qu_job.id unless qu_job.nil?
         qu_job
diff --git a/activejob/lib/active_job/queue_adapters/test_adapter.rb b/activejob/lib/active_job/queue_adapters/test_adapter.rb
index 28a6235429..da042cfebf 100644
--- a/activejob/lib/active_job/queue_adapters/test_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/test_adapter.rb
@@ -39,22 +39,22 @@ module ActiveJob
 
       private
 
-      def job_to_hash(job, extras = {})
-        { job: job.class, args: job.serialize.fetch("arguments"), queue: job.queue_name }.merge!(extras)
-      end
+        def job_to_hash(job, extras = {})
+          { job: job.class, args: job.serialize.fetch("arguments"), queue: job.queue_name }.merge!(extras)
+        end
 
-      def enqueue_or_perform(perform, job, job_data)
-        if perform
-          performed_jobs << job_data
-          Base.execute job.serialize
-        else
-          enqueued_jobs << job_data
+        def enqueue_or_perform(perform, job, job_data)
+          if perform
+            performed_jobs << job_data
+            Base.execute job.serialize
+          else
+            enqueued_jobs << job_data
+          end
         end
-      end
 
-      def filtered?(job)
-        filter && !Array(filter).include?(job.class)
-      end
+        def filtered?(job)
+          filter && !Array(filter).include?(job.class)
+        end
     end
   end
 end
diff --git a/activejob/lib/rails/generators/job/job_generator.rb b/activejob/lib/rails/generators/job/job_generator.rb
index 6a509056c8..97c11a9ea6 100644
--- a/activejob/lib/rails/generators/job/job_generator.rb
+++ b/activejob/lib/rails/generators/job/job_generator.rb
@@ -27,11 +27,11 @@ module Rails # :nodoc:
 
       private
         def application_job_file_name
-           @application_job_file_name ||= if mountable_engine?
-             "app/jobs/#{namespaced_path}/application_job.rb"
-           else
-             "app/jobs/application_job.rb"
-           end
+          @application_job_file_name ||= if mountable_engine?
+            "app/jobs/#{namespaced_path}/application_job.rb"
+          else
+            "app/jobs/application_job.rb"
+          end
         end
     end
   end
diff --git a/activejob/test/adapters/backburner.rb b/activejob/test/adapters/backburner.rb
index 0bd4aad5d3..17ba07b802 100644
--- a/activejob/test/adapters/backburner.rb
+++ b/activejob/test/adapters/backburner.rb
@@ -1,3 +1,3 @@
 require "support/backburner/inline"
 
-ActiveJob::Base.queue_adapter = :backburner
\ No newline at end of file
+ActiveJob::Base.queue_adapter = :backburner
diff --git a/activejob/test/adapters/delayed_job.rb b/activejob/test/adapters/delayed_job.rb
index afd9c9deb7..5f0ee2418c 100644
--- a/activejob/test/adapters/delayed_job.rb
+++ b/activejob/test/adapters/delayed_job.rb
@@ -4,4 +4,3 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../support/delayed_job"
 
 Delayed::Worker.delay_jobs = false
 Delayed::Worker.backend    = :test
-
diff --git a/activejob/test/adapters/inline.rb b/activejob/test/adapters/inline.rb
index e0092552c4..24113dfa5a 100644
--- a/activejob/test/adapters/inline.rb
+++ b/activejob/test/adapters/inline.rb
@@ -1 +1 @@
-ActiveJob::Base.queue_adapter = :inline
\ No newline at end of file
+ActiveJob::Base.queue_adapter = :inline
diff --git a/activejob/test/cases/exceptions_test.rb b/activejob/test/cases/exceptions_test.rb
index 004e9f4305..30e43c99cb 100644
--- a/activejob/test/cases/exceptions_test.rb
+++ b/activejob/test/cases/exceptions_test.rb
@@ -65,7 +65,7 @@ class ExceptionsTest < ActiveJob::TestCase
 
   test "long wait job" do
     travel_to Time.now
-  
+
     perform_enqueued_jobs do
       assert_performed_with at: (Time.now + 3600.seconds).to_i do
         RetryJob.perform_later "LongWaitError", 5
@@ -78,13 +78,13 @@ class ExceptionsTest < ActiveJob::TestCase
 
     perform_enqueued_jobs do
       assert_performed_with at: (Time.now + 3.seconds).to_i do
-      assert_performed_with at: (Time.now + 18.seconds).to_i do
-      assert_performed_with at: (Time.now + 83.seconds).to_i do
-      assert_performed_with at: (Time.now + 258.seconds).to_i do
-        RetryJob.perform_later "ExponentialWaitTenAttemptsError", 5
-      end
-      end
-      end
+        assert_performed_with at: (Time.now + 18.seconds).to_i do
+          assert_performed_with at: (Time.now + 83.seconds).to_i do
+            assert_performed_with at: (Time.now + 258.seconds).to_i do
+              RetryJob.perform_later "ExponentialWaitTenAttemptsError", 5
+            end
+          end
+        end
       end
     end
   end
@@ -94,13 +94,13 @@ class ExceptionsTest < ActiveJob::TestCase
 
     perform_enqueued_jobs do
       assert_performed_with at: (Time.now + 2.seconds).to_i do
-      assert_performed_with at: (Time.now + 4.seconds).to_i do
-      assert_performed_with at: (Time.now + 6.seconds).to_i do
-      assert_performed_with at: (Time.now + 8.seconds).to_i do
-        RetryJob.perform_later "CustomWaitTenAttemptsError", 5
-      end
-      end
-      end
+        assert_performed_with at: (Time.now + 4.seconds).to_i do
+          assert_performed_with at: (Time.now + 6.seconds).to_i do
+            assert_performed_with at: (Time.now + 8.seconds).to_i do
+              RetryJob.perform_later "CustomWaitTenAttemptsError", 5
+            end
+          end
+        end
       end
     end
   end
diff --git a/activejob/test/jobs/gid_job.rb b/activejob/test/jobs/gid_job.rb
index 42484dc198..c7cfa6e7a2 100644
--- a/activejob/test/jobs/gid_job.rb
+++ b/activejob/test/jobs/gid_job.rb
@@ -5,4 +5,3 @@ class GidJob < ActiveJob::Base
     JobBuffer.add("Person with ID: #{person.id}")
   end
 end
-
diff --git a/activejob/test/jobs/logging_job.rb b/activejob/test/jobs/logging_job.rb
index d84ed8589b..119b32fa67 100644
--- a/activejob/test/jobs/logging_job.rb
+++ b/activejob/test/jobs/logging_job.rb
@@ -7,4 +7,3 @@ class LoggingJob < ActiveJob::Base
     "LOGGING-JOB-ID"
   end
 end
-
diff --git a/activejob/test/jobs/nested_job.rb b/activejob/test/jobs/nested_job.rb
index 8c4ec549a6..21b7692cd1 100644
--- a/activejob/test/jobs/nested_job.rb
+++ b/activejob/test/jobs/nested_job.rb
@@ -7,4 +7,3 @@ class NestedJob < ActiveJob::Base
     "NESTED-JOB-ID"
   end
 end
-
diff --git a/activejob/test/support/backburner/inline.rb b/activejob/test/support/backburner/inline.rb
index 7b7954e8f7..647dbf317f 100644
--- a/activejob/test/support/backburner/inline.rb
+++ b/activejob/test/support/backburner/inline.rb
@@ -5,4 +5,4 @@ Backburner::Worker.class_eval do
   def self.enqueue(job_class, args=[], opts={})
     job_class.perform(*args)
   end
-end
\ No newline at end of file
+end
diff --git a/activejob/test/support/integration/adapters/backburner.rb b/activejob/test/support/integration/adapters/backburner.rb
index 2e82562948..263097c792 100644
--- a/activejob/test/support/integration/adapters/backburner.rb
+++ b/activejob/test/support/integration/adapters/backburner.rb
@@ -35,4 +35,3 @@ module BackburnerJobsManager
     true
   end
 end
-
diff --git a/activejob/test/support/integration/adapters/inline.rb b/activejob/test/support/integration/adapters/inline.rb
index 83c38f706f..e06b34c976 100644
--- a/activejob/test/support/integration/adapters/inline.rb
+++ b/activejob/test/support/integration/adapters/inline.rb
@@ -12,4 +12,3 @@ module InlineJobsManager
   def stop_workers
   end
 end
-