kw_apn 0.4 → 0.5

data/README.rdoc

@@ -1,6 +1,13 @@
+====================================
+About
+====================================
+
+Push Notification Library with support for the extended format. This Library is designed to send thousands of APNs at once without dropping a lot of messages on errors. Since version 0.4 it supports the use of multiple App IDs with one process.
+
 ====================================
 Getting Started
 ====================================
+
 For Rails start the generator: kw_apn
 This will copy the configuration example into your project.
 
@@ -52,7 +59,7 @@ Example
   
 
 ====================================
-Configuring for multiple App IDs
+Multiple App IDs
 ====================================
 
 Since version 0.4 it is possible to use kw_apn with multiple App IDs.

data/VERSION

@@ -1 +1 @@
-0.4
+0.5

data/kw_apn.gemspec

@@ -7,11 +7,11 @@ end
 Gem::Specification.new do |s|
   s.name = 'kw_apn'
   s.version = version
-  s.authors = ['Jonathan Cichon', 'Kupferwerk GmbH']
+  s.authors = ['Jonathan Cichon', 'Andreas Gerauer', 'Kupferwerk GmbH']
   s.email = 'cichon@kupferwerk.com'
   s.homepage = 'http://github.com/kupferwerk/kw_apn'
   s.summary = 'APN Lib by Kupferwerk'
-  s.description = 'Apple Push Notification Library by Kupferwerk'
+  s.description = 'Apple Push Notification Library by Kupferwerk. Supports extended format with feedback.'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.rdoc']
   s.require_path = 'lib'

data/lib/config.rb

@@ -50,8 +50,7 @@ module KwAPN
       def option(opt, app_id = nil)
         @options || load_options
         opt = opt.to_sym
-        app_id = app_id.to_sym
-        if app_id && @options[app_id] && @options[app_id][opt]
+        if app_id && (app_id = app_id.to_sym) && @options[app_id] && @options[app_id][opt]
           @options[app_id][opt]
         else
           @options[opt]

data/lib/connection.rb

@@ -7,6 +7,7 @@ module KwAPN
     
     def connect(host, port, app_id = nil)
       ctx = OpenSSL::SSL::SSLContext.new()
+      
       ctx.cert = OpenSSL::X509::Certificate.new(File.read(KwAPN::Config.option(:cert_file, app_id)))
       ctx.key  = OpenSSL::PKey::RSA.new(File.read(KwAPN::Config.option(:cert_file, app_id)))
 

data/lib/sender.rb

@@ -80,28 +80,33 @@ private
         # wait for apple to respond errors
         sleep(1)
       rescue => e
+        @watch_thread.join
+        
         if @last_error_index.nil?
           # stop watchthread as the connection should be allready down
-          @watch_thread.exit
           self.class.log("(#{app_id} - #{session_id}) Exception at index #{counter+index}: #{e.message}")
           @failed_index_array << (counter+index)
           failed
         else
           # should be interrupted by watchthread, do nothing wait for restart
         end
+        
       end
     end
     
     def perform_watch
-      ret = @ssl.read
-      err = ret.strip.unpack('CCN')
-      if err[1] != 0 and err[2]
-        @last_error_index = (err[2] - ID_OFFSET)
-        @failed_index_array << @last_error_index
-        failed
-        @work_thread.exit
-      else
-        perform_watch
+      begin
+        ret = @ssl.read
+        err = ret.strip.unpack('CCN')
+        if err[1] != 0 and err[2]
+          @last_error_index = (err[2] - ID_OFFSET)
+          @failed_index_array << @last_error_index
+          failed
+          @work_thread.exit
+        else
+          perform_watch
+        end
+      rescue => e
       end
     end
 

metadata

@@ -1,25 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: kw_apn
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
-  - 4
-  version: "0.4"
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Jonathan Cichon
+- Andreas Gerauer
 - Kupferwerk GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +02:00
+date: 2011-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
-description: Apple Push Notification Library by Kupferwerk
+description: Apple Push Notification Library by Kupferwerk. Supports extended format with feedback.
 email: cichon@kupferwerk.com
 executables: []