paquito 0.5.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6fef6b415e3f3f99d82d937b412923f77675f2fd2b458c67a79b17325df5c4b
-  data.tar.gz: a3805612f06f9a04a2c3c452f571798d086113ff601ee550623e975abd66ac15
+  metadata.gz: 4cafb8418a35a2c05c91af1a49f3deb2a025b0f1d68ae7ca3ac21c6e0b81b79a
+  data.tar.gz: 59f193750cd85c9f6664547f01665866af0f17ee43b371e89cee21d999aadf20
 SHA512:
-  metadata.gz: 76457976e3d2bbf665b38922d0e9be0d62bfa7ecb34e7a55c3931eff29260646a92e7b5f6ed04ff53a350cc035c4e794e9a079be39cb95b1f6f261211db94a2e
-  data.tar.gz: ed1156971e6736ee6b9abab62edb2b6eabb5ad1751a3d6d2aa48b84c444b5720dc21ba713721f82c10a7f0cbf629520ef0bc1e8625702afc683494b4fd940e22
+  metadata.gz: 2b04f0da342fc419646fdc20f147f1aa05bd357c1a42cec8802739fc6bd7858b5deabfeef9a1e1542e1edc68bf4a0807acbe7a306da55786b2a861c31046a198
+  data.tar.gz: 8f2eb1d10755847d5a2a6d15fd5a67304d671f35805ed1b97123c0a981cf77eabebe2f0a8daeee438d09fd25e0bd7a59ecf34c132892823aff84274a64fac70a

data/.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -26,7 +26,7 @@ jobs:
         ruby: [ ruby-head, '3.0', '2.7', '2.6' ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/CHANGELOG.md

@@ -0,0 +1,42 @@
+# Unreleased
+
+# 0.6.2
+
+* Make ActiveRecordCoder handle to read payloads that will be generated by Paquito 0.7.0 (#12).
+  DO NOT upgrade to Paquito 0.7.0+ without first fully rolling out Paquito 0.6.2.
+
+# 0.6.1
+
+* No data
+
+# 0.6.0
+
+* No data
+
+# 0.5.0
+
+* No data
+
+# 0.4.0
+
+* No data
+
+# 0.3.1
+
+* No data
+
+# 0.3.0
+
+* No data
+
+# 0.2.1
+
+* No data
+
+# 0.2.0
+
+* No data
+
+# 0.1.0
+
+* No data

data/Gemfile

@@ -5,8 +5,6 @@ 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"
 gem "activerecord"

data/Gemfile.lock

@@ -1,14 +1,8 @@
-GIT
-  remote: https://github.com/msgpack/msgpack-ruby.git
-  revision: b69e6d6965ef46890885ddf73f02b820f3185d80
-  specs:
-    msgpack (1.4.5)
-
 PATH
   remote: .
   specs:
-    paquito (0.5.0)
-      msgpack
+    paquito (0.6.2)
+      msgpack (>= 1.5.2)
 
 GEM
   remote: https://rubygems.org/
@@ -31,6 +25,7 @@ GEM
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     minitest (5.15.0)
+    msgpack (1.5.4)
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
@@ -70,7 +65,6 @@ DEPENDENCIES
   benchmark-ips
   byebug
   minitest (~> 5.0)
-  msgpack!
   paquito!
   rake (~> 13.0)
   rubocop
@@ -79,4 +73,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.33
+   2.3.8

data/lib/paquito/active_record_coder.rb

@@ -4,6 +4,8 @@ require "paquito/errors"
 
 module Paquito
   class ActiveRecordCoder
+    EMPTY_HASH = {}.freeze
+
     class << self
       def dump(record)
         instances = InstanceTracker.new
@@ -94,13 +96,17 @@ module Paquito
         attributes
       end
 
-      def deserialize_record(class_name, attributes_from_database)
+      def deserialize_record(class_name, attributes_from_database, new_record = false)
         begin
           klass = Object.const_get(class_name)
         rescue NameError
           raise ClassMissingError, "undefined class: #{class_name}"
         end
-        klass.instantiate(attributes_from_database)
+
+        # Ideally we'd like to call `klass.instantiate`, however it doesn't allow to pass
+        # wether the record was persisted or not.
+        attributes = klass.attributes_builder.build_from_database(attributes_from_database, EMPTY_HASH)
+        klass.allocate.init_with_attributes(attributes, new_record)
       end
     end
 

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/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.5.0"
+  VERSION = "0.6.2"
 end

data/paquito.gemspec

@@ -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.5.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-08-01 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
@@ -34,6 +34,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Framework for defining efficient and extendable serializers