dry-validation-matchers 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 114a34fb8b5a6e38dd5940013d850f90c143b3ac
-  data.tar.gz: 8de84e039e1f043018ffb97d591c73b65a361abe
+  metadata.gz: c61a21e873808ff9bdeb8207d230b5a97e0cfcb1
+  data.tar.gz: 58a4295128b369931a1bf1e2449a5281f5e85de5
 SHA512:
-  metadata.gz: c9684d7132fce67d1d6933e22b124979fa32f415fa4bcd169d3acba074e4636d870514c676752ba2e6db51d998c0919ef9411f27514bdcefb6f00cf2165c38d3
-  data.tar.gz: f3889efd51bedc92d9b2a8d650f3a9543ed35061dadce9f06cab7b3fbbaf012ecdbe86338dbac2a97ce30c7f19593f03de8bbccee4026049788c7dca434e8328
+  metadata.gz: ca14625ea04518c7ea14c641e6d5339945fda18a7183756906cb82183452ba94b4db58bd379ec8d175c655b3d2b35470e776ccc4f39d63932c65c8216dfaad84
+  data.tar.gz: 02f55fdae5f93a526b34880173f1ad3113a6f08f8d6e0af17d92af5fd0ff98af10cb761bfca9fa8e663555b04ac9127bc81abc7264b438be6d35ba7a7cb09d45

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+ruby-2.4.1

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.0
-before_install: gem install bundler -v 1.13.1
+  - 2.4.1
+before_install: gem install bundler -v 1.16.2

data/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.4.1] - 2018-06-01
+### Fixed
+- [Fix date_time type error message](https://github.com/bloom-solutions/dry-validation-matchers/pull/9)
+- [Fix false positive checks missmatch between type check and other checks](https://github.com/bloom-solutions/dry-validation-matchers/pull/9)
+- [Fix gemspec dependencies context](https://github.com/bloom-solutions/dry-validation-matchers/pull/8)
+- [Fix warning on `@check_filled`](https://github.com/bloom-solutions/dry-validation-matchers/pull/7)
+- Description messages for pass and fail do not leave artifacts if there are no details
+- Make messages consistent with "Subject predicate noun"
+
 ## [0.4.0] - 2016-11-10
 ### Added
 - Add support for checking that the value is included_in

data/README.md

@@ -1,6 +1,6 @@
 # Dry::Validation::Matchers
 
-[![Build Status](https://travis-ci.org/imacchiato/dry-validation-matchers.svg?branch=master)](https://travis-ci.org/imacchiato/dry-validation-matchers)
+[![Build Status](https://travis-ci.org/bloom-solutions/dry-validation-matchers.svg?branch=master)](https://travis-ci.org/bloom-solutions/dry-validation-matchers)
 
 RSpec matchers for [Dry::Validation](dry-rb.org/gems/dry-validation).
 
@@ -31,6 +31,7 @@ RSpec.describe "SomeSchema class", type: [:dry_validation]
         required(:first_name)
         required(:age).filled(:int?)
         required(:last_name).filled(:str?)
+        required(:rank).value(included_in?: %w(sarge chief))
         optional(:mobile).filled
         optional(:email)
       end
@@ -40,6 +41,7 @@ RSpec.describe "SomeSchema class", type: [:dry_validation]
   it { is_expected.to validate(:username, :required).filled }
   it { is_expected.to validate(:mobile, :optional).filled }
   it { is_expected.to validate(:email, :optional) }
+  it { is_expected.to validate(:rank, :optional).value(included_in: %w(sarge chief)) }
 end
 ```
 
@@ -53,7 +55,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/imacchiato/dry-validation-matchers. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/bloom-solutions/dry-validation-matchers. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/dry-validation-matchers.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "activesupport"
-  spec.add_development_dependency "dry-validation"
+  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "dry-validation"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/dry/validation/matchers.rb

@@ -1,5 +1,6 @@
 require "active_support/core_ext/object"
 require "active_support/core_ext/object/blank"
+require "securerandom"
 require "dry-validation"
 require "dry/validation/matchers/version"
 require "dry/validation/matchers/validate_matcher"

data/lib/dry/validation/matchers/validate_matcher.rb

@@ -33,7 +33,7 @@ module Dry::Validation::Matchers
       },
       date_time: {
         test_value: DateTime.new(2011, 5, 1, 2, 3, 4),
-        message: "must be a date_time",
+        message: "must be a date time",
       },
       array: {
         test_value: [1, 3, 5],
@@ -50,25 +50,39 @@ module Dry::Validation::Matchers
       @acceptance = acceptance
       @type = DEFAULT_TYPE
       @value_rules = []
+      @check_filled = false
     end
 
     def description
       @desc = []
-      @desc << "validation for #{@acceptance} `#{@attr}`"
-      @desc << " ("
-      @desc << "filled with #{@type}" if @check_filled
-      @desc << ")"
+      @desc << "validate for #{@acceptance} `#{@attr}`"
+
+      validation_details_message = []
+      validation_details_message << "filled with #{@type}" if @check_filled
+
+      unless validation_details_message.empty?
+        @desc << " ("
+        @desc << validation_details_message.join("; ")
+        @desc << ")"
+      end
+
       @desc << " exists"
       @desc.join
     end
 
     def failure_message
       @desc = []
-      @desc << "validation for #{@acceptance} `#{@attr}`"
-      @desc << " ("
-      @desc << "filled with #{@type}" if @check_filled
-      @desc << ")"
-      @desc << " is lacking"
+      @desc << "be missing validation for #{@acceptance} `#{@attr}`"
+
+      validation_details_message = []
+      validation_details_message << "filled with #{@type}" if @check_filled
+
+      unless validation_details_message.empty?
+        @desc << " ("
+        @desc << validation_details_message.join("; ")
+        @desc << ")"
+      end
+
       @desc.join
     end
 
@@ -110,6 +124,8 @@ module Dry::Validation::Matchers
       when :required
         result = schema.({})
         error_messages = result.errors[@attr]
+        # NOTE should support required to specify but not fillup. Must wait for
+        # https://github.com/dry-rb/dry-validation/issues/251
         error_messages.present? && error_messages.include?("is missing")
       else
         result = schema.({})
@@ -133,9 +149,12 @@ module Dry::Validation::Matchers
       result = schema.(@attr => TYPE_ERRORS[@type][:test_value])
       error_messages = result.errors[@attr]
       return true if error_messages.nil?
-      allowed_errors = [TYPE_ERRORS[@type][:message]] & error_messages
-      unallowed_errors = error_messages - allowed_errors
-      unallowed_errors.empty?
+      # Message not allowed are all the type_error_messages that are not the
+      # expected type. Any other message is accepted (like "size cannot be less than 20")
+      unallowed_errors = type_error_messages - [TYPE_ERRORS[@type][:message]]
+      # We check if error_messages intersect with the unallowed_errors.
+      # if intersection is empty, then the check is passed.
+      (error_messages & unallowed_errors).empty?
     end
 
     def check_value!(schema)
@@ -165,5 +184,12 @@ module Dry::Validation::Matchers
       false
     end
 
+    def type_error_messages
+      type_error_messages = []
+      TYPE_ERRORS.each_pair do |type, hash|
+        type_error_messages << hash[:message]
+      end
+      type_error_messages
+    end
   end
 end

data/lib/dry/validation/matchers/version.rb

@@ -1,7 +1,7 @@
 module Dry
   module Validation
     module Matchers
-      VERSION = "0.4.0"
+      VERSION = "0.4.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation-matchers
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2018-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,7 +17,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -31,7 +31,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 description: RSpec matchers for dry-validation
 email:
 - ramon.tayag@gmail.com
@@ -126,9 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for dry-validation
 test_files: []
-has_rdoc: