simple_notifications 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 901a82711bccfaa4b7eb9294b84eddb4e9cc4a439660b3bdbd9103aace8c919a
-  data.tar.gz: 89b3175be328a334f75ebb585ec61019f16dab74f366072f3d1003c005d0a00b
+  metadata.gz: f1709f0238eda36afb2285dd4e57a53ec62fcf1e80a9f3268d573294ea9fb4e1
+  data.tar.gz: d75e8e7a639e530bc92907050f365013b7c1901a3a7a6ffd019092d9e95130c9
 SHA512:
-  metadata.gz: 3c12be42028d7096e859733f290cdf12b5050b5103c70d7d8e7b94af2e338f69e2e1f1deccd05405dacf675c05d1f435561307263ed55768a60f5850f3d14bee
-  data.tar.gz: 14f6988d25a32dc032e7c40a5b8a131127ebd42741719aaa1f9ac07cb6ea04d47bcfc313c525e35758a7b56c7c56b5a87944e0f545645a017def7f27e3f38b9c
+  metadata.gz: ad26e5c56c0678bbe5f6805707783e4d489604d686212fa11c05010689d76fd245563d68026e38a22def0e624d533f185fb5832481274dfb67b88f0ebe7c2431
+  data.tar.gz: 298446be7bf1586b81636f1c179ca7224d7d64d423459b263f7f64334ccc1cd2e7062ca152ebb9fb406612b2364622cc4dbea3c5fccd3bde179fbe6ab2643ef5

data/README.md

@@ -39,12 +39,16 @@ rails db:migrate
 Add following line to the model for which notifications functionality is required
 
 ```ruby
-notify sender: :author, 
-       receivers: :followers, 
-       before_notify: proc {puts 'Before Notifications actions'},
-       after_notify: proc {puts 'Deliver Push notifications'},
-       after_delivered: proc {puts 'Notification delivered'},
-       after_read: proc { puts 'Notification marked as read'}
+notify sender: :product_class,
+         receivers: :variants,
+         actions: [:follow, :unfollow, :update, :create],
+         notify_message: :dd_message,
+         before_notify: :before_notify_method,
+         after_notify: :after_notify_method,
+         before_delivered: :before_delivered_method,
+         after_delivered: :after_delivered_method,
+         before_read: :before_read_method,
+         after_read: :after_read_method
 ``` 
 Or you can provide ActiveRecord::Base object or ActiveRecord::Relation objects as 
 

data/lib/simple_notifications/app/models/delivery.rb

@@ -12,17 +12,32 @@ module SimpleNotifications
     belongs_to :receiver, polymorphic: true
 
     # Callbacks
-    after_update_commit :after_create_actions
+    before_update :before_read, if: proc {!!SimpleNotifications::Base.options[:before_read] && changes['is_read'] == [false, true]}
+    before_update :before_delivered, if: proc {!!SimpleNotifications::Base.options[:before_delivered] && changes['is_delivered'] == [false, true]}
+    after_update_commit :after_read, if: proc {!!SimpleNotifications::Base.options[:after_read] && previous_changes['is_read'] == [false, true]}
+    after_update_commit :after_delivered, if: proc {!!SimpleNotifications::Base.options[:after_delivered] && previous_changes['is_delivered'] == [false, true]}
+
+    def entity
+      simple_notification.entity
+    end
 
     private
 
-    def after_create_actions
-      if !!SimpleNotifications::Delivery.after_delivered && previous_changes['is_delivered'] == [false, true]
-        SimpleNotifications::Delivery.after_delivered.call
+    %w(read delivered).each do |update_type|
+      define_method("before_#{update_type}") do
+        call_method(SimpleNotifications::Base.options["before_#{update_type}".to_sym])
       end
 
-      if !!SimpleNotifications::Delivery.after_read && previous_changes['is_read'] == [false, true]
-        SimpleNotifications::Delivery.after_read.call
+      define_method("after_#{update_type}") do
+        call_method(SimpleNotifications::Base.options["after_#{update_type}".to_sym])
+      end
+    end
+
+    def call_method(_method)
+      if _method.class == Symbol
+        entity.method(_method).call if entity.class.instance_methods(false).include?(_method)
+      elsif _method.class == Proc
+        _method.call
       end
     end
   end

data/lib/simple_notifications/app/models/simple_notification.rb

@@ -36,12 +36,17 @@ module SimpleNotifications
 
     private
 
-    def before_actions
-      SimpleNotifications::Record.before_notify.call if !!SimpleNotifications::Record.before_notify
-    end
-
-    def after_actions
-      SimpleNotifications::Record.after_notify.call if !!SimpleNotifications::Record.after_notify
+    %w(before after).each do |call_type|
+      define_method("#{call_type}_actions".to_sym) do
+        _method = SimpleNotifications::Base.send(:options)["#{call_type}_notify".to_sym]
+        if _method.present?
+          if _method.class == Symbol
+            entity.method(_method).call if entity.class.instance_methods(false).include?(_method)
+          elsif _method.class == Proc
+            _method.call
+          end
+        end
+      end
     end
   end
 end

data/lib/simple_notifications/base.rb

@@ -1,6 +1,6 @@
 module SimpleNotifications
   module Base
-    mattr_accessor :notified_flag, :entity_class, :sender, :receivers, :actions, :notify_message
+    mattr_accessor :options, :notified_flag
 
     #Example
     #notify(sender: :author, receivers: :followers)
@@ -8,16 +8,11 @@ module SimpleNotifications
     #       receivers: :variants,
     #       action: [:follow, :update, :create, :destroy]
     def notify(options = {})
-      @@entity_class = self
-      @@sender = options[:sender]
-      @@receivers = options[:receivers]
-      @@actions = options[:actions]
-      @@notify_message = options[:notify_message]
-
-      SimpleNotifications::Record.before_notify = options[:before_notify] if !!options[:before_notify]
-      SimpleNotifications::Record.after_notify = options[:after_notify] if !!options[:after_notify]
-      SimpleNotifications::Delivery.after_delivered = options[:after_delivered] if !!options[:after_delivered]
-      SimpleNotifications::Delivery.after_read = options[:after_read] if !!options[:after_read]
+      @@options = options
+      @@options[:entity_class] = self
+      @@options[:callbacks] = []
+      [:create, :update, :destroy].each {|_method| @@options[:callbacks] << @@options[:actions].delete(_method)}
+      @@options[:callbacks].compact!
       open_sender_class
       open_receiver_class
       open_notified_class
@@ -32,7 +27,7 @@ module SimpleNotifications
     # Opening the class which is defined as sender.
     def open_sender_class
       # Define association for sender model
-      sender_class(@@sender).class_eval do
+      sender_class(@@options[:sender]).class_eval do
         has_many :sent_notifications, class_name: 'SimpleNotifications::Record', as: :sender
       end
     end
@@ -40,7 +35,7 @@ module SimpleNotifications
     # Opening the classes which are defined as receivers.
     def open_receiver_class
       # Define association for receiver model
-      [receivers_class(@@receivers)].flatten.each do |base|
+      [receivers_class(@@options[:receivers])].flatten.each do |base|
         base.class_eval do
           has_many :deliveries, class_name: 'SimpleNotifications::Delivery', as: :receiver
           has_many :received_notifications, through: :deliveries, source: :simple_notification
@@ -56,16 +51,16 @@ 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(@@sender).to_s
+        has_many :notifiers, through: :notifications, source: :sender, source_type: sender_class(@@options[:sender]).to_s
         SimpleNotifications::Record.class_eval do
-          [@@entity_class.receivers_class(@@receivers)].flatten.each do |receiver_class|
+          [@@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(@@receivers)].flatten.each do |receiver_class|
+        [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
@@ -77,27 +72,26 @@ module SimpleNotifications
         # has_many :unread_notificants, through: :unread_deliveries, source: :receiver, source_type: 'User'
 
         # Callbacks
-        after_create_commit :create_notification, if: proc {@notify.nil? || !!@notify}
-        after_update_commit :update_notification, if: proc {@notify.nil? || !!@notify}
+        @@options[:callbacks].each {|_method| send("after_#{_method}_commit", "#{_method}_notification".to_sym)}
 
         NotificationActions.module_eval do
-          @@actions.each do |action|
+          @@options[:actions].each do |action|
             define_method(action) do
               run_callbacks action do
                 super()
               end
             end
 
-            define_method("before_#{action}") do
+            define_method("before_#{action}".to_sym) do
             end
 
-            define_method("after_#{action}") do
-              self.notify(sender: @@sender, receivers: @@receivers, message: default_message(self, @@sender, action.to_s))
+            define_method("after_#{action}".to_sym) do
+              self.notify(sender: @@options[:sender], receivers: @@options[:receivers], message: default_message(self, @@options[:sender], action.to_s))
             end
           end
         end
 
-        @@actions.each do |action|
+        @@options[:actions].each do |action|
           define_model_callbacks action
           send("before_#{action}", "before_#{action}".to_sym)
           send("after_#{action}", "after_#{action}".to_sym)
@@ -107,7 +101,7 @@ module SimpleNotifications
         #post.notify(sender: :author, receivers: :followers, message: 'My Custom logic message')
         #post.create(content: '', notify: false) -> It does not create the notification.
         def notify(options = {})
-          raise 'SimpleNotification::SenderReceiverError' unless options[:sender] && options[:receivers]
+          raise 'SimpleNotification::SenderReceiverError' unless @@options[:sender] && @@options[:receivers]
           @message = options[:message] if options[:message]
           notification = notifications.build(entity: self, sender: get_obj(options[:sender]), message: default_message(self, get_obj(options[:sender]), 'created'))
           get_obj(options[:receivers]).each {|receiver| notification.deliveries.build(receiver: receiver)}
@@ -149,7 +143,7 @@ module SimpleNotifications
         end
 
         def default_message(entity, sender, action)
-          @message || (method(@@notify_message).call if !!@@notify_message) || "#{get_obj(sender).class.name} #{action} #{entity.class.name} #{entity.name}."
+          @message || (method(@@options[:notify_message]).call if !!@@options[:notify_message]) || "#{get_obj(sender).class.name} #{action} #{entity.class.name} #{entity.name}."
         end
 
         private
@@ -159,11 +153,15 @@ module SimpleNotifications
         end
 
         def create_notification
-          notify({sender: get_obj(@@sender), receivers: get_obj(@@receivers), message: default_message(self, get_obj(@@sender), 'created')})
+          notify({sender: get_obj(@@options[:sender]), receivers: get_obj(@@options[:receivers]), message: default_message(self, get_obj(@@options[:sender]), 'created')})
         end
 
         def update_notification
-          notify({sender: get_obj(@@sender), receivers: get_obj(@@receivers), message: default_message(self, get_obj(@@sender), 'updated')})
+          notify({sender: get_obj(@@options[:sender]), receivers: get_obj(@@options[:receivers]), message: default_message(self, get_obj(@@options[:sender]), 'updated')})
+        end
+
+        def destroy_notification
+          notify({sender: get_obj(@@options[:sender]), receivers: get_obj(@@options[:receivers]), message: default_message(self, get_obj(@@options[:sender]), 'deleted')})
         end
       end
     end

data/lib/simple_notifications/version.rb

@@ -1,3 +1,3 @@
 module SimpleNotifications
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

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