vox-etf 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20430b5c79bc96dd01b89eb8a15e4f18ad5387d2da0401a32757207a8e4bb997
-  data.tar.gz: 030dfda27dbe590878dd76514f151afb2d0ef275dfa1d3056f8712ecd514efda
+  metadata.gz: c8d2deb457e60eb111c3f25ee95afcf9532e369ec4dff759908d48c92c93d3cf
+  data.tar.gz: d003df24854077a8b6192506f62db5888c417acaf35872b9ddd6bebf7c37f720
 SHA512:
-  metadata.gz: 8abe290ea1d4816ec4c9db1e408bc0540d54ebb8659d1e6f617c6524adfd2ce010013bf20d25eca76bd5ad9fd284343219b9d22c14cfc81de57d1ef663e73e4b
-  data.tar.gz: f1c124d99a11e882a2351b95937ce8b341e25322d057111be055b229cb44ea4f1d21c1fc0aa6f5fe638ec1f6369851f1957f3f812bada7fcb4bf5fd4980ee68c
+  metadata.gz: be499bd7ec49e3e1ee4945b808979a2a8bf331ac871f227a90a8ff77d28a87eddc32cea4f7e6e722d3d09d88a1a226c05d6b4760ef1ccf517b786fe9799c1429
+  data.tar.gz: 7bfa5417c8d0fbe5a2226fe2bb506af46cbb22d1736ef7b99029bec0074c35080b30e84450296ce23c0589cf6394349eca4f8e2376099cc60eccd9af796528c6

data/ext/vox/decoder.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include <zlib.h>
+#include "./etf.hpp"
 #include "ruby.h"
 #include "erlpack/sysdep.h"
 #include "erlpack/constants.h"
@@ -360,11 +361,12 @@ namespace etf
 
         VALUE decode_compressed()
         {
+#if HAVE_ZLIB_H
             const uint32_t decompressed_size = read32();
 
-            uint64_t source_size = decompressed_size;
+            unsigned long source_size = decompressed_size;
             uint8_t *out_buffer = (uint8_t *)malloc(decompressed_size);
-            const int ret = uncompress(out_buffer, &source_size, (const unsigned char *)(data + offset), (uint64_t)(size - offset));
+            const int ret = uncompress(out_buffer, &source_size, (const unsigned char *)(data + offset), (uLong)(size - offset));
 
             offset += source_size;
             if (ret != Z_OK)
@@ -378,6 +380,10 @@ namespace etf
             VALUE value = decompressed.decode_term();
             free(out_buffer);
             return value;
+#else
+            rb_raise(rb_eArgError, "vox-etf was compiled without zlib support can cannot decode the compressed term.");
+            return Qnil;
+#endif
         }
     };
 } // namespace etf

data/ext/vox/encoder.hpp

@@ -1,6 +1,7 @@
 #include "erlpack/encoder.h"
 #include "erlpack/constants.h"
-#include "etf.hpp"
+#include "./etf.hpp"
+#include "ruby.h"
 
 namespace etf
 {
@@ -98,11 +99,11 @@ namespace etf
 
         void encode_fixnum(VALUE fixnum)
         {
-            long l = FIX2LONG(fixnum);
-            if (l > 0 && l <= 0xFF)
-                erlpack_append_small_integer(erl_buff, (unsigned char)l);
+            uint32_t n = NUM2UINT(fixnum);
+            if (n > 0 && n <= UINT8_MAX)
+                erlpack_append_small_integer(erl_buff, (uint8_t)n);
             else
-                erlpack_append_integer(erl_buff, l);
+                erlpack_append_integer(erl_buff, n);
         }
 
         void encode_bignum(VALUE bignum)
@@ -137,18 +138,30 @@ namespace etf
 
         void encode_array(VALUE array)
         {
-            erlpack_append_list_header(erl_buff, RARRAY_LEN(array));
-            uint32_t size = RARRAY_LEN(array);
-            for (uint32_t index = 0; index < size; index++)
+            uint64_t size = RARRAY_LEN(array);
+            if (size == 0)
+            {
+                erlpack_append_nil_ext(erl_buff);
+                return;
+            }
+            else if (size > UINT32_MAX)
+            {
+                rb_raise(rb_eRangeError, "Array size is too large to fit into a 32 bit integer.");
+                return;
+            }
+
+            erlpack_append_list_header(erl_buff, size);
+            for (size_t index = 0; index < size; index++)
             {
                 encode_object(RARRAY_AREF(array, index));
             }
+
+            erlpack_append_nil_ext(erl_buff);
         }
 
         void encode_symbol(VALUE symbol)
         {
-            VALUE str = rb_sym2str(symbol);
-            erlpack_append_atom_utf8(erl_buff, RSTRING_PTR(str), RSTRING_LEN(str));
+            encode_string(rb_sym2str(symbol));
         }
 
         void encode_string(VALUE string)
@@ -158,13 +171,20 @@ namespace etf
 
         void encode_hash(VALUE hash)
         {
-            uint32_t size = RHASH_SIZE(hash);
+            uint64_t size = RHASH_SIZE(hash);
+            if (size > UINT32_MAX)
+            {
+                rb_raise(rb_eRangeError, "Hash size is too large to fit into a 32 bit integer");
+                return;
+            }
+
             erlpack_append_map_header(erl_buff, size);
             VALUE keys = rb_funcall(hash, rb_intern("keys"), 0);
 
             for (uint32_t index = 0; index < size * 2; index += 2)
             {
                 VALUE key = RARRAY_AREF(keys, index / 2);
+                // Normalize keys to strings because discord
                 encode_object(key);
                 encode_object(rb_hash_aref(hash, key));
             }

data/ext/vox/etf.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "./extconf.h"
 #define ETF_VERSION 131
 
 VALUE decode(VALUE self, VALUE input);

data/ext/vox/extconf.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
-require('mkmf-rice')
+require('mkmf')
 
 find_header('ruby.h')
-find_header('zlib.h')
 find_header('stddef.h')
 find_header('stdlib.h')
 find_header('stdint.h')
 find_header('limits.h')
 find_header('string.h')
+have_header('zlib.h')
+have_library('z')
+
+create_header
 
 create_makefile('vox/etf')

data/lib/vox/etf/version.rb

@@ -21,6 +21,6 @@ module Vox
     #   end
 
     # Gem version
-    VERSION = '0.1.3'
+    VERSION = '0.1.8'
   end
 end

data/vox-etf.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extensions << 'ext/vox/extconf.rb'
 
-  spec.add_dependency 'rice', '~> 2.2.0'
   spec.add_development_dependency 'rake', '~> 12.3.3'
   spec.add_development_dependency 'rake-compiler', '~> 1.1.1'
   spec.add_development_dependency 'rspec', '~> 3.9.0'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vox-etf
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Matthew Carey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rice
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement