erlectricity 0.2.1 → 1.0.0

data/lib/erlectricity.rb

@@ -1,19 +1,18 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. ext])
 
+require 'stringio'
 
 require 'erlectricity/constants'
-
 require 'erlectricity/types/new_reference'
 require 'erlectricity/types/pid'
 require 'erlectricity/types/function'
 require 'erlectricity/types/list'
 
-
 begin
-  #try to load the decoder C extension
+  # try to load the decoder C extension
   require 'decoder'
 rescue LoadError
-  #load the pure ruby instead
+  # fall back on the pure ruby version
   require 'erlectricity/decoder'
 end
 
@@ -21,14 +20,12 @@ require 'erlectricity/encoder'
 
 require 'erlectricity/port'
 require 'erlectricity/matcher'
-
 require 'erlectricity/condition'
+require 'erlectricity/conditions/boolean'
 require 'erlectricity/conditions/hash'
 require 'erlectricity/conditions/static'
 require 'erlectricity/conditions/type'
-
 require 'erlectricity/receiver'
-
 require 'erlectricity/errors/erlectricity_error'
 require 'erlectricity/errors/decode_error'
 require 'erlectricity/errors/encode_error'

data/lib/erlectricity/condition.rb

@@ -1,50 +1,65 @@
 module Erlectricity
   class Condition
-  
+    def self.for(a)
+      case a
+        when Condition then a
+        when Class then TypeCondition.new(a)
+        else StaticCondition.new(a)
+      end
+    end
+
     def initialize
     end
-  
+
     def binding_for(arg)
       nil
     end
-  
+
     def satisfies?(arg)
       false
     end
-    
+
     alias === satisfies?
   end
 
   module Conditions
-    def atom()
+    def atom
       TypeCondition.new(Symbol)
     end
-  
-    def any()
+
+    def any
       TypeCondition.new(Object)
     end
-  
-    def number()
+
+    def number
       TypeCondition.new(Fixnum)
     end
-  
-    def pid()
+
+    def pid
       TypeCondition.new(Erlectricity::Pid)
     end
-  
-    def string()
-      TypeCondition.new(String)   
+
+    def ref
+      TypeCondition.new(Erlectricity::NewReference)
+    end
+
+    def string
+      TypeCondition.new(String)
     end
-  
-    def list()
-      TypeCondition.new(Array) 
+
+    def list
+      TypeCondition.new(Array)
     end
-  
-    def hash()
+
+    def hash
       HashCondition.new()
     end
+
+    def boolean
+      BooleanCondition.new()
+    end
   end
-  
+
   extend Conditions
 end
 

data/lib/erlectricity/conditions/boolean.rb

@@ -0,0 +1,11 @@
+module Erlectricity
+  class BooleanCondition < Condition
+    def satisfies?(arg)
+      [TrueClass, FalseClass].include?(arg.class)
+    end
+
+    def binding_for(arg)
+      arg
+    end
+  end
+end

data/lib/erlectricity/conditions/hash.rb

@@ -1,14 +1,13 @@
 module Erlectricity
-class HashCondition < Condition
+  class HashCondition < Condition
+    def satisfies?(arg)
+      return false unless arg.class == Array
+      arg.all? { |x| x.class == Array && x.length == 2 }
+    end
 
-  def satisfies?(arg)
-    return false unless arg.class == Array
-    arg.all?{|x| x.class == Array && x.length == 2}
+    def binding_for(arg)
+      flattened = arg.inject([]) { |memo, kv| memo + kv }
+      Hash[*flattened]
+    end
   end
-  
-  def binding_for(arg)
-    flattened = arg.inject([]){|memo, kv| memo + kv}
-    Hash[*flattened]
-  end
-end
 end

data/lib/erlectricity/conditions/static.rb

@@ -1,13 +1,34 @@
 module Erlectricity
-class StaticCondition < Condition
-  attr_accessor :value
-  def initialize(value)
-    self.value = value
-  end
-  
-  def satisfies?(arg)
-    arg.eql? value
-  end
+  class StaticCondition < Condition
+    attr_accessor :value
+    def initialize(value)
+      if value.is_a?(Array)
+        self.value = value.map do |v|
+          Condition.for(v)
+        end
+      else
+        self.value = value
+      end
+    end
 
+    def satisfies?(arg)
+      if value.is_a?(Array)
+        return false unless arg.is_a?(Array)
+        return false if value.length != arg.length
+        value.zip(arg).all? do |l, r|
+          l.respond_to?(:satisfies?) ? l.satisfies?(r) : l.eql?(r)
+        end
+      else
+        arg.eql?(value)
+      end
+    end
+
+    def binding_for(arg)
+      if value.is_a?(Array)
+        value.zip(arg).map { |l, r| l.binding_for(r) }.compact
+      else
+        nil
+      end
+    end
+  end
 end
-end

data/lib/erlectricity/conditions/type.rb

@@ -1,17 +1,17 @@
 module Erlectricity
-class TypeCondition < Condition
-  attr_accessor :type
-  
-  def initialize(type)
-    self.type = type
+  class TypeCondition < Condition
+    attr_accessor :type
+
+    def initialize(type)
+      self.type = type
+    end
+
+    def satisfies?(arg)
+      arg.is_a?(self.type)
+    end
+
+    def binding_for(arg)
+      arg
+    end
   end
-  
-  def satisfies?(arg)
-    arg.is_a? self.type
-  end
-  
-  def binding_for(arg)
-    arg
-  end
-end
 end

data/lib/erlectricity/constants.rb

@@ -11,7 +11,7 @@ module Erlectricity
 
       ATOM = 100
       REF = 101           #old style reference
-      NEW_REF = 114     
+      NEW_REF = 114
       PORT = 102          #not supported accross node boundaries
       PID = 103
 
@@ -22,16 +22,15 @@ module Erlectricity
       STRING = 107
       LIST = 108
       BIN = 109
-      
+
       FUN = 117
       NEW_FUN = 112
     end
 
     VERSION = 131
-    
+
     MAX_INT = (1 << 27) -1
     MIN_INT = -(1 << 27)
     MAX_ATOM = 255
   end
-
 end

data/lib/erlectricity/decoder.rb

@@ -1,204 +1,210 @@
 module Erlectricity
-class Decoder
-  attr_accessor :in
-  include Erlectricity::External::Types
-  
-  def self.read_any_from(string)
-    new(StringIO.new(string)).read_any
-  end
-  
-  def initialize(ins)
-    @in = ins
-    @peeked = ""
-  end
-  
-  def read_any
-    fail("Bad Magic") unless read_1 == Erlectricity::External::VERSION
-    read_any_raw
-  end
-  
-  def read_any_raw
-    case peek_1
-    when ATOM then read_atom
-    when SMALL_INT then read_small_int
-    when INT then read_int
-    when SMALL_BIGNUM then read_small_bignum
-    when LARGE_BIGNUM then read_large_bignum
-    when FLOAT then read_float
-    when NEW_REF then read_new_reference
-    when PID then read_pid
-    when SMALL_TUPLE then read_small_tuple
-    when LARGE_TUPLE then read_large_tuple
-    when NIL then read_nil
-    when STRING then read_erl_string
-    when LIST then read_list
-    when BIN then read_bin
-    else
-      fail("Unknown term tag: #{peek_1}")      
+  class Decoder
+    attr_accessor :in
+    include Erlectricity::External::Types
+
+    def self.decode(string)
+      new(StringIO.new(string)).read_any
     end
-  end
-  
-  def read(length)
-    if length < @peeked.length
-      result = @peeked[0...length]
-      @peeked = @peeked[length..-1]
-      length = 0
-    else
-      result = @peeked
-      @peeked = ''
-      length -= result.length
-    end
-    
-    if length > 0
-      result << @in.read(length)
-    end
-    result
-  end
-  
-  def peek(length)
-    if length <= @peeked.length
-      @peeked[0...length]
-    else
-      read_bytes = @in.read(length - @peeked.length)    
-      @peeked << read_bytes if read_bytes
-      @peeked
+
+    def initialize(ins)
+      @in = ins
+      @peeked = ""
+    end
+
+    def read_any
+      fail("Bad Magic") unless read_1 == Erlectricity::External::VERSION
+      read_any_raw
+    end
+
+    def read_any_raw
+      case peek_1
+        when ATOM then read_atom
+        when SMALL_INT then read_small_int
+        when INT then read_int
+        when SMALL_BIGNUM then read_small_bignum
+        when LARGE_BIGNUM then read_large_bignum
+        when FLOAT then read_float
+        when NEW_REF then read_new_reference
+        when PID then read_pid
+        when SMALL_TUPLE then read_small_tuple
+        when LARGE_TUPLE then read_large_tuple
+        when NIL then read_nil
+        when STRING then read_erl_string
+        when LIST then read_list
+        when BIN then read_bin
+        else
+          fail("Unknown term tag: #{peek_1}")
+      end
+    end
+
+    def read(length)
+      if length < @peeked.length
+        result = @peeked[0...length]
+        @peeked = @peeked[length..-1]
+        length = 0
+      else
+        result = @peeked
+        @peeked = ''
+        length -= result.length
+      end
+
+      if length > 0
+        result << @in.read(length)
+      end
+      result
+    end
+
+    def peek(length)
+      if length <= @peeked.length
+        @peeked[0...length]
+      else
+        read_bytes = @in.read(length - @peeked.length)
+        @peeked << read_bytes if read_bytes
+        @peeked
+      end
+    end
+
+    def peek_1
+      peek(1).unpack("C").first
+    end
+
+    def peek_2
+      peek(2).unpack("n").first
+    end
+
+    def read_1
+      read(1).unpack("C").first
+    end
+
+    def read_2
+      read(2).unpack("n").first
+    end
+
+    def read_4
+      read(4).unpack("N").first
+    end
+
+    def read_string(length)
+      read(length)
+    end
+
+    def read_atom
+      fail("Invalid Type, not an atom") unless read_1 == ATOM
+      length = read_2
+      a = read_string(length)
+      case a
+        when "true"
+          true
+        when "false"
+          false
+        else
+          a.to_sym
+      end
+    end
+
+    def read_small_int
+      fail("Invalid Type, not a small int") unless read_1 == SMALL_INT
+      read_1
+    end
+
+    def read_int
+      fail("Invalid Type, not an int") unless read_1 == INT
+      value = read_4
+      negative = (value >> 31)[0] == 1
+      value = (value - (1 << 32)) if negative
+      value = Fixnum.induced_from(value)
+    end
+
+    def read_small_bignum
+      fail("Invalid Type, not a small bignum") unless read_1 == SMALL_BIGNUM
+      size = read_1
+      sign = read_1
+      bytes = read_string(size).unpack("C" * size)
+      added = bytes.zip((0..bytes.length).to_a).inject(0) do |result, byte_index|
+        byte, index = *byte_index
+        value = (byte * (256 ** index))
+        sign != 0 ? (result - value) : (result + value)
+      end
+      Bignum.induced_from(added)
+    end
+
+    def read_large_bignum
+      fail("Invalid Type, not a large bignum") unless read_1 == LARGE_BIGNUM
+      size = read_4
+      sign = read_1
+      bytes = read_string(size).unpack("C" * size)
+      added = bytes.zip((0..bytes.length).to_a).inject(0) do |result, byte_index|
+        byte, index = *byte_index
+        value = (byte * (256 ** index))
+        sign != 0 ? (result - value) : (result + value)
+      end
+      Bignum.induced_from(added)
+    end
+
+    def read_float
+      fail("Invalid Type, not a float") unless read_1 == FLOAT
+      string_value = read_string(31)
+      result = string_value.to_f
+    end
+
+    def read_new_reference
+      fail("Invalid Type, not a new-style reference") unless read_1 == NEW_REF
+      size = read_2
+      node = read_atom
+      creation = read_1
+      id = (0...size).map { |i| read_4 }
+      NewReference.new(node, creation, id)
+    end
+
+    def read_pid
+      fail("Invalid Type, not a pid") unless read_1 == PID
+      node = read_atom
+      id = read_4
+      serial = read_4
+      creation = read_1
+      Pid.new(node, id, serial, creation)
+    end
+
+    def read_small_tuple
+      fail("Invalid Type, not a small tuple") unless read_1 == SMALL_TUPLE
+      arity = read_1
+      (0...arity).map { |i| read_any_raw }
+    end
+
+    def read_large_tuple
+      fail("Invalid Type, not a small tuple") unless read_1 == LARGE_TUPLE
+      arity = read_4
+      (0...arity).map { |i| read_any_raw }
+    end
+
+    def read_nil
+      fail("Invalid Type, not a nil list") unless read_1 == NIL
+      []
+    end
+
+    def read_erl_string
+      fail("Invalid Type, not an erlang string") unless read_1 == STRING
+      length = read_2
+      read_string(length).unpack('C' * length)
+    end
+
+    def read_list
+      fail("Invalid Type, not an erlang list") unless read_1 == LIST
+      length = read_4
+      list = (0...length).map { |i| read_any_raw }
+      read_1
+      list
+    end
+
+    def read_bin
+      fail("Invalid Type, not an erlang binary") unless read_1 == BIN
+      length = read_4
+      read_string(length)
+    end
+
+    def fail(str)
+      raise DecodeError, str
     end
   end
-  
-  def peek_1
-    peek(1).unpack("C").first
-  end
-  
-  def peek_2
-    peek(2).unpack("n").first
-  end
-  
-  def read_1
-    read(1).unpack("C").first
-  end
-  
-  def read_2
-    read(2).unpack("n").first
-  end
- 
-  def read_4
-    read(4).unpack("N").first
-  end
-  
-  def read_string(length)
-    read(length)
-  end
-  
-  def read_atom
-    fail("Invalid Type, not an atom") unless read_1 == ATOM
-    length = read_2
-    read_string(length).to_sym
-  end
-  
-  def read_small_int
-    fail("Invalid Type, not a small int") unless read_1 == SMALL_INT
-    read_1
-  end
-  
-  def read_int
-    fail("Invalid Type, not an int") unless read_1 == INT
-    value = read_4
-    negative = (value >> 31)[0] == 1
-    value = (value - (1 << 32)) if negative
-    value = Fixnum.induced_from(value)
-  end
-  
-  def read_small_bignum
-    fail("Invalid Type, not a small bignum") unless read_1 == SMALL_BIGNUM
-    size = read_1
-    sign = read_1
-    bytes = read_string(size).unpack("C" * size)
-    added = bytes.zip((0..bytes.length).to_a).inject(0) do |result, byte_index| 
-      byte, index = *byte_index
-      value = (byte * (256 ** index))
-      sign != 0 ? (result - value) : (result + value) 
-    end
-    Bignum.induced_from(added)
-  end
-  
-  def read_large_bignum
-    fail("Invalid Type, not a large bignum") unless read_1 == LARGE_BIGNUM
-    size = read_4
-    sign = read_1
-    bytes = read_string(size).unpack("C" * size)
-    added = bytes.zip((0..bytes.length).to_a).inject(0) do |result, byte_index| 
-      byte, index = *byte_index
-      value = (byte * (256 ** index))
-      sign != 0 ? (result - value) : (result + value) 
-    end
-    Bignum.induced_from(added)
-  end
-  
-  def read_float
-    fail("Invalid Type, not a float") unless read_1 == FLOAT
-    string_value = read_string(31)
-    result = string_value.to_f
-  end
-  
-  def read_new_reference
-    fail("Invalid Type, not a new-style reference") unless read_1 == NEW_REF
-    size = read_2
-    node = read_atom
-    creation = read_1
-    id = (0...size).map{|i| read_4 }
-    NewReference.new(node, creation, id)
-  end
-  
-  def read_pid
-    fail("Invalid Type, not a pid") unless read_1 == PID
-    node = read_atom
-    id = read_4
-    serial = read_4
-    creation = read_1
-    Pid.new(node, id, serial, creation)
-  end
-  
-  def read_small_tuple
-    fail("Invalid Type, not a small tuple") unless read_1 == SMALL_TUPLE
-    arity = read_1
-    
-    (0...arity).map{|i| read_any_raw }
-  end
-  
-  def read_large_tuple
-    fail("Invalid Type, not a small tuple") unless read_1 == LARGE_TUPLE
-    arity = read_4
-    (0...arity).map{|i| read_any_raw}
-  end
-  
-  def read_nil
-    fail("Invalid Type, not a nil list") unless read_1 == NIL
-    []
-  end
-  
-  def read_erl_string
-    fail("Invalid Type, not an erlang string") unless read_1 == STRING
-    length = read_2
-    read_string(length).unpack('C' * length)
-  end
-  
-  def read_list
-    fail("Invalid Type, not an erlang list") unless read_1 == LIST
-    length = read_4
-    list = (0...length).map{|i| read_any_raw}
-    read_1
-    list
-  end
-  
-  def read_bin
-    fail("Invalid Type, not an erlang binary") unless read_1 == BIN
-    length = read_4
-    read_string(length)
-  end
-  
-  def fail(str)
-    raise DecodeError, str
-  end
-  
 end
-end