journaled 2.1.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd948588d9c1d876db7b98ca2f23a0d5d6dce08e
-  data.tar.gz: fc7edb7bef6fcb50e0c32081c86ab036fe3f6b25
+SHA256:
+  metadata.gz: a57088ffa5913d3e80f1d6d978bfe3f0a4ff090bd78f20f3fcbed1c32b84bdbc
+  data.tar.gz: 75c470723ae03dd2695300c0a8a2aaf0d05202fac8fdb5157efd248214a7eb6d
 SHA512:
-  metadata.gz: 0e16247d3f7e8c67a7c9ff79dc4205fcf4ca89c335108d646c3fcb8edd1ca1a666dac6ed170d17ab97fdf5c89b4895aef52ca8ada6e80002d8f739bc3a9e2ed8
-  data.tar.gz: 6206fde79a179858d4c8e57f5396d23d29e9316bec634f339b6db5728ebb022884963ce5293bb8de3a89548f7be95bd8dc02cf1fc43a83c1b0ba03a1c21db12e
+  metadata.gz: ffcbd7201f572423fa304c440d18b2993e7a97050b5ac7b1be68143da64a8c7caaa430aa3ef64d8a99940380b67361e50ef55cb9ce01cecb9dd017f977e08934
+  data.tar.gz: a6c33d7c56b1fbd9558d219617a12dbfa0b704dac7b9ca3171cd2387477a3b00a6fe6dac592ed6a8cc4a4f6de2cbb806ff49d670134131a6e2eddfe5d64be0d7

data/README.md

@@ -88,6 +88,29 @@ Journaling provides a number of different configuation options that can be set i
   This can be used to configure what `priority` the Delayed Jobs are enqueued with. This will be applied to all the Journaled::Devivery jobs that are created by this application.
   Ex: `Journaled.job_priority = 14`
 
+#### `Journaled.http_idle_timeout` (default: 1 second)
+
+  The number of seconds a persistent connection is allowed to sit idle before it should no longer be used.
+
+#### `Journaled.http_open_timeout` (default: 15 seconds)
+
+  The number of seconds before the :http_handler should timeout while trying to open a new HTTP session.
+
+#### `Journaled.http_read_timeout` (default: 60 seconds)
+
+  The number of seconds before the :http_handler should timeout while waiting for a HTTP response.
+
+#### DJ `enqueue` options
+
+Both model-level directives accept additional options to be passed into DelayedJob's `enqueue` method:
+
+```ruby
+# For change journaling:
+journal_changes_to :email, as: :identity_change, enqueue_with: { priority: 10 }
+
+# Or for custom journaling:
+journal_attributes :email, enqueue_with: { priority: 20, queue: 'journaled' }
+```
 
 ### Change Journaling
 

data/app/controllers/concerns/journaled/actor.rb

@@ -12,6 +12,7 @@ module Journaled::Actor
   class_methods do
     def journaled_actor=(method_name)
       raise "Must provide a symbol method name" unless method_name.is_a?(Symbol)
+
       self._journaled_actor_method_name = method_name
     end
   end

data/app/models/concerns/journaled/changes.rb

@@ -2,10 +2,9 @@ module Journaled::Changes
   extend ActiveSupport::Concern
 
   included do
-    cattr_accessor :_journaled_change_definitions
-    cattr_accessor :journaled_attribute_names
-    self._journaled_change_definitions = []
-    self.journaled_attribute_names = []
+    cattr_accessor(:_journaled_change_definitions) { [] }
+    cattr_accessor(:journaled_attribute_names) { [] }
+    cattr_accessor(:journaled_enqueue_opts, instance_writer: false) { {} }
 
     after_create do
       self.class._journaled_change_definitions.each do |definition|
@@ -57,7 +56,7 @@ module Journaled::Changes
   end
 
   class_methods do
-    def journal_changes_to(*attribute_names, as:) # rubocop:disable Naming/UncommunicativeMethodParamName
+    def journal_changes_to(*attribute_names, as:, enqueue_with: {}) # rubocop:disable Naming/UncommunicativeMethodParamName
       if attribute_names.empty? || attribute_names.any? { |n| !n.is_a?(Symbol) }
         raise "one or more symbol attribute_name arguments is required"
       end
@@ -66,6 +65,7 @@ module Journaled::Changes
 
       _journaled_change_definitions << Journaled::ChangeDefinition.new(attribute_names: attribute_names, logical_operation: as)
       journaled_attribute_names.concat(attribute_names)
+      journaled_enqueue_opts.merge!(enqueue_with)
     end
 
     if Rails::VERSION::MAJOR > 5 || (Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2)

data/app/models/journaled/change.rb

@@ -7,6 +7,7 @@ class Journaled::Change
     :logical_operation,
     :changes,
     :journaled_app_name,
+    :journaled_enqueue_opts,
     :actor
 
   journal_attributes :table_name,
@@ -16,12 +17,13 @@ class Journaled::Change
     :changes,
     :actor
 
-  def initialize(table_name:, # rubocop:disable Metrics/ParameterLists
+  def initialize(table_name:,
                  record_id:,
                  database_operation:,
                  logical_operation:,
                  changes:,
                  journaled_app_name:,
+                 journaled_enqueue_opts:,
                  actor:)
     @table_name = table_name
     @record_id = record_id
@@ -29,6 +31,7 @@ class Journaled::Change
     @logical_operation = logical_operation
     @changes = changes
     @journaled_app_name = journaled_app_name
+    @journaled_enqueue_opts = journaled_enqueue_opts
     @actor = actor
   end
 end

data/app/models/journaled/change_definition.rb

@@ -19,6 +19,7 @@ class Journaled::ChangeDefinition
 
         #{nonexistent_attribute_names.join(', ')}
     ERROR
+
     @validated = true
   end
 end

data/app/models/journaled/change_writer.rb

@@ -28,7 +28,8 @@ class Journaled::ChangeWriter
       logical_operation: logical_operation,
       changes: JSON.dump(changes),
       journaled_app_name: journaled_app_name,
-      actor: actor_uri
+      journaled_enqueue_opts: model.journaled_enqueue_opts,
+      actor: actor_uri,
     )
   end
 

data/app/models/journaled/delivery.rb

@@ -1,4 +1,4 @@
-class Journaled::Delivery
+class Journaled::Delivery # rubocop:disable Betterment/ActiveJobPerformable
   DEFAULT_REGION = 'us-east-1'.freeze
 
   def initialize(serialized_event:, partition_key:, app_name:)
@@ -25,7 +25,10 @@ class Journaled::Delivery
   def kinesis_client_config
     {
       region: ENV.fetch('AWS_DEFAULT_REGION', DEFAULT_REGION),
-      retry_limit: 0
+      retry_limit: 0,
+      http_idle_timeout: Journaled.http_idle_timeout,
+      http_open_timeout: Journaled.http_open_timeout,
+      http_read_timeout: Journaled.http_read_timeout,
     }.merge(credentials)
   end
 
@@ -37,7 +40,7 @@ class Journaled::Delivery
     {
       stream_name: stream_name,
       data: serialized_event,
-      partition_key: partition_key
+      partition_key: partition_key,
     }
   end
 
@@ -48,7 +51,7 @@ class Journaled::Delivery
   def credentials
     if ENV.key?('JOURNALED_IAM_ROLE_ARN')
       {
-        credentials: iam_assume_role_credentials
+        credentials: iam_assume_role_credentials,
       }
     else
       legacy_credentials_hash_if_present
@@ -59,7 +62,7 @@ class Journaled::Delivery
     if ENV.key?('RUBY_AWS_ACCESS_KEY_ID')
       {
         access_key_id: ENV.fetch('RUBY_AWS_ACCESS_KEY_ID'),
-        secret_access_key: ENV.fetch('RUBY_AWS_SECRET_ACCESS_KEY')
+        secret_access_key: ENV.fetch('RUBY_AWS_SECRET_ACCESS_KEY'),
       }
     else
       {}
@@ -68,7 +71,7 @@ class Journaled::Delivery
 
   def sts_client
     Aws::STS::Client.new({
-      region: ENV.fetch('AWS_DEFAULT_REGION', DEFAULT_REGION)
+      region: ENV.fetch('AWS_DEFAULT_REGION', DEFAULT_REGION),
     }.merge(legacy_credentials_hash_if_present))
   end
 
@@ -76,7 +79,7 @@ class Journaled::Delivery
     @iam_assume_role_credentials ||= Aws::AssumeRoleCredentials.new(
       client: sts_client,
       role_arn: ENV.fetch('JOURNALED_IAM_ROLE_ARN'),
-      role_session_name: "JournaledAssumeRoleAccess"
+      role_session_name: "JournaledAssumeRoleAccess",
     )
   end
 

data/app/models/journaled/event.rb

@@ -2,7 +2,7 @@ module Journaled::Event
   extend ActiveSupport::Concern
 
   def journal!
-    Journaled::Writer.new(journaled_event: self, priority: Journaled.job_priority).journal!
+    Journaled::Writer.new(journaled_event: self).journal!
   end
 
   # Base attributes
@@ -42,8 +42,9 @@ module Journaled::Event
   private
 
   class_methods do
-    def journal_attributes(*args)
+    def journal_attributes(*args, enqueue_with: {})
       journaled_attributes.concat(args)
+      journaled_enqueue_opts.merge!(enqueue_with)
     end
 
     def journaled_attributes
@@ -56,6 +57,8 @@ module Journaled::Event
   end
 
   included do
+    cattr_accessor(:journaled_enqueue_opts, instance_writer: false) { {} }
+
     journal_attributes :id, :event_type, :created_at
   end
 end

data/app/models/journaled/writer.rb

@@ -4,9 +4,10 @@ class Journaled::Writer
     journaled_partition_key
     journaled_attributes
     journaled_app_name
+    journaled_enqueue_opts
   ).freeze
 
-  def initialize(journaled_event:, priority:)
+  def initialize(journaled_event:)
     raise "An enqueued event must respond to: #{EVENT_METHOD_NAMES.to_sentence}" unless respond_to_all?(journaled_event, EVENT_METHOD_NAMES)
 
     unless journaled_event.journaled_schema_name.present? &&
@@ -21,25 +22,24 @@ class Journaled::Writer
     end
 
     @journaled_event = journaled_event
-    @priority = priority
   end
 
   def journal!
     base_event_json_schema_validator.validate! serialized_event
     json_schema_validator.validate! serialized_event
-    Delayed::Job.enqueue journaled_delivery, priority: priority
+    Journaled.enqueue!(journaled_delivery, journaled_enqueue_opts)
   end
 
   private
 
-  attr_reader :journaled_event, :priority
-  delegate :journaled_schema_name, :journaled_attributes, :journaled_partition_key, :journaled_app_name, to: :journaled_event
+  attr_reader :journaled_event
+  delegate(*EVENT_METHOD_NAMES, to: :journaled_event)
 
   def journaled_delivery
     @journaled_delivery ||= Journaled::Delivery.new(
       serialized_event: serialized_event,
       partition_key: journaled_partition_key,
-      app_name: journaled_app_name
+      app_name: journaled_app_name,
     )
   end
 

data/lib/journaled.rb

@@ -1,14 +1,17 @@
-require "aws-sdk-resources"
+require "aws-sdk-kinesis"
 require "delayed_job"
 require "json-schema"
 require "request_store"
 
 require "journaled/engine"
-require "journaled/job_priority"
+require 'journaled/enqueue'
 
 module Journaled
   mattr_accessor :default_app_name
-  mattr_accessor(:job_priority) { Journaled::JobPriority::EVENTUAL }
+  mattr_accessor(:job_priority) { 20 }
+  mattr_accessor(:http_idle_timeout) { 5 }
+  mattr_accessor(:http_open_timeout) { 15 }
+  mattr_accessor(:http_read_timeout) { 60 }
 
   def development_or_test?
     %w(development test).include?(Rails.env)

data/lib/journaled/enqueue.rb

@@ -0,0 +1,13 @@
+module Journaled
+  class << self
+    def enqueue!(*args)
+      delayed_job_enqueue(*args)
+    end
+
+    private
+
+    def delayed_job_enqueue(*args, **opts)
+      Delayed::Job.enqueue(*args, **opts.reverse_merge(priority: Journaled.job_priority))
+    end
+  end
+end

data/lib/journaled/relation_change_protection.rb

@@ -1,7 +1,15 @@
 module Journaled::RelationChangeProtection
-  def update_all(updates, force: false)
+  def update_all(updates, force: false) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
     unless force || !@klass.respond_to?(:journaled_attribute_names) || @klass.journaled_attribute_names.empty?
-      conflicting_journaled_attribute_names = @klass.journaled_attribute_names & updates.keys.map(&:to_sym)
+      conflicting_journaled_attribute_names = if updates.is_a?(Hash)
+                                                @klass.journaled_attribute_names & updates.keys.map(&:to_sym)
+                                              elsif updates.is_a?(String)
+                                                @klass.journaled_attribute_names.select do |a|
+                                                  updates.match?(/\b(?<!')#{a}(?!')\b/)
+                                                end
+                                              else
+                                                raise "unsupported type '#{updates.class}' for 'updates'"
+                                              end
       raise(<<~ERROR) if conflicting_journaled_attribute_names.present?
         .update_all aborted by Journaled::Changes due to journaled attributes:
 

data/lib/journaled/version.rb

@@ -1,3 +1,3 @@
 module Journaled
-  VERSION = "2.1.0".freeze
+  VERSION = "2.4.0".freeze
 end

data/spec/lib/journaled_spec.rb

@@ -3,49 +3,50 @@ require 'rails_helper'
 RSpec.describe Journaled do
   it "is enabled in production" do
     allow(Rails).to receive(:env).and_return("production")
-    expect(Journaled).to be_enabled
+    expect(described_class).to be_enabled
   end
 
   it "is disabled in development" do
     allow(Rails).to receive(:env).and_return("development")
-    expect(Journaled).not_to be_enabled
+    expect(described_class).not_to be_enabled
   end
 
   it "is disabled in test" do
     allow(Rails).to receive(:env).and_return("test")
-    expect(Journaled).not_to be_enabled
+    expect(described_class).not_to be_enabled
   end
 
   it "is enabled in whatevs" do
     allow(Rails).to receive(:env).and_return("whatevs")
-    expect(Journaled).to be_enabled
+    expect(described_class).to be_enabled
   end
 
   it "is enabled when explicitly enabled in development" do
     with_env(JOURNALED_ENABLED: true) do
       allow(Rails).to receive(:env).and_return("development")
-      expect(Journaled).to be_enabled
+      expect(described_class).to be_enabled
     end
   end
 
   it "is disabled when explicitly disabled in production" do
     with_env(JOURNALED_ENABLED: false) do
       allow(Rails).to receive(:env).and_return("production")
-      expect(Journaled).not_to be_enabled
+      expect(described_class).not_to be_enabled
     end
   end
 
   it "is disabled when explicitly disabled with empty string" do
     with_env(JOURNALED_ENABLED: '') do
       allow(Rails).to receive(:env).and_return("production")
-      expect(Journaled).not_to be_enabled
+      expect(described_class).not_to be_enabled
     end
   end
 
   describe "#actor_uri" do
     it "delegates to ActorUriProvider" do
-      allow(Journaled::ActorUriProvider).to receive(:instance).and_return(double(actor_uri: "my actor uri"))
-      expect(Journaled.actor_uri).to eq "my actor uri"
+      allow(Journaled::ActorUriProvider).to receive(:instance)
+        .and_return(instance_double(Journaled::ActorUriProvider, actor_uri: "my actor uri"))
+      expect(described_class.actor_uri).to eq "my actor uri"
     end
   end
 end

data/spec/models/concerns/journaled/changes_spec.rb

@@ -17,6 +17,7 @@ RSpec.describe Journaled::Changes do
       def self.after_save(opts, &hook)
         # This is a back-door assertion to prevent regressions in the module's hook definition behavior
         raise "expected `unless: :saved_change_to_id?`" unless opts[:unless] == :saved_change_to_id?
+
         after_save_hooks << hook
       end
 
@@ -91,4 +92,15 @@ RSpec.describe Journaled::Changes do
     expect(change_writer).to have_received(:delete)
     expect(Journaled::ChangeWriter).to have_received(:new)
   end
+
+  context 'when DJ opts are provided' do
+    before do
+      klass.journal_changes_to :thing, as: :other_thing, enqueue_with: { asdf: 1, foo: 'bar' }
+    end
+
+    it 'sets them on the model' do
+      expect(klass.journaled_enqueue_opts).to eq(asdf: 1, foo: 'bar')
+      expect(klass.new.journaled_enqueue_opts).to eq(asdf: 1, foo: 'bar')
+    end
+  end
 end

data/spec/models/database_change_protection_spec.rb

@@ -19,10 +19,17 @@ if Rails::VERSION::MAJOR > 5 || (Rails::VERSION::MAJOR == 5 && Rails::VERSION::M
 
     describe "the relation" do
       describe "#update_all" do
-        it "refuses on journaled columns" do
+        it "refuses on journaled columns passed as hash" do
           expect { journaled_class.update_all(locked_at: nil) }.to raise_error(/aborted by Journaled/)
         end
 
+        it "refuses on journaled columns passed as string" do
+          expect { journaled_class.update_all("\"locked_at\" = NULL") }.to raise_error(/aborted by Journaled/)
+          expect { journaled_class.update_all("locked_at = null") }.to raise_error(/aborted by Journaled/)
+          expect { journaled_class.update_all("delayed_jobs.locked_at = null") }.to raise_error(/aborted by Journaled/)
+          expect { journaled_class.update_all("last_error = 'locked_at'") }.not_to raise_error
+        end
+
         it "succeeds on unjournaled columns" do
           expect { journaled_class.update_all(handler: "") }.not_to raise_error
         end

data/spec/models/journaled/change_writer_spec.rb

@@ -11,12 +11,13 @@ RSpec.describe Journaled::ChangeWriter do
         "name" => "bob",
         "rank" => "first lieutenant",
         "serial_number" => "foobar",
-        "last_sign_in_at" => now
+        "last_sign_in_at" => now,
       },
       saved_changes: {
         "name" => %w(bill bob),
-        "last_sign_in_at" => now
-      }
+        "last_sign_in_at" => now,
+      },
+      journaled_enqueue_opts: {},
     )
   end
 
@@ -24,21 +25,21 @@ RSpec.describe Journaled::ChangeWriter do
     double(
       "SoldierClass",
       table_name: "soldiers",
-      attribute_names: %w(id name rank serial_number last_sign_in_at)
+      attribute_names: %w(id name rank serial_number last_sign_in_at),
     )
   end
 
   let(:change_definition) do
     Journaled::ChangeDefinition.new(
       attribute_names: %i(name rank serial_number),
-      logical_operation: "identity_change"
+      logical_operation: "identity_change",
     )
   end
 
   let(:faulty_change_definition) do
     Journaled::ChangeDefinition.new(
       attribute_names: %i(name rank serial_number nonexistent_thingie),
-      logical_operation: "identity_change"
+      logical_operation: "identity_change",
     )
   end
 
@@ -58,9 +59,10 @@ RSpec.describe Journaled::ChangeWriter do
           "name" => "bill",
           "rank" => "first lieutenant",
           "serial_number" => "foobar",
-          "last_sign_in_at" => Time.zone.now
+          "last_sign_in_at" => Time.zone.now,
         },
-        saved_changes: {}
+        saved_changes: {},
+        journaled_enqueue_opts: {},
       )
     end
 
@@ -68,7 +70,7 @@ RSpec.describe Journaled::ChangeWriter do
       expect(subject.relevant_attributes).to eq(
         "name" => "bill",
         "rank" => "first lieutenant",
-        "serial_number" => "foobar"
+        "serial_number" => "foobar",
       )
     end
   end
@@ -83,11 +85,12 @@ RSpec.describe Journaled::ChangeWriter do
           "name" => "bill",
           "rank" => "first lieutenant",
           "serial_number" => "foobar",
-          "last_sign_in_at" => Time.zone.now
+          "last_sign_in_at" => Time.zone.now,
         },
         changes: {
-          "name" => %w(bob bill)
-        }
+          "name" => %w(bob bill),
+        },
+        journaled_enqueue_opts: {},
       )
     end
 
@@ -95,7 +98,7 @@ RSpec.describe Journaled::ChangeWriter do
       expect(subject.relevant_unperturbed_attributes).to eq(
         "name" => "bob",
         "rank" => "first lieutenant",
-        "serial_number" => "foobar"
+        "serial_number" => "foobar",
       )
     end
   end
@@ -180,9 +183,10 @@ RSpec.describe Journaled::ChangeWriter do
             "name" => "bill",
             "rank" => "first lieutenant",
             "serial_number" => "foobar",
-            "last_sign_in_at" => Time.zone.now
+            "last_sign_in_at" => Time.zone.now,
           },
-          saved_changes: {}
+          saved_changes: {},
+          journaled_enqueue_opts: {},
         )
       end
 
@@ -222,9 +226,9 @@ RSpec.describe Journaled::ChangeWriter do
               "name" => "bill",
               "rank" => "first lieutenant",
               "serial_number" => "foobar",
-              "last_sign_in_at" => Time.zone.now
+              "last_sign_in_at" => Time.zone.now,
             },
-            saved_changes: {}
+            saved_changes: {},
           )
         end
 
@@ -248,11 +252,12 @@ RSpec.describe Journaled::ChangeWriter do
             "name" => "bob",
             "rank" => "first lieutenant",
             "serial_number" => "foobar",
-            "last_sign_in_at" => now
+            "last_sign_in_at" => now,
           },
           changes: {
-            "name" => %w(bill bob)
-          }
+            "name" => %w(bill bob),
+          },
+          journaled_enqueue_opts: {},
         )
       end
 
@@ -261,7 +266,7 @@ RSpec.describe Journaled::ChangeWriter do
           expect(JSON.parse(opts[:changes])).to eq(
             "name" => "bill",
             "rank" => "first lieutenant",
-            "serial_number" => "foobar"
+            "serial_number" => "foobar",
           )
           journaled_change
         end