notifiable-core 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5df3b3bcfd3d08ee0b58a80025ead697fceaac22af37199c400832620644103
-  data.tar.gz: 824b553df5c6978d4fb9058be35b076623472bc284869f2bbc3f0e8637f62907
+  metadata.gz: 98c5713043730258b62c23e08942daba07ec2d600373c65d64494f6fd34d9a01
+  data.tar.gz: 33bdabb3ed2d2a8dbf0fb61dbb5eaa0eeb83972f22ba1f3f31b666afbd3739b8
 SHA512:
-  metadata.gz: 52e8589031c3919f9f83a8e694c19388771344d59a9e9cf68aefae83772ff08c25a01880e17da5221f0a58a5b76b53187adadae579b81981dc7142e2a8a39690
-  data.tar.gz: 45108ea49a1965f7e169e47207f8f68daa230d66f0160e7b773afe7688708ee92eb06acd33ba245b8396e3360dd5f0c1a7a59bd316008fcbbb3f101419c5b4ac
+  metadata.gz: 8ca200e50537f583ebadb0145431254eb4fa071fa3874371f963a67251661234dbb64ab7c76e75cf36d497b3c29a577803ef1d7395138117fd65082aeaf1e21c
+  data.tar.gz: 89d927957447f6de3d02bb0fed70768f589295836785aee0b40d57f382d13a0eff662b7cb7d47a4c5cab042252e93b811d94adad401eec2749adeb7d767bd2cf

data/lib/notifiable/notification.rb

@@ -48,13 +48,21 @@ module Notifiable
     end
     
     def delivered!(device_token)
+      if notification_statuses.exists?(device_token: device_token)
+        s = notification_statuses.find_by(device_token: device_token)
+        return if s.delivered?
+        s.delivered!
+      end
       increment!(:delivered_count)
-      notification_statuses.find_by(device_token: device_token).delivered! if notification_statuses.exists?(device_token: device_token)
     end
     
     def opened!(device_token)
+      if notification_statuses.exists?(device_token: device_token)
+        s = notification_statuses.find_by(device_token: device_token)
+        return if s.opened?
+        s.opened!
+      end
       increment!(:opened_count)
-      notification_statuses.find_by(device_token: device_token).opened! if notification_statuses.exists?(device_token: device_token)
     end
 
     private

data/lib/notifiable/notification_status.rb

@@ -27,8 +27,16 @@ module Notifiable
       update_attributes(status: DELIVERED_STATUS)
     end
     
+    def delivered?
+      status == DELIVERED_STATUS
+    end
+    
     def opened!
       update_attributes(status: OPENED_STATUS)
     end
+    
+    def opened?
+      status == OPENED_STATUS
+    end
   end
 end

data/lib/notifiable/version.rb

@@ -1,3 +1,3 @@
 module Notifiable
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-core
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Matt Brooke-Smith