ruby-lzws 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08551ca534634f131621d9bea42ec6d06bf7b1be6f3f7f3cb33bd11f9744ec1a'
-  data.tar.gz: db0b8c35c381df919bb9b21b9064abd4d88bdc28a82cdead9365f97c4e698b96
+  metadata.gz: c705cd3581e745a96ee58e79c8b9b9ca69a55294d499db00ed5a073be0efa42b
+  data.tar.gz: 4925c44f35575a3be67419285b0ca911e6f10e74d52c63c42f9277a249de9a01
 SHA512:
-  metadata.gz: 0063ee032bf5b6cac9d7e16e696e235c18acec9a6ae48a66c5516906ca290b1c30fb6a0867d371b7b2404706a7523130e00e3b7bb17c1484017a0862a0c7c03f
-  data.tar.gz: eb1905eb2a128c716ffec1693b5be4ce94fb52894ea60adcb446ae03cc3263d8b51b62092e7e164085e875dac752a328b110c68bfdcfc631356d294ec3c50bd6
+  metadata.gz: f879b4d19f3de43d0304a6e70ce86c262b4d0085e2f3f7d101308a80785ccd808d1240372a85f8f49929526566682824f28c61b90bb0b9a1649e75c6726dabae
+  data.tar.gz: f2bbb94977b0eecb1e00a3bf655b4dcf08d428b256bebebcb95b37e9da7bf135a9958e7f38f6a0fe2ce5abdfb9bf413e0a3864e1ade7885102726a1541c884ed

data/README.md

@@ -1,13 +1,14 @@
 # Ruby bindings for lzws library
 
-[![Travis build status](https://travis-ci.org/andrew-aladev/ruby-lzws.svg?branch=master)](https://travis-ci.org/andrew-aladev/ruby-lzws)
-[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/github/andrew-aladev/ruby-lzws?branch=master&svg=true)](https://ci.appveyor.com/project/andrew-aladev/ruby-lzws/branch/master)
+| Travis | AppVeyor | Cirrus | Circle |
+| :---:  | :---:    | :---:  | :---:  |
+| [![Travis test status](https://travis-ci.com/andrew-aladev/ruby-lzws.svg?branch=master)](https://travis-ci.com/andrew-aladev/ruby-lzws) | [![AppVeyor test status](https://ci.appveyor.com/api/projects/status/github/andrew-aladev/ruby-lzws?branch=master&svg=true)](https://ci.appveyor.com/project/andrew-aladev/ruby-lzws/branch/master) | [![Cirrus test status](https://api.cirrus-ci.com/github/andrew-aladev/ruby-lzws.svg?branch=master)](https://cirrus-ci.com/github/andrew-aladev/ruby-lzws) | [![Circle test status](https://circleci.com/gh/andrew-aladev/ruby-lzws/tree/master.svg?style=shield)](https://circleci.com/gh/andrew-aladev/ruby-lzws/tree/master) |
 
 See [lzws library](https://github.com/andrew-aladev/lzws).
 
 ## Installation
 
-Please install lzws library first.
+Please install lzws library first, use latest 1.3.0+ version.
 
 ```sh
 gem install ruby-lzws
@@ -81,7 +82,7 @@ Values: 0, 2 - infinity, default value: 0.
 :max_code_bit_length
 ```
 
-Values: 9 - 16, default value: 16.
+Values: `LZWS::Option::LOWEST_MAX_CODE_BIT_LENGTH` - `LZWS::Option::BIGGEST_MAX_CODE_BIT_LENGTH`, default value: `LZWS::Option::BIGGEST_MAX_CODE_BIT_LENGTH`.
 
 ```
 :block_mode
@@ -332,6 +333,12 @@ See [`IO`](https://ruby-doc.org/core-2.6.1/IO.html) docs.
 
 Typical helpers, see [`Zlib::GzipReader`](https://ruby-doc.org/stdlib-2.6.1/libdoc/zlib/rdoc/Zlib/GzipReader.html) docs.
 
+## CI
+
+Travis and Appveyor CI uses [scripts/ci_test.sh](scripts/ci_test.sh) directly.
+Cirrus and Circle CI uses prebuilt [scripts/test-images](scripts/test-images).
+Cirrus CI uses amd64 image, Circle CI - i686.
+
 ## License
 
 MIT license, see LICENSE and AUTHORS.

data/ext/extconf.rb

@@ -3,51 +3,57 @@
 
 require "mkmf"
 
-def require_header(name)
+def require_header(name, types = [])
   abort "Can't find #{name} header" unless find_header name
+
+  types.each do |type|
+    abort "Can't find #{type} type in #{name} header" unless find_type type, nil, name
+  end
 end
 
 require_header "lzws/buffer.h"
+require_header "lzws/common.h", %w[lzws_result_t]
 require_header "lzws/compressor/common.h"
 require_header "lzws/compressor/main.h"
-require_header "lzws/compressor/state.h"
+require_header "lzws/compressor/state.h", %w[lzws_compressor_state_t]
 require_header "lzws/decompressor/common.h"
 require_header "lzws/decompressor/main.h"
-require_header "lzws/decompressor/state.h"
+require_header "lzws/decompressor/state.h", %w[lzws_decompressor_state_t]
 require_header "lzws/file.h"
 
 def require_library(name, functions)
   functions.each do |function|
-    abort "Can't find #{name} library and #{function} function" unless find_library name, function
+    abort "Can't find #{function} function in #{name} library" unless find_library name, function
   end
 end
 
-functions = %w[
-  lzws_create_source_buffer_for_compressor
-  lzws_create_destination_buffer_for_compressor
-  lzws_create_source_buffer_for_decompressor
-  lzws_create_destination_buffer_for_decompressor
+require_library(
+  "lzws",
+  %w[
+    lzws_create_source_buffer_for_compressor
+    lzws_create_destination_buffer_for_compressor
+    lzws_create_source_buffer_for_decompressor
+    lzws_create_destination_buffer_for_decompressor
 
-  lzws_compressor_get_initial_state
-  lzws_compressor_free_state
-  lzws_compress
-  lzws_compressor_finish
+    lzws_compressor_get_initial_state
+    lzws_compressor_free_state
+    lzws_compress
+    lzws_compressor_finish
 
-  lzws_decompressor_get_initial_state
-  lzws_decompressor_free_state
-  lzws_decompress
-
-  lzws_compress_file
-  lzws_decompress_file
-]
-.freeze
+    lzws_decompressor_get_initial_state
+    lzws_decompressor_free_state
+    lzws_decompress
 
-require_library "lzws", functions
+    lzws_compress_file
+    lzws_decompress_file
+  ]
+)
 
 extension_name = "lzws_ext".freeze
 dir_config extension_name
 
-sources = %w[
+# rubocop:disable Style/GlobalVars
+$srcs = %w[
   stream/compressor
   stream/decompressor
   buffer
@@ -57,13 +63,9 @@ sources = %w[
   option
   string
 ]
+.map { |name| "src/#{extension_name}/#{name}.c" }
 .freeze
 
-# rubocop:disable Style/GlobalVars
-$srcs = sources
-  .map { |name| "src/#{extension_name}/#{name}.c" }
-  .freeze
-
 $CFLAGS << " -Wno-declaration-after-statement"
 $VPATH << "$(srcdir)/#{extension_name}:$(srcdir)/#{extension_name}/stream"
 # rubocop:enable Style/GlobalVars

data/ext/lzws_ext/buffer.c

@@ -7,12 +7,24 @@
 
 #include "ruby.h"
 
+VALUE lzws_ext_create_string_buffer(VALUE length)
+{
+  return rb_str_new(NULL, NUM2SIZET(length));
+}
+
+VALUE lzws_ext_resize_string_buffer(VALUE args)
+{
+  VALUE buffer = rb_ary_entry(args, 0);
+  VALUE length = rb_ary_entry(args, 1);
+  return rb_str_resize(buffer, NUM2SIZET(length));
+}
+
 void lzws_ext_buffer_exports(VALUE root_module)
 {
-  VALUE option = rb_define_module_under(root_module, "Buffer");
+  VALUE module = rb_define_module_under(root_module, "Buffer");
 
-  rb_define_const(option, "DEFAULT_SOURCE_BUFFER_LENGTH_FOR_COMPRESSOR", UINT2NUM(LZWS_DEFAULT_SOURCE_BUFFER_LENGTH_FOR_COMPRESSOR));
-  rb_define_const(option, "DEFAULT_DESTINATION_BUFFER_LENGTH_FOR_COMPRESSOR", UINT2NUM(LZWS_DEFAULT_DESTINATION_BUFFER_LENGTH_FOR_COMPRESSOR));
-  rb_define_const(option, "DEFAULT_SOURCE_BUFFER_LENGTH_FOR_DECOMPRESSOR", UINT2NUM(LZWS_DEFAULT_SOURCE_BUFFER_LENGTH_FOR_DECOMPRESSOR));
-  rb_define_const(option, "DEFAULT_DESTINATION_BUFFER_LENGTH_FOR_DECOMPRESSOR", UINT2NUM(LZWS_DEFAULT_DESTINATION_BUFFER_LENGTH_FOR_DECOMPRESSOR));
+  rb_define_const(module, "DEFAULT_SOURCE_BUFFER_LENGTH_FOR_COMPRESSOR", SIZET2NUM(LZWS_DEFAULT_SOURCE_BUFFER_LENGTH_FOR_COMPRESSOR));
+  rb_define_const(module, "DEFAULT_DESTINATION_BUFFER_LENGTH_FOR_COMPRESSOR", SIZET2NUM(LZWS_DEFAULT_DESTINATION_BUFFER_LENGTH_FOR_COMPRESSOR));
+  rb_define_const(module, "DEFAULT_SOURCE_BUFFER_LENGTH_FOR_DECOMPRESSOR", SIZET2NUM(LZWS_DEFAULT_SOURCE_BUFFER_LENGTH_FOR_DECOMPRESSOR));
+  rb_define_const(module, "DEFAULT_DESTINATION_BUFFER_LENGTH_FOR_DECOMPRESSOR", SIZET2NUM(LZWS_DEFAULT_DESTINATION_BUFFER_LENGTH_FOR_DECOMPRESSOR));
 }

data/ext/lzws_ext/buffer.h

@@ -6,6 +6,18 @@
 
 #include "ruby.h"
 
+VALUE lzws_ext_create_string_buffer(VALUE length);
+
+#define LZWS_EXT_CREATE_STRING_BUFFER(buffer, length, exception) \
+  VALUE buffer = rb_protect(lzws_ext_create_string_buffer, SIZET2NUM(length), &exception);
+
+VALUE lzws_ext_resize_string_buffer(VALUE args);
+
+#define LZWS_EXT_RESIZE_STRING_BUFFER(buffer, length, exception)            \
+  VALUE args = rb_ary_new_from_args(2, buffer, SIZET2NUM(length));          \
+  buffer     = rb_protect(lzws_ext_resize_string_buffer, args, &exception); \
+  RB_GC_GUARD(args);
+
 void lzws_ext_buffer_exports(VALUE root_module);
 
 #endif // LZWS_EXT_BUFFER_H

data/ext/lzws_ext/error.c

@@ -13,9 +13,9 @@ static inline NORETURN(void raise(const char* name, const char* description))
   rb_raise(error, "%s", description);
 }
 
-void lzws_ext_raise_error(lzws_ext_result_t result)
+void lzws_ext_raise_error(lzws_ext_result_t ext_result)
 {
-  switch (result) {
+  switch (ext_result) {
     case LZWS_EXT_ERROR_ALLOCATE_FAILED:
       raise("AllocateError", "allocate error");
     case LZWS_EXT_ERROR_VALIDATE_FAILED:

data/ext/lzws_ext/error.h

@@ -25,6 +25,6 @@ enum {
   LZWS_EXT_ERROR_UNEXPECTED
 };
 
-NORETURN(void lzws_ext_raise_error(lzws_ext_result_t result));
+NORETURN(void lzws_ext_raise_error(lzws_ext_result_t ext_result));
 
 #endif // LZWS_EXT_ERROR_H

data/ext/lzws_ext/io.c

@@ -3,6 +3,7 @@
 
 #include "ruby/io.h"
 
+#include <lzws/common.h>
 #include <lzws/file.h>
 
 #include "lzws_ext/common.h"
@@ -63,8 +64,7 @@ VALUE lzws_ext_compress_io(VALUE LZWS_EXT_UNUSED(self), VALUE source, VALUE dest
     without_magic_header, max_code_bit_length, block_mode, msb, unaligned_bit_groups, quiet);
 
   if (result != 0) {
-    lzws_ext_result_t ext_result = get_file_error(result);
-    lzws_ext_raise_error(ext_result);
+    lzws_ext_raise_error(get_file_error(result));
   }
 
   // Ruby itself won't flush stdio file before closing fd, flush is required.
@@ -88,8 +88,7 @@ VALUE lzws_ext_decompress_io(VALUE LZWS_EXT_UNUSED(self), VALUE source, VALUE de
     without_magic_header, msb, unaligned_bit_groups, quiet);
 
   if (result != 0) {
-    lzws_ext_result_t ext_result = get_file_error(result);
-    lzws_ext_raise_error(ext_result);
+    lzws_ext_raise_error(get_file_error(result));
   }
 
   // Ruby itself won't flush stdio file before closing fd, flush is required.

data/ext/lzws_ext/option.c

@@ -4,6 +4,7 @@
 #include "lzws_ext/option.h"
 
 #include <stdbool.h>
+#include <stdlib.h>
 
 #include "lzws_ext/error.h"
 #include "ruby.h"
@@ -25,7 +26,7 @@ bool lzws_ext_get_bool_option_value(VALUE options, const char* name)
   return raw_type == T_TRUE;
 }
 
-unsigned long lzws_ext_get_fixnum_option_value(VALUE options, const char* name)
+unsigned int lzws_ext_get_uint_option_value(VALUE options, const char* name)
 {
   VALUE raw_value = get_raw_option_value(options, name);
 
@@ -33,3 +34,12 @@ unsigned long lzws_ext_get_fixnum_option_value(VALUE options, const char* name)
 
   return NUM2UINT(raw_value);
 }
+
+size_t lzws_ext_get_size_option_value(VALUE options, const char* name)
+{
+  VALUE raw_value = get_raw_option_value(options, name);
+
+  Check_Type(raw_value, T_FIXNUM);
+
+  return NUM2SIZET(raw_value);
+}

data/ext/lzws_ext/option.h

@@ -5,24 +5,29 @@
 #define LZWS_EXT_OPTIONS_H
 
 #include <stdbool.h>
+#include <stdlib.h>
 
 #include "ruby.h"
 
-bool          lzws_ext_get_bool_option_value(VALUE options, const char* name);
-unsigned long lzws_ext_get_fixnum_option_value(VALUE options, const char* name);
+bool         lzws_ext_get_bool_option_value(VALUE options, const char* name);
+unsigned int lzws_ext_get_uint_option_value(VALUE options, const char* name);
+size_t       lzws_ext_get_size_option_value(VALUE options, const char* name);
 
 #define LZWS_EXT_GET_BOOL_OPTION(options, name) \
   bool name = lzws_ext_get_bool_option_value(options, #name);
 
-#define LZWS_EXT_GET_FIXNUM_OPTION(options, type, name) \
-  type name = lzws_ext_get_fixnum_option_value(options, #name);
+#define LZWS_EXT_GET_UINT_OPTION(options, type, name) \
+  type name = lzws_ext_get_uint_option_value(options, #name);
 
-#define LZWS_EXT_GET_COMPRESSOR_OPTIONS(options)                          \
-  LZWS_EXT_GET_BOOL_OPTION(options, without_magic_header);                \
-  LZWS_EXT_GET_FIXNUM_OPTION(options, uint_fast8_t, max_code_bit_length); \
-  LZWS_EXT_GET_BOOL_OPTION(options, block_mode);                          \
-  LZWS_EXT_GET_BOOL_OPTION(options, msb);                                 \
-  LZWS_EXT_GET_BOOL_OPTION(options, unaligned_bit_groups);                \
+#define LZWS_EXT_GET_SIZE_OPTION(options, name) \
+  size_t name = lzws_ext_get_size_option_value(options, #name);
+
+#define LZWS_EXT_GET_COMPRESSOR_OPTIONS(options)                        \
+  LZWS_EXT_GET_BOOL_OPTION(options, without_magic_header);              \
+  LZWS_EXT_GET_UINT_OPTION(options, uint_fast8_t, max_code_bit_length); \
+  LZWS_EXT_GET_BOOL_OPTION(options, block_mode);                        \
+  LZWS_EXT_GET_BOOL_OPTION(options, msb);                               \
+  LZWS_EXT_GET_BOOL_OPTION(options, unaligned_bit_groups);              \
   LZWS_EXT_GET_BOOL_OPTION(options, quiet);
 
 #define LZWS_EXT_GET_DECOMPRESSOR_OPTIONS(options)         \
@@ -32,6 +37,6 @@ unsigned long lzws_ext_get_fixnum_option_value(VALUE options, const char* name);
   LZWS_EXT_GET_BOOL_OPTION(options, quiet);
 
 #define LZWS_EXT_GET_BUFFER_LENGTH_OPTION(options, name) \
-  LZWS_EXT_GET_FIXNUM_OPTION(options, size_t, name);
+  LZWS_EXT_GET_SIZE_OPTION(options, name);
 
 #endif // LZWS_EXT_OPTIONS_H

data/ext/lzws_ext/stream/compressor.c

@@ -4,6 +4,7 @@
 #include "lzws_ext/stream/compressor.h"
 
 #include <lzws/buffer.h>
+#include <lzws/common.h>
 #include <lzws/compressor/common.h>
 #include <lzws/compressor/main.h>
 #include <lzws/compressor/state.h>
@@ -119,7 +120,7 @@ VALUE lzws_ext_compress(VALUE self, VALUE source_value)
     lzws_ext_raise_error(LZWS_EXT_ERROR_UNEXPECTED);
   }
 
-  VALUE bytes_written          = UINT2NUM(source_length - remaining_source_length);
+  VALUE bytes_written          = SIZET2NUM(source_length - remaining_source_length);
   VALUE needs_more_destination = result == LZWS_COMPRESSOR_NEEDS_MORE_DESTINATION ? Qtrue : Qfalse;
 
   return rb_ary_new_from_args(2, bytes_written, needs_more_destination);
@@ -192,9 +193,10 @@ VALUE lzws_ext_compressor_close(VALUE self)
 
 void lzws_ext_compressor_exports(VALUE root_module)
 {
-  VALUE stream = rb_define_module_under(root_module, "Stream");
+  VALUE module = rb_define_module_under(root_module, "Stream");
+
+  VALUE compressor = rb_define_class_under(module, "NativeCompressor", rb_cObject);
 
-  VALUE compressor = rb_define_class_under(stream, "NativeCompressor", rb_cObject);
   rb_define_alloc_func(compressor, lzws_ext_allocate_compressor);
   rb_define_method(compressor, "initialize", lzws_ext_initialize_compressor, 1);
   rb_define_method(compressor, "write", lzws_ext_compress, 1);

data/ext/lzws_ext/stream/decompressor.c

@@ -4,6 +4,7 @@
 #include "lzws_ext/stream/decompressor.h"
 
 #include <lzws/buffer.h>
+#include <lzws/common.h>
 #include <lzws/decompressor/common.h>
 #include <lzws/decompressor/main.h>
 #include <lzws/decompressor/state.h>
@@ -125,7 +126,7 @@ VALUE lzws_ext_decompress(VALUE self, VALUE source_value)
     }
   }
 
-  VALUE bytes_read             = UINT2NUM(source_length - remaining_source_length);
+  VALUE bytes_read             = SIZET2NUM(source_length - remaining_source_length);
   VALUE needs_more_destination = result == LZWS_DECOMPRESSOR_NEEDS_MORE_DESTINATION ? Qtrue : Qfalse;
 
   return rb_ary_new_from_args(2, bytes_read, needs_more_destination);
@@ -178,9 +179,10 @@ VALUE lzws_ext_decompressor_close(VALUE self)
 
 void lzws_ext_decompressor_exports(VALUE root_module)
 {
-  VALUE stream = rb_define_module_under(root_module, "Stream");
+  VALUE module = rb_define_module_under(root_module, "Stream");
+
+  VALUE decompressor = rb_define_class_under(module, "NativeDecompressor", rb_cObject);
 
-  VALUE decompressor = rb_define_class_under(stream, "NativeDecompressor", rb_cObject);
   rb_define_alloc_func(decompressor, lzws_ext_allocate_decompressor);
   rb_define_method(decompressor, "initialize", lzws_ext_initialize_decompressor, 1);
   rb_define_method(decompressor, "read", lzws_ext_decompress, 1);

data/ext/lzws_ext/string.c

@@ -4,6 +4,7 @@
 #include "lzws_ext/string.h"
 
 #include <lzws/buffer.h>
+#include <lzws/common.h>
 #include <lzws/compressor/common.h>
 #include <lzws/compressor/main.h>
 #include <lzws/compressor/state.h>
@@ -13,6 +14,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+#include "lzws_ext/buffer.h"
 #include "lzws_ext/error.h"
 #include "lzws_ext/macro.h"
 #include "lzws_ext/option.h"
@@ -20,26 +22,6 @@
 
 // -- buffer --
 
-static inline VALUE create_buffer(VALUE length)
-{
-  return rb_str_new(NULL, NUM2UINT(length));
-}
-
-#define CREATE_BUFFER(buffer, length, exception) \
-  VALUE buffer = rb_protect(create_buffer, UINT2NUM(length), &exception);
-
-static inline VALUE resize_buffer(VALUE args)
-{
-  VALUE buffer = rb_ary_entry(args, 0);
-  VALUE length = rb_ary_entry(args, 1);
-  return rb_str_resize(buffer, NUM2UINT(length));
-}
-
-#define RESIZE_BUFFER(buffer, length, exception)                                        \
-  VALUE resize_buffer_args = rb_ary_new_from_args(2, buffer, UINT2NUM(length));         \
-  buffer                   = rb_protect(resize_buffer, resize_buffer_args, &exception); \
-  RB_GC_GUARD(resize_buffer_args);
-
 static inline lzws_ext_result_t increase_destination_buffer(
   VALUE destination_value, size_t destination_length,
   size_t* remaining_destination_buffer_length_ptr, size_t destination_buffer_length)
@@ -51,7 +33,7 @@ static inline lzws_ext_result_t increase_destination_buffer(
 
   int exception;
 
-  RESIZE_BUFFER(destination_value, destination_length + destination_buffer_length, exception);
+  LZWS_EXT_RESIZE_STRING_BUFFER(destination_value, destination_length + destination_buffer_length, exception);
   if (exception != 0) {
     return LZWS_EXT_ERROR_ALLOCATE_FAILED;
   }
@@ -63,13 +45,11 @@ static inline lzws_ext_result_t increase_destination_buffer(
 
 // -- utils --
 
-#define GET_SOURCE_DATA(source_value)                              \
-  Check_Type(source_value, T_STRING);                              \
-                                                                   \
-  const char* source                  = RSTRING_PTR(source_value); \
-  size_t      source_length           = RSTRING_LEN(source_value); \
-  uint8_t*    remaining_source        = (uint8_t*)source;          \
-  size_t      remaining_source_length = source_length;
+#define GET_SOURCE_DATA(source_value)                    \
+  Check_Type(source_value, T_STRING);                    \
+                                                         \
+  const char* source        = RSTRING_PTR(source_value); \
+  size_t      source_length = RSTRING_LEN(source_value);
 
 // -- compress --
 
@@ -105,12 +85,15 @@ static inline lzws_ext_result_t increase_destination_buffer(
 
 static inline lzws_ext_result_t compress(
   lzws_compressor_state_t* state_ptr,
-  uint8_t* remaining_source, size_t remaining_source_length,
+  const char* source, size_t source_length,
   VALUE destination_value, size_t destination_buffer_length)
 {
   lzws_result_t     result;
   lzws_ext_result_t ext_result;
 
+  uint8_t* remaining_source        = (uint8_t*)source;
+  size_t   remaining_source_length = source_length;
+
   size_t destination_length                  = 0;
   size_t remaining_destination_buffer_length = destination_buffer_length;
 
@@ -119,7 +102,7 @@ static inline lzws_ext_result_t compress(
 
   int exception;
 
-  RESIZE_BUFFER(destination_value, destination_length, exception);
+  LZWS_EXT_RESIZE_STRING_BUFFER(destination_value, destination_length, exception);
   if (exception != 0) {
     return LZWS_EXT_ERROR_ALLOCATE_FAILED;
   }
@@ -157,7 +140,7 @@ VALUE lzws_ext_compress_string(VALUE LZWS_EXT_UNUSED(self), VALUE source_value,
 
   int exception;
 
-  CREATE_BUFFER(destination_value, destination_buffer_length, exception);
+  LZWS_EXT_CREATE_STRING_BUFFER(destination_value, destination_buffer_length, exception);
   if (exception != 0) {
     lzws_compressor_free_state(state_ptr);
     lzws_ext_raise_error(LZWS_EXT_ERROR_ALLOCATE_FAILED);
@@ -165,7 +148,7 @@ VALUE lzws_ext_compress_string(VALUE LZWS_EXT_UNUSED(self), VALUE source_value,
 
   lzws_ext_result_t ext_result = compress(
     state_ptr,
-    remaining_source, remaining_source_length,
+    source, source_length,
     destination_value, destination_buffer_length);
 
   lzws_compressor_free_state(state_ptr);
@@ -181,12 +164,15 @@ VALUE lzws_ext_compress_string(VALUE LZWS_EXT_UNUSED(self), VALUE source_value,
 
 static inline lzws_ext_result_t decompress(
   lzws_decompressor_state_t* state_ptr,
-  uint8_t* remaining_source, size_t remaining_source_length,
+  const char* source, size_t source_length,
   VALUE destination_value, size_t destination_buffer_length)
 {
   lzws_result_t     result;
   lzws_ext_result_t ext_result;
 
+  uint8_t* remaining_source        = (uint8_t*)source;
+  size_t   remaining_source_length = source_length;
+
   size_t destination_length                  = 0;
   size_t remaining_destination_buffer_length = destination_buffer_length;
 
@@ -232,7 +218,7 @@ static inline lzws_ext_result_t decompress(
 
   int exception;
 
-  RESIZE_BUFFER(destination_value, destination_length, exception);
+  LZWS_EXT_RESIZE_STRING_BUFFER(destination_value, destination_length, exception);
   if (exception != 0) {
     return LZWS_EXT_ERROR_ALLOCATE_FAILED;
   }
@@ -268,7 +254,7 @@ VALUE lzws_ext_decompress_string(VALUE LZWS_EXT_UNUSED(self), VALUE source_value
 
   int exception;
 
-  CREATE_BUFFER(destination_value, destination_buffer_length, exception);
+  LZWS_EXT_CREATE_STRING_BUFFER(destination_value, destination_buffer_length, exception);
   if (exception != 0) {
     lzws_decompressor_free_state(state_ptr);
     lzws_ext_raise_error(LZWS_EXT_ERROR_ALLOCATE_FAILED);
@@ -276,7 +262,7 @@ VALUE lzws_ext_decompress_string(VALUE LZWS_EXT_UNUSED(self), VALUE source_value
 
   lzws_ext_result_t ext_result = decompress(
     state_ptr,
-    remaining_source, remaining_source_length,
+    source, source_length,
     destination_value, destination_buffer_length);
 
   lzws_decompressor_free_state(state_ptr);

data/lib/lzws/option.rb

@@ -1,6 +1,8 @@
 # Ruby bindings for lzws library.
 # Copyright (c) 2019 AUTHORS, MIT License.
 
+require "lzws_ext"
+
 require_relative "error"
 require_relative "validation"
 
@@ -38,8 +40,7 @@ module LZWS
       Validation.validate_positive_integer max_code_bit_length
 
       raise ValidateError, "invalid max code bit length" if
-        max_code_bit_length < LOWEST_MAX_CODE_BIT_LENGTH ||
-        max_code_bit_length > BIGGEST_MAX_CODE_BIT_LENGTH
+        max_code_bit_length < LOWEST_MAX_CODE_BIT_LENGTH || max_code_bit_length > BIGGEST_MAX_CODE_BIT_LENGTH
 
       Validation.validate_bool options[:without_magic_header]
       Validation.validate_bool options[:block_mode]

data/lib/lzws/version.rb

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

data/lib/lzws.rb

@@ -5,3 +5,4 @@ require_relative "lzws/stream/reader"
 require_relative "lzws/stream/writer"
 require_relative "lzws/file"
 require_relative "lzws/string"
+require_relative "lzws/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lzws
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Andrew Aladjev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.12'
+- !ruby/object:Gem::Dependency
+  name: ocg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.75'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.75'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 description: 
 email: aladjev.andrew@gmail.com
 executables: []