fireinc-apn_on_rails 0.4.2.6 → 0.4.2.7

data/fireinc-apn_on_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fireinc-apn_on_rails}
-  s.version = "0.4.2.6"
+  s.version = "0.4.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["markbates", "Rebecca Nesson", "Caleb Adam Haye"]

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

@@ -1,16 +1,16 @@
 class APN::App < APN::Base
-  
+
   has_many :groups, :class_name => 'APN::Group', :dependent => :destroy
   has_many :devices, :class_name => 'APN::Device', :dependent => :destroy
   has_many :notifications, :through => :devices, :dependent => :destroy
   has_many :unsent_notifications, :through => :devices
   has_many :group_notifications, :through => :groups
   has_many :unsent_group_notifications, :through => :groups
-    
+
   def cert
     (RAILS_ENV == 'production' ? apn_prod_cert : apn_dev_cert)
   end
-  
+
   # Opens a connection to the Apple APN server and attempts to batch deliver
   # an Array of group notifications.
   # 
@@ -25,9 +25,9 @@ class APN::App < APN::Base
     end
     APN::App.send_notifications_for_cert(self.cert, self.id)
   end
-  
+
   def self.send_notifications
-    apps = APN::App.all 
+    apps = APN::App.all
     apps.each do |app|
       app.send_notifications
     end
@@ -36,55 +36,60 @@ class APN::App < APN::Base
       send_notifications_for_cert(global_cert, nil)
     end
   end
-  
+
   def self.send_notifications_for_cert(the_cert, app_id)
     # unless self.unsent_notifications.nil? || self.unsent_notifications.empty?
-      if (app_id == nil)
-        conditions = "app_id is null"
-      else 
-        conditions = ["app_id = ?", app_id]
-      end
-      begin
-        APN::Connection.open_for_delivery({:cert => the_cert}) do |conn, sock|
-          APN::Device.find_each(:conditions => conditions) do |dev|
-            dev.unsent_notifications.each do |noty|
-              begin
-                conn.write(noty.message_for_sending)
-              rescue => e
-                Rails.logger.error "Cannot send notification ##{noty.id}: " + e.message
-                return if e.message == "Broken pipe"
-              end
-              noty.sent_at = Time.now
-              noty.save
-            end
+    if (app_id == nil)
+      conditions = "app_id is null"
+    else
+      conditions = ["app_id = ?", app_id]
+    end
+    begin
+      APN::Connection.open_for_delivery({:cert => the_cert}) do |conn, sock|
+        APN::Device.find_each(:conditions => conditions) do |dev|
+          dev.unsent_notifications.each do |noty|
+            conn.write(noty.message_for_sending)
+            noty.sent_at = Time.now
+            noty.save
           end
         end
-      rescue Exception => e
-        log_connection_exception(e)
       end
+    rescue Exception => e
+      log_connection_exception(e)
+    end
     # end   
   end
-  
+
   def send_group_notifications
-    if self.cert.nil? 
+    if self.cert.nil?
       raise APN::Errors::MissingCertificateError.new
       return
     end
-    unless self.unsent_group_notifications.nil? || self.unsent_group_notifications.empty? 
-      APN::Connection.open_for_delivery({:cert => self.cert}) do |conn, sock|
-        unsent_group_notifications.each do |gnoty|
-          gnoty.devices.find_each do |device|
-            conn.write(gnoty.message_for_sending(device))
+    unless self.unsent_group_notifications.nil? || self.unsent_group_notifications.empty?
+      unsent_group_notifications.each do |gnoty|
+        failed = 0
+        devices_to_send = gnoty.devices.count
+        gnoty.devices.find_in_batches(:batch_size => 100) do |devices|
+          APN::Connection.open_for_delivery({:cert => self.cert}) do |conn, sock|
+            devices.each do |device|
+              begin
+                conn.write(gnoty.message_for_sending(device))
+              rescue Exception => e
+                puts e.message
+                failed += 1
+              end
+            end
           end
-          gnoty.sent_at = Time.now
-          gnoty.save
         end
+        puts "Sent to: #{devices_to_send - failed}/#{devices_to_send} "
+        gnoty.sent_at = Time.now
+        gnoty.save
       end
     end
   end
-  
+
   def send_group_notification(gnoty)
-    if self.cert.nil? 
+    if self.cert.nil?
       raise APN::Errors::MissingCertificateError.new
       return
     end
@@ -98,14 +103,14 @@ class APN::App < APN::Base
       end
     end
   end
-  
+
   def self.send_group_notifications
     apps = APN::App.all
     apps.each do |app|
       app.send_group_notifications
     end
-  end          
-  
+  end
+
   # Retrieves a list of APN::Device instnces from Apple using
   # the <tt>devices</tt> method. It then checks to see if the
   # <tt>last_registered_at</tt> date of each APN::Device is
@@ -122,8 +127,10 @@ class APN::App < APN::Base
       return
     end
     APN::App.process_devices_for_cert(self.cert)
-  end # process_devices
-  
+  end
+
+  # process_devices
+
   def self.process_devices
     apps = APN::App.all
     apps.each do |app|
@@ -134,23 +141,23 @@ class APN::App < APN::Base
       APN::App.process_devices_for_cert(global_cert)
     end
   end
-  
+
   def self.process_devices_for_cert(the_cert)
     puts "in APN::App.process_devices_for_cert"
     APN::Feedback.devices(the_cert).each do |device|
       if device.last_registered_at < device.feedback_at
         puts "device #{device.id} -> #{device.last_registered_at} < #{device.feedback_at}"
         device.destroy
-      else 
+      else
         puts "device #{device.id} -> #{device.last_registered_at} not < #{device.feedback_at}"
       end
-    end 
+    end
   end
-  
-  
+
+
   protected
-  def self.log_connection_exception(ex)
+  def log_connection_exception(ex)
     puts ex.message
   end
-    
+
 end

data/lib/apn_on_rails/libs/connection.rb

@@ -59,7 +59,7 @@ module APN
         ssl.connect
   
         yield ssl, sock if block_given?
-  
+      ensure
         ssl.close
         sock.close
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: fireinc-apn_on_rails
 version: !ruby/object:Gem::Version 
-  hash: 107
+  hash: 105
   prerelease: 
   segments: 
   - 0
   - 4
   - 2
-  - 6
-  version: 0.4.2.6
+  - 7
+  version: 0.4.2.7
 platform: ruby
 authors: 
 - markbates