extzstd 0.3 → 0.3.1

data/ext/extzstd.h

@@ -183,7 +183,7 @@ aux_const_dig_str_0(VALUE obj, const char *p[], const char **pp)
 #   define RBEXT_IMPORT __declspec(dllimport)
 #   define RBEXT_EXPORT __declspec(dllexport)
 #   define RBEXT_LOCAL
-#elif __GNUC__ >= 4 || __clang__
+#elif defined(__GNUC__) && __GNUC__ >= 4 || defined(__clang__)
 #   define RBEXT_IMPORT __attribute__((visibility("default")))
 #   define RBEXT_EXPORT __attribute__((visibility("default")))
 #   define RBEXT_LOCAL  __attribute__((visibility("hidden")))

data/ext/libzstd_conf.h

@@ -0,0 +1,8 @@
+#ifndef RUBY_ZSTD_LIBZSTD_CONF_H
+#define RUBY_ZSTD_LIBZSTD_CONF_H 1
+
+#define ZSTD_LEGACY_SUPPORT 1
+#define MEM_MODULE 1
+#define visibility(v) visibility("hidden")
+
+#endif /* RUBY_ZSTD_LIBZSTD_CONF_H */

data/ext/zstd_common.c

@@ -1,6 +1,4 @@
-#define ZSTD_LEGACY_SUPPORT 1
-#define MEM_MODULE 1
-#define visibility(v) visibility("hidden")
+#include "libzstd_conf.h"
 
 #include "../contrib/zstd/lib/common/entropy_common.c"
 #include "../contrib/zstd/lib/common/error_private.c"

data/ext/zstd_compress.c

@@ -1,12 +1,12 @@
-#define ZSTD_LEGACY_SUPPORT 1
-#define MEM_MODULE 1
-#define visibility(v) visibility("hidden")
+#include "libzstd_conf.h"
 
 #include "../contrib/zstd/lib/compress/fse_compress.c"
 #include "../contrib/zstd/lib/compress/huf_compress.c"
 
 #undef CHECK_F
 #include "../contrib/zstd/lib/compress/zstd_compress.c"
+#include "../contrib/zstd/lib/compress/zstd_compress_literals.c"
+#include "../contrib/zstd/lib/compress/zstd_compress_sequences.c"
 #include "../contrib/zstd/lib/compress/zstd_double_fast.c"
 #include "../contrib/zstd/lib/compress/zstd_fast.c"
 #include "../contrib/zstd/lib/compress/zstd_lazy.c"

data/ext/zstd_decompress.c

@@ -1,10 +1,6 @@
-#define ZSTD_LEGACY_SUPPORT 1
-#define MEM_MODULE 1
-#define visibility(v) visibility("hidden")
+#include "libzstd_conf.h"
 
 #include "../contrib/zstd/lib/decompress/zstd_decompress.c"
 #include "../contrib/zstd/lib/decompress/zstd_decompress_block.c"
-
-#undef CHECK_F
 #include "../contrib/zstd/lib/decompress/huf_decompress.c"
 #include "../contrib/zstd/lib/decompress/zstd_ddict.c"

data/ext/zstd_dictbuilder.c

@@ -1,6 +1,4 @@
-#define ZSTD_LEGACY_SUPPORT 1
-#define MEM_MODULE 1
-#define visibility(v) visibility("hidden")
+#include "libzstd_conf.h"
 
 #include "../contrib/zstd/lib/dictBuilder/zdict.c"
 #include "../contrib/zstd/lib/dictBuilder/divsufsort.c"
@@ -8,4 +6,5 @@
 #undef DISPLAY
 #undef DISPLAYLEVEL
 #undef DISPLAYUPDATE
+#define prime4bytes cover_prime4bytes
 #include "../contrib/zstd/lib/dictBuilder/cover.c"

data/ext/zstd_dictbuilder_fastcover.c

@@ -1,5 +1,3 @@
-#define ZSTD_LEGACY_SUPPORT 1
-#define MEM_MODULE 1
-#define visibility(v) visibility("hidden")
+#include "libzstd_conf.h"
 
 #include "../contrib/zstd/lib/dictBuilder/fastcover.c"

data/ext/zstd_legacy_v01.c

@@ -1 +1,3 @@
+#include "libzstd_conf.h"
+
 #include "../contrib/zstd/lib/legacy/zstd_v01.c"

data/ext/zstd_legacy_v02.c

@@ -1 +1,3 @@
+#include "libzstd_conf.h"
+
 #include "../contrib/zstd/lib/legacy/zstd_v02.c"

data/ext/zstd_legacy_v03.c

@@ -1 +1,3 @@
+#include "libzstd_conf.h"
+
 #include "../contrib/zstd/lib/legacy/zstd_v03.c"

data/ext/zstd_legacy_v04.c

@@ -1 +1,3 @@
+#include "libzstd_conf.h"
+
 #include "../contrib/zstd/lib/legacy/zstd_v04.c"

data/ext/zstd_legacy_v05.c

@@ -1 +1,3 @@
+#include "libzstd_conf.h"
+
 #include "../contrib/zstd/lib/legacy/zstd_v05.c"

data/ext/zstd_legacy_v06.c

@@ -1 +1,3 @@
+#include "libzstd_conf.h"
+
 #include "../contrib/zstd/lib/legacy/zstd_v06.c"

data/ext/zstd_legacy_v07.c

@@ -1 +1,3 @@
+#include "libzstd_conf.h"
+
 #include "../contrib/zstd/lib/legacy/zstd_v07.c"

data/lib/extzstd.rb

@@ -2,7 +2,7 @@
 
 ver = RUBY_VERSION.slice(/\d+\.\d+/)
 soname = File.basename(__FILE__, ".rb") << ".so"
-require_relative File.join(ver, soname)
+require File.join(ver, soname)
 
 require_relative "extzstd/version"
 
@@ -12,13 +12,21 @@ require "stringio"
 # This is ruby bindings for zstd <https://github.com/Cyan4973/zstd> the compression library.
 #
 module Zstd
-  module Aux
-    EMPTY_BUFFER = "".force_encoding(Encoding::BINARY).freeze
+  module Internals
+    unless String.method_defined? :b
+      refine String do
+        def b
+          dup.force_encoding(Encoding::BINARY)
+        end
+      end
+    end
   end
 
+  using Internals
+
   refine String do
     def to_zstd(params = nil, dict: nil)
-      ContextLess.encode(self, Aux::EMPTY_BUFFER.dup, nil, dict, params)
+      ContextLess.encode(self, "".b, nil, dict, params)
     end
 
     def unzstd(size = nil, dict: nil)
@@ -52,8 +60,8 @@ module Zstd
   # [level = nil (integer or nil)]
   # [encode_params (instance of Zstd::Parameters)]
   # [opts dict: nil (string or nil)]
-  def self.encode(src, *args, &block)
-    src.to_zstd(*args, &block)
+  def self.encode(src, *args, **opts, &block)
+    src.to_zstd(*args, **opts, &block)
   end
 
   #
@@ -62,8 +70,8 @@ module Zstd
   #   decode(zstd_stream, dict: nil) -> zstd decoder
   #   decode(zstd_stream, dict: nil) { |decoder| ... } -> yield returned value
   #
-  def self.decode(src, *args, &block)
-    src.unzstd(*args, &block)
+  def self.decode(src, *args, **opts, &block)
+    src.unzstd(*args, **opts, &block)
   end
 
   class << Zstd
@@ -94,7 +102,7 @@ module Zstd
     end
 
     def self.encode(src, params = nil, dest: nil, dict: nil)
-      ContextLess.encode(src, dest || Aux::EMPTY_BUFFER.dup, nil, dict, params)
+      ContextLess.encode(src, dest || "".b, nil, dict, params)
     end
 
     class << Encoder
@@ -131,7 +139,7 @@ module Zstd
 
     def self.decode(src, dest: nil, dict: nil)
       # NOTE: ContextLess.decode は伸長時のサイズが必要なため、常に利用できるわけではない
-      # ContextLess.decode(src, dest || Aux::EMPTY_BUFFER.dup, nil, dict)
+      # ContextLess.decode(src, dest || "".b, nil, dict)
 
       new(StringIO.new(src), dict).read(nil, dest)
     end

data/lib/extzstd/version.rb

@@ -1,3 +1,3 @@
 module Zstd
-  VERSION = "0.3"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extzstd
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - dearblue
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,7 @@ extra_rdoc_files:
 - ext/extzstd.h
 - ext/extzstd_nogvls.h
 - ext/extzstd_stream.c
+- ext/libzstd_conf.h
 - ext/zstd_common.c
 - ext/zstd_compress.c
 - ext/zstd_decompress.c
@@ -101,6 +102,13 @@ files:
 - contrib/zstd/lib/compress/huf_compress.c
 - contrib/zstd/lib/compress/zstd_compress.c
 - contrib/zstd/lib/compress/zstd_compress_internal.h
+- contrib/zstd/lib/compress/zstd_compress_literals.c
+- contrib/zstd/lib/compress/zstd_compress_literals.h
+- contrib/zstd/lib/compress/zstd_compress_sequences.c
+- contrib/zstd/lib/compress/zstd_compress_sequences.h
+- contrib/zstd/lib/compress/zstd_compress_superblock.c
+- contrib/zstd/lib/compress/zstd_compress_superblock.h
+- contrib/zstd/lib/compress/zstd_cwksp.h
 - contrib/zstd/lib/compress/zstd_double_fast.c
 - contrib/zstd/lib/compress/zstd_double_fast.h
 - contrib/zstd/lib/compress/zstd_fast.c
@@ -154,6 +162,7 @@ files:
 - ext/extzstd.h
 - ext/extzstd_nogvls.h
 - ext/extzstd_stream.c
+- ext/libzstd_conf.h
 - ext/zstd_common.c
 - ext/zstd_compress.c
 - ext/zstd_decompress.c
@@ -174,7 +183,7 @@ homepage: https://github.com/dearblue/ruby-extzstd/
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset"
 - UTF-8
@@ -193,8 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: ruby bindings for Zstandard (zstd)
 test_files: []