asynchronic 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a48e57f1b93e2a2d84f3fba80708b40350c756db
-  data.tar.gz: 63e282e6e55c00d2ada87c934b6712f5f4de61c3
+  metadata.gz: a1dfc813a24c2580723d255461a9a6b91376d562
+  data.tar.gz: 793f9fd3f28c7fc712f98adeba227128b37644f9
 SHA512:
-  metadata.gz: 3fb56ecfca909f90d6ab86ac280bf6b93211cbda896d82ae66d7e6de0f563d7dc3d25696167cd72f514d83f49af6237906915ba2ee73b4ff27082d42ea3c95cd
-  data.tar.gz: 036fb94d1c004a38a85bf4ce78bca64b102044b057289fe77b76f21c2189f2f7849ef7e56dddb6848ac1de7f313d5a8dd9f7537798ca8f88faa5721ab209a270
+  metadata.gz: 1a003d3fefe9a1a4f79535a6dc0e1639306f347672d75b1aef6e625c59da4aaeca68a98d0d8d73f02646d62bcef6ec431836531d7292bdb25c0d1bd4854a4ff9
+  data.tar.gz: c2d6023bd1ea95d9b6147193bea9be6b36062c5bf774c08cd39e85029e4b5825067902553c14db0be6d05416e82b03ba4bea404376a62c64aad00fd0c0508caa

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+
 rvm:
   - 1.9.3
   - 2.0
@@ -6,8 +7,20 @@ rvm:
   - 2.2
   - 2.3.0
   - 2.4.0
-  - jruby
-services:
-  - redis-server
+  - 2.5.0
+  - jruby-1.7.25
+  - jruby-9.1.7.0
+  - ruby-head
+  - jruby-head
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
 before_install:
-  - gem install bundler
+  - gem install bundler
+
+services:
+  - redis-server

data/lib/asynchronic/job.rb

@@ -25,13 +25,15 @@ module Asynchronic
 
     private
 
+    attr_reader :process
+
     def async(type, params={})
-      @process.nest type, params
+      process.nest type, params
       nil
     end
 
     def set(key, value)
-      @process.set key, value
+      process.set key, value
     end
 
     def retry_when(exceptions, interval=1)

data/lib/asynchronic/process.rb

@@ -41,6 +41,12 @@ module Asynchronic
       completed? || aborted?
     end
 
+    def full_status
+      processes.each_with_object(name => status) do |process, hash|
+        hash.update(process.full_status)
+      end
+    end
+
     def params
       data_store.scoped(:params).no_lazy.readonly
     end
@@ -67,6 +73,10 @@ module Asynchronic
       Process.new environment, id.remove_last(2) if id.nested?
     end
 
+    def root
+      id.nested? ? Process.new(environment, id.sections.first) : self
+    end
+
     def real_error
       return nil unless error
 
@@ -107,7 +117,7 @@ module Asynchronic
     end
 
     def nest(type, params={})
-      self.class.create @environment, type, params.merge(id: id[:processes][processes.count])
+      self.class.create environment, type, params.merge(id: id[:processes][processes.count])
     end
 
     def set(key, value)
@@ -139,9 +149,7 @@ module Asynchronic
 
     private
 
-    def environment
-      @environment
-    end
+    attr_reader :environment
 
     def data_store
       @data_store ||= environment.data_store.scoped id
@@ -169,15 +177,19 @@ module Asynchronic
       end
     end
 
-    def abort!(exception)
-      self.error = Error.new exception
+    def abort!(exception=nil)
+      self.error = Error.new exception if exception
       aborted!
     end
 
     def run
-      running!
-      self.result = job.call
-      waiting!
+      if root.aborted?
+        abort!
+      else
+        running!
+        self.result = job.call
+        waiting!
+      end
     rescue Exception => ex
       message = "Failed process #{type} (#{id})\n#{ex.class} #{ex.message}\n#{ex.backtrace.join("\n")}"
       Asynchronic.logger.error('Asynchronic') { message }
@@ -189,7 +201,9 @@ module Asynchronic
     def wakeup_children
       if waiting?
         if processes.any?(&:aborted?)
-          abort! Error.new "Error caused by #{processes.select(&:aborted?).map{|p| p.name}.join(', ')}"
+          childs_with_errors = processes.select(&:error)
+          error = childs_with_errors.any? ? "Error caused by #{childs_with_errors.map(&:name).join(', ')}" : nil
+          abort! error
         elsif processes.all?(&:completed?)
           completed!
         else

data/lib/asynchronic/version.rb

@@ -1,3 +1,3 @@
 module Asynchronic
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/spec/jobs.rb

@@ -240,10 +240,10 @@ class DataJob < Asynchronic::Job
 end
 
 
-class NestedJobWithErrorInParent< Asynchronic::Job
+class NestedJobWithErrorInParentJob < Asynchronic::Job
   def call
     async Child_1
-    raise "Error in parent"
+    raise 'Error in parent'
     nil
   end
 
@@ -255,7 +255,7 @@ class NestedJobWithErrorInParent< Asynchronic::Job
 end
 
 
-class NestedJobWithErrorInChild < Asynchronic::Job
+class NestedJobWithErrorInChildJob < Asynchronic::Job
 
   def call
     async Child_1
@@ -300,7 +300,7 @@ class NestedJobWithErrorInChild < Asynchronic::Job
 
     class Child_2_2 < Asynchronic::Job
       def call
-        raise "Error in Child_2_2"
+        raise 'Error in Child_2_2'
       end
     end
 
@@ -323,4 +323,41 @@ class NestedJobWithErrorInChild < Asynchronic::Job
       end
     end
   end
+end
+
+
+class AbortQueuedAfertErrorJob < Asynchronic::Job
+  def call
+    async Child_1
+    async Child_2
+    async Child_3
+    async Child_4
+    nil
+  end
+
+  class Child_1 < Asynchronic::Job
+    def call
+      1.upto(2) do |i|
+        async Child_2, alias: "Child_1_#{i}"
+      end
+    end
+  end
+
+  class Child_2 < Asynchronic::Job
+    def call
+      nil
+    end
+  end
+
+  class Child_3 < Asynchronic::Job
+    def call
+      raise 'Forced error'
+    end
+  end
+
+  class Child_4 < Asynchronic::Job
+    def call
+      nil
+    end
+  end
 end

data/spec/process/life_cycle_examples.rb

@@ -462,28 +462,104 @@ module LifeCycleExamples
     process.data.must_equal text: 'Input was 1', value: 1
   end
 
-  it 'NestedJobWithErrorInChild' do
-    process = create NestedJobWithErrorInChild, queue: :test_queue
+  it 'Nested job with error in child' do
+    process = create NestedJobWithErrorInChildJob
 
     process.enqueue 
 
     Timeout.timeout(1) do
       until process.status == :aborted
-        execute queue_engine[:test_queue]
+        execute queue
       end
     end
 
     process.real_error.must_equal "Error in Child_2_2"
   end
 
-  it 'NestedJobWithErrorInParent' do
-    process = create NestedJobWithErrorInParent, queue: :test_queue
+  it 'Nested job with error in parent' do
+    process = create NestedJobWithErrorInParentJob
 
     process.enqueue 
 
-    execute queue_engine[:test_queue]
+    execute queue
  
     process.real_error.must_equal "Error in parent"
   end
 
+  it 'Abort queued afert error' do
+    process = create AbortQueuedAfertErrorJob
+
+    process.enqueue 
+
+    execute queue
+
+    process.full_status.must_equal AbortQueuedAfertErrorJob => :waiting,
+                                   AbortQueuedAfertErrorJob::Child_1 => :queued,
+                                   AbortQueuedAfertErrorJob::Child_2 => :queued,
+                                   AbortQueuedAfertErrorJob::Child_3 => :queued,
+                                   AbortQueuedAfertErrorJob::Child_4 => :queued
+
+    execute queue
+
+    process.full_status.must_equal AbortQueuedAfertErrorJob => :waiting,
+                                   AbortQueuedAfertErrorJob::Child_1 => :waiting,
+                                   'Child_1_1' => :queued,
+                                   'Child_1_2' => :queued,
+                                   AbortQueuedAfertErrorJob::Child_2 => :queued,
+                                   AbortQueuedAfertErrorJob::Child_3 => :queued,
+                                   AbortQueuedAfertErrorJob::Child_4 => :queued
+
+    execute queue
+
+    process.full_status.must_equal AbortQueuedAfertErrorJob => :waiting,
+                                   AbortQueuedAfertErrorJob::Child_1 => :waiting,
+                                   'Child_1_1' => :queued,
+                                   'Child_1_2' => :queued,
+                                   AbortQueuedAfertErrorJob::Child_2 => :completed,
+                                   AbortQueuedAfertErrorJob::Child_3 => :queued,
+                                   AbortQueuedAfertErrorJob::Child_4 => :queued
+
+    execute queue
+
+    process.full_status.must_equal AbortQueuedAfertErrorJob => :aborted,
+                                   AbortQueuedAfertErrorJob::Child_1 => :waiting,
+                                   'Child_1_1' => :queued,
+                                   'Child_1_2' => :queued,
+                                   AbortQueuedAfertErrorJob::Child_2 => :completed,
+                                   AbortQueuedAfertErrorJob::Child_3 => :aborted,
+                                   AbortQueuedAfertErrorJob::Child_4 => :queued
+
+    execute queue
+
+    process.full_status.must_equal AbortQueuedAfertErrorJob => :aborted,
+                                   AbortQueuedAfertErrorJob::Child_1 => :waiting,
+                                   'Child_1_1' => :queued,
+                                   'Child_1_2' => :queued,
+                                   AbortQueuedAfertErrorJob::Child_2 => :completed,
+                                   AbortQueuedAfertErrorJob::Child_3 => :aborted,
+                                   AbortQueuedAfertErrorJob::Child_4 => :aborted
+
+    execute queue
+
+    process.full_status.must_equal AbortQueuedAfertErrorJob => :aborted,
+                                   AbortQueuedAfertErrorJob::Child_1 => :aborted,
+                                   'Child_1_1' => :aborted,
+                                   'Child_1_2' => :queued,
+                                   AbortQueuedAfertErrorJob::Child_2 => :completed,
+                                   AbortQueuedAfertErrorJob::Child_3 => :aborted,
+                                   AbortQueuedAfertErrorJob::Child_4 => :aborted
+
+    execute queue
+
+    process.full_status.must_equal AbortQueuedAfertErrorJob => :aborted,
+                                   AbortQueuedAfertErrorJob::Child_1 => :aborted,
+                                   'Child_1_1' => :aborted,
+                                   'Child_1_2' => :aborted,
+                                   AbortQueuedAfertErrorJob::Child_2 => :completed,
+                                   AbortQueuedAfertErrorJob::Child_3 => :aborted,
+                                   AbortQueuedAfertErrorJob::Child_4 => :aborted
+
+    process.real_error.must_equal 'Forced error'
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asynchronic
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis