resque-aps 0.9.3 → 0.9.4

data/HISTORY.md

@@ -1,5 +1,12 @@
 ## 0.9.3 (2010-07-08)
 
+* Use redis.[rpush,lpop,lrange] commands rather than Resque.[push,pop,peek] so that Resque queues are not created for the notifications.
+* Add a rescue around create_sockets to transform the exception into an application exception before raising it.
+* Fix the aps_application.erb table and link to the notifications.
+* Fix the application test.
+
+## 0.9.3 (2010-07-08)
+
 * Remove the aps_application class attribute. It's Ruby monkey patch the Application class.
 
 ## 0.9.2 (2010-07-07)

data/lib/resque_aps/application.rb

@@ -94,11 +94,15 @@ module ResqueAps
       logger.debug("resque-aps: ssl_socket(#{name})") if logger
       exc = nil
 
-      socket, ssl_socket = Application.create_sockets(cert || File.read(cert_file),
-                                                      certp || cert_passwd,
-                                                      host || Resque.aps_gateway_host,
-                                                      port || Resque.aps_gateway_port)
-
+      begin
+        socket, ssl_socket = Application.create_sockets(cert || File.read(cert_file),
+                                                        certp || cert_passwd,
+                                                        host || Resque.aps_gateway_host,
+                                                        port || Resque.aps_gateway_port)
+      rescue
+        raise Application.application_exception($!, name)
+      end
+      
       begin
         ssl_socket.connect
         yield ssl_socket, self if block_given?

data/lib/resque_aps/server/views/aps_applications.erb

@@ -10,13 +10,12 @@
 
 <table>
   <tr>
-    <th></th>
     <th>Application</th>
-    <th>Notification count</th>
+    <th>Notification Count</th>
   </tr>
   <% resque.aps_application_names(start, start+20).each do |application_name| %>
     <tr>
-      <td><a href="<%= url "aps_applicatons/#{application_name}" %>"><%= application_name %></a></td>
+      <td><a href="<%= url "aps/#{application_name}" %>"><%= application_name %></a></td>
       <td><%= resque.aps_notification_count_for_application(application_name) %></td>
     </tr>
   <% end %>

data/lib/resque_aps/version.rb

@@ -1,3 +1,3 @@
 module ResqueAps
-  Version = '0.9.3'
+  Version = '0.9.4'
 end

data/lib/resque_aps.rb

@@ -7,6 +7,7 @@ require 'resque_aps/version'
 require 'resque_aps/server'
 require 'resque_aps/application'
 require 'resque_aps/notification'
+require 'resque_aps/unknown_attribute_error'
 
 module ResqueAps
 
@@ -72,27 +73,27 @@ module ResqueAps
   
   def enqueue_aps(application_name, notification)
     count = aps_notification_count_for_application(application_name)
-    push(aps_application_queue_key(application_name), notification.to_hash)
+    redis.rpush(aps_application_queue_key(application_name), encode(notification.to_hash))
     enqueue(ResqueAps::Application, application_name) if count <= aps_queue_size_lower || count >= aps_queue_size_upper
     true
   end
 
   def dequeue_aps(application_name)
-    h = pop(aps_application_queue_key(application_name))
+    h = decode(redis.lpop(aps_application_queue_key(application_name)))
     return ResqueAps::Notification.new(h) if h
     nil
   end
   
   # Returns the number of queued notifications for a given application
   def aps_notification_count_for_application(application_name)
-    size(aps_application_queue_key(application_name))
+    redis.llen(aps_application_queue_key(application_name)).to_i
   end
 
   # Returns an array of queued notifications for the given application
   def aps_notifications_for_application(application_name, start = 0, count = 1)
-    r = peek(aps_application_queue_key(application_name), start, count)
+    r = redis.lrange(aps_application_queue_key(application_name), start, count)
     if r 
-      r.map { |h| ResqueAps::Notification.new(h) }
+      r.map { |h| ResqueAps::Notification.new(decode(h)) }
     else
       []
     end

data/test/application_test.rb

@@ -26,33 +26,34 @@ context "ResqueAps::Application" do
   end
 
   context "ApplicationWithHooks" do
-    class ApplicationWithHooks < ResqueAps::Application
-      def before_aps_write(notification)
-        logger.debug "before_aps_write #{notification.inspect}"
-      end
-
-      def after_aps_write(notification)
-        logger.debug "after_aps_write #{notification.inspect}"
-      end
-
-      def failed_aps_write(notification, exception)
-        logger.debug "failed_aps_write #{notification.inspect}"
-      end
-
-      def notify_aps_admin(exception)
-        logger.debug "notify_aps_admin #{exception}"
-      end
-
-      def aps_nil_notification_retry?(sent_count, start_time)
-        logger.debug "aps_nil_notification_retry #{sent_count}"
-        false
+    module ResqueAps
+      class Application
+        def before_aps_write(notification)
+          logger.debug "before_aps_write #{notification.inspect}"
+        end
+
+        def after_aps_write(notification)
+          logger.debug "after_aps_write #{notification.inspect}"
+        end
+
+        def failed_aps_write(notification, exception)
+          logger.debug "failed_aps_write #{notification.inspect}"
+        end
+
+        def notify_aps_admin(exception)
+          logger.debug "notify_aps_admin #{exception}"
+        end
+
+        def aps_nil_notification_retry?(sent_count, start_time)
+          logger.debug "aps_nil_notification_retry #{sent_count}"
+          false
+        end
       end
     end
     
     test "can perform with logging hooks" do
       n = ResqueAps::Notification.new('application_name' => 'TestApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
       assert Resque.enqueue_aps('TestApp', n)
-      Resque.aps_application_class = ApplicationWithHooks
       Resque.create_aps_application('TestApp', File.dirname(__FILE__) + "/../test-dev.pem", nil)
       ResqueAps::Application.perform('TestApp')
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Ashley Martens