pipe-ruby 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3360d89c8d7925a9c69a3fe6e0549722890e1235
-  data.tar.gz: b95e816b5f0a74e3712f3553f8c91f00bb93a0ec
+  metadata.gz: d0eca86ffad3466f3843db7cb3013985bfc1c3bf
+  data.tar.gz: df2cd7013334b5abce3608c1c85bcd4ca261201a
 SHA512:
-  metadata.gz: 87cf0cbe09d6660cb55ff502f19d7acf6cac4eb09aa7c89c94e72432fdb8f8cf29df32a9778ff0989f61c837b514c77da8f4868404a2ec039b6af271fcf1e87a
-  data.tar.gz: 221cd32905cfc0081a6b99f27071811140ef5e18800dd6fa46a0f745f46da451d8f719fad15a3087c7994b5a51990878deba4ecea4a87169b8288102d3785809
+  metadata.gz: 918395735261b1110693cfa0c08d933e5c7c8ea5e0a73597a3d067a5fc3b29044f36a47b608dfb5a0c911f9df1f3711ff50fbf765bb6a960b91bff22670a30f8
+  data.tar.gz: 9338db4f769305be5ad63474cca4e4e2ef2fcfebee1f8eb0ade7a2231f992beebfe6e92d842e31be5e823c1d208ba109c911cd72c63f944048214b785d342bf8

data/README.md

@@ -55,12 +55,17 @@ configurable options. Here they are with their defaults:
 
 ```ruby
 Pipe::Config.new(
-  :error_handlers => [],   # an array of procs to be called when an error occurs
-  :raise_on_error => true, # tells Pipe to re-raise errors which occur
-  :skip_on => false,       # a truthy value or proc which tells pipe to skip the
-                           # next method in the `through` array
-  :stop_on => false        # a truthy value or proc which tells pipe to stop
-                           # processing and return the current value
+  :error_handlers => [],        # an array of procs to be called when an error
+                                # occurs
+  :raise_on_error => true,      # tells Pipe to re-raise errors which occur
+  :return_on_error => :subject, # when an error happens and raise error is false
+                                # returns the current value of subject defaultly;
+                                # if callable, will return the result of the call
+                                # if not callable, will return the value
+  :skip_on => false,            # a truthy value or proc which tells pipe to skip
+                                # the next method in the `through` array
+  :stop_on => false             # a truthy value or proc which tells pipe to stop
+                                # processing and return the current value
 )
 ```
 

data/lib/pipe/config.rb

@@ -1,16 +1,18 @@
 module Pipe
   class Config
     attr_accessor :raise_on_error
-    attr_reader :error_handlers, :skip_on, :stop_on
+    attr_reader :error_handlers, :return_on_error, :skip_on, :stop_on
 
     def initialize(
       error_handlers: [],
       raise_on_error: true,
+      return_on_error: :subject,
       skip_on: false,
       stop_on: false
     )
       @error_handlers = error_handlers
       @raise_on_error = raise_on_error
+      @return_on_error = return_on_error
       self.skip_on = skip_on
       self.stop_on = stop_on
     end

data/lib/pipe/reducer.rb

@@ -14,8 +14,9 @@ module Pipe
 
           process(subj, method)
         rescue => e
-          handle_error(:error => e, :method => method, :subject => subj)
-          break subj
+          payload = {:error => e, :method => method, :subject => subj}
+          handle_error(payload)
+          break error_response(payload)
         end
       }
     end
@@ -24,6 +25,16 @@ module Pipe
 
     attr_accessor :config, :context, :subject, :through
 
+    def error_response(error:, method:, subject:)
+      if config.return_on_error == :subject
+        subject
+      elsif config.return_on_error.respond_to?(:call)
+        config.return_on_error.call(subject, method, error)
+      else
+        config.return_on_error
+      end
+    end
+
     def handle_error(error:, method:, subject:)
       process_error_handlers(
         :error => error,

data/lib/pipe/version.rb

@@ -1,3 +1,3 @@
 module Pipe
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/spec/pipe/config_spec.rb

@@ -10,6 +10,10 @@ describe Pipe::Config do
       expect(Pipe::Config.new.raise_on_error).to eq(true)
     end
 
+    it "sets return_on_error to :subject" do
+      expect(Pipe::Config.new.return_on_error).to eq(:subject)
+    end
+
     it "sets skip_on to a proc which returns false" do
       expect(Pipe::Config.new.skip_on.call).to eq(false)
     end

data/spec/pipe/reducer_spec.rb

@@ -119,10 +119,10 @@ describe Pipe::Reducer do
       context = Class.new do
         ExpectedError = Class.new(StandardError)
 
-        def bomb
+        def bomb(subject)
           raise ExpectedError, "BOOM!"
         end
-      end
+      end.new
 
       expect(handler1).to receive(:call)
       expect(handler2).to receive(:call)
@@ -142,10 +142,10 @@ describe Pipe::Reducer do
       context = Class.new do
         AnotherExpectedError = Class.new(StandardError)
 
-        def bomb
+        def bomb(subject)
           raise AnotherExpectedError, "BOOM!"
         end
-      end
+      end.new
 
       expect{
         Pipe::Reducer.new(
@@ -156,5 +156,76 @@ describe Pipe::Reducer do
         ).reduce
       }.to_not raise_error
     end
+
+    it "honors Config#return_on_error :subject default" do
+      config = Pipe::Config.new(:raise_on_error => false)
+      context = Class.new do
+        AndAnotherExpectedError = Class.new(StandardError)
+
+        def bomb(subject)
+          raise AndAnotherExpectedError, "BOOM!"
+        end
+      end.new
+      subject = Object.new
+
+      expect(
+        Pipe::Reducer.new(
+          :config => config,
+          :context => context,
+          :subject => subject,
+          :through => [:bomb]
+        ).reduce
+      ).to eq(subject)
+    end
+
+    it "honors Config#return_on_error callable objects" do
+      subject = Object.new
+      config = Pipe::Config.new(
+        :raise_on_error => false,
+        :return_on_error => proc { |subj, method, e|
+          [subj, method, e.class, e.to_s, :hello]
+        }
+      )
+      context = Class.new do
+        YetAnotherExpectedError = Class.new(StandardError)
+
+        def bomb(subject)
+          raise YetAnotherExpectedError, "BOOM!"
+        end
+      end.new
+      expected = [subject, :bomb, YetAnotherExpectedError, "BOOM!", :hello]
+
+      expect(
+        Pipe::Reducer.new(
+          :config => config,
+          :context => context,
+          :subject => subject,
+          :through => [:bomb]
+        ).reduce
+      ).to eq(expected)
+    end
+
+    it "returns Config#return_on_error when not callable" do
+      config = Pipe::Config.new(
+        :raise_on_error => false,
+        :return_on_error => :error
+      )
+      context = Class.new do
+        OneMoreError = Class.new(StandardError)
+
+        def bomb(subject)
+          raise OneMoreError, "BOOM!"
+        end
+      end.new
+
+      expect(
+        Pipe::Reducer.new(
+          :config => config,
+          :context => context,
+          :subject => Object.new,
+          :through => [:bomb]
+        ).reduce
+      ).to eq(:error)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dan Matthews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler