wires 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b89018baa293cf418580c299f57c87efc111ff84
-  data.tar.gz: f99305a8263a8697bc87479f5abef918091182c4
+  metadata.gz: 95acdf9855630beb97ecabff1acb709c0251ad60
+  data.tar.gz: 43bd14f65cd614891e42f561bf4056245c7008c4
 SHA512:
-  metadata.gz: 0a6b46c0f31c127d9b80221ba099c6f9f8252d2e442a33828a48a0514c0f95743f6ecb03893d26497b1073c41fd12e52d9fd3bb43cce99bb031a85d08321dd4f
-  data.tar.gz: 700abbf49b2e3de5bd1396b89a7eef600100bcc865a649f3b0eb8274850fc7f7ae20205b11aa2a7b397111066a51b2f72e1ab09315f04b29e4548e4a55d4e7fe
+  metadata.gz: 474fb2acc06c4a06a19239cd56d7aa8a525bcd80d43cc1426babac2c0709343e9f009d8f7006d2ac2f8ea43f5ee18af8b00c094721c24ef9a98b0d8d97cd1614
+  data.tar.gz: 5b3122f9bd2cf537209527ab3c672c0f5bb15a8aff194dc5db14d212375299da73344b2db3b6a06ac3f155e7c52f3a977bdc41c339bfb0b926209e1170e5adfd

data/lib/wires/channel.rb

@@ -46,19 +46,23 @@ module Wires
     end
     
     # Register a proc to be triggered by an event on this channel
-    def register(events, proc)
-      
+    # Return the proc that was passed in
+    def register(*events, &proc)
       if not proc.is_a?(Proc) then raise SyntaxError, \
         "No Proc given to execute on event: #{events}" end
-      
-      # Convert all events to strings
-      events = [events] unless events.is_a? Array
-      events.flatten!
-      events.map! { |e| (e.is_a?(Class) ? e.codestring : e.to_s) }
-      events.uniq!
-      
+      _normalize_event_list(events)
       @target_list << [events, proc]
-    nil end
+      proc
+    end
+    
+    # Unregister a proc from the target list of this channel
+    # Return true if at least one matching target was unregistered, else false
+    def unregister(*events, &proc)
+      _normalize_event_list(events)
+      !!(@target_list.reject! do |e, p|
+        (proc and proc==p) and (events.map{|event| e.include? event}.all?)
+      end)
+    end
     
     # Register hook to execute before fire - can call multiple times
     def self.before_fire(retain=false, &block)
@@ -113,6 +117,14 @@ module Wires
       
     nil end
     
+    # Convert events to array of unique codestrings
+    def _normalize_event_list(events)
+      events = [events] unless events.is_a? Array
+      events.flatten!
+      events.map! { |e| (e.is_a?(Class) ? e.codestring : e.to_s) }
+      events.uniq!
+    end
+    
     def _relevant_init
       @relevant_channels = [@@channel_star]
       @my_names = (self.name.is_a? Array) ? self.name : [self.name]

data/lib/wires/convenience.rb

@@ -9,9 +9,10 @@ module Wires
       channels = [channels] unless channels.is_a? Array
       for channel in channels
         channel=Channel.new(channel) unless channel.is_a? Channel
-        channel.register(events, codeblock)
+        channel.register(*events, &codeblock)
       end
-    nil end
+      codeblock
+    end
     
     def fire(event, channel='*', **kwargs)
       channel = Channel.new(channel) unless channel.is_a? Channel

data/lib/wires/event.rb

@@ -99,8 +99,8 @@ module Wires
         for key in kwargs.keys
           att = key.to_s
           obj.instance_variable_set("@#{att}", kwargs[key])
-          class_eval("def #{att}; @#{att}; end")
-          # class_eval("def #{att}=(val); @#{att}=val; end")
+          class_eval { attr_reader att }
+          # class_eval { attr_writer att }
         end
         
         obj

metadata

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