fireinc-apn_on_rails 0.4.2.4 → 0.4.2.5

data/VERSION

@@ -1 +1 @@
-0.4.2.3
+0.4.2.5

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.4"
+  s.version = "0.4.2.5"
 
   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

@@ -38,27 +38,26 @@ class APN::App < APN::Base
   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|
+          devs = APN::Device.where(:app_id => app_id)
+          unset = APN::Notification.where(:sent_at => nil).where(:device_id => devs.all.collect {|d| d.id}).order(:device_id, :created_at)
+          unset.each do |noty|
+            Rails.logger.debug "Sending notification ##{noty.id}"
+            begin
               conn.write(noty.message_for_sending)
-              noty.sent_at = Time.now
-              noty.save
+            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
         end
       rescue Exception => e
         log_connection_exception(e)
       end
-    # end   
-  end
+    end
   
   def send_group_notifications
     if self.cert.nil? 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: fireinc-apn_on_rails
 version: !ruby/object:Gem::Version 
-  hash: 111
+  hash: 109
   prerelease: 
   segments: 
   - 0
   - 4
   - 2
-  - 4
-  version: 0.4.2.4
+  - 5
+  version: 0.4.2.5
 platform: ruby
 authors: 
 - markbates