dry-mutations 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9ed6f4872b96d36e2fea5b3eee2126c0555a0be
-  data.tar.gz: 30fcd69467a7a873d9c39085b5be1f5bf2bd5d0c
+  metadata.gz: 760fe6575962834c3d430912f8caf909a1fb110b
+  data.tar.gz: 0de4a65993b087bcd3474f54f0a7633eb9a69148
 SHA512:
-  metadata.gz: 59771ac3fd3024eb83451a8ba84ff4abb741ef5ce18954830e6da5f00ceda526ae09d1cb866577f5c3a1328bbb4e3edf09c3cc024b645e786758047551674e9f
-  data.tar.gz: f74ccc264978e504a0c4a261c22db1c243e2c6936e6ee2546d0806f28e175a18241cd968c9dfb4db8e5ddcc0b0088b5fe3bb1b3bad51cc9d8335c075a5e413b5
+  metadata.gz: 35a791a79e10cb3aadf1ea351359aa6e92f554b3bcd481a3d61615839fc00750487184f6ec4d58b930a6903630471e3323fe98a61bc9aef50b1858f9f8df79e7
+  data.tar.gz: 6f42e471b03e94e146f8c273697808f080938a795ed75acdbe5c4e184faef00bb6a137d4777ce9078eb023adf64cdd1916c39d4000573bd9790dd7f4a4ef0135

data/config/messages.yml

@@ -2,3 +2,4 @@ en:
   errors:
     duck?: 'must respond to %{expected}'
     model?: 'must be a model (instance of %{expected})'
+    discard_empty: 'aleksei’s too dumb error (%{expected},) you won :-P'

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

@@ -20,16 +20,20 @@ module Dry
         ########################################################################
 
         # FIXME: errors in double+ nested hashes are not nested! dry-rb glitch?
-        def hash name, **_params, &cb
+        def hash name, **params, &cb
           current = @current # closure scope
 
           schema { __send__(current, name).schema(Nested.!(current, &cb)) }
 
-          define_method(name) { Utils::Hash(@inputs[name]) } unless Nested === self
+          case
+          when params[:discard_empty] then schema.discarded!(name)
+          when Nested === self then # do nothing
+          else define_method(name) { Utils::Hash(@inputs[name]) }
+          end
         end
 
         # FIXME: array of anonymous objects
-        def array name, **_params, &cb
+        def array name, **params, &cb
           current = @current # closure scope
 
           nested =  begin
@@ -40,7 +44,11 @@ module Dry
 
           name.nil? ? schema { each(nested) } : schema { __send__(current, name).each(nested) }
 
-          define_method(name) { @inputs[name] } unless Nested === self
+          case
+          when params[:discard_empty] then schema.discarded!(name)
+          when Nested === self then # do nothing
+          else define_method(name) { @inputs[name] }
+          end
         end
 
         ########################################################################
@@ -95,7 +103,7 @@ module Dry
             Utils.smart_send(__send__(current, name), *type, **opts)
           end
 
-          define_helper_methods name
+          params[:discard_empty] ? schema.discarded!(name) : define_helper_methods(name)
         end
 
         %i(string integer float date time boolean).each do |m|
@@ -107,9 +115,8 @@ module Dry
         private
 
         def optionality params
-          nils, empty = params.delete(:nils), params.delete(:empty)
           # FIXME: Should we treat `empty?` in some specific way?
-          nils || empty ? :maybe : :filled
+          params.delete(:nils) || params.delete(:empty) || params[:discard_empty] ? :maybe : :filled
         end
 
         def define_helper_methods name

data/lib/dry/mutations/extensions/command.rb

@@ -37,7 +37,7 @@ module Dry
         def initialize(*args)
           @raw_inputs = Utils.RawInputs(*args)
 
-          @validation_result = schema.(@raw_inputs)
+          @validation_result = discard_empty!
 
           @inputs = Utils.Hash @validation_result.output
 
@@ -66,6 +66,27 @@ module Dry
           run.either
         end
 
+        ########################################################################
+        ### Legacy mutations support
+        ########################################################################
+
+        def vacant?(value)
+          case value
+          when NilClass then true
+          when Integer, Float then false # FIXME make sure!
+          when ->(v) { v.respond_to? :empty? } then value.empty?
+          when ->(v) { v.respond_to? :blank? } then value.blank?
+          else false
+          end
+        end
+
+        def discard_empty!
+          discarded = schema.discarded
+          schema.(
+            ::Dry::Mutations::Utils.Hash(@raw_inputs.reject { |k, v| discarded.include?(k.to_sym) && vacant?(v) })
+          )
+        end
+
         ########################################################################
         ### Overrides
         ########################################################################

data/lib/dry/mutations/predicates.rb

@@ -23,6 +23,10 @@ module Dry
                    end unless expected.is_a? Module
         current.is_a?(expected)
       end
+
+      predicate(:discard_empty) do |_expected, _current|
+        true
+      end
     end
   end
 end

data/lib/dry/mutations/schema.rb

@@ -1,6 +1,8 @@
 module Dry
   module Mutations
     class Schema < ::Dry::Validation::Schema
+      @@discarded = []
+
       MESSAGES_FILE = (::File.join __dir__, '..', '..', '..', 'config', 'messages.yml').freeze
 
       configure do |config|
@@ -8,8 +10,22 @@ module Dry
         config.hash_type = :symbolized
         config.input_processor = :sanitizer
 
+        config.instance_variable_set :@discarded, []
+
         predicates(::Dry::Mutations::Predicates)
       end
+
+      def discarded
+        @@discarded
+      end
+
+      def discarded?
+        discarded.empty?
+      end
+
+      def discarded! value
+        discarded << value
+      end
     end
   end
 end

data/lib/dry/mutations/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Mutations
-    VERSION = '0.10.0'.freeze
+    VERSION = '0.10.1'.freeze
   end
 end

metadata

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