wires 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6ef896589b7b29bffcde2800b2a0205c993bf70
-  data.tar.gz: 849f9147f51646922d9148fdae2d592dc3998fc2
+  metadata.gz: cb41c46e8299e103ed2d71b4221c33f3eff95da9
+  data.tar.gz: b3a0e06ef17d3291ad4afb5ade9b1391cc889967
 SHA512:
-  metadata.gz: a27d75fe9e4020189e732e04e93cc6e22493390b7b28ebe616d31420a97d18e1a3c56a43b940a2030f75dfba27e396ea0762965dad59f47496bc0f2d8c40b6d9
-  data.tar.gz: ba4092b89082a0fd4f6da1af2aa7664eca682a6017e6cb5ebaa00b7d8e8804305b6f1f26107fb2eba318807456a08353f09ca5c34b7d5feef88ed316b022adec
+  metadata.gz: 9654a5fa03c9dfb448c07ce179b37165d8e6754e568ff758404e2d881c4ed8f7fe9f5e049a17ac89ae572c2d9986e61f8373471725ee678f45ce231fb571c06e
+  data.tar.gz: 98b4ae7b01efba5a6a9cf005be0f3ab4ee48569ba9e38957df8d034cc30e1073d208ad2a71436de88ae1177a4193abfda765d91aac712a5c9163fddb508e3399

data/lib/wires/base.rb

@@ -56,3 +56,4 @@ loader.call 'base/channel/sync_helper'
 loader.call 'base/time_scheduler_item'
 loader.call 'base/time_scheduler'
 loader.call 'base/convenience'
+loader.call 'base/actor'

data/lib/wires/base/convenience.rb

@@ -3,12 +3,12 @@ module Wires.current_network::Namespace
 
   module Convenience
     
-    def on(events, channels=self, &codeblock)
+    def on(events, channels=self, **kwargs, &codeblock)
       channels = [channels] unless channels.is_a? Array
       channels.each do |channel|
         channel=Channel.new(channel) unless channel.is_a? Channel
         
-        channel.register(*events, &codeblock)
+        channel.register(*events, **kwargs, &codeblock)
       end
       codeblock
     end

data/lib/wires/core_ext/numeric.rb

@@ -1,35 +1,45 @@
 
-# Add Numeric => Numeric time-factor converters
-{
-  [:second,     :seconds]    => '1',
-  [:minute,     :minutes]    => '60',
-  [:hour,       :hours]      => '3600',
-  [:day,        :days]       => '24.hours',
-  [:week,       :weeks]      => '7.days',
-  [:fortnight,  :fortnights] => '2.weeks',
-}.each_pair do |k,v|
-  ::Numeric.class_eval <<-CODE
-    def #{k.last}
-      self * #{v}
-    end
-    alias #{k.first.inspect} #{k.last.inspect}
-  CODE
-end
-
-
-# Add Numeric => Time converters with implicit anonymous fire
-{
-  [:from_now, :since] => '+',
-  [:until,    :ago]   => '-',
-}.each_pair do |k,v|
-  ::Numeric.class_eval <<-CODE
-    def #{k.last}(time = ::Time.now, &block)
-      if block
-        Wires::Channel[block.object_id].register :time_scheduler_anon, &block
-        self.#{k.last}(time).fire(:time_scheduler_anon, block.object_id)
+module Wires.current_network::Namespace
+  
+  module CoreExt
+    module Numeric
+      
+      # Add Numeric => Numeric time-factor converters
+      {
+        [:second,     :seconds]    => 1,
+        [:minute,     :minutes]    => 60,
+        [:hour,       :hours]      => 60*60,
+        [:day,        :days]       => 60*60*24,
+        [:week,       :weeks]      => 60*60*24*7,
+        [:fortnight,  :fortnights] => 60*60*24*7*2,
+      }.each_pair do |symbols, multiplier|
+        define_method(symbols.last) { self * multiplier }
+        
+        alias_method symbols.first, symbols.last
+      end
+      
+      # Add Numeric => Time converters with implicit anonymous fire
+      {
+        [:from_now, :since] => :+,
+        [:until,    :ago]   => :-,
+      }.each_pair do |symbols, operator|
+        channel = Channel[TimeScheduler]
+        
+        define_method symbols.last do |time = ::Time.now, &block|
+          if block
+            event = Event.new block: block, type: :time_scheduler_anon
+            channel.register event, &block
+            self.send(symbols.last, time).fire(event, channel)
+          end
+          time.send operator, self
+        end
+        
+        alias_method symbols.first, symbols.last
       end
-      time #{v} self
+      
     end
-    alias #{k.first.inspect} #{k.last.inspect}
-  CODE
+  end
+  
+  ::Numeric.prepend CoreExt::Numeric
+  
 end

data/lib/wires/core_ext/symbol.rb

@@ -1,11 +1,20 @@
 
-# Add implicit conversion of symbol into an event
-class ::Symbol
-  # Create a Wires::Event from any symbol with a payload of arguments
-  def [](*args, **kwargs, &block)
-    Wires::Event.new(*args, **kwargs, type:self, &block)
+module Wires.current_network::Namespace
+  
+  module CoreExt
+    module Symbol
+      
+      # Create a Wires::Event from any symbol with a payload of arguments
+      def [](*args, **kwargs, &block)
+        Event.new(*args, **kwargs, type:self, &block)
+      end
+      
+      # Convert to a Wires::Event; returns an empty event with type:self
+      def to_wires_event; self.[]; end
+      
+    end
   end
   
-  # Convert to a Wires::Event; returns an empty event with type:self
-  def to_wires_event; self.[]; end
+  ::Symbol.prepend CoreExt::Symbol
+  
 end

data/lib/wires/core_ext/time.rb

@@ -1,7 +1,17 @@
 
-# Add Time#fire for timed firing of events
-class ::Time
-  def fire(events, channel, **kwargs)
-    Wires::TimeScheduler.add(self, events, channel, **kwargs)
+module Wires.current_network::Namespace
+  
+  module CoreExt
+    module Time
+      
+      # Timed firing of events
+      def fire(events, channel, **kwargs)
+        TimeScheduler.add(self, events, channel, **kwargs)
+      end
+      
+    end
   end
+  
+  ::Time.prepend CoreExt::Time
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: threadlock
@@ -110,6 +110,34 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.99'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.99'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: fivemat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fivemat
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: yard-wires
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="