acidic_job 1.0.0.beta.1 → 1.0.0.beta.2

data/lib/acidic_job/extensions/noticed.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module AcidicJob
+  module Extensions
+    module Noticed
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def deliver_acidicly(recipients)
+          new.deliver_acidicly(recipients)
+        end
+      end
+
+      # THIS IS A HACK THAT COPIES AND PASTES KEY PARTS OF THE `Noticed::Base` CODE
+      # IN ORDER TO ALLOW US TO TRANSACTIONALLY DELIVER NOTIFICATIONS
+      # THIS IS THUS LIABLE TO BREAK WHENEVER THAT GEM IS UPDATED
+      def deliver_acidicly(recipients)
+        delivery_methods = self.class.delivery_methods.dup
+
+        Array.wrap(recipients).uniq.each do |recipient|
+          if (index = delivery_methods.find_index { |m| m[:name] == :database })
+            database_delivery_method = delivery_methods.delete_at(index)
+            self.record = run_delivery_method(database_delivery_method,
+                                              recipient: recipient,
+                                              enqueue: false,
+                                              record: nil)
+          end
+
+          delivery_methods.map do |delivery_method|
+            job_class = delivery_method_for(delivery_method[:name], delivery_method[:options])
+            args = {
+              notification_class: self.class.name,
+              options: delivery_method[:options],
+              params: params,
+              recipient: recipient,
+              record: record
+            }
+            job = job_class.new(args)
+
+            AcidicJob::Run.stage!(job)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/acidic_job/mixin.rb

@@ -14,6 +14,12 @@ module AcidicJob
       # and run perform callbacks for Sidekiq workers
       other.prepend PerformWrapper
 
+      # Add `deliver_acidicly` to ActionMailer
+      ::ActionMailer::Parameterized::MessageDelivery.include(Extensions::ActionMailer) if defined?(::ActionMailer)
+      ::ActionMailer::MessageDelivery.include(Extensions::ActionMailer) if defined?(::ActionMailer)
+      # Add `deliver_acidicly` to Noticed
+      ::Noticed::Base.include(Extensions::Noticed) if defined?(::Noticed)
+
       # By default, we unique job runs by the `job_id`
       other.instance_variable_set(:@acidic_identifier, :job_id)
       # However, you can customize this behavior on a per job class level

data/lib/acidic_job/perform_wrapper.rb

@@ -4,15 +4,15 @@ module AcidicJob
   # NOTE: it is essential that this be a bare module and not an ActiveSupport::Concern
   # WHY?
   module PerformWrapper
-    def perform(*args, **kwargs)
+    def perform(*args)
       @arguments = args
 
       # we don't want to run the `perform` callbacks twice, since ActiveJob already handles that for us
       if defined?(ActiveJob) && self.class < ActiveJob::Base
-        super(*args, **kwargs)
+        super(*args)
       elsif defined?(Sidekiq) && self.class.include?(Sidekiq::Worker)
         run_callbacks :perform do
-          super(*args, **kwargs)
+          super(*args)
         end
       else
         raise UnknownJobAdapter

data/lib/acidic_job/run.rb

@@ -117,7 +117,7 @@ module AcidicJob
             staged: true,
             job_class: job.class.name,
             serialized_job: job.serialize,
-            idempotency_key: job.idempotency_key
+            idempotency_key: job.try(:idempotency_key) || job.job_id
           )
         end
       end

data/lib/acidic_job/testing.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "database_cleaner"
+
+module AcidicJob
+  module Testing
+    def self.included(mod)
+      mod.class_eval "self.use_transactional_tests = false if respond_to?(:use_transactional_tests)", __FILE__, __LINE__
+    end
+
+    def before_setup
+      @connection = ::ActiveRecord::Base.connection
+      @original_cleaners = ::DatabaseCleaner.cleaners
+      ::DatabaseCleaner.cleaners = transaction_free_cleaners_for(@original_cleaners)
+      super
+      ::DatabaseCleaner.start
+    end
+
+    def after_teardown
+      ::DatabaseCleaner.clean
+      super
+      ::DatabaseCleaner.cleaners = @original_cleaners
+    end
+
+    private
+
+    # Ensure that the system's original DatabaseCleaner configuration is maintained, options included,
+    # except that any `transaction` strategies for any ORMs are replaced with a `deletion` strategy.
+    def transaction_free_cleaners_for(original_cleaners)
+      non_transaction_cleaners = original_cleaners.dup.to_h do |(orm, opts), cleaner|
+        [[orm, opts], ensure_no_transaction_strategies_for(cleaner)]
+      end
+      ::DatabaseCleaner::Cleaners.new(non_transaction_cleaners)
+    end
+
+    def ensure_no_transaction_strategies_for(cleaner)
+      return cleaner unless strategy_name_for(cleaner) == "transaction"
+
+      cleaner.strategy = deletion_strategy_for(cleaner)
+      cleaner
+    end
+
+    def strategy_name_for(cleaner)
+      cleaner               # <DatabaseCleaner::Cleaner>
+        .strategy           # <DatabaseCleaner::ActiveRecord::Truncation>
+        .class              # DatabaseCleaner::ActiveRecord::Truncation
+        .name               # "DatabaseCleaner::ActiveRecord::Truncation"
+        .rpartition("::")   # ["DatabaseCleaner::ActiveRecord", "::", "Truncation"]
+        .last               # "Truncation"
+        .downcase           # "truncation"
+    end
+
+    def deletion_strategy_for(cleaner)
+      strategy = cleaner.strategy
+      strategy_namespace = strategy                    # <DatabaseCleaner::ActiveRecord::Truncation>
+                           .class                      # DatabaseCleaner::ActiveRecord::Truncation
+                           .name                       # "DatabaseCleaner::ActiveRecord::Truncation"
+                           .rpartition("::")           # ["DatabaseCleaner::ActiveRecord", "::", "Truncation"]
+                           .first                      # "DatabaseCleaner::ActiveRecord"
+      deletion_strategy_class_name = [strategy_namespace, "::", "Deletion"].join
+      deletion_strategy_class = deletion_strategy_class_name.constantize
+      instance_variable_hash = strategy.instance_variables.to_h do |var|
+        [
+          var.to_s.remove("@"),
+          strategy.instance_variable_get(var)
+        ]
+      end
+      options = instance_variable_hash.except("db", "connection_class")
+
+      deletion_strategy_class.new(**options)
+    end
+  end
+end

data/lib/acidic_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AcidicJob
-  VERSION = "1.0.0.beta.1"
+  VERSION = "1.0.0.beta.2"
 end

data/lib/acidic_job.rb

@@ -17,6 +17,8 @@ require_relative "acidic_job/perform_wrapper"
 require_relative "acidic_job/mixin"
 require_relative "acidic_job/base"
 require_relative "acidic_job/active_kiq"
+require_relative "acidic_job/extensions/action_mailer"
+require_relative "acidic_job/extensions/noticed"
 
 require_relative "acidic_job/serializers/exception_serializer"
 require_relative "acidic_job/serializers/finished_point_serializer"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.1
+  version: 1.0.0.beta.2
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +220,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: warning
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Idempotent operations for Rails apps, built on top of ActiveJob.
 email:
 - stephen.margheim@gmail.com
@@ -267,17 +239,22 @@ files:
 - UPGRADE_GUIDE.md
 - acidic_job.gemspec
 - bin/console
-- bin/sandbox
 - bin/setup
 - blog_post.md
 - combustion/log/test.log
-- gemfiles/rails_6.1.gemfile
-- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_6.1_sidekiq_6.4.gemfile
+- gemfiles/rails_6.1_sidekiq_6.5.gemfile
+- gemfiles/rails_7.0_sidekiq_6.4.gemfile
+- gemfiles/rails_7.0_sidekiq_6.5.gemfile
+- gemfiles/rails_7.1_sidekiq_6.4.gemfile
+- gemfiles/rails_7.1_sidekiq_6.5.gemfile
 - lib/acidic_job.rb
 - lib/acidic_job/active_kiq.rb
 - lib/acidic_job/arguments.rb
 - lib/acidic_job/base.rb
 - lib/acidic_job/errors.rb
+- lib/acidic_job/extensions/action_mailer.rb
+- lib/acidic_job/extensions/noticed.rb
 - lib/acidic_job/finished_point.rb
 - lib/acidic_job/idempotency_key.rb
 - lib/acidic_job/logger.rb
@@ -293,6 +270,7 @@ files:
 - lib/acidic_job/serializers/range_serializer.rb
 - lib/acidic_job/serializers/recovery_point_serializer.rb
 - lib/acidic_job/serializers/worker_serializer.rb
+- lib/acidic_job/testing.rb
 - lib/acidic_job/version.rb
 - lib/acidic_job/workflow.rb
 - lib/acidic_job/workflow_builder.rb