petri_flow 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbde18cce71cef5defd61e81def61a22161d86f65a9bcf9e4747f801fb20347a
-  data.tar.gz: b3815dfe29977ccef329d79f907cb39d2b95b3c27cabce139ee6ea6d7a1d904a
+  metadata.gz: 5fab8df9f2e3aab0e596f470cab3b32c81bd395d9693a761c64b671b78c01a7e
+  data.tar.gz: befe8793cab6a2b5f07ab2cd7f80621832949354557dbdb7d54ea07ee4cdb8e8
 SHA512:
-  metadata.gz: e09272dfd04c097eb21caa9a5d3493f39e4f30ade13d8d77546f64a23743f2d382a177e97c53e9cb8b77d860a863cb93d506099471cb0698b938eb2ede731e7c
-  data.tar.gz: d1ab085bbb1ac92833f653dd8f84011e4a2c052e440577262e1663bfc145589a032e49ea9011422d7b4d15196b95da22f0ffd494835f8c35bb75948d93dca84f
+  metadata.gz: 9e959b6a9e7283e0546fba60f1284c43f633850f175ae41ec57f68dd7bf794e9f3130c1ffdb5a51630c1a7a588b30615b7e70a4029436c2f4cc27b315c81eb4a
+  data.tar.gz: 742a8b6b01db351fd78ec40df6b3bcb96415f46a1c24cc6c8429a2261101764028ed146bd9b2d2798cb8a5b8875839ac53759476c0ae29aadd1e03f2f2a75f9c

data/README.md

@@ -74,16 +74,8 @@ Add wf_config:
 
 ```ruby
 # config/initializers/wf_config.rb
-Wf::Workflow.class_eval do
-  def self.user_class
-    ::User
-  end
-  
-  # you can add more org class, for example, Role, Department, Position etc.
-  def self.org_classes
-    { group: ::Group }
-  end
-end
+Wf.user_class = "::User"
+Wf.org_classes = { group: "::Group" }
 ```
 
 Set parties:

data/app/controllers/wf/workitems_controller.rb

@@ -13,7 +13,7 @@ module Wf
     def index
       current_party_ids = [
         wf_current_user,
-        Wf::Workflow.org_classes.map { |org, _org_class| wf_current_user&.public_send(org) }
+        Wf.org_classes.map { |org, _org_class| wf_current_user&.public_send(org) }
       ].flatten.map { |x| x&.party&.id }.compact
       @workitems = Wf::Workitem.joins(:workitem_assignments).where(Wf::WorkitemAssignment.table_name => { party_id: current_party_ids })
       @workitems = @workitems.where(state: params[:state].intern) if params[:state]

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

@@ -11,7 +11,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)
+        workitem.update!(state: :canceled, canceled_at: Time.zone.now)
         ReleaseToken.call(workitem)
         SweepAutomaticTransitions.call(workitem.case)
       end

data/app/models/wf/comment.rb

@@ -16,6 +16,6 @@
 module Wf
   class Comment < ApplicationRecord
     belongs_to :workitem
-    belongs_to :user, class_name: Wf::Workflow.user_class.to_s
+    belongs_to :user, class_name: Wf.user_class.to_s
   end
 end

data/app/models/wf/entry.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: wf_entries
@@ -15,7 +16,7 @@
 module Wf
   class Entry < ApplicationRecord
     belongs_to :form
-    belongs_to :user, class_name: Wf::Workflow.user_class.to_s
+    belongs_to :user, class_name: Wf.user_class.to_s
     belongs_to :workitem
     has_many :field_values
 

data/app/models/wf/field_value.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: wf_field_values

data/app/models/wf/transition.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: wf_transitions

data/app/models/wf/workflow.rb

@@ -25,61 +25,6 @@ module Wf
 
     validates :name, presence: true
 
-    # TODO: move to config
-    def self.enable_callbacks
-      [Wf::Callbacks::EnableDefault]
-    end
-
-    def self.fire_callbacks
-      [Wf::Callbacks::FireDefault]
-    end
-
-    def self.assignment_callbacks
-      [Wf::Callbacks::AssignmentDefault]
-    end
-
-    def self.unassignment_callbacks
-      [Wf::Callbacks::UnassignmentDefault]
-    end
-
-    def self.notification_callbacks
-      [Wf::Callbacks::NotificationDefault]
-    end
-
-    def self.deadline_callbacks
-      [Wf::Callbacks::DeadlineDefault]
-    end
-
-    def self.time_callbacks
-      [Wf::Callbacks::TimeDefault]
-    end
-
-    def self.hold_timeout_callbacks
-      [Wf::Callbacks::HoldTimeoutDefault]
-    end
-
-    def self.form_class
-      "::Wf::Form"
-    end
-
-    def self.entry_class
-      "::Wf::Entry"
-    end
-
-    def self.field_class
-      "::Wf::Field"
-    end
-
-    def self.user_class
-      "::Wf::User"
-    end
-
-    def self.org_classes
-      {
-        group: "::Wf::Group"
-      }
-    end
-
     after_save do
       do_validate!
     end

data/app/models/wf/workitem.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: wf_workitems
@@ -25,11 +26,11 @@ module Wf
     belongs_to :workflow
     belongs_to :transition
     belongs_to :case
-    belongs_to :holding_user, foreign_key: :holding_user_id, class_name: Workflow.user_class.to_s, optional: true
+    belongs_to :holding_user, foreign_key: :holding_user_id, class_name: Wf.user_class.to_s, optional: true
     has_many :workitem_assignments
     has_many :parties, through: :workitem_assignments, source: "party"
     has_many :comments
-    has_many :entries, class_name: Wf::Workflow.entry_class.to_s
+    has_many :entries, class_name: Wf.entry_class.to_s
 
     enum state: {
       enabled: 0,

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

@@ -43,47 +43,47 @@
 
   <div class="form-group">
     <%= f.label :form, class: "label" %>
-    <%= f.select :form, options_for_select(Wf::Workflow.form_class.constantize.all.map{|x| [x.name, x.to_global_id]} || [], selected: f.object&.form&.to_global_id), {include_blank: 'user can input from custom form?'}, class: "form-control custom-select", placeholder: "Form" %>
+    <%= f.select :form, options_for_select(Wf.form_class.constantize.all.map{|x| [x.name, x.to_global_id]} || [], selected: f.object&.form&.to_global_id), {include_blank: 'user can input from custom form?'}, class: "form-control custom-select", placeholder: "Form" %>
   </div>
 
   <div class="form-group">
     <%= f.label :enable_callback, class: "label" %>
-    <%= f.select :enable_callback, Wf::Workflow.enable_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
+    <%= f.select :enable_callback, Wf.enable_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
   </div>
 
   <div class="form-group">
     <%= f.label :fire_callback, class: "label" %>
-    <%= f.select :fire_callback, Wf::Workflow.fire_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
+    <%= f.select :fire_callback, Wf.fire_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
   </div>
 
   <div class="form-group">
     <%= f.label :deadline_callback, class: "label" %>
-    <%= f.select :deadline_callback, Wf::Workflow.deadline_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
+    <%= f.select :deadline_callback, Wf.deadline_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
   </div>
 
   <div class="form-group">
     <%= f.label :time_callback, class: "label" %>
-    <%= f.select :time_callback, Wf::Workflow.time_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
+    <%= f.select :time_callback, Wf.time_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
   </div>
 
   <div class="form-group">
     <%= f.label :hold_timeout_callback, class: "label" %>
-    <%= f.select :hold_timeout_callback, Wf::Workflow.hold_timeout_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
+    <%= f.select :hold_timeout_callback, Wf.hold_timeout_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
   </div>
 
   <div class="form-group">
     <%= f.label :assignment_callback, class: "label" %>
-    <%= f.select :assignment_callback, Wf::Workflow.assignment_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
+    <%= f.select :assignment_callback, Wf.assignment_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
   </div>
 
   <div class="form-group">
     <%= f.label :unassignment_callback, class: "label" %>
-    <%= f.select :unassignment_callback, Wf::Workflow.unassignment_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
+    <%= f.select :unassignment_callback, Wf.unassignment_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
   </div>
 
   <div class="form-group">
     <%= f.label :notification_callback, class: "label" %>
-    <%= f.select :notification_callback, Wf::Workflow.notification_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
+    <%= f.select :notification_callback, Wf.notification_callbacks, {}, class: "form-control custom-select", placeholder: "Callback" %>
   </div>
 
   <div class="form-group">

data/lib/wf/version.rb

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

data/lib/wf.rb

@@ -3,5 +3,35 @@
 require "wf/engine"
 
 module Wf
-  # Your code goes here...
+  class << self
+    attr_accessor :enable_callbacks
+    attr_accessor :fire_callbacks
+    attr_accessor :assignment_callbacks
+    attr_accessor :unassignment_callbacks
+    attr_accessor :notification_callbacks
+    attr_accessor :time_callbacks
+    attr_accessor :deadline_callbacks
+    attr_accessor :hold_timeout_callbacks
+
+    attr_accessor :form_class
+    attr_accessor :entry_class
+    attr_accessor :field_class
+
+    attr_accessor :user_class
+    attr_accessor :org_classes
+  end
+
+  self.enable_callbacks          = ["Wf::Callbacks::EnableDefault"]
+  self.fire_callbacks            = ["Wf::Callbacks::FireDefault"]
+  self.assignment_callbacks      = ["Wf::Callbacks::AssignmentDefault"]
+  self.unassignment_callbacks    = ["Wf::Callbacks::UnassignmentDefault"]
+  self.notification_callbacks    = ["Wf::Callbacks::NotificationDefault"]
+  self.deadline_callbacks        = ["Wf::Callbacks::DeadlineDefault"]
+  self.time_callbacks            = ["Wf::Callbacks::TimeDefault"]
+  self.hold_timeout_callbacks    = ["Wf::Callbacks::HoldTimeoutDefault"]
+  self.form_class                = "::Wf::Form"
+  self.entry_class               = "::Wf::Entry"
+  self.field_class               = "::Wf::Field"
+  self.user_class                = "::Wf::User"
+  self.org_classes               = { group: "::Wf::Group" }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petri_flow
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Hooopo Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap