dry-validation 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad0f90e5090baa3afaf8d120f05f35f1429f3854
-  data.tar.gz: 6c36b63d3975d7a60daed91545fac2e06547a808
+  metadata.gz: edf13779b21ef1f3313847f3dfc4678e039d8352
+  data.tar.gz: f9e381733562194e590520528fdb4525958e5fd0
 SHA512:
-  metadata.gz: 76f9702473cf3f94f5254c965b29de19df3c050a05fe35c3c4b0e04efc0b67ed71604b698a6de8dd47bf76c12390637ab02931f9f706264f3fbdbf99c3199c58
-  data.tar.gz: 56f8d8da5d7ab1aadf7b46f4b445c6a4f19a83a5e6f49ceedab84481aa9d503781713d59d6a8075932f763dab424df040767fb6db750f5ca04393160f630c3d3
+  metadata.gz: b746e81131b3020d929c91aef54a77117608e13ab86f090a7c3eed3447b65101075ba87f46c5bb738f80fae0e8dee55ff47ec19dd1a21656673ee538c23fe62a
+  data.tar.gz: f0fe7d3bdaff33e2218998f8ae89cf56d484346fcd2393936640f9b2c720df38cc8a017d05ab216a418fa125ab36abe04042a53b85d415c3e3388815e90f643f

data/.travis.yml

@@ -1,22 +1,25 @@
 language: ruby
-sudo: false
+dist: trusty
+sudo: required
 cache: bundler
-bundler_args: --without console benchmarks
+bundler_args: --without benchmarks tools
+after_success:
+  - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
 script:
   - bundle exec rake
 rvm:
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - rbx-2
-  - jruby-9.1.1.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - jruby-9.1.5.0
+  - rbx-3
 env:
   global:
+    - COVERAGE=true
     - JRUBY_OPTS='--dev -J-Xmx1024M'
 matrix:
   allow_failures:
-    - rvm: rbx-2
-
+    - rvm: rbx-3
 notifications:
   email: false
   webhooks:

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# v0.10.4 2016-12-03
+
+### Fixed
+
+* Updated to dry-core >= 0.2.1 (ruby warnings are gone) (flash-gordon)
+* `format?` predicate is excluded from hints (solnic)
+
+### Changed
+
+* `version` file is now required by default (georgemillo)
+
+[Compare v0.10.3...v0.10.4](https://github.com/dryrb/dry-validation/compare/v0.10.3...v0.10.4)
+
 # v0.10.3 2016-09-27
 
 ### Fixed
@@ -32,7 +45,7 @@
 * Support for retrieving hint messages exclusively via `schema.(input).hints` (solnic)
 * Support for opt-in extensions loaded via `Dry::Validation.load_extensions(:my_ext)` (flash-gordon)
 * Add `:monads` extension which transforms a result instance to `Either` monad, `schema.(input).to_either` (flash-gordon)
-* Add `dry-struct` integration via an extension activated by `Dry::Validation.load_extension(:struct)` (flash-gordon)
+* Add `dry-struct` integration via an extension activated by `Dry::Validation.load_extensions(:struct)` (flash-gordon)
 
 ### Fixed
 

data/Gemfile

@@ -4,9 +4,12 @@ gemspec
 
 group :test do
   gem 'i18n', require: false
-  gem 'codeclimate-test-reporter', platform: :rbx
+  platform :mri do
+    gem 'codeclimate-test-reporter', require: false
+    gem 'simplecov', require: false
+  end
   gem 'dry-monads', require: false
-  gem 'dry-struct', github: 'dry-rb/dry-struct', branch: 'master', require: false
+  gem 'dry-struct', require: false
 end
 
 group :tools do

data/dry-validation.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
   spec.add_runtime_dependency 'dry-logic', '~> 0.4', '>= 0.4.0'
   spec.add_runtime_dependency 'dry-types', '~> 0.9', '>= 0.9.0'
-  spec.add_runtime_dependency 'dry-core', '~> 0.1'
+  spec.add_runtime_dependency 'dry-core', '~> 0.2', '>= 0.2.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/dry/validation.rb

@@ -2,14 +2,12 @@ require 'dry-equalizer'
 require 'dry-configurable'
 require 'dry-container'
 require 'dry/core/extensions'
-
-require 'dry/validation/schema'
-require 'dry/validation/schema/form'
-require 'dry/validation/schema/json'
+require 'dry/core/constants'
 
 module Dry
   module Validation
     extend Dry::Core::Extensions
+    include Dry::Core::Constants
 
     MissingMessageError = Class.new(StandardError)
     InvalidSchemaError = Class.new(StandardError)
@@ -41,4 +39,8 @@ module Dry
   end
 end
 
+require 'dry/validation/schema'
+require 'dry/validation/schema/form'
+require 'dry/validation/schema/json'
 require 'dry/validation/extensions'
+require 'dry/validation/version'

data/lib/dry/validation/message.rb

@@ -1,9 +1,6 @@
-require 'dry/core/constants'
-
 module Dry
   module Validation
     class Message
-      include Core::Constants
       include Dry::Equalizer(:predicate, :path, :text, :options)
 
       attr_reader :predicate, :path, :text, :rule, :args, :options

data/lib/dry/validation/message_compiler.rb

@@ -1,4 +1,3 @@
-require 'dry/core/constants'
 require 'dry/validation/message'
 require 'dry/validation/message_set'
 require 'dry/validation/message_compiler/visitor_opts'
@@ -6,8 +5,6 @@ require 'dry/validation/message_compiler/visitor_opts'
 module Dry
   module Validation
     class MessageCompiler
-      include Core::Constants
-
       attr_reader :messages, :options, :locale, :default_lookup_options
 
       EMPTY_OPTS = VisitorOpts.new

data/lib/dry/validation/message_compiler/visitor_opts.rb

@@ -1,12 +1,10 @@
-require 'dry/core/constants'
-
 module Dry
   module Validation
     class MessageCompiler
       class VisitorOpts < Hash
         def self.new
           opts = super
-          opts[:path] = Core::Constants::EMPTY_ARRAY
+          opts[:path] = EMPTY_ARRAY
           opts[:rule] = nil
           opts[:message_type] = :failure
           opts

data/lib/dry/validation/message_set.rb

@@ -1,12 +1,14 @@
-require 'dry/core/constants'
-
 module Dry
   module Validation
     class MessageSet
-      include Core::Constants
       include Enumerable
 
-      HINT_EXCLUSION = %i(key? filled? none? bool? str? int? float? decimal? date? date_time? time? hash? array?).freeze
+      HINT_EXCLUSION = %i(
+        key? filled? none? bool?
+        str? int? float? decimal?
+        date? date_time? time? hash?
+        array? format?
+      ).freeze
 
       attr_reader :messages, :failures, :hints, :paths, :placeholders, :options
 

data/lib/dry/validation/predicate_registry.rb

@@ -1,11 +1,8 @@
-require 'dry/core/constants'
 require 'dry/logic/rule/predicate'
 
 module Dry
   module Validation
     class PredicateRegistry
-      include Core::Constants
-
       attr_reader :predicates
       attr_reader :external
 

data/lib/dry/validation/result.rb

@@ -1,9 +1,6 @@
-require 'dry/core/constants'
-
 module Dry
   module Validation
     class Result
-      include Core::Constants
       include Dry::Equalizer(:output, :errors)
       include Enumerable
 

data/lib/dry/validation/schema/dsl.rb

@@ -6,7 +6,6 @@ module Dry
     class Schema
       class DSL < BasicObject
         include ::Dry::Validation::Deprecations
-        include ::Dry::Core::Constants
 
         attr_reader :name, :registry, :rules, :checks, :parent, :options
 

data/lib/dry/validation/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Validation
-    VERSION = '0.10.3'.freeze
+    VERSION = '0.10.4'.freeze
   end
 end

data/spec/integration/form/predicates/format_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe 'Predicates: Format' do
       let(:input) { {} }
 
       it 'is not successful' do
-        expect(result).to be_failing ['is missing', 'is in invalid format']
+        expect(result).to be_failing ['is missing']
       end
     end
 
@@ -26,7 +26,7 @@ RSpec.describe 'Predicates: Format' do
       let(:input) { { 'foo' => nil } }
 
       it 'is not successful' do
-        expect(result).to be_failing ['must be a string', 'is in invalid format']
+        expect(result).to be_failing ['must be a string']
       end
     end
 
@@ -42,7 +42,7 @@ RSpec.describe 'Predicates: Format' do
       let(:input) { { 'foo' => { 'a' => '1' } } }
 
       it 'raises error' do
-        expect(result).to be_failing ['must be a string', 'is in invalid format']
+        expect(result).to be_failing ['must be a string']
       end
     end
 
@@ -82,7 +82,7 @@ RSpec.describe 'Predicates: Format' do
       let(:input) { { 'foo' => nil } }
 
       it 'is not successful' do
-        expect(result).to be_failing ["must be a string", "is in invalid format"]
+        expect(result).to be_failing ['must be a string']
       end
     end
 
@@ -98,7 +98,7 @@ RSpec.describe 'Predicates: Format' do
       let(:input) { { 'foo' => { 'a' => '1' } } }
 
       it 'raises error' do
-        expect(result).to be_failing ['must be a string', 'is in invalid format']
+        expect(result).to be_failing ['must be a string']
       end
     end
 
@@ -132,7 +132,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { {} }
 
           it 'is not successful' do
-            expect(result).to be_failing ['is missing', 'is in invalid format']
+            expect(result).to be_failing ['is missing']
           end
         end
 
@@ -140,7 +140,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => nil } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be a string', 'is in invalid format']
+            expect(result).to be_failing ['must be a string']
           end
         end
 
@@ -156,7 +156,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => { 'a' => '1' } } }
 
           it 'raises error' do
-            expect(result).to be_failing ['must be a string', 'is in invalid format']
+            expect(result).to be_failing ['must be a string']
           end
         end
 
@@ -188,7 +188,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { {} }
 
           it 'is not successful' do
-            expect(result).to be_failing ['is missing', 'is in invalid format']
+            expect(result).to be_failing ['is missing']
           end
         end
 
@@ -196,7 +196,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => nil } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be filled', 'is in invalid format']
+            expect(result).to be_failing ['must be filled']
           end
         end
 
@@ -204,7 +204,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => '' } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be filled', 'is in invalid format']
+            expect(result).to be_failing ['must be filled']
           end
         end
 
@@ -212,7 +212,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => { 'a' => '1' } } }
 
           it 'raises error' do
-            expect(result).to be_failing ["must be a string", "is in invalid format"]
+            expect(result).to be_failing ['must be a string']
           end
         end
 
@@ -244,7 +244,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { {} }
 
           it 'is not successful' do
-            expect(result).to be_failing ['is missing', 'is in invalid format']
+            expect(result).to be_failing ['is missing']
           end
         end
 
@@ -267,7 +267,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => { 'a' => '1' } } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be a string', 'is in invalid format']
+            expect(result).to be_failing ['must be a string']
           end
         end
 
@@ -309,7 +309,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => nil } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be a string', 'is in invalid format']
+            expect(result).to be_failing ['must be a string']
           end
         end
 
@@ -325,7 +325,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => { 'a' => '1' } } }
 
           it 'raises error' do
-            expect(result).to be_failing ['must be a string', 'is in invalid format']
+            expect(result).to be_failing ['must be a string']
           end
         end
 
@@ -365,7 +365,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => nil } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be filled', 'is in invalid format']
+            expect(result).to be_failing ['must be filled']
           end
         end
 
@@ -373,7 +373,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => '' } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be filled', 'is in invalid format']
+            expect(result).to be_failing ['must be filled']
           end
         end
 
@@ -381,7 +381,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => { 'a' => '1' } } }
 
           it 'raises error' do
-            expect(result).to be_failing ['must be a string', 'is in invalid format']
+            expect(result).to be_failing ['must be a string']
           end
         end
 
@@ -437,7 +437,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { 'foo' => { 'a' => '1' } } }
 
           it 'raises error' do
-            expect(result).to be_failing ['must be a string', 'is in invalid format']
+            expect(result).to be_failing ['must be a string']
           end
         end
 

data/spec/integration/hints_spec.rb

@@ -116,6 +116,19 @@ RSpec.describe 'Validation hints' do
     end
   end
 
+  context 'with a format? predicate' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:name).value(size?: 2, format?: /xy/)
+      end
+    end
+
+    it 'skips hints' do
+      expect(schema.(name: 'x').messages[:name]).to_not include('is in invalid format')
+      expect(schema.(name: 'ab').messages[:name]).to include('is in invalid format')
+    end
+  end
+
   context 'when the message uses input value' do
     subject(:schema) do
       Dry::Validation.Schema do

data/spec/integration/schema/predicates/format_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe 'Predicates: Format' do
       let(:input) { {} }
 
       it 'is not successful' do
-        expect(result).to be_failing ['is missing', 'is in invalid format']
+        expect(result).to be_failing ['is missing']
       end
     end
 
@@ -132,7 +132,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { {} }
 
           it 'is not successful' do
-            expect(result).to be_failing ['is missing', 'is in invalid format']
+            expect(result).to be_failing ['is missing']
           end
         end
 
@@ -188,7 +188,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { {} }
 
           it 'is not successful' do
-            expect(result).to be_failing ['is missing', 'is in invalid format']
+            expect(result).to be_failing ['is missing']
           end
         end
 
@@ -196,7 +196,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { foo: nil } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be filled', 'is in invalid format']
+            expect(result).to be_failing ['must be filled']
           end
         end
 
@@ -204,7 +204,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { foo: '' } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be filled', 'is in invalid format']
+            expect(result).to be_failing ['must be filled']
           end
         end
 
@@ -244,7 +244,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { {} }
 
           it 'is not successful' do
-            expect(result).to be_failing ['is missing', 'is in invalid format']
+            expect(result).to be_failing ['is missing']
           end
         end
 
@@ -366,7 +366,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { foo: nil } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be filled', 'is in invalid format']
+            expect(result).to be_failing ['must be filled']
           end
         end
 
@@ -374,7 +374,7 @@ RSpec.describe 'Predicates: Format' do
           let(:input) { { foo: '' } }
 
           it 'is not successful' do
-            expect(result).to be_failing ['must be filled', 'is in invalid format']
+            expect(result).to be_failing ['must be filled']
           end
         end
 

data/spec/spec_helper.rb

@@ -1,14 +1,14 @@
-# encoding: utf-8
+if ENV['COVERAGE'] == 'true' && RUBY_ENGINE == 'ruby' && RUBY_VERSION == '2.3.1'
+  require "simplecov"
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
+end
 
 begin
   require 'byebug'
 rescue LoadError; end
 
-if RUBY_ENGINE == "rbx"
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-end
-
 require 'dry-validation'
 require 'dry/core/constants'
 require 'ostruct'
@@ -19,7 +19,6 @@ Dir[SPEC_ROOT.join('shared/**/*.rb')].each(&method(:require))
 Dir[SPEC_ROOT.join('support/**/*.rb')].each(&method(:require))
 
 include Dry::Validation
-include Dry::Core::Constants
 
 module Types
   include Dry::Types.module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -125,14 +125,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement