notifiable-rails 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b109b7e4229eae4cc3b4033b5443695cf79efa1c
-  data.tar.gz: 94a994b5dccaac5d746602c77e15a4c13b1d3ec1
+  metadata.gz: 8866068be795e5ab4b9eeaca25bd7a32652a7aaa
+  data.tar.gz: 43335737e5ce55937010d5e596ca3c236845e019
 SHA512:
-  metadata.gz: 67da3afd51f2d586796dea736ffec204ae6787a7293e66ab491afbb6265bc66cb00201534039d6c9285307b32f8bbdef9a12491341907fc174f949c80974f25d
-  data.tar.gz: ff2c59f101908c96f1cfca9d16b396e9e068ed64c57d1922307b6c871d13e2f1f29e96cbf9fa8eb2906d7bf04792b07c75495be90ebc74c02594660078bd2596
+  metadata.gz: 8185060efd46e0014da52f7108a73774532b21fa387cb3d8a1f811ecf444e80f7dc2f590c9d3715fc82816be609686ceba5a5e94dc2ad20aae0efda66e513e70
+  data.tar.gz: 3cd022e2dd580c5db9a9ae8f130b7ba37401044bce353dd524bf8212124815f63c7592dcbc85a966cd5a0a058fbd43ba5ba3c57ea2868b0ff496d5255b966349

data/lib/notifiable/app.rb

@@ -10,5 +10,14 @@ module Notifiable
       
       self.configuration[provider].each_pair {|key, value| notifier.send("#{key}=", value) if notifier.methods.include?("#{key}=".to_sym) } 
     end
+    
+    def save_notification_statuses?
+      self.configuration[:save_notification_statuses].nil? ? true : self.configuration[:save_notification_statuses]
+    end
+    
+    def save_notification_statuses=(save_notification_statuses)
+      self.configuration[:save_notification_statuses] = save_notification_statuses
+    end
+    
   end
 end

data/lib/notifiable/notification.rb

@@ -42,12 +42,6 @@ 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 ||= {}
@@ -56,7 +50,6 @@ module Notifiable
       def close
         notifiers.each_value {|n| n.close}
         @notifiers = nil
-        summarise
       end
   end
 end

data/lib/notifiable/notifier_base.rb

@@ -31,14 +31,14 @@ module Notifiable
       end
     
       def processed(device_token, status)
-        if Notifiable.save_receipts
+        if @notification.app.save_notification_statuses?
           receipts << {localized_notification_id: self.localized_notification(device_token).id, device_token_id: device_token.id, status: status, created_at: DateTime.now}
-        
           save_receipts if receipts.count >= Notifiable.notification_status_batch_size
-        else
-          @notification.sent_count += 1
-          @notification.save if (@notification.sent_count % Notifiable.notification_status_batch_size == 0)
         end
+        
+        @notification.sent_count += 1
+        @notification.gateway_accepted_count += 1 if status == 0
+        @notification.save if (@notification.sent_count % Notifiable.notification_status_batch_size == 0)
       end
     
       def test_env?
@@ -53,7 +53,6 @@ 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.22.1"
+  VERSION = "0.23.0"
 end

data/spec/model/notifier_base_spec.rb

@@ -13,7 +13,6 @@ describe Notifiable::NotifierBase do
   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') }
@@ -24,8 +23,12 @@ describe Notifiable::NotifierBase do
     
     before(:each) { Notifiable.notification_status_batch_size = 2 }  
     
-    context "saving receipts" do    
-      before(:each) do      
+    context "saving receipts by default" do
+      let(:notifiable_app) { FactoryGirl.create(:app, :configuration => {:configurable_mock => {:use_sandbox => true}}) }
+      
+      before(:each) do
+        notifiable_app.save_notification_statuses = true
+             
         notifier.processed(device_token1, 0)
         notifier.processed(device_token2, 0)
       end
@@ -34,10 +37,10 @@ describe Notifiable::NotifierBase do
       it { expect(Notifiable::Notification.first.sent_count).to eq 2 }
     end
     
-    context "not saving receipts" do    
-      before(:each) do      
-        Notifiable.save_receipts = false
+    context "not saving statuses" do  
+      let(:notifiable_app) { FactoryGirl.create(:app, :configuration => {:save_notification_statuses => false, :configurable_mock => {:use_sandbox => true}}) }
         
+      before(:each) do
         notifier.processed(device_token1, 0)
         notifier.processed(device_token2, 0)
       end