business_flow 0.15.1 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f138e6ec77fc0cbcada6bc02b282310b22db7cfb
-  data.tar.gz: 473e3b3afa5b3af4b78eb6ee92475b77150a56e3
+SHA256:
+  metadata.gz: e3e82021d8909a6bc2e1506eabcc81e311eadb03b799146c8ff0731519ce6700
+  data.tar.gz: acc5d1ccc792d66d9ea1562f7fa3549af9c06600cfca35178118e08a8635a3cb
 SHA512:
-  metadata.gz: c5f6d16dd0671e965ddc9415cf47868c7ba1a01c41af9360ed8c2c9f9cb76fa7ac3cb6f6953fa58388a24f199b53b4c15e5f7902560a7ca5e6feb77c0782f94c
-  data.tar.gz: 8d95b1ebf703d4bcf4663f2fccd86c8bb0058f0faa4bde05ea3ff17d41104d172123a26ebe423d5c5a8f2f6ab15c566a48dcadfbf09f6cecffcc74114e4bedfe
+  metadata.gz: bd4a457dbaf1cd943db479b585379d0f8b1391890e956a265eea09fa9f0badea95fcc8857223a451759844dfe419e661c43324e5db13bcb9fe6ccdd07d741684
+  data.tar.gz: '08f2debe4942321aaca7896c99a05147a56a8a2cde31fda83f9c2bfaf1fc8873b5e78a58e6c65b47aa94dfe794040da7be65f049527119147a959040ad940ac1'

data/Gemfile.lock

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

data/lib/business_flow/dsl.rb

@@ -16,16 +16,19 @@ module BusinessFlow
 
         def add_needs(fields)
           @all += fields
+          @all.uniq!
           @needs.add_fields(fields)
         end
 
         def add_optional(fields)
           @all += fields
+          @all.uniq!
           @optionals.add_fields(fields)
         end
 
         def add_wants(field)
           @all << field.name
+          @all.uniq!
           @optionals.add_field(field)
         end
       end
@@ -46,10 +49,23 @@ module BusinessFlow
         inputs.add_optional(fields)
       end
 
+      # Provides an alternate way to look up the value for a field. This can be
+      # thought of as using a 'wants' combined with an expectation of presence,
+      # without having to check for whether or not the wants can be executed.
+      #
+      # :reek:NilCheck This is one of the places where we eliminate nil.
+      def lookup(field, by:, with:)
+        by = Array.wrap(by)
+        optional(*by)
+        wants field, with, unless: -> { by.any? { |input| send(input).nil? } },
+                           default_output: field
+      end
+
       # Allows a field to be retrieved from the initialiaztion parameters
-      def wants(field, default = proc { nil }, opts = {})
+      def wants(field, default = nil, opts = {}, &blk)
         internal_name = "wants_#{field}".to_sym
-        uses(internal_name, default, opts)
+        default = proc { nil } unless default || block_given?
+        uses(internal_name, default, opts, &blk)
         inputs.add_wants(ParameterField.new(field, internal_name))
       end
 
@@ -60,7 +76,7 @@ module BusinessFlow
       # Declares that you will expose a field to the outside world.
       def provides(*fields)
         @provides ||= FieldList.new([], PublicField, [self, const_get(:Result)])
-        @result_copy ||= 'def from_flow(flow)'
+        @result_copy ||= FROM_FLOW_PREAMBLE
         @result_copy += fields.map { |field| "\n@#{field} = flow.#{field}" }
                               .join
         @provides.add_fields(fields)
@@ -71,16 +87,16 @@ module BusinessFlow
       def uses(field, klass = nil, opts = {}, &blk)
         step = Step.new(Callable.new(klass || blk),
                         { default_output: field }.merge(opts))
-        retriever = proc { step.call(self).output }
+        retriever = proc { step.call(self).merge_into(self) }
         UsesField.new(field, retriever).add_to(self)
       end
 
-      def step(klass, opts = {})
-        step = Step.new(Callable.new(klass), opts)
+      # :reek:ControlParameter It's just nicer to have this fall back to a
+      # block than have a different DSL method when using/not using blocks
+      def step(klass, opts = {}, &blk)
+        step = Step.new(Callable.new(blk || klass), opts)
         step_queue.push(step)
-        step.outputs
-            .values
-            .select { |field| field.is_a?(Symbol) }
+        step.output_fields
             .each { |field| Field.new(field).add_to(self) }
       end
 
@@ -127,7 +143,7 @@ module BusinessFlow
       end
 
       def result_from(flow)
-        finalize_result_provider
+        finalize_result_provider unless @finalized_result_provider
         # We use instance_variable_get here instead of making it part of
         # from_flow to ensure that we do not create the errors object unless
         # we need it.
@@ -165,6 +181,11 @@ module BusinessFlow
       end
     end
 
+    FROM_FLOW_PREAMBLE = %(
+      def from_flow(flow)
+        return if errors?
+    ).freeze
+
     RESULT_DEF = %(
       class Result
         def initialize(errors)
@@ -178,7 +199,7 @@ module BusinessFlow
         def errors?
           # We're explicitly using the instance variable here so that if no
           # errors have been created, we don't initialize the error object.
-          @errors.present?
+          !!@errors && @errors.present?
         end
 
         def valid?(_context = nil)
@@ -267,7 +288,7 @@ module BusinessFlow
     def errors?
       # We're explicitly using the instance variable here so that if no
       # errors have been created, we don't initialize the error object.
-      @errors.present?
+      @errors && @errors.present?
     end
 
     def valid?(_context = nil)
@@ -296,6 +317,7 @@ module BusinessFlow
         fields.each do |field|
           add_field(@field_klass.new(field))
         end
+        @field_list.uniq! if fields.present?
         @field_list
       end
 

data/lib/business_flow/step.rb

@@ -44,8 +44,8 @@ module BusinessFlow
       end
 
       def merge_into(object)
-        merge_errors_into(object)
-        merge_outputs_into(object)
+        merge_errors_into(object) if mergeable_errors?
+        merge_outputs_into(object) if @output_map
         output
       end
 
@@ -62,9 +62,11 @@ module BusinessFlow
         # 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) &&
+        elsif @result.class.ancestors.include?(ActiveModel::Validations) &&
               @result.instance_variable_defined?(:@errors)
           @result.instance_variable_get(:@errors).present?
+        elsif @result.respond_to?(:errors)
+          @result.errors.present?
         else
           false
         end
@@ -88,9 +90,7 @@ module BusinessFlow
       end
 
       def merge_errors_into(object)
-        return unless mergeable_errors?
         @result.errors.each do |attribute, message|
-          attribute = "#{@result.class.name.underscore}.#{attribute}"
           (object.errors[attribute] << message).uniq!
         end
         throw :halt_step
@@ -175,7 +175,7 @@ module BusinessFlow
       end
 
       def result_factory
-        ResultFactory.new(opts[:outputs] || {},
+        ResultFactory.new(opts[:outputs],
                           opts[:output],
                           opts[:default_output])
       end
@@ -201,6 +201,8 @@ module BusinessFlow
       update_call_method
     end
 
+    # This will show up as not covered in coverage reports, because it is
+    # dynamically redefined by #update_call_method below.
     def call(parameter_source)
       parameters = @input_object.parameters_from_source(parameter_source)
       if !@condition || @condition.call(parameter_source, parameters)
@@ -219,6 +221,11 @@ module BusinessFlow
       @result_factory.outputs
     end
 
+    def output_fields
+      return [] unless outputs
+      outputs.values.select { |field| field.is_a?(Symbol) }
+    end
+
     def to_s
       @callable.to_s
     end

data/lib/business_flow/version.rb

@@ -1,3 +1,3 @@
 module BusinessFlow
-  VERSION = '0.15.1'.freeze
+  VERSION = '0.17.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_flow
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.17.3
 platform: ruby
 authors:
 - Alex Scarborough
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -164,7 +164,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-description: 
+description:
 email:
 - alex@teak.io
 executables: []
@@ -200,7 +200,7 @@ homepage: https://teak.io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,9 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: General purpose management of service object flows
 test_files: []