flow_core 0.0.3 → 0.0.5

data/db/migrate/{20200130200532_create_flow_core_tables.rb → 20200130200532_create_workflow_tables.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateFlowCoreTables < ActiveRecord::Migration[6.0]
+class CreateWorkflowTables < ActiveRecord::Migration[6.0]
   def change
     create_table :flow_core_workflows do |t|
       t.string :name, null: false
@@ -30,64 +30,67 @@ class CreateFlowCoreTables < ActiveRecord::Migration[6.0]
 
       t.string :name
       t.string :tag
+      t.integer :output_token_create_strategy, null: false, default: 0, comment: "0-petri_net"
+      t.integer :auto_finish_strategy, null: false, default: 0, comment: "0-disabled"
 
       t.timestamps
     end
 
-    create_table :flow_core_transition_callbacks do |t|
+    create_table :flow_core_arcs do |t|
       t.references :workflow, null: false, foreign_key: { to_table: :flow_core_workflows }
       t.references :transition, null: false, foreign_key: { to_table: :flow_core_transitions }
+      t.references :place, null: false, foreign_key: { to_table: :flow_core_places }
 
-      t.string :configuration
-      t.string :type
+      t.integer :direction, null: false, default: 0, comment: "0-in, 1-out"
+      t.boolean :fallback_arc, null: false, default: false
 
       t.timestamps
     end
 
-    create_table :flow_core_transition_triggers do |t|
+    create_table :flow_core_instances do |t|
       t.references :workflow, null: false, foreign_key: { to_table: :flow_core_workflows }
-      t.references :transition, null: false, foreign_key: { to_table: :flow_core_transitions }
 
-      t.text :configuration
-      t.string :type
+      t.string :tag, index: { unique: true }
 
-      t.timestamps
-    end
+      t.integer :stage, default: 0, comment: "0-created, 1-activated, 2-canceled, 3-finished, 4-terminated"
+      t.datetime :activated_at
+      t.datetime :finished_at
+      t.datetime :canceled_at
+      t.datetime :terminated_at
 
-    create_table :flow_core_arcs do |t|
-      t.references :workflow, null: false, foreign_key: { to_table: :flow_core_workflows }
-      t.references :transition, null: false, foreign_key: { to_table: :flow_core_transitions }
-      t.references :place, null: false, foreign_key: { to_table: :flow_core_places }
+      t.string :terminate_reason
 
-      t.integer :direction, null: false, default: 0, comment: "0-in, 1-out"
+      t.text :payload
 
       t.timestamps
     end
 
-    create_table :flow_core_arc_guards do |t|
-      t.references :workflow, null: false, foreign_key: { to_table: :flow_core_workflows }
-      t.references :arc, null: false, foreign_key: { to_table: :flow_core_arcs }
+    create_table :flow_core_transition_callbacks do |t|
+      t.references :workflow, foreign_key: { to_table: :flow_core_workflows }
+      t.references :transition, foreign_key: { to_table: :flow_core_transitions }
 
-      t.text :configuration
+      t.string :configuration
       t.string :type
 
       t.timestamps
     end
 
-    create_table :flow_core_instances do |t|
-      t.references :workflow, null: false, foreign_key: { to_table: :flow_core_workflows }
+    create_table :flow_core_transition_triggers do |t|
+      t.references :workflow, foreign_key: { to_table: :flow_core_workflows }
+      t.references :transition, foreign_key: { to_table: :flow_core_transitions }
 
-      t.string :tag, index: { unique: true }
+      t.text :configuration
+      t.string :type
 
-      t.integer :stage, default: 0, comment: "0-created, 1-activated, 2-canceled, 3-finished, 4-terminated"
-      t.datetime :activated_at
-      t.datetime :finished_at
-      t.datetime :canceled_at
-      t.datetime :terminated_at
+      t.timestamps
+    end
 
-      t.string :terminate_reason
+    create_table :flow_core_arc_guards do |t|
+      t.references :workflow, foreign_key: { to_table: :flow_core_workflows }
+      t.references :arc, foreign_key: { to_table: :flow_core_arcs }
 
-      t.text :payload
+      t.text :configuration
+      t.string :type
 
       t.timestamps
     end

data/db/migrate/20200130200533_create_pipeline_tables.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+class CreatePipelineTables < ActiveRecord::Migration[6.0]
+  def change
+    create_table :flow_core_pipelines do |t|
+      t.string :name, null: false
+      t.string :type
+
+      t.timestamps
+    end
+
+    create_table :flow_core_steps do |t|
+      t.references :pipeline, null: false, foreign_key: { to_table: :flow_core_pipelines }
+
+      t.string :ancestry, index: true
+      t.integer :position, null: false
+
+      t.string :name
+      t.string :type
+      t.boolean :verified, null: false, default: false
+
+      t.references :redirect_to_step, foreign_key: { to_table: :flow_core_steps }
+
+      t.timestamps
+    end
+
+    create_table :flow_core_branches do |t|
+      t.references :pipeline, null: false, foreign_key: { to_table: :flow_core_pipelines }
+      t.references :step, null: false, foreign_key: { to_table: :flow_core_steps }
+
+      t.string :name
+      t.boolean :fallback_branch, null: false, default: false
+
+      t.timestamps
+    end
+
+    change_table :flow_core_steps do |t|
+      t.references :branch, foreign_key: { to_table: :flow_core_branches }
+    end
+
+    change_table :flow_core_transition_triggers do |t|
+      t.references :pipeline, foreign_key: { to_table: :flow_core_pipelines }
+      t.references :step, foreign_key: { to_table: :flow_core_steps }
+    end
+
+    change_table :flow_core_transition_callbacks do |t|
+      t.references :pipeline, foreign_key: { to_table: :flow_core_pipelines }
+      t.references :step, foreign_key: { to_table: :flow_core_steps }
+    end
+
+    change_table :flow_core_arc_guards do |t|
+      t.references :pipeline, foreign_key: { to_table: :flow_core_pipelines }
+      t.references :branch, foreign_key: { to_table: :flow_core_branches }
+    end
+
+    change_table :flow_core_transitions do |t|
+      t.references :generated_by_step, foreign_key: { to_table: :flow_core_steps }
+    end
+
+    change_table :flow_core_workflows do |t|
+      t.references :generated_by_pipeline, foreign_key: { to_table: :flow_core_pipelines }
+    end
+  end
+end

data/lib/flow_core.rb

@@ -6,6 +6,9 @@ require "rgl/topsort"
 require "rgl/traversal"
 require "rgl/path"
 
+require "acts_as_list"
+require "ancestry"
+
 require "flow_core/engine"
 
 require "flow_core/errors"
@@ -18,9 +21,5 @@ require "flow_core/workflow_callbacks"
 require "flow_core/definition"
 require "flow_core/violations"
 
-ActiveSupport.on_load(:i18n) do
-  I18n.load_path << File.expand_path("flow_core/locale/en.yml", __dir__)
-end
-
 module FlowCore
 end

data/lib/flow_core/definition/net.rb

@@ -67,7 +67,8 @@ module FlowCore::Definition
 
       workflow = nil
       FlowCore::ApplicationRecord.transaction do
-        workflow = FlowCore::Workflow.create! attributes
+        workflow = FlowCore::Workflow.new attributes
+        workflow.save!
 
         # Places
         place_records = {}
@@ -97,9 +98,10 @@ module FlowCore::Definition
 
           td.output_tags.each do |output|
             arc = workflow.arcs.out.create! transition: transition_records[td.tag],
-                                            place: place_records[output[:tag]]
-            if output[:guard]
-              arc.guards.create! output[:guard].compile
+                                            place: place_records[output[:tag]],
+                                            fallback_arc: output[:fallback]
+            output[:guards].each do |guard|
+              arc.guards.create! guard.compile
             end
           end
         end

data/lib/flow_core/definition/transition.rb

@@ -3,6 +3,7 @@
 module FlowCore::Definition
   class Transition
     attr_reader :net, :tag, :attributes, :trigger, :callbacks, :input_tags, :output_tags
+
     private :net
 
     def initialize(net, tag, attributes = {}, &block)
@@ -19,8 +20,8 @@ module FlowCore::Definition
       output = attributes.delete(:output)
       raise ArgumentError, "Require `input`" unless input
 
-      self.input input
-      self.output output if output
+      inputs(*input)
+      outputs(*output) if output
 
       trigger = attributes.delete :with_trigger
       @trigger =
@@ -31,7 +32,7 @@ module FlowCore::Definition
       callbacks = []
       callbacks.concat Array.wrap(attributes.delete(:with_callbacks))
       callbacks.concat Array.wrap(attributes.delete(:with_callback))
-      @callbacks = callbacks.map { |cb| FlowCore::Definition::Callback.new cb }
+      @callbacks = callbacks.compact.map { |cb| FlowCore::Definition::Callback.new cb }
 
       @attributes = attributes.with_indifferent_access.except(FlowCore::Transition::FORBIDDEN_ATTRIBUTES)
       @attributes[:name] ||= tag.to_s
@@ -54,42 +55,53 @@ module FlowCore::Definition
       end
     end
 
-    def input(tag)
-      places = Array.wrap(tag)
-      places.each do |place|
-        case place
+    def input(tag, attributes = {})
+      unless net.places.find { |place| place.tag == tag }
+        net.add_place(tag, attributes)
+      end
+
+      @input_tags << tag
+    end
+
+    def inputs(*tags)
+      tags.each do |tag|
+        case tag
         when Symbol
-          net.add_place(place)
-          tag = place
+          input(tag)
         when Array # Expect `[:p1, {name: "Place 1"}]`
-          net.add_place(*place)
-          tag = place.first
+          input(*tag)
         else
           raise TypeError, "Unknown pattern - #{place}"
         end
-
-        @input_tags << tag
       end
     end
 
     def output(tag, attributes = {})
-      guard = attributes.delete :with_guard
-      guard = FlowCore::Definition::Guard.new(guard) if guard&.is_a?(Hash)
+      guards = []
+      guards.concat Array.wrap(attributes.delete(:with_guards))
+      guards.concat Array.wrap(attributes.delete(:with_guard))
+      guards.compact!
+      guards.map! { |guard| FlowCore::Definition::Guard.new guard }
 
-      places = Array.wrap(tag)
-      places.each do |place|
-        case place
+      fallback = attributes.delete(:fallback) || false
+
+      unless net.places.find { |place| place.tag == tag }
+        net.add_place(tag, attributes)
+      end
+
+      @output_tags << { tag: tag, guards: guards, fallback: fallback }
+    end
+
+    def outputs(*tags)
+      tags.each do |tag|
+        case tag
         when Symbol
-          net.add_place(place)
-          tag = place
+          output(tag)
         when Array # Expect `[:p1, {name: "Place 1"}]`
-          net.add_place(*place)
-          tag = place.first
+          output(*tag)
         else
           raise TypeError, "Unknown pattern - #{place}"
         end
-
-        @output_tags << { tag: tag, guard: guard }
       end
     end
 
@@ -100,7 +112,7 @@ module FlowCore::Definition
         trigger: @trigger&.compile,
         callbacks: @callbacks.map(&:compile),
         input_tags: @input_tags,
-        output_tags: @output_tags.map { |output| { tag: output[:tag], guard: output[:guard]&.compile } }
+        output_tags: @output_tags.map { |output| { tag: output[:tag], guards: output[:guards].map(&:compile) } }
       }
     end
   end

data/lib/flow_core/engine.rb

@@ -2,5 +2,10 @@
 
 module FlowCore
   class Engine < ::Rails::Engine
+    initializer "flow_core.load_default_i18n" do
+      ActiveSupport.on_load(:i18n) do
+        I18n.load_path << File.expand_path("locale/en.yml", __dir__)
+      end
+    end
   end
 end

data/lib/flow_core/locale/en.yml

@@ -5,11 +5,11 @@ en:
       flow_core/place: Place
       flow_core/start_place: Start Place
       flow_core/end_place: End Place
-      flow_core/transition: Workflow
-      flow_core/transition_trigger: Transition Trigger
-      flow_core/transition_callback: Trasition Callback
+      flow_core/transition: Transition
+      # flow_core/transition_trigger: Transition Trigger
+      # flow_core/transition_callback: Transition Callback
       flow_core/arc: Arc
-      flow_core/arc_guard: Arc Guard
+      # flow_core/arc_guard: Arc Guard
       flow_core/instance: Instance
       flow_core/token: Token
       flow_core/task: Task
@@ -19,8 +19,13 @@ en:
       verified: Verified
       invalid: Invalid
     violations:
+      no_start_place: "No start place"
+      no_end_place: "No end place"
       format: "%{model} %{name} %{message}"
       unreachable: "Unreachable from start place"
       impassable: "Impassable to end place"
       trigger_unconfigure: "Trigger not configured yet"
       callback_unconfigure: "Callback not configured yet"
+    pipeline:
+      synchronization_transition_name: "Synchronization"
+      fallback_branch_name: "Default branch"

data/lib/flow_core/task_executable.rb

@@ -24,6 +24,10 @@ module FlowCore
       true
     end
 
+    def auto_finishable?
+      false
+    end
+
     protected
 
       def notify_workflow_task_finished!

data/lib/flow_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlowCore
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/flow_core/workflow_callbacks.rb

@@ -4,6 +4,8 @@ module FlowCore
   module WorkflowCallbacks
     extend ActiveSupport::Concern
 
+    def on_instance_create_validation(_instance); end
+
     def on_instance_cancel(_instance); end
 
     def on_instance_activate(_instance); end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: flow_core
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: acts_as_list
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ancestry
+  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: rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,10 +94,18 @@ files:
 - app/models/flow_core/application_record.rb
 - app/models/flow_core/arc.rb
 - app/models/flow_core/arc_guard.rb
+- app/models/flow_core/branch.rb
 - app/models/flow_core/end_place.rb
 - app/models/flow_core/instance.rb
+- app/models/flow_core/pipeline.rb
 - app/models/flow_core/place.rb
 - app/models/flow_core/start_place.rb
+- app/models/flow_core/step.rb
+- app/models/flow_core/steps/end.rb
+- app/models/flow_core/steps/exclusive_choice.rb
+- app/models/flow_core/steps/parallel_split.rb
+- app/models/flow_core/steps/redirection.rb
+- app/models/flow_core/steps/task.rb
 - app/models/flow_core/task.rb
 - app/models/flow_core/token.rb
 - app/models/flow_core/transition.rb
@@ -77,7 +113,8 @@ files:
 - app/models/flow_core/transition_trigger.rb
 - app/models/flow_core/workflow.rb
 - config/routes.rb
-- db/migrate/20200130200532_create_flow_core_tables.rb
+- db/migrate/20200130200532_create_workflow_tables.rb
+- db/migrate/20200130200533_create_pipeline_tables.rb
 - lib/flow_core.rb
 - lib/flow_core/arc_guardable.rb
 - lib/flow_core/definition.rb
@@ -116,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A multi purpose, extendable, Workflow-net-based workflow engine for Rails