chrono_forge 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88cee304794f2d186c2103563b8f98c08a00cc1d9a351ae206c35e34bacdcf61
-  data.tar.gz: dee282b43b65a4846797629903141329a3f094fd009416848cb0f5b33ed3f68e
+  metadata.gz: 0303e4144f2e7546095c0828a02fa810138b3963603ee33810232cc4444a7ee8
+  data.tar.gz: d1805992395168a7873b34c7264518e0b6d740fcdef23dd5fce2ac2cf686bb3a
 SHA512:
-  metadata.gz: ba3c5937b30c3ea0a46135a30f2cc46d59e430bb75f41bda1fc50d352a4bbe615532b1de0526eed819c824d5851cac9812b2f7de1ffb930a72a380045312692d
-  data.tar.gz: 3db298d79b40715bc6cbcb54031b5ff37dd549c8361e70fb1584431d62010d14cffe7ca5b9e7e36e79a2513f0524882eae6ff9295fae905b342506783160a0c0
+  metadata.gz: 64d20d4a723c5d751c60415f1461e5e0e581a6401a084d4f6c83cc9c0813f7b7163c87dff916e4af628e7742291cecfc9786d6afc922fc046577713d2db94f13
+  data.tar.gz: 0bcb5a5c37f3fd0e241e0e3d60a358b4fd7d2700c1960a8148b5b12dca147ce8f0db07c7e435d314c7b6bd537e3830ad1f0fc131f33e2cee1bfbf0d60c4a7b63

data/README.md

@@ -151,17 +151,6 @@ class MyWorkflow < ApplicationJob
 end
 ```
 
-### Cleanup
-
-ChronoForge includes built-in cleanup methods for managing old workflow data:
-
-```ruby
-# Clean up old workflows and logs
-ChronoForge::Workflow.cleanup_old_logs(retention_period: 30.days)
-ChronoForge::ExecutionLog.cleanup_old_logs(retention_period: 30.days)
-ChronoForge::ErrorLog.cleanup_old_logs(retention_period: 30.days)
-```
-
 ## Testing
 
 ChronoForge is designed to be easily testable using [ChaoticJob](https://github.com/fractaledmind/chaotic_job), a testing framework that makes it simple to test complex job workflows. Here's how to set up your test environment:
@@ -186,7 +175,7 @@ require 'chaotic_job'
 Example test:
 
 ```ruby
-class WorkflowTest < Minitest::Test
+class WorkflowTest < ActiveJob::TestCase
   include ChaoticJob::Helpers
 
   def test_workflow_completion
@@ -210,7 +199,6 @@ end
 ChaoticJob provides several helpful methods for testing workflows:
 
 - `perform_all_jobs`: Processes all enqueued jobs, including those enqueued during job execution
-- `enqueued_jobs`: Returns the current number of jobs in the queue
 
 For testing with specific job processing libraries like Sidekiq or Delayed Job, you can still use their respective testing modes, but ChaoticJob is recommended for testing ChronoForge workflows as it better handles the complexities of nested job scheduling and wait states.
 

data/gemfiles/rails_7.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    chrono_forge (0.0.1)
+    chrono_forge (0.1.0)
       activejob
       activerecord
       zeitwerk

data/lib/chrono_forge/error_log.rb

@@ -27,10 +27,5 @@ module ChronoForge
     self.table_name = "chrono_forge_error_logs"
 
     belongs_to :workflow
-
-    # Cleanup method
-    def self.cleanup_old_logs(retention_period: 30.days)
-      where("created_at < ?", retention_period.ago).delete_all
-    end
   end
 end

data/lib/chrono_forge/execution_log.rb

@@ -38,10 +38,5 @@ module ChronoForge
       completed
       failed
     ]
-
-    # Cleanup method
-    def self.cleanup_old_logs(retention_period: 30.days)
-      where("created_at < ?", retention_period.ago).delete_all
-    end
   end
 end

data/lib/chrono_forge/executor/methods/wait_until.rb

@@ -6,8 +6,8 @@ module ChronoForge
       module WaitUntil
         def wait_until(condition, **options)
           # Default timeout and check interval
-          timeout = options[:timeout] || 10.seconds
-          check_interval = options[:check_interval] || 1.second
+          timeout = options[:timeout] || 1.hour
+          check_interval = options[:check_interval] || 15.minutes
 
           # Find or create execution log
           step_name = "wait_until$#{condition}"
@@ -89,8 +89,8 @@ module ChronoForge
               state: :failed,
               metadata: metadata.merge("result" => nil)
             )
-            Rails.logger.warn { "Timeout reached for condition #{condition}. Condition not met within the timeout period." }
-            raise WaitConditionNotMet, "Condition not met within timeout period"
+            Rails.logger.warn { "Timeout reached for condition '#{condition}'." }
+            raise WaitConditionNotMet, "Condition '#{condition}' not met within timeout period"
           end
 
           # Reschedule with delay

data/lib/chrono_forge/executor/retry_strategy.rb

@@ -13,7 +13,7 @@ module ChronoForge
         wait_duration = BACKOFF_STRATEGY[attempt] || BACKOFF_STRATEGY.last
 
         # Schedule with exponential backoff
-        workflow.job_klass.constantize
+        workflow.job_klass
           .set(wait: wait_duration)
           .perform_later(
             workflow.key,

data/lib/chrono_forge/executor.rb

@@ -10,7 +10,7 @@ module ChronoForge
 
     include Methods
 
-    def perform(key, attempt: 0, **kwargs)
+    def perform(key, attempt: 0, options: {}, **kwargs)
       # Prevent excessive retries
       if attempt >= self.class::RetryStrategy.max_attempts
         Rails.logger.error { "Max attempts reached for job #{key}" }
@@ -18,7 +18,7 @@ module ChronoForge
       end
 
       # Find or create job with comprehensive tracking
-      setup_workflow(key, kwargs)
+      setup_workflow(key, options, kwargs)
 
       begin
         # Skip if workflow cannot be executed
@@ -47,13 +47,13 @@ module ChronoForge
         nil
       rescue => e
         Rails.logger.error { "An error occurred during execution of #{key}" }
-        self.class::ExecutionTracker.track_error(workflow, e)
+        error_log = self.class::ExecutionTracker.track_error(workflow, e)
 
         # Retry if applicable
         if should_retry?(e, attempt)
           self.class::RetryStrategy.schedule_retry(workflow, attempt: attempt)
         else
-          workflow.failed!
+          fail_workflow! error_log
         end
       ensure
         context.save!
@@ -71,9 +71,6 @@ module ChronoForge
         step_name: "$workflow_completion$"
       ) do |log|
         log.started_at = Time.current
-        log.metadata = {
-          workflow_id: workflow.id
-        }
       end
 
       begin
@@ -104,14 +101,53 @@ module ChronoForge
       end
     end
 
-    def setup_workflow(key, kwargs)
-      @workflow = find_workflow(key, kwargs)
+    def fail_workflow!(error_log)
+      # Create an execution log for workflow failure
+      execution_log = ExecutionLog.create_or_find_by!(
+        workflow: workflow,
+        step_name: "$workflow_failure$"
+      ) do |log|
+        log.started_at = Time.current
+        log.metadata = {
+          error_log_id: error_log.id
+        }
+      end
+
+      begin
+        execution_log.update!(
+          attempts: execution_log.attempts + 1,
+          last_executed_at: Time.current
+        )
+
+        workflow.failed!
+
+        # Mark execution log as completed
+        execution_log.update!(
+          state: :completed,
+          completed_at: Time.current
+        )
+
+        # Return the execution log for tracking
+        execution_log
+      rescue => e
+        # Log any completion errors
+        execution_log.update!(
+          state: :failed,
+          error_message: e.message,
+          error_class: e.class.name
+        )
+        raise
+      end
+    end
+
+    def setup_workflow(key, options, kwargs)
+      @workflow = find_workflow(key, options, kwargs)
       @context = Context.new(@workflow)
     end
 
-    def find_workflow(key, kwargs)
-      Workflow.create_or_find_by!(key: key) do |workflow|
-        workflow.job_klass = self.class.to_s
+    def find_workflow(key, options, kwargs)
+      Workflow.create_or_find_by!(job_class: self.class.to_s, key: key) do |workflow|
+        workflow.options = options
         workflow.kwargs = kwargs
         workflow.started_at = Time.current
       end

data/lib/chrono_forge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChronoForge
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/chrono_forge/workflow.rb

@@ -7,9 +7,10 @@
 #  id           :integer          not null, primary key
 #  completed_at :datetime
 #  context      :json             not null
-#  job_klass    :string           not null
+#  job_class    :string           not null
 #  key          :string           not null
 #  kwargs       :json             not null
+#  options      :json             not null
 #  locked_at    :datetime
 #  started_at   :datetime
 #  state        :integer          default("idle"), not null
@@ -24,8 +25,8 @@ module ChronoForge
   class Workflow < ActiveRecord::Base
     self.table_name = "chrono_forge_workflows"
 
-    has_many :execution_logs
-    has_many :error_logs
+    has_many :execution_logs, -> { order(id: :asc) }
+    has_many :error_logs, -> { order(id: :asc) }
 
     enum :state, %i[
       idle
@@ -35,16 +36,15 @@ module ChronoForge
       stalled
     ]
 
-    # Cleanup method
-    def self.cleanup_old_logs(retention_period: 30.days)
-      where("created_at < ?", retention_period.ago).delete_all
-    end
-
     # Serialization for metadata
     serialize :metadata, coder: JSON
 
     def executable?
       idle? || running?
     end
+
+    def job_klass
+      job_class.constantize
+    end
   end
 end

data/lib/chrono_forge.rb

@@ -4,7 +4,7 @@ require "zeitwerk"
 require "active_record"
 require "active_job"
 
-module Chronoforge
+module ChronoForge
   Loader = Zeitwerk::Loader.for_gem.tap do |loader|
     loader.ignore("#{__dir__}/generators")
     loader.setup

data/lib/generators/chrono_forge/install/templates/install_chrono_forge.rb

@@ -3,8 +3,8 @@
 class InstallChronoForge < ActiveRecord::Migration[7.1]
   def change
     create_table :chrono_forge_workflows do |t|
-      t.string :key, null: false, index: {unique: true}
-      t.string :job_klass, null: false
+      t.string :key, null: false, index: true
+      t.string :job_class, null: false
 
       if t.respond_to?(:jsonb)
         t.jsonb :kwargs, null: false, default: {}
@@ -24,6 +24,7 @@ class InstallChronoForge < ActiveRecord::Migration[7.1]
       t.datetime :completed_at
 
       t.timestamps
+      t.index %i[job_class key], unique: true
     end
 
     create_table :chrono_forge_execution_logs do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chrono_forge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-21 00:00:00.000000000 Z
+date: 2025-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord