erlang_rb 1.7.5 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba7347aefac6e4656ee2c2bdb09b4331e8d918e2
-  data.tar.gz: 10faf3c7ae747c865232bdc8faf17345efcce6d7
+  metadata.gz: 01a38d9f79736ca6e186d862077fd3ab6deceab4
+  data.tar.gz: 96988c81914130f61694678f3bb743ce0f96204d
 SHA512:
-  metadata.gz: deacc5353c6e26cb2812150de8546bf5c4c7c30efaec730afe97e471feabd6bbcca50e4435e974675674cd9f7263ea77791b5fdfb1fada3d40d9aa419a744114
-  data.tar.gz: 7f023589a206ee8eef60d94c52098c3953a2b37a9e2afd9343e3d5201720feac666005bd178d499b7e7557306b5c803eda1ef6236a00829e266ee087aefe22ba
+  metadata.gz: 1ab24b9f6106407798ff282a88c1e7463a4c3d00f5dec4dd9543a349b642d5c371311709f573be265b6f8d876b4f153492a47dee1d5e184d76b611f6fd494095
+  data.tar.gz: 7cf34813dd0dc5a0c722aadd2d8b45fe7dfd4a8b1d10283d19400bc8b424678397999f7375d0ee4b192a82e3c99c4449742de86c38f92ae9ef97f967ab730ffc

data/lib/erlang.rb

@@ -3,7 +3,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2011-2018 Michael Truog <mjtruog at protonmail dot com>
+# Copyright (c) 2011-2019 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"),
@@ -192,8 +192,16 @@ module Erlang
         attr_reader :serial
         attr_reader :creation
         def binary
-            return "#{TAG_PID_EXT.chr}" \
-                   "#{@node.binary}#{@id}#{@serial}#{@creation}"
+            creation_size = @creation.bytesize
+            if creation_size == 1
+                return "#{TAG_PID_EXT.chr}" \
+                       "#{@node.binary}#{@id}#{@serial}#{@creation}"
+            elsif creation_size == 4
+                return "#{TAG_NEW_PID_EXT.chr}" \
+                       "#{@node.binary}#{@id}#{@serial}#{@creation}"
+            else
+                raise OutputException, 'unknown pid type', caller
+            end
         end
         def to_s
             return "#{self.class.name}" \
@@ -219,7 +227,16 @@ module Erlang
         attr_reader :id
         attr_reader :creation
         def binary
-            return "#{TAG_PORT_EXT.chr}#{@node.binary}#{@id}#{@creation}"
+            creation_size = @creation.bytesize
+            if creation_size == 1
+                return "#{TAG_PORT_EXT.chr}" \
+                       "#{@node.binary}#{@id}#{@creation}"
+            elsif creation_size == 4
+                return "#{TAG_NEW_PORT_EXT.chr}" \
+                       "#{@node.binary}#{@id}#{@creation}"
+            else
+                raise OutputException, 'unknown port type', caller
+            end
         end
         def to_s
             return "#{self.class.name}" \
@@ -250,8 +267,16 @@ module Erlang
                        "#{@node.binary}#{@id}#{@creation}"
             elsif length <= 65535
                 length_packed = [length].pack('n')
-                return "#{TAG_NEW_REFERENCE_EXT.chr}#{length_packed}" \
-                       "#{@node.binary}#{@creation}#{@id}"
+                creation_size = @creation.bytesize
+                if creation_size == 1
+                    return "#{TAG_NEW_REFERENCE_EXT.chr}#{length_packed}" \
+                           "#{@node.binary}#{@creation}#{@id}"
+                elsif creation_size == 4
+                    return "#{TAG_NEWER_REFERENCE_EXT.chr}#{length_packed}" \
+                           "#{@node.binary}#{@creation}#{@id}"
+                else
+                    raise OutputException, 'unknown reference type', caller
+                end
             else
                 raise OutputException, 'uint16 overflow', caller
             end
@@ -354,27 +379,38 @@ module Erlang
             else
                 raise ParseException, 'invalid atom_name latin1', caller
             end
-        elsif tag == TAG_REFERENCE_EXT or tag == TAG_PORT_EXT
+        elsif tag == TAG_NEW_PORT_EXT or \
+              tag == TAG_REFERENCE_EXT or tag == TAG_PORT_EXT
             result = binary_to_atom(i, data)
             i = result[0]; node = result[1]
             id = data[i,4]
             i += 4
-            creation = data[i]
-            i += 1
-            if tag == TAG_REFERENCE_EXT
-                return [i, OtpErlangReference.new(node, id, creation)]
-            elsif tag == TAG_PORT_EXT
-                return [i, OtpErlangPort.new(node, id, creation)]
+            if tag == TAG_NEW_PORT_EXT
+                creation = data[i,4]
+                i += 4
+            else
+                creation = data[i]
+                i += 1
+                if tag == TAG_REFERENCE_EXT
+                    return [i, OtpErlangReference.new(node, id, creation)]
+                end
             end
-        elsif tag == TAG_PID_EXT
+            # tag == TAG_NEW_PORT_EXT or tag == TAG_PORT_EXT
+            return [i, OtpErlangPort.new(node, id, creation)]
+        elsif tag == TAG_NEW_PID_EXT or tag == TAG_PID_EXT
             result = binary_to_atom(i, data)
             i = result[0]; node = result[1]
             id = data[i,4]
             i += 4
             serial = data[i,4]
             i += 4
-            creation = data[i]
-            i += 1
+            if tag == TAG_NEW_PID_EXT
+                creation = data[i,4]
+                i += 4
+            elsif tag == TAG_PID_EXT
+                creation = data[i]
+                i += 1
+            end
             return [i, OtpErlangPid.new(node, id, serial, creation)]
         elsif tag == TAG_SMALL_TUPLE_EXT or tag == TAG_LARGE_TUPLE_EXT
             if tag == TAG_SMALL_TUPLE_EXT
@@ -446,13 +482,18 @@ module Erlang
             #arity = data[i].ord
             i += 1
             return [i, OtpErlangFunction.new(tag, data[old_i,i - old_i])]
-        elsif tag == TAG_NEW_REFERENCE_EXT
+        elsif tag == TAG_NEWER_REFERENCE_EXT or tag == TAG_NEW_REFERENCE_EXT
             j = data[i,2].unpack('n')[0] * 4
             i += 2
             result = binary_to_atom(i, data)
             i = result[0]; node = result[1]
-            creation = data[i]
-            i += 1
+            if tag == TAG_NEWER_REFERENCE_EXT
+                creation = data[i,4]
+                i += 4
+            elsif tag == TAG_NEW_REFERENCE_EXT
+                creation = data[i]
+                i += 1
+            end
             id = data[i,j]
             return [i + j, OtpErlangReference.new(node, id, creation)]
         elsif tag == TAG_SMALL_ATOM_EXT
@@ -570,7 +611,17 @@ module Erlang
     def self.binary_to_pid(i, data)
         tag = data[i].ord
         i += 1
-        if tag == TAG_PID_EXT
+        if tag == TAG_NEW_PID_EXT
+            result = binary_to_atom(i, data)
+            i = result[0]; node = result[1]
+            id = data[i,4]
+            i += 4
+            serial = data[i,4]
+            i += 4
+            creation = data[i,4]
+            i += 4
+            return [i, OtpErlangPid.new(node, id, serial, creation)]
+        elsif tag == TAG_PID_EXT
             result = binary_to_atom(i, data)
             i = result[0]; node = result[1]
             id = data[i,4]
@@ -776,6 +827,9 @@ module Erlang
     TAG_NEW_FLOAT_EXT = 70
     TAG_BIT_BINARY_EXT = 77
     TAG_ATOM_CACHE_REF = 78
+    TAG_NEW_PID_EXT = 88
+    TAG_NEW_PORT_EXT = 89
+    TAG_NEWER_REFERENCE_EXT = 90
     TAG_SMALL_INTEGER_EXT = 97
     TAG_INTEGER_EXT = 98
     TAG_FLOAT_EXT = 99

data/tests/erlang_tests.rb

@@ -4,7 +4,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2014-2018 Michael Truog <mjtruog at protonmail dot com>
+# Copyright (c) 2014-2019 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
@@ -331,6 +331,67 @@ 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_pid
+        pid_old_binary = (
+            "\x83\x67\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E\x6F" \
+            "\x68\x6F\x73\x74\x00\x00\x00\x4E\x00\x00\x00\x00\x00"
+        )
+        pid_old = Erlang::binary_to_term(pid_old_binary)
+        assert(pid_old.kind_of?(Erlang::OtpErlangPid))
+        assert_equal(Erlang::term_to_binary(pid_old),
+                     "\x83gs\rnonode@nohost\x00\x00\x00N" \
+                     "\x00\x00\x00\x00\x00")
+        pid_new_binary = (
+            "\x83\x58\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E\x6F\x68" \
+            "\x6F\x73\x74\x00\x00\x00\x4E\x00\x00\x00\x00\x00\x00\x00\x00"
+        )
+        pid_new = Erlang::binary_to_term(pid_new_binary)
+        assert(pid_new.kind_of?(Erlang::OtpErlangPid))
+        assert_equal(Erlang::term_to_binary(pid_new),
+                     "\x83Xs\rnonode@nohost\x00\x00\x00N" \
+                     "\x00\x00\x00\x00\x00\x00\x00\x00")
+    end
+    def test_binary_to_term_port
+        port_old_binary = (
+            "\x83\x66\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E\x6F\x68" \
+            "\x6F\x73\x74\x00\x00\x00\x06\x00"
+        )
+        port_old = Erlang::binary_to_term(port_old_binary)
+        assert(port_old.kind_of?(Erlang::OtpErlangPort))
+        assert_equal(Erlang::term_to_binary(port_old),
+                     "\x83fs\rnonode@nohost\x00\x00\x00\x06\x00")
+        port_new_binary = (
+            "\x83\x59\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E\x6F\x68" \
+            "\x6F\x73\x74\x00\x00\x00\x06\x00\x00\x00\x00"
+        )
+        port_new = Erlang::binary_to_term(port_new_binary)
+        assert(port_new.kind_of?(Erlang::OtpErlangPort))
+        assert_equal(Erlang::term_to_binary(port_new),
+                     "\x83Ys\rnonode@nohost\x00\x00\x00\x06" \
+                     "\x00\x00\x00\x00")
+    end
+    def test_binary_to_term_ref
+        ref_new_binary = (
+            "\x83\x72\x00\x03\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E" \
+            "\x6F\x68\x6F\x73\x74\x00\x00\x03\xE8\x4E\xE7\x68\x00\x02\xA4" \
+            "\xC8\x53\x40"
+        )
+        ref_new = Erlang::binary_to_term(ref_new_binary)
+        assert(ref_new.kind_of?(Erlang::OtpErlangReference))
+        assert_equal(Erlang::term_to_binary(ref_new),
+                     "\x83r\x00\x03s\rnonode@nohost\x00\x00\x03\xe8" \
+                     "N\xe7h\x00\x02\xa4\xc8S@")
+        ref_newer_binary = (
+            "\x83\x5A\x00\x03\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E" \
+            "\x6F\x68\x6F\x73\x74\x00\x00\x00\x00\x00\x01\xAC\x03\xC7\x00" \
+            "\x00\x04\xBB\xB2\xCA\xEE"
+        )
+        ref_newer = Erlang::binary_to_term(ref_newer_binary)
+        assert(ref_newer.kind_of?(Erlang::OtpErlangReference))
+        assert_equal(Erlang::term_to_binary(ref_newer),
+                     "\x83Z\x00\x03s\rnonode@nohost\x00\x00\x00\x00\x00" \
+                     "\x01\xac\x03\xc7\x00\x00\x04\xbb\xb2\xca\xee")
+    end
     def test_binary_to_term_compressed_term
         assert_raise(Erlang::ParseException){
             Erlang::binary_to_term("\x83P")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erlang_rb
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.8.0
 platform: ruby
 authors:
 - Michael Truog
@@ -12,25 +12,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRAwDgYDVQQDDAdtanRy
   dW9nMRowGAYKCZImiZPyLGQBGRYKcHJvdG9ubWFpbDETMBEGCgmSJomT8ixkARkW
-  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
+  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
-  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
+  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
-  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
+  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
   -----END CERTIFICATE-----
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies: []
 description: Erlang Binary Term Format for Ruby
 email: mjtruog@protonmail.com