acidic_job 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efbbe68a5d9822e76723f8724743f58b6566706937fa1e939f1fba67ccb8fece
-  data.tar.gz: 48a2cc89d6c9cc0bc13dc95abcce456b5be78bb15ae583e68fd9c72b86ed466a
+  metadata.gz: 528d362023c8d2547054566f13d65556e057285124ffb05f8bc4c6007848b5cb
+  data.tar.gz: 05d08959ff8b674b48966ce4b879fd8c290d658a20c24b6af27e0c1fa8150452
 SHA512:
-  metadata.gz: 5f095c6a40548b07d4216e8939f52b533778071e4eef2df4090e35f681766a391805a394966d39a3e809e6d1c48094bbb39e768e986401a847882fe8b61ce5ef
-  data.tar.gz: e05b1a3f238492038c40e1a3d51110c52f7062b0143b12d78ac3aace525ea225a13db139f951bc6cf46cc04b14429beaa55c99b0f772c806014b746b88e14897
+  metadata.gz: 68bdc77c5e23e4fa680ca9ec72e00cf62cc1bcb2fc133b539d4c17f68b8926da9edd19f895ff92a0a379db567aee9ee949f0ade58eee0ef8b38edd61d28b5c19
+  data.tar.gz: b352b70b51cf7f3244a057dc5d6b2a89ede6e9b317346dd0fd0d54e9115ffff84a86670ac27c3bd45dc8b8f28d535de9af308fbd1b6be8dbd6eec76a7d740485

data/Gemfile

@@ -24,3 +24,5 @@ gem "sqlite3"
 gem "database_cleaner"
 
 gem "simplecov"
+
+gem "pry"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (0.2.2)
+    acidic_job (0.3.0)
       activerecord (>= 4.0.0)
       activesupport
 
@@ -37,6 +37,7 @@ GEM
       zeitwerk (~> 2.3)
     ast (2.4.2)
     builder (3.2.4)
+    coderay (1.1.3)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
     database_cleaner (2.0.1)
@@ -65,6 +66,9 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -123,6 +127,7 @@ DEPENDENCIES
   activerecord (~> 6.1.3.2)
   database_cleaner
   minitest (~> 5.0)
+  pry
   railties (>= 4.0)
   rake (~> 13.0)
   rubocop (~> 1.7)

data/acidic_job.gemspec

@@ -3,15 +3,15 @@
 require_relative "lib/acidic_job/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "acidic_job"
-  spec.version       = AcidicJob::VERSION
-  spec.authors       = ["fractaledmind"]
-  spec.email         = ["stephen.margheim@gmail.com"]
+  spec.name = "acidic_job"
+  spec.version = AcidicJob::VERSION
+  spec.authors = ["fractaledmind"]
+  spec.email = ["stephen.margheim@gmail.com"]
 
-  spec.summary       = "Idempotent operations for Rails apps, built on top of ActiveJob."
-  spec.description   = "Idempotent operations for Rails apps, built on top of ActiveJob."
-  spec.homepage      = "https://github.com/fractaledmind/acidic_job"
-  spec.license       = "MIT"
+  spec.summary = "Idempotent operations for Rails apps, built on top of ActiveJob."
+  spec.description = "Idempotent operations for Rails apps, built on top of ActiveJob."
+  spec.homepage = "https://github.com/fractaledmind/acidic_job"
+  spec.license = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"

data/lib/acidic_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AcidicJob
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/acidic_job.rb

@@ -24,10 +24,11 @@ module AcidicJob
     self.table_name = "acidic_job_keys"
 
     serialize :error_object
+    serialize :job_args
 
+    validates :idempotency_key, presence: true, uniqueness: {scope: [:job_name, :job_args]}
     validates :job_name, presence: true
     validates :job_args, presence: true
-    validates :idempotency_key, presence: true
     validates :last_run_at, presence: true
     validates :recovery_point, presence: true
 
@@ -84,7 +85,7 @@ module AcidicJob
     # close proximity, one of the two will be aborted by Postgres because we're
     # using a transaction with SERIALIZABLE isolation level. It may not look
     # it, but this code is safe from races.
-    ensure_idempotency_key_record(job_id, with, defined_steps.first)
+    ensure_idempotency_key_record(job_id, defined_steps.first)
 
     # if the key record is already marked as finished, immediately return its result
     return @key.succeeded? if @key.finished?
@@ -126,7 +127,7 @@ module AcidicJob
 
         phase_result.call(key: key)
       end
-    rescue StandardError => e
+    rescue => e
       error = e
       raise e
     ensure
@@ -134,7 +135,7 @@ module AcidicJob
       # key right away so that another request can try again.
       begin
         key.update_columns(locked_at: nil, error_object: error) if error.present?
-      rescue StandardError => e
+      rescue => e
         # We're already inside an error condition, so swallow any additional
         # errors from here and just send them to logs.
         puts "Failed to unlock key #{key.id} because of #{e}."
@@ -142,13 +143,14 @@ module AcidicJob
     end
   end
 
-  def ensure_idempotency_key_record(key_val, job_args, first_step)
+  def ensure_idempotency_key_record(key_val, first_step)
     isolation_level = case ActiveRecord::Base.connection.adapter_name.downcase.to_sym
                       when :sqlite
                         :read_uncommitted
                       else
                         :serializable
-                      end
+    end
+    serialized_job_info = serialize
 
     ActiveRecord::Base.transaction(isolation: isolation_level) do
       @key = Key.find_by(idempotency_key: key_val)
@@ -156,7 +158,7 @@ module AcidicJob
       if @key
         # Programs enqueuing multiple jobs with different parameters but the
         # same idempotency key is a bug.
-        raise MismatchedIdempotencyKeyAndJobArguments if @key.job_args != job_args.deep_stringify_keys.inspect
+        raise MismatchedIdempotencyKeyAndJobArguments if @key.job_args != serialized_job_info["arguments"]
 
         # Only acquire a lock if the key is unlocked or its lock has expired
         # because the original job was long enough ago.
@@ -170,8 +172,8 @@ module AcidicJob
           locked_at: Time.current,
           last_run_at: Time.current,
           recovery_point: first_step,
-          job_name: self.class.name,
-          job_args: job_args.inspect
+          job_name: serialized_job_info["job_class"],
+          job_args: serialized_job_info["arguments"]
         )
       end
     end

data/lib/generators/acidic_job_generator.rb

@@ -23,15 +23,16 @@ class AcidicJobGenerator < ActiveRecord::Generators::Base
   # Copies the migration template to db/migrate.
   def copy_files
     migration_template "migration.rb",
-                       "db/migrate/create_acidic_job_keys.rb"
+      "db/migrate/create_acidic_job_keys.rb"
   end
 
   protected
-    def migration_class
-      if ActiveRecord::VERSION::MAJOR >= 5
-        ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"]
-      else
-        ActiveRecord::Migration
-      end
+
+  def migration_class
+    if ActiveRecord::VERSION::MAJOR >= 5
+      ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"]
+    else
+      ActiveRecord::Migration
     end
+  end
 end

data/lib/generators/templates/migration.rb

@@ -10,8 +10,9 @@ class CreateAcidicJobKeys < <%= migration_class %>
       t.text :error_object
       t.timestamps
 
-      t.index %i[idempotency_key job_name job_args], unique: true,
-                                                     name: "idx_acidic_job_keys_on_idempotency_key_n_job_name_n_job_args"
+      t.index %i[idempotency_key job_name job_args],
+        unique: true,
+        name: "idx_acidic_job_keys_on_idempotency_key_n_job_name_n_job_args"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport