swarm 0.3.0 → 0.4.0

data/lib/swarm/router.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module Swarm
   class Router
     class << self
       def expression_class_for_node(node)
         command = node[0]
         expression_type = case command
-        when "if", "unless"
-          "conditional"
-        when "sequence", "concurrence", "subprocess"
-          command
-        else
-          "activity"
+                          when "if", "unless"
+                            "conditional"
+                          when "sequence", "concurrence", "subprocess"
+                            command
+                          else
+                            "activity"
         end
         Swarm::Support.constantize("swarm/#{expression_type}_expression")
       end

data/lib/swarm/storage/hash_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "key_value_storage"
 
 module Swarm
@@ -24,4 +26,4 @@ module Swarm
       end
     end
   end
-end
+end

data/lib/swarm/storage/key_value_storage.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module Swarm
   module Storage
     class KeyValueStorage
+      class AssociationKeyMissingError < StandardError; end
+
       attr_reader :store
 
       def initialize(store)
@@ -16,35 +20,45 @@ module Swarm
       end
 
       def regex_for_type(type)
-        /^#{type}\:(.*)/
+        /^#{type}:(.*)/
       end
 
-      def ids_for_type(type)
+      def ids_for_type(_type)
         raise "Not implemented yet!"
       end
 
-      def all_of_type(type)
+      def all_of_type(_type)
         raise "Not implemented yet!"
       end
 
-      def load_associations(association_name, owner:, type:, foreign_key: nil)
-        type = type.split("::").last
-        local_association_ids = :"#{association_name}_ids"
-        if owner.respond_to?(local_association_ids)
-          ids = owner.send(local_association_ids) || []
-          ids.map { |id|
-            self["#{type}:#{id}"]
-          }.compact
-        end
+      def add_association(association_name, associated, owner:, class_name:, foreign_key: nil)
+        key = :"#{association_name}_ids"
+        raise AssociationKeyMissingError, key unless owner.respond_to?(key)
+
+        ids = owner.send(key) || owner.send("#{key}=", [])
+        ids << associated.id
+        associated
+      end
+
+      def load_associations(association_name, owner:, class_name:, foreign_key: nil)
+        key = :"#{association_name}_ids"
+        raise AssociationKeyMissingError, key unless owner.respond_to?(key)
+
+        ids = owner.send(key) || []
+        ids.map { |id|
+          self["#{class_name.split("::").last}:#{id}"]
+        }.compact
       end
 
       def serialize(value)
         return nil if value.nil?
+
         value.to_json
       end
 
       def deserialize(value)
         return nil if value.nil?
+
         JSON.parse(value)
       end
 
@@ -56,7 +70,7 @@ module Swarm
         store[key] = serialize(value)
       end
 
-      def delete(key)
+      def delete(_key)
         raise "Not implemented yet!"
       end
 

data/lib/swarm/storage/redis_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "redis"
 require_relative "key_value_storage"
 
@@ -13,7 +15,7 @@ module Swarm
         if subtypes
           hsh.values
         else
-          hsh.select { |key, value| value["type"] == type }.values
+          hsh.select { |_key, value| value["type"] == type }.values
         end
       end
 
@@ -26,4 +28,4 @@ module Swarm
       end
     end
   end
-end
+end

data/lib/swarm/storage.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require_relative "storage/hash_storage"
 require_relative "storage/redis_storage"
 
 module Swarm
   module Storage
   end
-end
+end

data/lib/swarm/stored_workitem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Swarm
   class StoredWorkitem < HiveDweller
     extend Forwardable
@@ -5,11 +7,11 @@ module Swarm
     def_delegators :expression, :node, :command, :arguments, :process_id, :workitem
 
     set_columns :expression_id
-    many_to_one :expression, :class_name => "Swarm::Expression"
+    many_to_one :expression, class_name: "Swarm::Expression"
 
     def proceed
       delete
       expression.reply
     end
   end
-end
+end

data/lib/swarm/support.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "securerandom"
 
 module Swarm
   module Support
     class << self
       def deep_merge(hsh1, hsh2, combine_arrays: :override)
-        hsh1.merge(hsh2) { |key, v1, v2|
+        hsh1.merge(hsh2) { |_key, v1, v2|
           if [v1, v2].all? { |v| v.is_a?(Array) }
             combine_arrays(v1, v2, method: combine_arrays)
           elsif [v1, v2].all? { |v| v.is_a?(Hash) }
@@ -45,15 +47,18 @@ module Swarm
 
       def tokenize(string)
         return nil if string.nil?
-        string = string.to_s.gsub(/&/, ' and ').
-          gsub(/[ \/]+/, '_').
-          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+
+        string.to_s.gsub(/&/, ' and ').
+          gsub(%r{[ /]+}, '_').
+          gsub(/([a-z\d])([A-Z])/, '\1_\2').
           downcase
       end
 
       def camelize(string)
-        string = string.sub(/^[a-z\d]*/) { $&.capitalize }
-        string = string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
+        string = string.sub(/^[a-z\d]*/) { ::Regexp.last_match(0).capitalize }
+        string.gsub(%r{(?:_|(/))([a-z\d]*)}) {
+          "#{::Regexp.last_match(1)}#{::Regexp.last_match(2).capitalize}"
+        }.gsub('/', '::')
       end
 
       def constantize(string)
@@ -70,20 +75,12 @@ module Swarm
         constant
       end
 
-      def slice(hash, *keys)
-        {}.tap { |h|
-          keys.each { |k|
-            h[k] = hash[k] if hash.has_key?(k)
-          }
-        }
-      end
-
       def wait_until(timeout: 5, initial_delay: nil)
         sleep(initial_delay) if initial_delay.is_a?(Numeric)
-        Timeout::timeout(timeout) do
+        Timeout.timeout(timeout) do
           sleep 0.05 until yield
         end
       end
     end
   end
-end
+end

data/lib/swarm/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Swarm
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/swarm.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
+require "forwardable"
 require "swarm/version"
 require "swarm/support"
-require "swarm/engine/base/queue"
+require "swarm/engine/queue"
 require "swarm/engine/volatile/queue"
 require "swarm/engine/worker"
 require "swarm/hive"
@@ -19,7 +22,6 @@ require "swarm/participants/storage_participant"
 require "swarm/pollen/reader"
 require "swarm/storage"
 
-
 module Swarm
   # Your code goes here...
 end

data/swarm.gemspec

@@ -21,11 +21,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "redis"
   spec.add_dependency "parslet"
+  spec.add_dependency "dentaku"
 
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "timecop", "~> 0.7"
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", "~> 3"
+  spec.add_development_dependency "timecop"
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rubocop"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swarm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ravi Gadad
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2025-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -38,62 +38,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dentaku
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby workflow engine
 email:
 - ravi@gadad.net
@@ -140,14 +168,13 @@ files:
 - bin/console
 - bin/setup
 - lib/swarm.rb
-- lib/swarm/engine/base/job.rb
-- lib/swarm/engine/base/queue.rb
+- lib/swarm/engine/job.rb
+- lib/swarm/engine/queue.rb
 - lib/swarm/engine/volatile/job.rb
 - lib/swarm/engine/volatile/queue.rb
 - lib/swarm/engine/worker.rb
 - lib/swarm/engine/worker/command.rb
 - lib/swarm/evaluation/expression_evaluator.rb
-- lib/swarm/evaluation/workitem_context.rb
 - lib/swarm/expression.rb
 - lib/swarm/expressions/activity_expression.rb
 - lib/swarm/expressions/branch_expression.rb
@@ -158,6 +185,7 @@ files:
 - lib/swarm/hive.rb
 - lib/swarm/hive_dweller.rb
 - lib/swarm/observers/base.rb
+- lib/swarm/observers/logger.rb
 - lib/swarm/participant.rb
 - lib/swarm/participants/storage_participant.rb
 - lib/swarm/participants/trace_participant.rb
@@ -179,7 +207,7 @@ homepage: https://github.com/bumbleworks/swarm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,9 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.5
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: A Ruby workflow engine
 test_files: []

data/lib/swarm/evaluation/workitem_context.rb

@@ -1,17 +0,0 @@
-module Swarm
-  class WorkitemContext
-    attr_reader :workitem
-
-    def initialize(workitem)
-      @workitem = Support.symbolize_keys(workitem)
-    end
-
-    def method_missing(method, *args)
-      if workitem.has_key?(method)
-        workitem.fetch(method, nil)
-      else
-        super
-      end
-    end
-  end
-end