standard_procedure_operations 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40faff52f3486a0ce989b2ea1fdb8350d8872827391331d0e5d8ad78c4e86a0a
-  data.tar.gz: b3667d26ebea3598955b0d4bf71eed3e22774c4aaf589ea3851c02454144a539
+  metadata.gz: 04267db639d0804b8fdc04e3a6cbe07531ff5870948f0ba95d91c4383188c331
+  data.tar.gz: 02fef265e8c2bae6ba1c5178fccb9fad3b0eca6f1bd87b4bbb0d321a47e55f40
 SHA512:
-  metadata.gz: a84bbf1163fbc9515450cf129bc9385043bb21f5d9d1e5c6135318f44caec11c1971801acdcd7e541915815e067898f36f7ffdbdb4e133b38f4a3a50156276aa
-  data.tar.gz: 4e6bbab0ababc9eb6a24f9b9dacbf4e755e08c44fd8a6da01502f59a5e763945df8cccd9198e0ef5532a80d31cccec81fb4eaafb5fa390fd682daf8e408fd66e
+  metadata.gz: 48a5aaf6c3c5f3b92bd274c62a1578b43c72212452b51ff934cdc3ff9ea8ad1eb8bd597d65db64185620a3cf1cde939bbfd19b78a8f297746d6d3b563b64a430
+  data.tar.gz: 97dbb727aa71212ba5bc485f83f1f5f68a07f3c40a08e37fe115b45246921c249917a5eee4fc841b6d23291cfa8f99d4e1bc80ae78472e62471e1b671f42f7b5

data/app/models/operations/task/state_management/wait_handler.rb

@@ -6,9 +6,8 @@ class Operations::Task::StateManagement::WaitHandler
     instance_eval(&config)
   end
 
-  def condition(destination = nil, options = {}, &condition)
+  def condition(options = {}, &condition)
     @conditions << condition
-    @destinations << destination if destination
     @condition_labels ||= {}
     condition_index = @conditions.size - 1
     @condition_labels[condition_index] = options[:label] if options[:label]
@@ -16,18 +15,12 @@ class Operations::Task::StateManagement::WaitHandler
 
   def go_to(state) = @destinations << state
 
-  def condition_labels
-    @condition_labels ||= {}
-  end
+  def condition_labels = @condition_labels ||= {}
 
   def call(task, data)
     raise Operations::CannotWaitInForeground.new("#{task.class} cannot wait in the foreground", task) unless task.background?
     condition = @conditions.find { |condition| data.instance_eval(&condition) }
-    if condition.nil?
-      task.go_to(task.state, data.to_h)
-    else
-      index = @conditions.index condition
-      task.go_to(@destinations[index], data.to_h)
-    end
+    next_state = (condition.nil? || @conditions.index(condition).nil?) ? task.state : @destinations[@conditions.index(condition)]
+    data.go_to next_state
   end
 end

data/app/models/operations/task/testing.rb

@@ -2,9 +2,9 @@ module Operations::Task::Testing
   extend ActiveSupport::Concern
 
   class_methods do
-    def handling state, **data, &block
+    def handling state, background: false, **data, &block
       # Create a task specifically for testing - avoid serialization issues
-      task = new(state: state)
+      task = new(state: state, background: background)
       # Use our own test-specific data carrier so we can examine results
       data = TestResultCarrier.new(data.merge(task: task))
 
@@ -22,7 +22,7 @@ module Operations::Task::Testing
 
   # Instead of extending DataCarrier (which no longer has go_to),
   # create a new class with similar functionality but keeps the go_to method for testing
-  class TestResultCarrier < OpenStruct
+  class TestResultCarrier < Operations::Task::DataCarrier
     def go_to(state, message = nil)
       self.next_state = state
       self.status_message = message || next_state.to_s
@@ -41,10 +41,7 @@ module Operations::Task::Testing
 
     def call(sub_task_class, **data, &result_handler)
       record_sub_task sub_task_class
-      # Return mock data for testing
-      result = {answer: 42}
-      result_handler&.call(result)
-      result
+      super
     end
 
     def start(sub_task_class, **data, &result_handler)

data/lib/operations/version.rb

@@ -1,3 +1,3 @@
 module Operations
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standard_procedure_operations
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Rahoul Baruah