dry-validation-matchers 1.0.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 004756acbf477a3129994796ca5466c1c7fc3e95
-  data.tar.gz: fe46b43804e904468b766ba0b8d72ac31392fc76
+SHA256:
+  metadata.gz: fb356fd9e7bd319025961ef39a1ea6d0418de27d0898035b3076bd3b3226e74d
+  data.tar.gz: 5cda89f507dfc43126811c8c14fbb742e3a310f06caae942e8c572df84ad1804
 SHA512:
-  metadata.gz: 5b6b9e7c3fd04dce96acdda9cd9b3657897ae6164b69e94d4bdf4f7e004e46b55e937c5ec644f3d92a5beab37a5f0e35338a8ef3839eeeca651f853180d7598c
-  data.tar.gz: eb402459bfab985909c22f1b0ffed0b81b3597b0e133f8f4f1ec57d47da65a25d8cb20847dece09fea1979f3f7a3090a302b737308fe888fa62ceaf43d54e260
+  metadata.gz: b80ecd94935e51a6cb59458fd27476c12bb76565e1a182325a33e76f5387c52c74f3e3e411a05cec7df184480cddc841187b307bb9fb5e023f0eeea914692a96
+  data.tar.gz: 1299dd2ef1395819995aa17835eeb442452357e36701500893e14dac2551bc01b8ab7beb680527b32b180f1e7d6b48a6632d1642d8f42e20a265373e776f0e52

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec

data/.ruby-version

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

data/CHANGELOG.md

@@ -4,6 +4,28 @@ 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.2] - 2021-06-15
+### Fixed
+- Use long-hand name for types. Not sure when it changed, but the short-hand
+(i.e. `str?`) no longer works
+
+## [1.2.1] - 2019-11-22
+### Fixed
+- Deprecation messages re BigDecimal()
+
+## [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)
+
+## [1.1.0] - 2019-04-10
+### Added
+- `min_size` validation
+
 ## [1.0.0] - 2019-04-04
 ### Added
 - Remove (I know, under "added") activesupport requirement

data/README.md

@@ -1,7 +1,5 @@
 # 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).
 
 ## Installation
@@ -23,25 +21,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))
+        required(:age).filled(:integer)
+        required(:last_name).filled(:string)
         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,8 +30,8 @@ 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", "~> 1.13"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
 end

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

@@ -1,13 +1,13 @@
 module Dry::Validation::Matchers
   class ValidateMatcher
 
-    DEFAULT_TYPE = :str
+    DEFAULT_TYPE = :string
     TYPE_ERRORS = {
-      str: {
+      string: {
         test_value: "str",
         message: "must be a string",
       },
-      int: {
+      integer: {
         test_value: 43,
         message: "must be an integer",
       },
@@ -16,7 +16,7 @@ module Dry::Validation::Matchers
         message: "must be a float",
       },
       decimal: {
-        test_value: BigDecimal.new("41.5"),
+        test_value: BigDecimal("41.5"),
         message: "must be a decimal",
       },
       bool: {
@@ -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,10 +107,11 @@ 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)
+    def filled(type=DEFAULT_TYPE)
       @check_filled = true
       @type = type
       self
@@ -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)
@@ -184,6 +195,31 @@ module Dry::Validation::Matchers
       false
     end
 
+    def check_value_min_size!(schema, rule)
+      predicate = rule[0]
+      min_size = rule[1]
+
+      expected_error_message = "size cannot be less than #{min_size}"
+
+      result = schema.(@attr => "a" * (min_size+1))
+      error_messages = result.errors[@attr]
+      no_error_when_over = error_messages.nil? ||
+        !error_messages.include?(expected_error_message)
+
+      result = schema.(@attr => "a" * (min_size))
+      error_messages = result.errors[@attr]
+      no_error_when_exact = error_messages.nil? ||
+        !error_messages.include?(expected_error_message)
+
+      result = schema.(@attr => "a" * (min_size-1))
+      error_messages = result.errors[@attr]
+      error_when_below = (min_size-1).zero? ||
+        !error_messages.nil? &&
+        error_messages.include?(expected_error_message)
+
+      no_error_when_over && no_error_when_exact && error_when_below
+    end
+
     def check_value_max_size!(schema, rule)
       predicate = rule[0]
       max_size = rule[1]
@@ -203,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.0.0"
+      VERSION = "1.2.2"
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation-matchers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Ramon Tayag
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2021-06-15 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
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,10 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -96,7 +96,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,9 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: RSpec matchers for dry-validation
 test_files: []

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.6.2
-before_install: gem install bundler -v 1.16.2