waterfall 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27aca92eae9decca2d3a32be3293985de0b219e1
-  data.tar.gz: d9e95c5a4a7aa9438f06bd67337bd5a87e7c8dd8
+  metadata.gz: cd6e3cd5ae2df5e4e6121b46e1ad127a9613b39b
+  data.tar.gz: bd9634100ae693fd84e1a6ed7b2c362395be627b
 SHA512:
-  metadata.gz: e178dab7e10f42a2215c17cd991d3af286a07908bd2e4c3d4f8f3b8769ee576a8c9e455af3a57c037a866bd3693aecf940894ef601f4684f3b4bbfeb15873f73
-  data.tar.gz: eac428e1c45e83e652451bf37fa972bbe03db7ad90c61c47a8597d7b512852d33c48d5010531fc78b52b006a9dc8bee71dd5d5b80f8931c7e9138f18addbd2de
+  metadata.gz: 89668b9efe963d440bb839827984a73e2b14ef3f3d1eeb4879a40c80ebf33465cde450685e392a0168b77686024413ff0257e1dcd10e0304ca3fe4c0dea5f90e
+  data.tar.gz: a425c2ced04535bca474ebff300070664172735bb120a22cea2d4e29b7f8d758042b9a702101d1bc232a373b558fbaa6f4da00b64e57b7b19490142b3b5f2f12

data/.travis.yml

@@ -1,10 +1,17 @@
 language: ruby
+env:
+  global:
+    - CC_TEST_REPORTER_ID=06ba7b4d95c2d056ef2b66c86e9d69f24dceee54354c1ab2ce1397f8f309b0a4
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-  - 2.3.0
-script: bundle exec rspec spec
-addons:
-  code_climate:
-    repo_token: 06ba7b4d95c2d056ef2b66c86e9d69f24dceee54354c1ab2ce1397f8f309b0a4
+  - 2.1.10
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - bundle exec rspec
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in waterfall.gemspec
-gemspec
-
-gem "codeclimate-test-reporter", group: :test, require: nil
+gemspec

data/Gemfile.lock

@@ -1,17 +1,13 @@
 PATH
   remote: .
   specs:
-    waterfall (1.1.0)
+    waterfall (1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    codeclimate-test-reporter (0.4.7)
-      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    json (1.8.2)
+    diff-lcs (1.3)
     method_source (0.8.2)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -20,36 +16,30 @@ GEM
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
     rake (10.3.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     slop (3.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
-  codeclimate-test-reporter
+  bundler (~> 1.14)
   pry (> 0.10)
   pry-nav
   rake
-  rspec (= 3.2)
+  rspec (= 3.6)
   waterfall!
 
 BUNDLED WITH

data/changelog.md

@@ -1,3 +1,7 @@
+===1.2.0
+- Removed `undam`.
+- Introduced `reverse_flow`
+
 ===1.1.0
 - Removed `chain_wf`.
 - Introduced `halt_chain`

data/lib/waterfall.rb

@@ -42,12 +42,10 @@ module Waterfall
 
   def dam(obj)
     raise IncorrectDamArgumentError.new("You cant dam with a falsy object") unless obj
-    _wf_run { @error_pool = obj }
-  end
-
-  def undam
-    @error_pool = nil
-    self
+    _wf_run do
+      @error_pool = obj
+      _reverse_flows(true)
+    end
   end
 
   def halt_chain(&block)
@@ -71,6 +69,25 @@ module Waterfall
     self
   end
 
+  def reverse_flow
+  end
+
+  protected
+
+  def _reverse_flows(skip_self)
+    return if @flow_reversed
+    @flow_reversed = true
+    reverse_flow unless skip_self
+    (@_executed_flows || []).reverse_each do |f|
+      f.send :_reverse_flows, false
+    end
+  end
+
+  def _add_executed_flow(flow)
+    @_executed_flows ||= []
+    @_executed_flows.push(flow)
+  end
+
   def _wf_run
     @has_flown = true
     @outflow ||= OpenStruct.new({})

data/lib/waterfall/predicates/chain.rb

@@ -24,6 +24,8 @@ module Waterfall
         @root.update_outflow(k, child_waterfall.outflow[v])
       end
 
+      @root.send :_add_executed_flow, child_waterfall
+
       if child_waterfall.dammed?
         @root.dam child_waterfall.error_pool
       end

data/lib/waterfall/version.rb

@@ -1,3 +1,3 @@
 module Waterfall
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/spec_helper.rb

@@ -5,9 +5,6 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
 require File.expand_path('../../lib/waterfall', __FILE__)
 require 'pry'
 

data/spec/wf_object_spec.rb

@@ -54,12 +54,6 @@ describe Flow do
     expect { wf.dam(nil) }.to raise_error(Waterfall::IncorrectDamArgumentError)
   end
 
-  it 'can be undammed' do
-    wf.dam('error').undam
-    expect(wf.dammed?).to be false
-    expect(wf.error_pool).to eq nil
-  end
-
   it 'can be dammed conditionnaly (falsy)' do
     wf.when_falsy { false }.dam { 'error' }
     expect(wf.dammed?).to be true
@@ -121,6 +115,59 @@ describe Flow do
     it "returns what the block returns" do
       expect(wf.halt_chain { "return value" }).to eq "return value"
     end
+  end
+
+  describe 'reverse_flow' do
+    let(:parent_flow) { Flow.new }
+    let(:sub_flow1)   { Flow.new }
+    let(:sub_flow2)   { Flow.new }
+    let(:sub_flow3)   { Flow.new }
+    let(:sub_sub_flow1) { Flow.new }
+    let(:sub_sub_flow2) { Flow.new }
+    let(:sub_sub_flow3) { Flow.new }
+    let(:sub_sub_sub_flow1) { Flow.new }
+
+    def action
+      parent_flow
+        .chain { sub_flow1 }
+        .chain do
+          sub_flow2
+            .chain do
+              sub_sub_flow1.chain { sub_sub_sub_flow1 }
+            end
+            .chain { sub_sub_flow2 }
+            .when_truthy { true }.dam { 'errr' }
+            .chain { sub_sub_flow3 }
+        end
+        .chain { sub_flow3 }
+    end
+
+    it 'does not trigger reverse_flow on initial dammed flow' do
+      expect(sub_flow2).to_not receive(:reverse_flow)
+
+      action
+    end
+
+    it 'does not trigger reverse_flow on parent_flow' do
+      expect(parent_flow).to_not receive(:reverse_flow)
+
+      action
+    end
+
+    it 'is called on all executed sub flows' do
+      expect(sub_sub_flow2).to receive(:reverse_flow).once.ordered
+      expect(sub_sub_flow1).to receive(:reverse_flow).once.ordered
+      expect(sub_sub_sub_flow1).to receive(:reverse_flow).once.ordered
+      expect(sub_flow1).to receive(:reverse_flow).once.ordered
 
+      action
+    end
+
+    it 'is not called on non executed sub flows' do
+      expect(sub_sub_flow3).to_not receive(:reverse_flow)
+      expect(sub_flow3).to_not receive(:reverse_flow)
+
+      action
+    end
   end
 end

data/waterfall.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "pry", '>0.10'
   spec.add_development_dependency "pry-nav"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "3.2"
+  spec.add_development_dependency "rspec", "3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfall
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Benjamin Roth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.6'
 description: A slice of functional programming to chain ruby services and blocks.
   Make them flow!
 email: