flow 0.10.5 → 0.10.8

data/lib/flow.rb

@@ -5,25 +5,21 @@ require "active_record"
 require "active_support"
 
 require "spicerack"
+require "malfunction"
 
-require "flow/version"
+require_relative "flow/version"
 
-require "flow/concerns/transaction_wrapper"
+require_relative "flow/errors"
 
-require "flow/flow_base"
-require "flow/operation_base"
-require "flow/state_base"
-require "flow/state_proxy"
+require_relative "flow/concerns/transaction_wrapper"
 
-module Flow
-  class Error < StandardError; end
+require_relative "flow/malfunction/base"
 
-  class FlowError < Error; end
-  class StateInvalidError < FlowError; end
+# TODO: Remove inheritance nonsense, just use Substance once deprecation is removed from Spicerack
+class Flow::RootObject < (defined?(Substance::RootObject) ? Substance::RootObject : Spicerack::RootObject); end
+class Flow::InputModel < (defined?(Substance::InputModel) ? Substance::InputModel : Spicerack::InputModel); end
 
-  class OperationError < Error; end
-  class AlreadyExecutedError < OperationError; end
-
-  class StateError < Error; end
-  class NotValidatedError < StateError; end
-end
+require_relative "flow/flow_base"
+require_relative "flow/operation_base"
+require_relative "flow/state_base"
+require_relative "flow/state_proxy"

data/lib/flow/errors.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Flow
+  class Error < StandardError; end
+
+  class FlowError < Error; end
+  class StateInvalidError < FlowError; end
+
+  class OperationError < Error; end
+  class AlreadyExecutedError < OperationError; end
+
+  class StateError < Error; end
+  class NotValidatedError < StateError; end
+end

data/lib/flow/flow/core.rb

@@ -8,7 +8,7 @@ module Flow
 
       class_methods do
         def state_class
-          "#{name.chomp("Flow")}State".constantize
+          conjugate(StateBase)
         end
       end
 

data/lib/flow/flow/trigger.rb

@@ -7,12 +7,12 @@ module Flow
       extend ActiveSupport::Concern
 
       class_methods do
-        def trigger!(*arguments)
-          new(*arguments).trigger!
+        def trigger!(*arguments, **options)
+          new(*arguments, **options).trigger!
         end
 
-        def trigger(*arguments)
-          new(*arguments).trigger
+        def trigger(*arguments, **options)
+          new(*arguments, **options).trigger
         end
       end
 

data/lib/flow/flow_base.rb

@@ -10,7 +10,10 @@ require_relative "flow/trigger"
 
 # A **Flow** is a collection of procedurally executed **Operations** sharing a common **State**.
 module Flow
-  class FlowBase < Spicerack::RootObject
+  class FlowBase < RootObject
+    include Conjunction::Junction
+    suffixed_with "Flow"
+
     include TransactionWrapper
     include Flow::Callbacks
     include Flow::Core

data/lib/flow/malfunction/base.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Flow
+  module Malfunction
+    class Base < ::Malfunction::MalfunctionBase
+      prefixed_with "Flow::Malfunction::"
+      suffixed_with nil
+    end
+  end
+end

data/lib/flow/operation/core.rb

@@ -16,7 +16,7 @@ module Flow
         def state_proxy_class
           @state_proxy_class ||= Class.new(StateProxy).tap do |proxy_class|
             delegate_method_names = _state_writers.map { |method_name| "#{method_name}=" } + _state_readers
-            proxy_class.delegate(*delegate_method_names, to: :state) if delegate_method_names.any?
+            proxy_class.delegate(*delegate_method_names, to: :_state) if delegate_method_names.any?
           end
         end
       end

data/lib/flow/operation/error_handler.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# When an exception is raised during during execution, but a handler can rescue, it causes a failure instead.
+# When an exception is raised during execution, but a handler can rescue, it causes a failure instead.
 module Flow
   module Operation
     module ErrorHandler

data/lib/flow/operation_base.rb

@@ -11,7 +11,7 @@ require_relative "operation/transactions"
 
 # An **Operation** is a service object which is executed with a **State**.
 module Flow
-  class OperationBase < Spicerack::RootObject
+  class OperationBase < RootObject
     include TransactionWrapper
     include Operation::Accessors
     include Operation::Callbacks

data/lib/flow/rspec/custom_matchers/have_on_state.rb

@@ -44,7 +44,12 @@ module Flow
 
       def matches?(object)
         @state_expectations.all? do |key, value|
-          expect(object.state.public_send(key)).to match value
+          # If state is actually a StateProxy, we to access the state directly with _state
+          if object.state.respond_to?(:_state, true)
+            expect(object.state.__send__(:_state).public_send(key)).to match value
+          else
+            expect(object.state.public_send(key)).to match value
+          end
         end
       end
 

data/lib/flow/state_base.rb

@@ -5,7 +5,10 @@ require_relative "state/output"
 
 # A **State** is an aggregation of input and derived data.
 module Flow
-  class StateBase < Spicerack::InputModel
+  class StateBase < InputModel
+    include Conjunction::Junction
+    suffixed_with "State"
+
     include State::Status
     include State::Output
   end

data/lib/flow/state_proxy.rb

@@ -4,27 +4,27 @@
 module Flow
   class StateProxy
     def initialize(state)
-      @state = state
+      @_state = state
     end
 
     # @deprecated
     def method_missing(method_name, *arguments, &block)
-      return super unless state.respond_to?(method_name)
+      return super unless _state.respond_to?(method_name)
 
       ActiveSupport::Deprecation.warn(
-        "Direct state access of `#{method_name}' on #{state.inspect} will be removed in a future version of flow. "\
+        "Direct state access of `#{method_name}' on #{_state.inspect} will be removed in a future version of flow. "\
         "Use a state accessor instead - for more information see github/freshly/flow/deprecation_notice"
       )
-      state.public_send(method_name, *arguments, &block)
+      _state.public_send(method_name, *arguments, &block)
     end
 
     # @deprecated
     def respond_to_missing?(method_name, include_private = false)
-      state.respond_to?(method_name) || super
+      _state.respond_to?(method_name) || super
     end
 
     private
 
-    attr_reader :state
+    attr_reader :_state
   end
 end

data/lib/flow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flow
-  VERSION = "0.10.5"
+  VERSION = "0.10.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flow
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.8
 platform: ruby
 authors:
 - Eric Garside
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -72,80 +72,112 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: short_circu_it
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: technologic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: malfunction
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -188,13 +220,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.13
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: rspice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.25.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -204,7 +250,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.25.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -214,7 +260,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -224,24 +270,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.0.1
 description: Tired of kitchen sink services, god-objects, and fat-everything? So were
   we. Get in the flow.
 email:
@@ -254,6 +286,7 @@ files:
 - README.md
 - lib/flow.rb
 - lib/flow/concerns/transaction_wrapper.rb
+- lib/flow/errors.rb
 - lib/flow/flow/callbacks.rb
 - lib/flow/flow/core.rb
 - lib/flow/flow/flux.rb
@@ -262,6 +295,7 @@ files:
 - lib/flow/flow/transactions.rb
 - lib/flow/flow/trigger.rb
 - lib/flow/flow_base.rb
+- lib/flow/malfunction/base.rb
 - lib/flow/operation/accessors.rb
 - lib/flow/operation/callbacks.rb
 - lib/flow/operation/core.rb
@@ -348,8 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.17
 signing_key: 
 specification_version: 4
 summary: Write modular and reusable business logic that's understandable and maintainable.