pr-zlib 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e267929bdd826d6886a7c925291f1a8e2f344e9d2d6a4458c11f7fff0a68f896
-  data.tar.gz: 04d530d76deb665ba5b825545ac41b032ae0b2a792d24b72ab09e5bc3281c642
+  metadata.gz: cde92bf4908555ba88f41b5c5e21634008c87aa817d1630eb33f153ad9bb9e19
+  data.tar.gz: 70418f20d59f855af6ac56a85959f09a68ce03e72ecbcb76a5b869accbf026a1
 SHA512:
-  metadata.gz: 5bfa36efad4f579428aa55297044cf0a1174fbded31d7b0e4c2d79815306bb9406f9b48ed4afb7c71c2e12d8114650efca13a444c391dcc5f11a72bc56da3073
-  data.tar.gz: ae47b4147c1607ec1ab0962a5c49200874c3b62010186a1648b2c27f8b85f341a5ef83074774acdaa9b809c73d21938098850279cc037b3742fce98321675381
+  metadata.gz: 704e0d45e29f0199f7b1dc627a8670900de6b93303dcc324ca25c9607b5d7e9e41ee78e2aee12d2e7f6c56771d3a634b0e6d87185a5b055c3bce23ae77a9d7fc
+  data.tar.gz: 29a6adb5f8fd1ee0afa422a39f20d00d9d907db56e09641426d5f20b98c7a06096566e8a3ec1a369226fc06c27c6239cd94edce6b8fc16c786beb5adf59bd00e

data/{CHANGES → CHANGES.md}

@@ -1,4 +1,17 @@
-= 1.0.5 - 18-Mar-2018
+## 1.1.0 - 30-Aug-2025
+* Fixed several critical bugs.
+* Many Ruby and Rubocop warnings cleaned up.
+* Tests now use rspec instead of test-unit.
+* Lots of cleanup, reorganization and general refactoring.
+
+## 1.0.6 - 19-Mar-2018
+* Added the minirbgzip executable, a Ruby implementation of minigzip.
+  Formerly minigzip.rb, this had been part of the repo but had never been
+  released with the gem.
+* Some minor updates and fixes to the minirbgzip executable.
+* Metadata fix for changelog_uri.
+
+## 1.0.5 - 18-Mar-2018
 * Set the frozen_string_literal pragma, which gives us a small performance
   boost for reads.
 * Removed the custom Fixnum#ord method.
@@ -6,12 +19,12 @@
 * Added metadata to the gemspec plus some other minor updates.
 * Updated cert.
 
-= 1.0.4 - 15-Nov-2016
+## 1.0.4 - 15-Nov-2016
 * Fixed an endian bug. Thanks go to Benoit Daloze for the patch.
 * The version constants are now frozen (and fixed the version number).
 * Updated the cert.
 
-= 1.0.3 - 3-Dec-2015
+## 1.0.3 - 3-Dec-2015
 * Added a license. This library is now covered under the zlib license.
 * Some performance tuning. Reads are 2-3 times faster, while writes are
   about twenty percent faster.
@@ -21,10 +34,10 @@
 * More stringent value and limit checking added. Thanks go to
   Chris Seaton for the patches.
 
-= 1.0.2 - 24-Jun-2015
+## 1.0.2 - 24-Jun-2015
 * Fixed a marshalling issue.
 
-= 1.0.1 - 16-Oct-2014
+## 1.0.1 - 16-Oct-2014
 * Added benchmark and profiler scripts and rake tasks.
 * Switched profiling scripts to use ruby-prof.
 * The test-unit and ruby-prof libraries are now development dependencies.
@@ -32,5 +45,5 @@
 * Some minor test suite updates, mostly for 1.9.3.
 * Updated the gemspec, removed Rubyforge references.
 
-= 1.0.0 - 12-Jun-2009
+## 1.0.0 - 12-Jun-2009
 * Initial release

data/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "ruby-prof", :platforms => [:mri, :truffleruby]
+gem "jruby-prof", :platforms => :jruby
+
+gemspec

data/MANIFEST.md

@@ -0,0 +1,20 @@
+* CHANGES.md
+* MANIFEST.md
+* README.md
+* pr-zlib.gemspec
+* bin/minirbgzip
+* certs/djberg96_pub.pem
+* examples/example_rbzlib.rb
+* lib/pr-zlib.rb
+* lib/pr/rbzlib.rb
+* lib/pr/zlib.rb
+* test/test_rbzlib_bytef.rb
+* test/test_rbzlib_posf.rb
+* test/test_rbzlib.rb
+* test/test_zlib_deflate.rb
+* test/test_zlib_gzip_file.rb
+* test/test_zlib_gzip_reader.rb
+* test/test_zlib_gzip_writer.rb
+* test/test_zlib_inflate.rb
+* test/test_zlib_zstream.rb
+* test/test_zlib.rb

data/{README → README.md}

@@ -1,19 +1,25 @@
-= Description
+## Description
 The pr-zlib library is a pure Ruby version of the zlib compression library.
 It consists of both a port of zlib.h and the Ruby zlib library that ships as
 part of the standard library.
 
-= Synopsis
+## Installation
+`gem install pr-zlib`
 
+## Adding the trusted cert
+`gem cert --add <(curl -Ls https://raw.githubusercontent.com/djberg96/pr-zlib/main/certs/djberg96_pub.pem)`
+
+## Synopsis
+```ruby
 # Imitating a bit of code used in rubygems
 require 'pr/zlib'
 require 'stringio'
 
 data = StringIO.new(data)
 Zlib::GzipReader.new(data).read
+```
 
-= Motivation
-
+## Motivation
 First, building the zlib C library on MS Windows with Visual C++ is very
 difficult. However, certain libraries depend on zlib, most notably rubygems.
 By providing a pure Ruby version we eliminate any compiler or platform
@@ -32,21 +38,32 @@ Last, the zlib interface that ships as part of the stdlib is a little on the
 clunky side. By providing a pure Ruby version, authors can create their own
 interface as they see fit.
 
-= TODO
+Update August 2025: Most of the original motivation for this library is no
+longer relevant today. Desktop users of MS Windows typically use the one-click
+installer which bundles the shared objects it needs. In the land of Unix, where
+most actual production code happens, folks use Docker images for Ruby which
+either already bundles everything, or they just add it to their Dockerfile.
+
+But, hey, I paid for this and it works. Who knows, maybe it'll be nice to have
+around someday.
+
+## Origins
+This library was the result of a small code bounty that I (Daniel Berger) funded:
 
+https://rubytalk.org/t/bounty-pure-ruby-zlib-gzipwriter/50730
+
+## TODO
 More tests, and better tests, are needed for both Rbzlib and Zlib.
 
-= Caveats
+## Caveats
 You cannot use both this library and the zlib standard library at the same
 time. If you try to use both there is a good chance you will get an allocation
 error of some sort. If you already have zlib, you do not need this library.
 
-= License
-
+## License
 This library is covered under the same license as zlib itself. For the text
 of the zlib license, please see http://zlib.net/zlib_license.html.
 
-= Authors
-
-* Park Heesob (C translation)
-* Daniel Berger (Testing, packaging, deployment)
+## Authors
+* Park Heesob (Original C translation)
+* Daniel Berger (Testing, packaging, deployment, maintenance)

data/Rakefile

@@ -1,9 +1,9 @@
 require 'rake'
 require 'rake/clean'
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 require 'rbconfig'
 
-CLEAN.include("**/*.rbc", "**/*.gem", "**/*.txt", "**/*.gz")
+CLEAN.include("**/*.rbc", "**/*.gem", "**/*.txt", "**/*.gz", "**/*.lock")
 
 desc 'Install the pr-zlib library as zlib'
 task :install_as_zlib do
@@ -16,11 +16,11 @@ end
 
 namespace :gem do
   desc 'Create the pr-zlib gem'
-  task :create do
+  task :create => :clean do
     require 'rubygems/package'
     spec = eval(IO.read('pr-zlib.gemspec'))
     spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
-    Gem::Package.build(spec, true)
+    Gem::Package.build(spec)
   end
 
   desc 'Install the pr-zlib gem'
@@ -54,63 +54,13 @@ namespace :profile do
   end
 end
 
-Rake::TestTask.new do |t|
-  t.warning = true
-  t.verbose = true
+# RSpec tests
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = ['--format', 'documentation', '--color']
 end
 
-Rake::TestTask.new('test_zlib') do |t|
-  t.warning = true
-  t.verbose = true
-  t.test_files = FileList['test/test_zlib.rb']
-end
-
-Rake::TestTask.new('test_gzip_file') do |t|
-  t.warning = true
-  t.verbose = true
-  t.test_files = FileList['test/test_zlib_gzip_file.rb']
-end
-
-Rake::TestTask.new('test_gzip_reader') do |t|
-  t.warning = true
-  t.verbose = true
-  t.test_files = FileList['test/test_zlib_gzip_reader.rb']
-end
-
-Rake::TestTask.new('test_gzip_writer') do |t|
-  t.warning = true
-  t.verbose = true
-  t.test_files = FileList['test/test_zlib_gzip_writer.rb']
-end
-
-Rake::TestTask.new('test_deflate') do |t|
-  t.warning = true
-  t.verbose = true
-  t.test_files = FileList['test/test_zlib_deflate.rb']
-end
-
-Rake::TestTask.new('test_inflate') do |t|
-  t.warning = true
-  t.verbose = true
-  t.test_files = FileList['test/test_zlib_inflate.rb']
-end
-
-Rake::TestTask.new('test_rbzlib') do |t|
-  t.warning = true
-  t.verbose = true
-  t.test_files = FileList['test/test_rbzlib.rb']
-end
-
-Rake::TestTask.new('test_rbzlib_bytef') do |t|
-  t.warning = true
-  t.verbose = true
-  t.test_files = FileList['test/test_rbzlib_bytef.rb']
-end
-
-Rake::TestTask.new('test_rbzlib_posf') do |t|
-  t.warning = true
-  t.verbose = true
-  t.test_files = FileList['test/test_rbzlib_posf.rb']
-end
+desc 'Run all RSpec tests'
+task :test => :spec
 
-task :default => :test
+task :default => :spec

data/bin/{minizip.rb → minirbgzip}

@@ -1,9 +1,9 @@
-# minigzip.rb -- simulate gzip using the zlib compression library
+#!/usr/bin/env ruby
+
+# minigzip -- simulate gzip using the zlib compression library
 # Copyright (C) 1995-2005 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in rbzlib.rb
 #
-#
-#
 # minigzip is a minimal implementation of the gzip utility. This is
 # only an example of using zlib and isn't meant to replace the
 # full-featured gzip. No attempt is made to deal with file systems
@@ -11,10 +11,10 @@
 # very limited. So use minigzip only for testing; use gzip for the
 # real thing. On MSDOS, use only on file names without extension
 # or in pipe mode.
-#              
-# Ruby tralnslation By Park Heesob.
+#
+# minigzip to minirbgzip Ruby translation By Park Heesob.
 
-require 'rbzlib'
+require_relative '../lib/pr-zlib'
 include Rbzlib
 
 GZ_SUFFIX = ".gz"
@@ -23,69 +23,70 @@ SUFFIX_LEN = GZ_SUFFIX.length
 BUFLEN      = 16384
 MAX_NAME_LEN = 1024
 
-
 def error(msg)
-    puts("#{__FILE__}: #{msg}")
-    exit(1)
+  puts("#{__FILE__}: #{msg}")
+  exit(1)
 end
 
 def gz_compress(_in, out)
-    while(true)
-      begin
-        buf = _in.read(BUFLEN)
-      rescue 
-        raise RuntimeError,"read"
-      end
-      break if buf.nil?
-      err = 0
-      len = buf.length
-      if (gzwrite(out, buf, len) != len)
-        error(gzerror(out, err))
-      end
+  while true
+    begin
+      buf = _in.read(BUFLEN)
+    rescue
+      raise RuntimeError,"read"
     end
-    _in.close
-    error("failed gzclose") if (gzclose(out) != Z_OK) 
-end
 
+    break if buf.nil?
+
+    err = 0
+    len = buf.length
+
+    if (gzwrite(out, buf, len) != len)
+      error(gzerror(out, err))
+    end
+  end
+  _in.close
+  error("failed gzclose") if (gzclose(out) != Z_OK)
+end
 
 def gz_uncompress(_in, out)
-    buf = 0.chr * BUFLEN
-    while true
-        len = gzread(_in, buf, buf.length)
-        err = 0
-        error(gzerror(_in, err)) if (len < 0) 
-        break if len.zero?
+  buf = 0.chr * BUFLEN
+  while true
+    len = gzread(_in, buf, buf.length)
+    err = 0
+    error(gzerror(_in, err)) if (len < 0)
+    break if len.zero?
 		if(out.write(buf[0,len]) != len)
-            error("failed write")
-        end
+      error("failed write")
     end
-    begin
-      out.close
-    rescue
-      error("failed fclose") 
-    end
-
-    error("failed gzclose") if (gzclose(_in) != Z_OK) 
+  end
+  begin
+    out.close
+  rescue
+    error("failed fclose")
+  end
+
+  error("failed gzclose") if (gzclose(_in) != Z_OK)
 end
 
-
 def file_compress(file, mode)
-    outfile = file + GZ_SUFFIX
+  outfile = file + GZ_SUFFIX
 
-    _in = File.open(file, "rb")
-    if _in.nil? 
-        raise RuntimeError,file
-    end
-    out = gzopen(outfile, mode)
-    if out.nil?
-        puts("#{__FILE__}: can't gzopen #{outfile}")
-        exit(1)
-    end
-    gz_compress(_in, out)
+  _in = File.open(file, "rb")
+  if _in.nil?
+    raise RuntimeError,file
+  end
+  out = gzopen(outfile, mode)
 
-    File.unlink(file)
-end
+  if out.nil?
+    puts("#{__FILE__}: can't gzopen #{outfile}")
+    exit(1)
+  end
 
+  gz_compress(_in, out)
+
+  File.unlink(file)
+end
 
 def file_uncompress(file)
     len = file.length
@@ -94,17 +95,17 @@ def file_uncompress(file)
     if (file[-SUFFIX_LEN..-1] == GZ_SUFFIX)
         infile = file.dup
         outfile = buf[0..(-SUFFIX_LEN-1)]
-    else 
+    else
         outfile = file.dup
         infile = buf + GZ_SUFFIX
     end
     _in = gzopen(infile, "rb")
-    if _in.nil? 
+    if _in.nil?
         puts("#{__FILE__}: can't gzopen #{infile}")
         exit(1)
     end
     out = File.open(outfile, "wb")
-    if out.nil? 
+    if out.nil?
         raise RuntimeError,file
         exit(1)
     end
@@ -141,6 +142,17 @@ end
         outmode[3] = 'R'
       when "-1".."-9"
         outmode[2] = argv[1]
+      when "--help"
+        help = <<-HERE
+        Usage:  minigzip [-d] [-f] [-h] [-r] [-1 to -9] [files...]
+          -d : decompress
+          -f : compress with Z_FILTERED
+          -h : compress with Z_HUFFMAN_ONLY
+          -r : compress with Z_RLE
+          -1 to -9 : compression level
+        HERE
+        puts help
+        exit!
       else
         ARGV.unshift(argv)
         break
@@ -149,23 +161,23 @@ end
     if (outmode[3].chr == ' ')
         outmode = outmode[0,3]
     end
-    if (ARGV.empty?)        
+    if (ARGV.empty?)
         $stdin.binmode
         $stdout.binmode
-        if (uncompr) 
+        if (uncompr)
             file = gzdopen($stdin.fileno, "rb")
-            error("can't gzdopen stdin") if file.nil? 
+            error("can't gzdopen stdin") if file.nil?
             gz_uncompress(file, $stdout)
-        else 
+        else
             file = gzdopen($stdout.fileno, outmode)
-            error("can't gzdopen stdout") if file.nil? 
+            error("can't gzdopen stdout") if file.nil?
             gz_compress($stdin, file)
         end
-    else 
-        while !ARGV.empty? 
-            if (uncompr) 
+    else
+        while !ARGV.empty?
+            if (uncompr)
                 file_uncompress(ARGV.shift)
-            else 
+            else
                 file_compress(ARGV.shift, outmode)
             end
         end

data/lib/pr/rbzlib/bytef.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative 'bytef_str'
+require_relative 'bytef_arr'
+
+module Rbzlib
+  class Bytef
+    def self.new(buffer, offset = 0)
+      if buffer.class == Array
+        Bytef_arr.new(buffer, offset)
+      else
+        Bytef_str.new(buffer, offset)
+      end
+    end
+  end
+end

data/lib/pr/rbzlib/bytef_arr.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative 'bytef_str'
+
+module Rbzlib
+  class Bytef_arr < Bytef_str
+
+    def initialize(buffer, offset = 0)
+      @buffer = buffer
+      @offset = offset
+    end
+
+    def [](idx)
+      @buffer[idx + @offset]
+    end
+
+    def []=(idx, val)
+      @buffer[idx + @offset] = val
+    end
+
+    def get
+      @buffer[@offset]
+    end
+
+    def set(val)
+      @buffer[@offset] = val
+    end
+  end
+end

data/lib/pr/rbzlib/bytef_str.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Rbzlib
+  class Bytef_str
+    attr_accessor :buffer, :offset
+
+    def initialize(buffer, offset = 0)
+      if buffer.class == String
+        @buffer = buffer
+        @offset = offset
+        @buffer.force_encoding('ASCII-8BIT')
+      else
+        @buffer = buffer.buffer
+        @offset = offset
+      end
+    end
+
+    def length
+      @buffer.length
+    end
+
+    def +(inc)
+      @offset += inc
+      self
+    end
+
+    def -(dec)
+      @offset -= dec
+      self
+    end
+
+    def [](idx)
+      @buffer.getbyte(idx + @offset)
+    end
+
+    def []=(idx, val)
+      @buffer.setbyte(idx + @offset, val.ord)
+    end
+
+    def get
+      @buffer.getbyte(@offset)
+    end
+
+    def set(val)
+      @buffer.setbyte(@offset, val.ord)
+    end
+
+    def current
+      @buffer[@offset..-1]
+    end
+  end
+end

data/lib/pr/rbzlib/posf.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'bytef_str'
+
+module Rbzlib
+  class Posf < Bytef_str
+    def +(inc)
+      @offset += inc * 2
+      self
+    end
+
+    def -(dec)
+      @offset -= dec * 2
+      self
+    end
+
+    def [](idx)
+      @buffer[(idx * 2) + @offset, 2].unpack('v').first
+    end
+
+    def []=(idx, val)
+      @buffer[(idx * 2) + @offset, 2] = [val].pack('v')
+    end
+
+    def get
+      @buffer[@offset, 2].unpack('v').first
+    end
+
+    def set(val)
+      @buffer[@offset, 2] = [val].pack('v')
+    end
+  end
+end