dry-validation 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e9f6498ea735d03aa4b73fb60bccd3b8a0455c1
-  data.tar.gz: 00230f9f5ecf0af35f05f66c60c2849885a363a1
+  metadata.gz: 6d2494cc932a3cd69938b609aa9ad9b19477097a
+  data.tar.gz: 1f8ea70284ddb90ef3c84f05f78684e66cfd040d
 SHA512:
-  metadata.gz: 0458a05e52268d2f43656070f72f43c84d2464765f2798b211c79328bc6a1a4fbb70ced00ae5bf5fa4bc9c6e08618c523e476f89061421efd1874fe5f60d1ced
-  data.tar.gz: ac470d5781ee4bff0fa72d5ff35c94c2995baf601814c68059e40c8442c9ad34d171d0ab36970724768e252b0d4225597d85e128bd511ec9edcce5b99be937c2
+  metadata.gz: a1acce326a10195fe64fd864aa784b5c975122636e194b658572ff1bde82fd7eb5f31fb13bd785447243446f4cd6c31c7e2594feb6082270feb1e43a9fbe2395
+  data.tar.gz: 61f64697186fd3ad6ca35b5a1ee5d9b9725fe705a45a72fc5fd0fb1b1c3f4180f9564d0bb85ed1302195d3c5a2b3fb27ea548412ad57167b0d9a50928bb461d5

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# v0.5.0 2016-01-11
+
+### Changed
+
+* Now depends on `[dry-logic](https://github.com/dryrb/dry-logic` for predicates and rules (solnic)
+* `dry/validation/schema/form` is now required by default (solnic)
+
+### Fixed
+
+* `Schema::Form` uses safe `form.array` and `form.hash` types which fixes #42 (solnic)
+
+[Compare v0.5.1...v0.5.0](https://github.com/dryrb/dry-validation/compare/v0.4.1...v0.5.0)
+
 # v0.4.1 2015-12-27
 
 ### Added

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Ruby Object Mapper
+Copyright (c) 2015 Dryrb Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -42,11 +42,11 @@ be an empty string.
 
 ## The DSL
 
-The core of `dry-validation` is rule composition and predicate logic. The DSL
-is a simple front-end for that. It only allows you to define the rules by using
-predicate identifiers. There are no magical options, conditionals and custom
-validation blocks known from other libraries. The focus is on pure validation
-logic expressed in a concise way.
+The core of `dry-validation` is rule composition and predicate logic provided by
+[dry-logic](https://github.com/dryrb/dry-logic). The DSL is a simple front-end
+for it. It only allows you to define the rules by using predicate identifiers.
+There are no magical options, conditionals and custom validation blocks known from
+other libraries. The focus is on pure validation logic expressed in a concise way.
 
 The DSL is very abstract, it builds [a rule AST](https://github.com/dryrb/dry-validation/wiki/Rule-AST)
 which is compiled into an array of rule objects. This means alternative interfaces could
@@ -74,11 +74,11 @@ Please refer to [the wiki](https://github.com/dryrb/dry-validation/wiki) for ful
 ``` ruby
 class UserSchema < Dry::Validation::Schema
   key(:name) { |name| name.filled? }
-  
+
   key(:email) { |email| email.filled? & email.format?(EMAIL_REGEX) }
-  
+
   key(:age) { |age| age.none? | age.int? }
-  
+
   key(:address) do |address|
    address.key(:street, &:filled?)
    address.key(:city, &:filled?)
@@ -89,7 +89,7 @@ end
 
 ## Status and Roadmap
 
-This library is in an early stage of development but you are encauraged to
+This library is in an early stage of development but you are encouraged to
 try it out and provide feedback.
 
 For planned features check out [the issues](https://github.com/dryrb/dry-validation/labels/feature).

data/dry-validation.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1'
   spec.add_runtime_dependency 'dry-container', '~> 0.2', '>= 0.2.6'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'dry-data', '~> 0.4', '>= 0.4.2'
+  spec.add_runtime_dependency 'dry-logic', '~> 0.1'
+  spec.add_runtime_dependency 'dry-data', '~> 0.5', '>= 0.5.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/dry/validation.rb

@@ -13,3 +13,4 @@ module Dry
 end
 
 require 'dry/validation/schema'
+require 'dry/validation/schema/form'

data/lib/dry/validation/input_type_compiler.rb

@@ -68,11 +68,11 @@ module Dry
       end
 
       def visit_set(node, *args)
-        [:type, ['hash', [:symbolized, node[1].map { |n| visit(n) }]]]
+        [:type, ['form.hash', [:symbolized, node[1].map { |n| visit(n) }]]]
       end
 
       def visit_each(node, *args)
-        [:type, ['array', visit(node[1], *args)]]
+        [:type, ['form.array', visit(node[1], *args)]]
       end
 
       def visit_predicate(node, *args)

data/lib/dry/validation/schema.rb

@@ -1,7 +1,8 @@
+require 'dry/logic/predicates'
+require 'dry/logic/rule_compiler'
+
 require 'dry/validation/schema/definition'
-require 'dry/validation/predicates'
 require 'dry/validation/error'
-require 'dry/validation/rule_compiler'
 require 'dry/validation/messages'
 require 'dry/validation/error_compiler'
 require 'dry/validation/hint_compiler'
@@ -14,7 +15,7 @@ module Dry
       extend Dry::Configurable
       extend Definition
 
-      setting :predicates, Predicates
+      setting :predicates, Logic::Predicates
       setting :messages, :yaml
       setting :messages_file
       setting :namespace
@@ -74,7 +75,7 @@ module Dry
       attr_reader :hint_compiler
 
       def initialize(error_compiler = self.class.error_compiler, hint_compiler = self.class.hint_compiler)
-        compiler = RuleCompiler.new(self)
+        compiler = Logic::RuleCompiler.new(self)
         @rules = compiler.(self.class.rules.map(&:to_ary))
         @checks = self.class.checks
         @groups = compiler.(self.class.groups.map(&:to_ary))
@@ -91,7 +92,7 @@ module Dry
         end
 
         if checks.size > 0
-          compiled_checks = RuleCompiler.new(result.to_h).(checks)
+          compiled_checks = Logic::RuleCompiler.new(result.to_h).(checks)
 
           compiled_checks.each do |rule|
             result << rule.()
@@ -113,7 +114,7 @@ module Dry
         if predicates.key?(name)
           predicates[name]
         elsif respond_to?(name)
-          Predicate.new(name, &method(name))
+          Logic::Predicate.new(name, &method(name))
         else
           raise ArgumentError, "+#{name}+ is not a valid predicate name"
         end

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

@@ -1,5 +1,3 @@
-require 'dry/validation/rule'
-
 module Dry
   module Validation
     class Schema

data/lib/dry/validation/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Validation
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/spec/integration/custom_predicates_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Dry::Validation do
     before do
       module Test
         module Predicates
-          include Dry::Validation::Predicates
+          include Dry::Logic::Predicates
 
           predicate(:email?) do |input|
             input.include?('@') # for the lols

data/spec/integration/schema_form_spec.rb

@@ -1,5 +1,3 @@
-require 'dry/validation/schema/form'
-
 RSpec.describe Dry::Validation::Schema::Form do
   subject(:validation) { schema.new }
 

data/spec/unit/input_type_compiler_spec.rb

@@ -251,4 +251,61 @@ RSpec.describe Dry::Validation::InputTypeCompiler, '#call' do
       author: { books: [published: false] }
     )
   end
+
+  it 'supports array? with an each rule' do
+    rule_ast = [
+      [
+        :and, [
+          [:key, [:ids, [:predicate, [:key?, []]]]],
+          [
+            :and, [
+              [:val, [:ids, [:predicate, [:array?, []]]]],
+              [:each, [:ids, [:val, [:ids, [:predicate, [:int?, []]]]]]]
+            ]
+          ]
+        ]
+      ]
+    ]
+
+    input_type = compiler.(rule_ast)
+
+    expect(input_type.('ids' => 'oops')).to eql(ids: 'oops')
+
+    expect(input_type.('ids' => %w(1 2 3))).to eql(ids: [1, 2, 3])
+  end
+
+  it 'supports hash? with a set rule' do
+    rule_ast = [
+      [
+        :and, [
+          [:key, [:address, [:predicate, [:key?, []]]]],
+          [
+            :and, [
+              [:val, [:address, [:predicate, [:hash?, []]]]],
+              [
+                :set, [
+                  :address, [
+                    [
+                      :and, [
+                        [:key, [:street, [:predicate, [:key?, []]]]],
+                        [:val, [: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.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -59,26 +59,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: dry-logic
+  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: dry-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -157,20 +171,7 @@ files:
 - lib/dry/validation/messages/i18n.rb
 - lib/dry/validation/messages/namespaced.rb
 - lib/dry/validation/messages/yaml.rb
-- lib/dry/validation/predicate.rb
-- lib/dry/validation/predicate_set.rb
-- lib/dry/validation/predicates.rb
 - lib/dry/validation/result.rb
-- lib/dry/validation/rule.rb
-- lib/dry/validation/rule/check.rb
-- lib/dry/validation/rule/composite.rb
-- lib/dry/validation/rule/each.rb
-- lib/dry/validation/rule/group.rb
-- lib/dry/validation/rule/key.rb
-- lib/dry/validation/rule/result.rb
-- lib/dry/validation/rule/set.rb
-- lib/dry/validation/rule/value.rb
-- lib/dry/validation/rule_compiler.rb
 - lib/dry/validation/schema.rb
 - lib/dry/validation/schema/definition.rb
 - lib/dry/validation/schema/form.rb
@@ -197,45 +198,10 @@ files:
 - spec/integration/schema/xor_spec.rb
 - spec/integration/schema_form_spec.rb
 - spec/integration/schema_spec.rb
-- spec/shared/predicates.rb
 - spec/spec_helper.rb
 - spec/unit/error_compiler_spec.rb
 - spec/unit/hint_compiler_spec.rb
 - spec/unit/input_type_compiler_spec.rb
-- spec/unit/predicate_spec.rb
-- spec/unit/predicates/bool_spec.rb
-- spec/unit/predicates/date_spec.rb
-- spec/unit/predicates/date_time_spec.rb
-- spec/unit/predicates/decimal_spec.rb
-- spec/unit/predicates/empty_spec.rb
-- spec/unit/predicates/eql_spec.rb
-- spec/unit/predicates/exclusion_spec.rb
-- spec/unit/predicates/filled_spec.rb
-- spec/unit/predicates/float_spec.rb
-- spec/unit/predicates/format_spec.rb
-- spec/unit/predicates/gt_spec.rb
-- spec/unit/predicates/gteq_spec.rb
-- spec/unit/predicates/inclusion_spec.rb
-- spec/unit/predicates/int_spec.rb
-- spec/unit/predicates/key_spec.rb
-- spec/unit/predicates/lt_spec.rb
-- spec/unit/predicates/lteq_spec.rb
-- spec/unit/predicates/max_size_spec.rb
-- spec/unit/predicates/min_size_spec.rb
-- spec/unit/predicates/none_spec.rb
-- spec/unit/predicates/size_spec.rb
-- spec/unit/predicates/str_spec.rb
-- spec/unit/predicates/time_spec.rb
-- spec/unit/rule/check_spec.rb
-- spec/unit/rule/conjunction_spec.rb
-- spec/unit/rule/disjunction_spec.rb
-- spec/unit/rule/each_spec.rb
-- spec/unit/rule/group_spec.rb
-- spec/unit/rule/implication_spec.rb
-- spec/unit/rule/key_spec.rb
-- spec/unit/rule/set_spec.rb
-- spec/unit/rule/value_spec.rb
-- spec/unit/rule_compiler_spec.rb
 - spec/unit/schema/rule_spec.rb
 - spec/unit/schema/value_spec.rb
 - spec/unit/schema_spec.rb
@@ -281,45 +247,10 @@ test_files:
 - spec/integration/schema/xor_spec.rb
 - spec/integration/schema_form_spec.rb
 - spec/integration/schema_spec.rb
-- spec/shared/predicates.rb
 - spec/spec_helper.rb
 - spec/unit/error_compiler_spec.rb
 - spec/unit/hint_compiler_spec.rb
 - spec/unit/input_type_compiler_spec.rb
-- spec/unit/predicate_spec.rb
-- spec/unit/predicates/bool_spec.rb
-- spec/unit/predicates/date_spec.rb
-- spec/unit/predicates/date_time_spec.rb
-- spec/unit/predicates/decimal_spec.rb
-- spec/unit/predicates/empty_spec.rb
-- spec/unit/predicates/eql_spec.rb
-- spec/unit/predicates/exclusion_spec.rb
-- spec/unit/predicates/filled_spec.rb
-- spec/unit/predicates/float_spec.rb
-- spec/unit/predicates/format_spec.rb
-- spec/unit/predicates/gt_spec.rb
-- spec/unit/predicates/gteq_spec.rb
-- spec/unit/predicates/inclusion_spec.rb
-- spec/unit/predicates/int_spec.rb
-- spec/unit/predicates/key_spec.rb
-- spec/unit/predicates/lt_spec.rb
-- spec/unit/predicates/lteq_spec.rb
-- spec/unit/predicates/max_size_spec.rb
-- spec/unit/predicates/min_size_spec.rb
-- spec/unit/predicates/none_spec.rb
-- spec/unit/predicates/size_spec.rb
-- spec/unit/predicates/str_spec.rb
-- spec/unit/predicates/time_spec.rb
-- spec/unit/rule/check_spec.rb
-- spec/unit/rule/conjunction_spec.rb
-- spec/unit/rule/disjunction_spec.rb
-- spec/unit/rule/each_spec.rb
-- spec/unit/rule/group_spec.rb
-- spec/unit/rule/implication_spec.rb
-- spec/unit/rule/key_spec.rb
-- spec/unit/rule/set_spec.rb
-- spec/unit/rule/value_spec.rb
-- spec/unit/rule_compiler_spec.rb
 - spec/unit/schema/rule_spec.rb
 - spec/unit/schema/value_spec.rb
 - spec/unit/schema_spec.rb

data/lib/dry/validation/predicate.rb

@@ -1,35 +0,0 @@
-module Dry
-  module Validation
-    def self.Predicate(block)
-      case block
-      when Method then Predicate.new(block.name, &block)
-      else raise ArgumentError, 'predicate needs an :id'
-      end
-    end
-
-    class Predicate
-      include Dry::Equalizer(:id)
-
-      attr_reader :id, :args, :fn
-
-      def initialize(id, *args, &block)
-        @id = id
-        @fn = block
-        @args = args
-      end
-
-      def call(*args)
-        fn.(*args)
-      end
-
-      def curry(*args)
-        self.class.new(id, *args, &fn.curry.(*args))
-      end
-
-      def to_ary
-        [:predicate, [id, args]]
-      end
-      alias_method :to_a, :to_ary
-    end
-  end
-end