dry-transaction 0.10.2 → 0.11.0

data/spec/unit/step_adapters/raw_spec.rb

@@ -1,51 +1,35 @@
-RSpec.describe Dry::Transaction::StepAdapters::Raw do
+RSpec.describe Dry::Transaction::StepAdapters::Raw, adapter: true do
 
   subject { described_class.new }
 
-  let(:operation) {
-    -> (input) { input.upcase }
-  }
-
-  let(:step) {
-    Dry::Transaction::Step.new(subject, :step, :step, operation, {})
-  }
+  let(:options) { { step_name: "unit" } }
 
   describe "#call" do
 
-    context "when the result of the operation is NOT a Dry::Monads::Either" do
+    context "when the result of the operation is NOT a Dry::Monads::Result" do
 
-      it "raises an ArgumentError" do
-        expect do
-          subject.call(step, 'input')
-        end.to raise_error(ArgumentError)
-      end
-    end
-
-    context "when the result of the operation is a Left Monad" do
       let(:operation) {
-        -> (input) { Left(input.upcase) }
+        -> (input) { input.upcase }
       }
 
-      it "return a Left Monad" do
-        expect(subject.call(step, 'input')).to be_a Dry::Monads::Either::Left
-      end
-
-      it "return the result of the operation as output" do
-        expect(subject.call(step, 'input').value).to eql 'INPUT'
+      it "raises an InvalidResultError" do
+        expect {
+          subject.(operation, options, "input")
+        }.to raise_error(
+               Dry::Transaction::InvalidResultError,
+               "step +unit+ must return a Result object"
+             )
       end
     end
 
-    context "when the result of the operation is a Right Monad" do
+    context "when the result of the operation is a Success value" do
+
       let(:operation) {
-        -> (input) { Right(input.upcase) }
+        -> (input) { Success(input.upcase) }
       }
 
-      it "return a Right Monad" do
-        expect(subject.call(step, 'input')).to be_a Dry::Monads::Either::Right
-      end
-
-      it "return the result of the operation as output" do
-        expect(subject.call(step, 'input').value).to eql 'INPUT'
+      it "return a Success value" do
+        expect(subject.(operation, options, "input")).to eql(Success("INPUT"))
       end
     end
   end

data/spec/unit/step_adapters/tee_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Dry::Transaction::StepAdapters::Tee do
+RSpec.describe Dry::Transaction::StepAdapters::Tee, :adapter do
 
   subject { described_class.new }
 
@@ -6,18 +6,12 @@ RSpec.describe Dry::Transaction::StepAdapters::Tee do
     -> (input) { input.upcase }
   }
 
-  let(:step) {
-    Dry::Transaction::Step.new(subject, :step, :step, operation, {})
-  }
+  let(:options) { { step_name: "unit" } }
 
   describe "#call" do
 
-    it "return a Right Monad" do
-      expect(subject.call(step, 'input')).to be_a Dry::Monads::Either::Right
-    end
-
-    it "return the original input as output" do
-      expect(subject.call(step, 'input').value).to eql 'input'
+    it "return a Success value" do
+      expect(subject.(operation, options, ["input"])).to eql(Success("input"))
     end
   end
 end

data/spec/unit/step_adapters/try_spec.rb

@@ -9,11 +9,7 @@ RSpec.describe Dry::Transaction::StepAdapters::Try do
     }
   }
 
-  let(:step) {
-    Dry::Transaction::Step.new(subject, :step, :step, operation, options)
-  }
-
-  let(:options) { { catch: Test::NotValidError } }
+  let(:options) { { catch: Test::NotValidError, step_name: "unit" } }
 
   before do
     Test::NotValidError = Class.new(StandardError)
@@ -23,12 +19,15 @@ RSpec.describe Dry::Transaction::StepAdapters::Try do
   describe "#call" do
 
     context "without the :catch option" do
-      let(:options) { { } }
+      let(:options) { { step_name: "unit" } }
 
       it "raises an ArgumentError" do
-        expect do
-          subject.call(step, {})
-        end.to raise_error(ArgumentError)
+        expect {
+          subject.(operation, options, ["something"])
+        }.to raise_error(
+               Dry::Transaction::MissingCatchListError,
+               "step +unit+ requires one or more exception classes provided via +catch:+"
+             )
       end
     end
 
@@ -36,14 +35,14 @@ RSpec.describe Dry::Transaction::StepAdapters::Try do
 
       context "when the error was raised" do
 
-        it "return a Left Monad" do
-          expect(subject.call(step, 1234)).to be_a Dry::Monads::Either::Left
+        it "returns a Failure value" do
+          expect(subject.(operation, options, [1234])).to be_a_failure
         end
 
-        it "return the raised error as output" do
-          result = subject.call(step, 1234)
-          expect(result.value).to be_a Test::NotValidError
-          expect(result.value.message).to eql 'not a string'
+        it "returns the raised error as output" do
+          result = subject.(operation, options, [1234])
+          expect(result.left).to be_a Test::NotValidError
+          expect(result.left.message).to eql("not a string")
         end
 
         context "when using the :raise option" do
@@ -54,26 +53,22 @@ RSpec.describe Dry::Transaction::StepAdapters::Try do
             }
           }
 
-          it "return a Left Monad" do
-            expect(subject.call(step, 1234)).to be_a Dry::Monads::Either::Left
+          it "returns a Failure value" do
+            expect(subject.(operation, options, [1234])).to be_a_failure
           end
 
-          it "return the error specified by :raise as output" do
-            result = subject.call(step, 1234)
-            expect(result.value).to be_a Test::BetterNamingError
-            expect(result.value.message).to eql 'not a string'
+          it "returns the error specified by :raise as output" do
+            result = subject.(operation, options, [1234])
+            expect(result.left).to be_a Test::BetterNamingError
+            expect(result.left.message).to eql("not a string")
           end
         end
       end
 
       context "when the error was NOT raised" do
 
-        it "return a Right Monad" do
-          expect(subject.call(step, 'input')).to be_a Dry::Monads::Either::Right
-        end
-
-        it "return the result of the operation as output" do
-          expect(subject.call(step, 'input').value).to eql 'INPUT'
+        it "returns a Success value" do
+          expect(subject.(operation, options, ["input"])).to eql(Success("INPUT"))
         end
 
         context "when using the :raise option" do
@@ -84,12 +79,8 @@ RSpec.describe Dry::Transaction::StepAdapters::Try do
             }
           }
 
-          it "return a Right Monad" do
-            expect(subject.call(step, 'input')).to be_a Dry::Monads::Either::Right
-          end
-
-          it "return the result of the operation as output" do
-            expect(subject.call(step, 'input').value).to eql 'INPUT'
+          it "returns a Success value" do
+            expect(subject.(operation, options, ["input"])).to  eql(Success("INPUT"))
           end
         end
       end

data/spec/unit/step_spec.rb

@@ -8,8 +8,23 @@ RSpec.describe Dry::Transaction::Step do
   describe "#call" do
     let(:listener) do
       Class.new do
-        def test_success(*args); end
-        alias_method :test_failure, :test_success
+        attr_reader :started, :success, :failed
+
+        def initialize
+          @started = []
+          @success = []
+          @failed = []
+        end
+
+        def on_step(event)
+          started << event[:step_name]
+        end
+        def on_step_succeeded(event)
+          success << "succeded_#{event[:step_name]}"
+        end
+        def on_step_failed(event)
+          failed << "failed_#{event[:step_name]}"
+        end
       end.new
     end
 
@@ -17,33 +32,49 @@ RSpec.describe Dry::Transaction::Step do
     subject { step.call(input) }
 
     context "when operation succeeds" do
-      let(:operation) { proc { |input| Dry::Monads::Either::Right.new(input) } }
+      let(:operation) { proc { |input| Dry::Monads::Result::Success.new(input) } }
 
       it { is_expected.to be_right }
 
-      it "publishes success" do
-        expect(listener).to receive(:test_success).with(input)
+      it "publishes step_succeeded" do
+        expect(listener).to receive(:on_step_succeeded).and_call_original
         step.subscribe(listener)
         subject
+
+        expect(listener.success).to eq ['succeded_test']
+      end
+    end
+
+    context "when operation starts" do
+      let(:operation) { proc { |input| Dry::Monads::Result::Right.new(input) } }
+
+      it "publishes step" do
+        expect(listener).to receive(:on_step).and_call_original
+        step.subscribe(listener)
+        subject
+
+        expect(listener.started).to eq [:test]
       end
     end
 
     context "when operation fails" do
-      let(:operation) { proc { |input| Dry::Monads::Either::Left.new("error") } }
+      let(:operation) { proc { |input| Dry::Monads::Result::Failure.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"
+          expect(subject.left).to be_a Dry::Transaction::StepFailure
+          expect(subject.left.value).to eq "error"
         end
       end
 
-      it "publishes failure" do
-        expect(listener).to receive(:test_failure).with(input, "error")
+      it "publishes step_failed" do
+        expect(listener).to receive(:on_step_failed).and_call_original
         step.subscribe(listener)
         subject
+
+        expect(listener.failed).to eq ['failed_test']
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-transaction
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Tim Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.8
 - !ruby/object:Gem::Dependency
-  name: dry-matcher
+  name: dry-events
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: dry-monads
+  name: dry-matcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: wisper
+  name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +85,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.2.2
   type: :development
@@ -92,6 +95,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.2.2
 - !ruby/object:Gem::Dependency
@@ -100,28 +106,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -151,13 +157,19 @@ files:
 - lib/dry-transaction.rb
 - lib/dry/transaction.rb
 - lib/dry/transaction/builder.rb
+- lib/dry/transaction/callable.rb
 - lib/dry/transaction/dsl.rb
+- lib/dry/transaction/errors.rb
 - lib/dry/transaction/instance_methods.rb
 - lib/dry/transaction/operation.rb
 - lib/dry/transaction/operation_resolver.rb
 - lib/dry/transaction/result_matcher.rb
+- lib/dry/transaction/stack.rb
 - lib/dry/transaction/step.rb
+- lib/dry/transaction/step_adapter.rb
 - lib/dry/transaction/step_adapters.rb
+- lib/dry/transaction/step_adapters/around.rb
+- lib/dry/transaction/step_adapters/check.rb
 - lib/dry/transaction/step_adapters/map.rb
 - lib/dry/transaction/step_adapters/raw.rb
 - lib/dry/transaction/step_adapters/tee.rb
@@ -165,14 +177,21 @@ files:
 - lib/dry/transaction/step_failure.rb
 - lib/dry/transaction/version.rb
 - spec/examples.txt
+- spec/integration/around_spec.rb
 - spec/integration/custom_step_adapters_spec.rb
 - spec/integration/operation_spec.rb
 - spec/integration/passing_step_arguments_spec.rb
 - spec/integration/publishing_step_events_spec.rb
 - spec/integration/transaction_spec.rb
+- spec/integration/transaction_without_steps_spec.rb
 - spec/spec_helper.rb
-- spec/support/either_mixin.rb
+- spec/support/container.rb
+- spec/support/database.rb
+- spec/support/db_transactions.rb
+- spec/support/result_mixin.rb
 - spec/support/test_module_constants.rb
+- spec/unit/step_adapters/around_spec.rb
+- spec/unit/step_adapters/check_spec.rb
 - spec/unit/step_adapters/map_spec.rb
 - spec/unit/step_adapters/raw_spec.rb
 - spec/unit/step_adapters/tee_spec.rb
@@ -190,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -198,9 +217,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Business Transaction Flow DSL
 test_files: []
-has_rdoc: 

data/spec/support/either_mixin.rb

@@ -1,3 +0,0 @@
-RSpec.configure do |config|
-  config.include Dry::Monads::Either::Mixin
-end