More idiomatic hook definition, tests no longer use globals, and are correctly cased

Author: ecoffey

lib/resque.rb

@@ -124,7 +124,8 @@ def after_fork(&block)
   # The `before_pause` hook will be run in the parent process before the
   # worker has paused processing (via #pause_processing or SIGUSR2).
   def before_pause(&block)
-    block ? (@before_pause = block) : @before_pause
+    @before_pause = block if block_given?
+    @before_pause
   end
 
   # Set the after_pause proc.
@@ -133,7 +134,8 @@ def before_pause(&block)
   # The `after_pause` hook will be run in the parent process after the
   # worker has paused (via SIGCONT).
   def after_pause(&block)
-    block ? (@after_pause = block) : @after_pause
+    @after_pause = block if block_given?
+    @after_pause
   end
 
   # Set the after_continue proc.

test/worker_test.rb

@@ -470,50 +470,50 @@ def self.perform
     assert_not_equal original_connection, Resque.redis.client.connection.instance_variable_get("@sock")
   end
 
-  it "Will call before_pause before it is paused" do
-    $BEFORE_PAUSE_CALLED = false
-    $CAPTURED_WORKER = nil
+  it "will call before_pause before it is paused" do
+    before_pause_called = false
+    captured_worker = nil
 
     Resque.before_pause do |worker|
-      $BEFORE_PAUSE_CALLED = true
-      $CAPTURED_WORKER = worker
+      before_pause_called = true
+      captured_worker = worker
     end
 
     @worker.pause_processing
 
-    assert !$BEFORE_PAUSE_CALLED
+    assert !before_pause_called
 
     t = Thread.start { sleep(0.1); Process.kill('CONT', @worker.pid) }
 
     @worker.work(0)
 
     t.join
 
-    assert $BEFORE_PAUSE_CALLED
-    assert_equal @worker, $CAPTURED_WORKER
+    assert before_pause_called
+    assert_equal @worker, captured_worker
   end
 
-  it "Will call after_pause after it is paused" do
-    $AFTER_PAUSED_CALLED = false
-    $CAPTURED_WORKER = nil
+  it "will call after_pause after it is paused" do
+    after_pause_called = false
+    captured_worker = nil
 
     Resque.after_pause do |worker|
-      $AFTER_PAUSED_CALLED = true
-      $CAPTURED_WORKER = worker
+      after_pause_called = true
+      captured_worker = worker
     end
 
     @worker.pause_processing
 
-    assert !$AFTER_PAUSED_CALLED
+    assert !after_pause_called
 
     t = Thread.start { sleep(0.1); Process.kill('CONT', @worker.pid) }
 
     @worker.work(0)
 
     t.join
 
-    assert $AFTER_PAUSED_CALLED
-    assert_equal @worker, $CAPTURED_WORKER
+    assert after_pause_called
+    assert_equal @worker, captured_worker
   end
 
   if !defined?(RUBY_ENGINE) || defined?(RUBY_ENGINE) && RUBY_ENGINE != "jruby"