notifiable-rails 0.21.1 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d71799addca4d1b62f55cc53648b8fbb79539e45
-  data.tar.gz: b02d89f3dd6b820427a2ed913f5d4635e4e2e5fd
+  metadata.gz: 18da379edb316d22c4fa33783e6b39557abd2acc
+  data.tar.gz: 2ea6c4d630af8b1c53715f6f554e8cbf741fc4bb
 SHA512:
-  metadata.gz: 5391c59e0e71f8849a174c7a53be0424de9ecd5e2f0db31f63abfa4076e75fe4bcb0486cabdd1d7822c636e4b2bd2cd10bddabd0736612c423edeaf40af6dec3
-  data.tar.gz: 8e123732670e709c34a7b3c04db382f6ece68c548289562a505052dd3682484b8d3d35197092c009d7178ce9d9c88936603961eb944d4d5e0cfd35ffb4797589
+  metadata.gz: ddbfdedac518e617f7c959a4338184bc0316d4cbed4ffbacfa682736a425a1d8b0f16b6afc860529dc326c72c462d891d4176fcbaa7d301ea3fc172664d3f9e0
+  data.tar.gz: 1ae79d56178c07d58069dd2d92b34ef087374005d596849056da53afc10ddd3e8e5befa2c7f79aeed7eacdc3b07a3c80e6357b2c50383de15ef62ca4792e103c

data/lib/notifiable/notification.rb

@@ -42,6 +42,12 @@ module Notifiable
   		notifiers[provider].send_notification(d) if d.is_valid?
     end
     
+    def summarise
+      self.sent_count = self.notification_statuses.count
+      self.gateway_accepted_count = self.notification_statuses.where(:status => 0).count
+      self.save
+    end
+    
     private
       def notifiers
         @notifiers ||= {}
@@ -52,11 +58,5 @@ module Notifiable
         @notifiers = nil
         summarise
       end
-    
-      def summarise
-        self.sent_count = self.notification_statuses.count
-        self.gateway_accepted_count = self.notification_statuses.where(:status => 0).count
-        self.save
-      end
   end
 end

data/lib/notifiable/notifier_base.rb

@@ -29,10 +29,8 @@ module Notifiable
     
       def processed(device_token, status)
         receipts << {localized_notification_id: self.localized_notification(device_token).id, device_token_id: device_token.id, status: status, created_at: DateTime.now}
-      
-        if receipts.count > Notifiable.notification_status_batch_size
-          save_receipts
-        end
+        
+        save_receipts if receipts.count >= Notifiable.notification_status_batch_size
       end
     
       def test_env?
@@ -47,6 +45,7 @@ module Notifiable
       def save_receipts
         Notifiable::NotificationStatus.bulk_insert! receipts
         @receipts = []
+        @notification.summarise
       end
 	end
 end

data/lib/notifiable/version.rb

@@ -1,3 +1,3 @@
 module Notifiable
-  VERSION = "0.21.1"
+  VERSION = "0.21.2"
 end

data/spec/model/notifier_base_spec.rb

@@ -11,6 +11,31 @@ describe Notifiable::NotifierBase do
 
     it { expect(notifier.test_env?).to eq true }
   end
+  
+  describe "#processed" do
+    let(:notifiable_app) { FactoryGirl.create(:app, :configuration => {:configurable_mock => {:use_sandbox => true}}) }
+    let(:notification) { FactoryGirl.create(:notification_with_en_localization, :app => notifiable_app) }
+    
+    let(:device_token1) { FactoryGirl.create(:device_token, :app => notifiable_app, :locale => :en) }
+    let(:device_token2) { FactoryGirl.create(:device_token, :app => notifiable_app, :locale => :en) }
+    let(:device_token3) { FactoryGirl.create(:device_token, :app => notifiable_app, :locale => :en) }
+    
+    subject(:notifier) { ConfigurableMockNotifier.new(Rails.env, notification) }
+    
+    before(:each) do
+      ConfigurableMockNotifier.send(:public, *ConfigurableMockNotifier.protected_instance_methods)
+      
+      Notifiable.notification_status_batch_size = 2
+      notifier.processed(device_token1, 0)
+      notifier.processed(device_token2, 0)
+    end
+
+    it { expect(Notifiable::NotificationStatus.count).to eq 2 }
+    it { expect(notification.sent_count).to eq 2 }
+    
+  end
+  
+  
 end
 
 class ConfigurableMockNotifier < Notifiable::NotifierBase