ruby_event_store-outbox 0.0.20 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 151cc4dc1f5abead45b181c09dd52ade1850944b1f240cf222778ab7891ca146
-  data.tar.gz: 95ff963b0957cd62a9456764f6f87f3e3dac8e4484ebd886c8ac3c5434db3026
+  metadata.gz: eca098a782c640bdb2bcfc7023a88b37b1c54025f785cb40c04abcafdd23ec9a
+  data.tar.gz: 419c3f82f9f553f1c7dab304633093ff27ff32a10d4a3d60bd26fb9f07064873
 SHA512:
-  metadata.gz: a894a74e5a4db50a5f9e3d030ea97ea725bbf0098f79d986d8ab7ead14dcfcf8b8daca4187d87e16a836ca40039bd6d950fa8dc55ca47aa8d3977d2bf69b078e
-  data.tar.gz: 5a251df0856e1dadae4868871fb3a428fd4b9ccb8f4d17dfcc9d623559c9c4ea5cfb58ec566589ed3358724e6063f9f40a43d62d15b3bde5bc6814bd73ee0758
+  metadata.gz: b1f689cd6077646bbb366089fec855e8c9b5b4550b7a44c4ff95d02f57eba05e3b87a06d697195424c58cf6384b0bd6df6f58eddcadf426cf34de62c683fa903
+  data.tar.gz: 9c8f0b506b8ffc9b439fa0d642b3ec847021783df36d60c774977d9efcfd97325f49b438c1ba31e4c8f02d8b78175c0948cbf1d011047d7235f1df54ed930d54

data/lib/ruby_event_store/outbox/cleanup_strategies/clean_old_enqueued.rb

@@ -2,17 +2,18 @@ module RubyEventStore
   module Outbox
     module CleanupStrategies
       class CleanOldEnqueued
-        def initialize(repository, duration)
+        def initialize(repository, duration, limit)
           @repository = repository
           @duration = duration
+          @limit = limit
         end
 
         def call(fetch_specification)
-          repository.delete_enqueued_older_than(fetch_specification, duration)
+          repository.delete_enqueued_older_than(fetch_specification, duration, limit)
         end
 
         private
-        attr_reader :repository, :duration
+        attr_reader :repository, :duration, :limit
       end
     end
   end

data/lib/ruby_event_store/outbox/cli.rb

@@ -15,6 +15,7 @@ module RubyEventStore
         batch_size: 100,
         metrics_url: nil,
         cleanup_strategy: :none,
+        cleanup_limit: :all,
         sleep_on_empty: 0.5
       }
       Options = Struct.new(*DEFAULTS.keys)
@@ -57,6 +58,10 @@ module RubyEventStore
               options.cleanup_strategy = cleanup_strategy
             end
 
+            option_parser.on("--cleanup-limit=LIMIT", "Amount of records removed in single cleanup run. One of: all or number of records that should be removed. Default: all") do |cleanup_limit|
+              options.cleanup_limit = cleanup_limit
+            end
+
             option_parser.on("--sleep-on-empty=SLEEP_TIME", Float, "How long to sleep before next check when there was nothing to do. Default: 0.5") do |sleep_on_empty|
               options.sleep_on_empty = sleep_on_empty
             end

data/lib/ruby_event_store/outbox/consumer.rb

@@ -21,6 +21,7 @@ module RubyEventStore
           database_url:,
           redis_url:,
           cleanup:,
+          cleanup_limit:,
           sleep_on_empty:
         )
           @split_keys = split_keys
@@ -29,6 +30,7 @@ module RubyEventStore
           @database_url = database_url
           @redis_url = redis_url
           @cleanup = cleanup
+          @cleanup_limit = cleanup_limit
           @sleep_on_empty = sleep_on_empty
           freeze
         end
@@ -41,11 +43,12 @@ module RubyEventStore
             database_url: overriden_options.fetch(:database_url, database_url),
             redis_url: overriden_options.fetch(:redis_url, redis_url),
             cleanup: overriden_options.fetch(:cleanup, cleanup),
+            cleanup_limit: overriden_options.fetch(:cleanup_limit, cleanup_limit),
             sleep_on_empty: overriden_options.fetch(:sleep_on_empty, sleep_on_empty)
           )
         end
 
-        attr_reader :split_keys, :message_format, :batch_size, :database_url, :redis_url, :cleanup, :sleep_on_empty
+        attr_reader :split_keys, :message_format, :batch_size, :database_url, :redis_url, :cleanup, :cleanup_limit, :sleep_on_empty
       end
 
       def initialize(consumer_uuid, configuration, clock: Time, logger:, metrics:)
@@ -68,7 +71,7 @@ module RubyEventStore
         when :none
           CleanupStrategies::None.new
         else
-          CleanupStrategies::CleanOldEnqueued.new(repository, ActiveSupport::Duration.parse(configuration.cleanup))
+          CleanupStrategies::CleanOldEnqueued.new(repository, ActiveSupport::Duration.parse(configuration.cleanup), configuration.cleanup_limit)
         end
       end
 

data/lib/ruby_event_store/outbox/repository.rb

@@ -142,11 +142,12 @@ module RubyEventStore
         record.update_column(:enqueued_at, now)
       end
 
-      def delete_enqueued_older_than(fetch_specification, duration)
-        Record
+      def delete_enqueued_older_than(fetch_specification, duration, limit)
+        scope = Record
           .for_fetch_specification(fetch_specification)
           .where("enqueued_at < ?", duration.ago)
-          .delete_all
+        scope = scope.limit(limit) unless limit == :all
+        scope.delete_all
         :ok
       rescue ActiveRecord::Deadlocked
         :deadlocked

data/lib/ruby_event_store/outbox/sidekiq_producer.rb

@@ -10,11 +10,11 @@ module RubyEventStore
       def call(klass, args)
         sidekiq_client = Sidekiq::Client.new(Sidekiq.redis_pool)
         item = {
+          'args' => args.map(&:to_h).map {|h| h.transform_keys(&:to_s)},
           'class' => klass,
-          'args' => args.map(&:to_h),
         }
         normalized_item = sidekiq_client.__send__(:normalize_item, item)
-        payload = sidekiq_client.__send__(:process_single, normalized_item.fetch('class'), normalized_item)
+        payload = sidekiq_client.middleware.invoke(normalized_item['class'], normalized_item, normalized_item['queue'], Sidekiq.redis_pool) { normalized_item }
         if payload
           Repository::Record.create!(
             format: SIDEKIQ5_FORMAT,

data/lib/ruby_event_store/outbox/sidekiq_scheduler.rb

@@ -5,7 +5,7 @@ require_relative "sidekiq_producer"
 module RubyEventStore
   module Outbox
     class SidekiqScheduler
-      def initialize(serializer: YAML)
+      def initialize(serializer: RubyEventStore::Serializers::YAML)
         @serializer = serializer
         @sidekiq_producer = SidekiqProducer.new
       end

data/lib/ruby_event_store/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module Outbox
-    VERSION = "0.0.20"
+    VERSION = "0.0.23"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-outbox
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.23
 platform: ruby
 authors:
 - Arkency
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-description:
+description: 
 email: dev@arkency.com
 executables:
 - res_outbox
@@ -75,7 +75,7 @@ metadata:
   source_code_uri: https://github.com/RailsEventStore/rails_event_store
   bug_tracker_uri: https://github.com/RailsEventStore/rails_event_store/issues
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.3.9
+signing_key: 
 specification_version: 4
 summary: Active Record based outbox for Ruby Event Store
 test_files: []