dry-mutations 0.99.2 → 0.99.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2737879381ea7e6b16728251b38259eb487a6ec3
-  data.tar.gz: 678d954f5325839ee83665614039fa848ace4573
+  metadata.gz: 3ecccccba39df150e33413f46b687f0f0075e258
+  data.tar.gz: f622cf4b467f91d4ab5d77b8f9e781b312e60fd2
 SHA512:
-  metadata.gz: f1c48b5bc25691331145a708e87e1745c091f17f5f6291a308eb491863433e7c5e410e55cf8d6dc19dedda46d8395f20a0e6497d9b5db720cf05b7422629ac7c
-  data.tar.gz: 00c2063c2b10bcf5a29323aaa4b53e8d580920100ccdfd83ab65d8a3cc266ca4222abc894f56194c2ba5bdaf311da051230ca6a4ea2299a3bca9ee0ad8809502
+  metadata.gz: b4abbb1d1856b4086ec31be72f25c804409bd9aa47dcc579bd901a1eefb6831e911052d112f7acabadecf13e93fd2629afb5569543b008e097bc176bb1703037
+  data.tar.gz: 373f196cc267a68a6d63470f7fcbf84c3d70724f51f847c3cacd479fa91c43b2378a8d17847e87840f11428c6d164482330768878ac00c7e7c246242dd05e613

data/README.md

@@ -53,7 +53,7 @@ end
 ```ruby
 class ComposedValidation < Mutations::Command
   prepend ::Dry::Mutations::Extensions::Command
-  prepend ::Dry::Mutations::Extensions::Dummy
+  prepend ::Dry::Mutations::Extensions::Sieve
 
   ...
   def validate
@@ -152,21 +152,37 @@ UserSchema = Dry::Validation.Schema do
 end
 ```
 
-or, in legacy `mutations` syntax (**NB! This is not yet implemented!**):
+or, in legacy `mutations` syntax (**NB! Starting with `0.99.9`!**):
 
 ```ruby
 required do
-  string :email
   string :name
   schema :address, AddressSchema
+  string :email
 end
 ```
 
 ## Combining dry schemas with mutation-like syntax
 
+Since version `0.99.9`, one might pass the `Dry::Validation::Schema` directly
+to legacy mutations syntax:
+
+```ruby
+required do
+  model :user
+  schema :address, AddressSchema # AddressSchema = ::Dry::Validation.Schema {}
+  date: Date.today
+end
+```
+
+---
+
 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:
+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.
+**NB** this is not a preferred way to do things, but it might be useful to _share_
+schemas (unlikely the above, this will _embed_ the schema, rather than _nest_ it.)
 
 ### Correct
 

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

@@ -2,11 +2,23 @@ module Dry
   module Mutations
     module DSL # :nodoc:
       module Schema # :nodoc:
-        def schema schema = nil, input_processor: nil, **options, &block
-          @schema ||= patched_schema(schema) || derived_schema(input_processor: input_processor, **options, &block)
-          return @schema unless block_given?
+        def schema *args, input_processor: nil, **options, &block
+          case args.count
+          when 0, 1
+            schema, = args
+            @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)
+            @schema = Validation.Schema(@schema, **@schema.options, &Proc.new)
+          when 2 # explicit dry schema given
+            name = args.first
+            current = @current # closure scope
+
+            schema do
+              Utils.smart_send(__send__(current, name), :schema, args.last, **options, &block)
+            end
+            define_method(name) { Utils::Hash(@inputs[name]) }
+          end
         end
 
         private

data/lib/dry/mutations/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Mutations
-    VERSION = '0.99.2'.freeze
+    VERSION = '0.99.9'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-mutations
 version: !ruby/object:Gem::Version
-  version: 0.99.2
+  version: 0.99.9
 platform: ruby
 authors:
 - Aleksei Matiushkin