erlang_rb 1.7.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 840879a6cfbce7f6edd7121da5e14b7ae19d87d8
-  data.tar.gz: 20c7c183a75f632da0b2c11979f969ef4eee22e2
+SHA256:
+  metadata.gz: b36f62f8d5c49daf16b3120596ff2d523a58820385d0375b4c891becb66d1abf
+  data.tar.gz: a7f2a937601cf8eb8feddf3187609515cdb82f8a1cd2e8f07a283efdc59c3703
 SHA512:
-  metadata.gz: d5966d24eaf1b950e3e52124a0d1780291d1ec497a6c913df0ca68e52ea56b29710a9fac0710c0e54d7e4021d0c532ec62b2db1b386575ad2d64024649420dab
-  data.tar.gz: '06872cf36314730369b5e1f0606010d58254826861a7e9048283efc95fe105f5e1dfe116713cc4354678f5a311fa393c65a8ef44cd18cabe504fb5d79254e96e'
+  metadata.gz: ab7a769ac8640a49878e7c700e162fd639649295fdc387312048e5fb9f9bcda44e4427033d6a82f685d61b1fe3504cfe8ac23932ac0f37d75c35c2a9cc676e8b
+  data.tar.gz: b7efca768abbd4b0a7409838cea35d1405dec08417edf83bbaf331e534d420c8916f52298fa5e1a527ef00c9d072fb7e4c85d6c5edcef42868855fdcc5035560

data/README.markdown

@@ -17,7 +17,7 @@ Tests
 Author
 ------
 
-Michael Truog (mjtruog [at] gmail (dot) com)
+Michael Truog (mjtruog at protonmail dot com)
 
 License
 -------

data/lib/erlang.rb

@@ -3,7 +3,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2011-2017 Michael Truog <mjtruog at gmail 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
@@ -402,7 +438,7 @@ module Erlang
             i = result[0]; tail = result[1]
             if tail.kind_of?(OtpErlangList) == false or tail.value != []
                 tmp.push(tail)
-                tmp = OtpErlangList.new(tmp, improper=true)
+                tmp = OtpErlangList.new(tmp, true)
             else
                 tmp = OtpErlangList.new(tmp)
             end
@@ -436,23 +472,28 @@ module Erlang
         elsif tag == TAG_EXPORT_EXT
             old_i = i
             result = binary_to_atom(i, data)
-            i = result[0]; name_module = result[1]
+            i = result[0]#; name_module = result[1]
             result = binary_to_atom(i, data)
-            i = result[0]; function = result[1]
+            i = result[0]#; function = result[1]
             if data[i].ord != TAG_SMALL_INTEGER_EXT
                 raise ParseException, 'invalid small integer tag', caller
             end
             i += 1
-            arity = data[i].ord
+            #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
@@ -485,18 +526,18 @@ module Erlang
             return [i, pairs]
         elsif tag == TAG_FUN_EXT
             old_i = i
-            numfree = data[i,4].unpack('N')[0]
+            #numfree = data[i,4].unpack('N')[0]
             i += 4
             result = binary_to_pid(i, data)
-            i = result[0]; pid = result[1]
+            i = result[0]#; pid = result[1]
             result = binary_to_atom(i, data)
-            i = result[0]; name_module = result[1]
+            i = result[0]#; name_module = result[1]
             result = binary_to_integer(i, data)
-            i = result[0]; index = result[1]
+            i = result[0]#; index = result[1]
             result = binary_to_integer(i, data)
-            i = result[0]; uniq = result[1]
+            i = result[0]#; uniq = result[1]
             result = binary_to_term_sequence(i, numfree, data)
-            i = result[0]; free = result[1]
+            i = result[0]#; free = result[1]
             return [i, OtpErlangFunction.new(tag, data[old_i,i - old_i])]
         elsif tag == TAG_ATOM_UTF8_EXT
             j = data[i,2].unpack('n')[0]
@@ -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]
@@ -644,6 +695,10 @@ module Erlang
             return OtpErlangAtom.new(
                 'false'.force_encoding('ISO-8859-1')
             ).binary
+        elsif term.nil?
+            return OtpErlangAtom.new(
+                'undefined'.force_encoding('ISO-8859-1')
+            ).binary
         elsif term.kind_of?(OtpErlangAtom)
             return term.binary
         elsif term.kind_of?(OtpErlangList)
@@ -772,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-2017 Michael Truog <mjtruog at gmail 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
@@ -70,7 +70,7 @@ end
 
 class ImproperListTestCase < Test::Unit::TestCase
     def test_improper_list
-        lst = Erlang::OtpErlangList.new([1, 2, 3, 4], improper=true)
+        lst = Erlang::OtpErlangList.new([1, 2, 3, 4], true)
         assert(lst.kind_of?(Erlang::OtpErlangList))
         assert_equal(Erlang::OtpErlangList.new([1, 2, 3, 4]).value, lst.value)
         assert_equal(4, lst.value[-1])
@@ -89,7 +89,7 @@ class ImproperListTestCase < Test::Unit::TestCase
     end
     def test_errors
         assert_raise(Erlang::OutputException){
-            Erlang::OtpErlangList.new('invalid', improper=true).binary
+            Erlang::OtpErlangList.new('invalid', true).binary
         }
     end
 end
@@ -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")
@@ -524,9 +585,10 @@ class EncodeTestCase < Test::Unit::TestCase
         assert_equal("\x83k\0\4test",
                      Erlang::term_to_binary('test'))
     end
-    def test_term_to_binary_boolean
+    def test_term_to_binary_predefined_atom
         assert_equal("\x83s\4true", Erlang::term_to_binary(true))
         assert_equal("\x83s\5false", Erlang::term_to_binary(false))
+        assert_equal("\x83s\x09undefined", Erlang::term_to_binary(nil))
     end
     def test_term_to_binary_short_integer
         assert_equal("\x83a\0", Erlang::term_to_binary(0))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erlang_rb
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Truog
@@ -10,30 +10,30 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MRAwDgYDVQQDDAdtanRy
-  dW9nMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNjb20w
-  HhcNMTcwOTEzMDYwMzAwWhcNMTgwOTEzMDYwMzAwWjA+MRAwDgYDVQQDDAdtanRy
-  dW9nMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNjb20w
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPlZFk7xAzMnUiNr/uHQV1
-  xPPNZmqevvZgfY9SMS2C7c4kGTNBePRvmr3ihTW8yFTEXNRdCO3Ibm9zp7YFmlzz
-  l7lyxHnEsrmPDmb5Ry+gIfrJ2M7lHqhbtvk3+5n5VB4npxEwXX3rsFWixO/8IOdX
-  s9fuALCwdRbWwSBSgp+8SGHIl16G7iTxD7moHNsqW4i8ryyRr05jnhxJBSCcZShE
-  Oa//izbIxWRvBk2Ibn/YlwZ2SrJXJ/DWxFkeXOcEFRQYy0vTn577GK0f4NTzoab5
-  G5FKKk0oMtl5W+kaF6+qd7XkotSMCC4jG9dU17G9HkbHfjPKS4mkbMnlYIXlN5ZJ
-  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSkVYwB
-  WjkE89b0x4Kq7W1UH82QODAcBgNVHREEFTATgRFtanRydW9nQGdtYWlsLmNvbTAc
-  BgNVHRIEFTATgRFtanRydW9nQGdtYWlsLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEA
-  YO8ZXcsUY/3m6/JFCTqL9qL2wR4zfcYwo/uYDo2S7FR/EGsy1M+qLJB8V13AR2Li
-  d/2mLm+SnhAgR32fMOaM58pbyFhlGaaEIs11xYywwbEbVe3eRxunsaJBcJxYeRZ+
-  V+c3ebJejEGUNJ4dRSB6WvWr9zl7FozsWBNSYJoWDMfkC2B2zHo08va5DRSActEn
-  27W/V+TnP3ONYvcoDcOr7sNOhNISlpgB5kDcl7stP85hm99IVK7vZi8t2jX/8GTT
-  +H4JAL4xk2aIYYf48338kxyZ8y9BNgp8cGbMEDtRSCgJnYk820Yt/fhM2DZtCbBL
-  tOEdFrZvpA23/sCoGvunHw==
+  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRAwDgYDVQQDDAdtanRy
+  dW9nMRowGAYKCZImiZPyLGQBGRYKcHJvdG9ubWFpbDETMBEGCgmSJomT8ixkARkW
+  A2NvbTAeFw0xOTExMjkwMjM1MzJaFw0yMDExMjgwMjM1MzJaMEMxEDAOBgNVBAMM
+  B21qdHJ1b2cxGjAYBgoJkiaJk/IsZAEZFgpwcm90b25tYWlsMRMwEQYKCZImiZPy
+  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5Ar67eHx
+  R/cmFgsj58SkbsqEQWZOQ5GNO25IKuwjGHqznJXszXM1NW0YFLjgXjsXVdTXPeIC
+  CbkfoR8Yc1CEI6FYOWqhO0JqpPfYzt0s27o3Ua2x8j6n+31iRkbArIX2IVEjvBNd
+  UiTg6mG4Hc3KLqrBRDxZ+uyzqH/FEGPi5Ggak/E5xKwSdPWBPqDYKcze+suXxYO7
+  u38NwloGxpatQGgHgNGf83RfWDPaiYHGdPAsvUDzRFauxcG8sYRbmohc0TmE5+TQ
+  KMviZJNaNOaQkW1/twRQpo9PEv8bxEzEXT+tNOMEHrXgKv4+xEZYBM7D1FdP8gKj
+  wMXN22ZkLWzP8wIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
+  HQ4EFgQUT8+9UATmehNm5Lg1aBx8HLK7MZwwIQYDVR0RBBowGIEWbWp0cnVvZ0Bw
+  cm90b25tYWlsLmNvbTAhBgNVHRIEGjAYgRZtanRydW9nQHByb3Rvbm1haWwuY29t
+  MA0GCSqGSIb3DQEBBQUAA4IBAQANj/kudiIbxJaurULxhML4palEaqIeWCw24bxj
+  X72RvO4Ti6DDKpeccK0QF26tZCOw4ngxPPY0w1Zzq96iYMVPlKVBYVDCtjIkFNDt
+  Q/0hupNd8lLloTlIJ7jzHohfPtzUjsdC0d0cwXZLkjxhw67N7QPDxsCEa+jiHaWd
+  i+DxiISAPKf9ugw5kej0v2j15juXiK5pwKIDDGAFfv3WAFbJXleLoqdM87rbC/vq
+  KH+3FIhF8jYeRqq/8g4k6zsZZwRewPjObe3Wm4yEv0f0dxdQRuWcuE7s7z0Bss5J
+  YQYB6UQUREuP9rhSHKbAZd9CPR3XW+S7PkeQiWc8ceLFVsfK
   -----END CERTIFICATE-----
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies: []
 description: Erlang Binary Term Format for Ruby
-email: mjtruog@gmail.com
+email: mjtruog@protonmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -61,8 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Erlang