acidic_job 0.8.7 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153e6365b6a1f1fd5aafca127047a04571c0c9a45f3320c4e17c347b7cbe84b8
-  data.tar.gz: 94238767a6f1d7066650ac117cdc7eff2cc2aac88f643b697391c411477dc1e1
+  metadata.gz: 81f0d07fd3ed80da090cad46ec491cc26eb563daf53409929a35c82cb63205fd
+  data.tar.gz: 64de5c5c2ae35b4ce1fc50495b1dd647c722a80075f6371aa62dd7ba6996ebdc
 SHA512:
-  metadata.gz: d55ffb8c2888bb83188042a74bf95b90d70dd4c541e92308f7f1e7008f13a63261e635fe280ea1f191fd4f6645e4ed99cfe26c3e63ac3d7b61b60fb1fde9ac0c
-  data.tar.gz: d773d20887dcf3894bb005a827c8a2ccb80bb1392a34290ddf6cc4e8afaf703b331c56b1246d9059c58900cdc12a23e678b2ef1cc89537878b914a932b9f495c
+  metadata.gz: 0fd0a5171079377a1c9e9d810af1e95e955defbe5bb1bd929b627f1b5e66bdea3ae7276728de7369076ad09fd3bf24b23427706f971b69bdb68c912fffdbd14d
+  data.tar.gz: 12a1ba218ac52d17bdff46307055a04df317c95600f40eb4391e8d40a8f37169ac3360a8c6fa05657d5c3fb5fac3de92aea8f79b6b81f72604690a63ae4d14cd

data/.rubocop.yml

@@ -1,3 +1,7 @@
+require:
+ - rubocop-minitest
+ - rubocop-rake
+
 AllCops:
   TargetRubyVersion: 2.7
   NewCops: enable
@@ -39,3 +43,6 @@ Metrics/PerceivedComplexity:
 
 Metrics/ClassLength:
   Enabled: false
+
+Minitest/MultipleAssertions:
+  Enabled: false

data/.tool-versions

@@ -1 +1 @@
-ruby 3.1.4
+ruby 3.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (0.8.7)
+    acidic_job (0.9.0)
       activejob
       activerecord
       activesupport

data/lib/acidic_job/active_kiq.rb

@@ -85,7 +85,7 @@ module AcidicJob
           "jid" => @job_id,
           "queue" => @queue_name
         }
-        item["at"] = @scheduled_at if @scheduled_at
+        item["at"] = @scheduled_at if defined?(@scheduled_at) && @scheduled_at
 
         ::Sidekiq::Client.push(item)
       end
@@ -126,16 +126,16 @@ module AcidicJob
     # https://github.com/rails/rails/blob/93c9534c9871d4adad4bc33b5edc355672b59c61/activejob/lib/active_job/callbacks.rb
     concerning :Callbacks do
       class_methods do
-        def around_perform(*filters, &blk)
-          set_callback(:perform, :around, *filters, &blk)
+        def around_perform(...)
+          set_callback(:perform, :around, ...)
         end
 
-        def before_perform(*filters, &blk)
-          set_callback(:perform, :before, *filters, &blk)
+        def before_perform(...)
+          set_callback(:perform, :before, ...)
         end
 
-        def after_perform(*filters, &blk)
-          set_callback(:perform, :after, *filters, &blk)
+        def after_perform(...)
+          set_callback(:perform, :after, ...)
         end
       end
     end

data/lib/acidic_job/arguments.rb

@@ -18,5 +18,13 @@ module AcidicJob
     rescue ActiveRecord::RecordNotFound
       nil
     end
+
+    # In order to allow our `NewRecordSerializer` a chance to work, we need to ensure that
+    # ActiveJob's first attempt to serialize an ActiveRecord model doesn't throw an exception.
+    def convert_to_global_id_hash(argument)
+      { GLOBALID_KEY => argument.to_global_id.to_s }
+    rescue URI::GID::MissingModelIdError
+      Serializers.serialize(argument)
+    end
   end
 end

data/lib/acidic_job/railtie.rb

@@ -16,6 +16,7 @@ module AcidicJob
       ::ActiveSupport.on_load(:active_job) do
         ::ActiveJob::Serializers.add_serializers(
           Serializers::ExceptionSerializer,
+          Serializers::NewRecordSerializer,
           Serializers::FinishedPointSerializer,
           Serializers::JobSerializer,
           Serializers::RangeSerializer,

data/lib/acidic_job/run.rb

@@ -15,7 +15,7 @@ module AcidicJob
     STAGED_JOB_ID_PREFIX = "STG"
     STAGED_JOB_ID_DELIMITER = "__"
     IDEMPOTENCY_KEY_LOCK_TIMEOUT_SECONDS = 2
-    RAILS_VERSION = Gem::Version.new(Rails.version)
+    RAILS_VERSION = Gem::Version.new(ActiveRecord.version)
     TARGET_VERSION = Gem::Version.new("7.1")
     REQUIRES_CODER_FOR_SERIALIZE = RAILS_VERSION >= TARGET_VERSION ||
                                    RAILS_VERSION.segments[..1] == TARGET_VERSION.segments

data/lib/acidic_job/serializers/exception_serializer.rb

@@ -6,31 +6,36 @@ module AcidicJob
   module Serializers
     class ExceptionSerializer < ::ActiveJob::Serializers::ObjectSerializer
       def serialize(exception)
-        hash = {
-          "class" => exception.class.name,
-          "message" => exception.message,
-          "cause" => exception.cause,
-          "backtrace" => {}
-        }
-
-        exception&.backtrace&.map do |trace|
+        compressed_backtrace = {}
+        exception.backtrace&.map do |trace|
           path, _, location = trace.rpartition("/")
+          next if compressed_backtrace.key?(path)
 
-          next if hash["backtrace"].key?(path)
-
-          hash["backtrace"][path] = location
+          compressed_backtrace[path] = location
         end
+        exception.set_backtrace(compressed_backtrace.map do |path, location|
+          [path, location].join("/")
+        end)
+        exception.cause&.set_backtrace([])
 
-        super(hash)
+        super({ "yaml" => exception.to_yaml })
       end
 
       def deserialize(hash)
-        exception_class = hash["class"].constantize
-        exception = exception_class.new(hash["message"])
-        exception.set_backtrace(hash["backtrace"].map do |path, location|
-          [path, location].join("/")
-        end)
-        exception
+        if hash.key?("class")
+          exception_class = hash["class"].constantize
+          exception = exception_class.new(hash["message"])
+          exception.set_backtrace(hash["backtrace"].map do |path, location|
+                                    [path, location].join("/")
+                                  end)
+          exception
+        elsif hash.key?("yaml")
+          if YAML.respond_to?(:unsafe_load)
+            YAML.unsafe_load(hash["yaml"])
+          else
+            YAML.load(hash["yaml"]) # rubocop:disable Security/YAMLLoad
+          end
+        end
       end
 
       def serialize?(argument)

data/lib/acidic_job/serializers/new_record_serializer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "active_job/serializers/object_serializer"
+
+module AcidicJob
+  module Serializers
+    class NewRecordSerializer < ::ActiveJob::Serializers::ObjectSerializer
+      def serialize(new_record)
+        super(
+          "class" => new_record.class.name,
+          "attributes" => new_record.attributes
+        )
+      end
+
+      def deserialize(hash)
+        new_record_class = hash["class"].constantize
+        new_record_class.new(hash["attributes"])
+      end
+
+      def serialize?(argument)
+        defined?(::ActiveRecord) && argument.respond_to?(:new_record?) && argument.new_record?
+      end
+    end
+  end
+end

data/lib/acidic_job/test_case.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./testing"
+require_relative "testing"
 
 module AcidicJob
   class TestCase < ::ActiveJob::TestCase

data/lib/acidic_job/version.rb

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

data/lib/acidic_job.rb

@@ -30,6 +30,7 @@ require_relative "acidic_job/serializers/range_serializer"
 require_relative "acidic_job/serializers/recovery_point_serializer"
 require_relative "acidic_job/serializers/worker_serializer"
 require_relative "acidic_job/serializers/active_kiq_serializer"
+require_relative "acidic_job/serializers/new_record_serializer"
 
 require_relative "acidic_job/railtie"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.0
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -275,6 +275,7 @@ files:
 - lib/acidic_job/serializers/exception_serializer.rb
 - lib/acidic_job/serializers/finished_point_serializer.rb
 - lib/acidic_job/serializers/job_serializer.rb
+- lib/acidic_job/serializers/new_record_serializer.rb
 - lib/acidic_job/serializers/range_serializer.rb
 - lib/acidic_job/serializers/recovery_point_serializer.rb
 - lib/acidic_job/serializers/worker_serializer.rb
@@ -311,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Idempotent operations for Rails apps, built on top of ActiveJob.