ruby-brs 1.1.0 → 1.1.5

data/ext/brs_ext/main.c

@@ -2,7 +2,6 @@
 // Copyright (c) 2019 AUTHORS, MIT License.
 
 #include "brs_ext/buffer.h"
-#include "brs_ext/common.h"
 #include "brs_ext/io.h"
 #include "brs_ext/option.h"
 #include "brs_ext/stream/compressor.h"

data/ext/brs_ext/option.c

@@ -5,10 +5,7 @@
 
 #include <brotli/decode.h>
 #include <brotli/encode.h>
-#include <stdbool.h>
-#include <stdlib.h>
 
-#include "brs_ext/common.h"
 #include "brs_ext/error.h"
 #include "ruby.h"
 

data/ext/brs_ext/option.h

@@ -7,7 +7,6 @@
 #include <brotli/decode.h>
 #include <brotli/encode.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include <stdlib.h>
 
 #include "brs_ext/common.h"
@@ -22,8 +21,8 @@ enum {
   BRS_EXT_OPTION_TYPE_MODE
 };
 
-typedef uint_fast8_t brs_ext_option_type_t;
-typedef uint32_t     brs_ext_option_value_t;
+typedef brs_ext_byte_fast_t brs_ext_option_type_t;
+typedef uint32_t            brs_ext_option_value_t;
 
 typedef struct {
   bool                   has_value;

data/ext/brs_ext/stream/compressor.c

@@ -5,11 +5,8 @@
 
 #include <brotli/encode.h>
 #include <brotli/types.h>
-#include <stdint.h>
-#include <stdlib.h>
 
 #include "brs_ext/buffer.h"
-#include "brs_ext/common.h"
 #include "brs_ext/error.h"
 #include "brs_ext/option.h"
 #include "ruby.h"
@@ -21,7 +18,7 @@ static void free_compressor(brs_ext_compressor_t* compressor_ptr)
     BrotliEncoderDestroyInstance(state_ptr);
   }
 
-  uint8_t* destination_buffer = compressor_ptr->destination_buffer;
+  brs_ext_byte_t* destination_buffer = compressor_ptr->destination_buffer;
   if (destination_buffer != NULL) {
     free(destination_buffer);
   }
@@ -70,7 +67,7 @@ VALUE brs_ext_initialize_compressor(VALUE self, VALUE options)
     destination_buffer_length = BRS_DEFAULT_DESTINATION_BUFFER_LENGTH_FOR_COMPRESSOR;
   }
 
-  uint8_t* destination_buffer = malloc(destination_buffer_length);
+  brs_ext_byte_t* destination_buffer = malloc(destination_buffer_length);
   if (destination_buffer == NULL) {
     BrotliEncoderDestroyInstance(state_ptr);
     brs_ext_raise_error(BRS_EXT_ERROR_ALLOCATE_FAILED);
@@ -90,13 +87,13 @@ VALUE brs_ext_initialize_compressor(VALUE self, VALUE options)
     brs_ext_raise_error(BRS_EXT_ERROR_USED_AFTER_CLOSE);                                 \
   }
 
-#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); \
-  const uint8_t* remaining_source        = (const 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);     \
+  const brs_ext_byte_t* remaining_source        = (const brs_ext_byte_t*)source; \
+  size_t                remaining_source_length = source_length;
 
 VALUE brs_ext_compress(VALUE self, VALUE source_value)
 {
@@ -130,8 +127,8 @@ VALUE brs_ext_flush_compressor(VALUE self)
 
   BrotliEncoderState* state_ptr = compressor_ptr->state_ptr;
 
-  const uint8_t* remaining_source        = NULL;
-  size_t         remaining_source_length = 0;
+  const brs_ext_byte_t* remaining_source        = NULL;
+  size_t                remaining_source_length = 0;
 
   BROTLI_BOOL result = BrotliEncoderCompressStream(
     state_ptr,
@@ -156,8 +153,8 @@ VALUE brs_ext_finish_compressor(VALUE self)
 
   BrotliEncoderState* state_ptr = compressor_ptr->state_ptr;
 
-  const uint8_t* remaining_source        = NULL;
-  size_t         remaining_source_length = 0;
+  const brs_ext_byte_t* remaining_source        = NULL;
+  size_t                remaining_source_length = 0;
 
   BROTLI_BOOL result = BrotliEncoderCompressStream(
     state_ptr,
@@ -180,9 +177,9 @@ VALUE brs_ext_compressor_read_result(VALUE self)
   GET_COMPRESSOR(self);
   DO_NOT_USE_AFTER_CLOSE(compressor_ptr);
 
-  uint8_t* destination_buffer                  = compressor_ptr->destination_buffer;
-  size_t   destination_buffer_length           = compressor_ptr->destination_buffer_length;
-  size_t   remaining_destination_buffer_length = compressor_ptr->remaining_destination_buffer_length;
+  brs_ext_byte_t* destination_buffer                  = compressor_ptr->destination_buffer;
+  size_t          destination_buffer_length           = compressor_ptr->destination_buffer_length;
+  size_t          remaining_destination_buffer_length = compressor_ptr->remaining_destination_buffer_length;
 
   const char* result        = (const char*)destination_buffer;
   size_t      result_length = destination_buffer_length - remaining_destination_buffer_length;
@@ -207,7 +204,7 @@ VALUE brs_ext_compressor_close(VALUE self)
     compressor_ptr->state_ptr = NULL;
   }
 
-  uint8_t* destination_buffer = compressor_ptr->destination_buffer;
+  brs_ext_byte_t* destination_buffer = compressor_ptr->destination_buffer;
   if (destination_buffer != NULL) {
     free(destination_buffer);
 

data/ext/brs_ext/stream/compressor.h

@@ -5,16 +5,16 @@
 #define BRS_EXT_STREAM_COMPRESSOR_H
 
 #include <brotli/encode.h>
-#include <stdint.h>
 #include <stdlib.h>
 
+#include "brs_ext/common.h"
 #include "ruby.h"
 
 typedef struct {
   BrotliEncoderState* state_ptr;
-  uint8_t*            destination_buffer;
+  brs_ext_byte_t*     destination_buffer;
   size_t              destination_buffer_length;
-  uint8_t*            remaining_destination_buffer;
+  brs_ext_byte_t*     remaining_destination_buffer;
   size_t              remaining_destination_buffer_length;
 } brs_ext_compressor_t;
 

data/ext/brs_ext/stream/decompressor.c

@@ -4,11 +4,8 @@
 #include "brs_ext/stream/decompressor.h"
 
 #include <brotli/decode.h>
-#include <stdint.h>
-#include <stdlib.h>
 
 #include "brs_ext/buffer.h"
-#include "brs_ext/common.h"
 #include "brs_ext/error.h"
 #include "brs_ext/option.h"
 #include "ruby.h"
@@ -20,7 +17,7 @@ static void free_decompressor(brs_ext_decompressor_t* decompressor_ptr)
     BrotliDecoderDestroyInstance(state_ptr);
   }
 
-  uint8_t* destination_buffer = decompressor_ptr->destination_buffer;
+  brs_ext_byte_t* destination_buffer = decompressor_ptr->destination_buffer;
   if (destination_buffer != NULL) {
     free(destination_buffer);
   }
@@ -69,7 +66,7 @@ VALUE brs_ext_initialize_decompressor(VALUE self, VALUE options)
     destination_buffer_length = BRS_DEFAULT_DESTINATION_BUFFER_LENGTH_FOR_DECOMPRESSOR;
   }
 
-  uint8_t* destination_buffer = malloc(destination_buffer_length);
+  brs_ext_byte_t* destination_buffer = malloc(destination_buffer_length);
   if (destination_buffer == NULL) {
     BrotliDecoderDestroyInstance(state_ptr);
     brs_ext_raise_error(BRS_EXT_ERROR_ALLOCATE_FAILED);
@@ -89,13 +86,13 @@ VALUE brs_ext_initialize_decompressor(VALUE self, VALUE options)
     brs_ext_raise_error(BRS_EXT_ERROR_USED_AFTER_CLOSE);                                     \
   }
 
-#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); \
-  const uint8_t* remaining_source        = (const 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);     \
+  const brs_ext_byte_t* remaining_source        = (const brs_ext_byte_t*)source; \
+  size_t                remaining_source_length = source_length;
 
 VALUE brs_ext_decompress(VALUE self, VALUE source_value)
 {
@@ -128,9 +125,9 @@ VALUE brs_ext_decompressor_read_result(VALUE self)
   GET_DECOMPRESSOR(self);
   DO_NOT_USE_AFTER_CLOSE(decompressor_ptr);
 
-  uint8_t* destination_buffer                  = decompressor_ptr->destination_buffer;
-  size_t   destination_buffer_length           = decompressor_ptr->destination_buffer_length;
-  size_t   remaining_destination_buffer_length = decompressor_ptr->remaining_destination_buffer_length;
+  brs_ext_byte_t* destination_buffer                  = decompressor_ptr->destination_buffer;
+  size_t          destination_buffer_length           = decompressor_ptr->destination_buffer_length;
+  size_t          remaining_destination_buffer_length = decompressor_ptr->remaining_destination_buffer_length;
 
   const char* result        = (const char*)destination_buffer;
   size_t      result_length = destination_buffer_length - remaining_destination_buffer_length;
@@ -155,7 +152,7 @@ VALUE brs_ext_decompressor_close(VALUE self)
     decompressor_ptr->state_ptr = NULL;
   }
 
-  uint8_t* destination_buffer = decompressor_ptr->destination_buffer;
+  brs_ext_byte_t* destination_buffer = decompressor_ptr->destination_buffer;
   if (destination_buffer != NULL) {
     free(destination_buffer);
 

data/ext/brs_ext/stream/decompressor.h

@@ -5,16 +5,16 @@
 #define BRS_EXT_STREAM_DECOMPRESSOR_H
 
 #include <brotli/decode.h>
-#include <stdint.h>
 #include <stdlib.h>
 
+#include "brs_ext/common.h"
 #include "ruby.h"
 
 typedef struct {
   BrotliDecoderState* state_ptr;
-  uint8_t*            destination_buffer;
+  brs_ext_byte_t*     destination_buffer;
   size_t              destination_buffer_length;
-  uint8_t*            remaining_destination_buffer;
+  brs_ext_byte_t*     remaining_destination_buffer;
   size_t              remaining_destination_buffer_length;
 } brs_ext_decompressor_t;
 

data/ext/brs_ext/string.c

@@ -6,11 +6,9 @@
 #include <brotli/decode.h>
 #include <brotli/encode.h>
 #include <brotli/types.h>
-#include <stdint.h>
 #include <stdlib.h>
 
 #include "brs_ext/buffer.h"
-#include "brs_ext/common.h"
 #include "brs_ext/error.h"
 #include "brs_ext/macro.h"
 #include "brs_ext/option.h"
@@ -57,15 +55,15 @@ static inline brs_ext_result_t compress(
   BROTLI_BOOL      result;
   brs_ext_result_t ext_result;
 
-  const uint8_t* remaining_source        = (const uint8_t*)source;
-  size_t         remaining_source_length = source_length;
+  const brs_ext_byte_t* remaining_source        = (const brs_ext_byte_t*)source;
+  size_t                remaining_source_length = source_length;
 
   size_t destination_length                  = 0;
   size_t remaining_destination_buffer_length = destination_buffer_length;
 
   while (true) {
-    uint8_t* remaining_destination_buffer             = (uint8_t*)RSTRING_PTR(destination_value) + destination_length;
-    size_t   prev_remaining_destination_buffer_length = remaining_destination_buffer_length;
+    brs_ext_byte_t* remaining_destination_buffer             = (brs_ext_byte_t*)RSTRING_PTR(destination_value) + destination_length;
+    size_t          prev_remaining_destination_buffer_length = remaining_destination_buffer_length;
 
     result = BrotliEncoderCompressStream(
       state_ptr,
@@ -159,15 +157,15 @@ static inline brs_ext_result_t decompress(
   BrotliDecoderResult result;
   brs_ext_result_t    ext_result;
 
-  const uint8_t* remaining_source        = (const uint8_t*)source;
-  size_t         remaining_source_length = source_length;
+  const brs_ext_byte_t* remaining_source        = (const brs_ext_byte_t*)source;
+  size_t                remaining_source_length = source_length;
 
   size_t destination_length                  = 0;
   size_t remaining_destination_buffer_length = destination_buffer_length;
 
   while (true) {
-    uint8_t* remaining_destination_buffer             = (uint8_t*)RSTRING_PTR(destination_value) + destination_length;
-    size_t   prev_remaining_destination_buffer_length = remaining_destination_buffer_length;
+    brs_ext_byte_t* remaining_destination_buffer             = (brs_ext_byte_t*)RSTRING_PTR(destination_value) + destination_length;
+    size_t          prev_remaining_destination_buffer_length = remaining_destination_buffer_length;
 
     result = BrotliDecoderDecompressStream(
       state_ptr,

data/ext/extconf.rb

@@ -61,7 +61,20 @@ $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"
+end
+
 $CFLAGS << " -Wno-declaration-after-statement"
+
 $VPATH << "$(srcdir)/#{extension_name}:$(srcdir)/#{extension_name}/stream"
 # rubocop:enable Style/GlobalVars
 

data/lib/brs/file.rb

@@ -22,6 +22,8 @@ module BRS
       open_files(source, destination) do |source_io, destination_io|
         BRS._native_compress_io source_io, destination_io, options
       end
+
+      nil
     end
 
     def self.decompress(source, destination, options = {})
@@ -33,6 +35,8 @@ module BRS
       open_files(source, destination) do |source_io, destination_io|
         BRS._native_decompress_io source_io, destination_io, options
       end
+
+      nil
     end
 
     private_class_method def self.open_files(source, destination, &_block)

data/lib/brs/stream/abstract.rb

@@ -17,23 +17,19 @@ module BRS
 
       include Delegates
 
-      attr_reader :io
-      attr_reader :stat
-      attr_reader :external_encoding
-      attr_reader :internal_encoding
-      attr_reader :transcode_options
-      attr_reader :pos
+      attr_reader :io, :stat, :external_encoding, :internal_encoding, :transcode_options, :pos
+
       alias tell pos
 
-      def initialize(io, external_encoding: nil, internal_encoding: nil, transcode_options: {})
+      def initialize(io, options = {})
         @raw_stream = create_raw_stream
 
         Validation.validate_io io
         @io = io
 
-        @stat = Stat.new @io.stat
+        @stat = Stat.new @io.stat if @io.respond_to? :stat
 
-        set_encoding external_encoding, internal_encoding, transcode_options
+        set_encoding options[:external_encoding], options[:internal_encoding], options[:transcode_options]
         reset_buffer
         reset_io_advise
 
@@ -50,8 +46,8 @@ module BRS
 
       protected def reset_io_advise
         # Both compressor and decompressor need sequential io access.
-        @io.advise :sequential
-      rescue ::Errno::ESPIPE # rubocop:disable Lint/HandleExceptions
+        @io.advise :sequential if @io.respond_to? :advise
+      rescue ::Errno::ESPIPE
         # ok
       end
 
@@ -126,7 +122,8 @@ module BRS
       def rewind
         @raw_stream = create_raw_stream
 
-        @io.rewind
+        @io.rewind if @io.respond_to? :rewind
+
         reset_buffer
         reset_io_advise
 

data/lib/brs/stream/raw/abstract.rb

@@ -19,11 +19,13 @@ module BRS
 
         def flush(&writer)
           write_result(&writer)
+
+          nil
         end
 
-        protected def flush_destination_buffer(&writer)
+        protected def more_destination(&writer)
           result_bytesize = write_result(&writer)
-          raise NotEnoughDestinationError, "not enough destination" if result_bytesize == 0
+          raise NotEnoughDestinationError, "not enough destination" if result_bytesize.zero?
         end
 
         protected def write_result(&_writer)
@@ -44,6 +46,8 @@ module BRS
 
           @native_stream.close
           @is_closed = true
+
+          nil
         end
 
         def closed?

data/lib/brs/stream/raw/compressor.rb

@@ -39,13 +39,15 @@ module BRS
 
             if need_more_destination
               source = source.byteslice bytes_written, source.bytesize - bytes_written
-              flush_destination_buffer(&writer)
+              more_destination(&writer)
               next
             end
 
             unless bytes_written == source.bytesize
+              # :nocov:
               # Compressor write should eat all provided "source" without remainder.
               raise UnexpectedError, "unexpected error"
+              # :nocov:
             end
 
             break
@@ -63,7 +65,7 @@ module BRS
             need_more_destination = @native_stream.flush
 
             if need_more_destination
-              flush_destination_buffer(&writer)
+              more_destination(&writer)
               next
             end
 
@@ -71,8 +73,6 @@ module BRS
           end
 
           super
-
-          nil
         end
 
         def close(&writer)
@@ -84,7 +84,7 @@ module BRS
             need_more_destination = @native_stream.finish
 
             if need_more_destination
-              flush_destination_buffer(&writer)
+              more_destination(&writer)
               next
             end
 
@@ -92,8 +92,6 @@ module BRS
           end
 
           super
-
-          nil
         end
       end
     end