dry-mutations 0.8.12 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f49ca2fa2417fe1742ed3fa35e912ac08a83cf30
-  data.tar.gz: c688fd3329e66ffeac44de2af98e01f4a5dc2e01
+  metadata.gz: 037fef1da0d822b477b53b0d2e5cbbc68739148e
+  data.tar.gz: ca900597fee286845d886cd93d7d9041460f4dc7
 SHA512:
-  metadata.gz: ccaea6b0d3b35983de61d2346d58f792a160e9cd5966be7f2206457fc4f26f08f70846431f64b454cddf796dbf5870568c4794b53d2d88cb2994b241d32f1a24
-  data.tar.gz: ebcb6185a4d5ae865acf1091faf1ce6fa3c67bc2770d8b95aa73b62ba42e56650b71f4fcb8920847fc9a631cacc659f6f78559a40727c6029641086a5a2abf56
+  metadata.gz: dd0b5855b30691cf2e22968ea246c6a810c90573388451893ccb6ed1f558b30531aae0f0176ae53256266fc02f7c75759291340b84e8d9bacc5e5050a4edd8dc
+  data.tar.gz: d8cabef109dda5d57dec635890fc333c2e1871926fafe6731b6110b262fcfc1e98988ed12ebfcb6db16f4a2694d2de47bbb9af1e8ed0417630ced6974fe2d2b1

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

@@ -75,13 +75,7 @@ module Dry
         ########################################################################
 
         def validation_outcome(result = nil)
-          # Outcome.new(!has_errors?, has_errors? ? nil : result, @errors, @inputs)
-          super.tap do |outcome|
-            outcome.singleton_class.tap do |klazz|
-              klazz.prepend Outcome unless klazz.ancestors.include?(Outcome)
-            end
-            outcome.eitherify!
-          end
+          ::Dry::Mutations::Extensions::Outcome(super)
         end
 
         def execute

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

@@ -7,10 +7,10 @@ module Dry
         class EitherCalculator # :nodoc:
           include Dry::Monads::Either::Mixin
 
-          attr_accessor :outcome
+          attr_reader :outcome, :either
 
-          def calculate
-            Right(outcome).bind do |value|
+          def initialize(outcome)
+            @either = Right(@outcome = outcome).bind do |value|
               value.success? ? Right(value.result) : Left(value.errors)
             end
           end
@@ -41,32 +41,23 @@ module Dry
         end
 
         def self.prepended base
-          fail ArgumentError, "Can not prepend #{self.class} to #{base.class}: base class must be a ::Mutations::Outcome descendant." unless base < ::Mutations::Outcome
+          fail ArgumentError, "Can not prepend #{self} to #{base}: base class must be a ::Mutations::Outcome descendant." unless base <= ::Mutations::Outcome
         end
 
-        attr_reader :either
-
-        def initialize(is_success, result, errors, inputs)
-          super is_success, result, errors, inputs
-          etherify!
-        end
-
-        def eitherify!
-          calc = EitherCalculator.new
-          calc.outcome = self
-          @either = calc.calculate
+        def either
+          @either ||= EitherCalculator.new(self).either
         end
 
         def right?
-          @either.is_a?(Right)
+          either.is_a?(Right)
         end
 
         def left?
-          @either.is_a?(Left)
+          either.is_a?(Left)
         end
 
         def value
-          @either.value
+          either.value
         end
 
         def match
@@ -74,6 +65,21 @@ module Dry
           Matcher.!.(self, &Proc.new)
         end
       end
+
+      ::Mutations::Outcome.prepend Outcome unless ::Mutations::Outcome.ancestors.include?(Outcome)
+
+      def self.Outcome input
+        case input
+        when ::Mutations::Outcome then input
+        when ::Dry::Monads::Either::Left
+          ::Mutations::Outcome.new(false, nil, input.value, nil)
+        when ::Dry::Monads::Either::Right
+          ::Mutations::Outcome.new(true, input.value, nil, nil)
+        when ->(inp) { inp.respond_to?(:success?) }
+          ::Mutations::Outcome.new(input.success?, input.success? && input, input.success? || input, nil)
+        else fail TypeError.new("Wrong input passed to Outcome(): [#{input.inspect}]")
+        end
+      end
     end
   end
 end

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

@@ -25,7 +25,9 @@ module Dry
             singleton_class.send :define_method, :call do |input|
               transaction.(input)
             end
-            singleton_class.send(:alias_method, :run, :call) unless singleton_class.respond_to?(:run)
+            singleton_class.send :define_method, :run do |input|
+              ::Dry::Mutations::Extensions::Outcome(transaction.(input))
+            end
           end
         end
       end

data/lib/dry/mutations/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Mutations
-    VERSION = '0.8.12'.freeze
+    VERSION = '0.8.13'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-mutations
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors:
 - Aleksei Matiushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler