wires 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95acdf9855630beb97ecabff1acb709c0251ad60
-  data.tar.gz: 43bd14f65cd614891e42f561bf4056245c7008c4
+  metadata.gz: 486d20e1c2995dea50118010dd60c4b9c8a5bbd8
+  data.tar.gz: d93b97c600da203bfcabd55781b80f2e6b0190ab
 SHA512:
-  metadata.gz: 474fb2acc06c4a06a19239cd56d7aa8a525bcd80d43cc1426babac2c0709343e9f009d8f7006d2ac2f8ea43f5ee18af8b00c094721c24ef9a98b0d8d97cd1614
-  data.tar.gz: 5b3122f9bd2cf537209527ab3c672c0f5bb15a8aff194dc5db14d212375299da73344b2db3b6a06ac3f155e7c52f3a977bdc41c339bfb0b926209e1170e5adfd
+  metadata.gz: 204086554b9b668d2ca5d559d99e3abf0173c23de146fb7232d80c9cb728e2f2c0de2dd82cd8ac619e0a5bc010beaf6c6a83e1b0d09e5682b170f418cd8cf598
+  data.tar.gz: f392ff623d48525508a535ea280d1924ea214f3a9276c1351a7d68d661ee78f70a164185be9585b7f560e0310f47f8ea3aa2dc23a4a59a338cf79d65381d04a8

data/lib/wires/channel.rb

@@ -64,31 +64,18 @@ module Wires
       end)
     end
     
-    # Register hook to execute before fire - can call multiple times
-    def self.before_fire(retain=false, &block)
-      @before_fires ||= []
-      @before_fires << [block, retain]
-    nil end
-    
-    # Register hook to execute after fire - can call multiple times
-    def self.after_fire(retain=false, &block)
-      @after_fires ||= []
-      @after_fires << [block, retain]
-    nil end
-    
-    def self.run_hooks(hooks_sym, *exc_args)
-      hooks = self.instance_variable_get(hooks_sym.to_sym)
-      for hook in hooks
-        proc, retain = hook
-        proc.call(*exc_args)
-      end if hooks
-    nil end
-    
-    def self.clear_hooks(hooks_sym, force=false)
-      hooks = self.instance_variable_get(hooks_sym.to_sym)
-      self.instance_variable_set(hooks_sym.to_sym,
-        (force ? [] : hooks.select{|h| h[1]})) if hooks
-    nil end
+    # Add hook methods
+    class << self
+      include Hooks
+      
+      def before_fire(*args, &proc)
+        add_hook(:@before_fire, *args, &proc)
+      end
+      
+      def after_fire(*args, &proc)
+        add_hook(:@after_fire, *args, &proc)
+      end
+    end
     
     # Fire an event on this channel
     def fire(event, blocking:false)
@@ -100,7 +87,7 @@ module Wires
       # Create an instance object from one of several acceptable input forms
       event = Event.new_from event
       
-      self.class.run_hooks(:@before_fires, event, self)
+      self.class.run_hooks(:@before_fire, event, self)
       
       # Fire to each relevant target on each channel
       for chan in relevant_channels()
@@ -113,10 +100,15 @@ module Wires
                                  backtrace) # captured backtrace
       end end end
       
-      self.class.run_hooks(:@after_fires, event, self)
+      self.class.run_hooks(:@after_fire, event, self)
       
     nil end
     
+    # Fire a blocking event on this channel
+    def fire_and_wait(event)
+      self.fire(event, blocking:true)
+    end
+    
     # Convert events to array of unique codestrings
     def _normalize_event_list(events)
       events = [events] unless events.is_a? Array
@@ -168,8 +160,8 @@ module Wires
     end
     
     hub.before_kill(true) do
-      self.clear_hooks(:@before_fires)
-      self.clear_hooks(:@after_fires)
+      self.clear_hooks(:@before_fire)
+      self.clear_hooks(:@after_fire)
     end
     
   end

data/lib/wires/hub.rb

@@ -76,25 +76,25 @@ module Wires
         sleep 0 until request_state :dead unless (flags.include? :nonblocking)
       nil end
       
-      # Register hook to execute before run - can call multiple times
-      def before_run(retain=false, &block)
-        @before_runs << [block, retain]
-      nil end
+      # Add hook methods
+      include Hooks
       
-      # Register hook to execute after run - can call multiple times
-      def after_run(retain=false, &block)
-        @after_runs << [block, retain]
-      nil end
+      def before_run(*args, &proc)
+        add_hook(:@before_run, *args, &proc)
+      end
       
-      # Register hook to execute before kill - can call multiple times
-      def before_kill(retain=false, &block)
-        @before_kills << [block, retain]
-      nil end
+      def after_run(*args, &proc)
+        add_hook(:@after_run, *args, &proc)
+      end
+      
+      def before_kill(*args, &proc)
+        add_hook(:@before_kill, *args, &proc)
+      end
+      
+      def after_kill(*args, &proc)
+        add_hook(:@after_kill, *args, &proc)
+      end
       
-      # Register hook to execute after kill - can call multiple times
-      def after_kill(retain=false, &block)
-        @after_kills << [block, retain]
-      nil end
       
       def on_neglect(&block)
         @on_neglect=block
@@ -243,35 +243,6 @@ module Wires
         end
       nil end
       
-      # Flush/run queue of [proc, retain]s, retaining those with retain==true
-      def run_hooks(hooks, *args)
-        retained = Queue.new
-        while not hooks.empty?
-          proc, retain = hooks.shift
-          retained << [proc, retain] if retain
-          proc.call(*args)
-        end
-        while not retained.empty?
-          hooks << retained.shift
-        end
-      nil end
-      
-      # Run queue of [proc, retain]s, retaining all
-      def run_fire_hooks(hooks, *args)
-        for hook in hooks
-          proc, retain = hook
-          proc.call(*args)
-        end
-      nil end
-      
-      # Clear queue of [proc, retain]s, retaining those with retain==true
-      def clear_fire_hooks(hooks, *args)
-        hooks.select! do |hook|
-          proc, retain = hook
-          retain
-        end
-      nil end
-      
     end
     
     
@@ -299,20 +270,18 @@ module Wires
         
         declare_state :dead do
           transition_to :alive do
-            before { run_hooks @before_runs }
-            after  { run_hooks @after_runs }
+            before { flush_hooks :@before_run }
+            after  { flush_hooks :@after_run }
           end
         end
         
         declare_state :alive do
           transition_to :dead do
-            before { run_hooks @before_kills }
+            before { flush_hooks :@before_kill }
             before { purge_neglected }
             before { join_children if @please_finish_all }
             after  { @please_finish_all = false }
-            after  { run_hooks @after_kills }
-            after  { clear_fire_hooks @before_fires }
-            after  { clear_fire_hooks @after_fires  }
+            after  { flush_hooks :@after_kill }
           end
         end
         

data/lib/wires/util/hooks.rb

@@ -0,0 +1,56 @@
+
+module Wires
+  module Hooks
+    
+    # Register a hook - can be called multiple times if retain is true
+    def add_hook(hooks_sym, retain=false, &proc)
+      hooks = instance_variable_get(hooks_sym.to_sym)
+      if hooks
+        hooks << [proc, retain]
+      else
+        instance_variable_set(hooks_sym.to_sym, [[proc, retain]])
+      end
+      proc
+    end
+    
+    # Remove a hook by proc reference
+    def remove_hook(hooks_sym, &proc)
+      hooks = instance_variable_get(hooks_sym.to_sym)
+      return unless hooks
+      hooks.reject! {|h| h[0]==proc}
+    end
+    
+    # Run all hooks, deleting those not marked for retention
+    def run_hooks(hooks_sym, *exc_args)
+      hooks = instance_variable_get(hooks_sym.to_sym)
+      return unless hooks
+      for hook in hooks
+        proc, retain = hook
+        proc.call(*exc_args)
+      end
+    nil end
+    
+    # Clear hooks not marked for retention (or all hooks if force)
+    def clear_hooks(hooks_sym, force=false)
+      hooks = instance_variable_get(hooks_sym.to_sym)
+      return unless hooks
+      (force ? hooks.clear : hooks.select!{|h| h[1]})
+    nil end
+    
+    # Flush/run all hooks, keeping only those marked for retention
+    def flush_hooks(hooks_sym, *exc_args)
+      hooks = instance_variable_get(hooks_sym.to_sym)
+      return unless hooks
+      retained = Queue.new
+      while not hooks.empty?
+        proc, retain = hooks.shift
+        retained << [proc, retain] if retain
+        proc.call(*exc_args)
+      end
+      while not retained.empty?
+        hooks << retained.shift
+      end
+    end
+    
+  end
+end

data/lib/wires.rb

@@ -4,7 +4,9 @@ require 'active_support/core_ext' # Convenience functions from Rails
 require 'threadlock' # Easily add re-entrant lock to instance methods
 require 'hegemon'    # State machine management
 
-require 'wires/expect_type'
+require 'wires/util/expect_type'
+require 'wires/util/hooks'
+
 require 'wires/event'
 require 'wires/hub'
 require 'wires/channel'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport-core-ext
@@ -105,8 +105,9 @@ files:
 - lib/wires/time.rb
 - lib/wires/hub.rb
 - lib/wires/core_ext.rb
-- lib/wires/expect_type.rb
 - lib/wires/clean.rb
+- lib/wires/util/expect_type.rb
+- lib/wires/util/hooks.rb
 - lib/wires/convenience.rb
 - lib/wires/channel.rb
 - lib/wires/event.rb