stalker 0.7.0 → 0.8.0

data/README.md

@@ -72,7 +72,7 @@ Error Handling
 
 If you include an `error` block in your jobs definition, that block will be invoked when a worker encounters an error. You might use this to report errors to an external monitoring service:
 
-    error do |e|
+    error do |e, job, args|
       Exceptional.handle(e)
     end
 
@@ -110,7 +110,7 @@ Meta
 
 Created by Adam Wiggins
 
-Patches from Jamie Cobbett, Scott Water, Keith Rarick, Mark McGranaghan, Sean Walberg
+Patches from Jamie Cobbett, Scott Water, Keith Rarick, Mark McGranaghan, Sean Walberg, Adam Pohorecki
 
 Heavily inspired by [Minion](http://github.com/orionz/minion) by Orion Henry
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/lib/stalker.rb

@@ -96,7 +96,13 @@ module Stalker
 		log_error exception_message(e)
 		job.bury rescue nil
 		log_job_end(name, 'failed')
-		error_handler.call(e) if error_handler
+    if error_handler
+      if error_handler.arity == 1
+        error_handler.call(e)
+      else
+        error_handler.call(e, name, args)
+      end
+    end
 	end
 
 	def failed_connection(e)

data/test/stalker_test.rb

@@ -14,6 +14,14 @@ class StalkerTest < Test::Unit::TestCase
 		$handled = false
 	end
 
+	def with_an_error_handler
+		Stalker.error do |e, job_name, args|
+			$handled = e.class
+			$job_name = job_name
+			$job_args = args
+		end
+	end
+
 	test "enqueue and work a job" do
 		val = rand(999999)
 		Stalker.job('my.job') { |args| $result = args['val'] }
@@ -24,12 +32,24 @@ class StalkerTest < Test::Unit::TestCase
 	end
 
 	test "invoke error handler when defined" do
-		Stalker.error { |e| $handled = true }
-		Stalker.job('my.job') { fail }
-		Stalker.enqueue('my.job')
+		with_an_error_handler
+		Stalker.job('my.job') { |args| fail }
+		Stalker.enqueue('my.job', :foo => 123)
 		Stalker.prep
 		Stalker.work_one_job
-		assert_equal true, $handled
+		assert $handled
+		assert_equal 'my.job', $job_name
+		assert_equal({'foo' => 123}, $job_args)
+	end
+
+	test "should be compatible with legacy error handlers" do
+		exception = StandardError.new("Oh my, the job has failed!")
+		Stalker.error { |e| $handled = e }
+		Stalker.job('my.job') { |args| raise exception }
+		Stalker.enqueue('my.job', :foo => 123)
+		Stalker.prep
+		Stalker.work_one_job
+		assert_equal exception, $handled
 	end
 
 	test "continue working when error handler not defined" do
@@ -41,7 +61,7 @@ class StalkerTest < Test::Unit::TestCase
 	end
 
 	test "exception raised one second before beanstalk ttr reached" do
-		Stalker.error { |e| $handled = e.class }
+		with_an_error_handler
 		Stalker.job('my.job') { sleep(3); $handled = "didn't time out" }
 		Stalker.enqueue('my.job', {}, :ttr => 2)
 		Stalker.prep
@@ -77,13 +97,15 @@ class StalkerTest < Test::Unit::TestCase
 	end
 
 	test "before filter invokes error handler when defined" do
-		Stalker.error { |e| $handled = true }
+		with_an_error_handler
 		Stalker.before { |name| fail }
 		Stalker.job('my.job') {	}
-		Stalker.enqueue('my.job')
+		Stalker.enqueue('my.job', :foo => 123)
 		Stalker.prep
 		Stalker.work_one_job
-		assert_equal true, $handled
+		assert $handled
+		assert_equal 'my.job', $job_name
+		assert_equal({'foo' => 123}, $job_args)
 	end
 
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: stalker
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 0
-  version: 0.7.0
+  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 -08:00
+date: 2011-03-11 00:00:00 -08:00
 default_executable: stalk
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -74,21 +66,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: stalker
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A job queueing and background workers system using Beanstalkd.