ruby-lzws 1.0.0 → 1.1.0

data/lib/lzws/stream/raw/decompressor.rb

@@ -4,7 +4,6 @@
 require "lzws_ext"
 
 require_relative "abstract"
-require_relative "../../error"
 require_relative "../../option"
 require_relative "../../validation"
 
@@ -12,13 +11,13 @@ module LZWS
   module Stream
     module Raw
       class Decompressor < Abstract
+        BUFFER_LENGTH_NAMES = %i[destination_buffer_length].freeze
+
         def initialize(options = {})
-          options       = Option.get_decompressor_options options
+          options       = Option.get_decompressor_options options, BUFFER_LENGTH_NAMES
           native_stream = NativeDecompressor.new options
 
           super native_stream
-
-          @need_to_read_magic_header = !options[:without_magic_header]
         end
 
         def read(source, &writer)
@@ -29,19 +28,6 @@ module LZWS
 
           total_bytes_read = 0
 
-          if @need_to_read_magic_header
-            bytes_read = @native_stream.read_magic_header source
-            if bytes_read == 0
-              # Decompressor is not able to read full magic header.
-              return 0
-            end
-
-            total_bytes_read += bytes_read
-            source            = source.byteslice bytes_read, source.bytesize - bytes_read
-
-            @need_to_read_magic_header = false
-          end
-
           loop do
             bytes_read, need_more_destination  = @native_stream.read source
             total_bytes_read                  += bytes_read
@@ -59,19 +45,15 @@ module LZWS
           total_bytes_read
         end
 
-        def flush(&writer)
-          do_not_use_after_close
+        def close(&writer)
+          return nil if closed?
 
           Validation.validate_proc writer
 
-          write_result(&writer)
+          super
 
           nil
         end
-
-        protected def do_not_use_after_close
-          raise UsedAfterCloseError, "decompressor used after close" if @is_closed
-        end
       end
     end
   end

data/lib/lzws/stream/reader.rb

@@ -11,8 +11,6 @@ module LZWS
     class Reader < Abstract
       include ReaderHelpers
 
-      DEFAULT_IO_PORTION_BYTESIZE = 1 << 15 # 32 KB
-
       attr_accessor :lineno
 
       def initialize(source_io, options = {}, *args)
@@ -20,17 +18,22 @@ module LZWS
 
         super source_io, *args
 
-        io_portion_bytesize = @options[:io_portion_bytesize]
-        @options.delete :io_portion_bytesize
-
-        Validation.validate_positive_integer io_portion_bytesize unless io_portion_bytesize.nil?
-        @io_portion_bytesize = io_portion_bytesize || DEFAULT_IO_PORTION_BYTESIZE
-
+        initialize_source_buffer_length
         reset_io_remainder
 
         @lineno = 0
       end
 
+      protected def initialize_source_buffer_length
+        source_buffer_length = @options[:source_buffer_length]
+        Validation.validate_not_negative_integer source_buffer_length unless source_buffer_length.nil?
+
+        source_buffer_length = Buffer::DEFAULT_SOURCE_BUFFER_LENGTH_FOR_DECOMPRESSOR \
+          if source_buffer_length == 0 || source_buffer_length.nil?
+
+        @source_buffer_length = source_buffer_length
+      end
+
       protected def create_raw_stream
         Raw::Decompressor.new @options
       end
@@ -69,7 +72,7 @@ module LZWS
       end
 
       protected def read_more_from_buffer
-        io_data = @io.read @io_portion_bytesize
+        io_data = @io.read @source_buffer_length
         append_io_data_to_buffer io_data
       end
 
@@ -82,7 +85,7 @@ module LZWS
       end
 
       protected def readpartial_from_buffer
-        io_data = @io.readpartial @io_portion_bytesize
+        io_data = @io.readpartial @source_buffer_length
         append_io_data_to_buffer io_data
       end
 
@@ -111,7 +114,7 @@ module LZWS
       end
 
       protected def read_more_from_buffer_nonblock(*options)
-        io_data = @io.read_nonblock @io_portion_bytesize, *options
+        io_data = @io.read_nonblock @source_buffer_length, *options
         append_io_data_to_buffer io_data
       end
 

data/lib/lzws/stream/reader_helpers.rb

@@ -156,7 +156,7 @@ module LZWS
       protected def ungetstring(string)
         Validation.validate_string string
 
-        string = ::String.new string, :encoding => @internal_encoding
+        string = ::String.new string, :encoding => @internal_encoding unless @internal_encoding.nil?
         string = transcode_to_external string unless @external_encoding.nil?
 
         string.force_encoding ::Encoding::BINARY
@@ -172,8 +172,8 @@ module LZWS
           Validation.validate_string file_path
           Validation.validate_proc block
 
-          ::File.open file_path, "rb" do |file|
-            reader = new file, *args
+          ::File.open file_path, "rb" do |io|
+            reader = new io, *args
 
             begin
               yield reader

data/lib/lzws/stream/writer_helpers.rb

@@ -73,8 +73,8 @@ module LZWS
           Validation.validate_string file_path
           Validation.validate_proc block
 
-          ::File.open file_path, "wb" do |file|
-            writer = new file, *args
+          ::File.open file_path, "wb" do |io|
+            writer = new io, *args
 
             begin
               yield writer

data/lib/lzws/string.rb

@@ -8,10 +8,12 @@ require_relative "validation"
 
 module LZWS
   module String
+    BUFFER_LENGTH_NAMES = %i[destination_buffer_length].freeze
+
     def self.compress(source, options = {})
       Validation.validate_string source
 
-      options = Option.get_compressor_options options
+      options = Option.get_compressor_options options, BUFFER_LENGTH_NAMES
 
       LZWS._native_compress_string source, options
     end
@@ -19,7 +21,7 @@ module LZWS
     def self.decompress(source, options = {})
       Validation.validate_string source
 
-      options = Option.get_decompressor_options options
+      options = Option.get_decompressor_options options, BUFFER_LENGTH_NAMES
 
       LZWS._native_decompress_string source, options
     end

data/lib/lzws/version.rb

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

data/lib/lzws.rb

@@ -1,4 +1,7 @@
-require_relative "lzws/file"
+# Ruby bindings for lzws library.
+# Copyright (c) 2019 AUTHORS, MIT License.
+
 require_relative "lzws/stream/reader"
 require_relative "lzws/stream/writer"
+require_relative "lzws/file"
 require_relative "lzws/string"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lzws
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Aladjev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
@@ -105,6 +105,8 @@ files:
 - LICENSE
 - README.md
 - ext/extconf.rb
+- ext/lzws_ext/buffer.c
+- ext/lzws_ext/buffer.h
 - ext/lzws_ext/common.h
 - ext/lzws_ext/error.c
 - ext/lzws_ext/error.h
@@ -156,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for lzws library.