hanami-validations 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a7b7aed1e386e42bd17c1840303d0cff588a2f51e0ec97241ca2b5ecc7960a
-  data.tar.gz: 6541430022c6922cba781ace7da6a1cec73a9128dbf0111394ef3a080d2a6eee
+  metadata.gz: 6951dfe0b98667ad29ca42c1e3dd45546070735435dfe23a6c437c61cb5e47ca
+  data.tar.gz: 591391b31ec99940947f8f134ec16f95942a52ca80d13a1f7e23da29a03dfc20
 SHA512:
-  metadata.gz: 93c49b2004993dda30dbea2af527725625bff6dc5155942f8ddf18f7914c83e25d47decc1887429ad83969637a8d8a05ab6874f0ee7735843e346fa277e9d090
-  data.tar.gz: e9e1af41957b3e89b015a7a991b5fdeadbf14193fc79c6f6a54404c5cc479f944b8abc7d2ced45bebc42b248d887ac36c89d5f3440e9671df0fb89f0556f0f00
+  metadata.gz: f9b2e15f3b82cd795ca6a0ccc902cdf5f4da854c18e9595ac4d5318afb30231d49d772ef496b8030fafdb3f563756ce6a782d456c0199480f379db83dfe20f3a
+  data.tar.gz: 50eaea7c4005d158d4506eda270d03d375cd6b834586dd3d59abc9d1e7ffcaa837b76260ad78016a37b32aad7fb8980d28b7e1e416def3d6711668320722ed5b

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Hanami::Validations
 Validations mixin for Ruby objects
 
+## v1.3.5 - 2019-07-26
+### Fixed
+- [ippachi] Ensure I18n doesn't crash when used for inline predicates
+
 ## v1.3.4 - 2019-07-26
 ### Fixed
 - [Luca Guidi] Ensure to load i18n backend (including `i18n` gem), when messages engine is `:i18n`

data/lib/hanami/validations.rb

@@ -292,11 +292,11 @@ module Hanami
 
       # @since 0.6.0
       # @api private
-      def _schema_predicates
+      def _schema_predicates # rubocop:disable Metrics/CyclomaticComplexity
         return if _predicates_module.nil? && _predicates.empty?
 
         lambda do |config|
-          config.messages      = _predicates_module&.messages || DEFAULT_MESSAGES_ENGINE
+          config.messages      = _predicates_module&.messages || @_messages || DEFAULT_MESSAGES_ENGINE
           config.messages_file = _predicates_module.messages_path unless _predicates_module.nil?
 
           require "dry/validation/messages/i18n" if config.messages == :i18n
@@ -341,11 +341,13 @@ module Hanami
           def messages
             engine = super
 
-            if engine.respond_to?(:merge)
-              engine
-            else
-              engine.messages
-            end.merge(__messages)
+            messages = if engine.respond_to?(:merge)
+                         engine
+                       else
+                         engine.messages
+                       end
+
+            config.messages == :i18n ? messages : messages.merge(__messages)
           end
         end
       end

data/lib/hanami/validations/version.rb

@@ -1,6 +1,6 @@
 module Hanami
   module Validations
     # @since 0.1.0
-    VERSION = '1.3.4'.freeze
+    VERSION = '1.3.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-validations
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils