zopfli 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3121a61abacb0a102a03f4ec91ac9e6ee4a6132942d6e402bcfded04a25f39bd
-  data.tar.gz: 544aee94aaaa325abcaee491d8b052a59dbd6809794fb2cdd4dd3fd787c466dd
+  metadata.gz: ea7e06b8390382908a91c402f02754fa8f2a325699d424731f3903595cbe2d73
+  data.tar.gz: 138f867202c10b77cca5cd0c06545add1a630dd8721e5d67dc667d5257c55915
 SHA512:
-  metadata.gz: 5ff282d1b59f9bd4ab899cb1a16b63cadc64bb5a24c72b76289b136eadd8b50fcd14cb3a787169bc342ca1c6bb4ca5f405cc412eb3c13af6f4aa0c389cae2ec9
-  data.tar.gz: 24c803340ae499cf43da0d62b4fd916a0a05db1db07967461a7e65145810b70129a8063d4b972a1dad67ec8a6691b0ecf4d057390a78be771efae17983cae142
+  metadata.gz: b6bbf82746d164940dd0781b512623fc22101c12240dc32b8745007f8ce04079d4fd07e6d1c25dea78f96bfaed8202c85ed18fb766041b4050a4dd3339bf46a1
+  data.tar.gz: f5415a40dee71d25d4cfd8279ccf5ec6ce3269551055be2dfddc8c375635481e39fbfdebc9f7547928631762a67dcada8e99c8da33cb669734bd2a218ff809e7

data/.github/workflows/main.yml

@@ -0,0 +1,35 @@
+name: Ruby
+
+on: [pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6, 2.7, 3.0]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run the default task
+      run: |
+        bundle exec rake clobber test build
+        gem install --no-document "$(ls pkg/zopfli-*.gem)"
+        cat <<EOF | ruby
+        require "zopfli"
+        require "zlib"
+        if Zlib::Inflate.inflate(Zopfli.deflate(File.read("README.md"))) == File.read("README.md")
+          puts "OK"
+          exit 0
+        else
+          puts "NG"
+          exit 0
+        end
+        EOF

data/.github/workflows/publish.yml

@@ -0,0 +1,34 @@
+name: Publish Gem
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [3.0]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run release task
+      run: |
+        mkdir -p ~/.gem
+        cat << EOF > ~/.gem/credentials
+        ---
+        :github: Bearer ${{secrets.GITHUB_TOKEN}}
+        :rubygems_api_key: ${{secrets.RUBYGEMS_API_KEY}}
+        EOF
+        chmod 600 ~/.gem/credentials
+        bundle exec rake release[remote]
+        rm -f ~/.gem/credentials

data/Gemfile

@@ -3,4 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in zopfli.gemspec
 gemspec
 
-gem 'travis'
+gem "rake", "~> 13.0"
+gem "test-unit", "~> 3.0"
+gem "test-unit-rr"

data/Rakefile

@@ -1,5 +1,7 @@
+require "bundler/setup"
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require "rake/clean"
+require "rake/testtask"
 require "rbconfig"
 
 DLEXT = RbConfig::CONFIG["DLEXT"]
@@ -12,12 +14,16 @@ file "ext/zopfli.#{DLEXT}" => Dir.glob("ext/*{.rb,.c,.h}") do
   cp "ext/zopfli.#{DLEXT}", "lib"
 end
 
-task :clean do
-  files = Dir["ext/*"] - ["ext/extconf.rb", "ext/zopfli.c"]
-  files += ["ext/zopfli.#{DLEXT}", "lib/zopfli.#{DLEXT}"]
-  rm_rf(files) unless files.empty?
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/**/*_test.rb"]
+  t.warning = true
+  t.verbose = true
 end
 
-RSpec::Core::RakeTask.new(:spec)
-task :spec => "ext/zopfli.#{DLEXT}"
-task :default => :spec
+CLEAN.include "ext/zopfli.#{DLEXT}", "lib/zopfli.#{DLEXT}"
+CLEAN.include "ext/*"
+CLEAN.exclude "ext/extconf.rb", "ext/zopfli.c"
+
+task :test => "ext/zopfli.#{DLEXT}"
+task :default => :test

data/ext/extconf.rb

@@ -8,37 +8,40 @@
 # the ZopfliOptions first.
 require "mkmf"
 
-dst = File.dirname File.expand_path __FILE__
-src = File.join dst, "..", "vendor", "zopfli", "src", "zopfli"
-
-%w(
-blocksplitter.c
-blocksplitter.h
-cache.c
-cache.h
-deflate.c
-deflate.h
-gzip_container.c
-gzip_container.h
-hash.c
-hash.h
-katajainen.c
-katajainen.h
-lz77.c
-lz77.h
-squeeze.c
-squeeze.h
-symbols.h
-tree.c
-tree.h
-util.c
-util.h
-zlib_container.c
-zlib_container.h
-zopfli.h
-zopfli_lib.c
-).each do |file|
-  FileUtils.copy File.join(src, file), File.join(dst, file) if FileTest.exist? File.join(src, file)
+dir_config("zopfli")
+if have_header("zopfli/zopfli.h") && have_library("zopfli", "ZopfliCompress", "zopfli/zopfli.h")
+  create_makefile "zopfli"
+else
+  dst = File.dirname File.expand_path __FILE__
+  src = File.join dst, "..", "vendor", "zopfli", "src", "zopfli"
+  %w[
+    blocksplitter.c
+    blocksplitter.h
+    cache.c
+    cache.h
+    deflate.c
+    deflate.h
+    gzip_container.c
+    gzip_container.h
+    hash.c
+    hash.h
+    katajainen.c
+    katajainen.h
+    lz77.c
+    lz77.h
+    squeeze.c
+    squeeze.h
+    symbols.h
+    tree.c
+    tree.h
+    util.c
+    util.h
+    zlib_container.c
+    zlib_container.h
+    zopfli.h
+    zopfli_lib.c
+  ].each do |file|
+    FileUtils.copy File.join(src, file), File.join(dst, file) if FileTest.exist? File.join(src, file)
+  end
+  create_makefile "zopfli"
 end
-
-create_makefile "zopfli"

data/ext/zopfli.c

@@ -1,6 +1,12 @@
 #include "ruby.h"
+#ifdef HAVE_RUBY_THREAD_H
 #include "ruby/thread.h"
+#endif
+#ifdef HAVE_ZOPFLI_ZOPFLI_H
+#include "zopfli/zopfli.h"
+#else
 #include "zopfli.h"
+#endif
 
 #define CSTR2SYM(x)    ID2SYM(rb_intern(x))
 #define DEFAULT_FORMAT ZOPFLI_FORMAT_ZLIB
@@ -94,7 +100,11 @@ zopfli_deflate(int argc, VALUE *argv, VALUE self)
     args.out = NULL;
     args.outsize = 0;
 
+#ifdef HAVE_RUBY_THREAD_H
     rb_thread_call_without_gvl(zopfli_deflate_no_gvl, (void *)&args, NULL, NULL);
+#else
+    zopfli_deflate_no_gvl((void *)&args);
+#endif
 
     out = rb_str_new((const char*)args.out, args.outsize);
 
@@ -106,6 +116,9 @@ zopfli_deflate(int argc, VALUE *argv, VALUE self)
 void
 Init_zopfli()
 {
+#if HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
     VALUE rb_mZopfli = rb_define_module("Zopfli");
     rb_define_singleton_method(rb_mZopfli, "deflate", zopfli_deflate, -1);
 }

data/lib/zopfli/version.rb

@@ -1,3 +1,3 @@
 module Zopfli
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+require "zopfli"
+
+require "test-unit"
+require "test/unit/rr"

data/test/zopfli_test.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "zlib"
+require "stringio"
+
+class ZopfliTest < Test::Unit::TestCase
+  T = [*"a".."z", *"A".."Z", *"0".."9"].freeze
+
+  def random_data(length = 1024)
+    Array.new(length) { T.sample }.join
+  end
+
+  test "VERSION" do
+    assert do
+      ::Zopfli.const_defined?(:VERSION)
+    end
+  end
+
+  test "well done" do
+    s = random_data
+    assert_equal s, Zlib::Inflate.inflate(Zopfli.deflate(s, format: :zlib))
+  end
+
+  test "well done(default format is zlib)" do
+    s = random_data
+    assert_equal Zopfli.deflate(s, format: :zlib), Zopfli.deflate(s)
+  end
+
+  test "well done(gzip format)" do
+    s = random_data
+    assert_equal s, Zlib::GzipReader.wrap(StringIO.new(Zopfli.deflate(s, format: :gzip)), &:read)
+  end
+
+  test "well done(deflate)" do
+    s = random_data
+    assert_nothing_raised do
+      Zopfli.deflate(s, format: :deflate)
+    end
+  end
+
+  test "raise error when pass invalid format" do
+    s = random_data
+    assert_raise ArgumentError do
+      Zopfli.deflate(s, format: :lzma)
+    end
+  end
+
+  sub_test_case "Ractor safe" do
+    test "able to invoke non-main ractor" do
+      unless defined? ::Ractor
+        notify "Ractor not defined"
+        omit
+      end
+      a = Array.new(2) do
+        Ractor.new(random_data) do |s|
+          Zlib::Inflate.inflate(Zopfli.deflate(s)) == s
+        end
+      end
+      assert_equal [true, true], a.map(&:take)
+    end
+  end
+end

data/zopfli.gemspec

@@ -8,12 +8,15 @@ Gem::Specification.new do |spec|
   spec.version       = Zopfli::VERSION
   spec.authors       = ["miyucy"]
   spec.email         = ["fistfvck@gmail.com"]
-  spec.description   = %q{zopfli}
-  spec.summary       = %q{zopfli}
+  spec.description   = "zopfli"
+  spec.summary       = "zopfli"
   spec.homepage      = "http://github.com/miyucy/zopfli"
   spec.license       = "MIT"
 
-  spec.test_files    = `git ls-files -z -- spec`.split("\x0")
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.test_files    = `git ls-files -z -- test`.split("\x0")
   spec.files         = `git ls-files -z`.split("\x0")
   spec.files        -= spec.test_files
   spec.files        -= ['vendor/zopfli']
@@ -23,8 +26,4 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/extconf.rb"]
-
-  spec.add_development_dependency "bundler", "~> 2.1.4"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zopfli
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: rspec
-  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'
+date: 2020-12-28 00:00:00.000000000 Z
+dependencies: []
 description: zopfli
 email:
 - fistfvck@gmail.com
@@ -60,9 +18,10 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
+- ".github/workflows/publish.yml"
 - ".gitignore"
 - ".gitmodules"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -71,9 +30,8 @@ files:
 - ext/zopfli.c
 - lib/zopfli/version.rb
 - smoke.sh
-- spec/fixtures/alice29.txt
-- spec/spec_helper.rb
-- spec/zopfli_spec.rb
+- test/test_helper.rb
+- test/zopfli_test.rb
 - vendor/zopfli/COPYING
 - vendor/zopfli/src/zopfli/blocksplitter.c
 - vendor/zopfli/src/zopfli/blocksplitter.h
@@ -105,7 +63,9 @@ files:
 homepage: http://github.com/miyucy/zopfli
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: http://github.com/miyucy/zopfli
+  source_code_uri: http://github.com/miyucy/zopfli
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -121,11 +81,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: zopfli
 test_files:
-- spec/fixtures/alice29.txt
-- spec/spec_helper.rb
-- spec/zopfli_spec.rb
+- test/test_helper.rb
+- test/zopfli_test.rb