ruby-zstds 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882ef3555df6569fdb51a8689d2e7b8e710255f98a08a631e023ae0160d3ad86
-  data.tar.gz: 233e455b9819cab316812fd7c977735972ad5ff2eeee1a816c329e7a5b7661f1
+  metadata.gz: fd4f85616a45bb4ea60d08e4f6e4dfa0091d5a098458e3f5c5ac81d6c9113aa3
+  data.tar.gz: a7b1afaa038f4339b0de26e91ae86c16a942620f8f450cbc791a7330cec372cb
 SHA512:
-  metadata.gz: 69ce6c1b92687ca88e87619a3314acf3b8c0584c56a1694730e5e5bf7139d5db3c7c280f01df79e1fb010a3c61c0c46af76a82bb1f4815b481421fb7b885f3d4
-  data.tar.gz: b77df0f6f9b98523ca3e611bbab7d5655a94c7e637fc61511096da614cb95672fab113894de375f6f406015aebc6eded0d0dabb5025644891775bec8a04cadda
+  metadata.gz: 0e76817922415c3fa1381aca25636aef90cc1a4bb98c8c8adc998667fc5eb10e24e27f66127f6c93d341af222bbf44229ef37996ea24fa89888b5381f0e8f1fb
+  data.tar.gz: c4aaa1527b723e6c2eec1f185b10657d50fd2e55fb0a9debf4cf993d561931b8cb60216023b0971d4739389eadcdccec011db668b943bfdc49f323e5852f409c

data/ext/extconf.rb

@@ -9,26 +9,96 @@ have_func "rb_thread_call_without_gvl", "ruby/thread.h"
 # https://bugs.gentoo.org/713940
 $LDFLAGS << " -pthread" # rubocop:disable Style/GlobalVars
 
-def require_header(name, types = [])
+def require_header(name, constants: [], macroses: [], types: [])
   abort "Can't find #{name} header" unless find_header name
 
+  constants.each do |constant|
+    abort "Can't find #{constant} constant in #{name} header" unless have_const constant, name
+  end
+
+  macroses.each do |macro|
+    abort "Can't find #{macro} macro in #{name} header" unless have_macro macro, name
+  end
+
   types.each do |type|
     abort "Can't find #{type} type in #{name} header" unless find_type type, nil, name
   end
 end
 
-require_header "zstd_errors.h", %w[
-  ZSTD_ErrorCode
-]
-require_header "zstd.h", [
-  "ZSTD_CCtx *",
-  "ZSTD_DCtx *",
-  "ZSTD_strategy",
-  "ZSTD_bounds",
-  "ZSTD_inBuffer",
-  "ZSTD_outBuffer"
-]
 require_header "zdict.h"
+require_header(
+  "zstd.h",
+  :constants => %w[
+    ZSTD_btlazy2
+    ZSTD_btopt
+    ZSTD_btultra
+    ZSTD_btultra2
+    ZSTD_c_chainLog
+    ZSTD_c_checksumFlag
+    ZSTD_c_compressionLevel
+    ZSTD_c_contentSizeFlag
+    ZSTD_c_dictIDFlag
+    ZSTD_c_enableLongDistanceMatching
+    ZSTD_c_hashLog
+    ZSTD_c_jobSize
+    ZSTD_c_ldmBucketSizeLog
+    ZSTD_c_ldmHashLog
+    ZSTD_c_ldmHashRateLog
+    ZSTD_c_ldmMinMatch
+    ZSTD_c_minMatch
+    ZSTD_c_nbWorkers
+    ZSTD_c_overlapLog
+    ZSTD_c_searchLog
+    ZSTD_c_strategy
+    ZSTD_c_targetLength
+    ZSTD_c_windowLog
+    ZSTD_dfast
+    ZSTD_d_windowLogMax
+    ZSTD_e_continue
+    ZSTD_e_end
+    ZSTD_e_flush
+    ZSTD_fast
+    ZSTD_greedy
+    ZSTD_lazy
+    ZSTD_lazy2
+  ],
+  :macroses  => %w[ZSTD_VERSION_STRING],
+  :types     => [
+    "ZSTD_bounds",
+    "ZSTD_CCtx *",
+    "ZSTD_DCtx *",
+    "ZSTD_inBuffer",
+    "ZSTD_outBuffer",
+    "ZSTD_strategy"
+  ]
+)
+require_header(
+  "zstd_errors.h",
+  :constants => %w[
+    ZSTD_error_checksum_wrong
+    ZSTD_error_corruption_detected
+    ZSTD_error_dictionaryCreation_failed
+    ZSTD_error_dictionary_corrupted
+    ZSTD_error_dictionary_wrong
+    ZSTD_error_dstBuffer_null
+    ZSTD_error_dstSize_tooSmall
+    ZSTD_error_frameParameter_unsupported
+    ZSTD_error_frameParameter_windowTooLarge
+    ZSTD_error_init_missing
+    ZSTD_error_maxSymbolValue_tooLarge
+    ZSTD_error_maxSymbolValue_tooSmall
+    ZSTD_error_memory_allocation
+    ZSTD_error_parameter_outOfBound
+    ZSTD_error_parameter_unsupported
+    ZSTD_error_prefix_unknown
+    ZSTD_error_srcSize_wrong
+    ZSTD_error_stage_wrong
+    ZSTD_error_tableLog_tooLarge
+    ZSTD_error_version_unsupported
+    ZSTD_error_workSpace_tooSmall
+  ],
+  :types     => %w[ZSTD_ErrorCode]
+)
 
 def require_library(name, functions)
   functions.each do |function|
@@ -39,26 +109,29 @@ end
 require_library(
   "zstd",
   %w[
-    ZSTD_isError
-    ZSTD_getErrorCode
-    ZSTD_createCCtx
-    ZSTD_createDCtx
-    ZSTD_freeCCtx
-    ZSTD_freeDCtx
+    ZDICT_getDictID
+    ZDICT_getDictHeaderSize
+    ZDICT_isError
+    ZDICT_trainFromBuffer
+    ZSTD_CCtx_loadDictionary
     ZSTD_CCtx_setParameter
-    ZSTD_DCtx_setParameter
     ZSTD_CCtx_setPledgedSrcSize
-    ZSTD_cParam_getBounds
-    ZSTD_dParam_getBounds
     ZSTD_CStreamInSize
     ZSTD_CStreamOutSize
+    ZSTD_compressStream2
+    ZSTD_cParam_getBounds
+    ZSTD_createCCtx
+    ZSTD_createDCtx
+    ZSTD_DCtx_setParameter
+    ZSTD_DCtx_loadDictionary
     ZSTD_DStreamInSize
     ZSTD_DStreamOutSize
-    ZSTD_compressStream2
     ZSTD_decompressStream
-    ZDICT_isError
-    ZDICT_getDictID
-    ZDICT_trainFromBuffer
+    ZSTD_dParam_getBounds
+    ZSTD_freeCCtx
+    ZSTD_freeDCtx
+    ZSTD_getErrorCode
+    ZSTD_isError
   ]
 )
 

data/ext/zstds_ext/buffer.c

@@ -5,8 +5,6 @@
 
 #include <zstd.h>
 
-#include "ruby.h"
-
 VALUE zstds_ext_create_string_buffer(VALUE length)
 {
   return rb_str_new(NULL, NUM2SIZET(length));

data/ext/zstds_ext/dictionary.c

@@ -6,7 +6,6 @@
 #include <string.h>
 #include <zdict.h>
 
-#include "ruby.h"
 #include "zstds_ext/buffer.h"
 #include "zstds_ext/error.h"
 #include "zstds_ext/gvl.h"
@@ -154,6 +153,16 @@ 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)
+{
+  zstds_result_t result = ZDICT_getDictHeaderSize(RSTRING_PTR(buffer), RSTRING_LEN(buffer));
+  if (ZDICT_isError(result)) {
+    zstds_ext_raise_error(zstds_ext_get_error(ZSTD_getErrorCode(result)));
+  }
+
+  return SIZET2NUM(result);
+}
+
 // -- exports --
 
 void zstds_ext_dictionary_exports(VALUE root_module)
@@ -161,5 +170,6 @@ void zstds_ext_dictionary_exports(VALUE root_module)
   VALUE dictionary = rb_define_class_under(root_module, "Dictionary", rb_cObject);
 
   rb_define_singleton_method(dictionary, "get_buffer_id", zstds_ext_get_dictionary_buffer_id, 1);
+  rb_define_singleton_method(dictionary, "get_header_size", zstds_ext_get_dictionary_header_size, 1);
   rb_define_singleton_method(dictionary, "train_buffer", zstds_ext_train_dictionary_buffer, 2);
 }

data/ext/zstds_ext/error.c

@@ -3,10 +3,6 @@
 
 #include "zstds_ext/error.h"
 
-#include <zstd_errors.h>
-
-#include "ruby.h"
-
 zstds_ext_result_t zstds_ext_get_error(ZSTD_ErrorCode error_code)
 {
   switch (error_code) {

data/ext/zstds_ext/io.c

@@ -7,7 +7,6 @@
 #include <string.h>
 #include <zstd.h>
 
-#include "ruby.h"
 #include "ruby/io.h"
 #include "zstds_ext/error.h"
 #include "zstds_ext/gvl.h"

data/ext/zstds_ext/main.c

@@ -1,7 +1,6 @@
 // Ruby bindings for zstd library.
 // Copyright (c) 2019 AUTHORS, MIT License.
 
-#include "ruby.h"
 #include "zstds_ext/buffer.h"
 #include "zstds_ext/dictionary.h"
 #include "zstds_ext/io.h"
@@ -21,4 +20,7 @@ void Init_zstds_ext()
   zstds_ext_compressor_exports(root_module);
   zstds_ext_decompressor_exports(root_module);
   zstds_ext_string_exports(root_module);
+
+  VALUE version = rb_str_new2(ZSTD_VERSION_STRING);
+  rb_define_const(root_module, "LIBRARY_VERSION", rb_obj_freeze(version));
 }

data/ext/zstds_ext/option.c

@@ -3,9 +3,6 @@
 
 #include "zstds_ext/option.h"
 
-#include <zstd.h>
-
-#include "ruby.h"
 #include "zstds_ext/dictionary.h"
 #include "zstds_ext/error.h"
 

data/ext/zstds_ext/stream/compressor.c

@@ -3,9 +3,6 @@
 
 #include "zstds_ext/stream/compressor.h"
 
-#include <zstd.h>
-
-#include "ruby.h"
 #include "zstds_ext/error.h"
 #include "zstds_ext/gvl.h"
 #include "zstds_ext/option.h"

data/ext/zstds_ext/stream/decompressor.c

@@ -3,9 +3,6 @@
 
 #include "zstds_ext/stream/decompressor.h"
 
-#include <zstd.h>
-
-#include "ruby.h"
 #include "zstds_ext/error.h"
 #include "zstds_ext/gvl.h"
 #include "zstds_ext/option.h"

data/ext/zstds_ext/string.c

@@ -5,7 +5,6 @@
 
 #include <zstd.h>
 
-#include "ruby.h"
 #include "zstds_ext/buffer.h"
 #include "zstds_ext/error.h"
 #include "zstds_ext/gvl.h"

data/lib/zstds/dictionary.rb

@@ -23,10 +23,6 @@ module ZSTDS
       @buffer = buffer
     end
 
-    def id
-      self.class.get_buffer_id @buffer
-    end
-
     def self.train(samples, options = {})
       Validation.validate_array samples
 
@@ -45,5 +41,13 @@ module ZSTDS
       buffer = train_buffer samples, options
       new buffer
     end
+
+    def id
+      self.class.get_buffer_id @buffer
+    end
+
+    def header_size
+      self.class.get_header_size @buffer
+    end
   end
 end

data/lib/zstds/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zstds
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Aladjev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Ruby bindings for zstd library.