sidekiq-amigo 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc6d4ac6f9e7a89afecc711780ceeeb3ab1204435a19be2683623256b2abc49
-  data.tar.gz: 725dc4719b949d5f93bd84125ed6d2bea713be872f7e8413e6509d90c9090544
+  metadata.gz: 53361c37c9ec31b3886fb7b33ff61bd022802128b458f93e624c4f0d0cbcc963
+  data.tar.gz: 54a9e75e5b011d6441b8906404a0d856394e19c4d27e66e7580c37d4928e3d41
 SHA512:
-  metadata.gz: e1a5e2c7beab44fecabb7d7b7f9f610ce1138029eb247b46c04d90399550d976990f6db36717c73f225c195318ea303b1607984878167dfac4087024e809c735
-  data.tar.gz: 807e4c88665fd4ac7a6a4004e654de2a697b4ebd7c90546be7f965955ecd84690f2e0f5eebe913d31e2673f32f7bbd560e05695f79154284f3d7bd8a6ee77eb9
+  metadata.gz: b469583cc5c2e339d359834763d3a67c154e9977212b35f039623f937b4b55997b7a523ba8f5c414898295c18c65d401a020b9679c4d695c50d636ef5c7334db
+  data.tar.gz: ab70f5da69a2bb8868c9ec864c760eb1d6fc124a99d71e2ad332a8dccd7ba8503971dfb0ee3a60d19d122e5ce079b5f9a4dc6a5a3df2a8c05057b19f2963c172

data/lib/amigo/spec_helpers.rb

@@ -16,18 +16,28 @@ module Amigo
     end
 
     module_function def snapshot_async_state(opts={})
-      old_hooks = Amigo.subscribers.to_a
+      old_subscribers = Amigo.subscribers.to_a
       old_jobs = Amigo.registered_jobs.to_a
       old_failure = Amigo.on_publish_error
 
+      new_subscribers = opts.fetch(:subscribers, [])
+      new_jobs = opts.fetch(:jobs, [])
+
+      @active_snapshots ||= 0
+      if @active_snapshots.positive?
+        new_subscribers = old_subscribers + new_subscribers
+        new_jobs = old_jobs = new_jobs
+      end
       begin
         Amigo.on_publish_error = opts[:on_error] if opts.key?(:on_error)
-        Amigo.subscribers.replace(opts[:subscribers]) if opts.key?(:subscribers)
-        Amigo.registered_jobs.replace(opts[:jobs]) if opts.key?(:jobs)
+        Amigo.subscribers.replace(new_subscribers) if opts.key?(:subscribers)
+        Amigo.registered_jobs.replace(new_jobs) if opts.key?(:jobs)
+        @active_snapshots += 1
         yield
       ensure
+        @active_snapshots -= 1
         Amigo.on_publish_error = old_failure
-        Amigo.subscribers.replace(old_hooks)
+        Amigo.subscribers.replace(old_subscribers)
         Amigo.registered_jobs.replace(old_jobs)
       end
     end

data/lib/amigo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Amigo
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/lib/amigo.rb

@@ -217,6 +217,14 @@ module Amigo
   end
 
   class Event
+    # @param topic [String]
+    # @param payload [Array]
+    # @return [Webhookdb::Event]
+    def self.create(topic, payload)
+      return self.new(SecureRandom.uuid, topic, payload)
+    end
+
+    # @return [Webhookdb::Event]
     def self.from_json(o)
       return self.new(o["id"], o["name"], o["payload"])
     end
@@ -252,25 +260,11 @@ module Amigo
     end
 
     protected def safe_stringify(o)
-      return self.deep_stringify_keys(o) if o.is_a?(Hash)
+      return o.utc.strftime("%Y-%m-%dT%H:%M:%S.%LZ") if o.is_a?(Time)
+      return o.each_with_object({}) { |(k, v), m| m[k.to_s] = safe_stringify(v) } if o.is_a?(Hash)
+      return o.map { |x| safe_stringify(x) } if o.is_a?(Array)
       return o
     end
-
-    def deep_stringify_keys(hash)
-      stringified_hash = {}
-      hash.each do |k, v|
-        stringified_hash[k.to_s] =
-          case v
-            when Hash
-              self.deep_stringify_keys(v)
-            when Array
-              v.map { |i| i.is_a?(Hash) ? self.deep_stringify_keys(i) : i }
-          else
-              v
-          end
-      end
-      stringified_hash
-    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-amigo
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Lithic Technology