sentia_apn_sender 1.0.4 → 1.0.6

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.6

data/lib/apn.rb

@@ -1,4 +1,5 @@
 require 'resque'
+require 'apn/before_unregister_worker_support'
 require 'resque/plugins/access_worker_from_job'
 require 'resque/hooks/before_unregister_worker'
 require 'json'
@@ -10,4 +11,4 @@ require 'apn/notification'
 require 'apn/notification_job'
 require 'apn/connection/base'
 require 'apn/sender'
-require 'apn/feedback'
+require 'apn/feedback'

data/lib/apn/before_unregister_worker_support.rb

@@ -0,0 +1,14 @@
+module APN
+  module BeforeUnregisterSupport
+    def before_unregister_worker(&block)
+      block ? (@before_unregister_worker = block) : @before_unregister_worker
+    end
+
+    def before_unregister_worker=(before_unregister_worker)
+      @before_unregister_worker = before_unregister_worker
+    end
+  end
+end
+
+# Add this module to the base Resque class
+Resque.send(:extend, APN::BeforeUnregisterSupport)

data/lib/apn/queue_manager.rb

@@ -13,14 +13,7 @@ module APN
   # functionality in the parent app, if we're included in e.g. a Rails application.
   class QueueManager
     extend Resque
-
-    def self.before_unregister_worker(&block)
-      block ? (@before_unregister_worker = block) : @before_unregister_worker
-    end
-
-    def self.before_unregister_worker=(before_unregister_worker)
-      @before_unregister_worker = before_unregister_worker
-    end
+    extend BeforeUnregisterSupport
 
     def self.to_s
       "APN::QueueManager (Resque Client) connected to #{redis.server}"
@@ -43,7 +36,6 @@ APN::QueueManager.before_unregister_worker do |worker|
   worker.send(:teardown_connection) if worker.respond_to?(:teardown_connection)
 end
 
-
 # # Run N jobs per fork, rather than creating a new fork for each notification
 # # By defunkt - http://gist.github.com/349376
 # APN::QueueManager.after_fork do |job|

data/lib/resque/hooks/before_unregister_worker.rb

@@ -11,20 +11,5 @@ module Resque
       run_hook(:before_unregister_worker, self) 
       unregister_worker_without_before_hook
     end
-    
-    
-    # Unforunately have to override Resque::Worker's +run_hook+ method to call hook on 
-    # APN::QueueManager rather on Resque directly. Any suggestions on
-    # how to make this more flexible are more than welcome.
-    def run_hook(name, *args)
-      # return unless hook = Resque.send(name)
-      return unless hook = APN::QueueManager.send(name)
-      msg = "Running #{name} hook"
-      msg << " with #{args.inspect}" if args.any?
-      log msg
-
-      args.any? ? hook.call(*args) : hook.call
-    end
-    
   end
-end
+end

data/sentia_apn_sender.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sentia_apn_sender"
-  s.version = "1.0.4"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kali Donovan", "Mario Visic"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "init.rb",
     "lib/apn.rb",
     "lib/apn/connection/base.rb",
+    "lib/apn/before_unregister_worker_support.rb",
     "lib/apn/feedback.rb",
     "lib/apn/notification.rb",
     "lib/apn/notification_job.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sentia_apn_sender
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70289459606940 !ruby/object:Gem::Requirement
+  requirement: &70294224336180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70289459606940
+  version_requirements: *70294224336180
 - !ruby/object:Gem::Dependency
   name: resque-access_worker_from_job
-  requirement: &70289459606420 !ruby/object:Gem::Requirement
+  requirement: &70294224335600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70289459606420
+  version_requirements: *70294224335600
 description: Resque-based background worker to send Apple Push Notifications over
   a persistent TCP socket. Includes Resque tweaks to allow persistent sockets between
   jobs, helper methods for enqueueing APN notifications, and a background daemon to
@@ -56,6 +56,7 @@ files:
 - init.rb
 - lib/apn.rb
 - lib/apn/connection/base.rb
+- lib/apn/before_unregister_worker_support.rb
 - lib/apn/feedback.rb
 - lib/apn/notification.rb
 - lib/apn/notification_job.rb