easy_flow 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a271be372fa760d850d21b7c3e90719fe8aef78d378b07c249896fd9f69a6ef4
-  data.tar.gz: e5e0130c5bc885bd7865e938998a8ebec35549e07c90428764409cce2a4ee2e8
+  metadata.gz: 48b43c9ecd7f02841d19f9fd4f10f42ea49092641bd998fb5750d6b61d9d330f
+  data.tar.gz: f6b12a0a88c69f17a8aa596dad74c310a936060babb7f76d0f0a7f0f486435fe
 SHA512:
-  metadata.gz: dc39e2bb8a0ce09d34d74d2e3c5635c8f7ea70094a7dfc83a4422b7254980e2a6c311c689ada061bd61cb7339d6a1d64e30438daa47c0a0d8f07a710a886fdc0
-  data.tar.gz: e7160a75079db724308f2dbbcf1d6263730188172b8198d037d9429713350086c87208f8803ede07084c92efb0993a0929988d3a50654411f2c643fc3606c681
+  metadata.gz: b8e4a6145d9ba8309fc633274e280d96409978b18f8a8df957add151423d9b75d1365b606efd444ae6a91d9563c27c9a1bfe0355f3e1e946020fb34d03c963d1
+  data.tar.gz: 48f5729ef10aa4b053ecf20583c91edbe7cf0f749e4623f85b84733ca6e2663c6e115df0f269a3e987f31d38ff4e4289840b4dc6856785d8611ab194e9d94281

data/app/models/easy_flow/chosen_flow.rb

@@ -1,7 +1,10 @@
 module EasyFlow
   ChosenFlow = Data.define(:flow_id, :number) do
-    def self.of(node, registry: EasyFlow.registry)
-      chosen = (registry.fetch(node.type).flow_chosen_by(node) if registry.registered?(node.type))
+    def self.of(node, registry: EasyFlow.registry, run: nil)
+      step_type = registry.fetch(node.type) if registry.registered?(node.type)
+      return worked_out((run && step_type.flow_chosen_from_run(node, run)) || {}) if step_type&.chooses_flow_from_run?
+
+      chosen = step_type&.flow_chosen_by(node)
       return worked_out(chosen) if chosen
 
       new(flow_id: node.config["flow"].presence, number: node.config["version"].presence)

data/app/models/easy_flow/progress/kept.rb

@@ -20,7 +20,8 @@ module EasyFlow
       def start_inner(node)
         return if @run.inner_runs.exists?(parent_step: node.id)
 
-        chosen = ChosenFlow.of(node)
+        chosen = ChosenFlow.of(node, run: @run)
+        raise InnerFlowError, "The step #{node.id} chose no flow to run" if chosen.flow.nil? && EasyFlow.registry.fetch(node.type).chooses_flow_from_run?
         raise InnerFlowError, "The Flow step #{node.id} names a version that cannot run" if chosen.version&.out_of_service?
         Run.start(chosen.flow || raise(ActiveRecord::RecordNotFound), version: chosen.version)
           .tap { |inner| inner.update!(parent_run: @run, parent_step: node.id, owner: @run.owner) }.advance
@@ -30,10 +31,16 @@ module EasyFlow
         parent = @run.parent_run or return
         return if parent.recorded.key?(@run.parent_step.to_sym)
 
-        parent.record(@run.parent_step.to_sym, @run.output) if @run.output
+        ending = @run.output || ("ended" if chose_from_run?(parent))
+        parent.record(@run.parent_step.to_sym, ending) if ending
         AdvanceParentJob.perform_later(parent, @run.parent_step)
       end
 
+      def chose_from_run?(parent)
+        type = parent.pinned_steps.dig(@run.parent_step, "type")
+        EasyFlow.registry.registered?(type) && EasyFlow.registry.fetch(type).chooses_flow_from_run?
+      end
+
       def finish(_state)
         @run
       end

data/app/models/easy_flow/step_type/declaration.rb

@@ -74,6 +74,10 @@ module EasyFlow
         @starts_a_flow = true
       end
 
+      def chooses_flow_from_run(&chooser)
+        @run_chooser = chooser
+      end
+
       def chooses_flow(&chooser)
         @flow_chooser = chooser
       end
@@ -124,7 +128,7 @@ module EasyFlow
 
       def to_step_type
         StepType.new(id: @id, step_name: @step_name, settings: settings, awaits_input: @awaits_input,
-          ends_here: @ends_here, begins_here: @begins_here, starts_a_flow: @starts_a_flow, flow_chooser: @flow_chooser, behaviour: @behaviour, routing: @routing,
+          ends_here: @ends_here, begins_here: @begins_here, starts_a_flow: @starts_a_flow, flow_chooser: @flow_chooser, run_chooser: @run_chooser, behaviour: @behaviour, routing: @routing,
           display: @display, drawn_by: @drawn_by, naming_field: @naming_field, naming: @naming,
           outputs: @declared_outputs, answer_check: @answer_check, answer_labelling: @answer_labelling, readiness: @readiness)
       end

data/app/models/easy_flow/step_type.rb

@@ -7,7 +7,7 @@ module EasyFlow
     attr_reader :id, :step_name, :settings, :naming_field, :naming, :outputs, :drawn_by
 
     def initialize(id:, step_name:, settings:, awaits_input:, behaviour:, routing:,
-      ends_here: false, begins_here: false, starts_a_flow: false, flow_chooser: nil, display: nil, drawn_by: nil,
+      ends_here: false, begins_here: false, starts_a_flow: false, flow_chooser: nil, run_chooser: nil, display: nil, drawn_by: nil,
       naming_field: nil, naming: nil, outputs: [], answer_check: nil, answer_labelling: nil, readiness: nil)
       @id = id
       @step_name = step_name
@@ -17,6 +17,7 @@ module EasyFlow
       @begins_here = begins_here
       @starts_a_flow = starts_a_flow
       @flow_chooser = flow_chooser
+      @run_chooser = run_chooser
       @behaviour = behaviour
       @routing = routing
       @display = display
@@ -91,6 +92,14 @@ module EasyFlow
       @starts_a_flow
     end
 
+    def chooses_flow_from_run?
+      !@run_chooser.nil?
+    end
+
+    def flow_chosen_from_run(node, run)
+      @run_chooser&.call(node, run)
+    end
+
     def flow_chosen_by(node)
       @flow_chooser&.call(node)
     end

data/app/models/easy_flow/validator.rb

@@ -170,7 +170,7 @@ module EasyFlow
     end
 
     def starting_a_flow(document = @document)
-      document.nodes.select { |node| @registry.registered?(node.type) && @registry.fetch(node.type).starts_a_flow? }
+      document.nodes.select { |node| @registry.registered?(node.type) && @registry.fetch(node.type).starts_a_flow? && !@registry.fetch(node.type).chooses_flow_from_run? }
     end
 
     def missing_settings

data/lib/easy_flow/version.rb

@@ -1,3 +1,3 @@
 module EasyFlow
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_flow
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - tylercschneider