erlectricity 1.0.1 → 1.1.0

data/.gitignore

@@ -0,0 +1,7 @@
+pkg
+ext/Makefile
+ext/decoder.bundle
+ext/decoder.o
+*.beam
+*.dump
+.DS_Store

data/History.txt

@@ -1,3 +1,14 @@
+== 1.1.0 / 2009-10-08
+  * Minor Improvements
+    * Implement Bignum encoding
+    * Fix tests on Erlang R13B
+
+== 1.0.2 / 2009-06-03
+  * Bug Fixes
+    * Fix decoding of atoms [github.com/bwbuchanan]
+    * Work around Ruby's reluctance to convert the empty string to
+      a symbol [github.com/bwbuchanan]
+
 == 1.0.1 / 2009-05-03
   * Bug Fixes
     * Fix premature null byte termination on binary decode

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
-:minor: 0
-:patch: 1
+:minor: 1
+:patch: 0

data/benchmarks/bench.rb

@@ -0,0 +1,21 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'erlectricity'
+require 'benchmark'
+
+data = [:ok, [:foo, :bar, [99, "bottles", "of", "beer", 3.14], [true, false]]]
+bert = Erlectricity::Encoder.encode(data)
+
+p bert
+
+Benchmark.bm do|b|
+  b.report("Decoder") do
+    100_000.times { Erl::Decoder.decode(bert) }
+  end
+end
+
+#               user        system     total    real
+# C Decoder      0.400000   0.000000   0.400000 (  0.425373)
+# Ruby Decoder  30.250000   0.220000  30.470000 ( 32.140890)
+#
+# C decoder is 75.56x faster than Ruby decoder on this data

data/erlectricity.gemspec

@@ -0,0 +1,105 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{erlectricity}
+  s.version = "1.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Scott Fleckenstein", "Tom Preston-Werner"]
+  s.date = %q{2009-10-08}
+  s.email = %q{tom@mojombo.com}
+  s.extensions = ["ext/extconf.rb"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION.yml",
+     "benchmarks/bench.rb",
+     "erlectricity.gemspec",
+     "examples/echo/README.md",
+     "examples/echo/echo.erl",
+     "examples/echo/echo.rb",
+     "examples/gruff/gruff.erl",
+     "examples/gruff/gruff_provider.rb",
+     "examples/gruff/gruff_run.sh",
+     "examples/gruff/stat_run.sh",
+     "examples/gruff/stat_writer.erl",
+     "examples/simple/README.md",
+     "examples/simple/rerl.rb",
+     "examples/simple/rerl.sh",
+     "examples/tinderl/README.md",
+     "examples/tinderl/tinderl.erl",
+     "examples/tinderl/tinderl.rb",
+     "ext/decoder.c",
+     "ext/extconf.rb",
+     "lib/erlectricity.rb",
+     "lib/erlectricity/condition.rb",
+     "lib/erlectricity/conditions/boolean.rb",
+     "lib/erlectricity/conditions/hash.rb",
+     "lib/erlectricity/conditions/static.rb",
+     "lib/erlectricity/conditions/type.rb",
+     "lib/erlectricity/constants.rb",
+     "lib/erlectricity/decoder.rb",
+     "lib/erlectricity/encoder.rb",
+     "lib/erlectricity/errors/decode_error.rb",
+     "lib/erlectricity/errors/encode_error.rb",
+     "lib/erlectricity/errors/erlectricity_error.rb",
+     "lib/erlectricity/matcher.rb",
+     "lib/erlectricity/port.rb",
+     "lib/erlectricity/receiver.rb",
+     "lib/erlectricity/types/function.rb",
+     "lib/erlectricity/types/list.rb",
+     "lib/erlectricity/types/new_function.rb",
+     "lib/erlectricity/types/new_reference.rb",
+     "lib/erlectricity/types/pid.rb",
+     "lib/erlectricity/types/reference.rb",
+     "lib/erlectricity/version.rb",
+     "test/condition_spec.rb",
+     "test/decode_spec.rb",
+     "test/encode_spec.rb",
+     "test/matcher_spec.rb",
+     "test/port_spec.rb",
+     "test/receiver_spec.rb",
+     "test/spec_suite.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/mojombo/erlectricity}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib", "ext"]
+  s.rubyforge_project = %q{erlectricity}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A library to interface erlang and ruby through the erlang port system}
+  s.test_files = [
+    "test/condition_spec.rb",
+     "test/decode_spec.rb",
+     "test/encode_spec.rb",
+     "test/matcher_spec.rb",
+     "test/port_spec.rb",
+     "test/receiver_spec.rb",
+     "test/spec_suite.rb",
+     "test/test_helper.rb",
+     "examples/echo/echo.rb",
+     "examples/gruff/gruff_provider.rb",
+     "examples/simple/rerl.rb",
+     "examples/tinderl/tinderl.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/ext/decoder.c

@@ -116,7 +116,8 @@ VALUE read_list(unsigned char **pData) {
 
   int size = read_4(pData);
 
-  VALUE array = rb_ary_new2(size);
+  VALUE newref_class = rb_const_get(mErlectricity, rb_intern("List"));
+  VALUE array = rb_funcall(newref_class, rb_intern("new"), 1, INT2NUM(size));
 
   int i;
   for(i = 0; i < size; ++i) {
@@ -159,7 +160,8 @@ VALUE read_string(unsigned char **pData) {
   unsigned char buf[length + 1];
   read_string_raw(buf, pData, length);
 
-  VALUE array = rb_ary_new2(length);
+  VALUE newref_class = rb_const_get(mErlectricity, rb_intern("List"));
+  VALUE array = rb_funcall(newref_class, rb_intern("new"), 1, INT2NUM(length));
 
   int i = 0;
   for(i; i < length; ++i) {
@@ -180,9 +182,9 @@ VALUE read_atom(unsigned char **pData) {
   read_string_raw(buf, pData, length);
 
   // Erlang true and false are actually atoms
-  if(strncmp((char *) buf, "true", length) == 0) {
+  if(length == 4 && strncmp((char *) buf, "true", length) == 0) {
     return Qtrue;
-  } else if(strncmp((char *) buf, "false", length) == 0) {
+  } else if(length == 5 && strncmp((char *) buf, "false", length) == 0) {
     return Qfalse;
   } else {
     return ID2SYM(rb_intern((char *) buf));
@@ -290,7 +292,8 @@ VALUE read_nil(unsigned char **pData) {
     rb_raise(rb_eStandardError, "Invalid Type, not a nil list");
   }
 
-  return rb_ary_new2(0);
+  VALUE newref_class = rb_const_get(mErlectricity, rb_intern("List"));
+  return rb_funcall(newref_class, rb_intern("new"), 0);
 }
 
 // specials

data/lib/erlectricity/decoder.rb

@@ -98,6 +98,8 @@ module Erlectricity
           true
         when "false"
           false
+        when ""
+          Marshal.load("\004\b:\005") # Workaround for inability to do ''.to_sym
         else
           a.to_sym
       end
@@ -180,13 +182,13 @@ module Erlectricity
 
     def read_nil
       fail("Invalid Type, not a nil list") unless read_1 == NIL
-      []
+      Erlectricity::List.new([])
     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)
+      Erlectricity::List.new(read_string(length).unpack('C' * length))
     end
 
     def read_list
@@ -194,7 +196,7 @@ module Erlectricity
       length = read_4
       list = (0...length).map { |i| read_any_raw }
       read_1
-      list
+      Erlectricity::List.new(list)
     end
 
     def read_bin

data/lib/erlectricity/encoder.rb

@@ -82,7 +82,30 @@ module Erlectricity
     end
 
     def write_bignum(num)
-      fail(num)
+      if num.is_a?(Bignum)
+        n = num.size
+      else
+        n = (num.to_s(2).size / 8.0).ceil
+      end
+      if n <= 256
+        write_1 SMALL_BIGNUM
+        write_1 n
+        write_bignum_guts(num)
+      else
+        write_1 LARGE_BIGNUM
+        write_4 n
+        write_bignum_guts(num)
+      end
+    end
+
+    def write_bignum_guts(num)
+      write_1 (num >= 0 ? 0 : 1)
+      num = num.abs
+      i = 0
+      while (rem = (num >> i * 8) % (256)) != 0
+        write_1 rem
+        i += 1
+      end
     end
 
     def write_new_reference(ref)

data/test/decode_spec.rb

@@ -90,15 +90,18 @@ context "When unpacking from a binary stream" do
   end
 
   specify "an empty erlang list encoded as a nil should decode to an array" do
+    get("[]").class.should == Erl::List
     get("[]").should == []
   end
 
   specify "an erlang list encoded as a string should decode to an array of bytes (less than ideal, but consistent)" do
+    get("\"asdasd\"").class.should == Erl::List
     get("\"asdasd\"").should == "asdasd".split('').map{|c| c[0]}
     get("\"#{'a' * 65534}\"").should == ['a'[0]] * 65534
   end
 
-  specify "an erlang list encoded as a list should decode to a array" do
+  specify "an erlang list encoded as a list should decode to an erl::list" do
+    get("[3,4,256]").class.should == Erl::List
     get("[3,4,256]").should == [3,4,256]
     get("\"#{'a' * 65535 }\"").should == [97] * 65535
     get("[3,4, foo, {3,4,5,bar}, 256]").should == [3,4, :foo, [3,4,5,:bar], 256]
@@ -110,10 +113,18 @@ context "When unpacking from a binary stream" do
     get("<< 99,0,99 >>").should == "c\000c"
   end
 
+  specify "the empty atom should decode to the empty symbol" do
+    empty_symbol = get("''")
+    empty_symbol.should.be.instance_of Symbol
+    empty_symbol.to_s.should == ""
+  end
+
   specify "erlang atomic booleans should decode to ruby booleans" do
     get("true").should == true
     get("false").should == false
     get("falsereio").should == :falsereio
+    get("t").should == :t
+    get("f").should == :f
   end
 
   specify "a good thing should be awesome" do

data/test/encode_spec.rb

@@ -36,6 +36,8 @@ context "When packing to a binary stream" do
     write_any(-(1 << 27)).should == get_erl_with_magic("#{-(1 << 27)}")
 
     # #SMALL_BIGNUMS
+    get{@encoder.write_fixnum(1254976067)}.should == get_erl("1254976067")
+    get{@encoder.write_fixnum(-1254976067)}.should == get_erl("-1254976067")
     # get{@encoder.write_fixnum((1 << word_length))}.should == get_erl("#{(1 << word_length)}")
     # get{@encoder.write_fixnum(-(1 << word_length) - 1)}.should == get_erl("#{-(1 << word_length) - 1}")
     # get{@encoder.write_fixnum((1 << (255 * 8)) - 1)}.should == get_erl("#{(1 << (255 * 8)) - 1}")
@@ -46,7 +48,10 @@ context "When packing to a binary stream" do
     # write_any((1 << (255 * 8)) - 1).should == get_erl_with_magic("#{(1 << (255 * 8)) - 1}")
     # write_any(-((1 << (255 * 8)) - 1)).should == get_erl_with_magic("#{-((1 << (255 * 8)) - 1)}")
     #
-    # #LARG_BIGNUMS
+    # #LARGE_BIGNUMS
+    x = 1254976067 ** 256
+    get{@encoder.write_fixnum(x)}.should == get_erl("#{x}")
+    get{@encoder.write_fixnum(-x)}.should == get_erl("-#{x}")
     # get{@encoder.write_fixnum((1 << (255 * 8)))}.should == get_erl("#{(1 << (255 * 8))}")
     # get{@encoder.write_fixnum(-(1 << (255 * 8))}.should == get_erl("#{-(1 << (255 * 8)}")
     # get{@encoder.write_fixnum((1 << (512 * 8))}.should == get_erl("#{(1 << (512 * 8))}")

data/test/test_helper.rb

@@ -10,7 +10,7 @@ $stdout.sync = true
 
 class Test::Unit::TestCase
   def run_erl(code)
-    cmd = %Q{erl -noshell -eval "A = #{code.split.join(' ')}, io:put_chars(A)." -s erlang halt}
+    cmd = %Q{erl -noshell -eval "A = #{code.split.join(' ')}, io:put_chars(binary_to_list(A))." -s erlang halt}
     `#{cmd}`
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erlectricity
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Scott Fleckenstein
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-03 00:00:00 -07:00
+date: 2009-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -24,11 +24,14 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .gitignore
 - History.txt
 - LICENSE
 - README.md
 - Rakefile
 - VERSION.yml
+- benchmarks/bench.rb
+- erlectricity.gemspec
 - examples/echo/README.md
 - examples/echo/echo.erl
 - examples/echo/echo.rb
@@ -77,6 +80,8 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/mojombo/erlectricity
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -98,9 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: erlectricity
-rubygems_version: 1.3.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A library to interface erlang and ruby through the erlang port system
 test_files: 
 - test/condition_spec.rb