resque-aps 0.9.4 → 0.9.5

data/HISTORY.md

@@ -1,4 +1,8 @@
-## 0.9.3 (2010-07-08)
+## 0.9.5 (2010-07-08)
+
+* Added Feedback class 
+
+## 0.9.4 (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.

data/lib/resque_aps/application.rb

@@ -128,12 +128,15 @@ module ResqueAps
     end
 
     def before_aps_write(notification)
+      logger.debug("ResqueAps[before_write]: #{notification}") if logger
     end
 
     def after_aps_write(notification)
+      logger.debug("ResqueAps[after_write]: #{notification}") if logger
     end
 
     def failed_aps_write(notification, exception)
+      logger.error("ResqueAps[write_failed]: #{exception} (#{notification}): #{exception.backtrace.join("\n")}") if logger
     end
 
     def notify_aps_admin(exception)
@@ -143,5 +146,21 @@ module ResqueAps
       false
     end
 
+    def before_aps_read
+      logger.debug("ResqueAps[before_read]:") if logger
+    end
+    
+    def after_aps_read(feedback)
+      logger.debug("ResqueAps[after_read]: #{feedback.to_s}") if logger
+    end
+    
+    def aps_read_error(exception)
+      logger.error("ResqueAps[read_error]: #{exception} (#{application_name}): #{exception.backtrace.join("\n")}") if logger
+    end
+
+    def aps_read_failed
+      logger.error("ResqueAps[read_failed]: Bad data on the socket (#{application_name})") if logger
+    end
+    
   end
 end

data/lib/resque_aps/feedback.rb

@@ -0,0 +1,88 @@
+require 'timeout'
+
+module ResqueAps
+  class Feedback
+    include ResqueAps::Helper
+    extend ResqueAps::Helper
+
+    @queue = "apple_push_service"
+    
+    attr_accessor :application_name, :device_token, :received_at
+
+    def initialize(attributes)
+      attributes.each do |k, v|
+        respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(ResqueAps::UnknownAttributeError, "unknown attribute: #{k}")
+      end
+    end
+        
+    def inspect
+      "#<#{self.class.name} #{application_name.inspect}, #{device_token.inspect}, #{received_at.inspect}>"
+    end
+    
+    def to_s
+      "#{application_name} #{received_at} #{device_token}"
+    end
+
+    def to_hash
+      {:application_name => application_name, :device_token => device_token, :received_at => received_at}
+    end
+
+    def self.read_feedback(ssl_socket, application_name, product_id)
+        data_str = ssl_socket.read(4)
+        return nil unless data_str
+        data_ary = data_str.unpack('N')
+        return nil unless data_ary && data_ary[0]
+        time     = Time.at(data_ary[0])
+
+        data_str = ssl_socket.read(2)
+        return nil unless data_str
+        data_ary = data_str.unpack('n')
+        return nil unless data_ary && data_ary[0]
+        tl       = data_ary[0]
+
+        data_str = ssl_socket.read(tl)
+        return nil unless data_str
+        data_ary = data_str.unpack('H*')
+        return nil unless data_ary && data_ary[0]
+        token    = data_ary[0]
+
+        feedback = Feedback.new({:received_at => time, :device_token => token, :application_name => application_name})
+        return feedback
+    end
+
+    #
+    # Perform a Feedback check on the APN server, for the given app key (which must be the first argument)
+    #
+    def self.perform(*args)
+      app_name = args[0]
+      start    = Time.now
+      count    = 0
+      appl     = Resque.aps_application(app_name)
+
+      return unless appl
+      
+      appl.socket(nil, nil, Resque.aps_feedback_host, Resque.aps_feedback_port) do |socket, app|
+        begin
+          logger.debug("Feedback: Reading feedbacks for #{app_name}.") if logger
+          timeout(5) do
+            until socket.eof?
+              app.before_aps_read
+              feedback = read_feedback(ssl_socket, app_name, product_id)
+              if feedback
+                count += 1
+                app.after_app_read(feedback)
+              else
+                app.aps_read_failed
+              end
+            end
+          end
+        rescue
+          logger.error Application.application_exception($!, app_name) if logger
+          app.aps_read_error(Application.application_exception($!, app_name))
+        end
+      end
+      logger.info("Read #{count} #{app_name} feedbacks over #{Time.now - start} sec.") if logger
+    end
+
+  end
+end

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

@@ -12,11 +12,17 @@
   <tr>
     <th>Application</th>
     <th>Notification Count</th>
+    <th></th>
   </tr>
   <% resque.aps_application_names(start, start+20).each do |application_name| %>
     <tr>
       <td><a href="<%= url "aps/#{application_name}" %>"><%= application_name %></a></td>
       <td><%= resque.aps_notification_count_for_application(application_name) %></td>
+      <td>
+        <form action="<%= url "/aps/#{application_name}" %>" method="post">
+          <input type="submit" value="Queue worker">
+        </form>
+      </td>
     </tr>
   <% end %>
 </table>

data/lib/resque_aps/server.rb

@@ -18,6 +18,10 @@ module ResqueAps
           erb File.read(File.join(File.dirname(__FILE__), 'server/views/notifications.erb'))
         end
         
+        post "/aps/:application_name" do
+          Resque.enqueue(ResqueAps::Application, params[:application_name])
+          redirect url("/aps")
+        end
       end
 
     end

data/lib/resque_aps/version.rb

@@ -1,3 +1,3 @@
 module ResqueAps
-  Version = '0.9.4'
+  Version = '0.9.5'
 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/feedback'
 require 'resque_aps/unknown_attribute_error'
 
 module ResqueAps

data/test/feedback_test.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+context "ResqueAps::Application" do
+  test "can perform" do
+    Resque.create_aps_application('TestApp', File.dirname(__FILE__) + "/../test-dev.pem", nil)
+    ResqueAps::Feedback.perform('TestApp')
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Ashley Martens
@@ -101,6 +101,7 @@ files:
 - Rakefile
 - lib/resque_aps.rb
 - lib/resque_aps/application.rb
+- lib/resque_aps/feedback.rb
 - lib/resque_aps/helper.rb
 - lib/resque_aps/notification.rb
 - lib/resque_aps/server.rb
@@ -112,6 +113,7 @@ files:
 - lib/resque_aps/version.rb
 - tasks/resque_aps.rake
 - test/application_test.rb
+- test/feedback_test.rb
 - test/notification_test.rb
 - test/redis-test.conf
 - test/resque-web_test.rb
@@ -149,6 +151,7 @@ specification_version: 3
 summary: Queuing system for Apple's Push Service on top of Resque
 test_files: 
 - test/application_test.rb
+- test/feedback_test.rb
 - test/notification_test.rb
 - test/resque-web_test.rb
 - test/resque_aps_test.rb