dry-validation-matchers 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e683c7835e3bdb494ff818f193966dc2a8cc4db3
-  data.tar.gz: 3255c6fec6c3ed488f14d66ca13af1edf2c07919
+  metadata.gz: 114a34fb8b5a6e38dd5940013d850f90c143b3ac
+  data.tar.gz: 8de84e039e1f043018ffb97d591c73b65a361abe
 SHA512:
-  metadata.gz: 4e59cf54eb8b8377fcb5c15caa216bd6fe6526d9b05174263bf8bc4e2df934114743a238cd107b6538ff08b416b2f190b3f84fc8bc0d5d412bb305006c2f83e5
-  data.tar.gz: 4b6985fbfe900d657f0f9816b79e36b3c1ffa50a5577845fb28d967f79ae6faaaadbdfa2bf3051282899de0ec51ff9eaa256f26b8871bbb976dbacfcb40dcde8
+  metadata.gz: c9684d7132fce67d1d6933e22b124979fa32f415fa4bcd169d3acba074e4636d870514c676752ba2e6db51d998c0919ef9411f27514bdcefb6f00cf2165c38d3
+  data.tar.gz: f3889efd51bedc92d9b2a8d650f3a9543ed35061dadce9f06cab7b3fbbaf012ecdbe86338dbac2a97ce30c7f19593f03de8bbccee4026049788c7dca434e8328

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.0] - 2016-11-10
+### Added
+- Add support for checking that the value is included_in
+
 ## [0.3.0] - 2016-11-09
 ### Added
 - Add support for float, decimal, bool, date, time, date_time, array, hash

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

@@ -49,6 +49,7 @@ module Dry::Validation::Matchers
       @attr = attr
       @acceptance = acceptance
       @type = DEFAULT_TYPE
+      @value_rules = []
     end
 
     def description
@@ -87,7 +88,8 @@ module Dry::Validation::Matchers
 
       check_required_or_optional!(schema) &&
         check_filled!(schema) &&
-        check_filled_with_type!(schema)
+        check_filled_with_type!(schema) &&
+        check_value!(schema)
     end
 
     def filled(type=:str)
@@ -96,6 +98,11 @@ module Dry::Validation::Matchers
       self
     end
 
+    def value(value_rules)
+      @value_rules = value_rules
+      self
+    end
+
     private
 
     def check_required_or_optional!(schema)
@@ -131,5 +138,32 @@ module Dry::Validation::Matchers
       unallowed_errors.empty?
     end
 
+    def check_value!(schema)
+      @value_rules.map do |rule|
+        method_name = :"check_value_#{rule[0]}!"
+        return true if !self.class.private_method_defined?(method_name)
+        send(method_name, schema, rule)
+      end.none? {|result| result == false}
+    end
+
+    def check_value_included_in!(schema, rule)
+      predicate = rule[0]
+      allowed_values = rule[1]
+
+      invalid_for_expected_values = allowed_values.map do |v|
+        result = schema.(@attr => v)
+        error_messages = result.errors[@attr]
+        error_messages.present? && error_messages.grep(/must be one of/).any?
+      end.all? {|result| result == true}
+      return false if invalid_for_expected_values
+
+      value_outside_required = allowed_values.sample.to_s + SecureRandom.hex(2)
+      result = schema.(@attr => value_outside_required)
+      error_messages = result.errors[@attr]
+      return false if error_messages.nil?
+      return true if error_messages.grep(/must be one of/).any?
+      false
+    end
+
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation-matchers
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport