table_sync 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c6441900e1a2c6f9605cff9034b5c393e5aa692f69eac0219ba2870cc780f94
-  data.tar.gz: cbd3cd0cbc388c08ac8cda0ddc9106e28972dd3750540e8aa345168904b1e795
+  metadata.gz: cfa9b3d17de49a2591644329464d45ba1ddfc6b9a56c76db6eb6c061b439f3e4
+  data.tar.gz: 7438f913929bd7eb6ae0b6e2d22fcb145b41a62d714aba7e989dcf2868bc7d70
 SHA512:
-  metadata.gz: f31202d84b064ea297774c22169ea7c1db9d9048010b3db3fe2de2742e568e2c8fabb3a84c35c124c459eab96b475b4fa30f978bdff9145dcdce15c7fe053a21
-  data.tar.gz: ba901b5c83cf12406556b5d60e5a5df7c1d2c62ca112c2fcaf5c3e1d2132179b27dcf8d6f5ad241342bc02f45f9c02b9bab034cd7ff60c5ef449ccb675bdae8e
+  metadata.gz: ed0babc48e2b1918ba4ae126215083182c6a3eadec3f79136b68322e2d2563ef02871b82aa86d5f310c77bc8303fc6a38042d35dfba95dab71b7bea653bfb658
+  data.tar.gz: 11783a0f991fb7d3b39b18e820a82a3075e0f6690ab0bd0d1c5fcb229fa2a0090df673ceacc4e3ec05bc722a42f8657fdd376f18f8f715f27c838efdde5c357b

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.8.0] - 2019-07-23
+### Added
+- `debounce_time` option for publishing
+
 ## [1.7.0] - 2019-07-11
 ### Added
 - `on_destroy` return value for manipulation with `after_commit` callback;

data/docs/synopsis.md

@@ -82,8 +82,8 @@ to default Rabbit gem configuration).
 
 # Manual publishing
 
-`TableSync::Publisher.new(object_class, original_attributes, confirm: true, state: :updated)` where
-state is one of `:created / :updated / :destroyed` and `confirm` is Rabbit's confirm delivery flag
+`TableSync::Publisher.new(object_class, original_attributes, confirm: true, state: :updated, debounce_time: 45)` 
+where state is one of `:created / :updated / :destroyed` and `confirm` is Rabbit's confirm delivery flag and optional param `debounce_time` determines debounce time in seconds, 1 minute by default.
 
 # Manual publishing with batches
 

data/lib/table_sync/orm_adapter/active_record.rb

@@ -17,10 +17,13 @@ module TableSync::ORMAdapter
     end
 
     def setup_sync(klass, **opts)
+      debounce_time = opts.delete(:debounce_time)
+
       klass.instance_exec do
         { create: :created, update: :updated, destroy: :destroyed }.each do |event, state|
           after_commit(on: event, **opts) do
-            TableSync::Publisher.new(self.class.name, attributes, state: state).publish
+            TableSync::Publisher.new(self.class.name, attributes,
+                                     state: state, debounce_time: debounce_time).publish
           end
         end
       end

data/lib/table_sync/orm_adapter/sequel.rb

@@ -19,13 +19,29 @@ module TableSync::ORMAdapter
     def setup_sync(klass, **opts)
       if_predicate     = to_predicate(opts.delete(:if), true)
       unless_predicate = to_predicate(opts.delete(:unless), false)
-      raise "Only :if and :unless options are currently supported for Sequel hooks" if opts.any?
+      debounce_time    = opts.delete(:debounce_time)
 
+      if opts.any?
+        raise "Only :if, :skip_debounce and :unless options are currently " \
+              "supported for Sequel hooks"
+      end
+
+      register_callbacks(klass, if_predicate, unless_predicate, debounce_time)
+    end
+
+    def to_predicate(val, default)
+      return val.to_proc if val.respond_to?(:to_proc)
+
+      -> (*) { default }
+    end
+
+    def register_callbacks(klass, if_predicate, unless_predicate, debounce_time)
       { create: :created, update: :updated }.each do |event, state|
         klass.send(:define_method, :"after_#{event}") do
           if instance_eval(&if_predicate) && !instance_eval(&unless_predicate)
             db.after_commit do
-              TableSync::Publisher.new(self.class.name, values, state: state).publish
+              TableSync::Publisher.new(self.class.name, values,
+                                       state: state, debounce_time: debounce_time).publish
             end
           end
           super()
@@ -40,11 +56,5 @@ module TableSync::ORMAdapter
         super()
       end
     end
-
-    def to_predicate(val, default)
-      return val.to_proc if val.respond_to?(:to_proc)
-
-      -> (*) { default }
-    end
   end
 end

data/lib/table_sync/publisher.rb

@@ -4,26 +4,28 @@ class TableSync::Publisher < TableSync::BasePublisher
   DEBOUNCE_TIME = 1.minute
 
   # 'original_attributes' are not published, they are used to resolve the routing key
-  def initialize(object_class, original_attributes, destroyed: nil, confirm: true, state: :updated)
+  def initialize(object_class, original_attributes, **opts)
     @object_class = object_class.constantize
     @original_attributes = filter_safe_for_serialization(original_attributes.deep_symbolize_keys)
-    @confirm = confirm
+    @confirm = opts.fetch(:confirm, true)
+    @debounce_time = opts[:debounce_time]&.seconds || DEBOUNCE_TIME
 
-    if destroyed.nil?
-      @state = validate_state(state)
+    if opts[:destroyed].nil?
+      @state = opts.fetch(:state, :updated).to_sym
+      validate_state
     else
       # TODO Legacy job support, remove
-      @state = destroyed ? :destroyed : :updated
+      @state = opts[:destroyed] ? :destroyed : :updated
     end
   end
 
   def publish
-    return enqueue_job if destroyed?
+    return enqueue_job if destroyed? || debounce_time.zero?
 
-    sync_time = Rails.cache.read(cache_key) || current_time - DEBOUNCE_TIME - 1.second
+    sync_time = Rails.cache.read(cache_key) || current_time - debounce_time - 1.second
     return if sync_time > current_time
 
-    next_sync_time = sync_time + DEBOUNCE_TIME
+    next_sync_time = sync_time + debounce_time
     next_sync_time <= current_time ? enqueue_job : enqueue_job(next_sync_time)
   end
 
@@ -38,6 +40,7 @@ class TableSync::Publisher < TableSync::BasePublisher
 
   attr_reader :original_attributes
   attr_reader :state
+  attr_reader :debounce_time
 
   def attrs_for_callables
     original_attributes
@@ -113,11 +116,7 @@ class TableSync::Publisher < TableSync::BasePublisher
     state == :created
   end
 
-  def validate_state(state)
-    if %i[created updated destroyed].include?(state&.to_sym)
-      state.to_sym
-    else
-      raise "Unknown state: #{state.inspect}"
-    end
+  def validate_state
+    raise "Unknown state: #{state.inspect}" unless %i[created updated destroyed].include?(state)
   end
 end

data/lib/table_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableSync
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sync
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Umbrellio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memery