fix linting

gocardless · Aug 6, 2024 · a0c4b58 · a0c4b58
1 parent a2afbb6
commit a0c4b58
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 45 deletions.
diff --git a/lib/que.rb b/lib/que.rb
@@ -63,7 +63,7 @@ def connection=(connection)
           Adapters::ActiveRecord.new
         else
           case connection.class.to_s
-          when "Que::Adapters::ActiveRecordWithLock" then  connection
+          when "Que::Adapters::ActiveRecordWithLock" then connection
           when "Sequel::Postgres::Database" then Adapters::Sequel.new(connection)
           when "ConnectionPool"             then Adapters::ConnectionPool.new(connection)
           when "PG::Connection"             then Adapters::PG.new(connection)

diff --git a/lib/que/adapters/active_record_with_lock.rb b/lib/que/adapters/active_record_with_lock.rb
@@ -35,14 +35,15 @@ def execute(command, params = [])
           job_id = params[0]
           unlock_job(job_id)
         else
-          super(command, params)
+          super
         end
       end
 
       def lock_job_with_lock_database(queue, cursor)
         result = []
         loop do
           result = Que.execute(:find_job_to_lock, [queue, cursor])
+
           break if result.empty?
 
           cursor = result.first["job_id"]

diff --git a/lib/que/adapters/base.rb b/lib/que/adapters/base.rb
@@ -9,7 +9,7 @@ module Adapters
     autoload :PG,             "que/adapters/pg"
     autoload :Pond,           "que/adapters/pond"
     autoload :Sequel,         "que/adapters/sequel"
-    autoload :ActiveRecordWithLock,        "que/adapters/active_record_with_lock"
+    autoload :ActiveRecordWithLock, "que/adapters/active_record_with_lock"
 
     class UnavailableConnection < StandardError; end
 

diff --git a/lib/que/sql.rb b/lib/que/sql.rb
@@ -168,14 +168,14 @@ module Que
     },
 
     find_job_to_lock: %{
-      SELECT 
-        queue, 
-        priority, 
-        run_at, 
-        job_id, 
-        job_class, 
-        retryable, 
-        args, 
+      SELECT
+        queue,
+        priority,
+        run_at,
+        job_id,
+        job_class,
+        retryable,
+        args,
         error_count,
         extract(epoch from (now() - run_at)) as latency
       FROM que_jobs
@@ -185,7 +185,7 @@ module Que
             AND job_id >= $2
             ORDER BY priority, run_at, job_id
             LIMIT 1
-    }
+    },
   }
   # rubocop:enable Style/MutableConstant
 end
diff --git a/spec/active_record_with_lock_spec_helper.rb b/spec/active_record_with_lock_spec_helper.rb
@@ -1,28 +1,30 @@
+# frozen_string_literal: true
+
 class LockDatabaseRecord < ActiveRecord::Base
-    establish_connection(
-        adapter: "postgresql",
-        host: ENV.fetch("LOCK_PGHOST", "localhost"),
-        user: ENV.fetch("LOCK_PGUSER", "ubuntu"),
-        password: ENV.fetch("LOCK_PGPASSWORD", "password"),
-        database: ENV.fetch("LOCK_PGDATABASE", "lock-test"),
-        port: ENV.fetch("LOCK_PGPORT", 5434),
-        pool: 6,
-    )
+  establish_connection(
+    adapter: "postgresql",
+    host: ENV.fetch("LOCK_PGHOST", "localhost"),
+    user: ENV.fetch("LOCK_PGUSER", "ubuntu"),
+    password: ENV.fetch("LOCK_PGPASSWORD", "password"),
+    database: ENV.fetch("LOCK_PGDATABASE", "lock-test"),
+    port: ENV.fetch("LOCK_PGPORT", 5434),
+    pool: 6,
+  )
 end
-  
+
 class JobRecord < ActiveRecord::Base
-    establish_connection(
-        adapter: "postgresql",
-        host: ENV.fetch("PGHOST", "localhost"),
-        user: ENV.fetch("PGUSER", "ubuntu"),
-        password: ENV.fetch("PGPASSWORD", "password"),
-        database: ENV.fetch("PGDATABASE", "que-test"),
-    )
+  establish_connection(
+    adapter: "postgresql",
+    host: ENV.fetch("PGHOST", "localhost"),
+    user: ENV.fetch("PGUSER", "ubuntu"),
+    password: ENV.fetch("PGPASSWORD", "password"),
+    database: ENV.fetch("PGDATABASE", "que-test"),
+  )
 end
 
 def active_record_with_lock_adapter_connection
-    Que::Adapters::ActiveRecordWithLock.new(
-        job_connection_pool: JobRecord.connection_pool,
-        lock_record: LockDatabaseRecord,
-    )
-end
+  Que::Adapters::ActiveRecordWithLock.new(
+    job_connection_pool: JobRecord.connection_pool,
+    lock_record: LockDatabaseRecord,
+  )
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -6,15 +6,14 @@
 require "rspec"
 require "active_record"
 
-require_relative "./helpers/create_user"
-require_relative "./helpers/exceptional_job"
-require_relative "./helpers/fake_job"
-require_relative "./helpers/que_job"
-require_relative "./helpers/sleep_job"
-require_relative "./helpers/interruptible_sleep_job"
-require_relative "./helpers/user"
-require_relative "./active_record_with_lock_spec_helper"
-
+require_relative "helpers/create_user"
+require_relative "helpers/exceptional_job"
+require_relative "helpers/fake_job"
+require_relative "helpers/que_job"
+require_relative "helpers/sleep_job"
+require_relative "helpers/interruptible_sleep_job"
+require_relative "helpers/user"
+require_relative "active_record_with_lock_spec_helper"
 
 def postgres_now
   ActiveRecord::Base.connection.execute("SELECT NOW();")[0]["now"]
@@ -33,7 +32,7 @@ def establish_database_connection
 establish_database_connection
 
 # Make sure our test database is prepared to run Que
-Que.connection = 
+Que.connection =
   case ENV["ADAPTER"]
   when "ActiveRecordWithLock" then active_record_with_lock_adapter_connection
   else ActiveRecord
@@ -44,7 +43,6 @@ def establish_database_connection
 # Ensure we have a logger, so that we can test the code paths that log
 Que.logger = Logger.new("/dev/null")
 
-
 RSpec.configure do |config|
   config.before do
     QueJob.delete_all