dry-validation-matchers 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c5fd64bd7d180697dc6d6618b349a71029ea939c52b446b4411c3b373cb7e43
-  data.tar.gz: f62e21ef82e36bf102092dff264be1931c664e048813c8784405436a4b6ceb11
+  metadata.gz: b0ee4b633e751ffaa7fdafb364f58990e9ebf09a952b87075a77ad36c84eb278
+  data.tar.gz: 2cbeb8982b547830905e1b4e7783e7bad557138a47c0ec5160e25c66d1ac95bc
 SHA512:
-  metadata.gz: 3c0144666861c44c01c0b9fab6e842f9be15a0eace36f8b5e300fb2b9272e49ea069c9a753018dad008a215891befc99e03c53f4ec66933ba90c98c588215d8b
-  data.tar.gz: 1bcf615053e306e858e7852486acb8ae53fe72120d802ea68cd689d24028727d0a1db8ae828dd8beb49b7908ea758e3c093b878b6cb3506670b37a25cc2f2413
+  metadata.gz: d9e3c8cb7a06630dbc433284bb9e8e720a5b80b4ad11b59c7f134e406b5355fef5e7ff1586785d815a83e78b931ac69424ba1ecba9f17b5ead299f408dab8328
+  data.tar.gz: 442e5b9d788d9f01422d4d56d457e65bb98d89360f1dc5133f8550410c183443287bf01944f1448794961c30607e88a8be82af3386429621fc685013f8bdca2e

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.2
+ruby-2.6.3

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.6.2
+  - 2.6.3
 before_install:
   - gem update --system
   - gem install bundler -v 2.0.1

data/CHANGELOG.md

@@ -4,6 +4,11 @@ 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/).
 
+## [1.2.0] - 2019-11-17
+### Added
+- Add support for checking that the macro is used through the method `macro_use?`
+- Updated gem dependency `"dry-validation", "~> 1.3"`
+
 ## [1.1.1] - 2019-04-10
 ### Fixed
 - when `min_size` is set to 1 (and 0 in tests)

data/README.md

@@ -23,25 +23,40 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-RSpec.describe "SomeSchema class", type: [:dry_validation]
+RSpec.describe "Integration with RSpec", type: %i[dry_validation] do
+
   subject(:schema_class) do
-    Class.new(Dry::Validation::Schema) do
-      define! do
+    Class.new(Dry::Validation::Contract) do
+      register_macro(:email) do
+        key.failure('must_be_a_valid_email') if value.is_a?(String) &&
+            !value.match?(/\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i)
+      end
+
+      register_macro(:precision) do |macro:|
+        num = macro.args[0]
+        key.failure("cant_have_more_than_#{num}_decimal_numbers") if value && value.to_s.split('.').last.size > num
+      end
+
+      params do
         required(:username).filled
         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)
+        optional(:decimal_value)
       end
+
+      rule(:email).validate(:email)
+      rule(:decimal_value).validate(precision: 5)
     end
   end
 
   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)) }
+  it { is_expected.to validate(:email, :optional).macro_use?(:email) }
+  it { is_expected.to validate(:decimal_value, :optional).macro_use?(precision: 5) }
 end
 ```
 

data/dry-validation-matchers.gemspec

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

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

@@ -50,7 +50,9 @@ module Dry::Validation::Matchers
       @acceptance = acceptance
       @type = DEFAULT_TYPE
       @value_rules = []
+      @macro_usage_params = []
       @check_filled = false
+      @check_macro = false
     end
 
     def description
@@ -59,6 +61,7 @@ module Dry::Validation::Matchers
 
       validation_details_message = []
       validation_details_message << "filled with #{@type}" if @check_filled
+      validation_details_message << "macro usage `#{@macro_usage_params.to_s}`" if @check_macro
 
       unless validation_details_message.empty?
         @desc << " ("
@@ -76,6 +79,7 @@ module Dry::Validation::Matchers
 
       validation_details_message = []
       validation_details_message << "filled with #{@type}" if @check_filled
+      validation_details_message << "macro usage `#{@macro_usage_params.to_s}`" if @check_macro
 
       unless validation_details_message.empty?
         @desc << " ("
@@ -87,10 +91,10 @@ module Dry::Validation::Matchers
     end
 
     def matches?(schema_or_schema_class)
-      if schema_or_schema_class.is_a?(Dry::Validation::Schema)
+      if schema_or_schema_class.is_a?(Dry::Validation::Contract)
         schema = schema_or_schema_class
       elsif schema_or_schema_class.is_a?(Class) &&
-        schema_or_schema_class.ancestors.include?(Dry::Validation::Schema)
+        schema_or_schema_class.ancestors.include?(Dry::Validation::Contract)
 
         schema = schema_or_schema_class.new
       else
@@ -103,7 +107,8 @@ module Dry::Validation::Matchers
       check_required_or_optional!(schema) &&
         check_filled!(schema) &&
         check_filled_with_type!(schema) &&
-        check_value!(schema)
+        check_value!(schema) &&
+        check_macro_usage!(schema)
     end
 
     def filled(type=:str)
@@ -117,6 +122,12 @@ module Dry::Validation::Matchers
       self
     end
 
+    def macro_use?(macro_params)
+      @check_macro = true
+      @macro_usage_params = macro_params
+      self
+    end
+
     private
 
     def check_required_or_optional!(schema)
@@ -228,6 +239,29 @@ module Dry::Validation::Matchers
       error_when_over && no_error_when_within
     end
 
+    def check_macro_usage!(schema)
+      return true if @macro_usage_params.empty?
+
+      is_present = false
+
+      schema.rules.each do |obj|
+        next if obj.keys.first != @attr
+
+        value = if @macro_usage_params.is_a?(Hash) && obj.macros.flatten.count > 1
+                  obj.macros.to_h.map { |k, v| [k, v.first] }.to_h
+                else
+                  obj.macros.flatten.first
+                end
+
+        if value == @macro_usage_params
+          is_present = true
+          break
+        end
+      end
+
+      is_present
+    end
+
     def type_error_messages
       type_error_messages = []
       TYPE_ERRORS.each_pair do |type, hash|

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

@@ -1,7 +1,7 @@
 module Dry
   module Validation
     module Matchers
-      VERSION = "1.1.1"
+      VERSION = "1.2.0"
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation-matchers
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -111,8 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for dry-validation