business_flow 0.17.4 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b8b055c5e74f6c55285b6b2c1514a062fb8f7ed5370538a482bae1f6319a21
-  data.tar.gz: 40b01f4b0e319225ae99890ebe3f9a93a2360f9a31ffe4379fe4b0b87afd91f0
+  metadata.gz: 9163d03b65bfd1a9419b31593b1e7efca00c7eb1b13838dab9a5c402597e14e1
+  data.tar.gz: 65cb6f0168df3fb353c70a7db3614950be0fce5304f99529357e9ccdf664d1e7
 SHA512:
-  metadata.gz: 6c3fc8bf70de03131787d8973e77117a80f824810a92f08abec20ec20ae2d10e5dd04eb7b3afdb9c759c01bdf97f87b440358f6ae5bbf3ad3c81a6375b350492
-  data.tar.gz: 332391d394a721cbcb5c3b212cae333daea82e7f2c34bc51dc1142c5d0f4c7b5438c06df7e9e22dd72f94a573fc39254763e33cff85bdb044eaaa85e1ca0c69a
+  metadata.gz: 156666c6666f24bd1d4bfa024d63b337c33cec5055cb7918bde71428e452609d37b45da7f8dd74d7aafd1890952006ca89b17eeaf508fe7d70f14bb408d71522
+  data.tar.gz: a907affc0aea2953272d33cb836b42ab8b6729a4a9ce43eaf88617ea03aae510efff9dfeb30f61198dd18a16d61ae88698d873a95223404c763d717be50ad9f3

data/Gemfile.lock

@@ -1,91 +1,86 @@
 PATH
   remote: .
   specs:
-    business_flow (0.17.3)
-      activemodel (~> 4.2)
-      activesupport (~> 4.2)
+    business_flow (0.18.1)
+      activemodel (>= 4.2, < 8)
+      activesupport (>= 4.2, < 8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.11.3)
-      activesupport (= 4.2.11.3)
-      builder (~> 3.1)
-    activesupport (4.2.11.3)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
+    activemodel (7.0.2)
+      activesupport (= 7.0.2)
+    activesupport (7.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     ast (2.4.2)
-    builder (3.2.4)
+    codeclimate-engine-rb (0.4.2)
     concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    docile (1.3.5)
-    i18n (0.9.5)
+    diff-lcs (1.5.0)
+    docile (1.1.5)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    kwalify (0.7.2)
-    minitest (5.14.4)
-    parallel (1.20.1)
-    parser (3.0.2.0)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    reek (6.0.6)
-      kwalify (~> 0.7.0)
-      parser (~> 3.0.0)
+    jaro_winkler (1.5.4)
+    json (2.6.1)
+    minitest (5.15.0)
+    parallel (1.21.0)
+    parser (2.5.3.0)
+      ast (~> 2.4.0)
+    rainbow (3.1.1)
+    rake (10.5.0)
+    reek (4.8.2)
+      codeclimate-engine-rb (~> 0.4.0)
+      parser (>= 2.5.0.0, < 2.6)
       rainbow (>= 2.0, < 4.0)
-    regexp_parser (2.1.1)
     retryable (3.0.5)
-    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (0.93.1)
+    rspec-support (3.10.3)
+    rubocop (0.68.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 2.5, != 2.5.1.1)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-rspec (1.44.1)
-      rubocop (~> 0.87)
-      rubocop-ast (>= 0.7.1)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    rubocop-rspec (1.24.0)
+      rubocop (>= 0.53.0)
     ruby-progressbar (1.11.0)
-    simplecov (0.18.5)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.3)
-    thread_safe (0.3.6)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     timecop (0.9.4)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   business_flow!
-  reek (~> 6)
+  rake (~> 10.0)
+  reek (~> 4.8)
   retryable (~> 3.0.4)
   rspec (~> 3.0)
   rubocop (~> 0.53)
-  rubocop-rspec (~> 1.24)
-  simplecov (~> 0.15)
-  timecop (~> 0.9)
+  rubocop-rspec (~> 1.24.0)
+  simplecov (~> 0.15.1)
+  timecop (~> 0.9.1)
 
 BUNDLED WITH
-   1.16.6
+   2.3.6

data/business_flow.gemspec

@@ -20,14 +20,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activemodel', '~> 4.2'
-  spec.add_dependency 'activesupport', '~> 4.2'
+  spec.add_dependency 'activemodel', '>= 4.2', '< 8'
+  spec.add_dependency 'activesupport', '>= 4.2', '< 8'
 
-  spec.add_development_dependency 'reek', '~> 6'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'reek', '~> 4.8'
   spec.add_development_dependency 'retryable', '~> 3.0.4'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.53'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.24'
-  spec.add_development_dependency 'simplecov', '~> 0.15'
-  spec.add_development_dependency 'timecop', '~> 0.9'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.24.0'
+  spec.add_development_dependency 'simplecov', '~> 0.15.1'
+  spec.add_development_dependency 'timecop', '~> 0.9.1'
 end

data/lib/business_flow/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # include BusinessFlow::Base in any object to get a flow!
   module Base

data/lib/business_flow/cacheable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # Extends the DSL to support caching of completed processes
   module Cacheable
@@ -50,7 +52,8 @@ module BusinessFlow
         end
       end
 
-      def cache_key(key = nil)
+      def cache_key(key = nil, &blk)
+        key ||= blk
         if key
           @cache_key = Callable.new(key)
         else

data/lib/business_flow/callable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # Isolate the logic around invoking a 'callable' -- a symbol representing a
   # method, a symbol representing another class which implements .call, or a
@@ -95,7 +97,7 @@ module BusinessFlow
 
     def lookup_callable(first_instance)
       constant_name = @callable.to_s.camelcase
-      first_instance.class.parents.each do |parent|
+      first_instance.class.module_parents.each do |parent|
         begin
           return parent.const_get(constant_name)
         rescue NameError

data/lib/business_flow/compat.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module BusinessFlow
+  # Provides compatibility for ActiveSupport/Model 4.x through 7.x
+  module Compat
+    if !Module.instance_methods.include?(:module_parents)
+      # ActiveSupport 5 removed #parents in favor of #module_parents.
+      class ::Module
+        def module_parents
+          parents
+        end
+      end
+    end
+
+    if !ActiveModel::Errors.instance_methods.include?(:merge!)
+      # ActiveModel 5 added details (which we do not use here) and #merge!
+      # :reek:PrimaDonnaMethod Look it's the API.
+      class ::ActiveModel::Errors
+        def merge!(other)
+          other.each do |attribute, message|
+            self[attribute] << message
+          end
+        end
+      end
+    end
+  end
+end

data/lib/business_flow/default_step_executor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # Default behavior for running a step queue -- execute each step in turn
   # halting the moment something goes wrong. Use the same flow as input

data/lib/business_flow/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # Core DSL for BusinessFlow. The relevant methods are all in
   # ClassMethods.
@@ -161,7 +163,7 @@ module BusinessFlow
       def needs_code
         needs.map do |need|
           %(if #{need}.nil?
-              errors[:#{need}] << 'must not be nil'
+              errors.add(:#{need}, :invalid, message: 'must not be nil')
               throw :halt_step
             end
           )
@@ -220,6 +222,14 @@ module BusinessFlow
       def human_attribute_name(key, _opts = {})
         key
       end
+
+      # Provides the miniimum necessary instance methods to support the use of
+      # ActiveMode::Errors, outside of what's provided by ActiveModel::Naming
+      module InstanceMethods
+        def read_attribute_for_validation(key)
+          send(key)
+        end
+      end
     end
 
     # :reek:ManualDispatch I have no need to actually call human_attribute_name,
@@ -228,6 +238,8 @@ module BusinessFlow
       klass.extend(ClassMethods)
       klass.class_eval RESULT_DEF, __FILE__, __LINE__
       klass.extend(ErrorSupport) unless klass.respond_to?(:human_attribute_name)
+      klass.extend(ActiveModel::Naming)
+      klass.include(ErrorSupport::InstanceMethods) unless klass.respond_to?(:read_attribute_for_validation)
     end
 
     attr_reader :parameter_object
@@ -247,7 +259,7 @@ module BusinessFlow
       @parameter_object = parameter_object
       needs.each do |need|
         if send(need).nil?
-          errors[need] << 'must not be nil'
+          errors.add(need, :invalid, message: 'must not be nil')
           throw :halt_step
         end
       end
@@ -357,7 +369,7 @@ module BusinessFlow
         klass.class_eval body, __FILE__, __LINE__
       end
 
-      def self.setter_factory(field, ivar_name)
+      def self.setter_factory(_field, ivar_name)
         <<-SETTER
           #{ivar_name} = new_value
         SETTER

data/lib/business_flow/flow_failed_exception.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # Exception raised by DSL when flow execution fails
   class FlowFailedException < RuntimeError

data/lib/business_flow/instrument.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # Include me to fire ActiveSupport notifications on the flow, every step,
   # and for any errors that happen.

data/lib/business_flow/instrumented_executor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # Fire ActiveSupport events for every step that's run and on errors
   class InstrumentedExecutor < DefaultStepExecutor

data/lib/business_flow/instrumented_step_executor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # Fire ActiveSupport events for every step that's run and on errors
   class InstrumentedStepExecutor < InstrumentedExecutor

data/lib/business_flow/retryable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'retryable'
 rescue LoadError

data/lib/business_flow/step.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # Step is a conditional callable which can marshal its own inputs, and
   # returns a value which can marshal errors and outputs into a given object.
@@ -90,9 +92,7 @@ module BusinessFlow
       end
 
       def merge_errors_into(object)
-        @result.errors.each do |attribute, message|
-          (object.errors[attribute] << message).uniq!
-        end
+        object.errors.merge!(@result.errors)
         throw :halt_step
       end
 

data/lib/business_flow/validations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
   # Responsible for adding validations to flow objects
   module Validations

data/lib/business_flow/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessFlow
-  VERSION = '0.17.4'.freeze
+  VERSION = '0.18.1'.freeze
 end

data/lib/business_flow.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'active_model'
 require 'active_support/core_ext'
+require 'business_flow/compat'
 require 'business_flow/version'
 require 'business_flow/flow_failed_exception'
 require 'business_flow/callable'

metadata

@@ -1,57 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: business_flow
 version: !ruby/object:Gem::Version
-  version: 0.17.4
+  version: 0.18.1
 platform: ruby
 authors:
 - Alex Scarborough
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -100,42 +126,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.1
 description:
 email:
 - alex@teak.io
@@ -158,6 +184,7 @@ files:
 - lib/business_flow/base.rb
 - lib/business_flow/cacheable.rb
 - lib/business_flow/callable.rb
+- lib/business_flow/compat.rb
 - lib/business_flow/default_step_executor.rb
 - lib/business_flow/dsl.rb
 - lib/business_flow/flow_failed_exception.rb
@@ -187,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: General purpose management of service object flows