dry-validation 0.9.5 → 0.10.0

data/spec/unit/input_processor_compiler/form_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Dry::Validation::InputProcessorCompiler::Form, '#call' do
     [
       [
         :and, [
-          [:val, p(:key?, :email)],
+          p(:key?, :email),
           [
             :and, [
               [:key, [:email, p(:str?)]],
@@ -18,7 +18,7 @@ RSpec.describe Dry::Validation::InputProcessorCompiler::Form, '#call' do
       ],
       [
         :and, [
-          [:val, p(:key?, :age)],
+          p(:key?, :age),
           [
             :or, [
               [:key, [:age, p(:none?)]],
@@ -34,7 +34,7 @@ RSpec.describe Dry::Validation::InputProcessorCompiler::Form, '#call' do
       ],
       [
         :and, [
-          [:val, p(:key?, :address)],
+          p(:key?, :address),
           [:key, [:address, p(:str?)]]
         ]
       ]

data/spec/unit/message_compiler/visit_failure_spec.rb

@@ -0,0 +1,38 @@
+RSpec.describe Dry::Validation::MessageCompiler, '#visit_failure' do
+  include_context :message_compiler
+
+  let(:visitor) { :visit_failure }
+
+  context 'with :int? predicate' do
+    let(:node) do
+      [:age, [:key, [:age, [:predicate, [:int?, [[:input, '17']]]]]]]
+    end
+
+    it 'returns a message for :int? failure with :rule name inferred from key-rule' do
+      expect(result.rule).to be(:age)
+      expect(result.path).to eql([:age])
+      expect(result).to eql('must be an integer')
+    end
+  end
+
+  context 'with set failure and :int? predicate' do
+    let(:node) do
+      [:items, [:key, [:items, [:set, [
+        [:key, [0, [:predicate, [:int?, [[:input, 'foo']]]]]],
+        [:key, [2, [:predicate, [:int?, [[:input, 'bar']]]]]]
+      ]]]]]
+    end
+
+    it 'returns a message for the first element that failed' do
+      expect(result[0].rule).to be(:items)
+      expect(result[0].path).to eql([:items, 0])
+      expect(result[0]).to eql('must be an integer')
+    end
+
+    it 'returns a message for the third element that failed' do
+      expect(result[1].rule).to be(:items)
+      expect(result[1].path).to eql([:items, 2])
+      expect(result[1]).to eql('must be an integer')
+    end
+  end
+end

data/spec/unit/message_compiler/visit_spec.rb

@@ -0,0 +1,16 @@
+RSpec.describe Dry::Validation::MessageCompiler, '#visit' do
+  include_context :message_compiler
+
+  let(:visitor) { :visit }
+
+  context 'with an anonymous :failure' do
+    let(:node) do
+      [:failure, [:age, [:key, [:age, [:predicate, [:int?, [[:input, '17']]]]]]]]
+    end
+
+    it 'returns a message for :int? failure with :rule name inferred from key-rule' do
+      expect(result.rule).to be(:age)
+      expect(result).to eql('must be an integer')
+    end
+  end
+end

data/spec/unit/message_compiler_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe MessageCompiler, '#call' do
+  subject(:message_compiler) { MessageCompiler.new( Messages.default ) }
+
+  it 'returns an empty hash when there are no errors' do
+    expect(message_compiler.([])).to be_empty
+  end
+end

data/spec/unit/predicate_registry_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe PredicateRegistry do
 
   describe '.[]' do
     it 'returns a registry which collects predicate methods' do
-      expect(predicate_registry[:dis_ok?]).to be_instance_of(Dry::Logic::Predicate)
+      expect(predicate_registry[:dis_ok?]).to be_instance_of(UnboundMethod)
     end
   end
 
@@ -27,7 +27,7 @@ RSpec.describe PredicateRegistry do
       registry = predicate_registry.bind(schema)
 
       expect(registry).to be_frozen
-      expect(registry[:dis_ok?]).to be_instance_of(Dry::Logic::Predicate)
+      expect(registry[:dis_ok?]).to be_a(Method)
       expect(registry[:dis_ok?].()).to be(true)
     end
   end

data/spec/unit/schema/key_spec.rb

@@ -7,7 +7,9 @@ RSpec.describe Schema::Key do
     subject(:user) { Schema::Key[:user, registry: registry] }
 
     it 'returns a key rule' do
-      expect(user.str?.to_ast).to eql([:key, [:user, p(:str?)]])
+      expect(user.str?.to_ast).to eql(
+        [:rule, [:user, [:key, [:user, [:predicate, [:str?, [[:input, Undefined]]]]]]]]
+      )
     end
 
     it 'returns a key rule & disjunction rule created within the block' do
@@ -15,17 +17,22 @@ RSpec.describe Schema::Key do
         required(:email) { none? | filled? }
       end
 
-      expect(user.to_ast).to eql([
-        :key, [:user, [
-          :and, [
-            [:val, p(:hash?)],
-            [:key, [:user, [:and, [
-              [:val, p(:key?, :email)],
-              [:or, [[:key, [:email, p(:none?)]], [:key, [:email, p(:filled?)]]]
-            ]]]]]
-          ]
-        ]]
-      ])
+      expect(user.to_ast).to eql(
+        [:key, [:user, [:rule, [:user,
+          [:and, [
+            [:rule, [:user, [:predicate, [:hash?, [[:input, Undefined]]]]]],
+            [:rule, [:user, [:key, [:user, [:rule, [:email,
+              [:and, [
+                [:rule, [:email, [:predicate, [:key?, [[:name, :email], [:input, Undefined]]]]]],
+                [:rule, [:user, [:rule, [:email,
+                  [:or, [
+                    [:rule, [:email, [:key, [:email, [:predicate, [:none?, [[:input, Undefined]]]]]]]],
+                    [:rule, [:email, [:key, [:email, [:predicate, [:filled?, [[:input, Undefined]]]]]]]]
+                  ]]]]]]
+              ]]]]]]]
+            ]]]
+        ]]]]
+      )
     end
   end
 end

data/spec/unit/schema/rule_spec.rb

@@ -1,8 +1,8 @@
 RSpec.describe Schema::Rule do
   include_context 'predicate helper'
 
-  let(:filled) { [:val, [:email, p(:filled?)]] }
-  let(:format) { [:val, [:email, p(:format?, /regex/)]] }
+  let(:filled) { p(:filled?) }
+  let(:format) { p(:format?, /regex/) }
 
   let(:left) { Schema::Rule.new(filled, name: :email, target: target) }
   let(:right) { Schema::Rule.new(format, name: :email, target: target) }
@@ -10,25 +10,33 @@ RSpec.describe Schema::Rule do
 
   describe '#and' do
     it 'returns a conjunction' do
-      expect(left.and(right).to_ast).to match_array([:and, [filled, format]])
+      expect(left.and(right).to_ast).to match_array(
+        [:rule, [:email, [:and, [[:rule, [:email, filled]], [:rule, [:email, format]]]]]]
+      )
     end
   end
 
   describe '#or' do
     it 'returns a disjunction' do
-      expect(left.or(right).to_ast).to match_array([:or, [filled, format]])
+      expect(left.or(right).to_ast).to match_array(
+        [:rule, [:email, [:or, [[:rule, [:email, filled]], [:rule, [:email, format]]]]]]
+      )
     end
   end
 
   describe '#xor' do
     it 'returns an exclusive disjunction' do
-      expect(left.xor(right).to_ast).to match_array([:xor, [filled, format]])
+      expect(left.xor(right).to_ast).to match_array(
+        [:rule, [:email, [:xor, [[:rule, [:email, filled]], [:rule, [:email, format]]]]]]
+      )
     end
   end
 
   describe '#then' do
     it 'returns an implication' do
-      expect(left.then(right).to_ast).to match_array([:implication, [filled, format]])
+      expect(left.then(right).to_ast).to match_array(
+        [:rule, [:email, [:implication, [[:rule, [:email, filled]], [:rule, [:email, format]]]]]]
+      )
     end
   end
 end

data/spec/unit/schema/value_spec.rb

@@ -8,21 +8,19 @@ RSpec.describe Schema::Value do
     subject(:value) { Schema::Value.new(registry: registry) }
 
     let(:expected_ast) do
-      [:and, [
-        [:val, p(:key?, :address)],
-        [:key, [:address, p(:filled?)]]
-      ]]
+      [:rule, [:address, [:and, [
+        [:rule, [:address, [:predicate, [:key?, [[:name, :address], [:input, Undefined]]]]]],
+        [:rule, [:address, [:key, [:address, [:predicate, [:filled?, [[:input, Undefined]]]]]]]]
+      ]]]]
     end
 
     it 'creates a rule for a specified key using a block' do
       rule = value.required(:address, &:filled?)
-
       expect(rule.to_ast).to eql(expected_ast)
     end
 
     it 'creates a rule for a specified key using a macro' do
       rule = value.required(:address).filled
-
       expect(rule.to_ast).to eql(expected_ast)
     end
   end
@@ -35,8 +33,8 @@ RSpec.describe Schema::Value do
 
       expect(rule.to_ast).to eql(
         [:and, [
-          [:val, p(:array?)],
-          [:each, [:val, p(:key?, :method)]]
+          [:predicate, [:array?, [[:input, Undefined]]]],
+          [:each, [:predicate, [:key?, [[:name, :method], [:input, Undefined]]]]]
         ]]
       )
     end
@@ -49,18 +47,17 @@ RSpec.describe Schema::Value do
 
       expect(rule.to_ast).to eql(
         [:and, [
-          [:val, p(:array?)],
-          [:each,
-            [:set, [
-              [:and, [
-                [:val, p(:key?, :method)],
-                [:key, [:method, p(:str?)]]
-              ]],
-              [:and, [
-                [:val, p(:key?, :amount)],
-                [:key, [:amount, p(:float?)]]
-              ]]
-            ]]]
+          [:predicate, [:array?, [[:input, Undefined]]]],
+          [:each, [:set, [
+            [:rule, [:method, [:and, [
+              [:rule, [:method, [:predicate, [:key?, [[:name, :method], [:input, Undefined]]]]]],
+              [:rule, [:method, [:key, [:method, [:predicate, [:str?, [[:input, Undefined]]]]]]]]]
+            ]]],
+            [:rule, [:amount, [:and, [
+              [:rule, [:amount, [:predicate, [:key?, [[:name, :amount], [:input, Undefined]]]]]],
+              [:rule, [:amount, [:key, [:amount, [:predicate, [:float?, [[:input, Undefined]]]]]]]]
+            ]]]]
+          ]]]
         ]]
       )
     end
@@ -72,15 +69,15 @@ RSpec.describe Schema::Value do
     it 'builds hash? & rule created within the block' do
       rule = user.hash? { required(:email).filled }
 
-      expect(rule.to_ast).to eql([
-        :and, [
-          [:val, p(:hash?)],
-          [:and, [
-            [:val, p(:key?, :email)],
-            [:key, [:email, p(:filled?)]]
-          ]]
-        ]
-      ])
+      expect(rule.to_ast).to eql(
+        [:and, [
+          [:predicate, [:hash?, [[:input, Undefined]]]],
+          [:rule, [:email, [:and, [
+            [:rule, [:email, [:predicate, [:key?, [[:name, :email], [:input, Undefined]]]]]],
+            [:rule, [:email, [:key, [:email, [:predicate, [:filled?, [[:input, Undefined]]]]]]]]
+          ]]]]
+        ]]
+      )
     end
 
     it 'builds hash? & rule created within the block with deep nesting' do
@@ -95,23 +92,23 @@ RSpec.describe Schema::Value do
 
       expect(rule.to_ast).to eql(
         [:and, [
-          [:val, p(:hash?)],
-          [:and, [
-            [:val, p(:key?, :address)],
-            [:and, [
-              [:val, p(:hash?)],
-              [:key, [
-                :address, [:set, [
-                  [:and, [
-                    [:val, p(:key?, :city)],
-                    [:key, [:city, p(:filled?)]]]],
-                  [:and, [
-                    [:val, p(:key?, :zipcode)],
-                    [:key, [:zipcode, p(:filled?)]]]]
-                ]]
-              ]]
-            ]]
-          ]]
+          [:predicate, [:hash?, [[:input, Undefined]]]],
+          [:rule, [:address, [:and, [
+            [:rule, [:address, [:predicate, [:key?, [[:name, :address], [:input, Undefined]]]]]],
+            [:rule, [:address, [:and, [
+              [:rule, [:address, [:predicate, [:hash?, [[:input, Undefined]]]]]],
+              [:rule, [:address, [:key, [:address, [:set, [
+                [:rule, [:city, [:and, [
+                  [:rule, [:city, [:predicate, [:key?, [[:name, :city], [:input, Undefined]]]]]],
+                  [:rule, [:city, [:key, [:city, [:predicate, [:filled?, [[:input, Undefined]]]]]]]]
+                ]]]],
+                [:rule, [:zipcode, [:and, [
+                  [:rule, [:zipcode, [:predicate, [:key?, [[:name, :zipcode], [:input, Undefined]]]]]],
+                  [:rule, [:zipcode, [:key, [:zipcode, [:predicate, [:filled?, [[:input, Undefined]]]]]]]]
+                ]]]]
+              ]]]]]]
+            ]]]]
+          ]]]]
         ]]
       )
     end
@@ -123,12 +120,12 @@ RSpec.describe Schema::Value do
     it 'builds a negated rule' do
       not_email = user.required(:email) { str?.not }
 
-      expect(not_email.to_ast).to eql([
-        :and, [
-          [:val, p(:key?, :email)],
-          [:not, [:key, [:email, p(:str?)]]]
-        ]
-      ])
+      expect(not_email.to_ast).to eql(
+        [:rule, [:email, [:and, [
+          [:rule, [:email, [:predicate, [:key?, [[:name, :email], [:input, Undefined]]]]]],
+          [:rule, [:email, [:not, [:key, [:email, [:predicate, [:str?, [[:input, Undefined]]]]]]]]]]
+        ]]]
+      )
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.0
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -85,40 +85,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -196,18 +210,18 @@ files:
 - examples/nested.rb
 - lib/dry-validation.rb
 - lib/dry/validation.rb
-- lib/dry/validation/constants.rb
 - lib/dry/validation/deprecations.rb
-- lib/dry/validation/error.rb
-- lib/dry/validation/error_compiler.rb
 - lib/dry/validation/executor.rb
-- lib/dry/validation/hint_compiler.rb
+- lib/dry/validation/extensions.rb
+- lib/dry/validation/extensions/monads.rb
+- lib/dry/validation/extensions/struct.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/message.rb
 - lib/dry/validation/message_compiler.rb
+- lib/dry/validation/message_compiler/visitor_opts.rb
 - lib/dry/validation/message_set.rb
 - lib/dry/validation/messages.rb
 - lib/dry/validation/messages/abstract.rb
@@ -230,11 +244,12 @@ files:
 - lib/dry/validation/type_specs.rb
 - lib/dry/validation/version.rb
 - log/.gitkeep
+- spec/extensions/monads/result_spec.rb
+- spec/extensions/struct/schema_spec.rb
 - spec/fixtures/locales/en.yml
 - spec/fixtures/locales/pl.yml
 - spec/integration/custom_error_messages_spec.rb
 - spec/integration/custom_predicates_spec.rb
-- spec/integration/error_compiler_spec.rb
 - spec/integration/form/predicates/array_spec.rb
 - spec/integration/form/predicates/empty_spec.rb
 - spec/integration/form/predicates/eql_spec.rb
@@ -262,7 +277,9 @@ files:
 - spec/integration/form/predicates/type_spec.rb
 - spec/integration/hints_spec.rb
 - spec/integration/injecting_rules_spec.rb
+- spec/integration/json/defining_base_schema_spec.rb
 - spec/integration/localized_error_messages_spec.rb
+- spec/integration/message_compiler_spec.rb
 - spec/integration/messages/i18n_spec.rb
 - spec/integration/optional_keys_spec.rb
 - spec/integration/result_spec.rb
@@ -275,6 +292,7 @@ files:
 - spec/integration/schema/dynamic_predicate_args_spec.rb
 - spec/integration/schema/each_with_set_spec.rb
 - spec/integration/schema/extending_dsl_spec.rb
+- spec/integration/schema/form/defining_base_schema_spec.rb
 - spec/integration/schema/form/explicit_types_spec.rb
 - spec/integration/schema/form_spec.rb
 - spec/integration/schema/hash_schema_spec.rb
@@ -295,6 +313,7 @@ files:
 - spec/integration/schema/not_spec.rb
 - spec/integration/schema/numbers_spec.rb
 - spec/integration/schema/option_with_default_spec.rb
+- spec/integration/schema/or_spec.rb
 - spec/integration/schema/predicate_verification_spec.rb
 - spec/integration/schema/predicates/array_spec.rb
 - spec/integration/schema/predicates/custom_spec.rb
@@ -325,9 +344,11 @@ files:
 - spec/integration/schema/predicates/type_spec.rb
 - spec/integration/schema/reusing_schema_spec.rb
 - spec/integration/schema/using_types_spec.rb
+- spec/integration/schema/validate_spec.rb
 - spec/integration/schema/xor_spec.rb
 - spec/integration/schema_builders_spec.rb
 - spec/integration/schema_spec.rb
+- spec/shared/message_compiler.rb
 - spec/shared/predicate_helper.rb
 - spec/shared/rule_compiler.rb
 - spec/spec_helper.rb
@@ -335,10 +356,11 @@ files:
 - spec/support/matchers.rb
 - spec/support/mutant.rb
 - spec/support/predicates_integration.rb
-- 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/message_compiler/visit_failure_spec.rb
+- spec/unit/message_compiler/visit_spec.rb
+- spec/unit/message_compiler_spec.rb
 - spec/unit/predicate_registry_spec.rb
 - spec/unit/schema/key_spec.rb
 - spec/unit/schema/rule_spec.rb
@@ -369,11 +391,12 @@ signing_key:
 specification_version: 4
 summary: A simple validation library
 test_files:
+- spec/extensions/monads/result_spec.rb
+- spec/extensions/struct/schema_spec.rb
 - spec/fixtures/locales/en.yml
 - spec/fixtures/locales/pl.yml
 - spec/integration/custom_error_messages_spec.rb
 - spec/integration/custom_predicates_spec.rb
-- spec/integration/error_compiler_spec.rb
 - spec/integration/form/predicates/array_spec.rb
 - spec/integration/form/predicates/empty_spec.rb
 - spec/integration/form/predicates/eql_spec.rb
@@ -401,7 +424,9 @@ test_files:
 - spec/integration/form/predicates/type_spec.rb
 - spec/integration/hints_spec.rb
 - spec/integration/injecting_rules_spec.rb
+- spec/integration/json/defining_base_schema_spec.rb
 - spec/integration/localized_error_messages_spec.rb
+- spec/integration/message_compiler_spec.rb
 - spec/integration/messages/i18n_spec.rb
 - spec/integration/optional_keys_spec.rb
 - spec/integration/result_spec.rb
@@ -414,6 +439,7 @@ test_files:
 - spec/integration/schema/dynamic_predicate_args_spec.rb
 - spec/integration/schema/each_with_set_spec.rb
 - spec/integration/schema/extending_dsl_spec.rb
+- spec/integration/schema/form/defining_base_schema_spec.rb
 - spec/integration/schema/form/explicit_types_spec.rb
 - spec/integration/schema/form_spec.rb
 - spec/integration/schema/hash_schema_spec.rb
@@ -434,6 +460,7 @@ test_files:
 - spec/integration/schema/not_spec.rb
 - spec/integration/schema/numbers_spec.rb
 - spec/integration/schema/option_with_default_spec.rb
+- spec/integration/schema/or_spec.rb
 - spec/integration/schema/predicate_verification_spec.rb
 - spec/integration/schema/predicates/array_spec.rb
 - spec/integration/schema/predicates/custom_spec.rb
@@ -464,9 +491,11 @@ test_files:
 - spec/integration/schema/predicates/type_spec.rb
 - spec/integration/schema/reusing_schema_spec.rb
 - spec/integration/schema/using_types_spec.rb
+- spec/integration/schema/validate_spec.rb
 - spec/integration/schema/xor_spec.rb
 - spec/integration/schema_builders_spec.rb
 - spec/integration/schema_spec.rb
+- spec/shared/message_compiler.rb
 - spec/shared/predicate_helper.rb
 - spec/shared/rule_compiler.rb
 - spec/spec_helper.rb
@@ -474,10 +503,11 @@ test_files:
 - spec/support/matchers.rb
 - spec/support/mutant.rb
 - spec/support/predicates_integration.rb
-- 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/message_compiler/visit_failure_spec.rb
+- spec/unit/message_compiler/visit_spec.rb
+- spec/unit/message_compiler_spec.rb
 - spec/unit/predicate_registry_spec.rb
 - spec/unit/schema/key_spec.rb
 - spec/unit/schema/rule_spec.rb