dry-validation 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ba7bd2c7d9b73c611e4ef91e34a4aedf18bc38b
-  data.tar.gz: ad1046184040352140c06823150e09f5af13f6e5
+  metadata.gz: 8275fd162e586ba1fcbb31efe723708f553e31f6
+  data.tar.gz: d95d66f951d31033be04e04258b3ac0dca700c8a
 SHA512:
-  metadata.gz: bdc8ccd55d16dbf914b03c346582ed67fb22fd415bc397d468b4febd34bf15c3eafe0764c9ec0259d3ec7ea3404d935b46a67e347e27122d95949a8402cb909e
-  data.tar.gz: 0e6e8d169dd74bf80dda570838b89f8aa3488fb4e985b04d28d6da8ad458a0ff83fd0a798d8815dbdeb16d17c5128fd69521946bf1d7d6ff0aa0e3c7d398bd9c
+  metadata.gz: 147d0f89a321c42bfa3799f37c3bd5700faefd22189a1c8bd49af812de16f4de80ab0bb9a98b253c688c66582f433bccacaccbcda5f0820fb3d6fb13c9c26ae5
+  data.tar.gz: 7e32822ddbe928051bceab4e7bf4e0ad9378d63e5e95972c4c6f98056dd5a7a66a81e3e4b4a8c85c8391de782d95e1fdfd6932ffeeb96776743bf0f9cf1ee63e

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v0.9.5 2016-08-15
+
+### Fixed
+
+* Infering multiple predicates with options works as expected ie `value(:str?, min_size?: 3, max_size?: 6)` (solnic)
+* Default `locale` configured in `I18n` is now respected by the messages compiler (agustin + cavi21)
+
+[Compare v0.9.4...v0.9.5](https://github.com/dryrb/dry-validation/compare/v0.9.4...v0.9.5)
+
 # v0.9.4 2016-08-11
 
 ### Fixed

data/lib/dry/validation/message_compiler.rb

@@ -11,7 +11,7 @@ module Dry
         @messages = messages
         @options = options
         @full = @options.fetch(:full, false)
-        @locale = @options.fetch(:locale, :en)
+        @locale = @options.fetch(:locale, messages.default_locale)
         @default_lookup_options = { message_type: message_type, locale: locale }
       end
 

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

@@ -100,6 +100,10 @@ module Dry
         def cache
           @cache ||= self.class.cache[self]
         end
+
+        def default_locale
+          :en
+        end
       end
     end
   end

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

@@ -18,13 +18,18 @@ module Dry
       end
 
       def key?(key, options)
-        ::I18n.exists?(key, options.fetch(:locale, I18n.default_locale))
+        ::I18n.exists?(key, options.fetch(:locale, default_locale)) ||
+        ::I18n.exists?(key, I18n.default_locale)
       end
 
       def merge(path)
         ::I18n.load_path << path
         self
       end
+
+      def default_locale
+        I18n.locale || I18n.default_locale || super
+      end
     end
   end
 end

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

@@ -34,11 +34,11 @@ module Dry
       end
 
       def get(key, options = {})
-        data[key % { locale: options.fetch(:locale, :en) }]
+        data[key % { locale: options.fetch(:locale, default_locale) }]
       end
 
       def key?(key, options = {})
-        data.key?(key % { locale: options.fetch(:locale, :en) })
+        data.key?(key % { locale: options.fetch(:locale, default_locale) })
       end
 
       def merge(overrides)

data/lib/dry/validation/schema/rule.rb

@@ -158,8 +158,8 @@ module Dry
         alias_method :>, :then
 
         def infer_predicates(predicates, macro = nil)
-          predicates.map do |predicate|
-            name, *args = ::Kernel.Array(predicate).first
+          predicates.flat_map(&::Kernel.method(:Array)).map do |predicate|
+            name, *args = ::Kernel.Array(predicate)
 
             if macro && INVALID_PREDICATES[macro].include?(name)
               ::Kernel.raise InvalidSchemaError, "you can't use #{name} predicate with #{macro} macro"

data/lib/dry/validation/schema/value.rb

@@ -172,8 +172,8 @@ module Dry
         end
 
         def infer_predicates(predicates, infer_on = self)
-          predicates.map { |predicate|
-            name, *args = ::Kernel.Array(predicate).first
+          predicates.flat_map(&::Kernel.method(:Array)).map { |predicate|
+            name, *args = ::Kernel.Array(predicate)
 
             if name.is_a?(Schema)
               infer_on.schema(name)

data/lib/dry/validation/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Validation
-    VERSION = '0.9.4'.freeze
+    VERSION = '0.9.5'.freeze
   end
 end

data/spec/fixtures/locales/pl.yml

@@ -5,6 +5,10 @@ pl:
       arg:
         default: "wielkość musi być równa %{size}"
         range: "wielkość musi być między %{size_left} a %{size_right}"
+      value:
+        string:
+          arg:
+            default: "wielkość musi być równa %{size}"
     rules:
       email:
         filled?: "Proszę podać adres email"

data/spec/integration/messages/i18n_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe Messages::I18n do
     I18n.config.available_locales_set << :pl
     I18n.load_path.concat(%w(en pl).map { |l| SPEC_ROOT.join("fixtures/locales/#{l}.yml") })
     I18n.backend.load_translations
+    I18n.locale = :pl
   end
 
   describe '#[]' do
@@ -18,58 +19,76 @@ RSpec.describe Messages::I18n do
       it 'returns a message for a predicate' do
         message = messages[:filled?, rule: :name]
 
-        expect(message).to eql("must be filled")
+        expect(message).to eql("nie może być pusty")
       end
 
       it 'returns a message for a specific rule' do
         message = messages[:filled?, rule: :email]
 
-        expect(message).to eql("Please provide your email")
+        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]
 
-        expect(message).to eql("length must be %{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]
 
-        expect(message).to eql("size must be %{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]
 
-        expect(message).to eql("size must be within %{size_left} - %{size_right}")
+        expect(message).to eql("wielkość musi być między %{size_left} a %{size_right}")
       end
     end
 
     context 'with a different locale' do
       it 'returns a message for a predicate' do
-        message = messages[:filled?, rule: :name, locale: :pl]
+        message = messages[:filled?, rule: :name, locale: :en]
 
-        expect(message).to eql("nie może być pusty")
+        expect(message).to eql("must be filled")
       end
 
       it 'returns a message for a specific rule' do
-        message = messages[:filled?, rule: :email, locale: :pl]
+        message = messages[:filled?, rule: :email, locale: :en]
 
-        expect(message).to eql("Proszę podać adres email")
+        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: :pl]
+        message = messages[:size?, rule: :pages, locale: :en]
 
-        expect(message).to eql("wielkość musi być równa %{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: :pl]
+        message = messages[:size?, rule: :pages, arg_type: Range, locale: :en]
 
-        expect(message).to eql("wielkość musi być między %{size_left} a %{size_right}")
+        expect(message).to eql("size must be within %{size_left} - %{size_right}")
+      end
+    end
+
+    context 'fallbacking to I18n.default_locale with fallback backend config' do
+      before do
+        require "i18n/backend/fallbacks"
+        I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+      end
+
+      it 'returns a message for a predicate in the default_locale' do
+        message = messages[:even?, rule: :some_number]
+
+        expect(I18n.locale).to eql(:pl)
+        expect(message).to eql("must be even")
       end
     end
   end
+
+  after(:all) do
+    I18n.locale = I18n.default_locale
+  end
 end

data/spec/integration/schema/macros/value_spec.rb

@@ -36,6 +36,20 @@ RSpec.describe 'Macros #value' do
       end
     end
 
+    context 'with a second predicate with args' do
+      subject(:schema) do
+        Dry::Validation.Schema do
+          required(:name).value(:str?, min_size?: 3, max_size?: 6)
+        end
+      end
+
+      it 'generates str? & min_size? & max_size?' do
+        expect(schema.(name: 'fo').messages).to eql(
+          name: ['size cannot be less than 3', 'size cannot be greater than 6']
+        )
+      end
+    end
+
     context 'with a range arg' do
       subject(:schema) do
         Dry::Validation.Schema do

data/spec/unit/error_compiler_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe ErrorCompiler, '#call' do
-  subject(:error_compiler) { ErrorCompiler.new({}) }
+  subject(:error_compiler) { ErrorCompiler.new( Messages.default ) }
 
   it 'returns an empty hash when there are no errors' do
     expect(error_compiler.([])).to be_empty

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby