business_flow 0.17.0 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30ea0891a62bcdd44afbf082b704e4a3deb7e5b1
-  data.tar.gz: 6cc8b240e591ffe7d9415cbc0293a1b466c880d7
+SHA256:
+  metadata.gz: 57b8b055c5e74f6c55285b6b2c1514a062fb8f7ed5370538a482bae1f6319a21
+  data.tar.gz: 40b01f4b0e319225ae99890ebe3f9a93a2360f9a31ffe4379fe4b0b87afd91f0
 SHA512:
-  metadata.gz: 8d706886574479bc3c9bbd2cf1b1c444bf76737473d612b0beb429fcfbfb23de2e26b1c86428095bdeab950beefc7aff647f65be2584f86ed511e370cd3a8ce5
-  data.tar.gz: e480293a62820301a174da33c9264b81db9c098a9715d1aaac65c67b09e7290f7e859a1de83420c800ba0bf9fdf7a5f06e099e2db43a3f96418580bcd0892309
+  metadata.gz: 6c3fc8bf70de03131787d8973e77117a80f824810a92f08abec20ec20ae2d10e5dd04eb7b3afdb9c759c01bdf97f87b440358f6ae5bbf3ad3c81a6375b350492
+  data.tar.gz: 332391d394a721cbcb5c3b212cae333daea82e7f2c34bc51dc1142c5d0f4c7b5438c06df7e9e22dd72f94a573fc39254763e33cff85bdb044eaaa85e1ca0c69a

data/Gemfile.lock

@@ -1,104 +1,91 @@
 PATH
   remote: .
   specs:
-    business_flow (0.17.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
+    business_flow (0.17.3)
+      activemodel (~> 4.2)
+      activesupport (~> 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activesupport (5.1.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+    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)
-    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)
-    docile (1.1.5)
-    equalizer (0.0.11)
-    i18n (1.0.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
+    i18n (0.9.5)
       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)
-      ast (~> 2.4.0)
-    powerpack (0.1.1)
+    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)
-    rake (10.5.0)
-    reek (4.8.0)
-      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)
+    reek (6.0.6)
+      kwalify (~> 0.7.0)
+      parser (~> 3.0.0)
+      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-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       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.2)
       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.2)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.24.0)
-      rubocop (>= 0.53.0)
-    ruby-progressbar (1.9.0)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      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)
+    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)
-    timecop (0.9.1)
-    tzinfo (1.2.5)
+    timecop (0.9.4)
+    tzinfo (1.2.9)
       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)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
   business_flow!
-  rake (~> 10.0)
-  reek (~> 4.8)
+  reek (~> 6)
   retryable (~> 3.0.4)
   rspec (~> 3.0)
   rubocop (~> 0.53)
-  rubocop-rspec (~> 1.24.0)
-  simplecov (~> 0.15.1)
-  timecop (~> 0.9.1)
+  rubocop-rspec (~> 1.24)
+  simplecov (~> 0.15)
+  timecop (~> 0.9)
 
 BUNDLED WITH
-   1.16.1
+   1.16.6

data/business_flow.gemspec

@@ -20,16 +20,14 @@ 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'
+  spec.add_dependency 'activesupport', '~> 4.2'
 
-  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 'reek', '~> 6'
   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.0'
-  spec.add_development_dependency 'simplecov', '~> 0.15.1'
-  spec.add_development_dependency 'timecop', '~> 0.9.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.24'
+  spec.add_development_dependency 'simplecov', '~> 0.15'
+  spec.add_development_dependency 'timecop', '~> 0.9'
 end

data/lib/business_flow/dsl.rb

@@ -75,7 +75,7 @@ module BusinessFlow
 
       # Declares that you will expose a field to the outside world.
       def provides(*fields)
-        @provides ||= FieldList.new([], PublicField, [self, @result_klass])
+        @provides ||= FieldList.new([], PublicField, [self, const_get(:Result)])
         @result_copy ||= FROM_FLOW_PREAMBLE
         @result_copy += fields.map { |field| "\n@#{field} = flow.#{field}" }
                               .join
@@ -147,14 +147,14 @@ module BusinessFlow
         # 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.
-        result = @result_klass.new(flow.instance_variable_get(:@errors))
+        result = const_get(:Result).new(flow.instance_variable_get(:@errors))
         result.from_flow(flow) if @result_copy
         result
       end
 
       def finalize_result_provider
         return if @finalized_result_provider || !@result_copy
-        @result_klass.class_eval "#{@result_copy}\nend", __FILE__, __LINE__
+        const_get(:Result).class_eval "#{@result_copy}\nend", __FILE__, __LINE__
         @finalized_result_provider = true
       end
 
@@ -199,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 && @errors.present?
+          !!@errors && @errors.present?
         end
 
         def valid?(_context = nil)
@@ -227,7 +227,6 @@ module BusinessFlow
     def self.included(klass)
       klass.extend(ClassMethods)
       klass.class_eval RESULT_DEF, __FILE__, __LINE__
-      klass.instance_variable_set(:@result_klass, klass.const_get(:Result))
       klass.extend(ErrorSupport) unless klass.respond_to?(:human_attribute_name)
     end
 
@@ -361,8 +360,6 @@ module BusinessFlow
       def self.setter_factory(field, ivar_name)
         <<-SETTER
           #{ivar_name} = new_value
-          throw :halt_step unless valid?(:#{field})
-          new_value
         SETTER
       end
 

data/lib/business_flow/step.rb

@@ -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

data/lib/business_flow/validations.rb

@@ -7,7 +7,7 @@ module BusinessFlow
       # processing, and that it should meet the given ActiveModel
       # validations.
       def expects(field, options = {})
-        validates field, options.merge(on: field)
+        validates field, options
         ::BusinessFlow::DSL::Field.new(field).add_to(self)
       end
     end

data/lib/business_flow/version.rb

@@ -1,3 +1,3 @@
 module BusinessFlow
-  VERSION = '0.17.0'.freeze
+  VERSION = '0.17.4'.freeze
 end

metadata

@@ -1,85 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: business_flow
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.4
 platform: ruby
 authors:
 - Alex Scarborough
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  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
+        version: '4.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '4.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -128,43 +100,43 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
-description: 
+        version: '0.9'
+description:
 email:
 - alex@teak.io
 executables: []
@@ -200,7 +172,7 @@ homepage: https://teak.io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,9 +187,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.10
+signing_key:
 specification_version: 4
 summary: General purpose management of service object flows
 test_files: []