subroutine 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db2163ce0bb2002f164e3bda2b19e7cd7946f04c
-  data.tar.gz: a6ec479f651d9d596f6dc7851c00b1c369e1c922
+  metadata.gz: adec63683815f30335f67edb81ae73e313cf7046
+  data.tar.gz: 07726344ba242224d384a4ad6c38af2f9985cddd
 SHA512:
-  metadata.gz: c11cf049c0dfcf2abc8de33f5841df7fce0be49a3104fcbe99dc60bf08f50e3fab04c5c08145b9d7646185c374d39e8b8db4b837c41f10ea0be18a3d7dc3230a
-  data.tar.gz: 069dcc45c333d6754dcd787a87b8c384a588589673d22271804e3f4907c1ea9e1f0a303ceff2cfbcd77ebf45a9b333c849cf1a66fe8cfe6230f16cf02c5501ed
+  metadata.gz: 7cfbdb1c872febd5ed53e2d6ef3466faf32fb20e02cfb4a8485c8c8e0f528ddfd3b10671063a22c173c6c81409337fd1e4f29fe218f5ae3e8797231108f207c5
+  data.tar.gz: 048c5ad5a14f44aba3f8bfedbdb02ed8617e7d6ffe92656b8a7f99140eda49d0216aac64f368da7182f9fd7a0ed515f6062a57af23ab6b9049a49d18a315bae2

data/lib/subroutine/op.rb

@@ -180,35 +180,42 @@ module Subroutine
     end
 
     def submit!
-      unless submit
-        raise ::Subroutine::Failure.new(self)
-      end
-      true
-    end
 
-    # the action which should be invoked upon form submission (from the controller)
-    def submit
-      result = observe_submission do
-        validate_and_perform
+      begin
+        observe_submission do
+          validate_and_perform
+        end
+      rescue Exception => e
+        if e.respond_to?(:record)
+          inherit_errors(e.record) unless e.record == self
+          raise ::Subroutine::Failure.new(self)
+        else
+          raise
+        end
       end
 
-      if result
+      if errors.empty?
         _outputs.each_pair do |name, config|
           if config[:required] && !@outputs.key?(name)
             raise ::Subroutine::OutputNotSetError.new(name)
           end
         end
-      end
 
-      result
+        true
+      else
+        raise ::Subroutine::Failure.new(self)
+      end
+    end
 
+    # the action which should be invoked upon form submission (from the controller)
+    def submit
+      submit!
     rescue Exception => e
-
       if e.respond_to?(:record)
         inherit_errors(e.record) unless e.record == self
         false
       else
-        raise e
+        raise
       end
     end
 

data/lib/subroutine/version.rb

@@ -1,8 +1,8 @@
 module Subroutine
 
   MAJOR = 0
-  MINOR = 4
-  PATCH = 1
+  MINOR = 5
+  PATCH = 0
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/subroutine/base_test.rb

@@ -119,6 +119,11 @@ module Subroutine
       assert_equal "Password can't be blank", err.message
     end
 
+    def test_the_result_of_perform_doesnt_matter
+      op = ::FalsePerformOp.new
+      assert op.submit!
+    end
+
     def test_it_allows_submission_from_the_class
       op = SignupOp.submit
       assert_equal ["can't be blank"], op.errors[:email]

data/test/support/ops.rb

@@ -201,6 +201,12 @@ class InheritedPolymorphicAssociationOp < ::Subroutine::Op
   inputs_from PolymorphicAssociationOp
 end
 
+class FalsePerformOp < ::Subroutine::Op
+  def perform
+    false
+  end
+end
+
 class MissingOutputOp < ::Subroutine::Op
   def perform
     output :foo, "bar"
@@ -224,6 +230,6 @@ end
 class NoOutputNoSuccessOp < ::Subroutine::Op
   outputs :foo
   def perform
-    false
+    errors.add(:foo, "bar")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel