business_flow 0.17.5 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b848fddcc8032b22020398c2b1cfa80cc41c243415f49bbbe9ef47ca273d6a
-  data.tar.gz: cdf6b62f0c354cde981a09c100f5de588956cc07599eb37d9604d2f6d743700c
+  metadata.gz: 6b1ad94958c6313af360e1343b5fd5ac9603e8e4aa7834581c40e53631de8a51
+  data.tar.gz: 5562160edcf999491ae6f7d32afdb8f2b7e3479e9141b202021a9fe2ce46144e
 SHA512:
-  metadata.gz: 2980690e93a0c7d56ebf2020984c39a8a85d5cae78c8d8d8610c7ca74f1513c4b051816d06ff6d040b3369df709b57967dba8db66d5d4b2a2573d8e23beb3bb7
-  data.tar.gz: 3b2be0ac6d8c86438dddb9ef7efc1ea062d7709378137d6db2307147fdfec7d84a5038d008d0ac87e3cc8a6f0dac7c64589668c7e283bbe17fb26967c8572f99
+  metadata.gz: 55311f2cf46499c01f1fb6c9886a6eace211696a17968eb9f4864696f650e573fa0343be4e9386d3fcce14daec28326d75f61fddd4e206d1a5a2a7275f4fa90e
+  data.tar.gz: 32ddef13a80d803eb0d95e0d8511ed4bd93b68866fa326d6b22fe770d618553cbfee48c1e5aa167501f3ed83d69d707482b28c1dc4d20896f5e5c0f44cef3c51

data/Gemfile.lock

@@ -1,95 +1,77 @@
 PATH
   remote: .
   specs:
-    business_flow (0.17.5)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
+    business_flow (0.18.0)
+      activemodel (>= 4.2, < 8)
+      activesupport (>= 4.2, < 8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activesupport (5.1.6)
+    activemodel (7.0.2)
+      activesupport (= 7.0.2)
+    activesupport (7.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ast (2.4.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    codeclimate-engine-rb (0.4.1)
-      virtus (~> 1.0)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.5)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    codeclimate-engine-rb (0.4.2)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.5.0)
     docile (1.1.5)
-    equalizer (0.0.11)
-    i18n (1.0.0)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    json (2.1.0)
-    minitest (5.11.3)
-    parallel (1.12.1)
-    parser (2.5.0.4)
+    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)
-    powerpack (0.1.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (10.5.0)
-    reek (4.8.0)
+    reek (4.8.2)
       codeclimate-engine-rb (~> 0.4.0)
       parser (>= 2.5.0.0, < 2.6)
-      rainbow (~> 3.0)
-    retryable (3.0.4)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+      rainbow (>= 2.0, < 4.0)
+    retryable (3.0.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.2)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.53.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (0.68.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.5, != 2.5.1.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 1.6)
     rubocop-rspec (1.24.0)
       rubocop (>= 0.53.0)
-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.11.0)
     simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
+    timecop (0.9.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
   business_flow!
   rake (~> 10.0)
   reek (~> 4.8)
@@ -101,4 +83,4 @@ DEPENDENCIES
   timecop (~> 0.9.1)
 
 BUNDLED WITH
-   1.16.1
+   2.3.6

data/business_flow.gemspec

@@ -20,10 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activemodel', '>= 3.0'
-  spec.add_dependency 'activesupport', '>= 3.0'
+  spec.add_dependency 'activemodel', '>= 4.2', '< 8'
+  spec.add_dependency 'activesupport', '>= 4.2', '< 8'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'reek', '~> 4.8'
   spec.add_development_dependency 'retryable', '~> 3.0.4'

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,8 +52,7 @@ module BusinessFlow
         end
       end
 
-      def cache_key(key = nil, &blk)
-        key ||= blk
+      def cache_key(key = nil)
         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.5'.freeze
+  VERSION = '0.18.0'.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_flow
 version: !ruby/object:Gem::Version
-  version: 0.17.5
+  version: 0.18.0
 platform: ruby
 authors:
 - Alex Scarborough
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,42 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        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: '3.0'
+        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: '3.0'
+        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: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -186,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