dry-validation 0.5.0 → 0.6.0

data/spec/spec_helper.rb

@@ -4,6 +4,11 @@ begin
   require 'byebug'
 rescue LoadError; end
 
+if RUBY_ENGINE == "rbx"
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+end
+
 require 'dry-validation'
 
 SPEC_ROOT = Pathname(__dir__)

data/spec/support/define_struct.rb

@@ -0,0 +1,25 @@
+module DefineStruct
+  def from_hash(hash = {})
+    values = members.map do |attr|
+      val = hash[attr]
+      val.is_a?(Hash) ? define_struct(*val.keys).from_hash(val) : val
+    end
+    new(*values)
+  end
+
+  def define_struct(*attrs)
+    Struct.new(*attrs) do
+      extend DefineStruct
+    end
+  end
+end
+
+def def_struct(*attrs)
+  Struct.new(*attrs) do
+    extend DefineStruct
+  end
+end
+
+def struct_from_hash(hash)
+  def_struct(*hash.keys).from_hash(hash)
+end

data/spec/unit/hint_compiler_spec.rb

@@ -19,6 +19,22 @@ RSpec.describe HintCompiler, '#call' do
               ]
             ]
           ]
+        ],
+      ],
+      [
+        :and, [
+          [:attr, [:height, [:predicate, [:attr?, []]]]],
+          [
+            :or, [
+              [:val, [:height, [:predicate, [:none?, []]]]],
+              [
+                :and, [
+                  [:val, [:height, [:predicate, [:int?, []]]]],
+                  [:val, [:height, [:predicate, [:gt?, [180]]]]]
+                ]
+              ]
+            ]
+          ]
         ]
       ]
     ]
@@ -26,7 +42,8 @@ RSpec.describe HintCompiler, '#call' do
 
   it 'returns hint messages for given rules' do
     expect(compiler.call).to eql(
-      age: ['age must be an integer', 'age must be greater than 18']
+      age: ['age must be an integer', 'age must be greater than 18'],
+      height: ['height must be an integer', 'height must be greater than 180'],
     )
   end
 end

data/spec/unit/input_type_compiler_spec.rb

@@ -171,7 +171,7 @@ RSpec.describe Dry::Validation::InputTypeCompiler, '#call' do
     expect(input_type['bday' => '2012-01-23 11:07']).to eql(bday: Time.new(2012, 1, 23, 11, 7))
   end
 
-  it 'supports bool? => "form.bool"' do
+  it 'supports time? => "form.time"' do
     rule_ast = [
       [
         :and,
@@ -187,7 +187,7 @@ RSpec.describe Dry::Validation::InputTypeCompiler, '#call' do
     expect(input_type['bday' => '2012-01-23 11:07']).to eql(bday: Time.new(2012, 1, 23, 11, 7))
   end
 
-  it 'supports time? => "form.time"' do
+  it 'supports bool? => "form.bool"' do
     rule_ast = [
       [
         :and,

data/spec/unit/schema/rule_spec.rb

@@ -7,25 +7,25 @@ RSpec.describe Schema::Rule do
 
   describe '#and' do
     it 'returns a conjunction' do
-      expect(left.and(right)).to match_array([:and, [filled, format]])
+      expect(left.and(right).to_ary).to match_array([:and, [filled, format]])
     end
   end
 
   describe '#or' do
     it 'returns a disjunction' do
-      expect(left.or(right)).to match_array([:or, [filled, format]])
+      expect(left.or(right).to_ary).to match_array([:or, [filled, format]])
     end
   end
 
   describe '#xor' do
     it 'returns an exclusive disjunction' do
-      expect(left.xor(right)).to match_array([:xor, [filled, format]])
+      expect(left.xor(right).to_ary).to match_array([:xor, [filled, format]])
     end
   end
 
   describe '#then' do
     it 'returns an implication' do
-      expect(left.then(right)).to match_array([:implication, [filled, format]])
+      expect(left.then(right).to_ary).to match_array([:implication, [filled, format]])
     end
   end
 end

data/spec/unit/schema/value_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Schema::Value do
         value.key?(:method)
       end
 
-      expect(rule).to match_array(
+      expect(rule.to_ary).to match_array(
         [:each, [
           :payments, [:val, [:payments, [:predicate, [:key?, [:method]]]]]]
         ]
@@ -20,7 +20,7 @@ RSpec.describe Schema::Value do
         value.key(:amount) { |amount| amount.float? }
       end
 
-      expect(rule).to match_array(
+      expect(rule.to_ary).to match_array(
         [:each, [
           :payments, [
             :set, [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -18,6 +18,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +40,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +50,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +72,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -73,6 +82,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: dry-data
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +155,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -173,6 +186,7 @@ files:
 - lib/dry/validation/messages/yaml.rb
 - lib/dry/validation/result.rb
 - lib/dry/validation/schema.rb
+- lib/dry/validation/schema/attr.rb
 - lib/dry/validation/schema/definition.rb
 - lib/dry/validation/schema/form.rb
 - lib/dry/validation/schema/key.rb
@@ -187,18 +201,23 @@ files:
 - spec/integration/custom_predicates_spec.rb
 - spec/integration/error_compiler_spec.rb
 - spec/integration/hints_spec.rb
+- spec/integration/injecting_rules_spec.rb
 - spec/integration/localized_error_messages_spec.rb
 - spec/integration/messages/i18n_spec.rb
 - spec/integration/optional_keys_spec.rb
 - spec/integration/rule_groups_spec.rb
+- spec/integration/schema/attrs_spec.rb
 - spec/integration/schema/check_rules_spec.rb
+- spec/integration/schema/default_key_behavior_spec.rb
 - spec/integration/schema/each_with_set_spec.rb
+- spec/integration/schema/grouped_rules_spec.rb
 - spec/integration/schema/nested_spec.rb
 - spec/integration/schema/not_spec.rb
 - spec/integration/schema/xor_spec.rb
 - spec/integration/schema_form_spec.rb
 - spec/integration/schema_spec.rb
 - spec/spec_helper.rb
+- spec/support/define_struct.rb
 - spec/unit/error_compiler_spec.rb
 - spec/unit/hint_compiler_spec.rb
 - spec/unit/input_type_compiler_spec.rb
@@ -225,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple validation library
@@ -236,18 +255,23 @@ test_files:
 - spec/integration/custom_predicates_spec.rb
 - spec/integration/error_compiler_spec.rb
 - spec/integration/hints_spec.rb
+- spec/integration/injecting_rules_spec.rb
 - spec/integration/localized_error_messages_spec.rb
 - spec/integration/messages/i18n_spec.rb
 - spec/integration/optional_keys_spec.rb
 - spec/integration/rule_groups_spec.rb
+- spec/integration/schema/attrs_spec.rb
 - spec/integration/schema/check_rules_spec.rb
+- spec/integration/schema/default_key_behavior_spec.rb
 - spec/integration/schema/each_with_set_spec.rb
+- spec/integration/schema/grouped_rules_spec.rb
 - spec/integration/schema/nested_spec.rb
 - spec/integration/schema/not_spec.rb
 - spec/integration/schema/xor_spec.rb
 - spec/integration/schema_form_spec.rb
 - spec/integration/schema_spec.rb
 - spec/spec_helper.rb
+- spec/support/define_struct.rb
 - spec/unit/error_compiler_spec.rb
 - spec/unit/hint_compiler_spec.rb
 - spec/unit/input_type_compiler_spec.rb