bpmn 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eec917ee2aadb5fcfb00c0320545531d3f0c8fa7a71d792bd0f2c3b98f11f6ea
-  data.tar.gz: 4cbade6e2c6abe6d0409c038072edbdf3ecbecf6273aa9ca62748982dcc20d66
+  metadata.gz: 570a8c61fe26fb937180699bec4ba9f2bb8d4232aea10647249c18cafbcd6b73
+  data.tar.gz: a2660ffe0e2ecab73c2941c5398748204e61fb3df81a6768c2490a46303d130b
 SHA512:
-  metadata.gz: 624a13c93bfc3ab6e8e20709b48a6c11c7c7b19c352bd1cbed245175de6de1fb5a52a4b03b2969978bcd4259ef11e0318c45860130e9386ad889211b282bf327
-  data.tar.gz: a1db62cb116e4829b5ef4d2dd7cdd3c28de6e257c677fadfacc4f59ff5e9a22393ec4d9e587775fbd8c97e5bea079894d789b1530314345524000ef6c052cebd
+  metadata.gz: 453bf5fa1b709c5929d2fa11484aaf20d8bbf386824b0cdad9b8b2344b3e4e37607f4db119fc116ac0505c05576ca6398207803785ca068272524be82a977a5d
+  data.tar.gz: 1cc2dd3f4b066713b16eac9c998b910c75ddbfa5f54bc6b459943bb0bfd5794e9a50e0774078daa3e59967c1d4a256cf978b0638172d3dce128509d1aa3f2a8a

data/lib/bpmn/definitions.rb

@@ -5,7 +5,7 @@ module BPMN
     include ActiveModel::Model
 
     attr_accessor :id, :name, :target_namespace, :exporter, :exporter_version, :execution_platform, :execution_platform_version
-    attr_reader :messages, :signals, :errors, :processes
+    attr_reader :messages, :signals, :errors, :escalations, :processes
 
     def self.from_xml(xml)
       XmlHasher.configure do |config|
@@ -22,11 +22,12 @@ module BPMN
     end
 
     def initialize(attributes={})
-      super(attributes.except(:message, :signal, :error, :process))
+      super(attributes.except(:message, :signal, :error, :escalation, :process))
 
       @messages = Array.wrap(attributes[:message]).map { |atts| Message.new(atts) }
       @signals = Array.wrap(attributes[:signal]).map { |atts| Signal.new(atts) }
       @errors = Array.wrap(attributes[:error]).map { |atts| Error.new(atts) }
+      @escalations = Array.wrap(attributes[:escalation]).map { |atts| Escalation.new(atts) }
       @processes = Array.wrap(attributes[:process]).map { |atts| Process.new(atts) }
     end
 
@@ -42,12 +43,16 @@ module BPMN
       errors.find { |error| error.id == id }
     end
 
+    def escalation_by_id(id)
+      escalations.find { |escalation| escalation.id == id }
+    end
+
     def process_by_id(id)
       processes.find { |process| process.id == id }
     end
 
     def inspect
-      "#<BPMN::Definitions @id=#{id.inspect} @name=#{name.inspect} @messages=#{messages.inspect} @signals=#{signals.inspect} @errors=#{errors.inspect} @processes=#{processes.inspect}>"
+      "#<BPMN::Definitions @id=#{id.inspect} @name=#{name.inspect} @messages=#{messages.inspect} @signals=#{signals.inspect} @errors=#{errors.inspect} @escalations=#{escalations.inspect} @processes=#{processes.inspect}>"
     end
   end
 end

data/lib/bpmn/element.rb

@@ -26,6 +26,9 @@ module BPMN
   class Error < Element
   end
 
+  class Escalation < Element
+  end
+
   class Collaboration < Element
   end
 

data/lib/bpmn/event.rb

@@ -5,7 +5,7 @@ module BPMN
     attr_accessor :event_definitions
 
     def initialize(attributes = {})
-      super(attributes.except(:message_event_definition, :signal_event_definition, :error_event_definition, :terminate_event_definition, :timer_event_definition))
+      super(attributes.except(:message_event_definition, :signal_event_definition, :error_event_definition, :escalation_event_definition, :terminate_event_definition, :timer_event_definition))
 
       @event_definitions = []
 
@@ -21,6 +21,10 @@ module BPMN
         @event_definitions.push ErrorEventDefinition.new(eed)
       end if attributes[:error_event_definition].present?
 
+      Array.wrap(attributes[:escalation_event_definition]).each do |esed|
+        @event_definitions.push EscalationEventDefinition.new(esed)
+      end if attributes[:escalation_event_definition].present?
+
       Array.wrap(attributes[:terminate_event_definition]).each do |ted|
         @event_definitions.push TerminateEventDefinition.new(ted)
       end if attributes[:terminate_event_definition].present?
@@ -82,6 +86,10 @@ module BPMN
       event_definitions.find { |ed| ed.is_a?(EscalationEventDefinition) }
     end
 
+    def escalation_event_definitions
+      event_definitions.select { |ed| ed.is_a?(EscalationEventDefinition) }
+    end
+
     def error_event_definitions
       event_definitions.select { |ed| ed.is_a?(ErrorEventDefinition) }
     end

data/lib/bpmn/event_definition.rb

@@ -19,6 +19,29 @@ module BPMN
   end
 
   class EscalationEventDefinition < EventDefinition
+    attr_accessor :escalation_ref, :escalation
+
+    def initialize(attributes = {})
+      super(attributes.except(:escalation_ref))
+
+      @escalation_ref = attributes[:escalation_ref]
+    end
+
+    def execute(execution)
+      if execution.step.is_throwing?
+        execution.throw_escalation(escalation_name)
+      else
+        execution.escalation_names.push escalation_name
+      end
+    end
+
+    def escalation_id
+      escalation&.id
+    end
+
+    def escalation_name
+      escalation&.name
+    end
   end
 
   class ErrorEventDefinition < EventDefinition

data/lib/bpmn/execution.rb

@@ -2,7 +2,7 @@
 
 module BPMN
   class Execution
-    attr_accessor :id, :status, :started_at, :ended_at, :variables, :tokens_in, :tokens_out, :start_event_id, :timer_expires_at, :message_names, :error_names, :condition
+    attr_accessor :id, :status, :started_at, :ended_at, :variables, :tokens_in, :tokens_out, :start_event_id, :timer_expires_at, :message_names, :error_names, :escalation_names, :condition
     attr_accessor :step, :parent, :children, :context, :attached_to_id
 
     delegate :print, to: :printer
@@ -50,6 +50,7 @@ module BPMN
       @tokens_out ||= []
       @message_names ||= []
       @error_names ||= []
+      @escalation_names ||= []
       @children ||= []
     end
 
@@ -166,16 +167,59 @@ module BPMN
       context.notify_listener(:error_thrown, execution: self, error_name: error_name)
     end
 
+    def throw_escalation(escalation_name, variables: {})
+      caught = false
+      waiting_children.each do |child|
+        step = child.step
+        if step.is_a?(BPMN::Event) && step.escalation_event_definitions.any? { |eed| eed.escalation_name == escalation_name }
+          child.signal(variables)
+          caught = true
+          break
+        end
+      end
+      unless caught
+        waiting_children.each do |child|
+          step = child.step
+          if step.is_a?(BPMN::Event) && step.escalation_event_definitions.any? { |eed| eed.escalation_name.nil? }
+            child.signal(variables)
+            break
+          end
+        end
+      end
+      context.notify_listener(:escalation_thrown, execution: self, escalation_name: escalation_name)
+    end
+
+    def timer_expired?
+      waiting? && timer_expires_at.present? && Time.zone.now > timer_expires_at
+    end
+
     def check_expired_timers
-      waiting_children.each { |child| child.signal if child.timer_expires_at.present? && Time.zone.now > child.timer_expires_at }
+      if timer_expired?
+        signal
+      else
+        children.each { |child| child.check_expired_timers }
+      end
+    end
+
+    def next_timer_expires_at
+      times = []
+      times << timer_expires_at if waiting? && timer_expires_at
+      children.each { |child| child_time = child.next_timer_expires_at; times << child_time if child_time }
+      times.min
     end
 
     def evaluate_condition(condition)
-      evaluate_expression(condition.delete_prefix("=")) == true
+      evaluate_expression(condition) == true
     end
 
     def evaluate_expression(expression, variables: parent&.variables || {}.with_indifferent_access)
-      DMN.evaluate(expression.delete_prefix("="), variables: variables)
+      return nil if expression.nil?
+
+      if expression.start_with?("=")
+        DMN.evaluate(expression.delete_prefix("="), variables: variables)
+      else
+        expression
+      end
     end
 
     def run_automated_tasks
@@ -257,6 +301,7 @@ module BPMN
         tokens_out: tokens_out,
         message_names: message_names,
         error_names: error_names,
+        escalation_names: escalation_names,
         timer_expires_at: timer_expires_at,
         condition: condition,
         children: children.map { |child| child.as_json },
@@ -276,6 +321,7 @@ module BPMN
       # parts << "@tokens_out=#{tokens_out.inspect}" if tokens_out.present?
       parts << "@message_names=#{message_names.inspect}" if message_names.present?
       parts << "@error_names=#{error_names.inspect}" if error_names.present?
+      parts << "@escalation_names=#{escalation_names.inspect}" if escalation_names.present?
       parts << "@timer_expires_at=#{timer_expires_at.inspect}" if timer_expires_at
       parts << "@condition=#{condition.inspect}" if condition
       parts << "@children=#{children.inspect}" if children.present?

data/lib/bpmn/process.rb

@@ -76,6 +76,8 @@ module BPMN
                 event_definition.signal = definitions.signal_by_id(event_definition.signal_ref)
               elsif event_definition.is_a?(ErrorEventDefinition)
                 event_definition.error = definitions.error_by_id(event_definition.error_ref)
+              elsif event_definition.is_a?(EscalationEventDefinition)
+                event_definition.escalation = definitions.escalation_by_id(event_definition.escalation_ref)
               end
             end
 
@@ -162,11 +164,10 @@ module BPMN
     attr_reader :process_id
 
     def execute(execution)
-      if extension_elements&.called_element&.process_id&.start_with?("=")
-        @process_id = DMN.evaluate(extension_elements&.called_element&.process_id, variables: execution.variables)
-      else
-        @process_id = extension_elements&.called_element&.process_id
-      end
+      @process_id = execution.evaluate_expression(
+        extension_elements&.called_element&.process_id,
+        variables: execution.variables
+      )
 
       execution.wait
 

data/lib/bpmn/task.rb

@@ -105,7 +105,7 @@ module BPMN
     end
 
     def run(execution)
-      DMN.evaluate(script.delete_prefix("="), variables: execution.parent.variables)
+      execution.parent.evaluate_expression(script, variables: execution.parent.variables)
     end
   end
 

data/lib/bpmn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BPMN
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bpmn
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Connected Bits
 bindir: bin
 cert_chain: []
-date: 2026-02-06 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dmn
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement