erlang-etf 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df02c49c6d963c92a155665d854c29c64d4d506
-  data.tar.gz: 1f4365a62a0b2ee16b87fa688cba57ee0b4a89f9
+  metadata.gz: c065a1c33b75cf6235b7911022718a22fa44204c
+  data.tar.gz: 57fb1fc1ce89f1826ac5bcef122f1eb085430baa
 SHA512:
-  metadata.gz: 40c84fcbf9312de7a5d9e0e057651743764fe6172e72c8c7e66a80fd4fd693b826235b83f010410f0ff086295f81186f3f4b9630b23276a432b6ad0a26af018b
-  data.tar.gz: f167a812a0f03ab72ea546cf3cf47947a9192e921de500439130932c11a33283fdad27f3a3d3b9e195c5b4b560d9a3b4f773d4b523598e421259d9ffdfba1b0a
+  metadata.gz: 3979a241f92a3f08a19e81042c266381fc8e17837e08f7f7dd7be0d34d637bacc051d0fff6a808237c57386b23fed4cc13970247efb70054c7f3ba0355668f79
+  data.tar.gz: 8947fad90e772020fff53c997d7c5240b73cb9cd298e4ab0f3f951d76aefc90ab193225a4241b4636f022c2031fecdb4d29f12bab2fdeb02e4003fc7795e6189

data/erlang-etf.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "binary-protocol"
-  spec.add_dependency "erlang-terms"
+  spec.add_dependency "erlang-terms", ">= 1.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/erlang/etf/extensions.rb

@@ -14,6 +14,7 @@ end
 
 require "erlang/etf/extensions/erlang-export"
 require "erlang/etf/extensions/erlang-list"
+require "erlang/etf/extensions/erlang-map"
 require "erlang/etf/extensions/erlang-nil"
 require "erlang/etf/extensions/erlang-pid"
 require "erlang/etf/extensions/erlang-string"
@@ -33,6 +34,11 @@ module Erlang
         include Erlang::ETF::Extensions::ErlangList
       end
 
+      # @private
+      class ::Erlang::Map
+        include Erlang::ETF::Extensions::ErlangMap
+      end
+
       # @private
       class ::Erlang::Nil
         include Erlang::ETF::Extensions::ErlangNil

data/lib/erlang/etf/extensions/erlang-map.rb

@@ -0,0 +1,26 @@
+require 'erlang/map'
+
+module Erlang
+  module ETF
+    module Extensions
+
+      module ErlangMap
+
+        def __erlang_type__
+          :map
+        end
+
+        def __erlang_evolve__
+          if size == 0
+            ETF::Map.new([], [])
+          else
+            ETF::Map.new(*map do |(key, value)|
+              [key.__erlang_evolve__, value.__erlang_evolve__]
+            end.transpose)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/erlang/etf/map.rb

@@ -0,0 +1,51 @@
+module Erlang
+  module ETF
+
+    #
+    # 1   | 4    | N    | N
+    # --- | ---- | ---- | ------
+    # 116 | Size | Keys | Values
+    #
+    # The Size specifies the number of keys and values that
+    # follows the size descriptor.
+    #
+    # (see [`MAP_EXT`])
+    #
+    # [`MAP_EXT`]: http://erlang.org/doc/apps/erts/erl_ext_dist.html#MAP_EXT
+    #
+    class Map
+      include Term
+
+      uint8 :tag, always: Terms::MAP_EXT
+
+      uint32be :size, always: -> { keys.size }
+
+      term :keys,   type: :array
+      term :values, type: :array
+
+      deserialize do |buffer|
+        size, = buffer.read(BYTES_32).unpack(UINT32BE_PACK)
+        self.keys = []
+        size.times do
+          self.keys << Terms.deserialize(buffer)
+        end
+        self.values = []
+        size.times do
+          self.values << Terms.deserialize(buffer)
+        end
+        self
+      end
+
+      finalize
+
+      def initialize(keys, values)
+        @keys   = keys
+        @values = values
+      end
+
+      def __ruby_evolve__
+        ::Erlang::Map[keys.map(&:__ruby_evolve__).zip(values.map(&:__ruby_evolve__))]
+      end
+    end
+  end
+end

data/lib/erlang/etf/terms.rb

@@ -26,6 +26,7 @@ module Erlang
       NEW_FLOAT_EXT       =  70.freeze
       ATOM_UTF8_EXT       = 118.freeze
       SMALL_ATOM_UTF8_EXT = 119.freeze
+      MAP_EXT             = 116.freeze
     end
   end
 end
@@ -44,6 +45,7 @@ require "erlang/etf/integer"
 require "erlang/etf/large_big"
 require "erlang/etf/large_tuple"
 require "erlang/etf/list"
+require "erlang/etf/map"
 require "erlang/etf/new_float"
 require "erlang/etf/new_fun"
 require "erlang/etf/new_reference"
@@ -87,6 +89,7 @@ module Erlang
       MAP[NEW_FLOAT_EXT]       = ETF::NewFloat
       MAP[ATOM_UTF8_EXT]       = ETF::AtomUTF8
       MAP[SMALL_ATOM_UTF8_EXT] = ETF::SmallAtomUTF8
+      MAP[MAP_EXT]             = ETF::Map
 
       def self.deserialize(buffer)
         key, = buffer.read(1).unpack(::Binary::Protocol::UINT8_PACK)

data/lib/erlang/etf/version.rb

@@ -1,5 +1,5 @@
 module Erlang
   module ETF
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/spec/erlang/etf/extensions/erlang-map_spec.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Erlang::ETF::Extensions::ErlangMap do
+  let(:klass) { ::Erlang::Map }
+
+  describe '[instance]' do
+    let(:instance) { klass[keys.zip(values)] }
+
+    describe '__erlang_type__' do
+      subject { instance.__erlang_type__ }
+
+      context 'when empty' do
+        let(:keys)   { [] }
+        let(:values) { [] }
+
+        it { should eq(:map) }
+      end
+
+      context 'when not empty' do
+        let(:keys)   { [:a] }
+        let(:values) { [1] }
+
+        it { should eq(:map) }
+      end
+    end
+
+    describe '__erlang_evolve__' do
+      subject { instance.__erlang_evolve__ }
+
+      context 'when empty' do
+        let(:keys)   { [] }
+        let(:values) { [] }
+
+        it { should eq(Erlang::ETF::Map.new([], [])) }
+      end
+
+      context 'when not empty' do
+        let(:keys)   { [:a] }
+        let(:values) { [1] }
+
+        it { should eq(Erlang::ETF::Map.new([Erlang::ETF::SmallAtom.new("a")], [Erlang::ETF::SmallInteger.new(1)])) }
+      end
+    end
+  end
+
+end

data/spec/erlang/etf/map_spec.rb

@@ -0,0 +1,100 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'pry'
+
+describe Erlang::ETF::Map do
+  let(:term_class) { Erlang::ETF::Map }
+
+  let(:atom)          { Erlang::ETF::SmallAtom.new("test").tap(&:serialize) }
+  let(:binary)        { Erlang::ETF::Binary.new("test").tap(&:serialize) }
+  let(:new_float)     { Erlang::ETF::NewFloat.new(1.1) }
+  let(:small_integer) { Erlang::ETF::SmallInteger.new(13) }
+  let(:small_list)    { Erlang::ETF::List.new([atom, binary, new_float, small_integer]) }
+  let(:erlang_nil)    { Erlang::ETF::Nil.new }
+  let(:small_tuple)   { Erlang::ETF::SmallTuple.new([atom, binary, new_float, small_integer, small_list]) }
+  let(:small_map)     { Erlang::ETF::Map.new([atom, binary, new_float], [small_integer, erlang_nil, small_list]) }
+
+  describe '[class]' do
+    describe 'deserialize' do
+      let(:buffer) { StringIO.new(bytes.pack('C*')) }
+      subject { term_class.deserialize(buffer) }
+
+      context 'single item map' do
+        let(:bytes) { [0, 0, 0, 1, 100, 0, 1, 97, 106] }
+        let(:atom_a) { Erlang::ETF::Atom.new("a").tap(&:serialize) }
+
+        its(:size)   { should eq(1) }
+        its(:keys)   { should eq([atom_a]) }
+        its(:values) { should eq([erlang_nil]) }
+      end
+
+      context 'multiple item map' do
+        let(:bytes) { [0, 0, 0, 3, 115, 4, 116, 101, 115, 116, 109, 0, 0, 0, 4, 116, 101, 115, 116, 70, 63, 241, 153, 153, 153, 153, 153, 154, 97, 13, 106, 108, 0, 0, 0, 4, 115, 4, 116, 101, 115, 116, 109, 0, 0, 0, 4, 116, 101, 115, 116, 70, 63, 241, 153, 153, 153, 153, 153, 154, 97, 13, 106] }
+
+        its(:size)   { should eq(3) }
+        its(:keys)   { should eq([atom, binary, new_float]) }
+        its(:values) { should eq([small_integer, erlang_nil, small_list]) }
+      end
+    end
+  end
+
+  describe '[instance]' do
+    let(:term) { term_class.new(keys, values) }
+
+    let(:atom_a) { Erlang::ETF::Atom.new("a").tap(&:serialize) }
+
+    describe 'serialize' do
+      subject { term.serialize }
+
+      context 'single item map' do
+        let(:bytes) { [116, 0, 0, 0, 1, 100, 0, 1, 97, 106].pack('C*') }
+
+        let(:keys)   { [atom_a] }
+        let(:values) { [erlang_nil] }
+
+        it { should eq(bytes) }
+      end
+
+      context 'multiple item map' do
+        let(:bytes) { [116, 0, 0, 0, 3, 115, 4, 116, 101, 115, 116, 109, 0, 0, 0, 4, 116, 101, 115, 116, 70, 63, 241, 153, 153, 153, 153, 153, 154, 97, 13, 116, 0, 0, 0, 3, 115, 4, 116, 101, 115, 116, 109, 0, 0, 0, 4, 116, 101, 115, 116, 70, 63, 241, 153, 153, 153, 153, 153, 154, 97, 13, 106, 108, 0, 0, 0, 4, 115, 4, 116, 101, 115, 116, 109, 0, 0, 0, 4, 116, 101, 115, 116, 70, 63, 241, 153, 153, 153, 153, 153, 154, 97, 13, 106, 108, 0, 0, 0, 4, 115, 4, 116, 101, 115, 116, 109, 0, 0, 0, 4, 116, 101, 115, 116, 70, 63, 241, 153, 153, 153, 153, 153, 154, 97, 13, 106].pack('C*') }
+
+        let(:keys)   { [atom, binary, new_float] }
+        let(:values) { [small_integer, small_map, small_list] }
+
+        it { should eq(bytes) }
+      end
+    end
+
+    describe '__erlang_type__' do
+      subject { term.__erlang_type__ }
+
+      let(:keys)   { [atom_a] }
+      let(:values) { [erlang_nil] }
+      it { should eq(:map) }
+    end
+
+    describe '__ruby_evolve__' do
+      context 'single item map' do
+        let(:ruby_obj) { ::Erlang::Map[:a, :a] }
+        subject { term.__ruby_evolve__ }
+
+        let(:keys)   { [atom_a] }
+        let(:values) { [atom_a] }
+
+        it { should eq(ruby_obj) }
+      end
+
+      context 'multiple item map' do
+        let(:ruby_obj) { ::Erlang::Map[:test, "test", 1.1, 13, ::Erlang::Tuple[:test, "test", 1.1, 13, ::Erlang::List[:test, "test", 1.1, 13]], ::Erlang::List[:test, "test", 1.1, 13]] }
+        subject { term.__ruby_evolve__ }
+
+        let(:keys)   { [atom, new_float, small_tuple] }
+        let(:values) { [binary, small_integer, small_list] }
+
+        it { should eq(ruby_obj) }
+      end
+    end
+  end
+
+end

data/spec/erlang_spec.rb

@@ -67,7 +67,10 @@ describe Erlang do
 
     Erlang::Export.new(:erlang, :now, 0),
     Erlang::Pid.new(:'node@host', 100, 10, 1),
-    Erlang::String.new("test")
+    Erlang::String.new("test"),
+    Erlang::Map[],
+    Erlang::Map[:atom, 1],
+    Erlang::Map[Erlang::Map[:atom, 1], 2]
   ]
 
   roundtrip_variables.each do |roundtrip_variable|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erlang-etf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Bennett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binary-protocol
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - lib/erlang/etf/extensions/big_decimal.rb
 - lib/erlang/etf/extensions/erlang-export.rb
 - lib/erlang/etf/extensions/erlang-list.rb
+- lib/erlang/etf/extensions/erlang-map.rb
 - lib/erlang/etf/extensions/erlang-nil.rb
 - lib/erlang/etf/extensions/erlang-pid.rb
 - lib/erlang/etf/extensions/erlang-string.rb
@@ -129,6 +130,7 @@ files:
 - lib/erlang/etf/large_big.rb
 - lib/erlang/etf/large_tuple.rb
 - lib/erlang/etf/list.rb
+- lib/erlang/etf/map.rb
 - lib/erlang/etf/new_float.rb
 - lib/erlang/etf/new_fun.rb
 - lib/erlang/etf/new_reference.rb
@@ -154,6 +156,7 @@ files:
 - spec/erlang/etf/extensions/big_decimal_spec.rb
 - spec/erlang/etf/extensions/erlang-export_spec.rb
 - spec/erlang/etf/extensions/erlang-list_spec.rb
+- spec/erlang/etf/extensions/erlang-map_spec.rb
 - spec/erlang/etf/extensions/erlang-nil_spec.rb
 - spec/erlang/etf/extensions/erlang-pid_spec.rb
 - spec/erlang/etf/extensions/erlang-string_spec.rb
@@ -175,6 +178,7 @@ files:
 - spec/erlang/etf/large_big_spec.rb
 - spec/erlang/etf/large_tuple_spec.rb
 - spec/erlang/etf/list_spec.rb
+- spec/erlang/etf/map_spec.rb
 - spec/erlang/etf/new_float_spec.rb
 - spec/erlang/etf/new_fun_spec.rb
 - spec/erlang/etf/new_reference_spec.rb
@@ -213,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Erlang External Term Format (ETF) for Ruby
@@ -227,6 +231,7 @@ test_files:
 - spec/erlang/etf/extensions/big_decimal_spec.rb
 - spec/erlang/etf/extensions/erlang-export_spec.rb
 - spec/erlang/etf/extensions/erlang-list_spec.rb
+- spec/erlang/etf/extensions/erlang-map_spec.rb
 - spec/erlang/etf/extensions/erlang-nil_spec.rb
 - spec/erlang/etf/extensions/erlang-pid_spec.rb
 - spec/erlang/etf/extensions/erlang-string_spec.rb
@@ -248,6 +253,7 @@ test_files:
 - spec/erlang/etf/large_big_spec.rb
 - spec/erlang/etf/large_tuple_spec.rb
 - spec/erlang/etf/list_spec.rb
+- spec/erlang/etf/map_spec.rb
 - spec/erlang/etf/new_float_spec.rb
 - spec/erlang/etf/new_fun_spec.rb
 - spec/erlang/etf/new_reference_spec.rb