composable_operations 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ac9f54ccfaf7e9e03e47174f435b00f536764c9
-  data.tar.gz: ee9f3b4c7a5185403b4b418a3860bb05af007891
+  metadata.gz: af1c4603f14d42656d794709d5db02bc69014f7b
+  data.tar.gz: c3b7bcd54b0747b0173f1e01050cb0f1a307247c
 SHA512:
-  metadata.gz: 10dbdfddb4ad3957b07e95316518902b6880f2ef3e739ce298b143824cc568402eba18aadfcd47c0907684351175abb5612f860ee2736daf0afc58ef79f3d3b5
-  data.tar.gz: 12f3736f3056b60b79a18e9645a267f5f7f4718f89a384b231d4cc3f60b88c63f9144757b6f90a0f2bb809b9766d1fedfb88aa08822778988257867c9d43418a
+  metadata.gz: 7cd11e937b6183a4b628d02d9b9ade6400a6dd9c831410a6905ab21e06d88db3b17117e8a06261e6064119f092b760f66053db87d8d2c8294eb5e6af31915e64
+  data.tar.gz: 6647e6ba14819d2d6fe07d339ac5290d449038ed2096f33f8c1ea64903202379adb1acd707586332b6c2c809c2d8bdbfe05cff3bbf9f33cbdde232dba05027a8

data/lib/composable_operations/composed_operation.rb

@@ -54,7 +54,7 @@ module ComposableOperations
           operation.perform
 
           if operation.failed?
-            fail operation.message, operation.result, operation.backtrace
+            fail operation.exception
           elsif operation.halted?
             halt operation.message, operation.result
           end

data/lib/composable_operations/operation.rb

@@ -15,7 +15,7 @@ module ComposableOperations
         operation = new(*args)
         operation.perform
 
-        raise exception, operation.message, operation.backtrace if operation.failed?
+        raise operation.exception if operation.failed?
 
         operation.result
       end
@@ -86,6 +86,7 @@ module ComposableOperations
     attr_reader :result
     attr_reader :message
     attr_reader :backtrace
+    attr_reader :exception
 
     def initialize(*args)
       named_input_parameters   = args.shift(self.class.arity)
@@ -136,18 +137,42 @@ module ComposableOperations
       attr_writer :message
       attr_writer :result
       attr_writer :backtrace
+      attr_writer :exception
 
       def execute
         raise NotImplementedError, "#{name}#execute not implemented"
       end
 
-      def fail(message = nil, return_value = nil, backtrace = caller)
+      def fail(*args)
         raise "Operation execution has already been aborted" if halted? or failed?
+        exception, message, backtrace = nil, nil, nil
+
+        case args.length
+        when 1
+          value = args[0]
+          if Exception === value
+            exception = value
+          elsif Class === value && Exception > value
+            exception = value
+            message = value.message
+            backtrace = value.backtrace
+          else
+            message = value
+          end
+        when 2, 3
+          exception, message, backtrace = args[0], args[1], args[2]
+        end
+
+        backtrace ||= caller
+        exception ||= self.class.exception
+        exception = Class === exception ? exception.new(message) : exception
+        exception.set_backtrace(backtrace)
 
         self.state = :failed
         self.backtrace = backtrace
         self.message = message
-        throw :halt, return_value
+        self.exception = exception
+        throw :halt, nil
       end
 
       def halt(message = nil, return_value = nil)

data/lib/composable_operations/version.rb

@@ -1,3 +1,3 @@
 module ComposableOperations
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/composable_operations/exception_handling_spec.rb

@@ -0,0 +1,146 @@
+require 'spec_helper'
+
+describe ComposableOperations::Operation, "that always fails:" do
+  let(:failing_operation) do
+    Class.new(described_class) do
+      def execute
+        fail "Operation failed"
+      end
+    end
+  end
+
+  context "When no default exception has been specified" do
+    it "should raise an error when executed" do
+      expect { failing_operation.perform }.to raise_error(ComposableOperations::OperationError, "Operation failed")
+    end
+
+    context "when manually instantiated and executed" do
+      subject(:failing_operation_instance) do
+        operation = failing_operation.new
+        operation.perform
+        operation
+      end
+
+      it "should have nil as result" do
+        failing_operation_instance.result.should be_nil
+      end
+
+      it "should have failed" do
+        failing_operation_instance.should be_failed
+      end
+
+      it "should have a message" do
+        failing_operation_instance.message.should_not be_nil
+      end
+
+      it "should have an exception of type OperationError whose message is 'Operation failed'" do
+        failing_operation_instance.exception.should be_kind_of(ComposableOperations::OperationError)
+        failing_operation_instance.exception.message.should be == 'Operation failed'
+      end
+    end
+
+    context "when extended with a finalizer" do
+      let(:supervisor) { mock("Supervisor") }
+
+      let(:failing_operation_with_finalizer) do
+        supervisor = supervisor()
+        Class.new(failing_operation) do
+          after { supervisor.notify }
+        end
+      end
+
+      subject(:failing_operation_with_finalizer_instance) do
+        failing_operation_with_finalizer.new
+      end
+
+      it "should execute the finalizers" do
+        supervisor.should_receive(:notify)
+        failing_operation_with_finalizer_instance.perform
+      end
+    end
+  end
+
+  context "When a default exception has been specified" do
+    let(:custom_exception) { Class.new(RuntimeError) }
+
+    subject(:failing_operation_with_custom_default_exception) do
+      custom_exception = custom_exception()
+      Class.new(failing_operation) do
+        raises custom_exception
+      end
+    end
+
+    it "should raise the custom exeception when executed" do
+      expect { failing_operation_with_custom_default_exception.perform }.
+        to raise_error(custom_exception, "Operation failed")
+    end
+
+    context "when manually instantiated and executed" do
+      subject(:failing_operation_with_custom_default_exception_instance) do
+        operation = failing_operation_with_custom_default_exception.new
+        operation.perform
+        operation
+      end
+
+      it "should have an exception of the custom exception type whose message is 'Operation failed'" do
+        failing_operation_with_custom_default_exception_instance.exception.should be_kind_of(custom_exception)
+        failing_operation_with_custom_default_exception_instance.exception.message.should be == 'Operation failed'
+      end
+    end
+  end
+
+  context "When a custom exception has been specified" do
+    let(:custom_exception) { Class.new(RuntimeError) }
+    subject(:failing_operation_with_custom_exception) do
+      custom_exception = self.custom_exception
+      Class.new(described_class) do
+        define_method(:execute) do
+          fail custom_exception, "Operation failed"
+        end
+      end
+    end
+
+    it "should raise the custom exeception when executed" do
+      expect { failing_operation_with_custom_exception.perform }.
+        to raise_error(custom_exception, "Operation failed")
+    end
+
+    context "when manually instantiated and executed" do
+      subject(:failing_operation_with_custom_exception_instance) do
+        operation = failing_operation_with_custom_exception.new
+        operation.perform
+        operation
+      end
+
+      it "should have an exception of the custom exception type whose message is 'Operation failed'" do
+        failing_operation_with_custom_exception_instance.exception.should be_kind_of(custom_exception)
+        failing_operation_with_custom_exception_instance.exception.message.should be == 'Operation failed'
+      end
+    end
+
+    context "when used in a composed operation" do
+      let(:failing_composed_operation) do
+        ComposableOperations::ComposedOperation.compose(failing_operation_with_custom_exception)
+      end
+
+      it "should raise the custom exception that is thrown by the inner operation when executed" do
+        expect { failing_composed_operation.perform }.
+          to raise_error(custom_exception, "Operation failed")
+      end
+
+      context "when this composed operation is manually instantiated and executed" do
+        subject(:failing_composed_operation_instance) do
+          operation = failing_composed_operation.new
+          operation.perform
+          operation
+        end
+
+        it "should have an exception of the custom exception type whose message is 'Operation failed'" do
+          failing_composed_operation_instance.exception.should be_kind_of(custom_exception)
+          failing_composed_operation_instance.exception.message.should be == 'Operation failed'
+        end
+      end
+    end
+  end
+end
+

data/spec/composable_operations/operation_input_forwarding_spec.rb

@@ -2,6 +2,35 @@ require 'spec_helper'
 
 describe ComposableOperations::ComposedOperation, "input forwarding:" do
 
+  describe "An operation pipeline that first constructs an array with two elements and then passes it to an operation that accepts two input parameters and returns the second one" do
+
+    let(:array_generator) do
+      Class.new(ComposableOperations::Operation) do
+        def execute
+          [:first_element, :second_element]
+        end
+      end
+    end
+
+    let(:extractor) do
+      Class.new(ComposableOperations::Operation) do
+        processes :first_parameter, :second_parameter
+        def execute
+          second_parameter
+        end
+      end
+    end
+
+    subject(:pipeline) do
+      ComposableOperations::ComposedOperation.compose(array_generator, extractor)
+    end
+
+    it "should return the correct element" do
+      result = pipeline.perform
+      result.should == :second_element
+    end
+  end
+
   describe "An operation pipeline that first constructs an enumerator, then passes it from operation to operation and finally returns it as the result" do
 
     let(:enum_generator) do

data/spec/composable_operations/operation_spec.rb

@@ -46,81 +46,6 @@ describe ComposableOperations::Operation do
 
   end
 
-  context "that always fails" do
-
-    let(:failing_operation) do
-      Class.new(described_class) do
-        def execute
-          fail "Operation failed"
-        end
-      end
-    end
-
-    subject(:failing_operation_instance) do
-      failing_operation.new
-    end
-
-    before(:each) do
-      failing_operation_instance.perform
-    end
-
-    it "should have nil as result" do
-      failing_operation_instance.result.should be_nil
-    end
-
-    it "should have failed" do
-      failing_operation_instance.should be_failed
-    end
-
-    it "should have a message" do
-      failing_operation_instance.message.should_not be_nil
-    end
-
-    it "should raise an error when executed using the class method perform" do
-      expect { failing_operation.perform }.to raise_error("Operation failed")
-    end
-
-    context "when extended with a finalizer" do
-
-      let(:supervisor) { mock("Supervisor") }
-
-      let(:failing_operation_instance_with_finalizer) do
-        supervisor = supervisor()
-        Class.new(failing_operation) do
-          after { supervisor.notify }
-        end
-      end
-
-      subject(:failing_operation_instance_with_finalizer_instance) do
-        failing_operation_instance_with_finalizer.new
-      end
-
-      it "should execute the finalizers" do
-        supervisor.should_receive(:notify)
-        failing_operation_instance_with_finalizer_instance.perform
-      end
-
-    end
-
-    context "when configured to raise a custom exception" do
-
-      let(:custom_exception) { Class.new(RuntimeError) }
-
-      subject(:failing_operation_with_custom_exception) do
-        custom_exception = custom_exception()
-        Class.new(failing_operation) do
-          raises custom_exception
-        end
-      end
-
-      it "should raise the custom exeception when executed using the class method perform" do
-        expect { failing_operation_with_custom_exception.perform }.to raise_error(custom_exception, "Operation failed")
-      end
-
-    end
-
-  end
-
   context "that always returns something when executed" do
 
     let(:simple_operation) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composable_operations
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Konstantin Tennhard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_properties
@@ -105,6 +105,7 @@ files:
 - lib/composable_operations/version.rb
 - spec/composable_operations/composed_operation_spec.rb
 - spec/composable_operations/control_flow_spec.rb
+- spec/composable_operations/exception_handling_spec.rb
 - spec/composable_operations/operation_input_forwarding_spec.rb
 - spec/composable_operations/operation_input_processing_spec.rb
 - spec/composable_operations/operation_spec.rb
@@ -136,6 +137,7 @@ summary: Tool set for operation pipelines.
 test_files:
 - spec/composable_operations/composed_operation_spec.rb
 - spec/composable_operations/control_flow_spec.rb
+- spec/composable_operations/exception_handling_spec.rb
 - spec/composable_operations/operation_input_forwarding_spec.rb
 - spec/composable_operations/operation_input_processing_spec.rb
 - spec/composable_operations/operation_spec.rb