business_flow 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdef83b6efdb2ec395d4163aa60019a462290771
-  data.tar.gz: 5e8cafcb5a42577f5ccd6935d4bc2caa27aad273
+  metadata.gz: ef0272ca5eb7e69dd6f802b1e684930a2a344021
+  data.tar.gz: 5b02b5d3c8981929d9f7e2675890933562501388
 SHA512:
-  metadata.gz: fcafa83b78deab671faf9ac470dc234a332ce159a05ba3ed652d719521038b786d63cf178a5270bcdaa1def9bda1b9cc7cd130d3a8100ceddededbe0232debe9
-  data.tar.gz: 6083b83d0699c52fda62eee141238dff4d7ce910cfc3386a52bdc518e7986e45bedefac50e19ac3081059474c3bbace3c2d051151169cad637ed49ebb5a05c61
+  metadata.gz: 8238af8e966875e8ffeca8ffa376f73d761158c64ca01b1af8edda23c3f2e6b814f12395d295c99269152de7b478205019ef1bebb4a725113dc4e8324595d7d0
+  data.tar.gz: f8afa54780606ad60029b47eee2c88a832822088ce98922374635ad1e97422341bf8a2d4aa43f8d48bdf05b515f2a06a612c720d83db759b041be2870e7fea38

data/Gemfile.lock

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

data/lib/business_flow/dsl.rb

@@ -15,6 +15,13 @@ module BusinessFlow
         @needs.add_fields(fields)
       end
 
+      # Allows a field to be retieved form the initialization paramters,
+      # but does not require it to be non-nil
+      def optional(*fields)
+        @optionals ||= FieldList.new([], ParameterField, self)
+        @optionals.add_fields(fields)
+      end
+
       # Allows a field to be retrieved from the initialiaztion parameters
       def wants(field, default = proc { nil }, opts = {})
         internal_name = "wants_#{field}".to_sym
@@ -53,7 +60,7 @@ module BusinessFlow
       # :reek:UtilityFunction This is a function on us so that other modules
       # can change execution behavior.
       def execute(flow)
-        catch(:halt_step) { flow.call }
+        catch(:halt_step) { flow.call } unless flow.errors?
         result_from(flow)
       end
 
@@ -304,6 +311,8 @@ module BusinessFlow
 
     # Helper class around memoized fields
     class MemoizedField
+      attr_reader :field
+
       def initialize(field, retriever, setter_factory)
         @field = field
         @retriever = retriever
@@ -319,7 +328,7 @@ module BusinessFlow
 
       private
 
-      attr_reader :field, :retriever, :setter_factory
+      attr_reader :retriever, :setter_factory
 
       def memoized(ivar_name, setter, retriever)
         <<-MEMOIZED
@@ -375,6 +384,7 @@ module BusinessFlow
 
       def add_to(klass)
         @field.add_to(klass)
+        klass.send(:public, @field.field)
       end
 
       private
@@ -390,9 +400,12 @@ module BusinessFlow
         @parameters = parameters
       end
 
+      # :reek:NilCheck
       def fetch(key)
         value = inner_fetch(key)
-        return yield if !value && block_given?
+        # We only want to fall back to a default if we were
+        # given nil. Other falsy vlues should be directly used.
+        return yield if value.nil? && block_given?
         value
       end
 

data/lib/business_flow/step.rb

@@ -35,7 +35,8 @@ module BusinessFlow
     # Represents the result of a step, and allows setting response values on
     # an object, and merging error data into the same object.
     class Result
-      def initialize(result, output_map, output_callable)
+      def initialize(parameter_source, result, output_map, output_callable)
+        @parameter_source = parameter_source
         @result = result
         @output_map = output_map
         @output_callable = output_callable
@@ -44,6 +45,7 @@ module BusinessFlow
       def merge_into(object)
         merge_errors_into(object)
         merge_outputs_into(object)
+        output
       end
 
       def executed?
@@ -56,8 +58,14 @@ module BusinessFlow
         @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
+      end
+
       def output
-        @output_callable.call(@result)
+        @parameter_source.instance_exec(@result, &@output_callable)
       end
 
       def self.process_output(object, output, output_setter)
@@ -71,8 +79,14 @@ module BusinessFlow
 
       private
 
+      # :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?
+      end
+
       def merge_errors_into(object)
-        return unless errors?
+        return unless mergeable_errors?
         @result.errors.each do |attribute, message|
           attribute = "#{@result.class.name.underscore}.#{attribute}"
           (object.errors[attribute] << message).uniq!
@@ -103,8 +117,8 @@ module BusinessFlow
 
     # Manage creating results for our step
     ResultFactory = Struct.new(:outputs, :output_callable) do
-      def result(step_result)
-        Result.new(step_result, outputs, output_callable)
+      def result(step_result, parameter_source)
+        Result.new(parameter_source, step_result, outputs, output_callable)
       end
     end
 
@@ -163,7 +177,8 @@ module BusinessFlow
     def call(parameter_source)
       parameters = @input_object.parameters_from_source(parameter_source)
       if @condition.call(parameter_source, parameters)
-        @result_factory.result(@callable.call(parameter_source, parameters))
+        @result_factory.result(@callable.call(parameter_source, parameters),
+                               parameter_source)
       else
         ConditionFailedResult.new
       end

data/lib/business_flow/version.rb

@@ -1,3 +1,3 @@
 module BusinessFlow
-  VERSION = '0.13.0'.freeze
+  VERSION = '0.14.0'.freeze
 end

metadata

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