dirty_pipeline 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4eef96b779d46b3c749e665cf467f69577b8b1dc1bac3dd1e107be269619a3d
-  data.tar.gz: 0a42107025850c20d9d2f4bfbeb5fb4b3fd42610c9eae3aacc3ba80e3600ad6d
+  metadata.gz: 52d7e43f1786f53222062344f5ba1c21473d384981a7cf6ffddaa1980d707252
+  data.tar.gz: 7453aa7396775663b8f040fe507ec251dabefbc8e1d5ac2255eee919c65d2943
 SHA512:
-  metadata.gz: 9fcb6bcf6655ab497f97fcf0f72d54a46b4a12407d5d2567d6027442e2652d4c901f0ef1a5031de184c0714821c27f466511c0db803e072082bd0d121968cbf3
-  data.tar.gz: '085965b95df37be6654977fb820b3d8937abd2097bc01a340119a8e99170206ce3670ffdcc2698723af7a484403fe76359b9b0e55548d6d11f1e2573c2ade88b'
+  metadata.gz: ea9d73885acedf923e33f1ace3e3649142a2ca1615a402a78ff93b216a412b369668f14139fd688fa225eea26120d6fd1e668cf1cb18cd8c3fd76f79e974436f
+  data.tar.gz: ba2e70358c97d8e4fbd5af668f1db770b1d99cf292b7d8d42d661420bff553978d9961b676cdc1b1083a6ce70229c1c572cc1f3a10db9ec212287cc6f20a01b2

data/dirty_pipeline.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   # temporary dependency
   spec.add_runtime_dependency "sidekiq", "~> 5.0"
   spec.add_runtime_dependency "redis", "~> 4.0"
-  spec.add_runtime_dependency "nanoid", "~> 0.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/dirty_pipeline/base.rb

@@ -35,7 +35,7 @@ module DirtyPipeline
 
     attr_reader :subject, :storage, :status, :uuid, :queue, :railway
     def initialize(subject, uuid: nil)
-      @uuid = uuid || Nanoid.generate
+      @uuid = uuid || SecureRandom.uuid
       @subject = subject
       @storage = Storage.new(subject, self.class.pipeline_storage)
       @railway = Railway.new(subject, @uuid)
@@ -60,34 +60,29 @@ module DirtyPipeline
       reset!
     end
 
+    # FIXME operation :call - argument
     def chain(*args)
       railway[:call] << Event.create(*args, tx_id: @uuid)
       self
     end
 
     def call
-      return self if (serialized_event = railway.next).nil?
-      execute(load_event(serialized_event), tx_method: :call)
+      return self if (enqueued_event = railway.next).nil?
+      execute(load_event(enqueued_event))
     end
     alias :call_next :call
 
     def clean
+      finished = railway.queue.to_a.empty?
+      finished &&= railway.queue.processing_event.nil?
+      return self if finished
       railway.switch_to(:undo)
-      call_next
-      self
+      call
     end
 
     def retry
-      return unless (event = load_event(railway.queue.processing_event))
-      execute(event, tx_id: :retry)
-    end
-
-    def schedule_cleanup
-      schedule("cleanup", cleanup_delay)
-    end
-
-    def schedule_retry
-      schedule("retry", retry_delay)
+      return self if (enqueued_event = railway.queue.processing_event).nil?
+      execute(load_event(enqueued_event), attempt_retry: true)
     end
 
     def schedule(operation, delay = nil)
@@ -105,6 +100,12 @@ module DirtyPipeline
       end
     end
 
+    def cleanup_delay; self.class.cleanup_delay || DEFAULT_CLEANUP_DELAY; end
+    def schedule_cleanup; schedule("cleanup", cleanup_delay); end
+
+    def retry_delay; self.class.retry_delay || DEFAULT_RETRY_DELAY; end
+    def schedule_retry; schedule("retry",   retry_delay); end
+
     def when_success
       yield(status.data, self) if status.success?
       self
@@ -117,8 +118,11 @@ module DirtyPipeline
 
     private
 
-    def execute(event, tx_method:)
-      transaction(event).public_send(tx_method) do |destination, action, *args|
+
+    def execute(event, attempt_retry: false)
+      attempt_retry ? event.attempt_retry! : event.start!
+
+      Transaction.new(self, event).call do |destination, action, *args|
         state_changes = process_action(action, event, *args)
         next if status.failure?
         Success(event, state_changes, destination)
@@ -140,45 +144,28 @@ module DirtyPipeline
         nil
       end
     rescue => exception
-      @status = Status.failure(exception, tag: :exception)
+      Failure(event, exception, type: :exception)
       raise
     end
 
     def run_operation(action, event, *args)
-      return unless action.respond_to?(operation = railway.operation)
+      return unless action.respond_to?(operation = railway.active)
       action.public_send(operation, event, self, *args)
     end
 
     def interupt_on_error(event)
-      return unless (fail_cause = catch(:fail_operation) { yield; nil })
-      Failure(event, fail_cause)
+      return unless (fail_cause = catch(:fail_transition) { yield; nil })
+      Failure(event, fail_cause, type: :error)
     end
 
     def find_subject_args
       subject.id
     end
 
-    def retry_delay
-      self.class.retry_delay || DEFAULT_RETRY_DELAY
-    end
-
-    def cleanup_delay
-      self.class.cleanup_delay || DEFAULT_CLEANUP_DELAY
-    end
-
-    def transaction(event)
-      Transaction.new(self, event)
-    end
-
-    def Failure(event, cause)
+    def Failure(event, cause, type:)
       railway.switch_to(:undo)
-      if cause.eql?(:abort)
-        event.abort!
-        @status = Status.failure(subject, tag: :aborted)
-      else
-        event.failure!
-        @status = Status.failure(cause, tag: :error)
-      end
+      event.failure!
+      @status = Status.failure(cause, tag: type)
       throw :abort_transaction, true
     end
 

data/lib/dirty_pipeline/event.rb

@@ -12,7 +12,8 @@ module DirtyPipeline
     def self.create(transition, *args, tx_id:)
       new(
         data: {
-          "uuid" => Nanoid.generate,
+          # FIXME: SecureRandom
+          "uuid" => SecureRandom.uuid,
           "transaction_uuid" => tx_id,
           "transition" => transition,
           "args" => args,

data/lib/dirty_pipeline/storage.rb

@@ -65,6 +65,7 @@ module DirtyPipeline
       (store.keys & %w(status events errors state)).size.eql?(4)
     end
 
+    # FIXME: save! - configurable method
     def save!
       subject.send("#{field}=", store)
       subject.save!

data/lib/dirty_pipeline/transaction.rb

@@ -9,18 +9,6 @@ module DirtyPipeline
     end
 
     def call
-      event.start!
-      with_transaction { |*targs| yield(*targs) }
-    end
-
-    def retry
-      event.attempt_retry!
-      with_transaction { |*targs| yield(*targs) }
-    end
-
-    private
-
-    def with_transaction
       pipeline.schedule_cleanup
 
       destination, action, max_attempts_count =
@@ -29,6 +17,7 @@ module DirtyPipeline
 
       storage.commit!(event)
 
+      # FIXME: make configurable, now - hardcoded to AR API
       subject.transaction(requires_new: true) do
         with_abort_handling { yield(destination, action, *event.args) }
       end
@@ -43,6 +32,8 @@ module DirtyPipeline
       storage.commit!(event)
     end
 
+    private
+
     def with_abort_handling
       return unless catch(:abort_transaction) { yield; nil }
       event.abort! unless event.abort?

data/lib/dirty_pipeline/transition.rb

@@ -1,11 +1,7 @@
 module DirtyPipeline
   class Transition
-    def Abort()
-      throw :fail_operation, :abort
-    end
-
     def Error(error)
-      throw :fail_operation, error
+      throw :fail_transition, error
     end
 
     def Success(changes = nil)

data/lib/dirty_pipeline/version.rb

@@ -1,3 +1,3 @@
 module DirtyPipeline
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/dirty_pipeline/worker.rb

@@ -1,3 +1,4 @@
+# FIXME: Abstract worker (see ActiveJob)
 require 'sidekiq'
 module DirtyPipeline
   class Worker
@@ -17,7 +18,7 @@ module DirtyPipeline
 
       case operation
       when "cleanup"
-        pipeline.clean
+        return pipeline.clean
       when "retry"
         return pipeline.retry
       end

data/lib/dirty_pipeline.rb

@@ -1,5 +1,5 @@
 require "dirty_pipeline/version"
-require "nanoid"
+require "securerandom"
 
 module DirtyPipeline
   require_relative "dirty_pipeline/ext/camelcase.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dirty_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Sergey Dolganov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: nanoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement