zstd-ruby 1.5.1.1 → 1.5.2.2

data/ext/zstdruby/streaming_decompress.c

@@ -0,0 +1,123 @@
+#include <common.h>
+
+struct streaming_decompress_t {
+  ZSTD_DCtx* ctx;
+  VALUE buf;
+  size_t buf_size;
+};
+
+static void
+streaming_decompress_mark(void *p)
+{
+  struct streaming_decompress_t *sd = p;
+  rb_gc_mark(sd->buf);
+}
+
+static void
+streaming_decompress_free(void *p)
+{
+  struct streaming_decompress_t *sd = p;
+  ZSTD_DCtx* ctx = sd->ctx;
+  if (ctx != NULL) {
+    ZSTD_freeDCtx(ctx);
+  }
+  xfree(sd);
+}
+
+static size_t
+streaming_decompress_memsize(const void *p)
+{
+    return sizeof(struct streaming_decompress_t);
+}
+
+static const rb_data_type_t streaming_decompress_type = {
+    "streaming_decompress",
+    { streaming_decompress_mark, streaming_decompress_free, streaming_decompress_memsize, },
+     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE
+rb_streaming_decompress_allocate(VALUE klass)
+{
+  struct streaming_decompress_t* sd;
+  VALUE obj = TypedData_Make_Struct(klass, struct streaming_decompress_t, &streaming_decompress_type, sd);
+  sd->ctx = NULL;
+  sd->buf = Qnil;
+  sd->buf_size = 0;
+  return obj;
+}
+
+static VALUE
+rb_streaming_decompress_initialize(VALUE obj)
+{
+  struct streaming_decompress_t* sd;
+  TypedData_Get_Struct(obj, struct streaming_decompress_t, &streaming_decompress_type, sd);
+  size_t const buffOutSize = ZSTD_DStreamOutSize();
+
+  ZSTD_DCtx* ctx = ZSTD_createDCtx();
+  if (ctx == NULL) {
+    rb_raise(rb_eRuntimeError, "%s", "ZSTD_createDCtx error");
+  }
+  sd->ctx = ctx;
+  sd->buf = rb_str_new(NULL, buffOutSize);
+  sd->buf_size = buffOutSize;
+
+  return obj;
+}
+
+static VALUE
+rb_streaming_decompress_decompress(VALUE obj, VALUE src)
+{
+  StringValue(src);
+  const char* input_data = RSTRING_PTR(src);
+  size_t input_size = RSTRING_LEN(src);
+  ZSTD_inBuffer input = { input_data, input_size, 0 };
+
+  struct streaming_decompress_t* sd;
+  TypedData_Get_Struct(obj, struct streaming_decompress_t, &streaming_decompress_type, sd);
+  const char* output_data = RSTRING_PTR(sd->buf);
+  VALUE result = rb_str_new(0, 0);
+  while (input.pos < input.size) {
+    ZSTD_outBuffer output = { (void*)output_data, sd->buf_size, 0 };
+    size_t const ret = ZSTD_decompressStream(sd->ctx, &output, &input);
+    if (ZSTD_isError(ret)) {
+      rb_raise(rb_eRuntimeError, "compress error error code: %s", ZSTD_getErrorName(ret));
+    }
+    rb_str_cat(result, output.dst, output.pos);
+  }
+  return result;
+}
+
+static VALUE
+rb_streaming_decompress_addstr(VALUE obj, VALUE src)
+{
+  StringValue(src);
+  const char* input_data = RSTRING_PTR(src);
+  size_t input_size = RSTRING_LEN(src);
+  ZSTD_inBuffer input = { input_data, input_size, 0 };
+
+  struct streaming_decompress_t* sd;
+  TypedData_Get_Struct(obj, struct streaming_decompress_t, &streaming_decompress_type, sd);
+  const char* output_data = RSTRING_PTR(sd->buf);
+
+  while (input.pos < input.size) {
+    ZSTD_outBuffer output = { (void*)output_data, sd->buf_size, 0 };
+    size_t const result = ZSTD_decompressStream(sd->ctx, &output, &input);
+    if (ZSTD_isError(result)) {
+      rb_raise(rb_eRuntimeError, "compress error error code: %s", ZSTD_getErrorName(result));
+    }
+  }
+  return obj;
+}
+
+extern VALUE rb_mZstd, cStreamingDecompress;
+void
+zstd_ruby_streaming_decompress_init(void)
+{
+  VALUE cStreamingDecompress = rb_define_class_under(rb_mZstd, "StreamingDecompress", rb_cObject);
+  rb_define_alloc_func(cStreamingDecompress, rb_streaming_decompress_allocate);
+  rb_define_method(cStreamingDecompress, "initialize", rb_streaming_decompress_initialize, 0);
+  rb_define_method(cStreamingDecompress, "decompress", rb_streaming_decompress_decompress, 1);
+  rb_define_method(cStreamingDecompress, "<<", rb_streaming_decompress_addstr, 1);
+}
+

data/ext/zstdruby/zstdruby.c

@@ -1,5 +1,6 @@
-#include "zstdruby.h"
-#include "./libzstd/zstd.h"
+#include <common.h>
+
+extern VALUE rb_mZstd;
 
 static VALUE zstdVersion(VALUE self)
 {
@@ -104,12 +105,9 @@ static VALUE decompress(VALUE self, VALUE input)
   return output;
 }
 
-VALUE rb_mZstd;
-
 void
-Init_zstdruby(void)
+zstd_ruby_init(void)
 {
-  rb_mZstd = rb_define_module("Zstd");
   rb_define_module_function(rb_mZstd, "zstd_version", zstdVersion, 0);
   rb_define_module_function(rb_mZstd, "compress", compress, -1);
   rb_define_module_function(rb_mZstd, "decompress", decompress, 1);

data/lib/zstd-ruby/version.rb

@@ -1,3 +1,3 @@
 module Zstd
-  VERSION = "1.5.1.1"
+  VERSION = "1.5.2.2"
 end

data/zstd-ruby.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   #end
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features|benchmarks|zstd)/})
+    f.match(%r{^(test|spec|features|benchmarks|zstd|.github)/})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zstd-ruby
 version: !ruby/object:Gem::Version
-  version: 1.5.1.1
+  version: 1.5.2.2
 platform: ruby
 authors:
 - SpringMT
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,8 +75,6 @@ extensions:
 - ext/zstdruby/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/dependabot.yml"
-- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
@@ -87,11 +85,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- ext/zstdruby/common.h
 - ext/zstdruby/extconf.rb
-- ext/zstdruby/libzstd/.gitignore
-- ext/zstdruby/libzstd/BUCK
-- ext/zstdruby/libzstd/Makefile
-- ext/zstdruby/libzstd/README.md
 - ext/zstdruby/libzstd/common/bitstream.h
 - ext/zstdruby/libzstd/common/compiler.h
 - ext/zstdruby/libzstd/common/cpu.h
@@ -150,44 +145,20 @@ files:
 - ext/zstdruby/libzstd/decompress/zstd_decompress_block.c
 - ext/zstdruby/libzstd/decompress/zstd_decompress_block.h
 - ext/zstdruby/libzstd/decompress/zstd_decompress_internal.h
-- ext/zstdruby/libzstd/deprecated/zbuff.h
-- ext/zstdruby/libzstd/deprecated/zbuff_common.c
-- ext/zstdruby/libzstd/deprecated/zbuff_compress.c
-- ext/zstdruby/libzstd/deprecated/zbuff_decompress.c
 - ext/zstdruby/libzstd/dictBuilder/cover.c
 - ext/zstdruby/libzstd/dictBuilder/cover.h
 - ext/zstdruby/libzstd/dictBuilder/divsufsort.c
 - ext/zstdruby/libzstd/dictBuilder/divsufsort.h
 - ext/zstdruby/libzstd/dictBuilder/fastcover.c
 - ext/zstdruby/libzstd/dictBuilder/zdict.c
-- ext/zstdruby/libzstd/dll/example/Makefile
-- ext/zstdruby/libzstd/dll/example/README.md
-- ext/zstdruby/libzstd/dll/example/build_package.bat
-- ext/zstdruby/libzstd/dll/example/fullbench-dll.sln
-- ext/zstdruby/libzstd/dll/example/fullbench-dll.vcxproj
-- ext/zstdruby/libzstd/legacy/zstd_legacy.h
-- ext/zstdruby/libzstd/legacy/zstd_v01.c
-- ext/zstdruby/libzstd/legacy/zstd_v01.h
-- ext/zstdruby/libzstd/legacy/zstd_v02.c
-- ext/zstdruby/libzstd/legacy/zstd_v02.h
-- ext/zstdruby/libzstd/legacy/zstd_v03.c
-- ext/zstdruby/libzstd/legacy/zstd_v03.h
-- ext/zstdruby/libzstd/legacy/zstd_v04.c
-- ext/zstdruby/libzstd/legacy/zstd_v04.h
-- ext/zstdruby/libzstd/legacy/zstd_v05.c
-- ext/zstdruby/libzstd/legacy/zstd_v05.h
-- ext/zstdruby/libzstd/legacy/zstd_v06.c
-- ext/zstdruby/libzstd/legacy/zstd_v06.h
-- ext/zstdruby/libzstd/legacy/zstd_v07.c
-- ext/zstdruby/libzstd/legacy/zstd_v07.h
-- ext/zstdruby/libzstd/libzstd.mk
-- ext/zstdruby/libzstd/libzstd.pc.in
-- ext/zstdruby/libzstd/modulemap/module.modulemap
 - ext/zstdruby/libzstd/zdict.h
 - ext/zstdruby/libzstd/zstd.h
 - ext/zstdruby/libzstd/zstd_errors.h
+- ext/zstdruby/main.c
+- ext/zstdruby/streaming_compress.c
+- ext/zstdruby/streaming_compress.h
+- ext/zstdruby/streaming_decompress.c
 - ext/zstdruby/zstdruby.c
-- ext/zstdruby/zstdruby.h
 - lib/zstd-ruby.rb
 - lib/zstd-ruby/version.rb
 - zstd-ruby.gemspec
@@ -195,7 +166,7 @@ homepage: https://github.com/SpringMT/zstd-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -210,8 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Ruby binding for zstd(Zstandard - Fast real-time compression algorithm)
 test_files: []

data/.github/dependabot.yml

@@ -1,8 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: "20:00"
-  open-pull-requests-limit: 10

data/.github/workflows/ruby.yml

@@ -1,35 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on: [push, pull_request]
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1']
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@168d6a54b412713c0ed60998a78093a270ca8d84
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Install dependencies
-      run: bundle install
-    - name: Compile
-      run: bundle exec rake compile
-    - name: Run tests
-      run: bundle exec rspec

data/ext/zstdruby/libzstd/.gitignore

@@ -1,3 +0,0 @@
-# make install artefact
-libzstd.pc
-libzstd-nomt

data/ext/zstdruby/libzstd/BUCK

@@ -1,232 +0,0 @@
-cxx_library(
-    name='zstd',
-    header_namespace='',
-    exported_headers=['zstd.h'],
-    visibility=['PUBLIC'],
-    deps=[
-        ':common',
-        ':compress',
-        ':decompress',
-        ':deprecated',
-    ],
-)
-
-cxx_library(
-    name='compress',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('compress', 'zstd*.h'),
-    ]),
-    srcs=glob(['compress/zstd*.c', 'compress/hist.c']),
-    deps=[':common'],
-)
-
-cxx_library(
-    name='decompress',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    headers=subdir_glob([
-        ('decompress', '*_impl.h'),
-    ]),
-    srcs=glob(['decompress/zstd*.c']),
-    deps=[
-        ':common',
-        ':legacy',
-    ],
-)
-
-cxx_library(
-    name='deprecated',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('deprecated', '*.h'),
-    ]),
-    srcs=glob(['deprecated/*.c']),
-    deps=[':common'],
-)
-
-cxx_library(
-    name='legacy',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('legacy', '*.h'),
-    ]),
-    srcs=glob(['legacy/*.c']),
-    deps=[':common'],
-    exported_preprocessor_flags=[
-        '-DZSTD_LEGACY_SUPPORT=4',
-    ],
-)
-
-cxx_library(
-    name='zdict',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=['zdict.h'],
-    headers=subdir_glob([
-        ('dictBuilder', 'divsufsort.h'),
-        ('dictBuilder', 'cover.h'),
-    ]),
-    srcs=glob(['dictBuilder/*.c']),
-    deps=[':common'],
-)
-
-cxx_library(
-    name='compiler',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('common', 'compiler.h'),
-    ]),
-)
-
-cxx_library(
-    name='cpu',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('common', 'cpu.h'),
-    ]),
-)
-
-cxx_library(
-    name='bitstream',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('common', 'bitstream.h'),
-    ]),
-)
-
-cxx_library(
-    name='entropy',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('common', 'fse.h'),
-        ('common', 'huf.h'),
-    ]),
-    srcs=[
-        'common/entropy_common.c',
-        'common/fse_decompress.c',
-        'compress/fse_compress.c',
-        'compress/huf_compress.c',
-        'decompress/huf_decompress.c',
-    ],
-    deps=[
-        ':debug',
-        ':bitstream',
-        ':compiler',
-        ':errors',
-        ':mem',
-    ],
-)
-
-cxx_library(
-    name='errors',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=[
-        'zstd_errors.h',
-        'common/error_private.h',
-    ]
-    srcs=['common/error_private.c'],
-)
-
-cxx_library(
-    name='mem',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('common', 'mem.h'),
-    ]),
-)
-
-cxx_library(
-    name='pool',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('common', 'pool.h'),
-    ]),
-    srcs=['common/pool.c'],
-    deps=[
-        ':threading',
-        ':zstd_common',
-    ],
-)
-
-cxx_library(
-    name='threading',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('common', 'threading.h'),
-    ]),
-    srcs=['common/threading.c'],
-    exported_preprocessor_flags=[
-        '-DZSTD_MULTITHREAD',
-    ],
-    exported_linker_flags=[
-        '-pthread',
-    ],
-)
-
-cxx_library(
-    name='xxhash',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('common', 'xxhash.h'),
-    ]),
-    srcs=['common/xxhash.c'],
-    exported_preprocessor_flags=[
-        '-DXXH_NAMESPACE=ZSTD_',
-    ],
-)
-
-cxx_library(
-    name='zstd_common',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('', 'zstd.h'),
-        ('common', 'zstd_internal.h'),
-    ]),
-    srcs=['common/zstd_common.c'],
-    deps=[
-        ':compiler',
-        ':errors',
-        ':mem',
-    ],
-)
-
-cxx_library(
-    name='debug',
-    header_namespace='',
-    visibility=['PUBLIC'],
-    exported_headers=subdir_glob([
-        ('common', 'debug.h'),
-    ]),
-    srcs=['common/debug.c'],
-)
-
-cxx_library(
-    name='common',
-    deps=[
-        ':debug',
-        ':bitstream',
-        ':compiler',
-        ':cpu',
-        ':entropy',
-        ':errors',
-        ':mem',
-        ':pool',
-        ':threading',
-        ':xxhash',
-        ':zstd_common',
-    ]
-)