erlang_rb 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82fd795948db72df73625ab7cef0f407018800b88d25e99a9a9a7a09d7ffbe8b
-  data.tar.gz: 1a049d6f1d488f86ef89450c5d258d389d25de4c7bdfb8bf7eb66802e36728fd
+  metadata.gz: cb447b6bd939e85f7064d8f8bb2dc8c9c9760dd85176aa03faa2f71b80d399af
+  data.tar.gz: 7e44a500d2f09968376420c89a3009299000751c7944e8c34dab65bab65dc364
 SHA512:
-  metadata.gz: c843ced9e5875d4439495a8fb9b193f2ea4672cfc86a682c4da2b23c6079d72920c607da8cc8c2afcc0b935da683f2ec2dc5fcfc5c2d30d03744c742dd084de5
-  data.tar.gz: 3497c55537d5a02e8aca60c3d54e733721370e011775f3425240aed59739b112a31551cf54a23cb31cd2a541b53ea505e15cd839c82fba7da6bbdf5f0229ad06
+  metadata.gz: 64da30400b66241b3742fe4e05f37c10c8fcf17b01380989d268e11640c5d91a069a37fe965d6b51dcd5ed820cc21cf94ffdd152dcc77d5003c866c7d446bcec
+  data.tar.gz: 934690e36553ff1c20eb4de1f1d5d0cc7893d4181e46738792b59238d731bc047e3a72827db6fec30047dbc372ea94878e62edecd3e87d934312a709138d0d6d

data/README.markdown

@@ -1,7 +1,7 @@
 Erlang External Term Format for Ruby
 ====================================
 
-
+[![Build Status](https://app.travis-ci.com/okeuday/erlang_rb.svg?branch=master)](https://app.travis-ci.com/okeuday/erlang_rb)
 
 Provides all encoding and decoding for the Erlang External Term Format
 (as defined at [http://erlang.org/doc/apps/erts/erl_ext_dist.html](http://erlang.org/doc/apps/erts/erl_ext_dist.html))

data/lib/erlang.rb

@@ -3,7 +3,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2011-2022 Michael Truog <mjtruog at protonmail dot com>
+# Copyright (c) 2011-2023 Michael Truog <mjtruog at protonmail dot com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -118,28 +118,6 @@ module Erlang
         alias eql? ==
     end
 
-    class OtpErlangFunction
-        def initialize(tag, value)
-            @tag = tag
-            @value = value
-        end
-        attr_reader :tag
-        attr_reader :value
-        def binary
-            return "#{@tag.chr}#{@value}"
-        end
-        def to_s
-            return "#{self.class.name}('#{@tag.to_s}','#{@value.to_s}')"
-        end
-        def hash
-            return binary.hash
-        end
-        def ==(other)
-            return binary == other.binary
-        end
-        alias eql? ==
-    end
-
     class OtpErlangList
         def initialize(value, improper = false)
             @value = value
@@ -232,13 +210,18 @@ module Erlang
         attr_reader :id
         attr_reader :creation
         def binary
-            creation_size = @creation.bytesize
-            if creation_size == 1
-                return "#{TAG_PORT_EXT.chr}" \
+            id_size = @id.bytesize
+            if id_size == 8
+                return "#{TAG_V4_PORT_EXT.chr}" \
                        "#{@node.binary}#{@id}#{@creation}"
-            elsif creation_size == 4
+            end
+            creation_size = @creation.bytesize
+            if creation_size == 4
                 return "#{TAG_NEW_PORT_EXT.chr}" \
                        "#{@node.binary}#{@id}#{@creation}"
+            elsif creation_size == 1
+                return "#{TAG_PORT_EXT.chr}" \
+                       "#{@node.binary}#{@id}#{@creation}"
             else
                 raise OutputException, 'unknown port type', caller
             end
@@ -299,6 +282,28 @@ module Erlang
         alias eql? ==
     end
 
+    class OtpErlangFunction
+        def initialize(tag, value)
+            @tag = tag
+            @value = value
+        end
+        attr_reader :tag
+        attr_reader :value
+        def binary
+            return "#{@tag.chr}#{@value}"
+        end
+        def to_s
+            return "#{self.class.name}('#{@tag.to_s}','#{@value.to_s}')"
+        end
+        def hash
+            return binary.hash
+        end
+        def ==(other)
+            return binary == other.binary
+        end
+        alias eql? ==
+    end
+
     # core functionality
 
     def self.binary_to_term(data)
@@ -380,12 +385,18 @@ module Erlang
         elsif tag == TAG_FLOAT_EXT
             value = data[i,31].partition(0.chr)[0].to_f
             return [i + 31, value]
-        elsif Set[TAG_NEW_PORT_EXT,TAG_REFERENCE_EXT,TAG_PORT_EXT].include?(tag)
+        elsif Set[TAG_V4_PORT_EXT,TAG_NEW_PORT_EXT,
+                  TAG_REFERENCE_EXT,TAG_PORT_EXT].include?(tag)
             result = binary_to_atom(i, data)
             i = result[0]; node = result[1]
-            id = data[i,4]
-            i += 4
-            if tag == TAG_NEW_PORT_EXT
+            if tag == TAG_V4_PORT_EXT
+                id = data[i,8]
+                i += 8
+            else
+                id = data[i,4]
+                i += 4
+            end
+            if Set[TAG_V4_PORT_EXT,TAG_NEW_PORT_EXT].include?(tag)
                 creation = data[i,4]
                 i += 4
             else
@@ -395,7 +406,8 @@ module Erlang
                     return [i, OtpErlangReference.new(node, id, creation)]
                 end
             end
-            # tag == TAG_NEW_PORT_EXT or tag == TAG_PORT_EXT
+            # tag == TAG_V4_PORT_EXT or tag == TAG_NEW_PORT_EXT or
+            # tag == TAG_PORT_EXT
             return [i, OtpErlangPort.new(node, id, creation)]
         elsif Set[TAG_NEW_PID_EXT, TAG_PID_EXT].include?(tag)
             result = binary_to_atom(i, data)
@@ -597,6 +609,8 @@ module Erlang
                 raise ParseException, 'unparsed data', caller
             end
             return [i + j, term]
+        elsif tag == TAG_LOCAL_EXT
+            raise ParseException, 'LOCAL_EXT is opaque', caller
         else
             raise ParseException, 'invalid tag', caller
         end
@@ -875,6 +889,8 @@ module Erlang
     TAG_FUN_EXT = 117
     TAG_ATOM_UTF8_EXT = 118
     TAG_SMALL_ATOM_UTF8_EXT = 119
+    TAG_V4_PORT_EXT = 120
+    TAG_LOCAL_EXT = 121
 
 end
 

data/tests/erlang_tests.rb

@@ -4,7 +4,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2014-2022 Michael Truog <mjtruog at protonmail dot com>
+# Copyright (c) 2014-2023 Michael Truog <mjtruog at protonmail dot com>
 # Copyright (c) 2009-2013 Dmitry Vasiliev <dima@hlabs.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -339,6 +339,41 @@ class DecodeTestCase < Test::Unit::TestCase
         assert_equal(-6618611909121,
                      Erlang::binary_to_term("\x83o\0\0\0\6\1\1\2\3\4\5\6"))
     end
+    def test_binary_to_term_map
+        assert_raise(Erlang::ParseException){
+            Erlang::binary_to_term("\x83t")
+        }
+        assert_raise(Erlang::ParseException){
+            Erlang::binary_to_term("\x83t\x00")
+        }
+        assert_raise(Erlang::ParseException){
+            Erlang::binary_to_term("\x83t\x00\x00")
+        }
+        assert_raise(Erlang::ParseException){
+            Erlang::binary_to_term("\x83t\x00\x00\x00")
+        }
+        assert_raise(Erlang::ParseException){
+            Erlang::binary_to_term("\x83t\x00\x00\x00\x01")
+        }
+        assert_equal({}, Erlang::binary_to_term("\x83t\x00\x00\x00\x00"))
+        map1 = {
+            Erlang::OtpErlangAtom.new("a".encode(Encoding::ISO_8859_1)) => 1
+        }
+        map1_binary = "\x83t\x00\x00\x00\x01s\x01aa\x01"
+        assert_equal(map1, Erlang::binary_to_term(map1_binary))
+        map2 = {
+            Erlang::OtpErlangBinary.new("\xA8", 6) =>
+            Erlang::OtpErlangBinary.new("everything"),
+            nil => Erlang::OtpErlangBinary.new("nothing")
+        }
+        map2_binary = (
+            "\x83\x74\x00\x00\x00\x02\x77\x09\x75\x6E\x64\x65\x66\x69" \
+            "\x6E\x65\x64\x6D\x00\x00\x00\x07\x6E\x6F\x74\x68\x69\x6E" \
+            "\x67\x4D\x00\x00\x00\x01\x06\xA8\x6D\x00\x00\x00\x0A\x65" \
+            "\x76\x65\x72\x79\x74\x68\x69\x6E\x67"
+        )
+        assert_equal(map2, Erlang::binary_to_term(map2_binary))
+    end
     def test_binary_to_term_pid
         pid_old_binary = (
             "\x83\x67\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E\x6F" \
@@ -377,6 +412,13 @@ class DecodeTestCase < Test::Unit::TestCase
         assert_equal(Erlang::term_to_binary(port_new),
                      "\x83Ys\rnonode@nohost\x00\x00\x00\x06" \
                      "\x00\x00\x00\x00")
+        port_v4_binary = (
+            "\x83\x78\x77\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E\x6F\x68\x6F" \
+            "\x73\x74\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00"
+        )
+        port_v4 = Erlang::binary_to_term(port_v4_binary)
+        assert(port_v4.kind_of?(Erlang::OtpErlangPort))
+        assert_equal(Erlang::term_to_binary(port_v4), port_v4_binary)
     end
     def test_binary_to_term_ref
         ref_new_binary = (
@@ -633,6 +675,27 @@ class EncodeTestCase < Test::Unit::TestCase
         assert_equal("\x83F\xc0\t!\xfbM\x12\xd8J",
                      Erlang::term_to_binary(-3.1415926))
     end
+    def test_term_to_binary_map
+        assert_equal("\x83t\x00\x00\x00\x00", Erlang::term_to_binary({}))
+        map1 = {
+            Erlang::OtpErlangAtom.new("a".encode(Encoding::ISO_8859_1)) => 1
+        }
+        map1_binary = "\x83t\x00\x00\x00\x01s\x01aa\x01"
+        assert_equal(map1_binary, Erlang::term_to_binary(map1))
+        map2 = {
+            Erlang::OtpErlangAtom.new("undefined".encode(Encoding::UTF_8)) =>
+            Erlang::OtpErlangBinary.new("nothing"),
+            Erlang::OtpErlangBinary.new("\xA8", 6) =>
+            Erlang::OtpErlangBinary.new("everything")
+        }
+        map2_binary = (
+            "\x83\x74\x00\x00\x00\x02\x77\x09\x75\x6E\x64\x65\x66\x69" \
+            "\x6E\x65\x64\x6D\x00\x00\x00\x07\x6E\x6F\x74\x68\x69\x6E" \
+            "\x67\x4D\x00\x00\x00\x01\x06\xA8\x6D\x00\x00\x00\x0A\x65" \
+            "\x76\x65\x72\x79\x74\x68\x69\x6E\x67"
+        )
+        assert_equal(map2_binary, Erlang::term_to_binary(map2))
+    end
     def test_term_to_binary_compressed_term
         assert_equal(
             "\x83P\x00\x00\x00\x15x\x9c\xcba``\xe0\xcfB\x03\x00B@\x07\x1c",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erlang_rb
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Michael Truog
@@ -34,7 +34,7 @@ cert_chain:
   CUaImqpeG21iNKLYHcNZkGfepUpp4FHudbeQeaJj8R5ug+f402l7T4s3JCAOcVIY
   MqZAStuHt2H1iR+JVSpFx1kkRJncIjtSnxUFd4MsBT083aOme9H/J+tb/YA=
   -----END CERTIFICATE-----
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies: []
 description: Erlang External Term Format for Ruby
 email: mjtruog@protonmail.com