dry-mutations 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 777dcd71e9799d0d49a7e695a55402cab042f047
-  data.tar.gz: 77defc333baf157827bbec9ffd92a8bd3f53585e
+  metadata.gz: 9346b654bae4273294f8c7ee18f0fdd0c9d7be56
+  data.tar.gz: 578fb14621e715e8b3a36941d685295e36159fc0
 SHA512:
-  metadata.gz: c13d02d970d8222ff4a8f61591124da209bb52249d66457179bb875aa69204b7aae30fde975836f13b420b6e322689964ece718ebc90b7b14a345ac46d496a96
-  data.tar.gz: 8eee17f91a8c1e31546306bf6ba9bb420b62fe2bd28c18d5686eb9829a37f87dad3e354754e25623fa727308b0170980041ce9802a6ee8783670f8d0ddc8dbf9
+  metadata.gz: 1208949dedcb0550201668e796f544f757adfad8223c2c5b457938000ad82577d2ecf3abbf6a096278e996cbb7ba1ce123d5e3ebff377f4e707f13acbc2cc5c8
+  data.tar.gz: 7300929b9559be9476b5c4ffdb9f7d06e23dcc22c706d690c439470daf5b72889dec31bae64dcbe0d692002050bc6727c1333ceeaf14b0140ad6e227d6eaf4fc

data/README.md

@@ -162,7 +162,53 @@ required do
 end
 ```
 
-## Dealing `outcome`
+## Combining dry schemas with mutation-like syntax
+
+Since version `0.11.1`, one might pass the instance of `Dry::Validation::Schema`
+and/or `Dry::Validation::Form` instance to `schema` mutation DSL. Such a block
+might be _only one_, and it _must be_ the first DSL in the mutation:
+
+### Correct
+
+```ruby
+Class.new(::Mutations::Command) do
+  prepend ::Dry::Mutations::Extensions::Command
+  prepend ::Dry::Mutations::Extensions::Sieve
+
+  schema(::Dry::Validation.Form do
+    required(:integer_value).filled(:int?, gt?: 0)
+    required(:date_value).filled(:date?)
+    required(:bool_value).filled(:bool?)
+  end)
+
+  required do
+    integer :forty_two
+    string :hello
+  end
+end
+```
+
+### Incorrect
+
+```ruby
+Class.new(::Mutations::Command) do
+  prepend ::Dry::Mutations::Extensions::Command
+  prepend ::Dry::Mutations::Extensions::Sieve
+
+  required do
+    integer :forty_two
+    string :hello
+  end
+
+  schema(::Dry::Validation.Form do
+    required(:integer_value).filled(:int?, gt?: 0)
+    required(:date_value).filled(:date?)
+    required(:bool_value).filled(:bool?)
+  end)
+end
+```
+
+## Dealing with `outcome`
 
 ### Command
 

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

@@ -3,7 +3,7 @@ module Dry
     module DSL # :nodoc:
       module Schema # :nodoc:
         def schema schema = nil, input_processor: nil, **options, &block
-          @schema ||= schema || derived_schema(input_processor: input_processor, **options, &block)
+          @schema ||= patched_schema(schema) || derived_schema(input_processor: input_processor, **options, &block)
           return @schema unless block_given?
 
           @schema = Validation.Schema(@schema, **@schema.options, &Proc.new)
@@ -25,6 +25,13 @@ module Dry
             ::Dry::Mutations.Schema(input_processor: input_processor, **options, &block)
           end
         end
+
+        def patched_schema(schema)
+          return nil unless schema.is_a?(::Dry::Validation::Schema)
+          schema.tap do |s|
+            s.config.instance_eval(&::Dry::Mutations::Schema::CONFIGURATOR)
+          end
+        end
       end
     end
   end

data/lib/dry/mutations/schema.rb

@@ -4,17 +4,18 @@ module Dry
       @@discarded = []
 
       MESSAGES_FILE = (::File.join __dir__, '..', '..', '..', 'config', 'messages.yml').freeze
-
-      configure do |config|
+      CONFIGURATOR = ->(config) do
         config.messages_file = MESSAGES_FILE
         config.hash_type = :symbolized
-        config.input_processor = :sanitizer
-
-        config.instance_variable_set :@discarded, []
-
-        predicates(::Dry::Mutations::Predicates)
+        config.input_processor = :sanitizer if config.input_processor == :noop
+        config.predicates = ::Dry::Mutations::Predicates
+        this = is_a?(::Dry::Validation::Schema) ? self : singleton_class
+        config.registry = ::Dry::Validation::PredicateRegistry[this, config.predicates]
       end
 
+      configure(&CONFIGURATOR)
+      # predicates(::Dry::Mutations::Predicates)
+
       def discarded
         @@discarded
       end

data/lib/dry/mutations/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Mutations
-    VERSION = '0.11.0'.freeze
+    VERSION = '0.11.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-mutations
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Aleksei Matiushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -390,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Mutations gem interface implemented with `dry-rb`’s validation schemas.