snappy 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4866cfb8c9b7b1e16e5d6c8ba7044d8e003d5a03274575a09d60227bbdf4c603
-  data.tar.gz: dfd8a8d4cdb51bce5a988b55c61940d9717fb95a9f9377f32db93708d43805ce
+  metadata.gz: b2895775124f25371d6d97fb3e0be40aba03493c5f7d9347826611c2b574f708
+  data.tar.gz: '0195162d3971e799cd011db55304b19a9a63a02411644d82f063f6a594f9664b'
 SHA512:
-  metadata.gz: 1f3f35f369f73dee25075f72dc48693833d084d6bc6844243ef82585f41255bbf6bedaece227b05aa3ecc8bd9f9db2a13c98ea9ee1f9894204a719b9e0e0f57c
-  data.tar.gz: 36af767eded664e7bb25e120e807897d47a6d6c5a86d6f655970030a20636b14143ae8e1df84d9032aa175987b2d97a21c31d1c048f0422f7da00079bce38d23
+  metadata.gz: 5bcc0284ef578c7e0545e0fc1865351d8b1a2ef162244b9aa9bb41b0aac2a601a53d0d51badbbd1204e3b17162088a083130ab2635171a44efd0d5e3600b527b
+  data.tar.gz: 7a8c04e18c08ef4e981f8658c4abfdb6be004be3684d5e618a42668f305b5408dc85385e05b472250a04731b30eccaeaa2d3f3902e6b7d7a754d7c573ed3a3d8

data/.github/workflows/main.yml

@@ -7,10 +7,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.5, 2.6, 2.7, 3.0, 3.1, jruby]
+        ruby: [2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 4.0, jruby]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Set up Ruby

data/.github/workflows/publish.yml

@@ -10,10 +10,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, jruby]
+        ruby: [4.0, jruby]
+    if: github.repository == 'miyucy/snappy'
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Set up Ruby
@@ -21,14 +25,4 @@ jobs:
       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
+    - uses: rubygems/release-gem@v1

data/Dockerfile

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:labs
-ARG RUBY_VERSION=3.1
+ARG RUBY_VERSION=3.4
 FROM ruby:${RUBY_VERSION}
 
 ENV BUNDLE_JOBS=4

data/Gemfile

@@ -4,5 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem "rake", "~> 13.0"
+gem "ostruct"
 gem "test-unit", "~> 3.0"
 gem "test-unit-rr"

data/README.md

@@ -9,7 +9,10 @@ see https://github.com/google/snappy
 
 ```bash
 $ brew install snappy
-$ brew install autoconf automake libtool
+$ brew install autoconf automake cmake libtool
+
+# This step may be needed if gem installation fails
+bundle config build.snappy --with-snappy-dir=/opt/homebrew/opt/snappy
 ```
 
 ### Ubuntu
@@ -26,6 +29,22 @@ $ apk install snappy
 $ apk install build-base libexecinfo automake autoconf libtool
 ```
 
+### Windows
+
+[Ruby Installer](https://rubyinstaller.org/) 3.0 and earlier:
+
+```bash
+(in MSYS2 shell)
+$ pacman -S mingw-w64-x86_64-snappy
+```
+
+Ruby Installer 3.1 and later:
+
+```bash
+(in MSYS2 shell)
+pacman -S mingw-w64-ucrt-x86_64-snappy
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -31,7 +31,7 @@ if defined?(JRUBY_VERSION)
 
   desc "Compile the extension"
   task compile: :setup do
-    ant.javac destdir: "${build.dir}", includeantruntime: "no", target: "1.6", source: "1.6", debug: "on" do
+    ant.javac destdir: "${build.dir}", includeantruntime: "no", target: "1.8", source: "1.8", debug: "on" do
       classpath refid: "compile.class.path"
       src { pathelement location: "${src.dir}" }
     end

data/ext/extconf.rb

@@ -1,25 +1,27 @@
-require 'mkmf'
-require 'fileutils'
+require "mkmf"
+require "fileutils"
 
 $CXXFLAGS += " -std=c++11 "
 
-unless pkg_config('libsnappy') || have_library('snappy')
+have_libsnappy = pkg_config("libsnappy") || have_library("snappy")
+unless have_libsnappy
   # build vendor/snappy
   pwd = File.dirname File.expand_path __FILE__
-  dir = File.join pwd, '..', 'vendor', 'snappy'
+  dir = File.join pwd, "..", "vendor", "snappy"
 
   Dir.chdir(dir) do
-    FileUtils.mkdir_p 'build'
-    Dir.chdir(File.join(dir, 'build')) do
-      `cmake .. -DCMAKE_BUILD_TYPE=Release`
+    FileUtils.rm_rf "build"
+    FileUtils.mkdir_p "build"
+    Dir.chdir(File.join(dir, "build")) do
+      `cmake .. -DCMAKE_BUILD_TYPE=Release -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF`
     end
   end
 
   src = %w[
     config.h
     snappy-stubs-public.h
-  ].map { |e| File.join dir, 'build', e }
-  FileUtils.cp src, pwd, :verbose => true
+  ].map { |e| File.join dir, "build", e }
+  FileUtils.cp src, pwd, verbose: true
   src = %w[
     snappy-c.cc
     snappy-c.h
@@ -31,7 +33,7 @@ unless pkg_config('libsnappy') || have_library('snappy')
     snappy-stubs-internal.cc
     snappy-stubs-internal.h
   ].map { |e| File.join dir, e }
-  FileUtils.cp src, pwd, :verbose => true
+  FileUtils.cp src, pwd, verbose: true
 end
 
-create_makefile 'snappy_ext'
+create_makefile "snappy_ext"

data/lib/snappy/shim.rb

@@ -3,28 +3,8 @@
 module Snappy
   module_function
 
-  if RUBY_VERSION[0..2] == "1.8"
-    def set_encoding(io)
-      io
-    end
-
-    def b(str)
-      str
-    end
-  else
-    def set_encoding(io)
-      io.set_encoding Encoding::ASCII_8BIT
-      io
-    end
-
-    if ::String.instance_methods.include? :b
-      def b(str)
-        str.b
-      end
-    else
-      def b(str)
-        str.force_encoding Encoding::ASCII_8BIT
-      end
-    end
+  def set_encoding(io)
+    io.set_encoding Encoding::ASCII_8BIT
+    io
   end
 end

data/lib/snappy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Snappy
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end

data/lib/snappy/writer.rb

@@ -4,7 +4,7 @@ require 'snappy/shim'
 
 module Snappy
   class Writer
-    MAGIC = Snappy.b("\x82SNAPPY\x0")
+    MAGIC = "\x82SNAPPY\x0".b
     DEFAULT_VERSION = 1
     MINIMUM_COMPATIBLE_VERSION = 1
     DEFAULT_BLOCK_SIZE = 32 * 1024

data/snappy.gemspec

@@ -32,5 +32,6 @@ Gem::Specification.new do |spec|
     spec.add_dependency "snappy-jars", "~> 1.1.0"
   else
     spec.extensions = ["ext/extconf.rb"]
+    spec.metadata['msys2_mingw_dependencies'] = 'snappy'
   end
 end

data/test/snappy_test.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 require "test_helper"
+require "securerandom"
 
 class SnappyTest < Test::Unit::TestCase
-  T = [*"a".."z", *"A".."Z", *"0".."9"].freeze
-
   def random_data(length = 1024)
-    Array.new(length) { T.sample }.join
+    SecureRandom.alphanumeric(length)
   end
 
   test "VERSION" do
@@ -20,6 +19,11 @@ class SnappyTest < Test::Unit::TestCase
     assert_equal s, Snappy.inflate(Snappy.deflate(s))
   end
 
+  test "binary data" do
+    s = SecureRandom.random_bytes(1024)
+    assert_equal s, Snappy.inflate(Snappy.deflate(s))
+  end
+
   test "well done (pair)" do
     s = random_data
     [
@@ -83,13 +87,34 @@ class SnappyTest < Test::Unit::TestCase
         notify "Ractor not defined"
         omit
       end
+      unless RUBY_VERSION.start_with?("4")
+        omit
+      end
       s = random_data
       a = Array.new(2) do
         Ractor.new(s) do |s|
           Snappy.inflate(Snappy.deflate(s)) == s
         end
       end
-      assert_equal [true, true], a.map(&:take)
+      assert_equal [true, true], a.map(&:value)
+    end
+
+    test "take2" do
+      unless defined? ::Ractor
+        notify "Ractor not defined"
+        omit
+      end
+      unless RUBY_VERSION.start_with?("4")
+        omit
+      end
+      s = random_data
+      i = Ractor.new(s) do |s|
+        Snappy.deflate(s)
+      end.value
+      j = Ractor.new(i) do |i|
+        Snappy.inflate(i)
+      end.value
+      assert_equal s, j
     end
   end
 end

data/vendor/snappy/BUILD.bazel

@@ -0,0 +1,211 @@
+# Copyright 2023 Google Inc. All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+SNAPPY_VERSION = (1, 2, 2)
+
+config_setting(
+    name = "windows",
+    constraint_values = ["@platforms//os:windows"],
+)
+
+cc_library(
+    name = "config",
+    hdrs = ["config.h"],
+    defines = ["HAVE_CONFIG_H"],
+)
+
+cc_library(
+    name = "snappy-stubs-public",
+    hdrs = [":snappy-stubs-public.h"],
+)
+
+cc_library(
+    name = "snappy-stubs-internal",
+    srcs = ["snappy-stubs-internal.cc"],
+    hdrs = ["snappy-stubs-internal.h"],
+    deps = [
+        ":config",
+        ":snappy-stubs-public",
+    ],
+)
+
+cc_library(
+    name = "snappy",
+    srcs = [
+        "snappy.cc",
+        "snappy-internal.h",
+        "snappy-sinksource.cc",
+    ],
+    hdrs = [
+        "snappy.h",
+        "snappy-sinksource.h",
+    ],
+    copts = select({
+        ":windows": [],
+        "//conditions:default": [
+            "-Wno-sign-compare",
+        ],
+    }),
+    deps = [
+        ":config",
+        ":snappy-stubs-internal",
+        ":snappy-stubs-public",
+    ],
+)
+
+cc_library(
+    name = "snappy-c",
+    srcs = ["snappy-c.cc"],
+    hdrs = ["snappy-c.h"],
+    deps = [":snappy"],
+)
+
+filegroup(
+    name = "testdata",
+    srcs = glob(["testdata/*"]),
+)
+
+cc_library(
+    name = "snappy-test",
+    testonly = True,
+    srcs = [
+        "snappy-test.cc",
+        "snappy_test_data.cc",
+    ],
+    hdrs = [
+        "snappy-test.h",
+        "snappy_test_data.h",
+    ],
+    deps = [":snappy-stubs-internal"],
+)
+
+cc_test(
+    name = "snappy_benchmark",
+    srcs = ["snappy_benchmark.cc"],
+    data = [":testdata"],
+    deps = [
+        ":snappy",
+        ":snappy-test",
+        "@com_google_benchmark//:benchmark_main",
+    ],
+)
+
+cc_test(
+    name = "snappy_unittest",
+    srcs = [
+        "snappy_unittest.cc",
+    ],
+    data = [":testdata"],
+    deps = [
+        ":snappy",
+        ":snappy-test",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+# Generate a config.h similar to what cmake would produce.
+genrule(
+    name = "config_h",
+    outs = ["config.h"],
+    cmd = """cat <<EOF >$@
+#define HAVE_STDDEF_H 1
+#define HAVE_STDINT_H 1
+#ifdef __has_builtin
+#  if !defined(HAVE_BUILTIN_EXPECT) && __has_builtin(__builtin_expect)
+#    define HAVE_BUILTIN_EXPECT 1
+#  endif
+#  if !defined(HAVE_BUILTIN_CTZ) && __has_builtin(__builtin_ctzll)
+#    define HAVE_BUILTIN_CTZ 1
+#  endif
+#  if !defined(HAVE_BUILTIN_PREFETCH) && __has_builtin(__builtin_prefetech)
+#    define HAVE_BUILTIN_PREFETCH 1
+#  endif
+#elif defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#  ifndef HAVE_BUILTIN_EXPECT
+#    define HAVE_BUILTIN_EXPECT 1
+#  endif
+#  ifndef HAVE_BUILTIN_CTZ
+#    define HAVE_BUILTIN_CTZ 1
+#  endif
+#  ifndef HAVE_BUILTIN_PREFETCH
+#    define HAVE_BUILTIN_PREFETCH 1
+#  endif
+#endif
+
+#if defined(_WIN32) && !defined(HAVE_WINDOWS_H)
+#define HAVE_WINDOWS_H 1
+#endif
+
+#ifdef __has_include
+#  if !defined(HAVE_BYTESWAP_H) && __has_include(<byteswap.h>)
+#    define HAVE_BYTESWAP_H 1
+#  endif
+#  if !defined(HAVE_UNISTD_H) && __has_include(<unistd.h>)
+#    define HAVE_UNISTD_H 1
+#  endif
+#  if !defined(HAVE_SYS_ENDIAN_H) && __has_include(<sys/endian.h>)
+#    define HAVE_SYS_ENDIAN_H 1
+#  endif
+#  if !defined(HAVE_SYS_MMAN_H) && __has_include(<sys/mman.h>)
+#    define HAVE_SYS_MMAN_H 1
+#  endif
+#  if !defined(HAVE_SYS_UIO_H) && __has_include(<sys/uio.h>)
+#    define HAVE_SYS_UIO_H 1
+#  endif
+#  if !defined(HAVE_SYS_TIME_H) && __has_include(<sys/time.h>)
+#    define HAVE_SYS_TIME_H 1
+#  endif
+#endif
+
+#ifndef SNAPPY_IS_BIG_ENDIAN
+#  ifdef __s390x__
+#    define SNAPPY_IS_BIG_ENDIAN 1
+#  elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#    define SNAPPY_IS_BIG_ENDIAN 1
+#  endif
+#endif
+EOF
+""",
+)
+
+genrule(
+    name = "snappy_stubs_public_h",
+    srcs = ["snappy-stubs-public.h.in"],
+    outs = ["snappy-stubs-public.h"],
+    # Assume sys/uio.h is available on non-Windows.
+    # Set the version numbers.
+    cmd = ("""sed -e 's/$${HAVE_SYS_UIO_H_01}/!_WIN32/g' \
+           -e 's/$${PROJECT_VERSION_MAJOR}/%d/g' \
+           -e 's/$${PROJECT_VERSION_MINOR}/%d/g' \
+           -e 's/$${PROJECT_VERSION_PATCH}/%d/g' \
+    $< >$@""" % SNAPPY_VERSION),
+)