apns 0.9.0 → 1.0.0

data/README.textile

@@ -12,7 +12,6 @@ Convert your certificate
 
 In Keychain access export your certificate as a p12. Then run the following command to convert it to a .pem
 
-
 <pre>
   <code>
     openssl pkcs12 -in cert.p12 -out cert.pem -nodes -clcerts
@@ -89,20 +88,48 @@ h2. Getting your iPhone's device token
 
 After you setup push notification for your application with Apple. You need to ask Apple for you application specific device token.
 
-ApplicationAppDelegate.m
+h3. ApplicationAppDelegate.m
+
 <pre>
   <code>
-    - (BOOL)application:(UIApplication *)application 
-    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions 
-    {
-    [[UIApplication sharedApplication] registerForRemoteNotificationTypes:(UIRemoteNotificationTypeAlert | UIRemoteNotificationTypeSound | UIRemoteNotificationTypeBadge)];
+    - (void)applicationDidFinishLaunching:(UIApplication *)application 
+    {    
+        // Register with apple that this app will use push notification
+        [[UIApplication sharedApplication] registerForRemoteNotificationTypes:(UIRemoteNotificationTypeAlert | 
+          UIRemoteNotificationTypeSound | UIRemoteNotificationTypeBadge)];
+
+        // Your app startup logic...
+        return YES;
     }
-    
-    - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-      NSLog(@"deviceToken: %@", deviceToken);
+
+    - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken 
+    {
+        // Convert the binary data token into an NSString (see below for the implementation of this function)
+        NSString *deviceTokenAsString = stringFromDeviceTokenData(deviceToken);
+
+        // Show the device token obtained from apple to the log
+        NSLog(@"deviceToken: %@", deviceTokenAsString);
     }
   </code>
 </pre>
-    
 
+h3. stringFromDeviceTokenData function
+
+This snippet comes from "this stackoverflow post's anwser":http://stackoverflow.com/a/1990880/855846.
+<pre>
+  <code>
+    NSString* stringFromDeviceTokenData(NSData *deviceToken)
+    {
+      const char *data = [deviceToken bytes];
+      NSMutableString* token = [NSMutableString string];
+      
+      for (int i = 0; i < [deviceToken length]; i++) {
+        [token appendFormat:@"%02.2hhX", data[i]];
+      }
+      
+      return [[token copy] autorelease];
+    }
+  </code>
+</pre>
 
+For more information on Apple Push Notifications you can see Apple Developer Documentation "here":http://developer.apple.com/library/mac/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/IPhoneOSClientImp/IPhoneOSClientImp.html#//apple_ref/doc/uid/TP40008194-CH103-SW2.

data/lib/apns/core.rb

@@ -8,63 +8,49 @@ module APNS
   # openssl pkcs12 -in mycert.p12 -out client-cert.pem -nodes -clcerts
   @pem = nil # this should be the path of the pem file not the contentes
   @pass = nil
-  
+
   class << self
     attr_accessor :host, :pem, :port, :pass
   end
-  
-  def self.send_notification(device_token, message)
-    sock, ssl = self.open_connection
-    ssl.write(self.packaged_notification(device_token, message))
 
-    ssl.close
-    sock.close
+  def self.send_notification(device_token, message)
+    n = APNS::Notification.new(device_token, message)
+    self.send_notifications([n])
   end
-  
+
   def self.send_notifications(notifications)
     sock, ssl = self.open_connection
-    
+
     notifications.each do |n|
       ssl.write(n.packaged_notification)
     end
-    
+
     ssl.close
     sock.close
   end
-  
-  protected
 
-  def self.packaged_notification(device_token, message)
-    pt = self.packaged_token(device_token)
-    pm = self.packaged_message(message)
-    [0, 0, 32, pt, 0, pm.size, pm].pack("ccca*cca*")
-  end
-  
-  def self.packaged_token(device_token)
-    [device_token.gsub(/[\s|<|>]/,'')].pack('H*')
-  end
-  
-  def self.packaged_message(message)
-    if message.is_a?(Hash)
-      apns_from_hash(message)
-    elsif message.is_a?(String)
-      '{"aps":{"alert":"'+ message + '"}}'
-    else
-      raise "Message needs to be either a hash or string"
+  def self.feedback
+    sock, ssl = self.feedback_connection
+
+    apns_feedback = []
+
+    while message = ssl.read(38)
+      timestamp, token_size, token = message.unpack('N1n1H*')
+      apns_feedback << [Time.at(timestamp), token]
     end
+
+    ssl.close
+    sock.close
+
+    return apns_feedback
   end
-  
-  def self.apns_from_hash(hash)
-    other = hash.delete(:other)
-    aps = {'aps'=> hash }
-    aps.merge!(other) if other
-    aps.to_json
-  end
-  
+
+  protected
+
   def self.open_connection
     raise "The path to your pem file is not set. (APNS.pem = /path/to/cert.pem)" unless self.pem
     raise "The path to your pem file does not exist!" unless File.exist?(self.pem)
-    
+
     context      = OpenSSL::SSL::SSLContext.new
     context.cert = OpenSSL::X509::Certificate.new(File.read(self.pem))
     context.key  = OpenSSL::PKey::RSA.new(File.read(self.pem), self.pass)
@@ -75,5 +61,22 @@ module APNS
 
     return sock, ssl
   end
-  
+
+  def self.feedback_connection
+    raise "The path to your pem file is not set. (APNS.pem = /path/to/cert.pem)" unless self.pem
+    raise "The path to your pem file does not exist!" unless File.exist?(self.pem)
+
+    context      = OpenSSL::SSL::SSLContext.new
+    context.cert = OpenSSL::X509::Certificate.new(File.read(self.pem))
+    context.key  = OpenSSL::PKey::RSA.new(File.read(self.pem), self.pass)
+
+    fhost = self.host.gsub('gateway','feedback')
+    puts fhost
+
+    sock         = TCPSocket.new(fhost, 2196)
+    ssl          = OpenSSL::SSL::SSLSocket.new(sock,context)
+    ssl.connect
+
+    return sock, ssl
+  end
 end

data/lib/apns/notification.rb

@@ -19,7 +19,7 @@ module APNS
     def packaged_notification
       pt = self.packaged_token
       pm = self.packaged_message
-      [0, 0, 32, pt, 0, pm.size, pm].pack("ccca*cca*")
+      [0, 0, 32, pt, 0, pm.bytesize, pm].pack("ccca*cca*")
     end
   
     def packaged_token

metadata

@@ -1,60 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: apns
-version: !ruby/object:Gem::Version 
-  version: 0.9.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - James Pozdena
 autorequire: apns
 bindir: bin
 cert_chain: []
-
-date: 2010-03-22 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2010-03-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Apple push notification service gem
 email: jpoz@jpoz.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - MIT-LICENSE
-files: 
+files:
 - MIT-LICENSE
 - README.textile
 - Rakefile
 - lib/apns/core.rb
 - lib/apns/notification.rb
 - lib/apns.rb
-has_rdoc: true
 homepage: http://github.com/jpoz/apns
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple Apple push notification service gem
 test_files: []
-
+has_rdoc: