dry-mutations 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23228f617c8162feb245848da2e562f4b9425bc7
-  data.tar.gz: 40dc518c5051e58a87950020bccdaf0de17b7dd9
+  metadata.gz: 25dba4781a90bcb4441444f72940618ee5cfedac
+  data.tar.gz: 44ee6fb881a76e12e503933602d696b1169a3527
 SHA512:
-  metadata.gz: 72fed50dd92a78813505cb95db253999860513d8253f0c5a568fa7dba370920c7cc8439b6ebba3a58473bf7c03ffb727481f84802e090029c8b0da93621d1e85
-  data.tar.gz: b91a085cdc2d0a279d527734c3b55e632cda6722cacc898e0d213c3612182f8800ff7256ffe6b1be0debd2103381301278630755d6d6f219680cc7a17f611750
+  metadata.gz: cbb1fce1ab811cc3bfa2384569f1a2d9e245f15bedc29571a8757640a9d81befd360506f2f49a1544caedda3ef8baaa4e0d1dc75edbd7750f98ffa57a22f6369
+  data.tar.gz: a141667b23e85eb60549dd6623ca7d80918979e5ddb67fbf7752fbb844eacf81d1c61856ab1bf56e5e35778cb50bfd7afe86c27489f1847e00da3c519552dd6c

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dry-mutations (1.0.0)
+    dry-mutations (1.1.0)
       activesupport (>= 3.2, < 5)
-      dry-transaction (~> 0.9)
+      dry-transaction (~> 0.9, < 0.10)
       dry-validation (~> 0.10)
       hashie (~> 3)
       mutations (~> 0.8)
@@ -32,12 +32,12 @@ GEM
     concurrent-ruby (1.0.5)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    dry-configurable (0.6.1)
+    dry-configurable (0.7.0)
       concurrent-ruby (~> 1.0)
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.2.4)
+    dry-core (0.3.1)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.0)
     dry-logic (0.4.1)
@@ -45,14 +45,15 @@ GEM
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
     dry-matcher (0.6.0)
-    dry-monads (0.2.1)
+    dry-monads (0.3.1)
+      dry-core
       dry-equalizer
     dry-transaction (0.9.0)
       dry-container (>= 0.2.8)
       dry-matcher (>= 0.5.0)
       dry-monads (>= 0.0.1)
       wisper (>= 1.6.0)
-    dry-types (0.9.4)
+    dry-types (0.10.3)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1)
       dry-container (~> 0.3)
@@ -60,7 +61,7 @@ GEM
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.4, >= 0.4.0)
       inflecto (~> 0.0.0, >= 0.0.2)
-    dry-validation (0.10.5)
+    dry-validation (0.10.7)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-core (~> 0.2, >= 0.2.1)
@@ -103,7 +104,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    wisper (1.6.1)
+    wisper (2.0.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -348,6 +348,9 @@ def validate # input ≡ { date: nil }
 end
 ```
 
+#### 1.1.0
+More handy `chain`s, better `dry-rb` integration, improvements.
+
 #### 0.99.0
 Support for `default:` guard. 99%-compatibility with `mutations`
 

data/dry-mutations.gemspec

@@ -39,5 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hashie', '~> 3'
 
   spec.add_dependency 'dry-validation', '~> 0.10'
-  spec.add_dependency 'dry-transaction', '~> 0.9'
+  spec.add_dependency 'dry-transaction', '~> 0.9', '< 0.10'
 end

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

@@ -35,11 +35,11 @@ module Dry
         attr_reader :validation
 
         def initialize(*args)
-          @raw_inputs = defaults.merge Utils.RawInputs(*args)
-
+          @raw_inputs = defaults.merge(Utils.RawInputs(*args))
           @validation_result = discard_empty!
+          @inputs = Utils.Hash @validation_result.output
 
-          @inputs = fix_accessors Utils.Hash @validation_result.output
+          fix_accessors!
 
           # dry: {:name=>["size cannot be greater than 10"],
           #       :properties=>{:first_arg=>["must be a string", "is in invalid format"]},
@@ -99,6 +99,7 @@ module Dry
           super
         rescue => e
           add_error(:♻, :runtime_exception, e.message)
+          raise e
         end
 
         def add_error(key, kind, message = nil, dry_message = nil)
@@ -110,7 +111,7 @@ module Dry
           #            path=[:maturity_set, :maturity_days_set, :days],
           #            text=\"must be an integer\",
           #            options={:args=>[], :rule=>:days, :each=>false}>"
-          dry_message ||= ::Dry::Validation::Message.new(kind, *path.map(&:to_sym), message, rule: :♻)
+          dry_message ||= ::Dry::Validation::Message.new(kind, key, message, rule: :♻)
           atom = Errors::ErrorAtom.new(key, kind, dry_message, message: message)
 
           last = path.pop
@@ -169,8 +170,8 @@ module Dry
           )
         end
 
-        def fix_accessors hash
-          hash.each do |method, _|
+        def fix_accessors!
+          schema.rules.keys.each do |method|
             next if respond_to?(name = method)
 
             singleton_class.tap do |c|

data/lib/dry/mutations/transactions/container.rb

@@ -1,12 +1,14 @@
 module Dry
   module Mutations
     module Transactions # :nodoc:
+      # rubocop:disable Style/MultilineTernaryOperator
       Container = lambda do |whatever|
         return ->(*input) { input } unless whatever
         whatever.respond_to?(:call) ? whatever : Utils.Constant(whatever).tap do |p|
           fail ArgumentError, "The argument must respond to :call, though #{whatever.inspect} passed." unless p.respond_to? :call
         end
       end
+      # rubocop:enable Style/MultilineTernaryOperator
     end
   end
 end

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

@@ -7,39 +7,47 @@ module Dry
       #   step :validate
       #   step :persist
       # end
+
       module DSL # :nodoc:
         include Dry::Monads::Either::Mixin
 
+        # rubocop:disable Style/MultilineIfModifier
         def self.extended base
           fail Errors::TypeError.new("Extended class [#{base}] should not respond to :call, it is defined by this extension.") if base.respond_to?(:call)
-          base.send :define_method, :initialize do |input|
-            @input = input
+          base.send :define_method, :initialize do |*input|
+            @input = Utils.RawInputs(*input)
           end unless base.instance_methods(false).include?(:initialize)
-          %i(run run!).each do |meth|
+          %i(call run run!).each do |meth|
             base.send :define_method, meth do
               base.public_send(meth, @input)
             end unless base.instance_methods(false).include?(meth)
           end
         end
+        # rubocop:enable Style/MultilineIfModifier
 
         def chain **params
           return enum_for(:chain) unless block_given? # FIXME: Needed? Works? Remove?
 
+          # rubocop:disable Style/VariableNumber
           λ = Proc.new
 
-          @transaction = ::Dry.Transaction(container: ::Dry::Mutations::Transactions::Container, step_adapters: StepAdapters) do
+          @transaction = ::Dry.Transaction(
+            container: ::Dry::Mutations::Transactions::Container,
+            step_adapters: StepAdapters
+          ) do
             instance_eval(&λ)
           end.tap do |transaction|
-            singleton_class.send :define_method, :call do |input|
-              transaction.(input)
+            singleton_class.send :define_method, :call do |*input|
+              transaction.(Utils.RawInputs(*input))
             end
-            singleton_class.send :define_method, :run do |input|
-              ::Dry::Mutations::Extensions::Outcome(transaction.(input))
+            singleton_class.send :define_method, :run do |*input|
+              ::Dry::Mutations::Extensions::Outcome(transaction.(Utils.RawInputs(*input)))
             end
-            singleton_class.send :define_method, :run! do |input|
-              ::Dry::Mutations::Extensions::Outcome!(transaction.(input))
+            singleton_class.send :define_method, :run! do |*input|
+              ::Dry::Mutations::Extensions::Outcome!(transaction.(Utils.RawInputs(*input)))
             end
           end
+          # rubocop:enable Style/VariableNumber
         end
       end
     end

data/lib/dry/mutations/transactions/step_adapters.rb

@@ -17,7 +17,7 @@ module Dry
           end
 
           def call(step, *args, input)
-            step.operation.(input, *args)
+            step.operation.(input, *args, &step.block)
           end
         end
 

data/lib/dry/mutations/transactions/step_adapters/chain.rb

@@ -0,0 +1,22 @@
+module Dry
+  module Mutations
+    module Transactions # :nodoc:
+      # http://dry-rb.org/gems/dry-transaction/custom-step-adapters/
+      # step adapters must provide a single `#call(step, *args, input)` method,
+      #   which should return the step’s result wrapped in an `Either` object.
+      # This one is a wrapper for neted chains
+      class Chain < StepAdapters::Move
+        def call(step, *args, input)
+          if step.block
+            Class.new do
+              extend ::Dry::Mutations::Transactions::DSL
+              chain(&step.block)
+            end.(input, *args)
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dry/mutations/utils/dry-mutations.rb

@@ -1,4 +1,7 @@
+# rubocop:disable Style/FileName
 require 'dry-types'
+# rubocop:enable Style/FileName
+
 module Dry
   module Mutations
     module Utils # :nodoc:

data/lib/dry/mutations/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Mutations
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-mutations
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Aleksei Matiushkin
@@ -183,6 +183,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -190,6 +193,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: |2
       Mutations gem interface implemented with `dry-rb`’s validation schemas.
 email:
@@ -240,6 +246,7 @@ files:
 - lib/dry/mutations/transactions/container.rb
 - lib/dry/mutations/transactions/dsl.rb
 - lib/dry/mutations/transactions/step_adapters.rb
+- lib/dry/mutations/transactions/step_adapters/chain.rb
 - lib/dry/mutations/transactions/step_adapters/mutate.rb
 - lib/dry/mutations/transactions/step_adapters/tranquilo.rb
 - lib/dry/mutations/transactions/step_adapters/transform.rb