dry-validation 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c372ced33f2c8865c3ecac3fe917610dc414d89
-  data.tar.gz: 50e61628de4b84caf57bcc874fbf74a4ba3925b8
+  metadata.gz: 2a2bb0a43d4bd22192529a1b75e0bdb5d9da603f
+  data.tar.gz: dfd9286f07480dc94fbfbdcd6ae1007a8cfefe97
 SHA512:
-  metadata.gz: 2a79910c2cd2e54c8076ca4b218976d972d06f99db6063005d57d7c9e47f96433bd380a53c4504a76c41cc4a810706fb383e3c298c2122416578276626b1fa2b
-  data.tar.gz: d731cd50af1a2b58ac03baccb1706fb2cb66acbb98ae4931f363d19fb13eebada0b766d8030a3404efe5a30d43264805a69321518467777c3a8f639b2f0e5596
+  metadata.gz: bf52dea16b06ef16dee99c65dd611c044d044be0bb3df0dcf80974fb01c507764cc2ead67a87f8ee0ad215b2a0983f3fc84954cfdd1108d9a4c9d380f1bdda0f
+  data.tar.gz: 8bb21ccf8a81b588116d493d2f724594e77db390532aab10bada0ec4cb224d1ce504d17cbfce23e63f51edf166ad0268665e458e140b98f2c306251be751800a

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# v0.7.3 2016-03-30
+
+### Added
+
+* Support for inferring rules from constrained type (coop + solnic)
+* Support for inferring nested schemas from `Dry::Types::Struct` classes (coop)
+* Support for `number?` predicate (solnic)
+
+### Fixed
+
+* Creating a nested schema properly sets full path to nested data structure (solnic)
+* Error message for `empty?` predicate is now correct (jodosha)
+
+### Internal
+
+* Switch from `thread_safe` to `concurrent` (joevandyk)
+
+[Compare v0.7.2...v0.7.3](https://github.com/dryrb/dry-validation/compare/v0.7.2...v0.7.3)
+
 # v0.7.2 2016-03-28
 
 ### Added

data/config/errors.yml

@@ -2,7 +2,7 @@ en:
   errors:
     array?: "must be an array"
 
-    empty?: "cannot be empty"
+    empty?: "must be empty"
 
     exclusion?: "must not be one of: %{list}"
 
@@ -12,6 +12,8 @@ en:
 
     format?: "is in invalid format"
 
+    number?: "must be a number"
+
     gt?: "must be greater than %{num}"
 
     gteq?: "must be greater than or equal to %{num}"

data/dry-validation.gemspec

@@ -15,10 +15,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1', '>= 0.1.3'
   spec.add_runtime_dependency 'dry-container', '~> 0.2', '>= 0.2.8'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'dry-logic', '~> 0.2', '>= 0.2.1'
+  spec.add_runtime_dependency 'dry-logic', '~> 0.2', '>= 0.2.2'
   spec.add_runtime_dependency 'dry-types', '~> 0.6', '>= 0.6.0'
 
   spec.add_development_dependency 'bundler'

data/lib/dry/validation/hint_compiler.rb

@@ -24,7 +24,7 @@ module Dry
       EXCLUDED = [:none?, :filled?, :key?].freeze
 
       def self.cache
-        @cache ||= ThreadSafe::Cache.new
+        @cache ||= Concurrent::Map.new
       end
 
       def initialize(messages, options = {})
@@ -114,6 +114,10 @@ module Dry
         DEFAULT_RESULT
       end
 
+      def visit_type(node)
+        visit(node.rule.to_ast)
+      end
+
       private
 
       def merge(result)

data/lib/dry/validation/input_processor_compiler.rb

@@ -24,6 +24,14 @@ module Dry
         send(:"visit_#{node[0]}", node[1], *args)
       end
 
+      def visit_type(type, *args)
+        if type.is_a?(Types::Constructor)
+          [:constructor, [type.primitive, type.fn]]
+        else
+          DEFAULT_TYPE_NODE
+        end
+      end
+
       def visit_schema(node, *args)
         hash_node(node.input_processor_ast(identifier))
       end
@@ -43,7 +51,7 @@ module Dry
           if result.size == 1
             result.first
           else
-            (result - self.class::DEFAULT_TYPE_NODE).first
+            (result - self.class::DEFAULT_TYPE_NODE).last
           end
         end
       end
@@ -70,7 +78,7 @@ module Dry
         array_node(visit(node, *args))
       end
 
-      def visit_predicate(node, *args)
+      def visit_predicate(node, *)
         id, args = node
 
         if id == :key?

data/lib/dry/validation/input_processor_compiler/form.rb

@@ -11,7 +11,9 @@ module Dry
         decimal?: 'form.decimal',
         date?: 'form.date',
         date_time?: 'form.date_time',
-        time?: 'form.time'
+        time?: 'form.time',
+        hash?: 'form.hash',
+        array?: 'form.array'
       }.freeze
 
       CONST_MAP = {

data/lib/dry/validation/input_processor_compiler/sanitizer.rb

@@ -11,7 +11,9 @@ module Dry
         decimal?: 'decimal',
         date?: 'date',
         date_time?: 'date_time',
-        time?: 'time'
+        time?: 'time',
+        hash?: 'hash',
+        array?: 'array'
       }.freeze
 
       CONST_MAP = {

data/lib/dry/validation/messages/abstract.rb

@@ -1,5 +1,5 @@
 require 'pathname'
-require 'thread_safe/cache'
+require 'concurrent/map'
 
 module Dry
   module Validation
@@ -36,7 +36,7 @@ module Dry
         )
 
         def self.cache
-          @cache ||= ThreadSafe::Cache.new { |h, k| h[k] = ThreadSafe::Cache.new }
+          @cache ||= Concurrent::Map.new { |h, k| h[k] = Concurrent::Map.new }
         end
 
         attr_reader :config

data/lib/dry/validation/result.rb

@@ -10,6 +10,7 @@ module Dry
       attr_reader :hint_compiler
 
       alias_method :to_hash, :output
+      alias_method :to_h, :output # for MRI 2.0, remove it when drop support
 
       EMPTY_MESSAGES = {}.freeze
 

data/lib/dry/validation/schema.rb

@@ -47,13 +47,17 @@ module Dry
 
       def self.create_class(target, other = nil, &block)
         klass =
-          if other
+          if other.is_a?(self)
             Class.new(other.class)
+          elsif other.is_a?(Class) && other < Types::Struct
+            Validation.Schema(parent: target, build: false) do
+              other.schema.each { |attr, type| key(attr).required(type) }
+            end
           else
             Validation.Schema(target.schema_class, parent: target, build: false, &block)
           end
 
-        klass.config.path = [target.name] if other
+        klass.config.path = target.path if other
         klass.config.input_processor = :noop
 
         klass

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

@@ -110,8 +110,10 @@ module Dry
           node =
             if predicate.is_a?(::Symbol)
               [target.type, [name, [:predicate, [predicate, args]]]]
-            elsif predicate.is_a?(Types::Constrained)
-              [target.type, [name, predicate.rule.to_ast]]
+            elsif predicate.respond_to?(:rule)
+              [target.type, [name, [:type, predicate]]]
+            elsif predicate.is_a?(::Class) && predicate < ::Dry::Types::Struct
+              [target.type, [name, [:schema, Schema.create_class(target, predicate)]]]
             else
               [target.type, [name, predicate.to_ast]]
             end

data/lib/dry/validation/schema_compiler.rb

@@ -33,6 +33,10 @@ module Dry
         deps, other = node
         Guard.new(visit(other), deps)
       end
+
+      def visit_type(type)
+        type.rule
+      end
     end
   end
 end

data/lib/dry/validation/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Validation
-    VERSION = '0.7.2'.freeze
+    VERSION = '0.7.3'.freeze
   end
 end

data/spec/integration/error_compiler_spec.rb

@@ -129,7 +129,7 @@ RSpec.describe Dry::Validation::ErrorCompiler do
           [:input, [:tags, [:result, [nil, [:val, [:predicate, [:empty?, []]]]]]]]
         )
 
-        expect(msg).to eql(tags: ['cannot be empty'])
+        expect(msg).to eql(tags: ['must be empty'])
       end
     end
 

data/spec/integration/schema/form_spec.rb

@@ -9,11 +9,9 @@ RSpec.describe Dry::Validation::Schema::Form, 'defining a schema' do
         key(:city).required
         key(:street).required
 
-        key(:loc) do
-          hash? do
-            key(:lat).required(:float?)
-            key(:lng).required(:float?)
-          end
+        key(:loc).schema do
+          key(:lat).required(:float?)
+          key(:lng).required(:float?)
         end
       end
 
@@ -123,7 +121,7 @@ RSpec.describe Dry::Validation::Schema::Form, 'defining a schema' do
   describe 'with nested schema in a high-level rule' do
     subject(:schema) do
       Dry::Validation.Form do
-        key(:address).maybe
+        key(:address).maybe(:hash?)
 
         key(:delivery).required(:bool?)
 
@@ -144,17 +142,21 @@ RSpec.describe Dry::Validation::Schema::Form, 'defining a schema' do
       Object.send(:remove_const, :AddressSchema)
     end
 
-    it 'applies nested form schema' do
+    it 'succeeds when nested form schema succeeds' do
       result = schema.(delivery: '1', address: { city: 'NYC', zipcode: '123' })
       expect(result).to be_success
+    end
+
+    it 'does not apply schema when there is no match' do
+      result = schema.(delivery: '0', address: nil)
+      expect(result).to be_success
+    end
 
+    it 'fails when nested schema fails' do
       result = schema.(delivery: '1', address: { city: 'NYC', zipcode: 'foo' })
       expect(result.messages).to eql(
         address: { zipcode: ['must be an integer'] }
       )
-
-      result = schema.(delivery: '0', address: nil)
-      expect(result).to be_success
     end
   end
 end

data/spec/integration/schema/numbers_spec.rb

@@ -0,0 +1,19 @@
+RSpec.describe Dry::Validation::Schema do
+  subject(:schema) do
+    Dry::Validation.Schema do
+      key(:age).required(:number?, :int?)
+    end
+  end
+
+  it 'passes when value is a number and an int' do
+    expect(schema.(age: 132)).to be_success
+  end
+
+  it 'fails when value is not a number' do
+    expect(schema.(age: 'ops').messages).to eql(age: ['must be a number'])
+  end
+
+  it 'fails when value is not an integer' do
+    expect(schema.(age: 1.0).messages).to eql(age: ['must be an integer'])
+  end
+end

data/spec/integration/schema/using_types_spec.rb

@@ -3,27 +3,91 @@ RSpec.describe Dry::Validation::Schema, 'defining schema using dry types' do
     Dry::Validation.Schema do
       key(:email).required(Email)
       key(:age).maybe(Age)
+      key(:country).required(Country)
+      optional(:admin).maybe(AdminBit)
     end
   end
 
   before do
     Email = Dry::Types['strict.string']
     Age = Dry::Types['strict.int'].constrained(gt: 18)
+    Country = Dry::Types['strict.string'].enum('Australia', 'Poland')
+    AdminBit = Dry::Types['strict.bool']
   end
 
   after do
     Object.send(:remove_const, :Email)
     Object.send(:remove_const, :Age)
+    Object.send(:remove_const, :Country)
+    Object.send(:remove_const, :AdminBit)
   end
 
   it 'passes when input is valid' do
-    expect(schema.(email: 'jane@doe', age: 19)).to be_success
-    expect(schema.(email: 'jane@doe', age: nil)).to be_success
+    expect(schema.(email: 'jane@doe', age: 19, country: 'Australia')).to be_success
+    expect(schema.(email: 'jane@doe', age: nil, country: 'Poland')).to be_success
   end
 
   it 'fails when input is not valid' do
-    expect(schema.(email: '', age: 19)).to_not be_success
+    expect(schema.(email: '', age: 19, country: 'New Zealand')).to_not be_success
     expect(schema.(email: 'jane@doe', age: 17)).to_not be_success
     expect(schema.(email: 'jane@doe', age: '19')).to_not be_success
   end
+
+  it 'correctly responds to messages' do
+    expect(schema.({}).messages).to eq(
+      age: ["is missing", "must be greater than 18"],
+      country: ["is missing", "must be one of: Australia, Poland"],
+      email: ["is missing", "must be String"],
+    )
+  end
+
+  it 'fails when sum-type rule did not pass' do
+    expect(schema.(email: 'jane@doe', age: 19, country: 'Australia', admin: 'foo').messages).to eql(
+      admin: ['must be FalseClass', 'must be TrueClass']
+    )
+  end
+
+  context "structs" do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        key(:person).required(Person)
+      end
+    end
+
+    class Name < Dry::Types::Value
+      attribute :given_name, Dry::Types['strict.string']
+      attribute :family_name, Dry::Types['strict.string']
+    end
+
+    class Person < Dry::Types::Value
+      attribute :name, Name
+    end
+
+    it 'handles nested structs' do
+      expect(schema.(person: { name: { given_name: 'Tim', family_name: 'Cooper' } })).to be_success
+    end
+
+    it 'fails when input is not valid' do
+      expect(schema.(person: {name: {given_name: 'Tim'}}).messages).to eq(
+        person: { name: { family_name: ["is missing"] } }
+      )
+    end
+  end
+
+  context 'custom coercions' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        configure { config.input_processor = :sanitizer }
+
+        key(:email).required(Dry::Types['strict.string'].constructor(&:strip))
+      end
+    end
+
+    it 'applies custom types to input prior validation' do
+      result = schema.(email: ' jane@doe.org  ')
+
+      expect(result).to be_success
+      expect(result.to_h).to eql(email: 'jane@doe.org')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Andy Holland
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +88,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +98,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +235,7 @@ files:
 - spec/integration/schema/macros/when_spec.rb
 - spec/integration/schema/nested_values_spec.rb
 - spec/integration/schema/not_spec.rb
+- spec/integration/schema/numbers_spec.rb
 - spec/integration/schema/option_with_default_spec.rb
 - spec/integration/schema/reusing_schema_spec.rb
 - spec/integration/schema/using_types_spec.rb
@@ -286,6 +301,7 @@ test_files:
 - spec/integration/schema/macros/when_spec.rb
 - spec/integration/schema/nested_values_spec.rb
 - spec/integration/schema/not_spec.rb
+- spec/integration/schema/numbers_spec.rb
 - spec/integration/schema/option_with_default_spec.rb
 - spec/integration/schema/reusing_schema_spec.rb
 - spec/integration/schema/using_types_spec.rb
@@ -301,3 +317,4 @@ test_files:
 - spec/unit/schema/rule_spec.rb
 - spec/unit/schema/value_spec.rb
 - spec/unit/schema_spec.rb
+has_rdoc: