resque-job-tracking 0.0.1 → 0.0.2

data/lib/resque/plugins/job_tracking.rb

@@ -29,50 +29,66 @@ module Resque
       end
 
       def before_enqueue_job_tracking(meta_id, *jobargs)
-        if self.respond_to?(:track)
-          identifiers = track(*jobargs)
-          identifiers.each do |ident|
-            Resque.redis.sadd("#{ident}:pending", meta_id)
-          end
+        if meta_id &&
+           self.respond_to?(:track) &&
+           meta = get_meta(meta_id)
+        then
+          enqueue_with_job_tracking(meta, meta_id, *jobargs)
+        end
+      end
+
+      def around_perform_job_tracking(meta_id, *jobargs, &block)
+        if meta_id &&
+          self.respond_to?(:track) &&
           meta = get_meta(meta_id)
-          meta["job_args"] = jobargs
-          meta.save
+        then
+          perform_with_job_tracking(meta, meta_id, *jobargs, &block)
+        else
+          yield
         end
       end
 
-      def around_perform_job_tracking(meta_id, *jobargs)
-        if self.respond_to?(:track)
-          identifiers = track(*jobargs)
+    private
+
+      def enqueue_with_job_tracking(meta, meta_id, *jobargs)
+        identifiers = track(*jobargs)
+        identifiers.each do |ident|
+          Resque.redis.sadd("#{ident}:pending", meta_id)
+        end
+        meta["job_args"] = jobargs
+        meta.save
+      end
+
+      def perform_with_job_tracking(meta, meta_id, *jobargs, &block)
+        identifiers = track(*jobargs)
+        identifiers.each do |ident|
+          Resque.redis.srem("#{ident}:pending", meta_id)
+          Resque.redis.sadd("#{ident}:running", meta_id)
+        end
+        begin
+          to_return = yield
+          meta = get_meta(meta_id)
+          meta.expire_in = expire_normal_meta_in
+          meta.save
+          to_return
+        rescue => e
           identifiers.each do |ident|
-            Resque.redis.srem("#{ident}:pending", meta_id)
-            Resque.redis.sadd("#{ident}:running", meta_id)
+            Resque.redis.sadd("#{ident}:failed", meta_id)
           end
-          begin
-            to_return = yield
-            meta = get_meta(meta_id)
-            meta.expire_in = expire_normal_meta_in
-            meta.save
-            to_return
-          rescue => e
-            identifiers.each do |ident|
-              Resque.redis.sadd("#{ident}:failed", meta_id)
-            end
-            meta = get_meta(meta_id)
-            meta.expire_in = expire_failures_meta_in
-            meta['exception_message'] = e.message
-            meta['exception_backtrace'] = e.backtrace
-            meta.save
-            raise e
-          ensure
-            identifiers.each do |ident|
-              Resque.redis.srem("#{ident}:running", meta_id)
-            end
+          meta = get_meta(meta_id)
+          meta.expire_in = expire_failures_meta_in
+          meta['exception_message'] = e.message
+          meta['exception_backtrace'] = e.backtrace
+          meta.save
+          raise e
+        ensure
+          identifiers.each do |ident|
+            Resque.redis.srem("#{ident}:running", meta_id)
           end
-        else
-          yield
         end
       end
 
+
     end
   end
 end

data/lib/resque/plugins/job_tracking/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module JobTracking
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

metadata

@@ -1,78 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: resque-job-tracking
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Jacob Burkhart
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: resque
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70216190504860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 1
-        - 8
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: resque-meta
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70216190504860
+- !ruby/object:Gem::Dependency
+  name: resque-meta
+  requirement: &70216190483140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70216190483140
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70216190484760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: A resque plugin for tracking jobs and their state (pending, running, failed) based on some originating entity
-email: 
+  prerelease: false
+  version_requirements: *70216190484760
+description: A resque plugin for tracking jobs and their state (pending, running,
+  failed) based on some originating entity
+email:
 - jacob@engineyard.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -86,40 +65,32 @@ files:
 - spec/spec_helper.rb
 - spec/support/worker_support.rb
 - spec/tracking_spec.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A resque plugin for tracking jobs and their state (pending, running, failed) based on some originating entity
-test_files: 
+summary: A resque plugin for tracking jobs and their state (pending, running, failed)
+  based on some originating entity
+test_files:
 - spec/basic_spec.rb
 - spec/spec_helper.rb
 - spec/support/worker_support.rb