dry-validation 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a2bb0a43d4bd22192529a1b75e0bdb5d9da603f
-  data.tar.gz: dfd9286f07480dc94fbfbdcd6ae1007a8cfefe97
+  metadata.gz: 16d323de18e994f717e80abb07098dc2e82534af
+  data.tar.gz: ef0e116d3f56eb249b70315bf43af0d74a249c58
 SHA512:
-  metadata.gz: bf52dea16b06ef16dee99c65dd611c044d044be0bb3df0dcf80974fb01c507764cc2ead67a87f8ee0ad215b2a0983f3fc84954cfdd1108d9a4c9d380f1bdda0f
-  data.tar.gz: 8bb21ccf8a81b588116d493d2f724594e77db390532aab10bada0ec4cb224d1ce504d17cbfce23e63f51edf166ad0268665e458e140b98f2c306251be751800a
+  metadata.gz: 2b9690fa21b55e46d09db96f93d4d58f07d7d5fe7291219d3107f154eda2597e6e7209049403fcb1f518936d025a62d31ed2315e8795a02e7bd017c9ead52b33
+  data.tar.gz: b8ac25905f1f1d602c0f930cc2895b9e6fd27d53fae3dfcc2794e46f255034417e14ce9407491ba19fd2c86276b3e820783890bdac10fb42bf190f72e9577ec3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# v0.7.4 2016-04-06
+
+### Added
+
+* `Schema.JSON` with json-specific coercions (coop)
+* Support for error messages for `odd? and `even?` predicates (fran-worley)
+
+### Fixed
+
+* Depending on deeply nested values in high-level rules works now (solnic)
+
+[Compare v0.7.3...v0.7.4](https://github.com/dryrb/dry-validation/compare/v0.7.3...v0.7.4)
+
 # v0.7.3 2016-03-30
 
 ### Added

data/Gemfile

@@ -8,10 +8,8 @@ group :test do
 end
 
 group :tools do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
   gem 'byebug', platform: :mri
+  gem 'pry'
 end
 
 group :benchmarks do

data/config/errors.yml

@@ -14,6 +14,10 @@ en:
 
     number?: "must be a number"
 
+    odd?: "must be odd"
+
+    even?: "must be even"
+
     gt?: "must be greater than %{num}"
 
     gteq?: "must be greater than or equal to %{num}"

data/examples/json.rb

@@ -0,0 +1,12 @@
+require 'json'
+require 'dry-validation'
+
+schema = Dry::Validation.JSON do
+  key(:email).required
+
+  key(:age).required(:int?, gt?: 18)
+end
+
+errors = schema.call(JSON.parse('{"email": "", "age": "18"}')).messages
+
+puts errors.inspect

data/lib/dry/validation.rb

@@ -4,6 +4,7 @@ require 'dry-container'
 
 require 'dry/validation/schema'
 require 'dry/validation/schema/form'
+require 'dry/validation/schema/json'
 
 module Dry
   module Validation
@@ -40,5 +41,9 @@ module Dry
     def self.Form(options = {}, &block)
       Validation.Schema(Schema::Form, options, &block)
     end
+
+    def self.JSON(options = {}, &block)
+      Validation.Schema(Schema::JSON, options, &block)
+    end
   end
 end

data/lib/dry/validation/input_processor_compiler.rb

@@ -103,4 +103,5 @@ module Dry
 end
 
 require 'dry/validation/input_processor_compiler/sanitizer'
+require 'dry/validation/input_processor_compiler/json'
 require 'dry/validation/input_processor_compiler/form'

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

@@ -0,0 +1,46 @@
+module Dry
+  module Validation
+    class InputProcessorCompiler::JSON < InputProcessorCompiler
+      PREDICATE_MAP = {
+        default: 'string',
+        none?: 'json.nil',
+        bool?: 'bool',
+        str?: 'string',
+        int?: 'int',
+        float?: 'float',
+        decimal?: 'json.decimal',
+        date?: 'json.date',
+        date_time?: 'json.date_time',
+        time?: 'json.time'
+      }.freeze
+
+      CONST_MAP = {
+        NilClass => 'nil',
+        String => 'string',
+        Fixnum => 'int',
+        Integer => 'int',
+        Float => 'float',
+        BigDecimal => 'json.decimal',
+        Array => 'json.array',
+        Hash => 'json.hash',
+        Date => 'json.date',
+        DateTime => 'json.date_time',
+        Time => 'json.time',
+        TrueClass => 'true',
+        FalseClass => 'false'
+      }.freeze
+
+      def identifier
+        :json
+      end
+
+      def hash_node(schema)
+        [:type, ['json.hash', [:symbolized, schema]]]
+      end
+
+      def array_node(members)
+        [:type, ['json.array', members]]
+      end
+    end
+  end
+end

data/lib/dry/validation/schema.rb

@@ -33,7 +33,8 @@ module Dry
 
       setting :input_processor_map, {
         sanitizer: InputProcessorCompiler::Sanitizer.new,
-        form: InputProcessorCompiler::Form.new
+        json: InputProcessorCompiler::JSON.new,
+        form: InputProcessorCompiler::Form.new,
       }.freeze
 
       def self.inherited(klass)

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

@@ -18,6 +18,11 @@ module Dry
           @options = options
         end
 
+        def inspect
+          to_ast.inspect
+        end
+        alias_method :to_s, :inspect
+
         def key(name, &block)
           define(name, Key, &block)
         end

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

@@ -0,0 +1,11 @@
+require 'dry/validation/schema'
+
+module Dry
+  module Validation
+    class Schema::JSON < Schema
+      configure do |config|
+        config.input_processor = :json
+      end
+    end
+  end
+end

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

@@ -13,6 +13,11 @@ module Dry
           @options = options
         end
 
+        def inspect
+          to_ast.inspect
+        end
+        alias_method :to_s, :inspect
+
         def schema(other = nil, &block)
           schema = Schema.create_class(target, other, &block)
           rule = __send__(type, key(:hash?).and(key(schema)))

data/lib/dry/validation/schema_compiler.rb

@@ -18,8 +18,12 @@ module Dry
 
       def deps_valid?(results)
         deps.all? do |path|
-          result = Array(path).reduce(results) { |a, e| a[e] }
-          result.success? if result
+          result = nil
+          Array(path).each do |name|
+            curr = results[name]
+            result = curr.success? if curr.respond_to?(:success)
+          end
+          result
         end
       end
     end

data/lib/dry/validation/version.rb

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

data/spec/integration/schema/check_with_nested_el_spec.rb

@@ -0,0 +1,37 @@
+RSpec.describe 'Check depending on a nested value from a hash' do
+  subject(:schema) do
+    Dry::Validation.Schema do
+      key(:tag).schema do
+        key(:color).schema do
+          key(:value).required(:str?)
+        end
+      end
+
+      rule(red: [[:tag, :color, :value]]) do |value|
+        value.eql?('red')
+      end
+    end
+  end
+
+  it 'passes when check passes' do
+    expect(schema.(tag: { color: { value: 'red' }})).to be_success
+  end
+
+  it 'skips check when parent of the dependency failed' do
+    expect(schema.(tag: { color: :oops }).messages).to eql(
+      tag: { color: ['must be a hash'] }
+    )
+  end
+
+  it 'skips check when dependency failed' do
+    expect(schema.(tag: { color: { value: :oops }}).messages).to eql(
+      tag: { color: { value: ['must be a string'] } }
+    )
+  end
+
+  it 'fails when check fails' do
+    expect(schema.(tag: { color: { value: 'blue' }}).messages).to eql(
+      tag: { color: { value: ['must be equal to red'] } }
+    )
+  end
+end

data/spec/integration/schema/json_spec.rb

@@ -0,0 +1,162 @@
+RSpec.describe Dry::Validation::Schema::JSON, 'defining a schema' do
+  subject(:schema) do
+    Dry::Validation.JSON do
+      key(:email).required
+
+      key(:age).maybe(:int?, gt?: 18)
+
+      key(:address).schema do
+        key(:city).required
+        key(:street).required
+
+        key(:loc).schema do
+          key(:lat).required(:float?)
+          key(:lng).required(:float?)
+        end
+      end
+
+      optional(:password).maybe.confirmation
+
+      optional(:phone_number).maybe(:int?, gt?: 0)
+
+      rule(:email_valid) { value(:email).email? }
+
+      configure do
+        def email?(value)
+          true
+        end
+      end
+    end
+  end
+
+  describe '#messages' do
+    it 'returns compiled error messages' do
+      result = schema.('email' => '', 'age' => 19)
+
+      expect(result.messages).to eql(
+        email: ['must be filled'],
+        address: ['is missing'],
+      )
+
+      expect(result.output).to eql(email: '', age: 19)
+    end
+
+    it 'returns hints for nested data' do
+      result = schema.(
+        'email' => 'jane@doe.org',
+        'age' => 19,
+        'address' => {
+          'city' => '',
+          'street' => 'Street 1/2',
+          'loc' => { 'lat' => '123.456', 'lng' => '' }
+        }
+      )
+
+      expect(result.messages).to eql(
+        address: {
+          loc: { lat: ['must be a float'], lng: ['must be filled'] },
+          city: ['must be filled']
+        }
+      )
+    end
+  end
+
+  describe '#call' do
+    it 'passes when attributes are valid' do
+      result = schema.(
+        'email' => 'jane@doe.org',
+        'age' => 19,
+        'address' => {
+          'city' => 'NYC',
+          'street' => 'Street 1/2',
+          'loc' => { 'lat' => 123.456, 'lng' => 456.123 }
+        }
+      )
+
+      expect(result).to be_success
+
+      expect(result.output).to eql(
+        email: 'jane@doe.org', age: 19,
+        address: {
+          city: 'NYC', street: 'Street 1/2',
+          loc: { lat: 123.456, lng: 456.123 }
+        }
+      )
+    end
+
+    it 'validates presence of an email and min age value' do
+      result = schema.('email' => '', 'age' => 18)
+
+      expect(result.messages).to eql(
+        address: ['is missing'],
+        age: ['must be greater than 18'],
+        email: ['must be filled']
+      )
+    end
+
+    it 'handles optionals' do
+      result = schema.(
+        'email' => 'jane@doe.org',
+        'age' => 19,
+        'phone_number' => 12,
+        'address' => {
+          'city' => 'NYC',
+          'street' => 'Street 1/2',
+          'loc' => { 'lat' => 123.456, 'lng' => 456.123 }
+        }
+      )
+
+      expect(result).to be_success
+
+      expect(result.output).to eql(
+        email: 'jane@doe.org', age: 19, phone_number: 12,
+        address: {
+          city: 'NYC', street: 'Street 1/2',
+          loc: { lat: 123.456, lng: 456.123 }
+        }
+      )
+    end
+  end
+
+  describe 'with nested schema in a high-level rule' do
+    subject(:schema) do
+      Dry::Validation.JSON do
+        key(:address).maybe(:hash?)
+
+        key(:delivery).required(:bool?)
+
+        rule(address: [:delivery, :address]) do |delivery, address|
+          delivery.true?.then(address.schema(AddressSchema))
+        end
+      end
+    end
+
+    before do
+      AddressSchema = Dry::Validation.JSON do
+        key(:city).required
+        key(:zipcode).required(:int?)
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :AddressSchema)
+    end
+
+    it 'succeeds when nested form schema succeeds' do
+      result = schema.(delivery: true, 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: false, address: nil)
+      expect(result).to be_success
+    end
+
+    it 'fails when nested schema fails' do
+      result = schema.(delivery: true, address: { city: 'NYC', zipcode: 'foo' })
+      expect(result.messages).to eql(
+        address: { zipcode: ['must be an integer'] }
+      )
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -19,18 +19,6 @@ Dir[SPEC_ROOT.join('support/**/*.rb')].each(&method(:require))
 
 include Dry::Validation
 
-class Schema::DSL < BasicObject
-  def inspect
-    to_ast.inspect
-  end
-end
-
-class Schema::Rule < BasicObject
-  def inspect
-    to_ast.inspect
-  end
-end
-
 RSpec.configure do |config|
   config.disable_monkey_patching!
 

data/spec/unit/input_processor_compiler/json_spec.rb

@@ -0,0 +1,281 @@
+RSpec.describe Dry::Validation::InputProcessorCompiler::JSON, '#call' do
+  subject(:compiler) { Dry::Validation::InputProcessorCompiler::JSON.new }
+
+  it 'supports arbitrary types via type?(const) => "json.const"' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:age]]]],
+          [:key, [:age, [:predicate, [:type?, [Fixnum]]]]]
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['age' => 21]).to eql(age: 21)
+  end
+
+  it 'supports arbitrary types via type?(conts)' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:admin]]]],
+          [:key, [:admin, [:predicate, [:type?, ['Bool']]]]]
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['admin' => false]).to eql(admin: false)
+  end
+
+  it 'supports str? => "string"' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:email]]]],
+          [
+            :and, [
+              [:key, [:email, [:predicate, [:str?, []]]]],
+              [:key, [:email, [:predicate, [:filled?, []]]]]
+            ]
+          ]
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['email' => 'jane@doe.org']).to eql(email: 'jane@doe.org')
+  end
+
+  it 'supports int? => "int"' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:age]]]],
+          [:key, [:age, [:predicate, [:int?, []]]]],
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['age' => 21]).to eql(age: 21)
+  end
+
+  it 'supports bool? => "bool"' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:admin]]]],
+          [:key, [:admin, [:predicate, [:bool?, []]]]],
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['admin' => true]).to eql(admin: true)
+    expect(input_type['admin' => false]).to eql(admin: false)
+  end
+
+  it 'supports none? => "int"' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:age]]]],
+          [
+            :or, [
+              [:key, [:age, [:predicate, [:none?, []]]]],
+              [:key, [:age, [:predicate, [:int?, []]]]],
+            ]
+          ]
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['age' => '']).to eql(age: nil)
+    expect(input_type['age' => 21]).to eql(age: 21)
+  end
+
+  it 'supports float? => "float"' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:lat]]]],
+          [:key, [:lat, [:predicate, [:float?, []]]]],
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['lat' => 21.12]).to eql(lat: 21.12)
+  end
+
+  it 'supports decimal? => "json.decimal"' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:lat]]]],
+          [:key, [:lat, [:predicate, [:decimal?, []]]]],
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['lat' => 21.12]).to eql(lat: 21.12.to_d)
+  end
+
+  it 'supports date? => "json.date"' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:bday]]]],
+          [:key, [:bday, [:predicate, [:date?, []]]]],
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['bday' => '2012-01-23']).to eql(bday: Date.new(2012, 1, 23))
+  end
+
+  it 'supports date_time? => "json.date_time"' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:bday]]]],
+          [:key, [:bday, [:predicate, [:date_time?, []]]]],
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['bday' => '2012-01-23 11:07']).to eql(bday: DateTime.new(2012, 1, 23, 11, 7))
+  end
+
+  it 'supports time? => "json.time"' do
+    rule_ast = [
+      [
+        :and,
+        [
+          [:val, [:predicate, [:key?, [:bday]]]],
+          [:key, [:bday, [:predicate, [:time?, []]]]],
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['bday' => '2012-01-23 11:07']).to eql(bday: Time.new(2012, 1, 23, 11, 7))
+  end
+
+  it 'supports each rule' do
+    rule_ast = [
+      [
+        :and, [
+          [:val, [:predicate, [:key?, [:author]]]],
+          [:set, [
+            [:and, [
+              [:val, [:predicate, [:key?, [:books]]]],
+              [
+                :each, [
+                  :set, [
+                    [
+                      :and, [
+                        [:val, [:predicate, [:key?, [:published]]]],
+                        [:key, [:published, [:predicate, [:bool?, []]]]]
+                      ]
+                    ]
+                  ]
+                ]
+              ]
+            ]]
+          ]]
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type['author' => { 'books' => [{ 'published' => true }] }]).to eql(
+      author: { books: [published: true] }
+    )
+
+    expect(input_type['author' => { 'books' => [{ 'published' => false }] }]).to eql(
+      author: { books: [published: false] }
+    )
+  end
+
+  it 'supports array? with an each rule' do
+    rule_ast = [
+      [
+        :and, [
+          [:val, [:predicate, [:key?, [:ids]]]],
+          [:and, [
+            [:key, [:ids, [:predicate, [:array?, []]]]],
+            [:each, [:val, [:predicate, [:int?, []]]]]
+          ]]
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type.('ids' => 'oops')).to eql(ids: 'oops')
+
+    expect(input_type.('ids' => [1, 2, 3])).to eql(ids: [1, 2, 3])
+  end
+
+  it 'supports hash? with a set rule' do
+    rule_ast = [
+      [
+        :and, [
+          [:val, [:predicate, [:key?, [:address]]]],
+          [
+            :and, [
+              [:key, [:address, [:predicate, [:hash?, []]]]],
+              [
+                :set, [
+                  [
+                    :and, [
+                      [:val, [:predicate, [:key?, [:street]]]],
+                      [:key, [:street, [:predicate, [:filled?, []]]]]
+                    ]
+                  ]
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type.('address' => 'oops')).to eql(address: 'oops')
+
+    expect(input_type.('address' => { 'street' => 'ok' })).to eql(
+      address: { street: 'ok' }
+    )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -183,6 +183,7 @@ files:
 - examples/basic.rb
 - examples/each.rb
 - examples/form.rb
+- examples/json.rb
 - examples/nested.rb
 - examples/rule_ast.rb
 - lib/dry-validation.rb
@@ -193,6 +194,7 @@ files:
 - lib/dry/validation/hint_compiler.rb
 - lib/dry/validation/input_processor_compiler.rb
 - lib/dry/validation/input_processor_compiler/form.rb
+- lib/dry/validation/input_processor_compiler/json.rb
 - lib/dry/validation/input_processor_compiler/sanitizer.rb
 - lib/dry/validation/messages.rb
 - lib/dry/validation/messages/abstract.rb
@@ -205,6 +207,7 @@ files:
 - lib/dry/validation/schema/check.rb
 - lib/dry/validation/schema/dsl.rb
 - lib/dry/validation/schema/form.rb
+- lib/dry/validation/schema/json.rb
 - lib/dry/validation/schema/key.rb
 - lib/dry/validation/schema/rule.rb
 - lib/dry/validation/schema/value.rb
@@ -223,11 +226,13 @@ files:
 - spec/integration/optional_keys_spec.rb
 - spec/integration/schema/array_schema_spec.rb
 - spec/integration/schema/check_rules_spec.rb
+- spec/integration/schema/check_with_nested_el_spec.rb
 - spec/integration/schema/check_with_nth_el_spec.rb
 - spec/integration/schema/each_with_set_spec.rb
 - spec/integration/schema/form_spec.rb
 - spec/integration/schema/inheriting_schema_spec.rb
 - spec/integration/schema/input_processor_spec.rb
+- spec/integration/schema/json_spec.rb
 - spec/integration/schema/macros/confirmation_spec.rb
 - spec/integration/schema/macros/each_spec.rb
 - spec/integration/schema/macros/maybe_spec.rb
@@ -247,6 +252,7 @@ files:
 - spec/unit/error_compiler_spec.rb
 - spec/unit/hint_compiler_spec.rb
 - spec/unit/input_processor_compiler/form_spec.rb
+- spec/unit/input_processor_compiler/json_spec.rb
 - spec/unit/schema/key_spec.rb
 - spec/unit/schema/rule_spec.rb
 - spec/unit/schema/value_spec.rb
@@ -289,11 +295,13 @@ test_files:
 - spec/integration/optional_keys_spec.rb
 - spec/integration/schema/array_schema_spec.rb
 - spec/integration/schema/check_rules_spec.rb
+- spec/integration/schema/check_with_nested_el_spec.rb
 - spec/integration/schema/check_with_nth_el_spec.rb
 - spec/integration/schema/each_with_set_spec.rb
 - spec/integration/schema/form_spec.rb
 - spec/integration/schema/inheriting_schema_spec.rb
 - spec/integration/schema/input_processor_spec.rb
+- spec/integration/schema/json_spec.rb
 - spec/integration/schema/macros/confirmation_spec.rb
 - spec/integration/schema/macros/each_spec.rb
 - spec/integration/schema/macros/maybe_spec.rb
@@ -313,6 +321,7 @@ test_files:
 - spec/unit/error_compiler_spec.rb
 - spec/unit/hint_compiler_spec.rb
 - spec/unit/input_processor_compiler/form_spec.rb
+- spec/unit/input_processor_compiler/json_spec.rb
 - spec/unit/schema/key_spec.rb
 - spec/unit/schema/rule_spec.rb
 - spec/unit/schema/value_spec.rb