ruby-lzws 1.1.5 → 1.3.1

data/lib/lzws/file.rb

@@ -17,7 +17,7 @@ module LZWS
 
       options = Option.get_compressor_options options, BUFFER_LENGTH_NAMES
 
-      open_files(source, destination) do |source_io, destination_io|
+      open_files source, destination do |source_io, destination_io|
         LZWS._native_compress_io source_io, destination_io, options
       end
 
@@ -30,7 +30,7 @@ module LZWS
 
       options = Option.get_decompressor_options options, BUFFER_LENGTH_NAMES
 
-      open_files(source, destination) do |source_io, destination_io|
+      open_files source, destination do |source_io, destination_io|
         LZWS._native_decompress_io source_io, destination_io, options
       end
 

data/lib/lzws/option.rb

@@ -8,45 +8,62 @@ require_relative "validation"
 
 module LZWS
   module Option
-    # Default options will be compatible with UNIX compress.
-
-    DEFAULT_BUFFER_LENGTH       = 0
-    LOWEST_MAX_CODE_BIT_LENGTH  = 9
-    BIGGEST_MAX_CODE_BIT_LENGTH = 16
-
-    DECOMPRESSOR_DEFAULTS = {
-      :without_magic_header => false,
-      :msb                  => false,
-      :unaligned_bit_groups => false,
-      :quiet                => false
+    DEFAULT_BUFFER_LENGTH = 0
+
+    COMPRESSOR_DEFAULTS = {
+      :gvl                  => false,
+      :max_code_bit_length  => nil,
+      :without_magic_header => nil,
+      :block_mode           => nil,
+      :msb                  => nil,
+      :unaligned_bit_groups => nil,
+      :quiet                => nil
     }
     .freeze
 
-    COMPRESSOR_DEFAULTS = DECOMPRESSOR_DEFAULTS.merge(
-      :max_code_bit_length => BIGGEST_MAX_CODE_BIT_LENGTH,
-      :block_mode          => true
-    )
+    DECOMPRESSOR_DEFAULTS = {
+      :gvl                  => false,
+      :without_magic_header => nil,
+      :msb                  => nil,
+      :unaligned_bit_groups => nil,
+      :quiet                => nil
+    }
     .freeze
 
     def self.get_compressor_options(options, buffer_length_names)
       Validation.validate_hash options
 
-      buffer_length_defaults = buffer_length_names.each_with_object({}) { |name, defaults| defaults[name] = DEFAULT_BUFFER_LENGTH }
-      options                = COMPRESSOR_DEFAULTS.merge(buffer_length_defaults).merge options
+      buffer_length_defaults = buffer_length_names.each_with_object({}) do |name, defaults|
+        defaults[name] = DEFAULT_BUFFER_LENGTH
+      end
+
+      options = COMPRESSOR_DEFAULTS.merge(buffer_length_defaults).merge options
 
       buffer_length_names.each { |name| Validation.validate_not_negative_integer options[name] }
 
+      Validation.validate_bool options[:gvl]
+
       max_code_bit_length = options[:max_code_bit_length]
-      Validation.validate_positive_integer max_code_bit_length
+      unless max_code_bit_length.nil?
+        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
+      end
+
+      without_magic_header = options[:without_magic_header]
+      Validation.validate_bool without_magic_header unless without_magic_header.nil?
 
-      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
+      block_mode = options[:block_mode]
+      Validation.validate_bool block_mode unless block_mode.nil?
 
-      Validation.validate_bool options[:without_magic_header]
-      Validation.validate_bool options[:block_mode]
-      Validation.validate_bool options[:msb]
-      Validation.validate_bool options[:unaligned_bit_groups]
-      Validation.validate_bool options[:quiet]
+      msb = options[:msb]
+      Validation.validate_bool msb unless msb.nil?
+
+      unaligned_bit_groups = options[:unaligned_bit_groups]
+      Validation.validate_bool unaligned_bit_groups unless unaligned_bit_groups.nil?
+
+      quiet = options[:quiet]
+      Validation.validate_bool quiet unless quiet.nil?
 
       options
     end
@@ -54,15 +71,27 @@ module LZWS
     def self.get_decompressor_options(options, buffer_length_names)
       Validation.validate_hash options
 
-      buffer_length_defaults = buffer_length_names.each_with_object({}) { |name, defaults| defaults[name] = DEFAULT_BUFFER_LENGTH }
-      options                = DECOMPRESSOR_DEFAULTS.merge(buffer_length_defaults).merge options
+      buffer_length_defaults = buffer_length_names.each_with_object({}) do |name, defaults|
+        defaults[name] = DEFAULT_BUFFER_LENGTH
+      end
+
+      options = DECOMPRESSOR_DEFAULTS.merge(buffer_length_defaults).merge options
 
       buffer_length_names.each { |name| Validation.validate_not_negative_integer options[name] }
 
-      Validation.validate_bool options[:without_magic_header]
-      Validation.validate_bool options[:msb]
-      Validation.validate_bool options[:unaligned_bit_groups]
-      Validation.validate_bool options[:quiet]
+      Validation.validate_bool options[:gvl]
+
+      without_magic_header = options[:without_magic_header]
+      Validation.validate_bool without_magic_header unless without_magic_header.nil?
+
+      msb = options[:msb]
+      Validation.validate_bool msb unless msb.nil?
+
+      unaligned_bit_groups = options[:unaligned_bit_groups]
+      Validation.validate_bool unaligned_bit_groups unless unaligned_bit_groups.nil?
+
+      quiet = options[:quiet]
+      Validation.validate_bool quiet unless quiet.nil?
 
       options
     end

data/lib/lzws/stream/abstract.rb

@@ -12,7 +12,8 @@ module LZWS
       # Native stream is not seekable by design.
       # Related methods like "seek" and "pos=" can't be implemented.
 
-      # It is not possible to maintain correspondance between bytes consumed from source and bytes written to destination by design.
+      # It is not possible to maintain correspondance between bytes
+      # consumed from source and bytes written to destination by design.
       # We will consume all source bytes and maintain buffer with remaining destination data.
 
       include Delegates
@@ -89,8 +90,9 @@ module LZWS
         end
 
         internal_encoding = args[1]
-        Validation.validate_string internal_encoding \
-          unless internal_encoding.nil? || internal_encoding.is_a?(::Encoding)
+        unless internal_encoding.nil? || internal_encoding.is_a?(::Encoding)
+          Validation.validate_string internal_encoding
+        end
 
         transcode_options = args[2]
         Validation.validate_hash transcode_options unless transcode_options.nil?

data/lib/lzws/stream/reader.rb

@@ -33,8 +33,9 @@ module LZWS
         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.nil? || source_buffer_length.zero?
+        if source_buffer_length.nil? || source_buffer_length.zero?
+          source_buffer_length = Buffer::DEFAULT_SOURCE_BUFFER_LENGTH_FOR_DECOMPRESSOR
+        end
 
         @source_buffer_length = source_buffer_length
       end

data/lib/lzws/stream/reader_helpers.rb

@@ -143,7 +143,7 @@ module LZWS
       end
 
       protected def each_string(each_proc, &block)
-        return enum_for __method__ unless block.is_a? ::Proc
+        return enum_for __method__, each_proc unless block.is_a? ::Proc
 
         loop do
           string = each_proc.call

data/lib/lzws/validation.rb

@@ -43,7 +43,9 @@ module LZWS
     end
 
     def self.validate_proc(value)
-      raise ValidateError, "invalid proc" unless value.is_a?(::Proc) || value.is_a?(::Method) || value.is_a?(::UnboundMethod)
+      unless value.is_a?(::Proc) || value.is_a?(::Method) || value.is_a?(::UnboundMethod)
+        raise ValidateError, "invalid proc"
+      end
     end
   end
 end

data/lib/lzws/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lzws
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.3.1
 platform: ruby
 authors:
 - Andrew Aladjev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-18 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.12'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.12'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: ocg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +128,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.75'
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.75'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +192,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: aladjev.andrew@gmail.com
 executables: []
 extensions:
@@ -152,6 +208,7 @@ files:
 - ext/lzws_ext/common.h
 - ext/lzws_ext/error.c
 - ext/lzws_ext/error.h
+- ext/lzws_ext/gvl.h
 - ext/lzws_ext/io.c
 - ext/lzws_ext/io.h
 - ext/lzws_ext/macro.h
@@ -185,7 +242,7 @@ homepage: https://github.com/andrew-aladev/ruby-lzws
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -193,15 +250,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
-summary: Ruby bindings for lzws library.
+summary: Ruby bindings for lzws library (compatible with UNIX compress).
 test_files: []