wires 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b10bb4a5abcff971b03e3ed715141508e21059b8
-  data.tar.gz: b2e95646c96b287a988ed2f0608b7b7159bce712
+  metadata.gz: 07b54cd8c5d2566dc1df5dbbba359680e290cb44
+  data.tar.gz: 32392ed09eae7079456c55ace22840b5d504aa55
 SHA512:
-  metadata.gz: b92ae83348fd8024b84324ab06d7f73978ffc516738201519e49898dd2ebd8469529792f99dbf7e3a4d1a0d26eb49bcace82e42cf4dabad279490b9d91c8ba70
-  data.tar.gz: 788c6c1ef24826e7b94661f0b5a7db4f30bcd83584e48c41c6438bd0e900f54dd7ad441702629723783c3218b66d2883b3edc0baa5eeab7aa4b1f9a5af8e17fe
+  metadata.gz: ec3dc587a26c0373cb9b8fd9872208608b6bb5a3f2445dcfd398623ab108b1e7da3205864cb0e15d6911a982ec9ad594e5e06d3975b1bbde075a03532037a3f6
+  data.tar.gz: 5264ed0c4c84c2063e62e32876b1e40acd38587e52e9c40af05bb301ed9e381555c3d7a3fe588a4b0f48fedf149b44235b54db533d107db0054139844ca97798

data/lib/wires/hub.rb

@@ -20,8 +20,11 @@ class Hub
     # Start the Hub event loop in a new thread
     def run
       if not @running
-        @running = true
-        @thread = Thread.new() {self.send(:run_loop)};
+        @thread = Thread.new() do
+          @running = true
+          self.send(:run_loop)
+        end
+        
         at_exit { @thread.join if not $! }
       end
     nil end
@@ -59,11 +62,14 @@ class Hub
       @after_kills << func
     end
     
-    # Put x in the queue, and block until x is processed
+    # Put x in the queue, and block until x is processed (if Hub is running)
     def fire(x)
-      @queue << [x, Thread.current]
-      # yield to event loop thread until awoken by it later
-      sleep unless not @running
+      if @running # yield to event loop thread until awoken by it later
+        @queue << [x, Thread.current]
+        sleep
+      else        # don't wait if Hub isn't running - would cause lockup
+        @queue << [x, nil]
+      end
     end
     def <<(x); fire(x); end
     
@@ -87,9 +93,9 @@ class Hub
       string, event, blocking, proc = x
       Thread.new do
         begin
-          waiting_thread.wakeup unless blocking
+          waiting_thread.wakeup unless blocking or not waiting_thread
           proc.call($event = event)
-          waiting_thread.wakeup if blocking
+          waiting_thread.wakeup if blocking and waiting_thread
           
         rescue Interrupt, SystemExit => e
           @running = false

data/lib/wires/time.rb

@@ -1,75 +1,105 @@
 
 
-# class StartSchedulerEvent < Event; end
+class StartSchedulerEvent < Event; end
 
-# # A singleton class to schedule future firing of events
-# class TimeScheduler
-#   @schedule      = Array.new
-#   @schedule_lock = Mutex.new
-#   @grain         = 0.2.seconds
+# A singleton class to schedule future firing of events
+class TimeScheduler
+  @schedule      = Array.new
+  @schedule_lock = Mutex.new
+  @grain         = 0.2.seconds
   
-#   # Operate on the metaclass as a type of singleton pattern
-#   class << self
+  # Operate on the metaclass as a type of singleton pattern
+  class << self
     
-#     # Get or set the time grain from outside the class
-#     attr_accessor :grain
+    # Get or set the time grain from outside the class
+    attr_accessor :grain
     
-#     # Fire an event delayed by time value
-#     def fire(time, event, channel='*')
-#       if not time.is_a? Time
-#         raise TypeError, "Expected #{time.inspect} to be an instance of Time."
-#       end
+    # Fire an event delayed by time value
+    def fire(time, event, channel='*')
+      if not time.is_a? Time
+        raise TypeError, "Expected #{time.inspect} to be an instance of Time."
+      end
       
-#       # Under mutex, push the event into the schedule and sort
-#       @schedule_lock.synchronize do
-#         @schedule << [time, event, channel]
-#         @schedule.sort! { |a,b| a[0] <=> b[0] }
-#       end
+      # Under mutex, push the event into the schedule and sort
+      @schedule_lock.synchronize do
+        @schedule << [time, event, channel]
+        @schedule.sort! { |a,b| a[0] <=> b[0] }
+      end
       
-#     end
+    end
     
-#   private
+  private
     
-#     def main_loop
+    def main_loop
       
-#       pending = Array.new
+      pending = Array.new
       
-#       while true
+      while true
         
-#         pending.clear
-#         this_time = Time.now
+        pending.clear
+        this_time = Time.now
         
-#         # Under mutex, pull any events that are ready
-#         @schedule_lock.synchronize do
-#           while ((not @schedule.empty?) and (this_time > @schedule[0][0]))
-#             puts 'thing'
-#             pending << @schedule.shift
-#           end
-#         end
+        # Under mutex, pull any events that are ready
+        @schedule_lock.synchronize do
+          while ((not @schedule.empty?) and (this_time > @schedule[0][0]))
+            pending << @schedule.shift
+          end
+        end
         
-#         # Fire pending events
-#         pending.each { |x| Channel(x[2]).fire(x[1]) }
+        # Fire pending events
+        pending.each { |x| Channel(x[2]).fire(x[1]) }
         
-#         # Calculate the time to sleep based on the time left in the "grain"
-#         sleep [@grain-(Time.now-this_time), 0].max
+        # Calculate the time to sleep based on the time left in the "grain"
+        sleep [@grain-(Time.now-this_time), 0].max
         
-#       end
-#     end
+      end
+    end
     
-#   end
+  end
   
-#   # Use fired event to only start scheduler when Hub is running
-#   # This also gets the scheduler loop its own thread within the Hub's threads
-#   on :start_scheduler, self do; main_loop; end;
-#   Channel(self).fire(:start_scheduler)
-  
-#   # Channel(self).fire(:start_scheduler, blocking=true)
-# end
+  # Use fired event to only start scheduler when Hub is running
+  # This also gets the scheduler loop its own thread within the Hub's threads
+  on :start_scheduler, self do; main_loop; end;
+  Channel(self).fire(:start_scheduler)
+end
+
+
+# Reopen the Time class and add the fire method to enable nifty syntax like:
+# 32.minutes.from_now.fire :event
+class Time
+  def fire(*args)
+    TimeScheduler.fire(self, *args)
+  end
+end
+
 
-# # Reopen the Time class and add the fire method to enable nifty syntax like:
-# # 32.minutes.from_now.fire :event
-# class Time
-#   def fire(*args)
-#     TimeScheduler.fire(self, *args)
-#   end
-# end
+# Reopen ActiveSupport::Duration to enable nifty syntax like:
+# 32.minutes.from_now do some_stuff end
+class TimeSchedulerAnonEvent < Event; end
+class ActiveSupport::Duration
+  
+  alias :__original_since :since
+  def since(*args, &block)
+    if block
+      on :time_scheduler_anon, block.object_id do block.call end
+      __original_since(*args).fire :time_scheduler_anon, block.object_id
+      nil
+    else
+      __original_since(*args)
+    end
+  end
+  alias :from_now :since
+  
+  alias :__original_ago :ago
+  def ago(*args, &block)
+    if block
+      on :time_scheduler_anon, block.object_id do block.call end
+      __original_ago(*args).fire :time_scheduler_anon, block.object_id
+      nil
+    else
+      __original_ago(*args)
+    end
+  end
+  alias :until :ago
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Joe McIlvain
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-06-27 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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