flow 0.10.6 → 0.10.7.1.pre1

data/lib/flow.rb

@@ -5,11 +5,14 @@ require "active_record"
 require "active_support"
 
 require "spicery"
+require "malfunction"
 
 require "flow/version"
 
 require "flow/concerns/transaction_wrapper"
 
+require "flow/malfunction/base"
+
 require "flow/flow_base"
 require "flow/operation_base"
 require "flow/state_base"

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/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/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)
+            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_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.6"
+  VERSION = "0.10.7.1.pre1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flow
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7.1.pre1
 platform: ruby
 authors:
 - Eric Garside
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.4
+        version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -72,7 +72,27 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.4
+        version: 0.21.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  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: 0.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -80,14 +100,14 @@ dependencies:
   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: 2.0.1
 - !ruby/object:Gem::Dependency
@@ -96,14 +116,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +200,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.4
+        version: 0.25.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -190,7 +210,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.4
+        version: 0.25.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -200,7 +220,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.4
+        version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -210,7 +230,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.4
+        version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -234,6 +254,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
@@ -316,12 +337,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Write modular and reusable business logic that's understandable and maintainable.