wires 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db21e3f9e121e59a5bb749f91bfc99671408c69
-  data.tar.gz: e05678e737f152a47a9ccd3e7b14214d2ac61f4b
+  metadata.gz: fe770b52bcfa8f3d4ebd9cdbc9474495cf518d40
+  data.tar.gz: 504f5acec60a51e872a21e01730f0e624e6ce0af
 SHA512:
-  metadata.gz: fb026f33a976e5c66d0da73e28bf5ac47deae08b8c1589df176bf70c471c4ea63b8d281777a4416b883258a91e820aeda776db7df0b167441b09b1a5f180c3cf
-  data.tar.gz: 03fbb2d4b977391eecfc75d4f3dfb259dd57b9345bd6c96e050020af2917dac2ad6ced83c89b6ddbb4b12b06b4e720ad611a9e61865c5f00d3b581e975169ce5
+  metadata.gz: 1e2e093f083689a43817e88ca3eec0dd013d513eb072c2f95b4fa98131c23748e61f19830dbe949d8560e91c706a069859f5813d256ed793295bba039bfbb96f
+  data.tar.gz: 2bfa6a3d6fe622e208ea61b41ae7dc40ca6ed3bb20dba0c07a4eab0e916301f1a4a13e760eb89857079f57e524c3794d25f5ea07196d047df053522152542f28

data/lib/wires.rb

@@ -8,4 +8,6 @@ require 'wires/expect_type'
 require 'wires/event'
 require 'wires/hub'
 require 'wires/channel'
-require 'wires/time'
+require 'wires/time'
+
+include Wires::Convenience # require 'wires/clean' to uninclude Convenience

data/lib/wires/channel.rb

@@ -1,24 +1,30 @@
 
-def on(events, channels='*', &codeblock)
-  channels = [channels] unless channels.is_a? Array
-  for channel in channels
-    Wires::Channel.new(channel).register(events, codeblock)
+module Wires
+  module Convenience
+    
+    def on(events, channels='*', &codeblock)
+      channels = [channels] unless channels.is_a? Array
+      for channel in channels
+        Wires::Channel.new(channel).register(events, codeblock)
+      end
+    nil end
+    
+    def fire(event, channel='*') 
+      Wires::Channel.new(channel).fire(event, blocking:false)
+    nil end
+    
+    def fire_and_wait(event, channel='*') 
+      Wires::Channel.new(channel).fire(event, blocking:true)
+    nil end
+    
+    def Channel(*args) Wires::Channel.new(*args) end
+    
   end
-nil end
-
-
-def fire(event, channel='*') 
-  Wires::Channel.new(channel).fire(event, blocking:false)
-nil end
+end
 
-def fire_and_wait(event, channel='*') 
-  Wires::Channel.new(channel).fire(event, blocking:true)
-nil end
-
-
-def Channel(*args) Wires::Channel.new(*args) end
 
 module Wires
+  
   class Channel
     
     attr_reader :name
@@ -29,7 +35,6 @@ module Wires
       @target_list = Set.new
     nil end
     
-    
     # Redefine this class method to use an alternate Hub
     def self.hub; Hub; end
     # Don't redefine this instance method!
@@ -74,6 +79,7 @@ module Wires
     
     # Fire an event on this channel
     def fire(event, blocking:false)
+      backtrace = caller
       
       # Create an instance object from one of several acceptable input forms
       event = Event.new_from event
@@ -82,7 +88,7 @@ module Wires
       for chan in relevant_channels()
         for target in chan.target_list
           for string in target[0] & event.class.codestrings
-            self.class.hub.spawn(event, string, *target[1], blocking)
+            self.class.hub.spawn(event, string, *target[1], blocking, backtrace)
       end end end
       
     nil end
@@ -108,5 +114,7 @@ module Wires
       end
       return relevant.uniq
     end
+    
   end
+  
 end

data/lib/wires/clean.rb

@@ -0,0 +1,9 @@
+require 'wires'
+
+class << self
+  target_owner = Wires::Convenience
+  target_owner.instance_methods(false)
+              .select { |sym| respond_to?(sym) }
+              .select { |sym| method(sym).owner==target_owner }
+              .each   { |sym| undef_method sym }
+end

data/lib/wires/event.rb

@@ -97,6 +97,7 @@ module Wires
         obj = super
         
         kwargs = args[-1].is_a?(Hash) ? args.pop : Hash.new
+        kwargs[:kwargs] = kwargs.clone.freeze
         kwargs[:args] = args
         kwargs[:codeblock] = block if block
         for key in kwargs.keys

data/lib/wires/hub.rb

@@ -1,5 +1,4 @@
 
-#TODO: Allow custom grain times
 module Wires
   # An Event Hub. Event/proc associations come in, and the procs 
   # get called in new threads in the order received
@@ -33,12 +32,8 @@ module Wires
         
         @please_finish_all = false
         
-        @on_neglect = Proc.new do |args|
-          $stderr.puts "#{self} neglected to spawn task: #{args.inspect}"
-        end
-        @on_neglect_done = Proc.new do |args|
-          $stderr.puts "#{self} finally spawned neglected task: #{args.inspect}"
-        end
+        reset_neglect_procs
+        reset_handler_exception_proc
         
         at_exit { (sleep 0.05 until dead?) unless $! }
         
@@ -101,22 +96,45 @@ module Wires
       
       def on_neglect(&block)
         @on_neglect=block
-      end
+      nil end
       def on_neglect_done(&block)
         @on_neglect_done=block
+      nil end
+      def on_handler_exception(&block)
+        @on_handler_exception=block
+      end
+      
+      def reset_neglect_procs
+        @on_neglect = Proc.new do |args|
+          $stderr.puts "#{self} neglected to spawn task: #{args.inspect}"
+        end
+        @on_neglect_done = Proc.new do |args|
+          $stderr.puts "#{self} finally spawned neglected task: #{args.inspect}"
+        end
+      nil end
+      
+      def reset_handler_exception_proc
+        @on_handler_exception = Proc.new { raise }
       end
       
       # Spawn a task
-      def spawn(*args) # :args: event, ch_string, proc, blocking
+      def spawn(*args) # :args: event, ch_string, proc, blocking, fire_bt
+
         @spawning_count_lock.synchronize { @spawning_count += 1 }
         
         return neglect(*args) if dead?
         
-        event, ch_string, proc, blocking = *args
+        event, ch_string, proc, blocking, fire_bt = *args
+        *exc_args = event, ch_string, fire_bt
         
         # If blocking, run the proc in this thread
         if blocking
-          proc.call(event, ch_string)
+          begin
+            proc.call(event, ch_string)
+          rescue Exception => exc
+            unhandled_exception(exc, *exc_args)
+          end
+          
           return :done
         end
         
@@ -133,10 +151,17 @@ module Wires
             raise ThreadError if (@max_child_threads) and \
                                  (@max_child_threads <= @child_threads.size)
             # Start the new child thread; follow with chain of neglected tasks
-            new_thread = Thread.new { proc.call(event, ch_string); \
-                                      spawn_neglected_task_chain }
+            new_thread = Thread.new do
+              begin
+                proc.call(event, ch_string)
+                spawn_neglected_task_chain
+              rescue Exception => exc
+                unhandled_exception(exc, *exc_args)
+              end
+            end
+            
           # Capture ThreadError from either OS or user-set limitation
-          rescue ThreadError; return neglect(*args); end
+          rescue ThreadError; return neglect(*args) end
           
           @child_threads << new_thread
           return new_thread
@@ -171,11 +196,21 @@ module Wires
       nil end
       
     private
+    
+      # Send relevant data to a custom exception handler
+      def unhandled_exception(exception, event, ch_string, fire_bt)
+        
+        class << exception;  attr_reader :fire_backtrace; end
+        exception.instance_variable_set(:@fire_backtrace, fire_bt.dup)
+        
+        @on_handler_exception.call(exception, event, ch_string)
+        
+      end
       
       # Temporarily neglect a task until resources are available to run it
       def neglect(*args)
         @neglected_lock.synchronize do
-          @on_neglect.call(args)
+          @on_neglect.call(*args)
           @neglected << args
         end
       false end
@@ -187,7 +222,7 @@ module Wires
           ((@neglected.shift)[0...-1]<<true) # Call with blocking
         end
         spawn(*args)
-        @on_neglect_done.call(args)
+        @on_neglect_done.call(*args)
         spawn_neglected_task_chain
       nil end
       
@@ -200,7 +235,7 @@ module Wires
           end
           break if cease
           spawn(*args)
-          @on_neglect_done.call(args)
+          @on_neglect_done.call(*args)
         end
       nil end
       

data/lib/wires/time.rb

@@ -1,5 +1,4 @@
 
-
 module Wires
   
   class TimeSchedulerAnonEvent  < Event; end
@@ -240,9 +239,15 @@ class ActiveSupport::Duration
   
 end
 
-def fire_every(interval, event, channel='*', **kwargs)
-  Wires::TimeScheduler << \
-    Wires::TimeSchedulerItem.new(self, event, channel, **kwargs)
+module Wires
+  module Convenience
+    
+    def fire_every(interval, event, channel='*', **kwargs)
+      Wires::TimeScheduler << \
+        Wires::TimeSchedulerItem.new(self, event, channel, **kwargs)
+    end
+    
+  end
 end
 
 # TODO: Repeatable event sugar?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Joe McIlvain
@@ -66,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: starkfish
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An asynchronous (threaded) event routing framework in Ruby. Patch your
   objects together with wires. Inspired by the python 'circuits' framework.
 email: joe.eli.mac@gmail.com
@@ -77,6 +105,7 @@ files:
 - lib/wires/time.rb
 - lib/wires/hub.rb
 - lib/wires/expect_type.rb
+- lib/wires/clean.rb
 - lib/wires/channel.rb
 - lib/wires/event.rb
 - LICENSE