dirty_pipeline 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c67b4adb4c6e578a8add63619a5836d1d9d820c1b4c07fd53f2dd1877f1851d0
-  data.tar.gz: 94d3c03c15d6e74079f3e64b985392f88b1c07247c394de1bf58e2feb1b94693
+  metadata.gz: 6b8f5e951d183bae44a012daeccb345d84b0ccc0dd26edeb1006cfe67cca27ba
+  data.tar.gz: 2b166ca245ea06ede75099e5c511749e9b9af04414446948e81db9ad5ce2b485
 SHA512:
-  metadata.gz: 52c62a8e38f6ab759bf7368b0f32e86008894b48e4cc4a4fd93643d84848c436fb8b2aa93d200faa29e98431bc8136805b45fa76ba4d76e72cd262450a5f16da
-  data.tar.gz: 0e83e12bdfb27820726ebd789b0d6226df9cdce1256d3a9cd5e4137656ef83ec8ccbaaf8cb6ccc12d4727c588bc5b8676760b3712df8bb601505301d92ba77e1
+  metadata.gz: 0ca3237ae6a6f282040216add989af7a84201d9d1a09be280d177c83de6ff752d55e7d5b3394c1f1e887677ec3e6280feff90f450df5ae18a550873f49bd80b9
+  data.tar.gz: 0c45a1200ffa8074fda41c1cf7839444d2f72d74a3bf1d4959f8f2a599ffac6aff0eed0a00f973799e4a99f4ef7e4f0fc983301bd39eba0306386592f651aace

data/lib/dirty_pipeline/base.rb

@@ -76,105 +76,53 @@ module DirtyPipeline
       storage.reset_pipeline_status!
     end
 
-    attr_reader :subject, :error, :storage
+    def clear!
+      storage.clear!
+    end
+
+    def cache
+      storage.store["cache"]
+    end
+
+    attr_reader :subject, :error, :storage, :status
     def initialize(subject)
       @subject = subject
       @storage = Storage.new(subject, self.class.pipeline_storage)
       @locker = Locker.new(@subject, @storage)
+      @status = Status.new(self)
     end
 
     def call(*args)
-      return self if succeeded == false
-      self.succeeded = nil
-      after_commit = nil
-
-      # transaction with support of external calls
-      transaction(*args) do |destination, action, *transition_args|
-        output = {}
-        fail_cause = nil
-
-        output, *after_commit = catch(:success) do
-          fail_cause = catch(:fail_with_error) do
-            return Abort() if catch(:abort) do
-              throw :success, action.(subject, *transition_args)
+      Result() do
+        after_commit = nil
+        # transaction with support of external calls
+        transaction(*args) do |destination, action, *targs|
+          output = {}
+          fail_cause = nil
+
+          output, *after_commit = catch(:success) do
+            fail_cause = catch(:fail_with_error) do
+              Abort() if catch(:abort) do
+                throw :success, action.(self, *targs)
+              end
             end
+            nil
           end
-          nil
-        end
 
-        if fail_cause
-          ExpectedError(fail_cause)
-        else
-          Success(destination, output)
+          if fail_cause
+            ExpectedError(fail_cause)
+          else
+            Success(destination, output)
+          end
         end
-      end
 
-      Array(after_commit).each { |cb| cb.call(subject) } if after_commit
-      self
-    end
-
-    def clear!
-      storage.clear!
-    end
-
-    def success?
-      succeeded
-    end
-
-    def when_success(callback = nil)
-      return self unless success?
-      if block_given?
-        yield(self)
-      else
-        callback.call(self)
-      end
-      self
-    end
-
-    def when_failed(callback = nil)
-      return self unless storage.failed?
-      if block_given?
-        yield(self)
-      else
-        callback.call(self)
-      end
-      self
-    end
-
-    def errored?
-      return if succeeded.nil?
-      ready? && !succeeded
-    end
-
-    def when_error(callback = nil)
-      return self unless errored?
-      if block_given?
-        yield(self)
-      else
-        callback.call(self)
+        Array(after_commit).each { |cb| cb.call(subject) } if after_commit
       end
-      self
-    end
-
-    def ready?
-      storage.pipeline_status.nil?
-    end
-
-    def when_processing(callback = nil)
-      return self unless storage.processing?
-      if block_given?
-        yield(self)
-      else
-        callback.call(self)
-      end
-      self
     end
 
     private
 
-    attr_writer :error
     attr_reader :locker
-    attr_accessor :succeeded, :previous_status
 
     def find_subject_args
       subject.id
@@ -188,6 +136,10 @@ module DirtyPipeline
       self.class.cleanup_delay || DEFAULT_CLEANUP_DELAY
     end
 
+    def Result()
+      status.wrap { yield }
+    end
+
     def Retry(error, *args)
       storage.save_retry!(error)
       Shipping::PipelineWorker.perform_in(
@@ -199,25 +151,26 @@ module DirtyPipeline
     end
 
     def ExpectedError(cause)
-      self.error = cause
+      status.error = cause
       storage.fail_event!
-      self.succeeded = false
+      status.succeeded = false
     end
 
-    def Error(error)
+    def Exception(error)
       storage.save_exception!(error)
-      self.error = error
-      self.succeeded = false
+      status.error = error
+      status.succeeded = false
     end
 
     def Abort()
-      self.succeeded = false
+      status.succeeded = false
       throw :abort_transaction, true
     end
 
     def Success(destination, output)
+      cache.clear
       storage.complete!(output, destination)
-      self.succeeded = true
+      status.succeeded = true
     end
 
     def try_again?(max_attempts_count)
@@ -252,6 +205,7 @@ module DirtyPipeline
           destination, action, max_attempts_count =
             find_transition(transition).values_at(:to, :action, :attempts)
 
+          status.action_pool.unshift(action)
           subject.transaction(requires_new: true) do
             raise ActiveRecord::Rollback if catch(:abort_transaction) do
               yield(destination, action, *transition_args); nil
@@ -261,10 +215,16 @@ module DirtyPipeline
           if try_again?(max_attempts_count)
             Retry(error)
           else
-            # FIXME: Somehow :error is a Hash, all the time
-            Error(error)
+            Exception(error)
           end
           raise
+        ensure
+          if status.succeeded == false
+            status.action_pool.each do |reversable_action|
+              next unless reversable_action.respond_to?(:undo)
+              reversable_action.undo(self, *transition_args)
+            end
+          end
         end
       end
     end

data/lib/dirty_pipeline/locker.rb

@@ -56,9 +56,6 @@ module DirtyPipeline
         @transition_args = locker.storage.last_event["input"]
       end
 
-      # RETRY MODE
-      # if state is not RETRY_STATE - finish
-      # if state is RETRY_STATE - start
       def skip_any_action?
         storage.status != Storage::RETRY_STATUS
       end

data/lib/dirty_pipeline/status.rb

@@ -0,0 +1,71 @@
+module DirtyPipeline
+  class Status < SimpleDelegator
+    attr_accessor :error, :succeeded, :action_pool
+    attr_reader :storage, :pipeline
+    def initialize(*)
+      super
+      @storage = __getobj__.storage
+      @action_pool = []
+    end
+
+    def wrap
+      return self if succeeded == false
+      self.succeeded = nil
+      yield
+      self
+    end
+
+    def success?
+      succeeded
+    end
+
+    def when_success(callback = nil)
+      return self unless success?
+      if block_given?
+        yield(self)
+      else
+        callback.call(self)
+      end
+      self
+    end
+
+    def when_failed(callback = nil)
+      return self unless storage.failed?
+      if block_given?
+        yield(self)
+      else
+        callback.call(self)
+      end
+      self
+    end
+
+    def errored?
+      return if succeeded.nil?
+      ready? && !succeeded
+    end
+
+    def when_error(callback = nil)
+      return self unless errored?
+      if block_given?
+        yield(self)
+      else
+        callback.call(self)
+      end
+      self
+    end
+
+    def ready?
+      storage.pipeline_status.nil?
+    end
+
+    def when_processing(callback = nil)
+      return self unless storage.processing?
+      if block_given?
+        yield(self)
+      else
+        callback.call(self)
+      end
+      self
+    end
+  end
+end

data/lib/dirty_pipeline/storage.rb

@@ -17,7 +17,7 @@ module DirtyPipeline
     def init_store(store_field)
       self.store = subject.send(store_field).to_h
       clear! if store.empty?
-      return if (store.keys & %w(status events errors state)).size == 4
+      return if (store.keys & %w(cache status events errors state)).size == 5
       raise InvalidPipelineStorage, store
     end
 
@@ -27,6 +27,7 @@ module DirtyPipeline
         "status" => nil,
         "pipeline_status" => nil,
         "state" => {},
+        "cache" => {},
         "events" => [],
         "errors" => [],
       )
@@ -99,6 +100,7 @@ module DirtyPipeline
 
     def commit_pipeline_status!(value = nil)
       self.pipeline_status = value
+      store["cache"].clear
       commit!
     end
     alias :reset_pipeline_status! :commit_pipeline_status!

data/lib/dirty_pipeline/transition.rb

@@ -15,11 +15,25 @@ module DirtyPipeline
       throw :success, result
     end
 
+    def self.undo(*args, **kwargs)
+      pipeline = args.shift
+      instance = new(pipeline, *args, **kwargs)
+      return unless instance.respond_to?(:undo)
+      instance.undo(pipeline.subject)
+    end
+
     def self.call(*args, **kwargs)
-      subject = args.shift
-      instance = new(*args, **kwargs)
-      instance.compensate(subject) if instance.respond_to?(:compensate)
-      instance.call(subject)
+      pipeline = args.shift
+      new(pipeline, *args, **kwargs).call(pipeline.subject)
+    end
+
+    attr_reader :pipeline
+    def initialize(pipeline, *, **)
+      @pipeline = pipeline
+    end
+
+    def fetch(key)
+      pipeline.cache.fetch(key) { pipeline.cache[key] = yield }
     end
   end
 end

data/lib/dirty_pipeline/version.rb

@@ -1,3 +1,3 @@
 module DirtyPipeline
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/dirty_pipeline.rb

@@ -4,6 +4,7 @@ module DirtyPipeline
   require_relative "dirty_pipeline/locker.rb"
   require_relative "dirty_pipeline/storage.rb"
   require_relative "dirty_pipeline/transition.rb"
+  require_relative "dirty_pipeline/status.rb"
   require_relative "dirty_pipeline/base.rb"
 
   # This method should yield raw Redis connection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dirty_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sergey Dolganov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - lib/dirty_pipeline.rb
 - lib/dirty_pipeline/base.rb
 - lib/dirty_pipeline/locker.rb
+- lib/dirty_pipeline/status.rb
 - lib/dirty_pipeline/storage.rb
 - lib/dirty_pipeline/transition.rb
 - lib/dirty_pipeline/version.rb