hanami-validations 1.3.2 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 554293d9bca14e3f54b807f6fa47d8c1548d16627bb5309d1c5d84347427c78b
-  data.tar.gz: b1f122e0dcde35e2c79d0a6429a6fff301ec6ed4d3f86b078877751718eec179
+  metadata.gz: 1a260f62f3f079229e28d43c20ce88826e06d23aff8ddcd4e67b1bda812b87a2
+  data.tar.gz: 2f0d8555be09a4a113570f99e810a76a141b7a6728aff90c073a8740cf0c2573
 SHA512:
-  metadata.gz: 5553713f80cdfe9919e33a7144c7c36b4c7e4dc2dc093025e619fecc2e3708128fc7cbb2a1ae8be59c0fe4614392c2e01908295be09d51863275fb029ff20fe1
-  data.tar.gz: 5df0f180c1ed2d7950e725962291adc6f5df32a32240cf5e7090b140a4c4c013e5a41de5cd6309175264287b091dd9d4b6952c2f81174a3a5089523b127f5899
+  metadata.gz: 3d6ce05e6ca243b83a4a7d0ab5b3d3c41fbf86ad552f68b7439bd4f57dcbc673747a86c74b417fdeec184cdb501f208fcba5b210c5bd0b163755e9b3ef0d9fbe
+  data.tar.gz: c90675c4bd0ecf46a0bc9d9c6ec5e35b3d8e79270fe40abdb29c344fa8e37fc2eeb9adf3e8ae871e9428ded029ea8e3e312132d9b1fe1ed44a96250dcb9b1223

data/CHANGELOG.md

@@ -1,6 +1,27 @@
 # Hanami::Validations
 Validations mixin for Ruby objects
 
+## v1.3.7 - 2021-01-06
+### Fixed
+- [Panagiotis Matsinopoulos] Ensure `predicate` and `predicates` to work together
+
+## v1.3.6 - 2020-01-08
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 2.7
+
+## 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`
+
+## v1.3.3 - 2019-01-31
+### Fixed
+- [Luca Guidi] Depend on `dry-validation` `~> 0.11`, `< 0.12`
+- [Luca Guidi] Depend on `dry-logic` `~> 0.4.2`, `< 0.5`
+
 ## v1.3.2 - 2019-01-30
 ### Fixed
 - [Luca Guidi] Depend on `dry-validation` `~> 0.11.2`, `< 0.12` in order to skip non compatible `dry-logic` `0.5.0`

data/README.md

@@ -5,8 +5,7 @@ Validations mixin for Ruby objects
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/hanami-validations.svg)](https://badge.fury.io/rb/hanami-validations)
-[![TravisCI](https://travis-ci.org/hanami/validations.svg?branch=master)](https://travis-ci.org/hanami/validations)
-[![CircleCI](https://circleci.com/gh/hanami/validations/tree/master.svg?style=svg)](https://circleci.com/gh/hanami/validations/tree/master)
+[![CI](https://github.com/hanami/validations/workflows/ci/badge.svg?branch=master)](https://github.com/hanami/validations/actions?query=workflow%3Aci+branch%3Amaster)
 [![Test Coverage](https://codecov.io/gh/hanami/validations/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/validations)
 [![Depfu](https://badges.depfu.com/badges/af6c6be539d9d587c7541ae7a013c9ff/overview.svg)](https://depfu.com/github/hanami/validations?project=Bundler)
 [![Inline Docs](http://inch-ci.org/github/hanami/validations.svg)](http://inch-ci.org/github/hanami/validations)
@@ -14,6 +13,8 @@ Validations mixin for Ruby objects
 ## Contact
 
 * Home page: http://hanamirb.org
+* Community: http://hanamirb.org/community
+* Guides: https://guides.hanamirb.org
 * Mailing List: http://hanamirb.org/mailing-list
 * API Doc: http://rdoc.info/gems/hanami-validations
 * Bugs/Issues: https://github.com/hanami/validations/issues
@@ -798,6 +799,6 @@ Thanks to [dry-rb](http://dry-rb.org) Community for their priceless support. ❤
 
 ## Copyright
 
-Copyright © 2014-2017 Luca Guidi – Released under MIT License
+Copyright © 2014-2021 Luca Guidi – Released under MIT License
 
 This project was formerly known as Lotus (`lotus-validations`).

data/hanami-validations.gemspec

@@ -1,27 +1,31 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'hanami/validations/version'
+require "hanami/validations/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'hanami-validations'
+  spec.name          = "hanami-validations"
   spec.version       = Hanami::Validations::VERSION
-  spec.authors       = ['Luca Guidi']
-  spec.email         = ['me@lucaguidi.com']
-  spec.summary       = 'Validations mixin for Ruby objects'
-  spec.description   = 'Validations mixin for Ruby objects and support for Hanami'
-  spec.homepage      = 'http://hanamirb.org'
-  spec.license       = 'MIT'
+  spec.authors       = ["Luca Guidi"]
+  spec.email         = ["me@lucaguidi.com"]
+  spec.summary       = "Validations mixin for Ruby objects"
+  spec.description   = "Validations mixin for Ruby objects and support for Hanami"
+  spec.homepage      = "http://hanamirb.org"
+  spec.license       = "MIT"
 
-  spec.files         = `git ls-files -- lib/* LICENSE.md README.md CHANGELOG.md hanami-validations.gemspec`.split($INPUT_RECORD_SEPARATOR)
+  spec.files         = `git ls-files -- lib/* LICENSE.md README.md CHANGELOG.md hanami-validations.gemspec`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.3.0"
 
-  spec.add_dependency 'hanami-utils',   '~> 1.3'
-  spec.add_dependency 'dry-validation', '~> 0.11.2', '< 0.12'
+  spec.add_dependency "hanami-utils",   "~> 1.3"
+  spec.add_dependency "dry-validation", "~> 0.11", "< 0.12"
+  spec.add_dependency "dry-logic",      "~> 0.4.2", "< 0.5"
 
-  spec.add_development_dependency 'bundler', '>= 1.6', '< 3'
-  spec.add_development_dependency 'rake',    '~> 12'
-  spec.add_development_dependency 'rspec',   '~> 3.7'
+  spec.add_development_dependency "bundler", ">= 1.6", "< 3"
+  spec.add_development_dependency "rake",    "~> 13"
+  spec.add_development_dependency "rspec",   "~> 3.9"
+  spec.add_development_dependency "rubocop", "0.81" # rubocop 0.81+ removed support for Ruby 2.3
 end

data/lib/hanami-validations.rb

@@ -1 +1,3 @@
-require 'hanami/validations'
+# frozen_string_literal: true
+
+require "hanami/validations"

data/lib/hanami/validations.rb

@@ -1,9 +1,11 @@
-require 'dry-validation'
-require 'hanami/utils/class_attribute'
-require 'hanami/validations/namespace'
-require 'hanami/validations/predicates'
-require 'hanami/validations/inline_predicate'
-require 'set'
+# frozen_string_literal: true
+
+require "dry-validation"
+require "hanami/utils/class_attribute"
+require "hanami/validations/namespace"
+require "hanami/validations/predicates"
+require "hanami/validations/inline_predicate"
+require "set"
 
 Dry::Validation::Messages::Namespaced.configure do |config|
   # rubocop:disable Lint/NestedPercentLiteral
@@ -45,7 +47,7 @@ module Hanami
     # @api private
     #
     # @see http://www.ruby-doc.org/core/Module.html#method-i-included
-    def self.included(base) # rubocop:disable Metrics/MethodLength
+    def self.included(base)
       base.class_eval do
         extend ClassMethods
 
@@ -71,7 +73,7 @@ module Hanami
       #
       # @since 0.6.0
       #
-      # @see http://hanamirb.org/guides/validations/overview/
+      # @see https://guides.hanamirb.org/validations/overview
       #
       # @example Basic Example
       #   require 'hanami/validations'
@@ -95,8 +97,8 @@ module Hanami
       #   result.success? # => false
       #   result.messages # => {:name=>["must be filled"]}
       #   result.output   # => {:name=>""}
-      def validations(&blk) # rubocop:disable Metrics/AbcSize
-        schema_predicates = _predicates_module || __predicates
+      def validations(&blk)
+        schema_predicates = __predicates
 
         base   = _build(predicates: schema_predicates, &_base_rules)
         schema = _build(predicates: schema_predicates, rules: base.rules, &blk)
@@ -152,7 +154,7 @@ module Hanami
       #
       #   result = Signup.new(name: nil).call
       #   result.messages # => { :name => ['must be foo'] }
-      def predicate(name, message: 'is invalid', &blk)
+      def predicate(name, message: "is invalid", &blk)
         _predicates << InlinePredicate.new(name, message, &blk)
       end
 
@@ -261,7 +263,7 @@ module Hanami
       # @since 0.6.0
       # @api private
       def _build(options = {}, &blk)
-        options = { build: false }.merge(options)
+        options = {build: false}.merge(options)
         Dry::Validation.__send__(_schema_type, options, &blk)
       end
 
@@ -285,6 +287,8 @@ module Hanami
           config.messages      = _messages      unless _messages.nil?
           config.messages_file = _messages_path unless _messages_path.nil?
           config.namespace     = namespace
+
+          require "dry/validation/messages/i18n" if config.messages == :i18n
         end
       end
 
@@ -294,15 +298,17 @@ module Hanami
         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
         end
       end
 
       # @since 0.6.0
       # @api private
       def __predicates
-        mod = Module.new { include Hanami::Validations::Predicates }
+        mod = _predicates_module || Module.new { include Hanami::Validations::Predicates }
 
         _predicates.each do |p|
           mod.module_eval do
@@ -315,7 +321,7 @@ module Hanami
 
       # @since 0.6.0
       # @api private
-      def __messages # rubocop:disable Metrics/MethodLength
+      def __messages
         result = _predicates.each_with_object({}) do |p, ret|
           ret[p.name] = p.message
         end
@@ -328,7 +334,7 @@ module Hanami
           def self.extended(base)
             base.instance_eval do
               def __messages
-                Hash[en: { errors: @@__messages }]
+                Hash[en: {errors: @@__messages}]
               end
             end
           end
@@ -337,11 +343,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/form.rb

@@ -1,4 +1,6 @@
-require 'hanami/validations'
+# frozen_string_literal: true
+
+require "hanami/validations"
 
 module Hanami
   module Validations

data/lib/hanami/validations/inline_predicate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hanami
   module Validations
     # Inline predicate

data/lib/hanami/validations/namespace.rb

@@ -1,4 +1,6 @@
-require 'hanami/utils/string'
+# frozen_string_literal: true
+
+require "hanami/utils/string"
 
 module Hanami
   module Validations
@@ -12,19 +14,19 @@ module Hanami
     class Namespace
       # @since 0.6.0
       # @api private
-      SUFFIX = 'Validator'.freeze
+      SUFFIX = "Validator"
 
       # @since 0.6.0
       # @api private
-      SUFFIX_REPLACEMENT = ''.freeze
+      SUFFIX_REPLACEMENT = ""
 
       # @since 0.6.0
       # @api private
-      RUBY_NAMESPACE_SEPARATOR = '/'.freeze
+      RUBY_NAMESPACE_SEPARATOR = "/"
 
       # @since 0.6.0
       # @api private
-      RUBY_NAMESPACE_REPLACEMENT = '.'.freeze
+      RUBY_NAMESPACE_REPLACEMENT = "."
 
       # @since 0.6.0
       # @api private

data/lib/hanami/validations/predicates.rb

@@ -1,5 +1,7 @@
-require 'dry/logic/predicates'
-require 'hanami/utils/class_attribute'
+# frozen_string_literal: true
+
+require "dry/logic/predicates"
+require "hanami/utils/class_attribute"
 
 module Hanami
   module Validations

data/lib/hanami/validations/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Hanami
   module Validations
     # @since 0.1.0
-    VERSION = '1.3.2'.freeze
+    VERSION = "1.3.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-validations
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.7
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0.11'
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.12'
@@ -40,10 +40,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0.11'
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: dry-logic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,28 +90,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.81'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.81'
 description: Validations mixin for Ruby objects and support for Hanami
 email:
 - me@lucaguidi.com
@@ -129,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.2.2
 signing_key: 
 specification_version: 4
 summary: Validations mixin for Ruby objects