paquito 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdea3e761f0c5cf3d5a99a42f31e55b645921e6597fb027c560de421b55f7ae3
-  data.tar.gz: f3dc6d6b15d149bb1d00115b79ef7f337af01197b5961a14fa9baead46e2586a
+  metadata.gz: d00c743e791d4a17131842b2f515d58cff0e62190c8509666aff3d0d34e2d005
+  data.tar.gz: b6760e6c8ceefa78e77f6b7c1a5668d40930c0d80fb8f841ea0a3deda82a77dd
 SHA512:
-  metadata.gz: ac2d37fe39cace2096b041200eb2c2fac5fa2b6024747420a69645097642bce3ef35d66dce1c53d0ff801a921c46f84ca68fdb5a123ffd5c71e52f2a492bc0b8
-  data.tar.gz: e0e6e8329734bfed770fc1cf8b1c964e7c7902a55686d7182cd078c26a3255d4e7af91e17e2898e35ef9c3515df1d38c5243417d18190cd968f4232e85231e59
+  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.1.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/README.md

@@ -120,6 +120,7 @@ coder.load(coder.dump(%i(foo bar).to_set)) # => #<Set: {:foo, :bar}>
 `Paquito::TypedStruct` is a opt-in Sorbet runtime plugin that allows `T::Struct` classes to be serializable. You need to explicitly include the module in the `T::Struct` classes that you will be serializing.
 
 Example
+
 ```ruby
 class MyStruct < T::Struct
   include Paquito::TypedStruct
@@ -134,9 +135,20 @@ my_struct.as_pack # => [26450, "foo", 1]
 MyStruct.from_pack([26450, "foo", 1]) # => <MyStruct bar=1, foo="foo">
 ```
 
-## Active Record utilities
+## Rails utilities
+
+`paquito` doesn't not depend on `rails` nor any of its components, however it does provide some optional utilities for it.
+
+### `CacheEntryCoder`
+
+`Paquito::CacheEntryCoder` turns an `ActiveSupport::Cache::Entry` instance into a simple `Array` instance. This allows to
+implement custom coders for `ActiveSupport::Cache`.
 
-`paquito` doesn't not depend on `rails` nor any of it's componement, however it does provide some optional utilities for it.
+Example:
+
+```ruby
+ActiveSupport::Cache::FileStore.new("tmp/cache", coder: Paquito.chain(Paquito::CacheEntryCoder, JSON))
+```
 
 ### `SerializedColumn`
 

data/lib/paquito/cache_entry_coder.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+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
+    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
+    end
+  end
+end

data/lib/paquito/codec_factory.rb

@@ -27,12 +27,16 @@ module Paquito
         @factory.dump(object)
       rescue NoMethodError => error
         raise PackError.new(error.message, error.receiver)
+      rescue RangeError => error
+        raise PackError, "#{error.class.name}, #{error.message}"
       end
 
       def load(payload)
         @factory.load(payload, freeze: @freeze)
       rescue MessagePack::UnpackError => error
         raise UnpackError, error.message
+      rescue IOError => error
+        raise UnpackError, "#{error.class.name}, #{error.message}"
       end
     end
   end

data/lib/paquito/conditional_compressor.rb

@@ -35,7 +35,7 @@ module Paquito
       when COMPRESSED
         @compressor.load(data)
       else
-        raise ArgumentError, "invalid ConditionalCompressor version"
+        raise UnpackError, "invalid ConditionalCompressor version"
       end
     end
   end

data/lib/paquito/errors.rb

@@ -5,6 +5,7 @@ module Paquito
 
   class PackError < Error
     attr_reader :receiver
+
     def initialize(msg, receiver = nil)
       super(msg)
       @receiver = receiver

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/struct.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "paquito/errors"
 
 module Paquito

data/lib/paquito/types.rb

@@ -73,8 +73,9 @@ 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,
       "Time" => {
         code: 0x01,
@@ -193,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.1.0"
+  VERSION = "0.3.1"
 end

data/lib/paquito.rb

@@ -14,6 +14,7 @@ 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/comment_prefix_version"
 require "paquito/types"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paquito
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -45,6 +45,7 @@ files:
 - lib/paquito.rb
 - lib/paquito/active_record_coder.rb
 - lib/paquito/allow_nil.rb
+- lib/paquito/cache_entry_coder.rb
 - lib/paquito/codec_factory.rb
 - lib/paquito/coder_chain.rb
 - lib/paquito/comment_prefix_version.rb