simple_notifications 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e098fb2d324d42f603872d4af58a79d3e424f1c1ab262804855c169689b5e6b3
-  data.tar.gz: 9d57327b0c855b83169836a97d11bb6897980232575dd0918038dc6bfdcc1991
+  metadata.gz: b68bdfc2e75a052f2ee8fb130cf00ab4b12ab311c4fd05a64765cb693083b214
+  data.tar.gz: 8497e5c83f7a11f8ca096f3c21e04da5eea965d353289dbc3dc2332a5bc0e01d
 SHA512:
-  metadata.gz: 228b2186f3465d38a2de8f9cca72677e85e45e78be167f2b86869ffb4060aeb78cf1d984607872db0f982b40d64f2a2f50798fb78b4b4ace9cc0873102a9c9cf
-  data.tar.gz: 93535ce72ceea4f1932542688a8e29148eee786c6f151282ed01e304eebd80f83ae92ce622fcdc3c584cc43e02e84c7a8acef3e1d4244d1bd3aafbd408fd4560
+  metadata.gz: 54a9962147cfacea84a7e8c03ee01472615e3cc178af61920365af53d4f4777d9327b1d16d679e51d63c946f706623599a9b06b6e1ffae2cc2dd40f3bb87195e
+  data.tar.gz: 80298c7efe237f9b8e5788b9b9d69aa214daed79a5859f70cd9d4ce0d2aa67f886f2c8a4e6290d887e5888c289129409a912ca3110ae59b4221b0e85a805b9f4

data/README.md

@@ -89,7 +89,6 @@ post.notify(sender: :author, receivers: :followers, message: 'My own message')
 post.notifications
 post.notifiers
 post.notificants
-post.#{receiver_class}_notificants
 post.read_marked_notificants
 post.unread_marked_notificants
 post.mark_read
@@ -114,7 +113,6 @@ follower.received_notifications
 ```ruby
 SimpleNotifications::Record.last.sender
 SimpleNotifications::Record.last.entity
-SimpleNotifications::Record.last.#{receiver_class.name.downcase}_receivers
 ```
 
 ### Skipping Notification

data/lib/simple_notifications/base.rb

@@ -52,25 +52,8 @@ module SimpleNotifications
         # Define association for the notified model
         has_many :notifications, class_name: 'SimpleNotifications::Record', as: :entity
         has_many :notifiers, through: :notifications, source: :sender, source_type: sender_class(@@options[:sender]).to_s
-        SimpleNotifications::Record.class_eval do
-          [@@options[:entity_class].receivers_class(@@options[:receivers])].flatten.each do |receiver_class|
-            has_many "#{receiver_class.name.downcase}_receivers".to_sym,
-                     through: :deliveries,
-                     source: :receiver,
-                     source_type: receiver_class.name
-          end
-        end
-        [receivers_class(@@options[:receivers])].flatten.each do |receiver_class|
-          has_many "#{receiver_class.name.downcase}_notificants".to_sym,
-                   through: :notifications,
-                   source: "#{receiver_class.name.downcase}_receivers".to_sym
-        end
         has_many :read_deliveries, through: :notifications, source: :read_deliveries
         has_many :unread_deliveries, through: :notifications, source: :unread_deliveries
-        # has_many :notificants, through: :notifications, source: :receivers
-        # has_many :read_notificants, through: :read_deliveries, source: :receiver, source_type: 'User'
-        # has_many :unread_notificants, through: :unread_deliveries, source: :receiver, source_type: 'User'
-
 
         # Callbacks
         after_create_commit :create_notification, if: proc {@@options[:callbacks].include?(:create)}
@@ -125,18 +108,22 @@ module SimpleNotifications
         end
 
         def notificants
-          #TODO : Need to eager load
-          SimpleNotifications::Record.where(entity: self).collect {|notification| notification.deliveries.collect(&:receiver)}.flatten
+          SimpleNotifications::Record.includes(deliveries: :receiver)
+              .collect(&:deliveries).flatten
+              .collect(&:receiver)
         end
 
         def read_marked_notificants
-          #TODO : Need to eager load
-          SimpleNotifications::Record.where(entity: self).collect {|notification| notification.deliveries.where(is_read: true).collect(&:receiver)}.flatten
+          SimpleNotifications::Record.includes(deliveries: :receiver)
+              .collect(&:deliveries).flatten
+              .select{|record| record.is_read}
+              .collect(&:receiver)
         end
 
         def unread_marked_notificants
-          #TODO : Need to eager load
-          SimpleNotifications::Record.where(entity: self).collect {|notification| notification.deliveries.where(is_read: false).collect(&:receiver)}.flatten
+          SimpleNotifications::Record.includes(deliveries: :receiver)
+              .collect(&:deliveries).flatten
+              .select{|record| !record.is_read}.collect(&:receiver)
         end
 
         # Mark notifications in read mode.

data/lib/simple_notifications/version.rb

@@ -1,3 +1,3 @@
 module SimpleNotifications
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_notifications
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Ashish Garg