dry-schema 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bf48198c497de44b2a8511ef4ba4189ea9cb94a7eeef95dfd816702e867636b
-  data.tar.gz: 2189a1c1c034de218601a2cafeff4fe0d4d1a5b5162b9ceed116ec0cd0989b2a
+  metadata.gz: 1867ad3cc77ca7f40338a9af423ebbdeb226c677e54fa2681af2efe43cc098e7
+  data.tar.gz: 2b0a981aaaab80619e4e79b5428961fa8f68e47796c171771531fa9263f3a487
 SHA512:
-  metadata.gz: d56209a51e4f48ceb29e6c9f7302d7ba184c13f1db0163d05754a95b7c3e7642e47cdb5cf89989dbc419747a48d4623b4906c7dd532700e6980a02420a361bbe
-  data.tar.gz: df81a0c7769187c928923de9750e1111b0acf8bc8324a1a6f50bffa3a4bf9c2c2edceb78c2de3d69d7962778450ba1f4745d79d979df46a9e4b3daaf388f51e0
+  metadata.gz: 8296a4a2e9d5972fcac050407a76c6c9ac477415f2abfeb2d5005f71a3ac6ee32101edfb785ef51048fdd1d6bf70ec24fcc53c5883004169ec20af2291e138b5
+  data.tar.gz: 88d64217d50a50c642a23713cd4f2a865ed16dd7da73a73dc085f7324daae9869c06c1e4024ecc2b973aea7097daae8037020fce7121cafab08732faa9362fa2

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v1.0.3 2019-05-21
+
+### Fixed
+
+* `Object#hash` is no longer used to calculate cache keys due to a potential risk of having hash collisions (solnic)
+* Predicate arguments are used again for template cache keys (solnic)
+* `I18n` messages backend no longer evaluates templates twice (solnic)
+
+[Compare v1.0.2...v1.0.3](https://github.com/dry-rb/dry-schema/compare/v1.0.2...v1.0.3)
+
 # v1.0.2 2019-05-12
 
 ### Fixed

data/lib/dry/schema/messages/abstract.rb

@@ -45,8 +45,6 @@ module Dry
           String => 'string'
         )
 
-        CACHE_KEYS = %i[path message_type val_type arg_type locale].freeze
-
         # @api private
         def self.cache
           @cache ||= Concurrent::Map.new { |h, k| h[k] = Concurrent::Map.new }
@@ -93,23 +91,13 @@ module Dry
         #
         # @api public
         def call(predicate, options)
-          cache.fetch_or_store(cache_key(predicate, options).hash) do
+          cache.fetch_or_store([predicate, options.reject { |k,| k.equal?(:input) }]) do
             text, meta = lookup(predicate, options)
             [Template[text], meta] if text
           end
         end
         alias_method :[], :call
 
-        if ::Hash.instance_methods.include?(:slice)
-          def cache_key(predicate, options)
-            [predicate, options.slice(*CACHE_KEYS)]
-          end
-        else
-          def cache_key(predicate, options)
-            [predicate, options.select { |key,| CACHE_KEYS.include?(key) }]
-          end
-        end
-
         # Try to find a message for the given predicate and its options
         #
         # @api private
@@ -168,14 +156,9 @@ module Dry
           config.root
         end
 
-        # @api private
-        def hash
-          @hash ||= config.hash
-        end
-
         # @api private
         def cache
-          @cache ||= self.class.cache[hash]
+          @cache ||= self.class.cache[self]
         end
 
         # @api private

data/lib/dry/schema/messages/i18n.rb

@@ -29,7 +29,7 @@ module Dry
       #
       # @api public
       def get(key, options = EMPTY_HASH)
-        t.(key, options) if key
+        t.(key, locale: options.fetch(:locale, default_locale)) if key
       end
 
       # Check if given key is defined

data/lib/dry/schema/messages/template.rb

@@ -14,7 +14,7 @@ module Dry
       class Template
         include Dry::Equalizer(:text)
 
-        TOKEN_REGEXP = /%{([\w\d]*)}/
+        TOKEN_REGEXP = /%{(\w*)}/
 
         # !@attribute [r] text
         # @return [String]

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby