acidic_job 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62d9233935caa3f86b25ae851b5039dbc6fc3ca29365acceb9e2fb6c50a37e84
-  data.tar.gz: 17488a81beea742db0f5e2ef24f40c11e43e89199e1986d95882313dc2cf5f64
+  metadata.gz: fb1de28508c8a662b772a9b9f8fb4046d8c2a64e242826ec92c1ecc820dbc18b
+  data.tar.gz: a0db4307ec7d7c971d9a5e1ff30ccb2243afa9ea35a7f17fe91f8c81d775a52b
 SHA512:
-  metadata.gz: 1634b63e1d1a6552f1f3c4615ac8376b9b055d2812a8b1e3018ba8f3297121c04f7a3c41e53b17fdfa30c0d01878183074c730907139b02cd3c4567ec5eb51ef
-  data.tar.gz: 2d4837e2ac68315de5e6ab60b757f10cc26244de1294956f4b6834f2552062487b7969a28758a6770815c3e352e4573f8da22d65ebafe53589459580f2140560
+  metadata.gz: 0e39981533a09f2f197f8c047d057328be88c5a34666bd8520500a805bee7fb4d86ac74fdebe673cd67fe92c3faff072a3d62eef79e4e14b21ffdfb05b292e2b
+  data.tar.gz: b2eb0c3c2fe92b27fc065fc0a450261743b3b6b397c2212e1b46ed4773074342c64c8433930b71f4125a71b9c692f5baa1d29b3ec9d9fc6ac13905c1fe4e2d2f

data/Gemfile

@@ -11,6 +11,10 @@ gem "minitest", "~> 5.0"
 
 gem "rubocop", "~> 1.7"
 
+gem "rubocop-minitest"
+
+gem "rubocop-rake"
+
 gem "activerecord", "~> 6.1.3.2"
 
 gem "activejob", "~> 6.1.3.2"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (0.1.3)
+    acidic_job (0.1.4)
       activesupport
 
 GEM
@@ -53,6 +53,10 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
+    rubocop-minitest (0.14.0)
+      rubocop (>= 0.90, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -67,6 +71,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-darwin-17
 
 DEPENDENCIES
@@ -77,6 +82,8 @@ DEPENDENCIES
   minitest (~> 5.0)
   rake (~> 13.0)
   rubocop (~> 1.7)
+  rubocop-minitest
+  rubocop-rake
   simplecov
   sqlite3
 

data/bin/console

@@ -3,6 +3,7 @@
 
 require "bundler/setup"
 require "acidic_job"
+require_relative "../test/setup"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/acidic_job.rb

@@ -6,7 +6,7 @@ require_relative "acidic_job/recovery_point"
 require_relative "acidic_job/response"
 require "active_support/concern"
 
-# rubocop:disable Metrics/ModuleLength, Style/Documentation, Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+# rubocop:disable Metrics/ModuleLength, Style/Documentation, Metrics/AbcSize, Metrics/MethodLength
 module AcidicJob
   class IdempotencyKeyRequired < StandardError; end
 
@@ -62,12 +62,11 @@ module AcidicJob
   IDEMPOTENCY_KEY_MIN_LENGTH = 20
 
   # &block
-  def idempotently(key:, with:)
+  def idempotently(with:)
     # set accessors for each argument passed in to ensure they are available
     # to the step methods the job will have written
     define_accessors_for_passed_arguments(with)
 
-    validate_passed_idempotency_key(key)
     validate_passed_arguments(with)
 
     # execute the block to gather the info on what phases are defined for this job
@@ -78,7 +77,7 @@ module AcidicJob
 
     # find or create an AcidicJobKey record to store all information about this job
     # side-effect: will set the @key instance variable
-    ensure_idempotency_key_record(key, with[:params], defined_steps.first)
+    ensure_idempotency_key_record(job_id, with[:params], defined_steps.first)
 
     # if the key record is already marked as finished, immediately return its result
     return @key.succeeded? if @key.finished?
@@ -110,17 +109,14 @@ module AcidicJob
 
   private
 
-  def atomic_phase(key = nil, proc = nil, &block)
+  def atomic_phase(key, proc = nil, &block)
     error = false
     phase_callable = (proc || block)
 
     begin
-      # ActiveRecord::Base.transaction(isolation: :serializable) do
-      ActiveRecord::Base.transaction(isolation: :read_uncommitted) do
+      key.with_lock do
         phase_result = phase_callable.call
 
-        # TODO: why is this here?
-        key ||= @key
         phase_result.call(key: key)
       end
     rescue StandardError => e
@@ -129,20 +125,26 @@ module AcidicJob
     ensure
       # If we're leaving under an error condition, try to unlock the idempotency
       # key right away so that another request can try again.
-      if error && !key.nil?
-        begin
-          key.update_columns(locked_at: nil, error_object: error)
-        rescue StandardError => 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}."
-        end
+      begin
+        key.update_columns(locked_at: nil, error_object: error) if error.present?
+      rescue StandardError => 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}."
       end
     end
   end
 
   def ensure_idempotency_key_record(key_val, params, first_step)
-    atomic_phase do
+    # isolation_level = case ActiveRecord::Base.connection.adapter_name.downcase.to_sym
+    #                   when :sqlite
+    #                     :read_uncommitted
+    #                   else # :nocov:
+    #                     :serializable # :nocov:
+    #                   end
+    isolation_level = :read_uncommitted
+
+    ActiveRecord::Base.transaction(isolation: isolation_level) do
       @key = AcidicJobKey.find_by(idempotency_key: key_val)
 
       if @key
@@ -167,9 +169,6 @@ module AcidicJob
           job_args: params.as_json
         )
       end
-
-      # no response and no need to set a recovery point
-      NoOp.new
     end
   end
 
@@ -184,13 +183,6 @@ module AcidicJob
     true
   end
 
-  def validate_passed_idempotency_key(key)
-    raise IdempotencyKeyRequired if key.nil?
-    raise IdempotencyKeyTooShort if key.length < IDEMPOTENCY_KEY_MIN_LENGTH
-
-    true
-  end
-
   def validate_passed_arguments(attributes)
     missing_attributes = self.class.required_attributes.select do |required_attribute|
       attributes[required_attribute].nil?
@@ -220,4 +212,4 @@ module AcidicJob
     end
   end
 end
-# rubocop:enable Metrics/ModuleLength, Style/Documentation, Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+# rubocop:enable Metrics/ModuleLength, Style/Documentation, Metrics/AbcSize, Metrics/MethodLength

data/lib/acidic_job/version.rb

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

metadata

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