paquito 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8270d4e3422ef944047a1a1832819ad3af49b90e4e2886423fcb4631a31586cf
-  data.tar.gz: 1cb40c98fbfc61c79fa677569925e212643b3bc878d6ac053fa711a2929ad325
+  metadata.gz: d00c743e791d4a17131842b2f515d58cff0e62190c8509666aff3d0d34e2d005
+  data.tar.gz: b6760e6c8ceefa78e77f6b7c1a5668d40930c0d80fb8f841ea0a3deda82a77dd
 SHA512:
-  metadata.gz: '0218b3e4e731b81e21c2f16df0eaa1f86c5267b815b9059de8922e233ceae9a7f4646bce089b215c38347e950fe20636753fd57aa5a9b61ef4617126fd4e96b8'
-  data.tar.gz: 22b6023ea6c0edf6d5c23de9b36c908f5b323b449c14ecdab0562d59b131e5ed54341d19e6404cf22d351384531bf3943eba60c958aed9566fdc589b900b4ad4
+  metadata.gz: 189792644f661fd6a5455921928ff94f911d972c971590ff6754bee2f0e27c3386199d0444286e279d6b658d755c3ad0e9deff2e6338620c5a1b81efe542365a
+  data.tar.gz: c4f9cb2d28a8598627497bf3e7f8c1de1a29e2fa0a37e54e06310af438fdd5f34b6c77c533a90b121559d5e77353b5fe316a8099b4d1f8b588873363edb43c3a

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" # Waiting for release of https://github.com/msgpack/msgpack-ruby/pull/220
-
 gem "rake", "~> 13.0"
-gem "activesupport", ">= 7.0.0.alpha2"
-gem "activerecord", ">= 7.0.0.alpha2"
+gem "activesupport", ">= 7.0.0"
+gem "activerecord", ">= 7.0.0"
 gem "sqlite3"
 
 gem "minitest", "~> 5.0"

data/Gemfile.lock

@@ -1,24 +1,18 @@
-GIT
-  remote: https://github.com/msgpack/msgpack-ruby.git
-  revision: ea20842ea732f4d625fd30c7b8f67655d73652f2
-  specs:
-    msgpack (1.4.2)
-
 PATH
   remote: .
   specs:
-    paquito (0.3.0)
+    paquito (0.3.1)
       msgpack
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.0.alpha2)
-      activesupport (= 7.0.0.alpha2)
-    activerecord (7.0.0.alpha2)
-      activemodel (= 7.0.0.alpha2)
-      activesupport (= 7.0.0.alpha2)
-    activesupport (7.0.0.alpha2)
+    activemodel (7.0.1)
+      activesupport (= 7.0.1)
+    activerecord (7.0.1)
+      activemodel (= 7.0.1)
+      activesupport (= 7.0.1)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -26,9 +20,10 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     concurrent-ruby (1.1.9)
-    i18n (1.8.10)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     minitest (5.14.4)
+    msgpack (1.4.4)
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
@@ -62,11 +57,10 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  activerecord (>= 7.0.0.alpha2)
-  activesupport (>= 7.0.0.alpha2)
+  activerecord (>= 7.0.0)
+  activesupport (>= 7.0.0)
   byebug
   minitest (~> 5.0)
-  msgpack!
   paquito!
   rake (~> 13.0)
   rubocop
@@ -75,4 +69,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.22
+   2.2.33

data/lib/paquito/safe_yaml.rb

@@ -43,31 +43,36 @@ module Paquito
 
     class RestrictedYAMLTree < Psych::Visitors::YAMLTree
       class DispatchCache
-        def initialize(visitor, cache, permitted_classes)
+        def initialize(visitor, cache)
           @visitor = visitor
           @cache = cache
-          @permitted_classes = permitted_classes
-
-          @permitted_cache = Hash.new do |h, klass|
-            unless @permitted_classes.include?(klass.name)
-              raise UnsupportedType, "Tried to dump unspecified class: #{klass.name.inspect}"
-            end
-
-            h[klass] = true
-          end.compare_by_identity
         end
 
         def [](klass)
-          if @permitted_cache[klass]
-            @cache[klass]
-          end
+          @cache[klass] if @visitor.permitted_class?(klass)
         end
       end
 
       def initialize(...)
         super
         @permitted_classes = Set.new(@options[:permitted_classes])
-        @dispatch_cache = DispatchCache.new(self, @dispatch_cache, @permitted_classes)
+        @dispatch_cache = DispatchCache.new(self, @dispatch_cache)
+        @permitted_cache = Hash.new do |h, klass|
+          unless @permitted_classes.include?(klass.name)
+            raise UnsupportedType, "Tried to dump unspecified class: #{klass.name.inspect}"
+          end
+
+          h[klass] = true
+        end.compare_by_identity
+      end
+
+      def dump_coder(target)
+        return unless permitted_class?(target.class)
+        super
+      end
+
+      def permitted_class?(klass)
+        @permitted_cache[klass]
       end
     end
   end

data/lib/paquito/types.rb

@@ -73,7 +73,7 @@ module Paquito
     TYPES = {
       "Symbol" => {
         code: 0x00,
-        packer: :to_s,
+        packer: Symbol.method_defined?(:name) ? :name : :to_s,
         unpacker: :to_sym,
         optimized_symbols_parsing: true,
       }.freeze,
@@ -194,11 +194,14 @@ 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,
-            packer: curry_callback(type_attributes.fetch(:packer), factory),
-            unpacker: curry_callback(type_attributes.fetch(:unpacker), factory),
+            type_attributes
           )
         end
       end

data/lib/paquito/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paquito
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack