wires 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 358d9d6b0b4094ed729bc94b80a5af81d2b6db25
-  data.tar.gz: 33eb37077d42bb24312b0a56ad910b4360396ee7
+  metadata.gz: b89018baa293cf418580c299f57c87efc111ff84
+  data.tar.gz: f99305a8263a8697bc87479f5abef918091182c4
 SHA512:
-  metadata.gz: ffd7d42fa653093a03c07528487629192a1a8007733e300a8aac1eafb52746beccb10362b9ef215af400f81e538e5768a49bf8b17af07659d98ef73f10e53d0d
-  data.tar.gz: e99e2c37b935818c4641a2a381e19d9774846563b5f57adfd1f6baff51d87462c3363f36a365588a25cf9b6a1e3a25e2d96baafd9a0792d3acc5346032f84342
+  metadata.gz: 0a6b46c0f31c127d9b80221ba099c6f9f8252d2e442a33828a48a0514c0f95743f6ecb03893d26497b1073c41fd12e52d9fd3bb43cce99bb031a85d08321dd4f
+  data.tar.gz: 700abbf49b2e3de5bd1396b89a7eef600100bcc865a649f3b0eb8274850fc7f7ae20205b11aa2a7b397111066a51b2f72e1ab09315f04b29e4548e4a55d4e7fe

data/lib/wires/channel.rb

@@ -5,11 +5,9 @@ module Wires
     
     attr_reader :name
     attr_reader :target_list
+    attr_reader :relevant_channels
     
-    def initialize(name)
-      @name = name
-      @target_list = Set.new
-    nil end
+    def inspect; "Channel(#{name.inspect})"; end
     
     # Redefine this class method to use an alternate Hub
     def self.hub; Hub; end
@@ -33,6 +31,20 @@ module Wires
       end
     end
     
+    def initialize(name)
+      @name = name
+      @target_list = Set.new
+      unless @@channel_hash.empty?
+        _relevant_init
+        @@channel_hash.values.each do |c| 
+          c.send(:_test_relevance, self)
+          _test_relevance c
+        end
+      else
+        @relevant_channels = []
+      end
+    end
+    
     # Register a proc to be triggered by an event on this channel
     def register(events, proc)
       
@@ -77,6 +89,8 @@ module Wires
     # Fire an event on this channel
     def fire(event, blocking:false)
       
+      raise *@not_firable if @not_firable
+      
       backtrace = caller
       
       # Create an instance object from one of several acceptable input forms
@@ -99,38 +113,41 @@ module Wires
       
     nil end
     
-    def relevant_channels
-      return @@channel_hash.values if self==channel_star
-        
-      relevant = [channel_star]
-      my_names = (self.name.is_a? Array) ? self.name : [self.name]
-      my_names.map {|o| (o.respond_to? :channel_name) ? o.channel_name : o.to_s}
+    def _relevant_init
+      @relevant_channels = [@@channel_star]
+      @my_names = (self.name.is_a? Array) ? self.name : [self.name]
+      @my_names.map {|o| (o.respond_to? :channel_name) ? o.channel_name : o.to_s}
               .flatten(1)
+      _test_relevance self
+    end
+    
+    def _test_relevance(other_chan)
+      if self==@@channel_star
+        @relevant_channels << other_chan
+        return
+      end
       
-      for my_name in my_names
+      for my_name in @my_names
         
-        if my_name.is_a?(Regexp) then raise TypeError,
+        if my_name.is_a?(Regexp) then 
+          @not_firable = [TypeError,
           "Cannot fire on Regexp channel: #{self.name}."\
-          "  Regexp channels can only used in event handlers." end
-        
-        for other_chan in @@channel_hash.values
-          
-          other_name = other_chan.name
-          other_name = (other_name.respond_to? :channel_name) ? \
-                          other_name.channel_name : other_name
-          
-          relevant << other_chan if \
-            if other_name.is_a?(Regexp)
-              my_name =~ other_name
-            else
-              my_name.to_s == other_name.to_s
-            end
-            
+          "  Regexp channels can only used in event handlers."]
+          return
         end
         
+        other_name = other_chan.name
+        other_name = (other_name.respond_to? :channel_name) ? \
+                        other_name.channel_name : other_name
+        
+        @relevant_channels << other_chan if \
+          !@relevant_channels.include?(other_chan) and \
+          if other_name.is_a?(Regexp)
+            my_name =~ other_name
+          else
+            my_name.to_s == other_name.to_s
+          end
       end
-      
-      return relevant.uniq
     end
     
     # Compare matching with another Channel

data/lib/wires/event.rb

@@ -42,9 +42,10 @@ module Wires
       
       # Convert class <ClassNameEvent> to string "class_name"
       def codestring(cls=self)
-        File.basename cls.to_s
-        .underscore
-        .gsub(/_event$/, "")
+        @codestring ||= \
+          File.basename cls.to_s
+            .underscore
+            .gsub(/_event$/, "")
       end
       
       # List of codestrings associated with this event and ancestors

data/lib/wires/time.rb

@@ -40,7 +40,7 @@ module Wires
     def active?;        @active                                      end
     def inactive?;      not @active                                  end
     
-    def ready?(at_time=Time.now);  @active and (at_time >= @time)    end
+    def ready?(at_time=Time.now); @active and at_time and (at_time>=@time) end
     
     def time_until;    (@active ? [(Time.now - @time), 0].max : nil) end
     
@@ -92,6 +92,8 @@ module Wires
     # Operate on the metaclass as a type of singleton pattern
     class << self
       
+      attr_accessor :grain
+      
       # Add an event to the schedule
       def add(*args)
         new_item = (args.first.is_a? TimeSchedulerItem) ?
@@ -121,18 +123,20 @@ module Wires
       
       def schedule_add(new_item)
         
-        if new_item.ready?
-          loop do
-            new_item.fire
-            break unless new_item.ready?
-          end
-        end
-        
-        if new_item.ready?(@next_pass)
-          Thread.new do
+        if @keepgoing
+          if new_item.ready?
             loop do
-              new_item.fire_when_ready(blocking:true)
-              break unless new_item.ready?(@next_pass)
+              new_item.fire
+              break unless new_item.ready?
+            end
+          end
+          
+          if new_item.ready?(@next_pass)
+            Thread.new do
+              loop do
+                new_item.fire_when_ready(blocking:true)
+                break unless new_item.ready?(@next_pass)
+              end
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport-core-ext