rabbit_jobs 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d36769d8fc6a0ac19a16b99fad47c5e57689b9d
-  data.tar.gz: 1af3fde5136cf8bcf2d15eac7232c1be8c94ba14
+  metadata.gz: 459302e4464a2603075ca57898645a2442574ab9
+  data.tar.gz: cd812ebe548dbe8ef8ff8f84f4be51e708cb47a8
 SHA512:
-  metadata.gz: 172d4010683cb8cb8ba0546c6446a76365485d093de6d022fa01e2a65d9bf54e88dffdf86df91574d08123fa9bd531dcf0eddca5db9503932e262df541253440
-  data.tar.gz: 7252412a56b66d6788b011794776fcdad917eb54c38874ca498c1174c13f7531d5decfbeda63926172a06bf2cdf6feebb1434151bf07d105dc631c1a081f8d17
+  metadata.gz: 606585f72d012f07a5fa8c3251fbbbc7e94016ae06be1654b6cd52dedd26e56ca8fdeec85341ad1d15da9b1e3c470a46926e7ecd46cb117fc91a7a8ea3c8eb52
+  data.tar.gz: efe1979f043b93b048e2aa7f89274c639d9161290f2b189118672be20025ef3331e5fda471e418e67de28e211899c43ede639621c5c6c1c5352b71da211d4ce6

data/lib/rabbit_jobs/job.rb

@@ -50,9 +50,9 @@ module RabbitJobs
     end
 
     def run_on_error_hooks(error, *params)
-      return unless @@rj_on_error_hooks.try(:present?)
+      return unless self.class.on_error_hooks.try(:present?)
 
-      @@rj_on_error_hooks.each do |proc_or_symbol|
+      self.class.on_error_hooks.each do |proc_or_symbol|
         proc = if proc_or_symbol.is_a?(Symbol)
                  method(proc_or_symbol)
                else
@@ -109,13 +109,15 @@ module RabbitJobs
           @expires_in
         end
 
+        attr_reader :on_error_hooks
+
         def on_error(*hooks)
-          @rj_on_error_hooks ||= []
+          @on_error_hooks ||= []
           hooks.each do |proc_or_symbol|
             unless proc_or_symbol.is_a?(Proc) || proc_or_symbol.is_a?(Symbol)
               fail ArgumentError.new, 'Pass proc or symbol to on_error hook'
             end
-            @rj_on_error_hooks << proc_or_symbol
+            @on_error_hooks << proc_or_symbol
           end
         end
 

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = '0.12.1'
+  VERSION = '0.12.2'
 end

data/spec/fixtures/jobs.rb

@@ -43,14 +43,18 @@ end
 
 class JobWithErrorHook
   include RJ::Job
-  on_error :first_hook, lambda { puts "second hook" }, :last_hook
+  on_error :first_hook, -> { puts 'second hook' }, :last_hook
 
   def first_hook(error)
-    puts 'first hook'
+    puts "first hook, error: #{error}"
   end
 
   def last_hook(error)
-    puts 'last hook'
+    puts "last hook, error: #{error}"
+  end
+
+  def some_other_method
+    puts 'some_other_method'
   end
 
   def perform

data/spec/unit/job_spec.rb

@@ -29,5 +29,18 @@ describe RabbitJobs::Job do
       job.created_at = (Time.now).to_i
       job.expired?.should == false
     end
+
+    context :run_perform do
+      it 'runs on_error hooks when error occured in #perform' do
+        job = JobWithErrorHook.new
+        mock(job).first_hook.with_any_args
+        mock(job).last_hook.with_any_args
+        mock(RabbitJobs.logger).error.with_any_args
+        dont_allow(job).some_other_method
+        job.send :run_perform
+      end
+
+      it 'measures and logs execution time'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Pavel Lazureykis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny