hey-pubsub 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad31b662949d67bd450ad5ded270916cbf41f16
-  data.tar.gz: 09ca24e92b72f232d5e13f9e4a0aac3626b70006
+  metadata.gz: 47678c0e57e35fa02d880ddb05d0905f5a1fdb35
+  data.tar.gz: 1675e2ed28ae1f7a7f9b7211d647f7e34cac8998
 SHA512:
-  metadata.gz: fb9033c52499b8d13d84f9737b910ee09ca6e7fac44e0c45ceb1054f9e410d87f1a20a4199ddd7a8662f7c98ffd51e5a4c4e18748339e72923b6bc1903b305d1
-  data.tar.gz: 97a3eec4d667df0ad59dfcc84ba8b8e66823ce37a98ecd1f804be675ecf3e727b9308101d3880aabd26e33b7073097d9c0a90a01ba84f9b035063b7344d7b160
+  metadata.gz: 220af4af52b73ce75ceb3aa127002750d077b3283c2aebb69e42a72351a9ce2ea721cf8bb9bdbfd73af44a7d245675e68fc6d927b01c557ee748b01ca63cac5c
+  data.tar.gz: 33a541aefdef8390cbf7faf0783c451e7b7c5f5ba072e01f7319621164f20234a40b2b27cff44a9b46b3d5e4300e614e20bfe07964b04656fa17611995b26743

data/lib/hey/pubsub/adapters/asn_adapter.rb

@@ -5,8 +5,16 @@ module Hey::Pubsub::Adapters
     def self.subscribe!(event_name)
       if block_given?
         ActiveSupport::Notifications.subscribe(event_name) do |*args|
-          event = ActiveSupport::Notifications::Event.new(*args)
-          yield(event.payload)
+          asn_event = ActiveSupport::Notifications::Event.new(*args)
+
+          payload = asn_event.payload.dup
+          event = Hey::Pubsub::Event.new(uuid: payload.delete(:uuid),
+                                         name: asn_event.name,
+                                         started_at: asn_event.time,
+                                         ended_at: asn_event.end,
+                                         metadata: payload)
+
+          yield(event.to_hash)
         end
       end
     end

data/lib/hey/pubsub/event.rb

@@ -0,0 +1,28 @@
+class Hey::Pubsub::Event
+  def initialize(name:, uuid:, started_at:, ended_at:, metadata: {})
+    @name = name
+    @uuid = uuid
+    @started_at = started_at
+    @ended_at = ended_at
+    @metadata = metadata
+  end
+
+  def to_hash
+    {
+      uuid: uuid,
+      name: name,
+      started_at: started_at,
+      ended_at: ended_at,
+      duration: duration,
+      metadata: metadata
+    }
+  end
+
+  private
+
+  attr_reader :name, :uuid, :metadata, :started_at, :ended_at
+
+  def duration
+    @duration ||= 1000.0 * (ended_at - started_at)
+  end
+end

data/lib/hey/pubsub/payload.rb

@@ -2,15 +2,12 @@ class Hey::Pubsub::Payload
   def initialize(values = {})
     @values = values
     merge_values!
-    sanitize_values!
   end
 
-  def to_hash
-    values
+  def to_h
+    Hey::SanitizedHash.new(values).to_h
   end
 
-  alias_method :to_h, :to_hash
-
   private
 
   attr_accessor :values
@@ -19,25 +16,4 @@ class Hey::Pubsub::Payload
     Hey::ThreadCargo.uuid # initialize if it has never been set
     self.values = Hey::ThreadCargo.to_hash.merge(values)
   end
-
-  def sanitize_values!
-    traverse_hash(values) { |k, v| [k, sanitize_value!(v)] }
-  end
-
-  def sanitize_value!(value)
-    Hey::ThreadCargo.sanitizable_values.each do |sanitizable_value|
-      value = value.to_s.gsub(sanitizable_value, "")
-    end
-    value
-  end
-
-  def traverse_hash(h, &block)
-    h.each_pair do |k, v|
-      if v.is_a?(Hash)
-        traverse_hash(v, &block)
-      else
-        yield(k, v)
-      end
-    end
-  end
 end

data/lib/hey/sanitized_hash.rb

@@ -0,0 +1,35 @@
+class Hey::SanitizedHash
+  def initialize(hash = {})
+    @hash = deep_dup(hash)
+  end
+
+  def to_h
+    traverse(hash) { |k, v| [k, sanitize!(v)] }
+  end
+
+  private
+
+  attr_reader :hash
+
+  def sanitizable_values
+    @sanitizable_values ||= Hey::ThreadCargo.sanitizable_values.collect { |value| [value, ""] }.to_h
+  end
+
+  def sanitize!(value)
+    Hey::ThreadCargo.sanitizable_values.each { |substr| value.to_s.gsub!(substr, "") }
+  end
+
+  def traverse(h, &block)
+    h.each_pair do |k, v|
+      if v.is_a?(Hash)
+        traverse(v, &block)
+      else
+        yield(k, v)
+      end
+    end
+  end
+
+  def deep_dup(object)
+    Marshal.load(Marshal.dump(object))
+  end
+end

data/lib/hey/version.rb

@@ -1,3 +1,3 @@
 module Hey
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/hey.rb

@@ -18,8 +18,8 @@ module Hey
     pubsub_adapter.publish!(event_name, payload.to_h, &block)
   end
 
-  def self.subscribe!(event_name)
-    pubsub_adapter.subscribe!(event_name)
+  def self.subscribe!(event_name, &block)
+    pubsub_adapter.subscribe!(event_name, &block)
   end
 
   def self.set(name, value)
@@ -38,6 +38,8 @@ end
 require "securerandom"
 require "hey/configuration"
 require "hey/thread_cargo"
+require "hey/sanitized_hash"
 require "hey/pubsub"
 require "hey/pubsub/payload"
+require "hey/pubsub/event"
 require "hey/pubsub/adapters/asn_adapter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hey-pubsub
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - ShippingEasy
@@ -87,7 +87,9 @@ files:
 - lib/hey/configuration.rb
 - lib/hey/pubsub.rb
 - lib/hey/pubsub/adapters/asn_adapter.rb
+- lib/hey/pubsub/event.rb
 - lib/hey/pubsub/payload.rb
+- lib/hey/sanitized_hash.rb
 - lib/hey/thread_cargo.rb
 - lib/hey/version.rb
 homepage: https://github.com/ShippingEasy/hey-pubsub
@@ -110,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Pubsub wrapper with utilities to chain events, sanitize payloads and record