wireframe-apn_on_rails 0.3.0.201302051600 → 0.3.0.20091216113551

data/lib/apn_on_rails/apn_on_rails.rb

@@ -38,9 +38,13 @@ module APN # :nodoc:
     
     # Raised when a notification message to Apple is longer than 256 bytes.
     class ExceededMessageSizeError < StandardError
-      MAX_BYTES = 256
+      
       def initialize(message) # :nodoc:
-        super("The maximum size allowed for a notification payload is #{MAX_BYTES} bytes: '#{message}'")
+        super("The maximum size allowed for a notification payload is 256 bytes: '#{message}'")
+        @overage = message.size.to_i - 256
+      end
+      def overage
+        @overage
       end
     end
     
@@ -55,11 +59,7 @@ end
 %w{ models controllers helpers }.each do |dir| 
   path = File.join(File.dirname(__FILE__), 'app', dir)
   $LOAD_PATH << path 
-  if ActiveSupport::Dependencies.respond_to?(:autoload_paths)
-    ActiveSupport::Dependencies.autoload_paths << path 
-    ActiveSupport::Dependencies.autoload_once_paths.delete(path) 
-  else
-    ActiveSupport::Dependencies.load_paths << path 
-    ActiveSupport::Dependencies.load_once_paths.delete(path)
-  end
-end
+  # puts "Adding #{path}"
+  ActiveSupport::Dependencies.load_paths << path 
+  ActiveSupport::Dependencies.load_once_paths.delete(path) 
+end

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

@@ -13,7 +13,7 @@ class APN::Device < APN::Base
   has_many :notifications, :class_name => 'APN::Notification'
   
   validates_uniqueness_of :token
-  validates_format_of :token, :with => /\A[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\z/
+  validates_format_of :token, :with => /^[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}\s[a-z0-9]{8}$/
   
   before_save :set_last_registered_at
   
@@ -45,4 +45,4 @@ class APN::Device < APN::Base
     self.last_registered_at = Time.now if self.last_registered_at.nil?
   end
   
-end
+end

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

@@ -16,6 +16,7 @@
 # so as to not be sent again.
 class APN::Notification < APN::Base
   include ::ActionView::Helpers::TextHelper
+  extend ::ActionView::Helpers::TextHelper
 
   serialize :payload
   
@@ -56,42 +57,38 @@ 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#{encode((json.bytesize).chr)}#{encode(json)}"
-    raise APN::Errors::ExceededMessageSizeError.new(message) if message.bytesize.to_i > APN::Errors::ExceededMessageSizeError::MAX_BYTES
+    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
   end
-  def encode(string)
-    string.respond_to?(:force_encoding) ? string.force_encoding('BINARY') : string
-  end
   
   class << self
     
     # Opens a connection to the Apple APN server and attempts to batch deliver
     # an Array of notifications.
+    # 
+    # This method expects an Array of APN::Notifications. If no parameter is passed
+    # in then it will use the following:
+    #   APN::Notification.all(:conditions => {:sent_at => nil})
+    # 
+    # As each APN::Notification is sent the <tt>sent_at</tt> column will be timestamped,
+    # so as to not be sent again.
+    # 
     # This can be run from the following Rake task:
     #   $ rake apn:notifications:deliver
-    def send_notifications(notifications)
-      sent_ids = []
-      sent = false
-      message = ''
-
-      notifications.find_each do |noty|
-        sent_ids << noty.id
-        message << noty.message_for_sending
-      end
+    def send_notifications(notifications = APN::Notification.all(:conditions => {:sent_at => nil}))
+      unless notifications.nil? || notifications.empty?
 
-      return if sent_ids.empty?
-
-      begin
         APN::Connection.open_for_delivery do |conn, sock|
-          sent = true
-          conn.write(message)
+          notifications.each do |noty|
+            conn.write(noty.message_for_sending)
+            noty.sent_at = Time.now
+            noty.save
+          end
         end
-      ensure
-        APN::Notification.update_all(['sent_at = ?', Time.now.utc], ['id in (?)', sent_ids]) if sent && sent_ids.any?
+
       end
     end
     
@@ -101,13 +98,10 @@ class APN::Notification < APN::Base
   # Truncate alert message if message payload will be too long
   def truncate_alert
     return unless self.alert
-    while self.alert.length > 1
-      begin
-        self.message_for_sending
-        break
-      rescue APN::Errors::ExceededMessageSizeError => e
-        self.alert = truncate(self.alert, :escape => false, :length => self.alert.mb_chars.length - 1)
-      end
+    begin
+      self.message_for_sending
+    rescue APN::Errors::ExceededMessageSizeError => e
+      self.alert = truncate(self.alert, :length => self.alert.size - e.overage)
     end
   end
-end # APN::Notification
+end # APN::Notification

metadata

@@ -1,56 +1,38 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: wireframe-apn_on_rails
-version: !ruby/object:Gem::Version
-  version: 0.3.0.201302051600
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.3.0.20091216113551
 platform: ruby
-authors:
-- ryan
+authors: 
+- markbates
+- ryansonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2009-12-16 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: configatron
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'apn_on_rails was developed by: ryan'
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: "apn_on_rails was developed by: markbates"
 email: mark@markbates.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README
 - LICENSE
-files:
+files: 
 - lib/apn_on_rails/apn_on_rails.rb
 - lib/apn_on_rails/app/models/apn/base.rb
 - lib/apn_on_rails/app/models/apn/device.rb
@@ -68,28 +50,33 @@ files:
 - generators/templates/apn_migrations/002_create_apn_notifications.rb
 - generators/templates/apn_migrations/003_alter_apn_devices.rb
 - generators/templates/apn_migrations/004_add_payload_to_notifications.rb
+has_rdoc: true
 homepage: http://www.metabates.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-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'
+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: 
 requirements: []
+
 rubyforge_project: magrathea
-rubygems_version: 1.8.24
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: apn_on_rails
 test_files: []
+