ruby-lzws 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68638ae503703523496d753cb9c343dcfd258eb0a1cbf2da1c4fa0888df53d05
-  data.tar.gz: cdbfd18419ca03bb13c3db8908b5afed42500ff40d45bd412191fca723b3e51b
+  metadata.gz: 62d885a3a75f291ea4b808da4ef4e47a68574e74dae8fe39aad61d228a62643c
+  data.tar.gz: 90e5fc29ea554392dcf93bb391a38361707c14306099b6654765e399d111ea9d
 SHA512:
-  metadata.gz: bfa3497c91ca513e97a82d540d3302cb330d7addadda117eab1fe3f7d615bbb774f3bf00f037c8cb4dcd0f2abb9ec92e240459eca7fab5f9689307f70130c38c
-  data.tar.gz: beef34ff8bdf2f20ab9ab9dcd797a7587d4d74c79e82dea0eff3aa64cd11e1222eefab566a6d45baa6e9ee34427ca8dcfd46ab6769bedc44a6758d2276527627
+  metadata.gz: 66c07c08d7094be0e9f2d802c01796529e0c14bcde067752aa629d7e3337218e0d6a08e7cfe08725659097fb0e3be90e7565a872a3c79dc96813afa6b235e4ab
+  data.tar.gz: a1d74a3408881c23f816818931685ec084bd2a0e9c114be212f8a059e37af8da882e9235f3780524e5e67557b3c9945f33b3ecab8535768e4737e972fc724d87

data/README.md

@@ -1,14 +1,14 @@
 # Ruby bindings for lzws library
 
-| Travis | AppVeyor | Cirrus | Circle | Codecov |
-| :---:  | :---:    | :---:  | :---:  | :---:   |
-| [![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) | [![Codecov](https://codecov.io/gh/andrew-aladev/ruby-lzws/branch/master/graph/badge.svg)](https://codecov.io/gh/andrew-aladev/ruby-lzws) |
+| Travis | AppVeyor | Circle | Codecov |
+| :---:  | :---:    | :---:  | :---:   |
+| [![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) | [![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) | [![Codecov](https://codecov.io/gh/andrew-aladev/ruby-lzws/branch/master/graph/badge.svg)](https://codecov.io/gh/andrew-aladev/ruby-lzws) |
 
 See [lzws library](https://github.com/andrew-aladev/lzws).
 
 ## Installation
 
-Please install lzws library first, use latest 1.3.0+ version.
+Please install lzws library first, use latest 1.4.0+ version.
 
 ```sh
 gem install ruby-lzws
@@ -21,6 +21,8 @@ rake gem
 gem install pkg/ruby-lzws-*.gem
 ```
 
+You can also use [overlay](https://github.com/andrew-aladev/overlay) for gentoo.
+
 ## Usage
 
 There are simple APIs: `String` and `File`. Also you can use generic streaming API: `Stream::Writer` and `Stream::Reader`.
@@ -36,6 +38,27 @@ LZWS::File.decompress "file.txt.Z", "file.txt"
 
 LZWS::Stream::Writer.open("file.txt.Z") { |writer| writer << "TOBEORNOTTOBEORTOBEORNOT" }
 puts LZWS::Stream::Reader.open("file.txt.Z") { |reader| reader.read }
+
+writer = LZWS::Stream::Writer.new output_socket
+begin
+  bytes_written = writer.write_nonblock "TOBEORNOTTOBEORTOBEORNOT"
+  # handle "bytes_written"
+rescue IO::WaitWritable
+  # handle wait
+ensure
+  writer.close
+end
+
+reader = LZWS::Stream::Reader.new input_socket
+begin
+  puts reader.read_nonblock(512)
+rescue IO::WaitReadable
+  # handle wait
+rescue ::EOFError
+  # handle eof
+ensure
+  reader.close
+end
 ```
 
 You can create and read `tar.Z` archives with `minitar` for example.
@@ -63,59 +86,26 @@ end
 
 ## Options
 
-Each API supports several options:
-
-```
-:source_buffer_length
-:destination_buffer_length
-```
+| Option                      | Values     | Default  | Description |
+|-----------------------------|------------|----------|-------------|
+| `source_buffer_length`      | 0, 2 - inf | 0 (auto) | internal buffer length for source data |
+| `destination_buffer_length` | 0, 2 - inf | 0 (auto) | internal buffer length for description data |
+| `max_code_bit_length`       | 9 - 16     | 16       | max code bit length |
+| `block_mode`                | true/false | true     | enables block mode |
+| `without_magic_header`      | true/false | false    | disables magic header |
+| `msb`                       | true/false | false    | enables most significant bit mode |
+| `unaligned_bit_groups`      | true/false | false    | enables unaligned bit groups |
+| `quiet`                     | true/false | false    | disables lzws library logging |
 
 There are internal buffers for compressed and decompressed data.
-For example you want to use 1 KB as source buffer length for compressor - please use 256 B as destination buffer length.
-You want to use 256 B as source buffer length for decompressor - please use 1 KB as destination buffer length.
-
-Values: 0, 2 - infinity, default value: 0.
-0 means automatic buffer length selection.
-1 byte is not enough, 2 bytes is minimal buffer length.
-
-```
-:max_code_bit_length
-```
-
-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
-```
-
-Values: true/false, default value: true.
-
-```
-:without_magic_header
-```
-
-Values: true/false, default value: false.
-
-```
-:msb
-```
-
-Values: true/false, default value: false.
-
-```
-:unaligned_bit_groups
-```
-
-Values: true/false, default value: false.
-
-```
-:quiet
-```
+For example you want to use 1 KB as `source_buffer_length` for compressor - please use 256 B as `destination_buffer_length`.
+You want to use 256 B as `source_buffer_length` for decompressor - please use 1 KB as `destination_buffer_length`.
 
-Values: true/false, default value: false.
-Disables lzws library logging.
+You can also read lzws docs for more info about options.
 
-Please read lzws docs for more info about options.
+| Option                | Related constants |
+|-----------------------|-------------------|
+| `max_code_bit_length` | `LZWS::Option::LOWEST_MAX_CODE_BIT_LENGTH` = 9, `LZWS::Option::BIGGEST_MAX_CODE_BIT_LENGTH` = 16 |
 
 Possible compressor options:
 ```
@@ -186,7 +176,7 @@ File maintains both source and destination buffers, it accepts both `source_buff
 
 ## Stream::Writer
 
-Its behaviour is similar to builtin [`Zlib::GzipWriter`](https://ruby-doc.org/stdlib-2.6.1/libdoc/zlib/rdoc/Zlib/GzipWriter.html).
+Its behaviour is similar to builtin [`Zlib::GzipWriter`](https://ruby-doc.org/stdlib-2.7.0/libdoc/zlib/rdoc/Zlib/GzipWriter.html).
 
 Writer maintains destination buffer only, so it accepts `destination_buffer_length` option only.
 
@@ -220,7 +210,7 @@ Set another encodings, `nil` is just for compatibility with `IO`.
 #tell
 ```
 
-See [`IO`](https://ruby-doc.org/core-2.6.1/IO.html) docs.
+See [`IO`](https://ruby-doc.org/core-2.7.0/IO.html) docs.
 
 ```
 #write(*objects)
@@ -230,7 +220,7 @@ See [`IO`](https://ruby-doc.org/core-2.6.1/IO.html) docs.
 #closed?
 ```
 
-See [`Zlib::GzipWriter`](https://ruby-doc.org/stdlib-2.6.1/libdoc/zlib/rdoc/Zlib/GzipWriter.html) docs.
+See [`Zlib::GzipWriter`](https://ruby-doc.org/stdlib-2.7.0/libdoc/zlib/rdoc/Zlib/GzipWriter.html) docs.
 
 ```
 #write_nonblock(object, *options)
@@ -252,11 +242,11 @@ Behaviour is the same as `IO#write_nonblock` method.
 #puts(*objects)
 ```
 
-Typical helpers, see [`Zlib::GzipWriter`](https://ruby-doc.org/stdlib-2.6.1/libdoc/zlib/rdoc/Zlib/GzipWriter.html) docs.
+Typical helpers, see [`Zlib::GzipWriter`](https://ruby-doc.org/stdlib-2.7.0/libdoc/zlib/rdoc/Zlib/GzipWriter.html) docs.
 
 ## Stream::Reader
 
-Its behaviour is similar to builtin [`Zlib::GzipReader`](https://ruby-doc.org/stdlib-2.6.1/libdoc/zlib/rdoc/Zlib/GzipReader.html).
+Its behaviour is similar to builtin [`Zlib::GzipReader`](https://ruby-doc.org/stdlib-2.7.0/libdoc/zlib/rdoc/Zlib/GzipReader.html).
 
 Reader maintains both source and destination buffers, it accepts both `source_buffer_length` and `destination_buffer_length` options.
 
@@ -291,7 +281,7 @@ Set another encodings.
 #tell
 ```
 
-See [`IO`](https://ruby-doc.org/core-2.6.1/IO.html) docs.
+See [`IO`](https://ruby-doc.org/core-2.7.0/IO.html) docs.
 
 ```
 #read(bytes_to_read = nil, out_buffer = nil)
@@ -301,14 +291,14 @@ See [`IO`](https://ruby-doc.org/core-2.6.1/IO.html) docs.
 #closed?
 ```
 
-See [`Zlib::GzipReader`](https://ruby-doc.org/stdlib-2.6.1/libdoc/zlib/rdoc/Zlib/GzipReader.html) docs.
+See [`Zlib::GzipReader`](https://ruby-doc.org/stdlib-2.7.0/libdoc/zlib/rdoc/Zlib/GzipReader.html) docs.
 
 ```
 #readpartial(bytes_to_read = nil, out_buffer = nil)
 #read_nonblock(bytes_to_read, out_buffer = nil, *options)
 ```
 
-See [`IO`](https://ruby-doc.org/core-2.6.1/IO.html) docs.
+See [`IO`](https://ruby-doc.org/core-2.7.0/IO.html) docs.
 
 ```
 #getbyte
@@ -331,13 +321,13 @@ See [`IO`](https://ruby-doc.org/core-2.6.1/IO.html) docs.
 #ungetline(line)
 ```
 
-Typical helpers, see [`Zlib::GzipReader`](https://ruby-doc.org/stdlib-2.6.1/libdoc/zlib/rdoc/Zlib/GzipReader.html) docs.
+Typical helpers, see [`Zlib::GzipReader`](https://ruby-doc.org/stdlib-2.7.0/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.
+See universal test script [scripts/ci_test.sh](scripts/ci_test.sh) for CI.
+Please visit [scripts/test-images](scripts/test-images).
+You can run this test script using many native and cross images.
 
 ## License
 

data/ext/extconf.rb

@@ -13,10 +13,10 @@ 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/common.h", %w[lzws_compressor_options_t]
 require_header "lzws/compressor/main.h"
 require_header "lzws/compressor/state.h", %w[lzws_compressor_state_t]
-require_header "lzws/decompressor/common.h"
+require_header "lzws/decompressor/common.h", %w[lzws_decompressor_options_t]
 require_header "lzws/decompressor/main.h"
 require_header "lzws/decompressor/state.h", %w[lzws_decompressor_state_t]
 require_header "lzws/file.h"
@@ -66,6 +66,13 @@ $srcs = %w[
 .map { |name| "src/#{extension_name}/#{name}.c" }
 .freeze
 
+# Removing library duplicates.
+$libs = $libs.split(%r{\s})
+  .reject(&:empty?)
+  .sort
+  .uniq
+  .join " "
+
 if ENV["CI"] || ENV["COVERAGE"]
   $CFLAGS << " --coverage"
   $LDFLAGS << " --coverage"

data/ext/lzws_ext/buffer.c

@@ -16,6 +16,7 @@ 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));
 }
 
@@ -23,8 +24,21 @@ void lzws_ext_buffer_exports(VALUE root_module)
 {
   VALUE module = rb_define_module_under(root_module, "Buffer");
 
-  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));
+  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/common.h

@@ -10,4 +10,7 @@
 
 typedef uint_fast8_t lzws_ext_result_t;
 
+typedef uint8_t      lzws_ext_byte_t;
+typedef uint_fast8_t lzws_ext_byte_fast_t;
+
 #endif // LZWS_EXT_COMMON_H

data/ext/lzws_ext/error.c

@@ -3,7 +3,6 @@
 
 #include "lzws_ext/error.h"
 
-#include "lzws_ext/common.h"
 #include "ruby.h"
 
 static inline NORETURN(void raise(const char* name, const char* description))

data/ext/lzws_ext/error.h

@@ -9,7 +9,8 @@
 
 // Results for errors listed in "lib/lzws/error" used in c extension.
 
-enum {
+enum
+{
   LZWS_EXT_ERROR_ALLOCATE_FAILED = 1,
   LZWS_EXT_ERROR_VALIDATE_FAILED,
 

data/ext/lzws_ext/io.c

@@ -1,17 +1,15 @@
 // Ruby bindings for lzws library.
 // Copyright (c) 2019 AUTHORS, MIT License.
 
-#include "ruby/io.h"
+#include "lzws_ext/io.h"
 
-#include <lzws/common.h>
 #include <lzws/file.h>
 
-#include "lzws_ext/common.h"
 #include "lzws_ext/error.h"
-#include "lzws_ext/io.h"
 #include "lzws_ext/macro.h"
 #include "lzws_ext/option.h"
 #include "ruby.h"
+#include "ruby/io.h"
 
 #define GET_FILE(target)                               \
   Check_Type(target, T_FILE);                          \
@@ -59,9 +57,7 @@ VALUE lzws_ext_compress_io(VALUE LZWS_EXT_UNUSED(self), VALUE source, VALUE dest
   LZWS_EXT_GET_BUFFER_LENGTH_OPTION(options, destination_buffer_length);
 
   lzws_result_t result = lzws_compress_file(
-    source_file, source_buffer_length,
-    destination_file, destination_buffer_length,
-    without_magic_header, max_code_bit_length, block_mode, msb, unaligned_bit_groups, quiet);
+    source_file, source_buffer_length, destination_file, destination_buffer_length, &compressor_options);
 
   if (result != 0) {
     lzws_ext_raise_error(get_file_error(result));
@@ -83,9 +79,7 @@ VALUE lzws_ext_decompress_io(VALUE LZWS_EXT_UNUSED(self), VALUE source, VALUE de
   LZWS_EXT_GET_BUFFER_LENGTH_OPTION(options, destination_buffer_length);
 
   lzws_result_t result = lzws_decompress_file(
-    source_file, source_buffer_length,
-    destination_file, destination_buffer_length,
-    without_magic_header, msb, unaligned_bit_groups, quiet);
+    source_file, source_buffer_length, destination_file, destination_buffer_length, &decompressor_options);
 
   if (result != 0) {
     lzws_ext_raise_error(get_file_error(result));

data/ext/lzws_ext/main.c

@@ -2,8 +2,8 @@
 // Copyright (c) 2019 AUTHORS, MIT License.
 
 #include "lzws_ext/buffer.h"
-#include "lzws_ext/common.h"
 #include "lzws_ext/io.h"
+#include "lzws_ext/option.h"
 #include "lzws_ext/stream/compressor.h"
 #include "lzws_ext/stream/decompressor.h"
 #include "lzws_ext/string.h"
@@ -15,6 +15,7 @@ void Init_lzws_ext()
 
   lzws_ext_buffer_exports(root_module);
   lzws_ext_io_exports(root_module);
+  lzws_ext_option_exports(root_module);
   lzws_ext_compressor_exports(root_module);
   lzws_ext_decompressor_exports(root_module);
   lzws_ext_string_exports(root_module);

data/ext/lzws_ext/option.c

@@ -3,36 +3,41 @@
 
 #include "lzws_ext/option.h"
 
-#include <stdbool.h>
-#include <stdlib.h>
-
 #include "lzws_ext/error.h"
 #include "ruby.h"
 
+// -- values --
+
 static inline VALUE get_raw_option_value(VALUE options, const char* name)
 {
   return rb_funcall(options, rb_intern("[]"), 1, ID2SYM(rb_intern(name)));
 }
 
-bool lzws_ext_get_bool_option_value(VALUE options, const char* name)
+void lzws_ext_get_bool_option(VALUE options, bool* option, const char* name)
 {
   VALUE raw_value = get_raw_option_value(options, name);
+  if (raw_value == Qnil) {
+    return;
+  }
 
   int raw_type = TYPE(raw_value);
   if (raw_type != T_TRUE && raw_type != T_FALSE) {
     lzws_ext_raise_error(LZWS_EXT_ERROR_VALIDATE_FAILED);
   }
 
-  return raw_type == T_TRUE;
+  *option = raw_type == T_TRUE;
 }
 
-unsigned int lzws_ext_get_uint_option_value(VALUE options, const char* name)
+void lzws_ext_get_max_code_bit_length_option(VALUE options, lzws_byte_fast_t* option, const char* name)
 {
   VALUE raw_value = get_raw_option_value(options, name);
+  if (raw_value == Qnil) {
+    return;
+  }
 
   Check_Type(raw_value, T_FIXNUM);
 
-  return NUM2UINT(raw_value);
+  *option = NUM2UINT(raw_value);
 }
 
 size_t lzws_ext_get_size_option_value(VALUE options, const char* name)
@@ -43,3 +48,13 @@ size_t lzws_ext_get_size_option_value(VALUE options, const char* name)
 
   return NUM2SIZET(raw_value);
 }
+
+// -- exports --
+
+void lzws_ext_option_exports(VALUE root_module)
+{
+  VALUE module = rb_define_module_under(root_module, "Option");
+
+  rb_define_const(module, "LOWEST_MAX_CODE_BIT_LENGTH", UINT2NUM(LZWS_LOWEST_MAX_CODE_BIT_LENGTH));
+  rb_define_const(module, "BIGGEST_MAX_CODE_BIT_LENGTH", UINT2NUM(LZWS_BIGGEST_MAX_CODE_BIT_LENGTH));
+}

data/ext/lzws_ext/option.h

@@ -4,39 +4,44 @@
 #if !defined(LZWS_EXT_OPTIONS_H)
 #define LZWS_EXT_OPTIONS_H
 
+#include <lzws/compressor/common.h>
+#include <lzws/decompressor/common.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
 #include "ruby.h"
 
-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);
+void lzws_ext_get_bool_option(VALUE options, bool* option, const char* name);
+void lzws_ext_get_max_code_bit_length_option(VALUE options, lzws_byte_fast_t* option, 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_BOOL_OPTION(options, target_options, name) \
+  lzws_ext_get_bool_option(options, &target_options.name, #name);
 
-#define LZWS_EXT_GET_UINT_OPTION(options, type, name) \
-  type name = lzws_ext_get_uint_option_value(options, #name);
+#define LZWS_EXT_GET_MAX_CODE_BIT_LENGTH_OPTION(options, target_options, name) \
+  lzws_ext_get_max_code_bit_length_option(options, &target_options.name, #name);
 
-#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_compressor_options_t compressor_options = LZWS_COMPRESSOR_DEFAULT_OPTIONS;            \
+                                                                                             \
+  LZWS_EXT_GET_BOOL_OPTION(options, compressor_options, without_magic_header);               \
+  LZWS_EXT_GET_MAX_CODE_BIT_LENGTH_OPTION(options, compressor_options, max_code_bit_length); \
+  LZWS_EXT_GET_BOOL_OPTION(options, compressor_options, block_mode);                         \
+  LZWS_EXT_GET_BOOL_OPTION(options, compressor_options, msb);                                \
+  LZWS_EXT_GET_BOOL_OPTION(options, compressor_options, unaligned_bit_groups);               \
+  LZWS_EXT_GET_BOOL_OPTION(options, compressor_options, quiet);
 
-#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)                                      \
+  lzws_decompressor_options_t decompressor_options = LZWS_DECOMPRESSOR_DEFAULT_OPTIONS; \
+                                                                                        \
+  LZWS_EXT_GET_BOOL_OPTION(options, decompressor_options, without_magic_header);        \
+  LZWS_EXT_GET_BOOL_OPTION(options, decompressor_options, msb);                         \
+  LZWS_EXT_GET_BOOL_OPTION(options, decompressor_options, unaligned_bit_groups);        \
+  LZWS_EXT_GET_BOOL_OPTION(options, decompressor_options, quiet);
 
-#define LZWS_EXT_GET_DECOMPRESSOR_OPTIONS(options)         \
-  LZWS_EXT_GET_BOOL_OPTION(options, without_magic_header); \
-  LZWS_EXT_GET_BOOL_OPTION(options, msb);                  \
-  LZWS_EXT_GET_BOOL_OPTION(options, unaligned_bit_groups); \
-  LZWS_EXT_GET_BOOL_OPTION(options, quiet);
+size_t lzws_ext_get_size_option_value(VALUE options, const char* name);
 
-#define LZWS_EXT_GET_BUFFER_LENGTH_OPTION(options, name) \
-  LZWS_EXT_GET_SIZE_OPTION(options, name);
+#define LZWS_EXT_GET_BUFFER_LENGTH_OPTION(options, name) size_t name = lzws_ext_get_size_option_value(options, #name);
+
+void lzws_ext_option_exports(VALUE root_module);
 
 #endif // LZWS_EXT_OPTIONS_H