dionysus-rb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8297895cea885c4df1b824188297d199eed0eb00f4c52f102842e8468c02728a
-  data.tar.gz: b71aff2bf67cffe2a5be1e9befd29f3651a23501ee107806b7c2c6eef85f744f
+  metadata.gz: '0934079a452c75d517f1954e9cc6650c4b6219273c329013b676f336ea0d9e13'
+  data.tar.gz: bee752d4720e8f4249867ecf3506b725fa9ba9cd678ebadf9ac0ac893c635925
 SHA512:
-  metadata.gz: 3ad54974b1e4956cd76f94e865c225dfe1beb2b339a29b6a594faf1671f59b4388d9a39a420788f57692e168edb1fc067e351a96d7d5883ec237f051f319eb21
-  data.tar.gz: 428894822478c3ed6296eb51c7440049fe39dd3ec54220abc038e1786b3f4468e48ee745cd2cadaaf7a419b9b093e79628cfb0be476602d352c6317280771685
+  metadata.gz: e12c164f5909f35e9b0d4336fb31ebb3d79e064409243beaad6e40c32f5590ff296ee805601de312b111fcc5fbb10d86008064cb2c229de56d7eab8518e6c9f9
+  data.tar.gz: 6a0fffb5d3b4d65eab34a0aaa16871002b8713addb45e07a1094706559fc978d5b37c885d6d2179c481bea436eddfe9805db0385a464ddb6a70b056ccf10e489

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## [Unreleased]
 
+## [0.4.0]
+- Allow `Dionysus::Producer::Genesis::StreamJob`/`Dionysus::Producer::Genesis::Streamer` to take more options and perform filtering by extra conditions. This is useful if you only need to stream some of the records.
+
 ## [0.3.0]
 - Allow to provide multiple message filters. `message_filter` stays for backwards compatibility and depends on `message_filters`.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dionysus-rb (0.3.0)
+    dionysus-rb (0.4.0)
       activerecord (>= 5)
       activesupport (>= 3.2)
       concurrent-ruby

data/lib/dionysus/producer/genesis/stream_job.rb

@@ -5,9 +5,10 @@ class Dionysus::Producer::Genesis::StreamJob
 
   sidekiq_options queue: Dionysus::Producer::Config.default_sidekiq_queue
 
-  def perform(topic, model_klass, from, to, number_of_days, streamer_job)
+  def perform(topic, model_klass, from, to, number_of_days, streamer_job, options = {})
+    final_options = options.symbolize_keys.reverse_merge(number_of_days: number_of_days)
     Dionysus::Producer::Genesis::Streamer
       .new(job_class: streamer_job.constantize)
-      .stream(topic, model_klass.constantize, from, to, number_of_days: number_of_days)
+      .stream(topic, model_klass.constantize, from, to, final_options)
   end
 end

data/lib/dionysus/producer/genesis/streamer.rb

@@ -26,14 +26,31 @@ class Dionysus::Producer::Genesis::Streamer
   delegate :soft_delete_column, to: :config
 
   def fetch_resources(resource_class, from, to, options_hash)
-    records = resource_class
-    records = resource_class.where("updated_at BETWEEN ? AND ?", from, to) if from.present? && to.present?
+    resource_class
+      .then { |records| apply_time_range(records, from, to) }
+      .then { |records| apply_visibility(records, options_hash) }
+      .then { |records| apply_query_conditions(records, options_hash) }
+  end
+
+  def apply_time_range(records, from, to)
+    records = records.where("updated_at BETWEEN ? AND ?", from, to) if from.present? && to.present?
+    records
+  end
+
+  def apply_visibility(records, options_hash)
     if visible_only?(options_hash) && records.column_names.include?(soft_delete_column.to_s)
       records = records.where(soft_delete_column => nil)
     end
     records
   end
 
+  def apply_query_conditions(records, options_hash)
+    if (query_conditions = options_hash.fetch(:query_conditions, {})).any?
+      query_conditions.each { |attr, val| records = records.where(attr => val) }
+    end
+    records
+  end
+
   def visible_only?(options_hash)
     options_hash.fetch(:visible_only, false)
   end

data/lib/dionysus/producer/genesis.rb

@@ -32,7 +32,7 @@ class Dionysus::Producer::Genesis
   def enqueue_stream_model_for_topic(topic, model, from, to, number_of_days, streamer_job)
     Dionysus::Producer::Genesis::StreamJob
       .set(queue: sidekiq_queue)
-      .perform_async(topic.to_s, model.to_s, from.as_json, to.as_json, number_of_days.to_i, streamer_job.to_s)
+      .perform_async(topic.to_s, model.to_s, from.as_json, to.as_json, number_of_days.to_i, streamer_job.to_s, {})
   end
 
   def publish_genesis_performed(model:, topic:, number_of_days:)

data/lib/dionysus/version.rb

@@ -3,5 +3,5 @@
 module Dionysus
   module Version
   end
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dionysus-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Karol Galanciak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-22 00:00:00.000000000 Z
+date: 2024-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord