dry-schema 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c66e7f3b66548c71cfc384f907b92c20d5328c1e726557d8a2a5084605818d7b
-  data.tar.gz: 4e0737dc66accd0149367edb1e2494f2cf776859023ced9eee36b7b6c2962804
+  metadata.gz: 1bf48198c497de44b2a8511ef4ba4189ea9cb94a7eeef95dfd816702e867636b
+  data.tar.gz: 2189a1c1c034de218601a2cafeff4fe0d4d1a5b5162b9ceed116ec0cd0989b2a
 SHA512:
-  metadata.gz: 7b2203dd173361640beba6981c4dafc16a11ec5bb31429cf5457f8447622648969b07a0f7b5eb1bd2c7fbd74fe2667a8bc1bb7f3564f71fb048d3fe4f35dce74
-  data.tar.gz: a657196a6d00386336654dd75a79142674d36fb101ae45796ebc9afd75467e31470e86862f7fa1cf759d4a406dd79b0cca0a09c587befd6ac81f766c78322f27
+  metadata.gz: d56209a51e4f48ceb29e6c9f7302d7ba184c13f1db0163d05754a95b7c3e7642e47cdb5cf89989dbc419747a48d4623b4906c7dd532700e6980a02420a361bbe
+  data.tar.gz: df81a0c7769187c928923de9750e1111b0acf8bc8324a1a6f50bffa3a4bf9c2c2edceb78c2de3d69d7962778450ba1f4745d79d979df46a9e4b3daaf388f51e0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.0.2 2019-05-12
+
+### Fixed
+
+* Caching message templates uses restricted set of known keys to calculate cache keys (issue #132) (solnic)
+
+[Compare v1.0.1...v1.0.2](https://github.com/dry-rb/dry-schema/compare/v1.0.1...v1.0.2)
+
 # 1.0.1 2019-05-08
 
 ### Fixed

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

@@ -45,6 +45,8 @@ 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 }
@@ -71,11 +73,6 @@ module Dry
           messages.prepare
         end
 
-        # @api private
-        def hash
-          @hash ||= config.hash
-        end
-
         # @api private
         def translate(key, locale: default_locale)
           t["#{config.top_namespace}.#{key}", locale: locale]
@@ -95,14 +92,24 @@ module Dry
         # @return [Template]
         #
         # @api public
-        def call(*args)
-          cache.fetch_or_store(args.hash) do
-            text, meta = lookup(*args)
+        def call(predicate, options)
+          cache.fetch_or_store(cache_key(predicate, options).hash) 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
@@ -161,9 +168,14 @@ module Dry
           config.root
         end
 
+        # @api private
+        def hash
+          @hash ||= config.hash
+        end
+
         # @api private
         def cache
-          @cache ||= self.class.cache[self]
+          @cache ||= self.class.cache[hash]
         end
 
         # @api private

data/lib/dry/schema/version.rb

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

metadata

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