hey-pubsub 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e52d47a26ddc8bc246c9a529de490e5296b34e
-  data.tar.gz: b2802f7e7e17ea5177e1f4a8827bc68891365aad
+  metadata.gz: 590724616c1051ab959c4ac95e4a645118456819
+  data.tar.gz: b72160d7af916bad08377c2838928210bbc54d4f
 SHA512:
-  metadata.gz: 7f41afce64925bcfba2f0c476f916b15d37269aa72a8b517ae33dbeceb8aaf10e20556073e39d14faa1bf5ee27ec5493e7332b48a9e395f92be3839f68b17386
-  data.tar.gz: 97c26cd93623698941e0cc0e4a75445f53586b88b443a2108785662d0c8ee56f1904fe4e5c38ebbb96f77e3e27f2f1b89a70147e03c7bb0f95f20f454d0e7f4e
+  metadata.gz: 4bb1fdfd774c144b7f9a84db60e3d406244efd9fa105333a195b6f7534511b4f0169193e3cfcf73e308856c173d4ca46f54e5c1a74fa18f38903ba53c91ee589
+  data.tar.gz: a04bff268858dee84d39c54400ccd1b833108b97589ded246e17c78d342c18374818b85467c04e5f338b835e92c99e1bd295d324f5c239f14b69c5aad04ec6eb

data/lib/hey/configuration.rb

@@ -3,6 +3,5 @@ class Hey::Configuration
 
   def initialize
     @pubsub_adapter = Hey::Pubsub::Adapters::AsnAdapter
-    @namespace = "pubsub"
   end
 end

data/lib/hey/context.rb

@@ -0,0 +1 @@
+class Hey::Context < OpenStruct; end

data/lib/hey/pubsub/event.rb

@@ -28,9 +28,8 @@ class Hey::Pubsub::Event
   end
 
   def metadata
-    merged_data = Hey::ThreadCargo.to_h.merge(@metadata)
-    merged_data.delete(:uuid)
-    merged_data.delete(Hey::ThreadCargo::SANITIZABLE_VALUES_KEY)
+    context_metadata = Hey::ThreadCargo.contexts.reverse.map(&:to_h).reduce(Hash.new, :merge)
+    merged_data = context_metadata.merge(@metadata)
     Hey::SanitizedHash.new(merged_data).to_h
   end
 

data/lib/hey/sanitized_hash.rb

@@ -12,11 +12,13 @@ class Hey::SanitizedHash
   attr_reader :hash
 
   def sanitizable_values
-    @sanitizable_values ||= Hey::ThreadCargo.sanitizable_values.collect { |value| [value, ""] }.to_h
+    @sanitizable_values ||= Hey::ThreadCargo.contexts.map do |context|
+      Array[context[Hey::SANITIZE_KEY]]
+    end.flatten.compact
   end
 
   def sanitize!(value)
-    Hey::ThreadCargo.sanitizable_values.each { |substr| value.to_s.gsub!(substr, "") }
+    sanitizable_values.each { |substr| value.to_s.gsub!(substr, "") }
   end
 
   def traverse(h, &block)

data/lib/hey/thread_cargo.rb

@@ -1,29 +1,29 @@
 class Hey::ThreadCargo
-  SANITIZABLE_VALUES_KEY = :sanitizable_values
-
-  # Sets a namespaced value on the current thread
-  def self.set(name, value)
+  def self.init!
     Thread.current[:hey] = {} if Thread.current[:hey].nil?
-    Thread.current[:hey][name] = value
-    value
+    Thread.current[:hey][:uuid] = SecureRandom.uuid if Thread.current[:hey][:uuid].nil?
   end
 
-  # Returns a namespaced value from the current thread
-  def self.get(name)
-    return nil if Thread.current[:hey].nil?
-    Thread.current[:hey][name]
+  def self.init_contexts!
+    init!
+    Thread.current[:hey][:contexts] = [] if Thread.current[:hey][:contexts].nil?
   end
 
   def self.uuid
-    return set(:uuid, SecureRandom.uuid) if get(:uuid).nil?
-    get(:uuid)
+    init!
+    Thread.current[:hey][:uuid]
+  end
+
+  # Sets a context on the current thread
+  def self.add_context(context)
+    self.init_contexts!
+    Thread.current[:hey][:contexts] << context
   end
 
-  # Adds the supplied values to the sanitized values array. It removes nils and duplicate values from the array.
-  def self.sanitize!(*values)
-    set(SANITIZABLE_VALUES_KEY, []) if get(SANITIZABLE_VALUES_KEY).nil?
-    values = Array(values)
-    set(SANITIZABLE_VALUES_KEY, get(SANITIZABLE_VALUES_KEY).concat(values).flatten.compact.uniq)
+  # Returns a context from the current thread
+  def self.remove_context(context)
+    self.init_contexts!
+    Thread.current[:hey][:contexts].delete(context)
   end
 
   # Removes all namespaced values from the current thread.
@@ -31,12 +31,8 @@ class Hey::ThreadCargo
     Thread.current[:hey] = nil
   end
 
-  def self.sanitizable_values
-    Array(get(SANITIZABLE_VALUES_KEY))
-  end
-
-  def self.to_h
-    Thread.current[:hey] = {} if Thread.current[:hey].nil?
-    Thread.current[:hey].clone
+  def self.contexts
+    self.init_contexts!
+    Thread.current[:hey][:contexts]
   end
 end

data/lib/hey/version.rb

@@ -1,3 +1,3 @@
 module Hey
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/lib/hey.rb

@@ -1,6 +1,10 @@
 require "hey/version"
+require "ostruct"
+require "securerandom"
 
 module Hey
+  SANITIZE_KEY = :sanitize
+
   def self.configure
     yield(configuration)
   end
@@ -24,20 +28,21 @@ module Hey
       pubsub_adapter.subscribe!(event_name, &block)
     end
 
-    def set(name, value)
-      Hey::ThreadCargo.set(name, value)
-    end
-
-    def sanitize!(*values)
-      Hey::ThreadCargo.sanitize!(values)
+    def context(**hash)
+      _context = Context.new(hash)
+      ThreadCargo.add_context(_context)
+      yield
+    ensure
+      ThreadCargo.remove_context(_context)
+      ThreadCargo.purge! if ThreadCargo.contexts.empty?
     end
   end
 
   extend Hey::Behavior
 end
 
-require "securerandom"
 require "hey/configuration"
+require "hey/context"
 require "hey/thread_cargo"
 require "hey/sanitized_hash"
 require "hey/pubsub"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hey-pubsub
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - ShippingEasy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - hey-pubsub.gemspec
 - lib/hey.rb
 - lib/hey/configuration.rb
+- lib/hey/context.rb
 - lib/hey/pubsub.rb
 - lib/hey/pubsub/adapters/asn_adapter.rb
 - lib/hey/pubsub/event.rb
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Pubsub wrapper with utilities to chain events, sanitize payloads and record