flow 0.10.9 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cb129da119969c0fa55399a567e43fff227f42bf1e92ee23ebaf13483f963e6
-  data.tar.gz: 79c8a4c5fee7ea9025351737a650f963c7d5714f9e69800fc6739ea4475cae11
+  metadata.gz: b58b685f68376d3cbb4e00e869d9f1a16d15ffb74fe13ed9c8088c89b5b915ca
+  data.tar.gz: 0a9028c03e0c7196f4feb4a2744f00262d3b2799e8752a87e95484a0344d47ef
 SHA512:
-  metadata.gz: aeec7a81e693940366a67cd11ea04f4c5885bf58e0bee0a324e6d09bd4c5ea97c5eb0035b5500270c7d7b2d9c8ca5b8962b8b2634aebc29918e80ab26631932f
-  data.tar.gz: 70794bcd311c9fee7b396024506e3df3460b01dc500a98f546a3f2e8c70267cab74096ba24ae802a0e57ad1f4048f9c4bab92bd710b4c44c4a7026355623ad33
+  metadata.gz: 9749b0bbbcb7a59ff426c81d0a1e5c05a913a383752afc641d8c90679b24f9a572873ad8efc9e7abaac8f19664f1b5e5e8b7474a71ab88f63abe04fcd1ba5bfa
+  data.tar.gz: ef93d1bd2d6e73f417daebb0c6884fb323677a9ff322eb7be8577506ce75c5b0596a161a56e716b18f049dc3c0625488f90995b00218ce2c648f9d91a10f73e1

data/lib/flow/flow_base.rb

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

data/lib/flow/operation/accessors.rb

@@ -1,58 +1,56 @@
 # frozen_string_literal: true
 
+require "set"
+
 module Flow
   module Operation
     module Accessors
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :_state_readers, instance_writer: false, default: []
-        class_attribute :_state_writers, instance_writer: false, default: []
-        class_attribute :_state_accessors, instance_writer: false, default: []
+        class_attribute :_state_readers, instance_writer: false, default: Set.new
+        class_attribute :_state_writers, instance_writer: false, default: Set.new
+        class_attribute :_state_accessors, instance_writer: false, default: Set.new
       end
 
-      class_methods do
+      module ClassMethods
         protected
 
-        def state_reader(name)
-          return unless _add_state_reader_tracker(name.to_sym)
+        def state_reader(*names, prefix: false)
+          names.each do |name|
+            delegate name, prefix: prefix, to: :state
 
-          delegate name, to: :state
+            _add_state_reader_tracker(name.to_sym)
+          end
         end
 
-        def state_writer(name)
-          return unless _add_state_writer_tracker(name.to_sym)
+        def state_writer(*names, prefix: false)
+          names.each do |name|
+            delegate "#{name}=", prefix: prefix, to: :state
 
-          delegate("#{name}=", to: :state)
+            _add_state_writer_tracker(name.to_sym)
+          end
         end
 
-        def state_accessor(name)
-          state_reader name
-          state_writer name
+        def state_accessor(*names, prefix: false)
+          names.each do |name|
+            state_reader name, prefix: prefix
+            state_writer name, prefix: prefix
+          end
         end
 
         private
 
         def _add_state_reader_tracker(name)
-          return false if _state_readers.include?(name)
-
-          _add_state_accessor_tracker(name) if _state_writers.include?(name)
+          _state_accessors << name if _state_writers.include?(name)
           _state_readers << name
         end
 
         def _add_state_writer_tracker(name)
-          return false if _state_writers.include?(name)
-
-          _add_state_accessor_tracker(name) if _state_readers.include?(name)
+          _state_accessors << name if _state_readers.include?(name)
           _state_writers << name
         end
 
-        def _add_state_accessor_tracker(name)
-          return if _state_accessors.include?(name)
-
-          _state_accessors << name
-        end
-
         def inherited(base)
           base._state_readers = _state_readers.dup
           base._state_writers = _state_writers.dup

data/lib/flow/operation/core.rb

@@ -15,7 +15,7 @@ module Flow
       class_methods do
         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
+            delegate_method_names = _state_writers.map { |method_name| "#{method_name}=" } + _state_readers.to_a
             proxy_class.delegate(*delegate_method_names, to: :_state) if delegate_method_names.any?
           end
         end

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 < RootObject
+  class OperationBase < Substance::RootObject
     include TransactionWrapper
     include Operation::Accessors
     include Operation::Callbacks

data/lib/flow/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "spicerack/spec_helper"
+require "substance/rspec"
 
 require_relative "rspec/custom_matchers"
 require_relative "rspec/shared_contexts"

data/lib/flow/state_base.rb

@@ -1,15 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "state/status"
-require_relative "state/output"
-
 # A **State** is an aggregation of input and derived data.
 module Flow
-  class StateBase < InputModel
+  class StateBase < Substance::OutputObject
     include Conjunction::Junction
     suffixed_with "State"
-
-    include State::Status
-    include State::Output
   end
 end

data/lib/flow/version.rb

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

data/lib/flow.rb

@@ -3,9 +3,9 @@
 require "active_model"
 require "active_support"
 
-require "spicerack"
 require "conjunction"
 require "malfunction"
+require "substance"
 
 require_relative "flow/version"
 
@@ -15,10 +15,6 @@ require_relative "flow/concerns/transaction_wrapper"
 
 require_relative "flow/malfunction/base"
 
-# 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
-
 require_relative "flow/flow_base"
 require_relative "flow/operation_base"
 require_relative "flow/state_base"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flow
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.11.0
 platform: ruby
 authors:
 - Eric Garside
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -43,7 +43,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.1
 - !ruby/object:Gem::Dependency
-  name: spicerack
+  name: conjunction
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -63,7 +63,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: conjunction
+  name: short_circu_it
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,12 +83,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: short_circu_it
+  name: substance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.26.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.26.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -244,16 +244,16 @@ dependencies:
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspice
   requirement: !ruby/object:Gem::Requirement
@@ -340,8 +340,6 @@ files:
 - lib/flow/rspec/shared_contexts/with_failing_operation.rb
 - lib/flow/rspec/shoulda_matcher_helper.rb
 - lib/flow/spec_helper.rb
-- lib/flow/state/output.rb
-- lib/flow/state/status.rb
 - lib/flow/state_base.rb
 - lib/flow/state_proxy.rb
 - lib/flow/version.rb
@@ -402,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.25
 signing_key: 
 specification_version: 4
 summary: Write modular and reusable business logic that's understandable and maintainable.

data/lib/flow/state/output.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-# Output data is created by Operations during runtime and CANNOT be validated or provided as part of the input.
-module Flow
-  module State
-    module Output
-      extend ActiveSupport::Concern
-
-      included do
-        class_attribute :_outputs, instance_writer: false, default: []
-
-        delegate :_outputs, to: :class
-
-        after_validation do
-          next unless validated?
-
-          _outputs.each do |key|
-            public_send("#{key}=".to_sym, _defaults[key].value) if _defaults.key?(key) && public_send(key).nil?
-          end
-        end
-      end
-
-      class_methods do
-        def inherited(base)
-          base._outputs = _outputs.dup
-          super
-        end
-
-        private
-
-        def output(output, default: nil, &block)
-          _outputs << output
-          define_attribute output
-          define_default output, static: default, &block
-          ensure_validation_before output
-          ensure_validation_before "#{output}=".to_sym
-        end
-
-        def ensure_validation_before(method)
-          around_method method do |*arguments|
-            raise NotValidatedError unless validated?
-
-            super(*arguments)
-          end
-        end
-      end
-
-      def outputs
-        return {} if _outputs.empty?
-
-        output_struct.new(*_outputs.map(&method(:public_send)))
-      end
-
-      def output_struct
-        Struct.new(*_outputs)
-      end
-    end
-  end
-end

data/lib/flow/state/status.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-# The State status is used to ensure and enforce internal consistency.
-module Flow
-  module State
-    module Status
-      extend ActiveSupport::Concern
-
-      included do
-        after_validation { self.was_validated = errors.empty? }
-
-        private
-
-        attr_accessor :was_validated
-      end
-
-      def validated?
-        was_validated.present?
-      end
-    end
-  end
-end