dry-validation 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a31ac4653e7f148d6ee09543b38c81f9670bc40c51c8644414aacc000e66357
-  data.tar.gz: 2c84a8c6b29bb290f3e24505a9f52c1abcc31c777b54ed4140bc38225e5410d2
+  metadata.gz: d569600e476b1c0830184bea7e9393f333693e11c1a9d8b074e2b2329deeba7a
+  data.tar.gz: 4811db9bc4e1cc3f398df8717333683355779116a72314532b10bc2d49a87333
 SHA512:
-  metadata.gz: afb6b1de3fea9028ec2d4ffd481b9a49a79f2a9192c0101122a00c4b567d99e5d53083c130cc1789d643b9c80a5b7c98384e776d36c746a3ca1ff83ea80b1caf
-  data.tar.gz: d287f0d13f12c65a476de805e6fd95175eea35da74b679dd0fcb98e8ac616e000cf465db769b2e53e5db2e082173c30a3c8c16cffe0537517e96dbd499e8d004
+  metadata.gz: c497db70c2bf78e3355c685176361b06357ee9d9f17a2c867127d4d575865f0e6cb1f5bafae4b595e1db3af8748fc6122e6522177a152e17e8e6119006591b3c
+  data.tar.gz: 2b93c44b453e47f6a68ec05bedaec9d2f48d001a6dc9d0f62f2f2d7b70de5f8c1a7130bfc33c558fff1129fceb69d37f33f341d38c96549570a684d7279d24b0

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# v0.13.3 2019-05-21
+
+### Fixed
+
+* Fixed regression with caching templates that rely on predicate arguments (solnic)
+* Removed ugly workaround for template evaluation with extra tokens (solnic)
+
+### Changed
+
+* [internal] `Messages::Abstract#call` returns a `Template` object now, this was backported from dry-schema (solnic)
+
+[Compare v0.13.2...v0.13.3](https://github.com/dry-rb/dry-validation/compare/v0.13.2...v0.13.3)
+
 # v0.13.2 2019-05-12
 
 ### Fixed

data/lib/dry/validation/message.rb

@@ -32,7 +32,7 @@ module Dry
         end
 
         def to_s
-          [left, right].uniq.join(" #{messages[:or]} ")
+          [left, right].uniq.join(" #{messages[:or].()} ")
         end
       end
 

data/lib/dry/validation/message_compiler.rb

@@ -160,9 +160,7 @@ module Dry
       end
 
       def message_text(rule, template, tokens, opts)
-        original_verbosity = $VERBOSE
-        $VERBOSE = nil
-        text = template % tokens
+        text = template[template.data(tokens)]
 
         if full?
           rule_name = messages.rule(rule, opts) || rule
@@ -170,8 +168,6 @@ module Dry
         else
           text
         end
-      ensure
-        $VERBOSE = original_verbosity
       end
 
       def message_tokens(args)

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

@@ -1,8 +1,11 @@
 require 'pathname'
 require 'concurrent/map'
+
 require 'dry/equalizer'
 require 'dry/configurable'
 
+require 'dry/validation/template'
+
 module Dry
   module Validation
     module Messages
@@ -62,23 +65,15 @@ module Dry
         end
 
         def call(predicate, options = EMPTY_HASH)
-          cache.fetch_or_store(cache_key(predicate, options)) do
+          cache.fetch_or_store([predicate, options.reject { |k,| k.equal?(:input) }]) do
             path, opts = lookup(predicate, options)
-            get(path, opts) if path
+            return unless path
+            text = yield(path, opts)
+            Template[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
-
         def lookup(predicate, options = {})
           tokens = options.merge(
             root: root,
@@ -112,7 +107,7 @@ module Dry
         end
 
         def cache
-          @cache ||= self.class.cache[hash]
+          @cache ||= self.class.cache[self]
         end
 
         def default_locale

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

@@ -13,8 +13,15 @@ module Dry
         @t = I18n.method(:t)
       end
 
+      def call(predicate, options = EMPTY_HASH)
+        super do |path, opts|
+          get(path, opts)
+        end
+      end
+      alias_method :[], :call
+
       def get(key, options = {})
-        t.(key, options) if key
+        t.(key, locale: options.fetch(:locale, default_locale)) if key
       end
 
       def rule(name, options = {})

data/lib/dry/validation/messages/namespaced.rb

@@ -11,6 +11,13 @@ module Dry
           @root = messages.root
         end
 
+        def call(predicate, options = EMPTY_HASH)
+          super do |path, opts|
+            messages.get(path, opts)
+          end
+        end
+        alias_method :[], :call
+
         def key?(key, *args)
           messages.key?(key, *args)
         end

data/lib/dry/validation/messages/yaml.rb

@@ -34,6 +34,13 @@ module Dry
         @data = data
       end
 
+      def call(predicate, options = EMPTY_HASH)
+        super do |path, opts|
+          get(path, opts)
+        end
+      end
+      alias_method :[], :call
+
       def get(key, options = {})
         data[key % { locale: options.fetch(:locale, default_locale) }]
       end

data/lib/dry/validation/template.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'dry/equalizer'
+
+module Dry
+  module Validation
+    module Messages
+      # Template wraps a string with interpolation tokens and defines evaluator function
+      # dynamically
+      #
+      # @api private
+      class Template
+        include Dry::Equalizer(:text)
+
+        TOKEN_REGEXP = /%{(\w*)}/
+
+        # !@attribute [r] text
+        # @return [String]
+        attr_reader :text
+
+        # !@attribute [r] tokens
+        # @return [Hash]
+        attr_reader :tokens
+
+        # !@attribute [r] evaluator
+        # @return [Proc]
+        attr_reader :evaluator
+
+        # @api private
+        def self.[](input)
+          new(*parse(input))
+        end
+
+        # @api private
+        def self.parse(input)
+          tokens = input.scan(TOKEN_REGEXP).flatten(1).map(&:to_sym)
+          text = input.gsub('%', '#')
+
+          evaluator = <<-RUBY.strip
+            -> (#{tokens.map { |token| "#{token}:" }.join(", ")}) { "#{text}" }
+          RUBY
+
+          [text, tokens, eval(evaluator, binding, __FILE__, __LINE__ - 3)]
+        end
+
+        # @api private
+        def initialize(text, tokens, evaluator)
+          @text = text
+          @tokens = tokens
+          @evaluator = evaluator
+        end
+
+        # @api private
+        def data(input)
+          tokens.each_with_object({}) { |k, h| h[k] = input[k] }
+        end
+
+        # @api private
+        def call(data = EMPTY_HASH)
+          data.empty? ? evaluator.() : evaluator.(data)
+        end
+        alias_method :[], :call
+      end
+    end
+  end
+end

data/lib/dry/validation/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Validation
-    VERSION = '0.13.2'.freeze
+    VERSION = '0.13.3'.freeze
   end
 end

data/spec/fixtures/locales/en.yml

@@ -3,4 +3,6 @@ en:
     rules:
       email:
         filled?: "Please provide your email"
+      age:
+        gt?: "%{input} must be greater than %{num}"
     email?: "must be an email"

data/spec/integration/custom_error_messages_spec.rb

@@ -4,8 +4,12 @@ RSpec.describe Dry::Validation do
   shared_context 'schema with customized messages' do
     describe '#messages' do
       it 'returns compiled error messages' do
-        expect(schema.(email: '').messages).to eql(
-          email: ['Please provide your email']
+        expect(schema.(email: '', age: 12).messages).to eql(
+          email: ['Please provide your email'], age: ['12 must be greater than 18']
+        )
+
+        expect(schema.(email: '', age: 14).messages).to eql(
+          email: ['Please provide your email'], age: ['14 must be greater than 18']
         )
       end
     end
@@ -18,7 +22,8 @@ RSpec.describe Dry::Validation do
           config.messages_file = SPEC_ROOT.join('fixtures/locales/en.yml')
         end
 
-        required(:email, &:filled?)
+        required(:email).filled
+        required(:age).value(gt?: 18)
       end
     end
 
@@ -38,7 +43,8 @@ RSpec.describe Dry::Validation do
             config.messages = :i18n
           end
 
-          required(:email, &:filled?)
+          required(:email).filled
+          required(:age).value(gt?: 18)
         end
       end
 

data/spec/integration/messages/i18n_spec.rb

@@ -17,33 +17,33 @@ RSpec.describe Messages::I18n do
       end
 
       it 'returns a message for a predicate' do
-        message = messages[:filled?, rule: :name]
+        message = messages[:filled?, rule: :name].text
 
         expect(message).to eql("nie może być pusty")
       end
 
       it 'returns a message for a specific rule' do
-        message = messages[:filled?, rule: :email]
+        message = messages[:filled?, rule: :email].text
 
         expect(message).to eql("Proszę podać adres email")
       end
 
       it 'returns a message for a specific val type' do
-        message = messages[:size?, rule: :pages, val_type: String]
+        message = messages[:size?, rule: :pages, val_type: String].text
 
-        expect(message).to eql("wielkość musi być równa %{size}")
+        expect(message).to eql("wielkość musi być równa \#{size}")
       end
 
       it 'returns a message for a specific rule and its default arg type' do
-        message = messages[:size?, rule: :pages]
+        message = messages[:size?, rule: :pages].text
 
-        expect(message).to eql("wielkość musi być równa %{size}")
+        expect(message).to eql("wielkość musi być równa \#{size}")
       end
 
       it 'returns a message for a specific rule and its arg type' do
-        message = messages[:size?, rule: :pages, arg_type: Range]
+        message = messages[:size?, rule: :pages, arg_type: Range].text
 
-        expect(message).to eql("wielkość musi być między %{size_left} a %{size_right}")
+        expect(message).to eql("wielkość musi być między \#{size_left} a \#{size_right}")
       end
     end
 
@@ -57,27 +57,27 @@ RSpec.describe Messages::I18n do
 
     context 'with a different locale' do
       it 'returns a message for a predicate' do
-        message = messages[:filled?, rule: :name, locale: :en]
+        message = messages[:filled?, rule: :name, locale: :en].text
 
         expect(message).to eql("must be filled")
       end
 
       it 'returns a message for a specific rule' do
-        message = messages[:filled?, rule: :email, locale: :en]
+        message = messages[:filled?, rule: :email, locale: :en].text
 
         expect(message).to eql("Please provide your email")
       end
 
       it 'returns a message for a specific rule and its default arg type' do
-        message = messages[:size?, rule: :pages, locale: :en]
+        message = messages[:size?, rule: :pages, locale: :en].text
 
-        expect(message).to eql("size must be %{size}")
+        expect(message).to eql("size must be \#{size}")
       end
 
       it 'returns a message for a specific rule and its arg type' do
-        message = messages[:size?, rule: :pages, arg_type: Range, locale: :en]
+        message = messages[:size?, rule: :pages, arg_type: Range, locale: :en].text
 
-        expect(message).to eql("size must be within %{size_left} - %{size_right}")
+        expect(message).to eql("size must be within \#{size_left} - \#{size_right}")
       end
     end
 
@@ -90,7 +90,7 @@ RSpec.describe Messages::I18n do
       it 'returns a message for a predicate in the default_locale' do
         pending 'FIXME: this got broken for some reason, probably an I18n issue'
 
-        message = messages[:even?, rule: :some_number]
+        message = messages[:even?, rule: :some_number].text
 
         expect(I18n.locale).to eql(:pl)
         expect(message).to eql("must be even")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 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
@@ -226,6 +226,7 @@ files:
 - lib/dry/validation/schema/rule.rb
 - lib/dry/validation/schema/value.rb
 - lib/dry/validation/schema_compiler.rb
+- lib/dry/validation/template.rb
 - lib/dry/validation/type_specs.rb
 - lib/dry/validation/version.rb
 - log/.gitkeep