lib/erlectricity/receiver.rb in mojombo-erlectricity-0.2.1 vs lib/erlectricity/receiver.rb in mojombo-erlectricity-1.0.0

@@ -1,79 +1,69 @@
 module Erlectricity
-class Receiver
-  
-  attr_accessor :port
-  attr_accessor :parent
-  attr_accessor :matchers
-  
-  RECEIVE_LOOP = Object.new
-  NO_MATCH = Object.new
-  
-  def initialize(port, parent=nil, &block)
-    @port = port
-    @parent = parent
-    @matchers = []
-    block.call self if block
-  end
-  
-  def process(arg)
-    matcher = @matchers.find{|r| r.matches? arg}
+  class Receiver
+    attr_accessor :port
+    attr_accessor :parent
+    attr_accessor :matchers
 
-    if(matcher)      
-      port.restore_skipped
-      matcher.run arg
-    else
-      NO_MATCH
+    RECEIVE_LOOP = Object.new
+    NO_MATCH = Object.new
+
+    def initialize(port, parent = nil, &block)
+      @port = port
+      @parent = parent
+      @matchers = []
+      block.call(self) if block
     end
-  end
-  
-  def when(*args, &block)
-    args = args.map do |a| 
-      case a
-      when Condition then a 
-      when Class then TypeCondition.new(a)
-      else StaticCondition.new(a)
+
+    def process(arg)
+      matcher = @matchers.find { |r| r.matches?(arg) }
+
+      if matcher
+        port.restore_skipped
+        matcher.run(arg)
+      else
+        NO_MATCH
       end
     end
-    
-    args = args.first if args.length == 1
-    @matchers << Matcher.new(self, args, block)
-  end
-  
-  def run
-    
-    loop do
-      msg = port.receive
-      return if msg.nil?
-      
-      case result = process(msg)
-      when RECEIVE_LOOP then next
-      when NO_MATCH
-        port.skipped << msg
-        next
-      else
-        break result
+
+    def when(arg, &block)
+      condition = Condition.for(arg)
+      @matchers << Matcher.new(self, condition, block)
+    end
+
+    def run
+      loop do
+        msg = port.receive
+        return if msg.nil?
+
+        case result = process(msg)
+          when RECEIVE_LOOP then next
+          when NO_MATCH
+            port.skipped << msg
+            next
+          else
+            break result
+        end
       end
     end
-  end
-  
-  def receive(&block)
-    Receiver.new(port, self, &block).run
-  end
 
-  def receive_loop
-    RECEIVE_LOOP
+    def receive(&block)
+      Receiver.new(port, self, &block).run
+    end
+
+    def receive_loop
+      RECEIVE_LOOP
+    end
+
+    def send!(term)
+      port.send(term)
+    end
   end
-  
-  def send!(*term)
-    term = term.first if term.length == 1
-    port.send(term)
-  end
 end
-end
 
-
 module Kernel
-  def receive(input=STDIN, output=STDOUT, &block)
+  def receive(input = nil, output = nil, &block)
+    input ||= IO.new(3)
+    output ||= IO.new(4)
     Erlectricity::Receiver.new(Erlectricity::Port.new(input, output), nil, &block).run
   end
 end
\ No newline at end of file