flow_core 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743fbfab50000cf6b47c17fe0d90d962faad47fb8eeb0cb44df1e777b56fff0d
-  data.tar.gz: 67d9e0a9f7e7f47d0d958116f4e10d5e885e80ce6b929aa49c49ae844cdc2c18
+  metadata.gz: c5e3dd023d304ad83feb5f766e4978391e64a2f4430129545e1e19282a62fe72
+  data.tar.gz: 0103c699f2bf9c4b739e9278d9c4d063f9997a0049afb5324afd793103d2c44e
 SHA512:
-  metadata.gz: e7b941b64b50e8d083832c3faf1c22f729473fbf1ac7ed1a0ba67f0831bb9d1a7078f95c008f18ae77138358be376124c47c094fb97d6b41ecf18e99f78a0c68
-  data.tar.gz: 35f944cd17e0b9d07afc0903198ffa9cc43f7d74858fa778112ae4a7c69a0de6a59e21354ab9c4460e2eafb8800f790aa12270dce06ffc85e1bfcafd643e5fca
+  metadata.gz: 741e6ce58294ed4cc9ac6992cb54dae77f3bdf9ccd8e2b4a341cca85e70503c50285489cf3a890f8627712c5f4c0c7c52517132ae7d03274103ef653498fe8ae
+  data.tar.gz: 39e078ca26644073e09aba704ab509059831ff91af272146593a65052148b509733dd3bbdfe1bcad50b771631973b962aca1c76ca386d2f99da557b68474c637

data/app/models/flow_core/instance.rb

@@ -27,8 +27,6 @@ module FlowCore
     scope :errored, -> { where.not(errored_at: nil) }
     scope :suspended, -> { where.not(suspended_at: nil) }
 
-    validate :on_create_validation, on: :create
-
     after_initialize do
       self.payload ||= {}
     end
@@ -58,7 +56,6 @@ module FlowCore
 
       with_transaction_returning_status do
         update! stage: :canceled, canceled_at: Time.zone.now
-        workflow.on_instance_cancel(self)
 
         true
       end
@@ -69,7 +66,6 @@ module FlowCore
 
       with_transaction_returning_status do
         update! stage: :activated, activated_at: Time.zone.now
-        workflow.on_instance_activate(self)
 
         tokens.create! place: workflow.start_place
 
@@ -87,7 +83,6 @@ module FlowCore
           task.terminate! reason: "Instance finished"
         end
         tokens.where(stage: %i[free locked]).find_each(&:terminate!)
-        workflow.on_instance_finish(self)
 
         true
       end
@@ -99,7 +94,6 @@ module FlowCore
       with_transaction_returning_status do
         tasks.enabled.each { |task| task.terminate! reason: "Instance terminated" }
         update! stage: :terminated, terminated_at: Time.zone.now, terminate_reason: reason
-        workflow.on_instance_terminate(self)
 
         true
       end
@@ -120,11 +114,5 @@ module FlowCore
     def terminate!(reason:)
       terminate(reason: reason) || raise(FlowCore::InvalidTransition, "Can't terminate Instance##{id}")
     end
-
-    private
-
-      def on_create_validation
-        workflow.on_instance_create_validation(self)
-      end
   end
 end

data/app/models/flow_core/task.rb

@@ -86,7 +86,6 @@ module FlowCore
           update! stage: :enabled, enabled_at: Time.zone.now
 
           transition.on_task_enable(self)
-          workflow.on_instance_task_enable(self)
 
           true
         end
@@ -109,7 +108,6 @@ module FlowCore
         update! stage: :finished, finished_at: Time.zone.now
 
         transition.on_task_finish(self)
-        workflow.on_instance_task_finish(self)
 
         true
       end
@@ -123,7 +121,6 @@ module FlowCore
       with_transaction_returning_status do
         update! stage: :terminated, terminated_at: Time.zone.now, terminate_reason: reason
         transition.on_task_terminate(self)
-        workflow.on_instance_task_terminate(self)
 
         true
       end
@@ -133,7 +130,6 @@ module FlowCore
       update! errored_at: Time.zone.now, error_reason: error.message
       instance.update! errored_at: Time.zone.now
       transition.on_task_errored(self, error)
-      workflow.on_instance_task_errored(self, error)
 
       true
     end
@@ -145,7 +141,6 @@ module FlowCore
         update! errored_at: nil, rescued_at: Time.zone.now
         instance.update! errored_at: nil, rescued_at: Time.zone.now
         transition.on_task_rescue(self)
-        workflow.on_instance_task_rescue(self)
 
         true
       end
@@ -155,7 +150,6 @@ module FlowCore
       with_transaction_returning_status do
         update! suspended_at: Time.zone.now
         transition.on_task_suspend(self)
-        workflow.on_instance_task_suspend(self)
 
         true
       end
@@ -165,7 +159,6 @@ module FlowCore
       with_transaction_returning_status do
         update! suspended_at: nil, resumed_at: Time.zone.now
         transition.on_task_resume(self)
-        workflow.on_instance_task_resume(self)
 
         true
       end

data/app/models/flow_core/workflow.rb

@@ -21,14 +21,16 @@ module FlowCore
 
     class_attribute :force_workflow_verified_on_create_instance, default: false
 
-    include FlowCore::WorkflowCallbacks
-
     def build_instance(attributes = {})
       if force_workflow_verified_on_create_instance && invalid?
         raise FlowCore::UnverifiedWorkflow, "Workflow##{id} didn't do soundness check yet."
       end
 
-      instances.build attributes.with_indifferent_access.except(FlowCore::Instance::FORBIDDEN_ATTRIBUTES)
+      instance = instances.new type: instance_class
+      on_build_instance(instance)
+      instance.assign_attributes attributes.except(FlowCore::Instance::FORBIDDEN_ATTRIBUTES)
+
+      instance
     end
 
     def create_instance(attributes = {})
@@ -212,5 +214,11 @@ module FlowCore
 
         graph
       end
+
+      def on_build_instance(_instance); end
+
+      def instance_class
+        FlowCore::Instance
+      end
   end
 end

data/db/migrate/20200130200532_create_workflow_tables.rb

@@ -15,7 +15,7 @@ class CreateWorkflowTables < ActiveRecord::Migration[6.0]
     end
 
     create_table :flow_core_places do |t|
-      t.references :workflow, null: false, foreign_key: { to_table: :flow_core_workflows }
+      t.references :workflow, null: false, foreign_key: false
 
       t.string :name
       t.string :tag
@@ -26,7 +26,7 @@ class CreateWorkflowTables < ActiveRecord::Migration[6.0]
     end
 
     create_table :flow_core_transitions do |t|
-      t.references :workflow, null: false, foreign_key: { to_table: :flow_core_workflows }
+      t.references :workflow, null: false, foreign_key: false
 
       t.string :name
       t.string :tag
@@ -37,9 +37,9 @@ class CreateWorkflowTables < ActiveRecord::Migration[6.0]
     end
 
     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.references :workflow, null: false, foreign_key: false
+      t.references :transition, null: false, foreign_key: false
+      t.references :place, null: false, foreign_key: false
 
       t.integer :direction, null: false, default: 0, comment: "0-in, 1-out"
       t.boolean :fallback_arc, null: false, default: false
@@ -48,7 +48,7 @@ class CreateWorkflowTables < ActiveRecord::Migration[6.0]
     end
 
     create_table :flow_core_instances do |t|
-      t.references :workflow, null: false, foreign_key: { to_table: :flow_core_workflows }
+      t.references :workflow, null: false, foreign_key: false
 
       t.string :tag, index: { unique: true }
 
@@ -62,12 +62,14 @@ class CreateWorkflowTables < ActiveRecord::Migration[6.0]
 
       t.text :payload
 
+      t.string :type
+
       t.timestamps
     end
 
     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.references :workflow, foreign_key: false
+      t.references :transition, foreign_key: false
 
       t.string :configuration
       t.string :type
@@ -76,8 +78,8 @@ class CreateWorkflowTables < ActiveRecord::Migration[6.0]
     end
 
     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.references :workflow, foreign_key: false
+      t.references :transition, foreign_key: false
 
       t.text :configuration
       t.string :type
@@ -86,8 +88,8 @@ class CreateWorkflowTables < ActiveRecord::Migration[6.0]
     end
 
     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.references :workflow, foreign_key: false
+      t.references :arc, foreign_key: false
 
       t.text :configuration
       t.string :type
@@ -96,17 +98,17 @@ class CreateWorkflowTables < ActiveRecord::Migration[6.0]
     end
 
     create_table :flow_core_tokens do |t|
-      t.references :workflow, null: false, foreign_key: { to_table: :flow_core_workflows }
-      t.references :instance, null: false, foreign_key: { to_table: :flow_core_instances }
-      t.references :place, null: false, foreign_key: { to_table: :flow_core_places }
+      t.references :workflow, null: false, foreign_key: false
+      t.references :instance, null: false, foreign_key: false
+      t.references :place, null: false, foreign_key: false
 
       t.integer :stage, default: 0, comment: "0-free, 1-locked, 11-consumed, 12-terminated"
       t.datetime :locked_at
       t.datetime :consumed_at
       t.datetime :terminated_at
 
-      t.references :created_by_task, foreign_key: { to_table: :flow_core_tasks }
-      t.references :consumed_by_task, foreign_key: { to_table: :flow_core_tasks }
+      t.references :created_by_task, foreign_key: false
+      t.references :consumed_by_task, foreign_key: false
 
       t.boolean :task_created, null: false, default: false
 
@@ -114,13 +116,13 @@ class CreateWorkflowTables < ActiveRecord::Migration[6.0]
     end
 
     create_table :flow_core_tasks do |t|
-      t.references :workflow, null: false, foreign_key: { to_table: :flow_core_workflows }
-      t.references :instance, null: false, foreign_key: { to_table: :flow_core_instances }
-      t.references :transition, null: false, foreign_key: { to_table: :flow_core_transitions }
+      t.references :workflow, null: false, foreign_key: false
+      t.references :instance, null: false, foreign_key: false
+      t.references :transition, null: false, foreign_key: false
 
       t.string :tag, index: { unique: true }
 
-      t.references :created_by_token, foreign_key: { to_table: :flow_core_tokens }
+      t.references :created_by_token, foreign_key: false
 
       t.integer :stage, default: 0, comment: "0-created, 1-enabled, 11-finished, 12-terminated"
       t.datetime :enabled_at
@@ -144,5 +146,53 @@ class CreateWorkflowTables < ActiveRecord::Migration[6.0]
 
       t.timestamps
     end
+
+    change_table :flow_core_places do |t|
+      t.foreign_key :flow_core_workflows, column: :workflow_id
+    end
+
+    change_table :flow_core_transitions do |t|
+      t.foreign_key :flow_core_workflows, column: :workflow_id
+    end
+
+    change_table :flow_core_arcs do |t|
+      t.foreign_key :flow_core_workflows, column: :workflow_id
+      t.foreign_key :flow_core_transitions, column: :transition_id
+      t.foreign_key :flow_core_places, column: :place_id
+    end
+
+    change_table :flow_core_instances do |t|
+      t.foreign_key :flow_core_workflows, column: :workflow_id
+    end
+
+    change_table :flow_core_transition_callbacks do |t|
+      t.foreign_key :flow_core_workflows, column: :workflow_id
+      t.foreign_key :flow_core_transitions, column: :transition_id
+    end
+
+    change_table :flow_core_transition_triggers do |t|
+      t.foreign_key :flow_core_workflows, column: :workflow_id
+      t.foreign_key :flow_core_transitions, column: :transition_id
+    end
+
+    change_table :flow_core_arc_guards do |t|
+      t.foreign_key :flow_core_workflows, column: :workflow_id
+      t.foreign_key :flow_core_arcs, column: :arc_id
+    end
+
+    change_table :flow_core_tokens do |t|
+      t.foreign_key :flow_core_workflows, column: :workflow_id
+      t.foreign_key :flow_core_instances, column: :instance_id
+      t.foreign_key :flow_core_places, column: :place_id
+      t.foreign_key :flow_core_tasks, column: :created_by_task_id
+      t.foreign_key :flow_core_tasks, column: :consumed_by_task_id
+    end
+
+    change_table :flow_core_tasks do |t|
+      t.foreign_key :flow_core_workflows, column: :workflow_id
+      t.foreign_key :flow_core_instances, column: :instance_id
+      t.foreign_key :flow_core_transitions, column: :transition_id
+      t.foreign_key :flow_core_tokens, column: :created_by_token_id
+    end
   end
 end

data/db/migrate/20200130200533_create_pipeline_tables.rb

@@ -10,7 +10,8 @@ class CreatePipelineTables < ActiveRecord::Migration[6.0]
     end
 
     create_table :flow_core_steps do |t|
-      t.references :pipeline, null: false, foreign_key: { to_table: :flow_core_pipelines }
+      t.references :pipeline, null: false, foreign_key: false
+      t.references :branch, foreign_key: false
 
       t.string :ancestry, index: true
       t.integer :position, null: false
@@ -19,14 +20,14 @@ class CreatePipelineTables < ActiveRecord::Migration[6.0]
       t.string :type
       t.boolean :verified, null: false, default: false
 
-      t.references :redirect_to_step, foreign_key: { to_table: :flow_core_steps }
+      t.references :redirect_to_step, foreign_key: false
 
       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.references :pipeline, null: false, foreign_key: false
+      t.references :step, null: false, foreign_key: false
 
       t.string :name
       t.boolean :fallback_branch, null: false, default: false
@@ -35,7 +36,14 @@ class CreatePipelineTables < ActiveRecord::Migration[6.0]
     end
 
     change_table :flow_core_steps do |t|
-      t.references :branch, foreign_key: { to_table: :flow_core_branches }
+      t.foreign_key :flow_core_pipelines, column: :pipeline_id
+      t.foreign_key :flow_core_branches, column: :branch_id
+      t.foreign_key :flow_core_steps, column: :redirect_to_step_id
+    end
+
+    change_table :flow_core_branches do |t|
+      t.foreign_key :flow_core_pipelines, column: :pipeline_id
+      t.foreign_key :flow_core_steps, column: :step_id
     end
 
     change_table :flow_core_transition_triggers do |t|

data/lib/flow_core.rb

@@ -16,7 +16,6 @@ require "flow_core/arc_guardable"
 require "flow_core/transition_triggerable"
 require "flow_core/transition_callbackable"
 require "flow_core/task_executable"
-require "flow_core/workflow_callbacks"
 
 require "flow_core/definition"
 require "flow_core/violations"

data/lib/flow_core/task_executable.rb

@@ -11,24 +11,15 @@ module FlowCore
       after_save :notify_workflow_task_finished!, if: :implicit_notify_workflow_task_finished
     end
 
-    # For automatic task
-    def run!
-      raise NotImplementedError
-    end
-
     def finished?
       raise NotImplementedError
     end
 
-    def implicit_notify_workflow_task_finished
-      true
-    end
+    private
 
-    def auto_finishable?
-      false
-    end
-
-    protected
+      def implicit_notify_workflow_task_finished
+        true
+      end
 
       def notify_workflow_task_finished!
         task.finish! if finished?

data/lib/flow_core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flow_core
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - jasl
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 description: A multi purpose, extendable, Workflow-net-based workflow engine for Rails
   applications, focusing on workflow definition and scheduling.
 email:
@@ -132,13 +118,12 @@ files:
 - lib/flow_core/transition_triggerable.rb
 - lib/flow_core/version.rb
 - lib/flow_core/violations.rb
-- lib/flow_core/workflow_callbacks.rb
 - lib/tasks/flow_core_tasks.rake
 homepage: https://github.com/rails-engine/flow_core
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A multi purpose, extendable, Workflow-net-based workflow engine for Rails
   applications

data/lib/flow_core/workflow_callbacks.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-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
-
-    def on_instance_finish(_instance); end
-
-    def on_instance_terminate(_instance); end
-
-    def on_instance_task_enable(_task); end
-
-    def on_instance_task_finish(_task); end
-
-    def on_instance_task_terminate(_task); end
-
-    def on_instance_task_errored(_task, _error); end
-
-    def on_instance_task_rescue(_task); end
-
-    def on_instance_task_suspend(_task); end
-
-    def on_instance_task_resume(_task); end
-  end
-end