paquito 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cfefa4171fc3e9f968368e99c134e864d493c6651ed21aff0e1bc299a95fb7f
-  data.tar.gz: e92cacde6d2aa0867b740f99a001d3ff109f4c88eddb7d89594305a579122af3
+  metadata.gz: e0339ed04d21077425e5dd4b2e814a63ec524ca4806bc3af33b82fc162b61205
+  data.tar.gz: 55b5ff0b7b2c325622307b6d6a25a978067ec69762993fc6d7f5f732fcc11301
 SHA512:
-  metadata.gz: 3e032eb7438d07371862c7f9015b8c0a2f72dc8a93004387f1b151f75d06614dba89bc97da21d3eb83399f1c86909f1dc0bbd5702ec8cc4fef1f5001f512a3da
-  data.tar.gz: e1bd239ec600c28dc5e322b8a8a95daeb539aaada4c9167cf046f5ee5716eb3a6231487b663b534d0db8cb6e1ce2ce53d1dd1b6706184b57f36890edbcbfa663
+  metadata.gz: 264f88b37a150446c8e3d021887321fe1f47138894ac36a06e57105107f0f47add8ad82bd5e95078a50387ae4daad95154ebc5e1ce2bfde1b758a74e4559087c
+  data.tar.gz: 3775371cc85bd799bdb9580f878e3c5a33c1a10020e9349afe5eecfcac7d65552a96e76eb72b387bc72dbce375a9f03f85151bdcdf27de8ceb8d23a73560b792

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: '2.7'
           bundler-cache: true
       - name: Run test
         run: bundle exec rubocop
@@ -23,18 +23,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ ruby-head, '3.1', '3.0', '2.7', '2.6' ]
+        ruby: [ ruby-head, '3.1', '3.0', '2.7' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - name: Remove Gemfile.lock
+        run: rm Gemfile.lock
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Install dependencies
-        run: |
-          rm Gemfile.lock
-          bundle install
+          bundler-cache: true
       - name: Run test
         run: bundle exec rake
       - name: Install gem

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_gem:
   rubocop-shopify: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Style/ClassMethodsDefinitions:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Unreleased
 
+# 0.9.1
+
+* Fix a bug when handle `compress / decompress` coders. (#23)
+* `SingleBytePrefixVersionWithStringBypass` accepts another coder for strings.
+
+# 0.9.0
+
+* Handle `compress / decompress` coders (#22)
+* Introduce `FlatCacheEntryCoder` (#21).
+* Drop the partial Ruby 2.6 support.
+
+# 0.8.0
+
 * Introduce `SingleBytePrefixVersionWithStringBypass` (#18, #20).
 
 # 0.7.0

data/Gemfile.lock

@@ -1,23 +1,22 @@
 PATH
   remote: .
   specs:
-    paquito (0.8.0)
+    paquito (0.9.1)
       msgpack (>= 1.5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.6.1)
-      activesupport (= 6.1.6.1)
-    activerecord (6.1.6.1)
-      activemodel (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
-    activesupport (6.1.6.1)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     benchmark-ips (2.10.0)
     byebug (11.1.3)
@@ -52,7 +51,6 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
-    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -70,6 +70,18 @@ in an optimized way.
 When the object to serialize is an `UTF-8`, `ASCII` or `BINARY` string, rather than invoking the underlying serializer, it simply
 prepends a single byte to the string which indicates the encoding.
 
+Additionally, you can pass a distinct serializer for strings only:
+
+Example:
+
+```ruby
+coder = Paquito::SingleBytePrefixVersion.new(
+  1,
+  { 0 => YAML, 1 => JSON },
+  Paquito::ConditionalCompressor.new(Zlib, 1024), # Large strings will be compressed but not serialized in JSON.
+)
+```
+
 The larger the string the larger the speed gain is, e.g. for a 1MB string, it's over 500x faster than going through `MessagePack` or `Marshal`.
 
 ### `CommentPrefixVersion`
@@ -161,6 +173,28 @@ Example:
 ActiveSupport::Cache::FileStore.new("tmp/cache", coder: Paquito.chain(Paquito::CacheEntryCoder, JSON))
 ```
 
+### `FlatCacheEntryCoder`
+
+`Paquito::FlatCacheEntryCoder` is a variation of `Paquito::CacheEntryCoder`. Instead of encoding `ActiveSupport::Cache::Entry`
+into an Array of three members, it serializes the entry metadata itself and adds it as a prefix to the serialized payload.
+
+This allows to leverage `Paquito::SingleBytePrefixVersionWithStringBypass` effectively.
+
+Example:
+
+```ruby
+ActiveSupport::Cache::FileStore.new(
+  "tmp/cache",
+  coder: Paquito::FlatCacheEntryCoder.new(
+    Paquito::SingleBytePrefixVersionWithStringBypass.new(
+      1,
+      0 => Marshal,
+      1 => JSON,
+    )
+  )
+)
+```
+
 ### `SerializedColumn`
 
 `Paquito::SerializedColumn` allows you to decorate any encoder to behave like Rails's builtin `YAMLColumn`

data/Rakefile

@@ -3,8 +3,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-suites = [:vanilla, :activesupport]
-suites << :activerecord if RUBY_VERSION >= "2.7"
+suites = [:vanilla, :activesupport, :activerecord]
 namespace :test do
   suites.each do |suite|
     Rake::TestTask.new(suite) do |t|

data/benchmark/flat-entry-coder.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "paquito"
+require "active_support"
+require "benchmark/ips"
+
+CODEC = Paquito::CodecFactory.build
+ORIGINAL = Paquito::SingleBytePrefixVersion.new(
+  0,
+  0 => Paquito.chain(
+    Paquito::CacheEntryCoder,
+    CODEC,
+  ),
+)
+FLAT = Paquito::FlatCacheEntryCoder.new(
+  Paquito::SingleBytePrefixVersionWithStringBypass.new(
+    0,
+    0 => CODEC,
+  )
+)
+
+entries = {
+  small_string: "Hello World!",
+  bytes_1mb: Random.bytes(1_000_000),
+  int_array: 1000.times.to_a,
+}
+
+entries.each do |name, object|
+  entry = ActiveSupport::Cache::Entry.new(object, expires_at: 15.minutes.from_now.to_f)
+  original_payload = ORIGINAL.dump(entry).freeze
+  flat_payload = FLAT.dump(entry).freeze
+
+  puts " === Read #{name} ==="
+  Benchmark.ips do |x|
+    x.report("original") { ORIGINAL.load(original_payload) }
+    x.report("flat") { FLAT.load(flat_payload) }
+    x.compare!(order: :baseline)
+  end
+
+  puts " === Write #{name} ==="
+  Benchmark.ips do |x|
+    x.report("original") { ORIGINAL.dump(entry) }
+    x.report("flat") { FLAT.dump(entry) }
+    x.compare!(order: :baseline)
+  end
+
+  puts
+end

data/dev.yml

@@ -2,11 +2,11 @@ name: paquito
 
 up:
   - ruby:
-      version: 2.6.9
+      version: 2.7.5
   - bundler
 
 commands:
   test:
     syntax: ""
     desc: 'run all the tests'
-    run: bundle exec rake test
+    run: bundle exec rake test

data/lib/paquito/active_record_coder.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+gem "activerecord", ">= 7.0"
 require "paquito/errors"
 
 module Paquito

data/lib/paquito/cache_entry_coder.rb

@@ -1,22 +1,15 @@
 # frozen_string_literal: true
 
+gem "activesupport", ">= 7.0"
+
 module Paquito
   module CacheEntryCoder
     def self.dump(entry)
-      attrs = [entry.value, entry.expires_at, entry.version]
-      # drop any trailing nil values to save a couple bytes
-      attrs.pop until !attrs.last.nil? || attrs.empty?
-      attrs
+      entry.pack
     end
 
     def self.load(payload)
-      entry = ::ActiveSupport::Cache::Entry.allocate
-      value, expires_in, version = payload
-      entry.instance_variable_set(:@value, value)
-      entry.instance_variable_set(:@expires_in, expires_in)
-      entry.instance_variable_set(:@created_at, 0.0)
-      entry.instance_variable_set(:@version, version)
-      entry
+      ::ActiveSupport::Cache::Entry.unpack(payload)
     end
   end
 end

data/lib/paquito/codec_factory.rb

@@ -5,7 +5,7 @@ require "paquito/coder_chain"
 
 module Paquito
   class CodecFactory
-    def self.build(types, freeze: false, serializable_type: false, pool: 1)
+    def self.build(types = [], freeze: false, serializable_type: false, pool: 1)
       factory = if types.empty? && !serializable_type
         MessagePack::DefaultFactory
       else

data/lib/paquito/compressor.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Paquito
+  class Compressor
+    def initialize(compressor)
+      @compressor = compressor
+    end
+
+    def dump(serial)
+      @compressor.compress(serial)
+    end
+
+    def load(payload)
+      @compressor.decompress(payload)
+    end
+  end
+end

data/lib/paquito/flat_cache_entry_coder.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+gem "activesupport", ">= 7.0"
+
+module Paquito
+  class FlatCacheEntryCoder
+    METADATA_CODEC = CodecFactory.build
+
+    EXPIRES_AT_FORMAT = "E" # Float double-precision, little-endian byte order (8 bytes)
+    VERSION_SIZE_FORMAT = "l<" # 32-bit signed, little-endian byte order (int32_t) (4 bytes)
+    PREFIX_FORMAT = -(EXPIRES_AT_FORMAT + VERSION_SIZE_FORMAT)
+    VERSION_SIZE_OFFSET = [0.0].pack(EXPIRES_AT_FORMAT).bytesize # should be 8
+    VERSION_OFFSET = [0.0, 0].pack(PREFIX_FORMAT).bytesize # Should be 12
+    VERSION_SIZE_UNPACK = -"@#{VERSION_SIZE_OFFSET}#{VERSION_SIZE_FORMAT}"
+
+    def initialize(value_coder)
+      @value_coder = value_coder
+    end
+
+    def dump(entry)
+      version = entry.version
+      payload = [
+        entry.expires_at || 0.0,
+        version ? version.bytesize : -1,
+      ].pack(PREFIX_FORMAT)
+      payload << version if version
+      payload << @value_coder.dump(entry.value)
+    end
+
+    def load(payload)
+      expires_at = payload.unpack1(EXPIRES_AT_FORMAT)
+      expires_at = nil if expires_at == 0.0
+
+      version_size = payload.unpack1(VERSION_SIZE_UNPACK)
+      if version_size < 0
+        version_size = 0
+      else
+        version = payload.byteslice(VERSION_OFFSET, version_size)
+      end
+
+      ::ActiveSupport::Cache::Entry.new(
+        @value_coder.load(payload.byteslice((VERSION_OFFSET + version_size)..-1).freeze),
+        expires_at: expires_at,
+        version: version,
+      )
+    end
+  end
+end

data/lib/paquito/single_byte_prefix_version_with_string_bypass.rb

@@ -6,15 +6,20 @@ module Paquito
     BINARY_VERSION = 254
     ASCII_VERSION = 253
 
+    def initialize(current_version, coders, string_coder = nil)
+      super(current_version, coders)
+      @string_coder = string_coder
+    end
+
     def dump(object)
       if object.class == String # We don't want to match subclasses
         case object.encoding
         when Encoding::UTF_8
-          UTF8_VERSION.chr(Encoding::BINARY) << object
+          UTF8_VERSION.chr(Encoding::BINARY) << (@string_coder ? @string_coder.dump(object) : object)
         when Encoding::BINARY
-          BINARY_VERSION.chr(Encoding::BINARY) << object
+          BINARY_VERSION.chr(Encoding::BINARY) << (@string_coder ? @string_coder.dump(object) : object)
         when Encoding::US_ASCII
-          ASCII_VERSION.chr(Encoding::BINARY) << object
+          ASCII_VERSION.chr(Encoding::BINARY) << (@string_coder ? @string_coder.dump(object) : object)
         else
           super
         end
@@ -31,11 +36,14 @@ module Paquito
 
       case payload_version
       when UTF8_VERSION
-        payload.byteslice(1..-1).force_encoding(Encoding::UTF_8)
+        string = payload.byteslice(1..-1).force_encoding(Encoding::UTF_8)
+        @string_coder ? @string_coder.load(string) : string
       when BINARY_VERSION
-        payload.byteslice(1..-1).force_encoding(Encoding::BINARY)
+        string = payload.byteslice(1..-1).force_encoding(Encoding::BINARY)
+        @string_coder ? @string_coder.load(string) : string
       when ASCII_VERSION
-        payload.byteslice(1..-1).force_encoding(Encoding::US_ASCII)
+        string = payload.byteslice(1..-1).force_encoding(Encoding::US_ASCII)
+        @string_coder ? @string_coder.load(string) : string
       else
         coder = @coders.fetch(payload_version) do
           raise UnsupportedCodec, "Unsupported packer version #{payload_version}"

data/lib/paquito/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Paquito
-  VERSION = "0.8.0"
+  VERSION = "0.9.1"
 end

data/lib/paquito.rb

@@ -10,11 +10,11 @@ require "msgpack"
 
 require "paquito/version"
 require "paquito/deflater"
+require "paquito/compressor"
 require "paquito/allow_nil"
 require "paquito/translate_errors"
 require "paquito/safe_yaml"
 require "paquito/conditional_compressor"
-require "paquito/cache_entry_coder"
 require "paquito/single_byte_prefix_version"
 require "paquito/single_byte_prefix_version_with_string_bypass"
 require "paquito/comment_prefix_version"
@@ -25,6 +25,8 @@ require "paquito/typed_struct"
 require "paquito/serialized_column"
 
 module Paquito
+  autoload :CacheEntryCoder, "paquito/cache_entry_coder"
+  autoload :FlatCacheEntryCoder, "paquito/flat_cache_entry_coder"
   autoload :ActiveRecordCoder, "paquito/active_record_coder"
 
   class << self
@@ -33,6 +35,8 @@ module Paquito
         coder
       elsif coder.respond_to?(:deflate) && coder.respond_to?(:inflate)
         Deflater.new(coder)
+      elsif coder.respond_to?(:compress) && coder.respond_to?(:decompress)
+        Compressor.new(coder)
       else
         raise TypeError, "Coders must respond to #dump and #load, #{coder.inspect} doesn't"
       end

data/paquito.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Framework for defining efficient and extendable serializers"
   spec.homepage      = "https://github.com/Shopify/paquito"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paquito
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -40,6 +40,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmark/flat-entry-coder.rb
 - benchmark/msgpack-pooling.rb
 - benchmark/string-bypass.rb
 - bin/console
@@ -52,9 +53,11 @@ files:
 - lib/paquito/codec_factory.rb
 - lib/paquito/coder_chain.rb
 - lib/paquito/comment_prefix_version.rb
+- lib/paquito/compressor.rb
 - lib/paquito/conditional_compressor.rb
 - lib/paquito/deflater.rb
 - lib/paquito/errors.rb
+- lib/paquito/flat_cache_entry_coder.rb
 - lib/paquito/safe_yaml.rb
 - lib/paquito/serialized_column.rb
 - lib/paquito/single_byte_prefix_version.rb
@@ -81,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="