resque-aps 0.9.11 → 0.9.12

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 0.9.12 (2010-08-31)
+
+* Bug fix
+
 ## 0.9.11 (2010-08-31)
 
 * Added version 2 of the push protocol

data/lib/resque_aps.rb

@@ -79,7 +79,7 @@ module Resque
       end
   
       def enqueue_aps_application(application_name, override = false)
-        count_apps = aps_applications_queued_count(application_name)
+        count_apps = aps_applications_queued_count(application_name).to_i
         count_not  = aps_notification_count_for_application(application_name)
         if override || count_apps <= 0 || (count_apps < aps_application_job_limit && (count_not > aps_queue_size_upper && count_not % (aps_queue_size_upper / 10) == 0))
           enqueue(Resque::Plugins::Aps::Application, application_name)
@@ -88,7 +88,7 @@ module Resque
       end
       
       def dequeue_aps_application(application_name)
-        redis.decr(aps_application_queued_key(application_name)) if aps_applications_queued_count(application_name) > 0
+        redis.decr(aps_application_queued_key(application_name)) if aps_applications_queued_count(application_name).to_i > 0
       end
       
       def enqueue_aps(application_name, notification)

data/lib/resque_aps/application.rb

@@ -33,18 +33,20 @@ module Resque
               app.before_aps_write n
               begin
                 n.batch_id = count + 1
-                n.expiry   = (Time.now.utc + 1.hour).to_i
+                n.expiry   = Time.now.utc.to_i + 3600
                 socket.write(n.formatted)
                 app.after_aps_write n
                 count += 1
-                unless (resp = socket.read).blank?
-                  logger.error "Failure response: #{resp.inspect}" if logger
-                  break
-                end
+                # resp = socket.read
+                # if resp && resp != ""
+                #   # logger.error "Failure response: #{resp.inspect}" if logger
+                #   logger.error "Failure response: #{resp.bytes.to_a.map{|i| i.to_s(16)}.join}" if logger
+                #   break
+                # end
               rescue
                 logger.error Application.application_exception($!, app_name) if logger
                 app.failed_aps_write n, $!
-                logger.error "Sent #{count} notifications before failure." if logger
+                logger.error "#{$!}: Sent #{count} notifications before failure." if logger
                 Resque.enqueue_aps(app_name, n)
                 break
               end

data/lib/resque_aps/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module Aps
-      Version = '0.9.11'
+      Version = '0.9.12'
     end
   end
 end

data/test/application_test.rb

@@ -19,10 +19,11 @@ context "Resque::Plugins::Aps::Application" do
   end
   
   test "can perform" do
-    n = Resque::Plugins::Aps::Notification.new('application_name' => 'TestApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
+    n = Resque::Plugins::Aps::Notification.new('application_name' => 'TestApp', 'device_token' => '3ECA0F9A3405B980A88A61A1556AF8B7F1DF5F7F109E1476A781E8220C4FE561', 'payload' => '{"aps": { "alert": "hello"}}')
     assert Resque.enqueue_aps('TestApp', n)
     Resque.create_aps_application('TestApp', File.dirname(__FILE__) + "/../test-dev.pem", nil)
     Resque::Plugins::Aps::Application.perform('TestApp')
+    assert_equal 0, Resque.aps_notification_count_for_application('TestApp')
   end
 
   context "ApplicationWithHooks" do
@@ -52,10 +53,19 @@ context "Resque::Plugins::Aps::Application" do
     end
     
     test "can perform with logging hooks" do
+      n = Resque::Plugins::Aps::Notification.new('application_name' => 'TestApp', 'device_token' => '3ECA0F9A3405B980A88A61A1556AF8B7F1DF5F7F109E1476A781E8220C4FE561', 'payload' => '{"aps": { "alert": "hello"}}')
+      assert Resque.enqueue_aps('TestApp', n)
+      Resque.create_aps_application('TestApp', File.dirname(__FILE__) + "/../test-dev.pem", nil)
+      Resque::Plugins::Aps::Application.perform('TestApp')
+      assert_equal 0, Resque.aps_notification_count_for_application('TestApp')
+    end
+
+    test "can perform with failure logging hooks" do
       n = Resque::Plugins::Aps::Notification.new('application_name' => 'TestApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
       assert Resque.enqueue_aps('TestApp', n)
       Resque.create_aps_application('TestApp', File.dirname(__FILE__) + "/../test-dev.pem", nil)
       Resque::Plugins::Aps::Application.perform('TestApp')
+      assert_equal 0, Resque.aps_notification_count_for_application('TestApp')
     end
   end
 end

data/test/resque-web_test.rb

@@ -29,7 +29,7 @@ context "on GET to /aps/some_ivar_application" do
   setup do
     Resque.redis.flushall
     Resque.create_aps_application(:some_ivar_application, nil, nil)
-    n = Resque::Plugins::Aps::Notification.new('application_name' => 'some_ivar_application', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
+    n = Resque::Plugins::Aps::Notification.new('application_name' => 'some_ivar_application', 'device_token' => '3ECA0F9A3405B980A88A61A1556AF8B7F1DF5F7F109E1476A781E8220C4FE561', 'payload' => '{"aps": { "alert": "hello"}}')
     assert Resque.enqueue_aps(:some_ivar_application, n)
     assert Resque.enqueue_aps(:some_ivar_application, n)
     assert Resque.enqueue_aps(:some_ivar_application, n)

data/test/test_helper.rb

@@ -8,6 +8,7 @@ require 'rubygems'
 require 'test/unit'
 require 'mocha'
 require 'resque'
+require 'ruby-debug'
 require File.join(dir, '../lib/resque_aps')
 $LOAD_PATH.unshift File.dirname(File.expand_path(__FILE__)) + '/../lib'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque-aps
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors: 
 - Ashley Martens