extlz4 0.2.5 → 0.3

data/contrib/lz4/lib/xxhash.h

@@ -57,8 +57,8 @@ Q.Score is a measure of quality of the hash function.
 It depends on successfully passing SMHasher test set.
 10 is a perfect score.
 
-A 64-bits version, named XXH64, is available since r35.
-It offers much better speed, but for 64-bits applications only.
+A 64-bit version, named XXH64, is available since r35.
+It offers much better speed, but for 64-bit applications only.
 Name     Speed on 64 bits    Speed on 32 bits
 XXH64       13.8 GB/s            1.9 GB/s
 XXH32        6.8 GB/s            6.0 GB/s
@@ -80,18 +80,19 @@ typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
 
 
 /* ****************************
-*  API modifier
-******************************/
-/** XXH_PRIVATE_API
-*   This is useful to include xxhash functions in `static` mode
-*   in order to inline them, and remove their symbol from the public list.
-*   Methodology :
-*     #define XXH_PRIVATE_API
-*     #include "xxhash.h"
-*   `xxhash.c` is automatically included.
-*   It's not useful to compile and link it as a separate module.
-*/
-#ifdef XXH_PRIVATE_API
+ *  API modifier
+ ******************************/
+/** XXH_INLINE_ALL (and XXH_PRIVATE_API)
+ *  This is useful to include xxhash functions in `static` mode
+ *  in order to inline them, and remove their symbol from the public list.
+ *  Inlining can offer dramatic performance improvement on small keys.
+ *  Methodology :
+ *     #define XXH_INLINE_ALL
+ *     #include "xxhash.h"
+ * `xxhash.c` is automatically included.
+ *  It's not useful to compile and link it as a separate module.
+ */
+#if defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)
 #  ifndef XXH_STATIC_LINKING_ONLY
 #    define XXH_STATIC_LINKING_ONLY
 #  endif
@@ -102,23 +103,24 @@ typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
 #  elif defined(_MSC_VER)
 #    define XXH_PUBLIC_API static __inline
 #  else
-#    define XXH_PUBLIC_API static   /* this version may generate warnings for unused static functions; disable the relevant warning */
+     /* this version may generate warnings for unused static functions */
+#    define XXH_PUBLIC_API static
 #  endif
 #else
 #  define XXH_PUBLIC_API   /* do nothing */
-#endif /* XXH_PRIVATE_API */
-
-/*!XXH_NAMESPACE, aka Namespace Emulation :
-
-If you want to include _and expose_ xxHash functions from within your own library,
-but also want to avoid symbol collisions with other libraries which may also include xxHash,
-
-you can use XXH_NAMESPACE, to automatically prefix any public symbol from xxhash library
-with the value of XXH_NAMESPACE (therefore, avoid NULL and numeric values).
-
-Note that no change is required within the calling program as long as it includes `xxhash.h` :
-regular symbol name will be automatically translated by this header.
-*/
+#endif /* XXH_INLINE_ALL || XXH_PRIVATE_API */
+
+/*! XXH_NAMESPACE, aka Namespace Emulation :
+ *
+ * If you want to include _and expose_ xxHash functions from within your own library,
+ * but also want to avoid symbol collisions with other libraries which may also include xxHash,
+ *
+ * you can use XXH_NAMESPACE, to automatically prefix any public symbol from xxhash library
+ * with the value of XXH_NAMESPACE (therefore, avoid NULL and numeric values).
+ *
+ * Note that no change is required within the calling program as long as it includes `xxhash.h` :
+ * regular symbol name will be automatically translated by this header.
+ */
 #ifdef XXH_NAMESPACE
 #  define XXH_CAT(A,B) A##B
 #  define XXH_NAME2(A,B) XXH_CAT(A,B)
@@ -149,18 +151,18 @@ regular symbol name will be automatically translated by this header.
 ***************************************/
 #define XXH_VERSION_MAJOR    0
 #define XXH_VERSION_MINOR    6
-#define XXH_VERSION_RELEASE  2
+#define XXH_VERSION_RELEASE  5
 #define XXH_VERSION_NUMBER  (XXH_VERSION_MAJOR *100*100 + XXH_VERSION_MINOR *100 + XXH_VERSION_RELEASE)
 XXH_PUBLIC_API unsigned XXH_versionNumber (void);
 
 
 /*-**********************************************************************
-*  32-bits hash
+*  32-bit hash
 ************************************************************************/
-typedef unsigned int       XXH32_hash_t;
+typedef unsigned int XXH32_hash_t;
 
 /*! XXH32() :
-    Calculate the 32-bits hash of sequence "length" bytes stored at memory address "input".
+    Calculate the 32-bit hash of sequence "length" bytes stored at memory address "input".
     The memory between input & input+length must be valid (allocated and read-accessible).
     "seed" can be used to alter the result predictably.
     Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s */
@@ -177,26 +179,25 @@ XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* statePtr, const void*
 XXH_PUBLIC_API XXH32_hash_t  XXH32_digest (const XXH32_state_t* statePtr);
 
 /*
-These functions generate the xxHash of an input provided in multiple segments.
-Note that, for small input, they are slower than single-call functions, due to state management.
-For small input, prefer `XXH32()` and `XXH64()` .
-
-XXH state must first be allocated, using XXH*_createState() .
-
-Start a new hash by initializing state with a seed, using XXH*_reset().
-
-Then, feed the hash state by calling XXH*_update() as many times as necessary.
-Obviously, input must be allocated and read accessible.
-The function returns an error code, with 0 meaning OK, and any other value meaning there is an error.
-
-Finally, a hash value can be produced anytime, by using XXH*_digest().
-This function returns the nn-bits hash as an int or long long.
-
-It's still possible to continue inserting input into the hash state after a digest,
-and generate some new hashes later on, by calling again XXH*_digest().
-
-When done, free XXH state space if it was allocated dynamically.
-*/
+ * Streaming functions generate the xxHash of an input provided in multiple segments.
+ * Note that, for small input, they are slower than single-call functions, due to state management.
+ * For small inputs, prefer `XXH32()` and `XXH64()`, which are better optimized.
+ *
+ * XXH state must first be allocated, using XXH*_createState() .
+ *
+ * Start a new hash by initializing state with a seed, using XXH*_reset().
+ *
+ * Then, feed the hash state by calling XXH*_update() as many times as necessary.
+ * The function returns an error code, with 0 meaning OK, and any other value meaning there is an error.
+ *
+ * Finally, a hash value can be produced anytime, by using XXH*_digest().
+ * This function returns the nn-bits hash as an int or long long.
+ *
+ * It's still possible to continue inserting input into the hash state after a digest,
+ * and generate some new hashes later on, by calling again XXH*_digest().
+ *
+ * When done, free XXH state space if it was allocated dynamically.
+ */
 
 /*======   Canonical representation   ======*/
 
@@ -205,22 +206,22 @@ XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t
 XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src);
 
 /* Default result type for XXH functions are primitive unsigned 32 and 64 bits.
-*  The canonical representation uses human-readable write convention, aka big-endian (large digits first).
-*  These functions allow transformation of hash result into and from its canonical format.
-*  This way, hash values can be written into a file / memory, and remain comparable on different systems and programs.
-*/
+ * The canonical representation uses human-readable write convention, aka big-endian (large digits first).
+ * These functions allow transformation of hash result into and from its canonical format.
+ * This way, hash values can be written into a file / memory, and remain comparable on different systems and programs.
+ */
 
 
 #ifndef XXH_NO_LONG_LONG
 /*-**********************************************************************
-*  64-bits hash
+*  64-bit hash
 ************************************************************************/
 typedef unsigned long long XXH64_hash_t;
 
 /*! XXH64() :
-    Calculate the 64-bits hash of sequence of length "len" stored at memory address "input".
+    Calculate the 64-bit hash of sequence of length "len" stored at memory address "input".
     "seed" can be used to alter the result predictably.
-    This function runs faster on 64-bits systems, but slower on 32-bits systems (see benchmark).
+    This function runs faster on 64-bit systems, but slower on 32-bit systems (see benchmark).
 */
 XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, unsigned long long seed);
 
@@ -241,48 +242,82 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src
 #endif  /* XXH_NO_LONG_LONG */
 
 
+
 #ifdef XXH_STATIC_LINKING_ONLY
 
 /* ================================================================================================
-   This section contains definitions which are not guaranteed to remain stable.
+   This section contains declarations which are not guaranteed to remain stable.
    They may change in future versions, becoming incompatible with a different version of the library.
-   They shall only be used with static linking.
-   Never use these definitions in association with dynamic linking !
+   These declarations should only be used with static linking.
+   Never use them in association with dynamic linking !
 =================================================================================================== */
 
-/* These definitions are only meant to allow allocation of XXH state
-   statically, on stack, or in a struct for example.
-   Do not use members directly. */
-
-   struct XXH32_state_s {
-       unsigned total_len_32;
-       unsigned large_len;
-       unsigned v1;
-       unsigned v2;
-       unsigned v3;
-       unsigned v4;
-       unsigned mem32[4];   /* buffer defined as U32 for alignment */
-       unsigned memsize;
-       unsigned reserved;   /* never read nor write, will be removed in a future version */
-   };   /* typedef'd to XXH32_state_t */
-
-#ifndef XXH_NO_LONG_LONG
-   struct XXH64_state_s {
-       unsigned long long total_len;
-       unsigned long long v1;
-       unsigned long long v2;
-       unsigned long long v3;
-       unsigned long long v4;
-       unsigned long long mem64[4];   /* buffer defined as U64 for alignment */
-       unsigned memsize;
-       unsigned reserved[2];          /* never read nor write, will be removed in a future version */
-   };   /* typedef'd to XXH64_state_t */
+/* These definitions are only present to allow
+ * static allocation of XXH state, on stack or in a struct for example.
+ * Never **ever** use members directly. */
+
+#if !defined (__VMS) \
+  && (defined (__cplusplus) \
+  || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+#   include <stdint.h>
+
+struct XXH32_state_s {
+   uint32_t total_len_32;
+   uint32_t large_len;
+   uint32_t v1;
+   uint32_t v2;
+   uint32_t v3;
+   uint32_t v4;
+   uint32_t mem32[4];
+   uint32_t memsize;
+   uint32_t reserved;   /* never read nor write, might be removed in a future version */
+};   /* typedef'd to XXH32_state_t */
+
+struct XXH64_state_s {
+   uint64_t total_len;
+   uint64_t v1;
+   uint64_t v2;
+   uint64_t v3;
+   uint64_t v4;
+   uint64_t mem64[4];
+   uint32_t memsize;
+   uint32_t reserved[2];          /* never read nor write, might be removed in a future version */
+};   /* typedef'd to XXH64_state_t */
+
+# else
+
+struct XXH32_state_s {
+   unsigned total_len_32;
+   unsigned large_len;
+   unsigned v1;
+   unsigned v2;
+   unsigned v3;
+   unsigned v4;
+   unsigned mem32[4];
+   unsigned memsize;
+   unsigned reserved;   /* never read nor write, might be removed in a future version */
+};   /* typedef'd to XXH32_state_t */
+
+#   ifndef XXH_NO_LONG_LONG  /* remove 64-bit support */
+struct XXH64_state_s {
+   unsigned long long total_len;
+   unsigned long long v1;
+   unsigned long long v2;
+   unsigned long long v3;
+   unsigned long long v4;
+   unsigned long long mem64[4];
+   unsigned memsize;
+   unsigned reserved[2];     /* never read nor write, might be removed in a future version */
+};   /* typedef'd to XXH64_state_t */
+#    endif
+
+# endif
+
+
+#if defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)
+#  include "xxhash.c"   /* include xxhash function bodies as `static`, for inlining */
 #endif
 
-#  ifdef XXH_PRIVATE_API
-#    include "xxhash.c"   /* include xxhash function bodies as `static`, for inlining */
-#  endif
-
 #endif /* XXH_STATIC_LINKING_ONLY */
 
 

data/ext/blockapi.c

@@ -504,7 +504,7 @@ blkenc_update(int argc, VALUE argv[], VALUE enc)
     int s = p->traits->update(p->context, srcp, RSTRING_PTR(dest), srcsize, maxsize, p->level);
     if (s <= 0) {
         rb_raise(extlz4_eError,
-                "destsize too small (given destsize is %zu)",
+                "destsize too small (given destsize is %"PRIuSIZE")",
                 rb_str_capacity(dest));
     }
     p->prefixsize = p->traits->savedict(p->context, p->prefix, sizeof(p->prefix));
@@ -684,7 +684,7 @@ blkenc_s_encode(int argc, VALUE argv[], VALUE lz4)
     size_t srcsize = RSTRING_LEN(src);
     if (srcsize > LZ4_MAX_INPUT_SIZE) {
         rb_raise(extlz4_eError,
-                 "source size is too big for lz4 encode (given %zu, but max %zu bytes)",
+                 "source size is too big for lz4 encode (given %"PRIuSIZE", but max %"PRIuSIZE" bytes)",
                  srcsize, (size_t)LZ4_MAX_INPUT_SIZE);
     }
     aux_str_reserve(dest, maxsize);

data/ext/lz4_amalgam.c

@@ -3,29 +3,6 @@
 #endif
 
 #include "../contrib/lz4/lib/lz4.c"
-
-#define LZ4_isLittleEndian      amalg_LZ4_isLittleEndian
-#define LZ4_read16              amalg_LZ4_read16
-#define LZ4_read32              amalg_LZ4_read32
-#define LZ4_read_ARCH           amalg_LZ4_read_ARCH
-#define LZ4_write16             amalg_LZ4_write16
-#define LZ4_write32             amalg_LZ4_write32
-#define LZ4_readLE16            amalg_LZ4_readLE16
-#define LZ4_writeLE16           amalg_LZ4_writeLE16
-#define LZ4_copy8               amalg_LZ4_copy8
-#define LZ4_wildCopy            amalg_LZ4_wildCopy
-#define LZ4_minLength           amalg_LZ4_minLength
-#define LZ4_NbCommonBytes       amalg_LZ4_NbCommonBytes
-#define LZ4_count               amalg_LZ4_count
-#define limitedOutput           amalg_limitedOutput
-#define limitedOutput_directive amalg_limitedOutput_directive
-#define unalign                 amalg_unalign
 #include "../contrib/lz4/lib/lz4hc.c"
-
-#undef ALLOCATOR
-#undef KB
-#undef MB
-#undef GB
 #include "../contrib/lz4/lib/lz4frame.c"
-
 #include "../contrib/lz4/lib/xxhash.c"

data/gemstub.rb

@@ -1,8 +1,7 @@
-unless File.read("README.md", 4096) =~ /^\s*\*\s*version:{1,2}\s*(.+)/i
+unless ver = File.read("README.md").scan(/^\s*[\*\-]\s*version:{1,2}\s*(.+)/i).flatten[-1]
   raise "バージョン情報が README.md に見つかりません"
 end
 
-ver = $1
 verfile = "lib/extlz4/version.rb"
 LIB << verfile
 
@@ -29,12 +28,13 @@ GEMSTUB = Gem::Specification.new do |s|
   s.version = ver
   s.summary = "ruby bindings for LZ4"
   s.description = <<EOS
-ruby bindings for LZ4 <https://github.com/lz4/lz4>.
+unofficial ruby bindings for LZ4 <https://github.com/lz4/lz4>.
 EOS
   s.homepage = "https://github.com/dearblue/ruby-extlz4"
   s.license = "BSD-2-Clause"
   s.author = "dearblue"
   s.email = "dearblue@users.noreply.github.com"
 
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "~> 1.12", ">= 1.12.3"
+  s.add_development_dependency "test-unit", "~> 3.2", ">= 3.2.7"
 end

data/lib/extlz4.rb

@@ -322,6 +322,52 @@ module LZ4
     alias block_stream_decompress block_stream_decode
     alias block_stream_uncompress block_stream_decode
   end
+
+  refine String do
+    #
+    # call-seq:
+    #   to_lz4frame(level = 1, opts = {}) -> lz4 frame'd data
+    #
+    def to_lz4frame(*args)
+      LZ4.encode self, *args
+    end
+
+    #
+    # call-seq:
+    #   unlz4frame -> decoded data
+    #
+    def unlz4frame(*args, &block)
+      LZ4.decode self, *args, &block
+    end
+
+    def to_lz4block(*args)
+      LZ4.block_encode(self, *args)
+    end
+
+    def unlz4block(*args)
+      LZ4.block_decode(self, *args)
+    end
+  end
+
+  refine Object do
+    #
+    # call-seq:
+    #   to_lz4frame(level = 1, opts = {}) -> stream encoder
+    #   to_lz4frame(level = 1, opts = {}) { |stream_encoder| ... } -> yield_status
+    #
+    def to_lz4frame(*args, &block)
+      LZ4.encode self, *args, &block
+    end
+
+    #
+    # call-seq:
+    #    -> decoder
+    #    { |decoder| ... } -> yield_status
+    #
+    def unlz4frame(*args, &block)
+      LZ4.decode self, *args, &block
+    end
+  end
 end
 
 require_relative "extlz4/compat"

data/lib/extlz4/version.rb

@@ -1,3 +1,3 @@
 module LZ4
-  VERSION = "0.2.5"
+  VERSION = "0.3"
 end

metadata

@@ -1,32 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: extlz4
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: '0.3'
 platform: ruby
 authors:
 - dearblue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.12.3
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: 'ruby bindings for LZ4 <https://github.com/lz4/lz4>.
+        version: 3.2.7
+description: 'unofficial ruby bindings for LZ4 <https://github.com/lz4/lz4>.
 
-'
+  '
 email: dearblue@users.noreply.github.com
 executables:
 - extlz4
@@ -62,7 +88,6 @@ files:
 - contrib/lz4/LICENSE
 - contrib/lz4/NEWS
 - contrib/lz4/README.md
-- contrib/lz4/circle.yml
 - contrib/lz4/lib/LICENSE
 - contrib/lz4/lib/README.md
 - contrib/lz4/lib/liblz4.pc.in
@@ -73,7 +98,6 @@ files:
 - contrib/lz4/lib/lz4frame_static.h
 - contrib/lz4/lib/lz4hc.c
 - contrib/lz4/lib/lz4hc.h
-- contrib/lz4/lib/lz4opt.h
 - contrib/lz4/lib/xxhash.c
 - contrib/lz4/lib/xxhash.h
 - examples/frameapi.rb
@@ -118,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ruby bindings for LZ4