wireframe-apn_on_rails 0.3.0.20091216113551 → 0.3.0.20091216122815

data/lib/apn_on_rails/apn_on_rails.rb

@@ -38,10 +38,10 @@ module APN # :nodoc:
     
     # Raised when a notification message to Apple is longer than 256 bytes.
     class ExceededMessageSizeError < StandardError
-      
+      MAX_BYTES = 255
       def initialize(message) # :nodoc:
-        super("The maximum size allowed for a notification payload is 256 bytes: '#{message}'")
-        @overage = message.size.to_i - 256
+        super("The maximum size allowed for a notification payload is #{MAX_BYTES} bytes: '#{message}'")
+        @overage = message.size.to_i - MAX_BYTES
       end
       def overage
         @overage

data/lib/apn_on_rails/app/models/apn/notification.rb

@@ -16,7 +16,6 @@
 # so as to not be sent again.
 class APN::Notification < APN::Base
   include ::ActionView::Helpers::TextHelper
-  extend ::ActionView::Helpers::TextHelper
 
   serialize :payload
   
@@ -57,11 +56,12 @@ class APN::Notification < APN::Base
   end
   
   # Creates the binary message needed to send to Apple.
+  # see http://developer.apple.com/IPhone/library/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingWIthAPS/CommunicatingWIthAPS.html#//apple_ref/doc/uid/TP40008194-CH101-SW4
   def message_for_sending
     json = self.to_apple_json
-    message = "\0\0 #{self.device.to_hexa}\0#{json.length.chr}#{json}"
-    raise APN::Errors::ExceededMessageSizeError.new(message) if message.size.to_i > 256
-    message
+    raise APN::Errors::ExceededMessageSizeError.new(json) if json.size.to_i > APN::Errors::ExceededMessageSizeError::MAX_BYTES
+
+    "\0\0 #{self.device.to_hexa}\0#{(json.length).chr}#{json}"
   end
   
   class << self
@@ -98,10 +98,13 @@ class APN::Notification < APN::Base
   # Truncate alert message if message payload will be too long
   def truncate_alert
     return unless self.alert
-    begin
-      self.message_for_sending
-    rescue APN::Errors::ExceededMessageSizeError => e
-      self.alert = truncate(self.alert, :length => self.alert.size - e.overage)
+    while self.alert.length > 1
+      begin
+        self.message_for_sending
+        break
+      rescue APN::Errors::ExceededMessageSizeError => e
+        self.alert = truncate(self.alert, :length => self.alert.mb_chars.length - 1)
+      end
     end
   end
 end # APN::Notification

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wireframe-apn_on_rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.0.20091216113551
+  version: 0.3.0.20091216122815
 platform: ruby
 authors: 
 - markbates