paquito 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3a891430b40fa7fad9d50b8f383070cee22cba06d19c0db67670324c575613
-  data.tar.gz: 752e27818f5781652fc91407b51a7f5c16e0a8a07baa0f1285b3e4a3c9029bb0
+  metadata.gz: d4a21000dd182ebc6975d8b6cbedf9702bb8e8b1590e5be3c6a048e2f827c54c
+  data.tar.gz: 6023594f29fbabdec9842ca1ea0d3a75c2f22a9bd519cbdab153dff75781a8cf
 SHA512:
-  metadata.gz: 7b25933ab48ec3327e7e2c781f6502f90ed7a440163e58c3255d43bb1473fc5da5414b44d85f06de7f0d90ef05d57871bd8fcb3aabd22caa19d97df3422240d2
-  data.tar.gz: aca4aa6e5d417d40926d9cf57045157d1eaffdae225cc051b97ad861e0dc2d19fecf1f6acdea1a9fa91982697cee231326d410a21b0c130f327fc21f967c914e
+  metadata.gz: 75ca51f0d7da3dc94b3b26454eeb7960af10102963f9d8d9dca8f2d1b260821e57f831ab7c95cb290fbf842f4473e8aa5d0d2fb2a150dc09d6e847ef4b45d1ba
+  data.tar.gz: 1d4b953529569f25bd8d345a0a968ed931ad23ea397f96b6e0e5ba10376c3a5e6cb2078230355fee37c65c50f829d4b32136ba2a8a9ccc4d616076c84e6a3c97

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '2.6'
           bundler-cache: true
       - name: Run test
         run: bundle exec rubocop
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ ruby-head, '3.0', '2.7' ]
+        ruby: [ ruby-head, '3.0', '2.7', '2.6' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

data/.rubocop.yml

@@ -2,4 +2,4 @@ inherit_gem:
   rubocop-shopify: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 2.6

data/Gemfile

@@ -5,11 +5,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in paquito.gemspec
 gemspec
 
-gem "msgpack", github: "msgpack/msgpack-ruby"
-
 gem "rake", "~> 13.0"
-gem "activesupport", ">= 7.0.0"
-gem "activerecord", ">= 7.0.0"
+gem "activesupport"
+gem "activerecord"
 gem "sqlite3"
 gem "benchmark-ips"
 

data/Gemfile.lock

@@ -1,28 +1,23 @@
-GIT
-  remote: https://github.com/msgpack/msgpack-ruby.git
-  revision: b69e6d6965ef46890885ddf73f02b820f3185d80
-  specs:
-    msgpack (1.4.5)
-
 PATH
   remote: .
   specs:
-    paquito (0.4.0)
-      msgpack
+    paquito (0.6.1)
+      msgpack (>= 1.5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.2.3)
-      activesupport (= 7.0.2.3)
-    activerecord (7.0.2.3)
-      activemodel (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
-    activesupport (7.0.2.3)
+    activemodel (6.1.5)
+      activesupport (= 6.1.5)
+    activerecord (6.1.5)
+      activemodel (= 6.1.5)
+      activesupport (= 6.1.5)
+    activesupport (6.1.5)
       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)
@@ -30,6 +25,7 @@ GEM
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     minitest (5.15.0)
+    msgpack (1.5.2)
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
@@ -56,6 +52,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -63,12 +60,11 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  activerecord (>= 7.0.0)
-  activesupport (>= 7.0.0)
+  activerecord
+  activesupport
   benchmark-ips
   byebug
   minitest (~> 5.0)
-  msgpack!
   paquito!
   rake (~> 13.0)
   rubocop
@@ -77,4 +73,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.33
+   2.3.8

data/Rakefile

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

data/dev.yml

@@ -2,7 +2,7 @@ name: paquito
 
 up:
   - ruby:
-      version: 2.7.4
+      version: 2.6.9
   - bundler
 
 commands:

data/lib/paquito/active_record_coder.rb

@@ -119,13 +119,14 @@ module Paquito
         @ids = {}.compare_by_identity
       end
 
-      def map(...)
-        @instances.map(...)
+      def map(&block)
+        @instances.map(&block)
       end
 
-      def fetch(...)
-        @instances.fetch(...)
+      def fetch(*args, &block)
+        @instances.fetch(*args, &block)
       end
+      ruby2_keywords :fetch if respond_to?(:ruby2_keywords, true)
 
       def push(instance)
         id = @ids[instance] = @instances.size

data/lib/paquito/codec_factory.rb

@@ -16,9 +16,6 @@ module Paquito
       Types.register_serializable_type(factory) if serializable_type
 
       if pool && pool > 0 && factory.respond_to?(:pool)
-        if serializable_type || types.any? { |t| Types.recursive?(t) }
-          pool *= 2
-        end
         factory = factory.freeze.pool(pool, freeze: freeze)
         freeze = false
       end

data/lib/paquito/safe_yaml.rb

@@ -53,7 +53,7 @@ module Paquito
         end
       end
 
-      def initialize(...)
+      def initialize(*)
         super
         @permitted_classes = Set.new(@options[:permitted_classes])
         @dispatch_cache = DispatchCache.new(self, @dispatch_cache)
@@ -65,6 +65,7 @@ module Paquito
           h[klass] = true
         end.compare_by_identity
       end
+      ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)
 
       def dump_coder(target)
         return unless permitted_class?(target.class)

data/lib/paquito/types.rb

@@ -75,8 +75,8 @@ module Paquito
     TYPES = {
       "Symbol" => {
         code: 0,
-        packer: Symbol.method_defined?(:name) ? :name : :to_s,
-        unpacker: :to_sym,
+        packer: Symbol.method_defined?(:name) ? :name.to_proc : :to_s.to_proc,
+        unpacker: :to_sym.to_proc,
         optimized_symbols_parsing: true,
       }.freeze,
       "Time" => {
@@ -153,14 +153,15 @@ module Paquito
       }.freeze,
       "ActiveSupport::HashWithIndifferentAccess" => {
         code: 7,
-        packer: ->(factory, value) do
+        packer: ->(value, packer) do
           unless value.instance_of?(ActiveSupport::HashWithIndifferentAccess)
             raise PackError.new("cannot pack HashWithIndifferentClass subclass", value)
           end
 
-          factory.dump(value.to_h)
+          packer.write(value.to_h)
         end,
-        unpacker: ->(factory, value) { HashWithIndifferentAccess.new(factory.load(value)) },
+        unpacker: ->(unpacker) { HashWithIndifferentAccess.new(unpacker.read) },
+        recursive: true,
       },
       "ActiveSupport::TimeWithZone" => {
         code: 8,
@@ -180,8 +181,9 @@ module Paquito
       },
       "Set" => {
         code: 9,
-        packer: ->(factory, value) { factory.dump(value.to_a) },
-        unpacker: ->(factory, value) { factory.load(value).to_set },
+        packer: ->(value, packer) { packer.write(value.to_a) },
+        unpacker: ->(unpacker) { unpacker.read.to_set },
+        recursive: true,
       },
       # Integer => { code: 10 }, reserved for oversized Integer
       # Object => { code: 127 }, reserved for serializable Object type
@@ -212,10 +214,6 @@ module Paquito
           end
 
           type_attributes = TYPES.fetch(name)
-          type_attributes = type_attributes.merge(
-            packer: curry_callback(type_attributes.fetch(:packer), factory),
-            unpacker: curry_callback(type_attributes.fetch(:unpacker), factory),
-          )
           factory.register_type(
             type_attributes.fetch(:code),
             type,
@@ -224,11 +222,6 @@ module Paquito
         end
       end
 
-      def recursive?(type)
-        type_attributes = TYPES.fetch(type.name)
-        recursive_callback?(type_attributes[:packer]) || recursive_callback?(type_attributes[:unpacker])
-      end
-
       def register_serializable_type(factory)
         factory.register_type(
           0x7f,
@@ -256,19 +249,6 @@ module Paquito
       def define_custom_type(klass, packer: nil, unpacker:)
         CustomTypesRegistry.register(klass, packer: packer, unpacker: unpacker)
       end
-
-      private
-
-      def recursive_callback?(callback)
-        callback.respond_to?(:arity) && callback.arity != 1
-      end
-
-      def curry_callback(callback, factory)
-        return callback.to_proc if callback.is_a?(Symbol)
-        return callback if callback.arity == 1
-
-        callback.curry.call(factory)
-      end
     end
   end
 end

data/lib/paquito/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Paquito
-  VERSION = "0.4.0"
+  VERSION = "0.6.1"
 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.7.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency("msgpack")
+  spec.add_dependency("msgpack", ">= 1.5.2")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paquito
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
 description: Framework for defining efficient and extendable serializers
 email:
 - jean.boussier@gmail.com
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="