resugan 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba18c2c784e29ca7493bbb579f33a75c31b41ae6
-  data.tar.gz: e47f70a4106daa799f18e3df9a157b2ba42ab50a
+  metadata.gz: 9529648f6c3c3ea15ec3bbd5de41528befc5b4ee
+  data.tar.gz: 54d84c99dad40bef7d122d853fecc369fcf12c1f
 SHA512:
-  metadata.gz: c9a89df390d48392b0526686d6aaf863f87c6e53385ef6d8449ccd2acfa7a1a38b7da5e7045a2032eab8c13ee8e5685a8a2085286556bb5bb7e354cb087c308c
-  data.tar.gz: 1d8be70ec1599f09e87b1380eaaf98ef195f8948c08c19ba5a994114a05e94487bf86f15f45ccce6f74ae98e72d348dec9039f6f40029e67e20a40c735f64350
+  metadata.gz: 14d17a89b022eeaba39cd2b719691464f71ff43d0a7f1bd9c9eba0e140c8f08ee5009b9305ec8f58fb211595c04e88795c856bf3b4afd590d17b72cfaf2e83ae
+  data.tar.gz: bdd07b56ed36bc09446ba3de39cbf995fae37a879879b065937e0872a138e28f5829fa6683ebb09cffcc331705a9fab19976a655a7c2d1df5320f420b2c151fb

data/CHANGELOG

@@ -1,3 +1,7 @@
+= Version 0.1.14
+  * events will only be resolved at the top level for nested resugan blocks unless resugan! is used
+  * Config is set using Resugan::Kernel.config do |c| c..... end
+
 = Version 0.1.11
   * Allow listeners to attach to multiple namespaces to allow for DRY'er code
 

data/README.md

@@ -147,6 +147,57 @@ listener that belongs to 2 namespaces
 hello! someone said hay!
 listener that belongs to 2 namespaces
 ```
+
+### Behavior of nested resugan blocks
+
+Resugan will by default only resolve events at the outermost resugan context of
+a namespace.
+
+```ruby
+_listener :event1 do |array_of_params|
+  puts "hello! event 1"
+end
+
+_listener :event2, namespace: "group2" do |array_of_params|
+  puts "hello! event 1"
+end
+
+resugan {
+  _fire :event1
+
+  resugan {
+    _fire :event2
+  }
+}
+```
+
+If there are nested resugan blocks note that event dispatch will occur at the
+outermost context. Output will be:
+
+```
+hello! event 1
+hello! event 2
+```
+
+To force the innermost block to immediately resolve, use resugan! instead (or set Kernel.config.reuse_top_level_context = false globally):
+
+```ruby
+resugan {
+  _fire :event1
+
+  resugan! {
+    _fire :event2
+  }
+}
+```
+
+Since the inner block will be resolved first, Output will be:
+
+```
+hello! event 2
+hello! event 1
+```
+
 ## Unique Listeners
 
 the _listener always creates a new listener for an event, so if it so happens that
@@ -207,7 +258,9 @@ This allows you to use various queue backends per namespace, like resugan-worker
 Sometimes you need to track where events are fired. You can do so by enabling line tracing:
 
 ```ruby
-  Resugan::Kernel.enable_line_trace true
+  Resugan::Kernel.config do |c|
+    c.line_trace_enabled = true
+  end
 ```
 
 Line source should now be passed as params everytime you fire an event. You can also
@@ -247,6 +300,12 @@ Can also be used as a sample on how to extend resugan.
 
 https://github.com/jedld/resugan-worker
 
+### Testing
+
+RSpec helpers are available:
+
+https://github.com/jedld/resugan-rspec
+
 ## Similar Projects
 
 wisper (https://github.com/krisleech/wisper) - An excellent gem that focuses on a coupled pub-sub model. Though its global listeners somehow have the same effect though in a syntactically different way.

data/lib/resugan/context.rb

@@ -1,7 +1,7 @@
 module Resugan
   class Context
     def initialize(namespace = '')
-      @namespace = namespace
+      @namespace = namespace.to_s
       @events = {}
     end
 

data/lib/resugan/kernel.rb

@@ -1,39 +1,53 @@
 module Resugan
+  class Config
+    attr_accessor :reuse_top_level_context, :warn_no_context_events, :line_trace_enabled, :default_dispatcher
+
+    def initialize
+      @reuse_top_level_context = true
+      @warn_no_context_events = false
+      @line_trace_enabled = false
+      @default_dispatcher = Resugan::Engine::InlineDispatcher
+    end
+  end
+
   class Kernel
-    # show warning when a _fire was called and there was no context to consume it
-    def self.warn_no_context_events(enable)
-      @warn_no_context_events = enable
+    def self.config
+      @config ||= Resugan::Config.new
+      if block_given?
+        yield @config
+      end
+
+      @config
     end
 
-    def self.warn_no_context_events?
-      @warn_no_context_events || false
+    def self.reuse_top_level_context?
+      config.reuse_top_level_context
     end
 
-    # flag to log the line source where a fire was executed
-    def self.enable_line_trace(enable)
-      @enable = enable
+    def self.warn_no_context_events?
+      config.warn_no_context_events
     end
 
     def self.line_trace_enabled?
-      @enable || false
+      config.line_trace_enabled
     end
 
     def self.set_default_dispatcher(dispatcher)
-      @default_dispatcher ||= dispatcher.new
+      config.default_dispatcher = dispatcher
     end
 
     def self.default_dispatcher
-      @default_dispatcher || Resugan::Engine::InlineDispatcher.new
+      config.default_dispatcher
     end
 
     def self.dispatcher_for(namespace = '')
       @dispatchers = {} unless @dispatchers
-      @dispatchers[namespace] || default_dispatcher
+      @dispatchers[namespace.to_s] || default_dispatcher.new
     end
 
     def self.register_dispatcher(dispatcher, namespace = '')
       @dispatchers = {} unless @dispatchers
-      @dispatchers[namespace] = dispatcher.is_a?(Class) ? dispatcher.new : dispatcher
+      @dispatchers[namespace.to_s] = (dispatcher.is_a?(Class) ? dispatcher.new : dispatcher)
     end
 
     def self.register(event, &block)

data/lib/resugan/object.rb

@@ -1,12 +1,24 @@
 class Object
   def resugan(namespace = '', &block)
+    namespace ||= ''
     current_thread = Thread.current
     current_thread.push_resugan_context(namespace)
     begin
       block.call
     ensure
       context = current_thread.pop_resugan_context
-      context.invoke
+    end
+    context
+  end
+
+  def resugan!(namespace = '', &block)
+    namespace ||= ''
+    current_thread = Thread.current
+    current_thread.push_resugan_context(namespace, true)
+    begin
+      block.call
+    ensure
+      context = current_thread.pop_resugan_context(true)
     end
     context
   end

data/lib/resugan/thread.rb

@@ -1,18 +1,40 @@
 class Thread
-  def push_resugan_context(namespace = '')
-    if !@resugan_context
-      @resugan_context_stack = []
+  def push_resugan_context(namespace = '', force_invoke = false)
+    @resugan_context_stack ||= []
+
+    namespace = namespace.to_s
+
+    if @resugan_context.nil? || !Resugan::Kernel.reuse_top_level_context? || force_invoke
+      @resugan_context = Resugan::Context.new(namespace)
+    elsif @resugan_context.namespace != namespace
+      @resugan_context = (@resugan_context_stack.reverse.find { |e| e.namespace == namespace }) || Resugan::Context.new(namespace)
     end
 
-    @resugan_context = Resugan::Context.new(namespace)
     @resugan_context_stack << @resugan_context
   end
 
-  def pop_resugan_context
-    @resugan_context = @resugan_context_stack.pop
+  def pop_resugan_context(force_invoke = false)
+    _resugan_context = @resugan_context_stack.pop
+    @resugan_context = @resugan_context_stack.last
+
+    # depending on option, only invoke if top level
+    if !force_invoke && Resugan::Kernel.reuse_top_level_context?
+      _resugan_context.invoke if @resugan_context_stack.find { |e| e.namespace == _resugan_context.namespace }.nil?
+    elsif
+      _resugan_context.invoke
+    end
+
+    _resugan_context
   end
 
   def resugan_context
     @resugan_context
   end
+
+  private
+
+  def clear_context
+    @resugan_context_stack = []
+    @resugan_context
+  end
 end

data/lib/resugan/version.rb

@@ -1,3 +1,3 @@
 module Resugan
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resugan
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler