dry-transaction 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 469bb10618cdbe431bbeace9d17e4865551af4ea
-  data.tar.gz: 876b92d26de8ddf5c97aedb1e01f1228c4faa435
+  metadata.gz: 19a5598d0c611fa9cd909c25cd76fccee443f925
+  data.tar.gz: f7dd7277b815393f51b7eb8cac00db2d8011ab83
 SHA512:
-  metadata.gz: c63eb2b015d1c503e72deeca01b7a7fd4af28ad6b22d38c523d2c6d85babdb076001935ced8a69ecc68ee1d48a590bb3e9b4a28776e1b7fb14c983c6e4826193
-  data.tar.gz: eba9fba94389262aac0b0a342fc3a36203c84160b54bd664f8952660be4772a58f83f32e1f66cf07d393ac15d6b1a1dcd7631e0ad973d2eb0c62b866acf586e7
+  metadata.gz: 3310c5583f9fc9c3d84dad54db9b71908227309e4325adc9f38d3a26aca64a699a66e75d0a3d05173beaf002d246fea7ed434300793ad1308bd6638fbb404505
+  data.tar.gz: 6dea0341d58c8da07a06bb1ec2fbb82ca793a47969f6f4acacf29dd445996910fdbcc9f096f0d286b4aabcef6343a946262f3b98197155059010294e3f9eb448

data/Gemfile

@@ -3,11 +3,12 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem "codeclimate-test-reporter", require: nil
+  gem "simplecov"
+  gem "codeclimate-test-reporter"
   gem "byebug", platform: :mri
 end
 
 group :tools do
   gem "pry"
-  gem "dry-container"
+  gem "rubocop"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dry-transaction (0.8.0)
+    dry-transaction (0.9.0)
       dry-container (>= 0.2.8)
       dry-matcher (>= 0.5.0)
       dry-monads (>= 0.0.1)
@@ -10,27 +10,34 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.3.0)
     byebug (8.2.2)
     codeclimate-test-reporter (0.5.0)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    dry-configurable (0.1.4)
+    dry-configurable (0.4.0)
       concurrent-ruby (~> 1.0)
-    dry-container (0.3.1)
+    dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-matcher (0.5.0)
-    dry-monads (0.0.2)
+    dry-equalizer (0.2.0)
+    dry-matcher (0.6.0)
+    dry-monads (0.2.0)
+      dry-equalizer
     json (1.8.3)
     method_source (0.8.2)
+    parser (2.3.1.4)
+      ast (~> 2.2)
+    powerpack (0.1.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.4.2)
+    rainbow (2.1.0)
+    rake (11.2.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -44,12 +51,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
+    rubocop (0.43.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
+    unicode-display_width (1.1.1)
     wisper (1.6.1)
     yard (0.8.7.6)
 
@@ -57,16 +72,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12.2)
+  bundler (~> 1.13.1)
   byebug
   codeclimate-test-reporter
-  dry-container
   dry-transaction!
   pry
-  rake (~> 10.4.2)
+  rake (~> 11.2.2)
   rspec (~> 3.3.0)
-  simplecov (~> 0.10.0)
+  rubocop
+  simplecov
   yard
 
 BUNDLED WITH
-   1.12.3
+   1.13.2

data/README.md

@@ -13,11 +13,41 @@
 
 dry-transaction is a business transaction DSL. It provides a simple way to define a complex business transaction that includes processing by many different objects.
 
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'dry-transaction'
+```
+
+And then execute:
+
+```sh
+$ bundle
+```
+
+Or install it yourself as:
+
+```sh
+$ gem install dry-transaction
+```
+
 ## Links
 
 * [Documentation](http://dry-rb.org/gems/dry-transaction)
 * [API documentation](http://www.rubydoc.info/github/dry-rb/dry-transaction)
 
+## Development
+
+After checking out the repo, run `bundle install` to install dependencies. Then, run
+`rake spec` to run the tests. You can also run `bin/console` for an interactive
+prompt that will allow you to experiment.
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at <https://github.com/dry-rb/dry-transaction>.
+
 ## License
 
 Copyright © 2015-2016 [Icelab](http://icelab.com.au/). dry-transaction is free software, and may be redistributed under the terms specified in the [license](LICENSE.md).

data/lib/dry/transaction.rb

@@ -1,6 +1,7 @@
 require "dry/monads/either"
 require "dry/transaction/version"
 require "dry/transaction/dsl"
+require "dry/transaction/api"
 
 module Dry
   # Define a business transaction.
@@ -10,10 +11,10 @@ module Dry
   #
   # The operations should be addressable via `#[]` in a container object that
   # you pass when creating the transaction. The operations must respond to
-  # `#call(*args, input)`.
+  # `#call(input, *args)`.
   #
   # Each operation will be called in the order it was specified in your
-  # transaction, with its output is passed as the input to the next operation.
+  # transaction, with its output passed as the input to the next operation.
   # Operations will only be called if the previous step was a success.
   #
   # A step is successful when it returns a [dry-monads](dry-monads) `Right` object
@@ -47,10 +48,32 @@ module Dry
   # @option options [#[]] :step_adapters (Dry::Transaction::StepAdapters) a custom container of step adapters
   # @option options [Dry::Matcher] :matcher (Dry::Transaction::ResultMatcher) a custom matcher object for result matching block API
   #
-  # @return [Dry::Transaction::Sequence] the transaction object
+  # @return [Dry::Transaction] the transaction object
   #
   # @api public
   def self.Transaction(options = {}, &block)
     Transaction::DSL.new(options, &block).call
   end
+
+  # This is the class that actually stores the transaction.
+  # To be precise, it stores a series of steps that make up a transaction and
+  # a matcher for handling the result of the transaction.
+  #
+  # Never instantiate this class directly, it is intended to be created through
+  # the provided DSL.
+  class Transaction
+    include API
+
+    # @api private
+    attr_reader :steps
+
+    # @api private
+    attr_reader :matcher
+
+    # @api private
+    def initialize(steps, matcher)
+      @steps = steps
+      @matcher = matcher
+    end
+  end
 end

data/lib/dry/transaction/{sequence.rb → api.rb}

@@ -1,23 +1,8 @@
 require "dry/monads/either"
-require "dry/transaction/dsl"
 
 module Dry
-  module Transaction
-    class Sequence
-      include Dry::Monads::Either::Mixin
-
-      # @api private
-      attr_reader :steps
-
-      # @api private
-      attr_reader :matcher
-
-      # @api private
-      def initialize(steps, matcher)
-        @steps = steps
-        @matcher = matcher
-      end
-
+  class Transaction
+    module API
       # Run the transaction.
       #
       # Each operation will be called in the order it was specified, with its
@@ -52,14 +37,14 @@ module Dry
         assert_options_satisfy_step_arity(options)
 
         steps = steps_with_options_applied(options)
-        result = steps.inject(Right(input), :bind)
+        result = steps.inject(Dry::Monads.Right(input), :bind)
 
         if block
           matcher.(result, &block)
         else
           result.or { |step_failure|
             # Unwrap the value from the StepFailure and return it directly
-            Left(step_failure.value)
+            Dry::Monads.Left(step_failure.value)
           }
         end
       end
@@ -131,14 +116,14 @@ module Dry
       #     step :another
       #   end
       #
-      # @param other [Dry::Transaction::Sequence] the transaction to prepend.
+      # @param other [Dry::Transaction] the transaction to prepend.
       #     Optional if you will define a transaction inline via a block.
       # @param options [Hash] the options hash for defining a transaction inline
       #     via a block. Optional if the transaction is passed directly as
       #     `other`.
       # @option options [#[]] :container the operations container
       #
-      # @return [Dry::Transaction::Sequence] the modified transaction object
+      # @return [Dry::Transaction] the modified transaction object
       #
       # @api public
       def prepend(other = nil, **options, &block)
@@ -172,14 +157,14 @@ module Dry
       #     step :another
       #   end
       #
-      # @param other [Dry::Transaction::Sequence] the transaction to append.
+      # @param other [Dry::Transaction] the transaction to append.
       #     Optional if you will define a transaction inline via a block.
       # @param options [Hash] the options hash for defining a transaction inline
       #     via a block. Optional if the transaction is passed directly as
       #     `other`.
       # @option options [#[]] :container the operations container
       #
-      # @return [Dry::Transaction::Sequence] the modified transaction object
+      # @return [Dry::Transaction] the modified transaction object
       #
       # @api public
       def append(other = nil, **options, &block)
@@ -215,7 +200,7 @@ module Dry
       #     step :another
       #   end
       #
-      # @param other [Dry::Transaction::Sequence] the transaction to append.
+      # @param other [Dry::Transaction] the transaction to append.
       #     Optional if you will define a transaction inline via a block.
       # @param before [Symbol] the name of the step before which the
       #     transaction should be inserted (provide either this or `after`)
@@ -226,17 +211,19 @@ module Dry
       #     as `other`.
       # @option options [#[]] :container the operations container
       #
-      # @return [Dry::Transaction::Sequence] the modified transaction object
+      # @return [Dry::Transaction] the modified transaction object
       #
       # @api public
       def insert(other = nil, before: nil, after: nil, **options, &block)
         insertion_step = before || after
-        unless steps.map(&:step_name).include?(insertion_step)
+        match_insertion_step = proc { |step| step.step_name == insertion_step }
+
+        unless steps.any?(&match_insertion_step)
           raise ArgumentError, "+#{insertion_step}+ is not a valid step name"
         end
 
         other = accept_or_build_transaction(other, **options, &block)
-        index = steps.index { |step| step.step_name == insertion_step } + (!!after ? 1 : 0)
+        index = steps.index(&match_insertion_step) + (after ? 1 : 0)
 
         self.class.new(steps.dup.insert(index, *other.steps), matcher)
       end
@@ -256,7 +243,7 @@ module Dry
       #   @param step [Symbol] the names of a step to remove
       #   @param ... [Symbol] more names of steps to remove
       #
-      #   @return [Dry::Transaction::Sequence] the modified transaction object
+      #   @return [Dry::Transaction] the modified transaction object
       #
       #   @api public
       def remove(*steps_to_remove)
@@ -265,14 +252,16 @@ module Dry
 
       private
 
+      # @param options [Hash] step arguments keyed by step name
       def assert_valid_options(options)
         options.each_key do |step_name|
-          unless steps.map(&:step_name).include?(step_name)
+          unless steps.any? { |step| step.step_name == step_name }
             raise ArgumentError, "+#{step_name}+ is not a valid step name"
           end
         end
       end
 
+      # @param options [Hash] step arguments keyed by step name
       def assert_options_satisfy_step_arity(options)
         steps.each do |step|
           args_required = step.arity >= 0 ? step.arity : ~step.arity
@@ -284,6 +273,7 @@ module Dry
         end
       end
 
+      # @param options [Hash] step arguments keyed by step name
       def steps_with_options_applied(options)
         steps.map { |step|
           if (args = options[step.step_name])
@@ -299,7 +289,12 @@ module Dry
           raise ArgumentError, "a transaction must be provided or defined in a block"
         end
 
-        other_transaction || DSL.new(**options, &block).call
+        if other_transaction
+          other_transaction
+        else
+          require "dry/transaction/dsl"
+          DSL.new(**options, &block).call
+        end
       end
     end
   end

data/lib/dry/transaction/dsl.rb

@@ -1,10 +1,10 @@
 require "dry/transaction/result_matcher"
 require "dry/transaction/step"
 require "dry/transaction/step_adapters"
-require "dry/transaction/sequence"
+require "dry/transaction/step_definition"
 
 module Dry
-  module Transaction
+  class Transaction
     # @api private
     class DSL < BasicObject
       attr_reader :container
@@ -25,20 +25,27 @@ module Dry
         step_adapters.key?(method_name)
       end
 
-      def method_missing(method_name, *args)
+      def method_missing(method_name, *args, &block)
         return super unless step_adapters.key?(method_name)
 
         step_adapter = step_adapters[method_name]
         step_name = args.first
         options = args.last.is_a?(::Hash) ? args.last : {}
-        operation_name = options.delete(:with) || step_name
-        operation = container[operation_name]
+        with = options.delete(:with)
 
-        steps << Step.new(step_adapter, step_name, operation_name, operation, options)
+        if with.respond_to?(:call)
+          operation_name = step_name
+          operation = StepDefinition.new(container, &with)
+        else
+          operation_name = with || step_name
+          operation = container[operation_name]
+        end
+
+        steps << Step.new(step_adapter, step_name, operation_name, operation, options, &block)
       end
 
       def call
-        Sequence.new(steps, matcher)
+        Transaction.new(steps, matcher)
       end
     end
   end

data/lib/dry/transaction/result_matcher.rb

@@ -1,21 +1,21 @@
 require "dry-matcher"
 
 module Dry
-  module Transaction
+  class Transaction
     ResultMatcher = Dry::Matcher.new(
       success: Dry::Matcher::Case.new(
         match: -> result { result.right? },
-        resolve: -> result { result.value },
+        resolve: -> result { result.value }
       ),
       failure: Dry::Matcher::Case.new(
         match: -> result, step_name = nil {
           if step_name
-            result.left? && result.value.step_name == step_name
+            result.left? && result.value.step.step_name == step_name
           else
             result.left?
           end
         },
-        resolve: -> result { result.value.value },
+        resolve: -> result { result.value.value }
       )
     )
   end

data/lib/dry/transaction/step.rb

@@ -1,8 +1,9 @@
+require "dry/monads/either"
 require "wisper"
 require "dry/transaction/step_failure"
 
 module Dry
-  module Transaction
+  class Transaction
     # @api private
     class Step
       include Wisper::Publisher
@@ -13,31 +14,33 @@ module Dry
       attr_reader :operation_name
       attr_reader :operation
       attr_reader :options
+      attr_reader :block
       attr_reader :call_args
 
-      def initialize(step_adapter, step_name, operation_name, operation, options, call_args = [])
+      def initialize(step_adapter, step_name, operation_name, operation, options, call_args = [], &block)
         @step_adapter = step_adapter
         @step_name = step_name
         @operation_name = operation_name
         @operation = operation
         @options = options
+        @block = block
         @call_args = call_args
       end
 
       def with_call_args(*call_args)
-        self.class.new(step_adapter, step_name, operation_name, operation, options, call_args)
+        self.class.new(step_adapter, step_name, operation_name, operation, options, call_args, &block)
       end
 
       def call(input)
-        args = call_args + [input]
-        result = step_adapter.call(self, *args)
+        args = [input] + call_args
+        result = step_adapter.call(self, *args, &block)
 
         result.fmap { |value|
           broadcast :"#{step_name}_success", value
           value
         }.or { |value|
           broadcast :"#{step_name}_failure", *args, value
-          Left(StepFailure.new(step_name, value))
+          Left(StepFailure.new(self, value))
         }
       end
 

data/lib/dry/transaction/step_adapters.rb

@@ -1,7 +1,7 @@
 require "dry-container"
 
 module Dry
-  module Transaction
+  class Transaction
     class StepAdapters
       extend Dry::Container::Mixin
     end

data/lib/dry/transaction/step_adapters/map.rb

@@ -1,12 +1,12 @@
 module Dry
-  module Transaction
+  class Transaction
     class StepAdapters
       # @api private
       class Map
         include Dry::Monads::Either::Mixin
 
-        def call(step, *args, input)
-          Right(step.operation.call(*args, input))
+        def call(step, input, *args)
+          Right(step.operation.call(input, *args))
         end
       end
 

data/lib/dry/transaction/step_adapters/raw.rb

@@ -1,14 +1,14 @@
 require "dry/monads/either"
 
 module Dry
-  module Transaction
+  class Transaction
     class StepAdapters
       # @api private
       class Raw
         include Dry::Monads::Either::Mixin
 
-        def call(step, *args, input)
-          result = step.operation.call(*args, input)
+        def call(step, input, *args)
+          result = step.operation.call(input, *args)
 
           unless result.is_a?(Dry::Monads::Either)
             raise ArgumentError, "step +#{step.step_name}+ must return an Either object"

data/lib/dry/transaction/step_adapters/tee.rb

@@ -1,12 +1,12 @@
 module Dry
-  module Transaction
+  class Transaction
     class StepAdapters
       # @api private
       class Tee
         include Dry::Monads::Either::Mixin
 
-        def call(step, *args, input)
-          step.operation.call(*args, input)
+        def call(step, input, *args)
+          step.operation.call(input, *args)
           Right(input)
         end
       end

data/lib/dry/transaction/step_adapters/try.rb

@@ -1,16 +1,16 @@
 module Dry
-  module Transaction
+  class Transaction
     class StepAdapters
       # @api private
       class Try
         include Dry::Monads::Either::Mixin
 
-        def call(step, *args, input)
+        def call(step, input, *args)
           unless step.options[:catch]
             raise ArgumentError, "+try+ steps require one or more exception classes provided via +catch:+"
           end
 
-          Right(step.operation.call(*args, input))
+          Right(step.operation.call(input, *args))
         rescue *Array(step.options[:catch]) => e
           e = step.options[:raise].new(e.message) if step.options[:raise]
           Left(e)

data/lib/dry/transaction/step_definition.rb

@@ -0,0 +1,23 @@
+module Dry
+  class Transaction
+    # @api private
+    class StepDefinition
+      include Dry::Monads::Either::Mixin
+
+      def initialize(container, &block)
+        @container = container
+        @block = block
+        freeze
+      end
+
+      def call(*args)
+        instance_exec(*args, &block)
+      end
+
+      private
+
+      attr_reader :block
+      attr_reader :container
+    end
+  end
+end

data/lib/dry/transaction/step_failure.rb

@@ -1,11 +1,15 @@
 module Dry
-  module Transaction
+  class Transaction
+    # A wrapper for storing together the step that failed
+    # and value describing the failure.
     class StepFailure
-      attr_reader :step_name
+      attr_reader :step
       attr_reader :value
 
-      def initialize(step_name, value)
-        @step_name = step_name
+      # @param step [Step]
+      # @param value [Object]
+      def initialize(step, value)
+        @step = step
         @value = value
       end
     end

data/lib/dry/transaction/version.rb

@@ -1,6 +1,6 @@
 module Dry
   # Business transaction DSL.
-  module Transaction
-    VERSION = "0.8.0".freeze
+  class Transaction
+    VERSION = "0.9.0".freeze
   end
 end

data/spec/examples.txt

@@ -1,64 +1,77 @@
 example_id                                               | status | run_time        |
 -------------------------------------------------------- | ------ | --------------- |
-./spec/integration/custom_matcher_spec.rb[1:1]           | passed | 0.00028 seconds |
-./spec/integration/custom_step_adapters_spec.rb[1:1]     | passed | 0.00027 seconds |
-./spec/integration/passing_step_arguments_spec.rb[1:1:1] | passed | 0.00021 seconds |
-./spec/integration/passing_step_arguments_spec.rb[1:2:1] | passed | 0.0002 seconds  |
-./spec/integration/passing_step_arguments_spec.rb[1:3:1] | passed | 0.00017 seconds |
-./spec/integration/publishing_step_events_spec.rb[1:1:1] | passed | 0.00046 seconds |
-./spec/integration/publishing_step_events_spec.rb[1:1:2] | passed | 0.00043 seconds |
-./spec/integration/publishing_step_events_spec.rb[1:2:1] | passed | 0.00043 seconds |
-./spec/integration/publishing_step_events_spec.rb[1:2:2] | passed | 0.00178 seconds |
-./spec/integration/transaction_spec.rb[1:1:1]            | passed | 0.00152 seconds |
-./spec/integration/transaction_spec.rb[1:1:2]            | passed | 0.00023 seconds |
-./spec/integration/transaction_spec.rb[1:1:3]            | passed | 0.00022 seconds |
-./spec/integration/transaction_spec.rb[1:1:4]            | passed | 0.0003 seconds  |
-./spec/integration/transaction_spec.rb[1:1:5]            | passed | 0.00021 seconds |
-./spec/integration/transaction_spec.rb[1:2:1]            | passed | 0.00258 seconds |
-./spec/integration/transaction_spec.rb[1:2:2]            | passed | 0.00033 seconds |
-./spec/integration/transaction_spec.rb[1:2:3]            | passed | 0.00043 seconds |
-./spec/integration/transaction_spec.rb[1:2:4]            | passed | 0.00026 seconds |
-./spec/integration/transaction_spec.rb[1:2:5]            | passed | 0.00114 seconds |
-./spec/integration/transaction_spec.rb[1:2:6]            | passed | 0.00028 seconds |
-./spec/integration/transaction_spec.rb[1:3:1]            | passed | 0.00185 seconds |
-./spec/integration/transaction_spec.rb[1:3:2]            | passed | 0.00028 seconds |
-./spec/integration/transaction_spec.rb[1:3:3]            | passed | 0.00019 seconds |
-./spec/integration/transaction_spec.rb[1:3:4]            | passed | 0.00038 seconds |
-./spec/integration/transaction_spec.rb[1:3:5]            | passed | 0.00025 seconds |
-./spec/integration/transaction_spec.rb[1:4:1]            | passed | 0.00026 seconds |
-./spec/unit/sequence_spec.rb[1:1:1]                      | passed | 0.00019 seconds |
-./spec/unit/sequence_spec.rb[1:1:2]                      | passed | 0.00016 seconds |
-./spec/unit/sequence_spec.rb[1:1:3]                      | passed | 0.00013 seconds |
-./spec/unit/sequence_spec.rb[1:1:4]                      | passed | 0.00015 seconds |
-./spec/unit/sequence_spec.rb[1:2:1]                      | passed | 0.00018 seconds |
-./spec/unit/sequence_spec.rb[1:2:2]                      | passed | 0.00016 seconds |
-./spec/unit/sequence_spec.rb[1:2:3]                      | passed | 0.00015 seconds |
-./spec/unit/sequence_spec.rb[1:2:4]                      | passed | 0.0002 seconds  |
-./spec/unit/sequence_spec.rb[1:3:1]                      | passed | 0.00017 seconds |
-./spec/unit/sequence_spec.rb[1:3:2]                      | passed | 0.00017 seconds |
-./spec/unit/sequence_spec.rb[1:4:1]                      | passed | 0.00022 seconds |
-./spec/unit/sequence_spec.rb[1:4:2]                      | passed | 0.00019 seconds |
-./spec/unit/sequence_spec.rb[1:4:3]                      | passed | 0.00013 seconds |
-./spec/unit/sequence_spec.rb[1:4:4]                      | passed | 0.00014 seconds |
-./spec/unit/sequence_spec.rb[1:4:5:1]                    | passed | 0.0002 seconds  |
-./spec/unit/sequence_spec.rb[1:4:5:2]                    | passed | 0.0002 seconds  |
-./spec/unit/sequence_spec.rb[1:4:6:1]                    | passed | 0.00022 seconds |
-./spec/unit/sequence_spec.rb[1:4:6:2]                    | passed | 0.00018 seconds |
-./spec/unit/step_adapters/map_spec.rb[1:1:1]             | passed | 0.00011 seconds |
+./spec/integration/custom_matcher_spec.rb[1:1]           | passed | 0.00027 seconds |
+./spec/integration/custom_step_adapters_spec.rb[1:1]     | passed | 0.00042 seconds |
+./spec/integration/passing_step_arguments_spec.rb[1:1:1] | passed | 0.00105 seconds |
+./spec/integration/passing_step_arguments_spec.rb[1:2:1] | passed | 0.00122 seconds |
+./spec/integration/passing_step_arguments_spec.rb[1:3:1] | passed | 0.00018 seconds |
+./spec/integration/publishing_step_events_spec.rb[1:1:1] | passed | 0.00049 seconds |
+./spec/integration/publishing_step_events_spec.rb[1:1:2] | passed | 0.00135 seconds |
+./spec/integration/publishing_step_events_spec.rb[1:2:1] | passed | 0.0007 seconds  |
+./spec/integration/publishing_step_events_spec.rb[1:2:2] | passed | 0.00051 seconds |
+./spec/integration/transaction_spec.rb[1:1:1]            | passed | 0.00105 seconds |
+./spec/integration/transaction_spec.rb[1:1:2]            | passed | 0.00022 seconds |
+./spec/integration/transaction_spec.rb[1:1:3]            | passed | 0.00025 seconds |
+./spec/integration/transaction_spec.rb[1:1:4]            | passed | 0.00034 seconds |
+./spec/integration/transaction_spec.rb[1:1:5]            | passed | 0.00025 seconds |
+./spec/integration/transaction_spec.rb[1:2:1]            | passed | 0.00023 seconds |
+./spec/integration/transaction_spec.rb[1:2:2]            | passed | 0.00023 seconds |
+./spec/integration/transaction_spec.rb[1:2:3]            | passed | 0.00023 seconds |
+./spec/integration/transaction_spec.rb[1:2:4]            | passed | 0.00022 seconds |
+./spec/integration/transaction_spec.rb[1:2:5]            | passed | 0.00028 seconds |
+./spec/integration/transaction_spec.rb[1:2:6]            | passed | 0.00025 seconds |
+./spec/integration/transaction_spec.rb[1:3:1]            | passed | 0.00021 seconds |
+./spec/integration/transaction_spec.rb[1:3:2]            | passed | 0.00025 seconds |
+./spec/integration/transaction_spec.rb[1:3:3]            | passed | 0.00021 seconds |
+./spec/integration/transaction_spec.rb[1:3:4]            | passed | 0.00019 seconds |
+./spec/integration/transaction_spec.rb[1:3:5]            | passed | 0.00023 seconds |
+./spec/integration/transaction_spec.rb[1:4:1]            | passed | 0.00028 seconds |
+./spec/unit/step_adapters/map_spec.rb[1:1:1]             | passed | 0.00009 seconds |
 ./spec/unit/step_adapters/map_spec.rb[1:1:2]             | passed | 0.0001 seconds  |
-./spec/unit/step_adapters/raw_spec.rb[1:1:1:1]           | passed | 0.00153 seconds |
-./spec/unit/step_adapters/raw_spec.rb[1:1:2:1]           | passed | 0.00011 seconds |
-./spec/unit/step_adapters/raw_spec.rb[1:1:2:2]           | passed | 0.00015 seconds |
-./spec/unit/step_adapters/raw_spec.rb[1:1:3:1]           | passed | 0.00096 seconds |
-./spec/unit/step_adapters/raw_spec.rb[1:1:3:2]           | passed | 0.00092 seconds |
-./spec/unit/step_adapters/tee_spec.rb[1:1:1]             | passed | 0.00009 seconds |
-./spec/unit/step_adapters/tee_spec.rb[1:1:2]             | passed | 0.00015 seconds |
-./spec/unit/step_adapters/try_spec.rb[1:1:1:1]           | passed | 0.00015 seconds |
-./spec/unit/step_adapters/try_spec.rb[1:1:2:1:1]         | passed | 0.00012 seconds |
+./spec/unit/step_adapters/raw_spec.rb[1:1:1:1]           | passed | 0.00015 seconds |
+./spec/unit/step_adapters/raw_spec.rb[1:1:2:1]           | passed | 0.00012 seconds |
+./spec/unit/step_adapters/raw_spec.rb[1:1:2:2]           | passed | 0.0001 seconds  |
+./spec/unit/step_adapters/raw_spec.rb[1:1:3:1]           | passed | 0.00011 seconds |
+./spec/unit/step_adapters/raw_spec.rb[1:1:3:2]           | passed | 0.0006 seconds  |
+./spec/unit/step_adapters/tee_spec.rb[1:1:1]             | passed | 0.00016 seconds |
+./spec/unit/step_adapters/tee_spec.rb[1:1:2]             | passed | 0.00011 seconds |
+./spec/unit/step_adapters/try_spec.rb[1:1:1:1]           | passed | 0.00018 seconds |
+./spec/unit/step_adapters/try_spec.rb[1:1:2:1:1]         | passed | 0.00014 seconds |
 ./spec/unit/step_adapters/try_spec.rb[1:1:2:1:2]         | passed | 0.00016 seconds |
 ./spec/unit/step_adapters/try_spec.rb[1:1:2:1:3:1]       | passed | 0.00015 seconds |
-./spec/unit/step_adapters/try_spec.rb[1:1:2:1:3:2]       | passed | 0.00014 seconds |
-./spec/unit/step_adapters/try_spec.rb[1:1:2:2:1]         | passed | 0.00012 seconds |
-./spec/unit/step_adapters/try_spec.rb[1:1:2:2:2]         | passed | 0.00011 seconds |
-./spec/unit/step_adapters/try_spec.rb[1:1:2:2:3:1]       | passed | 0.00012 seconds |
-./spec/unit/step_adapters/try_spec.rb[1:1:2:2:3:2]       | passed | 0.00012 seconds |
+./spec/unit/step_adapters/try_spec.rb[1:1:2:1:3:2]       | passed | 0.00016 seconds |
+./spec/unit/step_adapters/try_spec.rb[1:1:2:2:1]         | passed | 0.00013 seconds |
+./spec/unit/step_adapters/try_spec.rb[1:1:2:2:2]         | passed | 0.00015 seconds |
+./spec/unit/step_adapters/try_spec.rb[1:1:2:2:3:1]       | passed | 0.00014 seconds |
+./spec/unit/step_adapters/try_spec.rb[1:1:2:2:3:2]       | passed | 0.00014 seconds |
+./spec/unit/step_definition_spec.rb[1:1]                 | passed | 0.00015 seconds |
+./spec/unit/step_definition_spec.rb[1:2:1]               | passed | 0.00013 seconds |
+./spec/unit/step_definition_spec.rb[1:3:1]               | passed | 0.00013 seconds |
+./spec/unit/step_definition_spec.rb[1:3:2]               | passed | 0.00013 seconds |
+./spec/unit/step_spec.rb[1:1:1:1]                        | passed | 0.00017 seconds |
+./spec/unit/step_spec.rb[1:1:1:2]                        | passed | 0.00042 seconds |
+./spec/unit/step_spec.rb[1:1:2:1]                        | passed | 0.00144 seconds |
+./spec/unit/step_spec.rb[1:1:2:2]                        | passed | 0.00153 seconds |
+./spec/unit/step_spec.rb[1:1:2:3]                        | passed | 0.00641 seconds |
+./spec/unit/step_spec.rb[1:2:1:1]                        | passed | 0.00016 seconds |
+./spec/unit/step_spec.rb[1:2:2:1]                        | passed | 0.00013 seconds |
+./spec/unit/transaction_spec.rb[1:1:1]                   | passed | 0.00024 seconds |
+./spec/unit/transaction_spec.rb[1:1:2]                   | passed | 0.00019 seconds |
+./spec/unit/transaction_spec.rb[1:1:3]                   | passed | 0.00016 seconds |
+./spec/unit/transaction_spec.rb[1:1:4]                   | passed | 0.00019 seconds |
+./spec/unit/transaction_spec.rb[1:2:1]                   | passed | 0.00016 seconds |
+./spec/unit/transaction_spec.rb[1:2:2]                   | passed | 0.00018 seconds |
+./spec/unit/transaction_spec.rb[1:2:3]                   | passed | 0.00015 seconds |
+./spec/unit/transaction_spec.rb[1:2:4]                   | passed | 0.00016 seconds |
+./spec/unit/transaction_spec.rb[1:3:1]                   | passed | 0.00015 seconds |
+./spec/unit/transaction_spec.rb[1:3:2]                   | passed | 0.0002 seconds  |
+./spec/unit/transaction_spec.rb[1:4:1]                   | passed | 0.00028 seconds |
+./spec/unit/transaction_spec.rb[1:4:2]                   | passed | 0.00019 seconds |
+./spec/unit/transaction_spec.rb[1:4:3]                   | passed | 0.00013 seconds |
+./spec/unit/transaction_spec.rb[1:4:4]                   | passed | 0.00014 seconds |
+./spec/unit/transaction_spec.rb[1:4:5:1]                 | passed | 0.00023 seconds |
+./spec/unit/transaction_spec.rb[1:4:5:2]                 | passed | 0.00018 seconds |
+./spec/unit/transaction_spec.rb[1:4:6:1]                 | passed | 0.0002 seconds  |
+./spec/unit/transaction_spec.rb[1:4:6:2]                 | passed | 0.00022 seconds |
+./spec/unit/transaction_spec.rb[1:4:7:1]                 | passed | 0.00019 seconds |
+./spec/unit/transaction_spec.rb[1:4:7:2]                 | passed | 0.0002 seconds  |

data/spec/integration/custom_matcher_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe "Custom matcher" do
   let(:transaction) {
     Dry.Transaction(container: container, matcher: Test::CustomMatcher) do
       step :process
-      step :validate
+      step :validate, failure: :bad_value
       step :persist
     end
   }
@@ -29,7 +29,13 @@ RSpec.describe "Custom matcher" do
           resolve: -> result { result.value }
         ),
         nup: Dry::Matcher::Case.new(
-          match: -> result { result.left? },
+          match: -> result, failure = nil {
+            if failure
+              result.left? && result.value.step.options[:failure] == failure
+            else
+              result.left?
+            end
+          },
           resolve: -> result { result.value.value }
         )
       )
@@ -39,7 +45,7 @@ RSpec.describe "Custom matcher" do
   it "supports a custom matcher" do
     matches = -> m {
       m.yep { |v| "Yep! #{v[:email]}" }
-      m.nup { |v| "Nup. #{v.to_s}" }
+      m.nup(:bad_value) { |v| "Nup. #{v.to_s}" }
     }
 
     input = {"name" => "Jane", "email" => "jane@doe.com"}

data/spec/integration/custom_step_adapters_spec.rb

@@ -23,8 +23,8 @@ RSpec.describe "Custom step adapters" do
       class CustomStepAdapters < Dry::Transaction::StepAdapters
         extend Dry::Monads::Either::Mixin
 
-        register :enqueue, -> step, *args, input {
-          Test::QUEUE << step.operation.call(*args, input)
+        register :enqueue, -> step, input, *args {
+          Test::QUEUE << step.operation.call(input, *args)
           Right(input)
         }
       end

data/spec/integration/passing_step_arguments_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe "Passing additional arguments to step operations" do
   let(:container) {
     {
       process:  -> input { {name: input["name"], email: input["email"]} },
-      validate: -> allowed, input { !input[:email].include?(allowed) ? raise(Test::NotValidError, "email not allowed") : input },
+      validate: -> input, allowed { !input[:email].include?(allowed) ? raise(Test::NotValidError, "email not allowed") : input },
       persist:  -> input { Test::DB << input and true }
     }
   }

data/spec/integration/transaction_spec.rb

@@ -3,7 +3,13 @@ RSpec.describe "Transactions" do
     Dry.Transaction(container: container) do
       map :process
       step :verify
-      try :validate, catch: Test::NotValidError
+      try :validate, with: -> input {
+        if input[:email].nil?
+          raise(container[:invalid_error], "email required")
+        else
+          input
+        end
+      }, catch: Test::NotValidError
       tee :persist
     end
   }
@@ -12,8 +18,8 @@ RSpec.describe "Transactions" do
     {
       process:  -> input { {name: input["name"], email: input["email"]} },
       verify:   -> input { Right(input) },
-      validate: -> input { input[:email].nil? ? raise(Test::NotValidError, "email required") : input },
-      persist:  -> input { Test::DB << input and true }
+      persist:  -> input { Test::DB << input and true },
+      invalid_error: Test::NotValidError
     }
   }
 
@@ -53,6 +59,8 @@ RSpec.describe "Transactions" do
         m.success do |value|
           results << "success for #{value[:email]}"
         end
+
+        m.failure { }
       end
 
       expect(results.first).to eq "success for jane@doe.com"
@@ -79,6 +87,8 @@ RSpec.describe "Transactions" do
       results = []
 
       transaction.call(input) do |m|
+        m.success { }
+
         m.failure do |value|
           results << "Failed: #{value}"
         end
@@ -91,6 +101,8 @@ RSpec.describe "Transactions" do
       results = []
 
       transaction.call(input) do |m|
+        m.success { }
+
         m.failure :validate do |value|
           results << "Validation failure: #{value}"
         end
@@ -103,6 +115,8 @@ RSpec.describe "Transactions" do
       results = []
 
       transaction.call(input) do |m|
+        m.success { }
+
         m.failure :some_other_step do |value|
           results << "Some other step failure"
         end

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
-if RUBY_ENGINE == "ruby"
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-
+if RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.3"
   require "simplecov"
-  SimpleCov.start do
-    add_filter "/spec/"
-  end
+  SimpleCov.start
 end
 
 begin

data/spec/unit/step_definition_spec.rb

@@ -0,0 +1,32 @@
+RSpec.describe Dry::Transaction::StepDefinition do
+  let(:container) do
+    { test: -> input { "This is a test with input: #{input.inspect}" } }
+  end
+
+  let(:step_definition) do
+    Dry::Transaction::StepDefinition.new(container) do |input|
+      Right(container[:test].call(input))
+    end
+  end
+
+  it { expect(step_definition).to be_kind_of(Dry::Monads::Either::Mixin) }
+
+  describe '#initialize' do
+    subject! { step_definition }
+
+    it { is_expected.to be_frozen }
+  end
+
+  describe '#call' do
+    let(:input) { { test: 'test' } }
+
+    subject!(:result) { step_definition.call(input) }
+
+    it do
+      expect(result.value).to eq(
+        "This is a test with input: {:test=>\"test\"}"
+      )
+    end
+    it { is_expected.to be_a(Dry::Monads::Either::Right) }
+  end
+end

data/spec/unit/step_spec.rb

@@ -0,0 +1,71 @@
+RSpec.describe Dry::Transaction::Step do
+  let(:step_adapter) { ->(step, input, *args) { step.operation.call(input, *args) } }
+  let(:step_name) { :test }
+  let(:operation_name) { step_name }
+
+  subject(:step) { described_class.new(step_adapter, step_name, operation_name, operation, {}) }
+
+  describe "#call" do
+    let(:listener) do
+      Class.new do
+        def test_success(*args); end
+        alias_method :test_failure, :test_success
+      end.new
+    end
+
+    let(:input) { "input" }
+    subject { step.call(input) }
+
+    context "when operation succeeds" do
+      let(:operation) { proc { |input| Dry::Monads::Either::Right.new(input) } }
+
+      it { is_expected.to be_right }
+
+      it "publishes success" do
+        expect(listener).to receive(:test_success).with(input)
+        step.subscribe(listener)
+        subject
+      end
+    end
+
+    context "when operation fails" do
+      let(:operation) { proc { |input| Dry::Monads::Either::Left.new("error") } }
+
+      it { is_expected.to be_left }
+
+      it "wraps value in StepFailure" do
+        aggregate_failures do
+          expect(subject.value).to be_a Dry::Transaction::StepFailure
+          expect(subject.value.value).to eq "error"
+        end
+      end
+
+      it "publishes failure" do
+        expect(listener).to receive(:test_failure).with(input, "error")
+        step.subscribe(listener)
+        subject
+      end
+    end
+  end
+
+  describe "#arity" do
+    subject { step.arity }
+
+    context "when operation is a proc" do
+      let(:operation) { proc { |a, b| a + b } }
+      it { is_expected.to eq 2 }
+    end
+
+    context "when operation is an object with call method" do
+      let(:operation) do
+        Class.new do
+          def call(a, b, c)
+            a + b + c
+          end
+        end.new
+      end
+
+      it { is_expected.to eq 3 }
+    end
+  end
+end

data/spec/unit/{sequence_spec.rb → transaction_spec.rb}

@@ -1,4 +1,4 @@
-RSpec.describe Dry::Transaction::Sequence do
+RSpec.describe Dry::Transaction do
   subject(:container) {
     {
       upcase: -> input { input.upcase },
@@ -169,5 +169,41 @@ RSpec.describe Dry::Transaction::Sequence do
         expect(initial_transaction.call("hello world").right).to eq "DLROW OLLEH"
       end
     end
+
+    context "with code block explicitly passed to step" do
+      class WithBlockStepAdapters < ::Dry::Transaction::StepAdapters # :nodoc:
+        class WithBlock
+          include Dry::Monads::Either::Mixin
+          def call(step, input, *args, &cb)
+            Right(step.operation.((block_given? ? yield(input) : input), *args))
+          end
+        end
+        register :with_block, WithBlock.new
+      end
+      let!(:with_block_container) {
+        { exclaim_all: -> input { input.split(" ").map { |str| "#{str}!" }.join(" ") } }
+      }
+
+      let!(:no_block_transaction) {
+        Dry.Transaction(container: with_block_container, step_adapters: WithBlockStepAdapters) do
+          with_block :exclaim_all
+        end
+      }
+      let!(:with_block_transaction) {
+        Dry.Transaction(container: with_block_container, step_adapters: WithBlockStepAdapters) do
+          with_block :exclaim_all do |input|
+            input.gsub(/(?<=\s|\A)/, '¡')
+          end
+        end
+      }
+
+      it "inserts normal bangs without block given" do
+        expect(no_block_transaction.call("hello world").right).to eq "hello! world!"
+      end
+
+      it "inserts spanish bangs with block given" do
+        expect(with_block_transaction.call("hello world").right).to eq "¡hello! ¡world!"
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-transaction
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Tim Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.2
+        version: 1.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.2
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 11.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 11.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -150,15 +150,16 @@ files:
 - Rakefile
 - lib/dry-transaction.rb
 - lib/dry/transaction.rb
+- lib/dry/transaction/api.rb
 - lib/dry/transaction/dsl.rb
 - lib/dry/transaction/result_matcher.rb
-- lib/dry/transaction/sequence.rb
 - lib/dry/transaction/step.rb
 - lib/dry/transaction/step_adapters.rb
 - lib/dry/transaction/step_adapters/map.rb
 - lib/dry/transaction/step_adapters/raw.rb
 - lib/dry/transaction/step_adapters/tee.rb
 - lib/dry/transaction/step_adapters/try.rb
+- lib/dry/transaction/step_definition.rb
 - lib/dry/transaction/step_failure.rb
 - lib/dry/transaction/version.rb
 - spec/examples.txt
@@ -170,11 +171,13 @@ files:
 - spec/spec_helper.rb
 - spec/support/either_mixin.rb
 - spec/support/test_module_constants.rb
-- spec/unit/sequence_spec.rb
 - spec/unit/step_adapters/map_spec.rb
 - spec/unit/step_adapters/raw_spec.rb
 - spec/unit/step_adapters/tee_spec.rb
 - spec/unit/step_adapters/try_spec.rb
+- spec/unit/step_definition_spec.rb
+- spec/unit/step_spec.rb
+- spec/unit/transaction_spec.rb
 homepage: https://github.com/dry-rb/dry-transaction
 licenses:
 - MIT