ruby-zstds 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd4f85616a45bb4ea60d08e4f6e4dfa0091d5a098458e3f5c5ac81d6c9113aa3
-  data.tar.gz: a7b1afaa038f4339b0de26e91ae86c16a942620f8f450cbc791a7330cec372cb
+  metadata.gz: 80ccd3c8a7210dcf3fabdfadcca8e37ce82d5fe78c7f761f5ae7c355ff746854
+  data.tar.gz: a4ed4e5dd4c89b7f95438c5e3033d09eb25721ab32fda8e1eac9351774ab3215
 SHA512:
-  metadata.gz: 0e76817922415c3fa1381aca25636aef90cc1a4bb98c8c8adc998667fc5eb10e24e27f66127f6c93d341af222bbf44229ef37996ea24fa89888b5381f0e8f1fb
-  data.tar.gz: c4aaa1527b723e6c2eec1f185b10657d50fd2e55fb0a9debf4cf993d561931b8cb60216023b0971d4739389eadcdccec011db668b943bfdc49f323e5852f409c
+  metadata.gz: 967b5d866cd79b139bdbca97e1fdacf9063e3bc425f441be239980dd839d123173fcad15c0830576a32fe7c0bb5166f4fd5159717a9ac7f038fe57a435859f70
+  data.tar.gz: 78c54fc20f8facaa556eb68438407cfa7ff96d33425a9dce73584fc26435177dda8478c729a412f00d9b28a9d860b3dec6a059a728926a587f3a83dae9fe1836

data/ext/extconf.rb

@@ -26,6 +26,7 @@ def require_header(name, constants: [], macroses: [], types: [])
 end
 
 require_header "zdict.h"
+
 require_header(
   "zstd.h",
   :constants => %w[
@@ -72,6 +73,7 @@ require_header(
     "ZSTD_strategy"
   ]
 )
+
 require_header(
   "zstd_errors.h",
   :constants => %w[
@@ -106,11 +108,16 @@ def require_library(name, functions)
   end
 end
 
+# rubocop:disable Style/GlobalVars
+if find_library "zstd", "ZDICT_getDictHeaderSize"
+  $defs.push "-DHAVE_ZDICT_HEADER_SIZE"
+end
+# rubocop:enable Style/GlobalVars
+
 require_library(
   "zstd",
   %w[
     ZDICT_getDictID
-    ZDICT_getDictHeaderSize
     ZDICT_isError
     ZDICT_trainFromBuffer
     ZSTD_CCtx_loadDictionary

data/ext/zstds_ext/dictionary.c

@@ -9,7 +9,6 @@
 #include "zstds_ext/buffer.h"
 #include "zstds_ext/error.h"
 #include "zstds_ext/gvl.h"
-#include "zstds_ext/macro.h"
 #include "zstds_ext/option.h"
 
 // -- initialization --
@@ -153,7 +152,8 @@ VALUE zstds_ext_get_dictionary_buffer_id(VALUE ZSTDS_EXT_UNUSED(self), VALUE buf
   return UINT2NUM(id);
 }
 
-VALUE zstds_ext_get_dictionary_header_size(VALUE ZSTDS_EXT_UNUSED(self), VALUE buffer)
+#if defined(HAVE_ZDICT_HEADER_SIZE)
+VALUE zstds_ext_get_dictionary_header_size(VALUE self, VALUE buffer)
 {
   zstds_result_t result = ZDICT_getDictHeaderSize(RSTRING_PTR(buffer), RSTRING_LEN(buffer));
   if (ZDICT_isError(result)) {
@@ -163,6 +163,13 @@ VALUE zstds_ext_get_dictionary_header_size(VALUE ZSTDS_EXT_UNUSED(self), VALUE b
   return SIZET2NUM(result);
 }
 
+#else
+ZSTDS_EXT_NORETURN VALUE zstds_ext_get_dictionary_header_size(VALUE self, VALUE buffer)
+{
+  zstds_ext_raise_error(ZSTDS_EXT_ERROR_NOT_IMPLEMENTED);
+};
+#endif
+
 // -- exports --
 
 void zstds_ext_dictionary_exports(VALUE root_module)

data/ext/zstds_ext/dictionary.h

@@ -6,11 +6,19 @@
 
 #include "ruby.h"
 
+#include "zstds_ext/macro.h"
+
 #define ZSTDS_EXT_DEFAULT_DICTIONARY_CAPACITY (1 << 17); // 128 KB
 
 VALUE zstds_ext_train_dictionary_buffer(VALUE self, VALUE samples, VALUE options);
 VALUE zstds_ext_get_dictionary_buffer_id(VALUE self, VALUE buffer);
 
+#if defined(HAVE_ZDICT_HEADER_SIZE)
+VALUE zstds_ext_get_dictionary_header_size(VALUE self, VALUE buffer);
+#else
+ZSTDS_EXT_NORETURN VALUE zstds_ext_get_dictionary_header_size(VALUE self, VALUE buffer);
+#endif
+
 void zstds_ext_dictionary_exports(VALUE root_module);
 
 #endif // ZSTDS_EXT_DICTIONARY_H

data/ext/zstds_ext/error.c

@@ -69,6 +69,9 @@ void zstds_ext_raise_error(zstds_ext_result_t ext_result)
     case ZSTDS_EXT_ERROR_WRITE_IO:
       raise_error("WriteIOError", "failed to write IO");
 
+    case ZSTDS_EXT_ERROR_NOT_IMPLEMENTED:
+      raise_error("NotImplementedError", "not implemented error");
+
     default:
       // ZSTDS_EXT_ERROR_UNEXPECTED
       raise_error("UnexpectedError", "unexpected error");

data/ext/zstds_ext/error.h

@@ -26,6 +26,7 @@ enum
   ZSTDS_EXT_ERROR_READ_IO,
   ZSTDS_EXT_ERROR_WRITE_IO,
 
+  ZSTDS_EXT_ERROR_NOT_IMPLEMENTED,
   ZSTDS_EXT_ERROR_UNEXPECTED
 };
 

data/ext/zstds_ext/gvl.h

@@ -4,7 +4,7 @@
 #if !defined(ZSTDS_EXT_GVL_H)
 #define ZSTDS_EXT_GVL_H
 
-#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
 
 #include "ruby/thread.h"
 

data/ext/zstds_ext/macro.h

@@ -10,4 +10,10 @@
 #define ZSTDS_EXT_UNUSED(x) x
 #endif
 
+#if defined(__GNUC__)
+#define ZSTDS_EXT_NORETURN __attribute__((__noreturn__))
+#else
+#define ZSTDS_EXT_NORETURN
+#endif
+
 #endif // ZSTDS_EXT_MACRO_H

data/lib/zstds/error.rb

@@ -18,5 +18,6 @@ module ZSTDS
   class ReadIOError   < BaseError; end
   class WriteIOError  < BaseError; end
 
-  class UnexpectedError < BaseError; end
+  class NotImplementedError < BaseError; end
+  class UnexpectedError     < BaseError; end
 end

data/lib/zstds/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2019 AUTHORS, MIT License.
 
 module ZSTDS
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zstds
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Andrew Aladjev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: ocg
   requirement: !ruby/object:Gem::Requirement
@@ -128,42 +128,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -244,7 +244,8 @@ files:
 homepage: https://github.com/andrew-aladev/ruby-zstds
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -260,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Ruby bindings for zstd library.