business_flow 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0180db91d5d4bd73704b91bab314200f16c20fd9
-  data.tar.gz: 8cc957b8a623b47f69e2c94d8e078ff017fb190d
+  metadata.gz: a36d386ed615b80fdfaab67a8c6b7a7817bdd04d
+  data.tar.gz: 492b752fcd273157fc60b59b2e73f19ccf3b3d3c
 SHA512:
-  metadata.gz: 5486b16d372727e76daa44d69527b132fa15b67333b0ba48c905e26427a9a11f26d143afea69ef6225bccadd0f5ff71edc458d7de553e71945d04756a68b580f
-  data.tar.gz: d2b00921a815c4ebd46f121e20ab6b3bbb1c9956f1b3f2cea1e17cbdd19b30106e2dc77d3caf79bd634f6affeb9bb27012a090e9a0ba34f60c025898fb328df9
+  metadata.gz: 2d2ac2702a87052c75c07996b626141ab2c090362119b02853d6df7b4f5fc2796adf76ad0d8fc5dba52ec17e070c55ab83f4155524a6c985f0a9610368964cd8
+  data.tar.gz: 0174d7593e10b6871139eeeb3566371ea0086162eea5200c0f0d7c06fea017f73a296e65a7ce1acbfebea3411797c28d36d9b739cf0648921d3792cc8b1a386a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    business_flow (0.14.1)
+    business_flow (0.14.2)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
 

data/lib/business_flow/step.rb

@@ -55,13 +55,18 @@ module BusinessFlow
       # :reek:ManualDispatch Checking respond_to? is signficantly faster than
       # eating the NoMethodError when grabbing our error object.
       def errors?
-        @result.respond_to?(:errors?) ? @result.errors? : false
-      end
-
-      # :reek:ManualDispatch Checking respond_to? is signficantly faster than
-      # eating the NoMethodError when grabbing our error object.
-      def valid?
-        @result.respond_to?(:valid?) ? @result.valid? : true
+        if @result.respond_to?(:errors?)
+          @result.errors?
+        # This is here to support ActiveRecord. We don't want to call valid?
+        # because that will run validations and a step may return a partially
+        # constructed model. By instead pulling out the errors instance variable
+        # we'll only merge errors if validations have already been run.
+        elsif @result.class.include?(ActiveModel::Validations) &&
+              @result.instance_variable_defined(:@errors)
+          @result.instance_variable_get(:@errors).present?
+        else
+          false
+        end
       end
 
       def output
@@ -82,7 +87,7 @@ module BusinessFlow
       # :reek:ManualDispatch Checking respond_to? is signficantly faster than
       # eating the NoMethodError when grabbing our error object.
       def mergeable_errors?
-        @result.respond_to?(:errors) && (errors? || !valid?)
+        @result.respond_to?(:errors) && errors?
       end
 
       def merge_errors_into(object)

data/lib/business_flow/version.rb

@@ -1,3 +1,3 @@
 module BusinessFlow
-  VERSION = '0.14.1'.freeze
+  VERSION = '0.14.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_flow
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Alex Scarborough
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-16 00:00:00.000000000 Z
+date: 2019-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel