petri_flow 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fab8df9f2e3aab0e596f470cab3b32c81bd395d9693a761c64b671b78c01a7e
-  data.tar.gz: befe8793cab6a2b5f07ab2cd7f80621832949354557dbdb7d54ea07ee4cdb8e8
+  metadata.gz: b75f2ac3288f2b169d4364a8aaa11586497d710477ecabe92adb6af2ffbf7376
+  data.tar.gz: 3a12e23472cc059ba4437ee1535d216b4df290f64d1de05c54a8395a648c5246
 SHA512:
-  metadata.gz: 9e959b6a9e7283e0546fba60f1284c43f633850f175ae41ec57f68dd7bf794e9f3130c1ffdb5a51630c1a7a588b30615b7e70a4029436c2f4cc27b315c81eb4a
-  data.tar.gz: 742a8b6b01db351fd78ec40df6b3bcb96415f46a1c24cc6c8429a2261101764028ed146bd9b2d2798cb8a5b8875839ac53759476c0ae29aadd1e03f2f2a75f9c
+  metadata.gz: 6aad07e5b69eb1ed0046afaa59f9679a3f77b259fa7410533eb2939883b43da7adf7518fe4b4d17e1d3f3f3b40feca8d12c954d9c837ca9c052bf1af84385942
+  data.tar.gz: e278b0c46d95a0b7744ef457ebac2d8f8f56d5ac943ff009264086490b762378cfb37ea3e7c5b64362d7fe09d674374f48bb0eb4008f90d7aa732343cd1cd4f0

data/README.md

@@ -1,4 +1,4 @@
-# Petri Flow ![Ruby Gem](https://github.com/hooopo/petri_flow/workflows/Ruby%20Gem/badge.svg?event=push)
+# Petri Flow ![Ruby Gem](https://github.com/hooopo/petri_flow/workflows/Ruby%20Gem/badge.svg?event=push) ![Testing](https://github.com/hooopo/petri_flow/workflows/Testing/badge.svg?event=push)
 
 Workflow engine for Rails.
 
@@ -67,6 +67,7 @@ Migration:
 bundle exec rake wf:install:migrations
 bundle exec rails db:create
 bundle exec rails db:migrate
+bundle exec rails db:seed
 ```
 ## Usage
 
@@ -116,7 +117,9 @@ visit:
 http://localhost:3000/wf
 ```
 
-Demo App: https://github.com/hooopo/petri_flow_demo
+## Testing
+
+* RAILS_ENV=test rake app:db:migrate && RAILS_ENV=test rake app:db:test:prepare && bundle exec rake test
 
 ## Contributing
 Contribution directions go here.

data/app/controllers/wf/guards_controller.rb

@@ -40,7 +40,7 @@ module Wf
 
     def update
       @arc = Wf::Arc.find(params[:arc_id])
-      gp = guard_params.merge(fieldable: GlobalID::Locator.locate(guard_params[:fieldable])) if guard_params[:fieldable].present?
+      gp = guard_params.merge(fieldable: GlobalID::Locator.locate(guard_params[:fieldable]))
       @guard = @arc.guards.find(params[:id])
       if @guard.update(gp)
         redirect_to workflow_arc_path(@arc.workflow, @arc), notice: "guard was successfully created."

data/app/models/wf/case_command/cancel_workitem.rb

@@ -10,6 +10,7 @@ module Wf::CaseCommand
 
     def call
       raise("The workitem is not in state #{workitem.state}") unless workitem.started?
+
       Wf::ApplicationRecord.transaction do
         workitem.update!(state: :canceled, canceled_at: Time.zone.now)
         ReleaseToken.call(workitem)

data/app/models/wf/entry.rb

@@ -28,6 +28,10 @@ module Wf
       field_values.includes(:field).map { |x| [x.field_id.to_i, { field_id: x.id.to_i, field_name: x.field.name, value: x.value_after_cast }] }.to_h
     end
 
+    def for_mini_racer
+      field_values.includes(:field).map { |x| [x.field.name, x.value_after_cast] }.to_h
+    end
+
     def update_payload!
       update(payload: json)
     end

data/app/models/wf/guard.rb

@@ -27,6 +27,8 @@ module Wf
       self.workflow = arc.workflow
     end
 
+    validate :validate_exp_and_fieldable
+
     OP = %w[
       =
       >
@@ -38,36 +40,76 @@ module Wf
 
     def value_after_cast
       field = fieldable
-      if fieldable
-        fieldable.cast(value)
+      fieldable&.cast(value)
+    end
+
+    def pass?(entry, workitem)
+      if exp
+        check_exp(entry, workitem)
       else
-        # TODO
+        check_fieldable(entry)
       end
     end
 
-    def pass?(entry)
+    def check_exp(entry, workitem)
+      form_hash = if entry
+        entry.for_mini_racer
+      else
+        {}
+      end
+
+      target_hash = workitem&.case&.targetable&.attributes || {}
+      user_hash = workitem&.holding_user&.attributes || {}
+
+      # 1000ms, 200mb
+      context = MiniRacer::Context.new(timeout: 1000, max_memory: 200_000_000)
+      context.eval("let form = #{form_hash.to_json};")
+      context.eval("let user = #{user_hash.to_json};")
+      context.eval("let target = #{target_hash.to_json};")
+      exp_value = context.eval(exp)
+      yes_or_no?(exp_value, value)
+    end
+
+    def check_fieldable(entry)
       fv = entry.field_values.where(field_id: fieldable_id).first
       return unless fv
 
+      yes_or_no?(fv.value_after_cast, value_after_cast)
+    end
+
+    def yes_or_no?(input_value, setting_value)
       if op == "="
-        fv.value_after_cast == value_after_cast
+        input_value == setting_value
       elsif op == ">"
-        fv.value_after_cast > value_after_cast
+        input_value > setting_value
       elsif op == "<"
-        fv.value_after_cast < value_after_cast
+        input_value < setting_value
       elsif op == ">="
-        fv.value_after_cast >= value_after_cast
+        input_value >= setting_value
       elsif op == "<="
-        fv.value_after_cast <= value_after_cast
+        input_value <= setting_value
       elsif op == "is_empty"
-        fv.value_after_cast.blank?
+        input_value.blank?
       else
         false
       end
     end
 
     def inspect
-      %(#{fieldable&.form&.name}.#{fieldable&.name} #{op} #{value})
+      if exp
+        %(eval(exp) #{op} #{value})
+      else
+        %(#{fieldable&.form&.name}.#{fieldable&.name} #{op} #{value})
+      end
+    end
+
+    def validate_exp_and_fieldable
+      if fieldable && exp.present?
+        errors.add(:exp, "Exp and Fieldable can not be set at the same time.")
+        return
+      end
+
+      errors.add(:exp, "Must set one of Exp and Fieldable.") unless fieldable || exp.present?
     end
   end
 end

data/app/models/wf/workitem.rb

@@ -44,13 +44,12 @@ module Wf
       "Workitem -> #{id}"
     end
 
-    # TODO: guards exp && target guards
     def pass_guard?(arc, has_passed = false)
       if arc.guards_count == 0
         !has_passed
       else
         entry = entries.where(user: holding_user).first
-        arc.guards.all? { |guard| guard.pass?(entry) }
+        arc.guards.all? { |guard| guard.pass?(entry, self) }
       end
     end
 

data/app/views/wf/arcs/show.html.erb

@@ -58,7 +58,11 @@
           <td><%= guard.fieldable&.form&.name %>/<%= guard.fieldable&.name %></td>
           <td><%= guard.op %></td>
           <td><%= guard.value %></td>
-          <td><%= guard.exp %></td>
+          <td>
+            <pre>
+              <%= guard.exp %>
+            </pre>
+          </td>
           <td><%= link_to 'Edit Guard', edit_arc_guard_path(@arc, guard), class: 'btn btn-sm btn-info' %></td>
           <td><%= link_to 'Delete Guard', [@arc, guard], remote: true, method: :delete, data: {confirm: 'confirm?'}, class: 'btn btn-sm btn-info' %></td>
         </tr>

data/app/views/wf/guards/_form.html.erb

@@ -18,7 +18,12 @@
 
   <div class="form-group">
     <%= f.label :fieldable, class: "label" %>
-    <%= f.select :fieldable, options_for_select(@arc.transition.form&.fields&.map {|x| [x.name, x.to_global_id]} || [], selected: f.object&.fieldable&.to_global_id), {}, class: "form-control custom-select", placeholder: "fieldable" %>
+    <%= f.select :fieldable, options_for_select(@arc.transition.form&.fields&.map {|x| [x.name, x.to_global_id]} || [], selected: f.object&.fieldable&.to_global_id), {include_blank: "select a field"}, class: "form-control custom-select", placeholder: "fieldable" %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :exp, class: "label" %> <small>JavaScript with build-in variable <span class="badge badge-danger">user</span>, <span class="badge badge-danger">form</span>, <span class="badge badge-danger">target</span>.</small>
+    <%= f.text_area :exp, class: "form-control", placeholder: "Exp", rows: 8 %>
   </div>
 
   <div class="form-group">
@@ -32,11 +37,6 @@
     <%= f.text_field :value, class: "form-control", placeholder: "Value" %>
   </div>
 
-  <div class="form-group">
-    <%= f.label :exp, class: "label" %>
-    <%= f.text_field :exp, class: "form-control", placeholder: "Exp" %>
-  </div>
-
   <div class="form-group">
     <%= f.submit class: "btn btn-primary", data: {disable_with: 'Waiting...'} %>
   </div>

data/lib/wf/engine.rb

@@ -29,3 +29,4 @@ require "rgl/traversal"
 require "rgl/path"
 require "active_record/connection_adapters/postgresql_adapter.rb"
 require "select2-rails"
+require "mini_racer"

data/lib/wf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wf
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petri_flow
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Hooopo Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_racer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement