activity_notification 1.7.1 → 2.0.0

data/lib/activity_notification/apis/subscription_api.rb

@@ -4,55 +4,83 @@ module ActivityNotification
     extend ActiveSupport::Concern
 
     included do
-      # Selects filtered subscriptions by key.
-      # @example Get filtered subscriptions of the @user with key 'comment.reply'
-      #   @subscriptions = @user.subscriptions.filtered_by_key('comment.reply')
-      # @scope class
-      # @param [String] key Key of the subscription for filter
-      # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of filtered subscriptions
-      scope :filtered_by_key,     ->(key) { where(key: key) }
-
-      # Selects filtered subscriptions by key with filter options.
-      # @example Get filtered subscriptions of the @user with key 'comment.reply'
-      #   @subscriptions = @user.subscriptions.filtered_by_key('comment.reply')
-      # @example Get custom filtered subscriptions of the @user
-      #   @subscriptions = @user.subscriptions.filtered_by_options({ custom_filter: ["created_at >= ?", time.hour.ago] })
-      # @scope class
-      # @param [Hash] options Options for filter
-      # @option options [String]     :filtered_by_key        (nil) Key of the subscription for filter 
-      # @option options [Array|Hash] :custom_filter          (nil) Custom subscription filter (e.g. ["created_at >= ?", time.hour.ago])
-      # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of filtered subscriptions
-      scope :filtered_by_options, ->(options = {}) {
-        options = ActivityNotification.cast_to_indifferent_hash(options)
-        filtered_subscriptions = all
-        if options.has_key?(:filtered_by_key)
-          filtered_subscriptions = filtered_subscriptions.filtered_by_key(options[:filtered_by_key])
-        end
-        if options.has_key?(:custom_filter)
-          filtered_subscriptions = filtered_subscriptions.where(options[:custom_filter])
+      # :only-rails5-plus#only-rails-with-callback-issue#except-dynamoid:
+      # :only-rails5-plus#only-rails-without-callback-issue#except-dynamoid:
+      # :except-rails5-plus#only-rails-with-callback-issue#except-dynamoid:
+      # :except-rails5-plus#only-rails-without-callback-issue#except-dynamoid:
+      unless ActivityNotification.config.orm == :dynamoid
+        # Selects filtered subscriptions by key.
+        # @example Get filtered subscriptions of the @user with key 'comment.reply'
+        #   @subscriptions = @user.subscriptions.filtered_by_key('comment.reply')
+        # @scope class
+        # @param [String] key Key of the subscription for filter
+        # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of filtered subscriptions
+        scope :filtered_by_key,     ->(key) { where(key: key) }
+
+        # Selects filtered subscriptions by key with filter options.
+        # @example Get filtered subscriptions of the @user with key 'comment.reply'
+        #   @subscriptions = @user.subscriptions.filtered_by_key('comment.reply')
+        # @example Get custom filtered subscriptions of the @user
+        #   @subscriptions = @user.subscriptions.filtered_by_options({ custom_filter: ["created_at >= ?", time.hour.ago] })
+        # @scope class
+        # @param [Hash] options Options for filter
+        # @option options [String]     :filtered_by_key        (nil) Key of the subscription for filter 
+        # @option options [Array|Hash] :custom_filter          (nil) Custom subscription filter (e.g. ["created_at >= ?", time.hour.ago] or ['created_at.gt': time.hour.ago])
+        # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of filtered subscriptions
+        scope :filtered_by_options, ->(options = {}) {
+          options = ActivityNotification.cast_to_indifferent_hash(options)
+          filtered_subscriptions = all
+          if options.has_key?(:filtered_by_key)
+            filtered_subscriptions = filtered_subscriptions.filtered_by_key(options[:filtered_by_key])
+          end
+          if options.has_key?(:custom_filter)
+            filtered_subscriptions = filtered_subscriptions.where(options[:custom_filter])
+          end
+          filtered_subscriptions
+        }
+
+        # Orders by latest (newest) first as created_at: :desc.
+        # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by latest first
+        scope :latest_order,              -> { order(created_at: :desc) }
+
+        # Orders by earliest (older) first as created_at: :asc.
+        # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by earliest first
+        scope :earliest_order,            -> { order(created_at: :asc) }
+
+        # Orders by latest (newest) first as created_at: :desc.
+        # This method is to be overridden in implementation for each ORM.
+        # @param [Boolean] reverse If subscriptions will be ordered as earliest first
+        # @return [ActiveRecord_AssociationRelation<Notificaion>, Mongoid::Criteria<Notificaion>] Database query of ordered subscriptions
+        scope :latest_order!,             ->(reverse = false) { reverse ? earliest_order : latest_order }
+
+        # Orders by earliest (older) first as created_at: :asc.
+        # This method is to be overridden in implementation for each ORM.
+        # @return [ActiveRecord_AssociationRelation<Notificaion>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by earliest first
+        scope :earliest_order!,           -> { earliest_order }
+
+        # Orders by latest (newest) first as subscribed_at: :desc.
+        # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by latest subscribed_at first
+        scope :latest_subscribed_order,   -> { order(subscribed_at: :desc) }
+
+        # Orders by earliest (older) first as subscribed_at: :asc.
+        # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by earliest subscribed_at first
+        scope :earliest_subscribed_order, -> { order(subscribed_at: :asc) }
+
+        # Orders by key name as key: :asc.
+        # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by key name
+        scope :key_order,                 -> { order(key: :asc) }
+
+        # Convert Time value to store in database as Hash value.
+        # @param [Time] time Time value to store in database as Hash value
+        # @return [Time, Object] Converted Time value
+        def self.convert_time_as_hash(time)
+          time
         end
-        filtered_subscriptions
-      }
-
-      # Orders by latest (newest) first as created_at: :desc.
-      # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by latest first
-      scope :latest_order,              -> { order(created_at: :desc) }
-
-      # Orders by earliest (older) first as created_at: :asc.
-      # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by earliest first
-      scope :earliest_order,            -> { order(created_at: :asc) }
-
-      # Orders by latest (newest) first as subscribed_at: :desc.
-      # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by latest subscribed_at first
-      scope :latest_subscribed_order,   -> { order(subscribed_at: :desc) }
-
-      # Orders by earliest (older) first as subscribed_at: :asc.
-      # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by earliest subscribed_at first
-      scope :earliest_subscribed_order, -> { order(subscribed_at: :asc) }
-
-      # Orders by key name as key: :asc.
-      # @return [ActiveRecord_AssociationRelation<Subscription>, Mongoid::Criteria<Notificaion>] Database query of subscriptions ordered by key name
-      scope :key_order,                 -> { order(key: :asc) }
+      end
+      # :only-rails5-plus#only-rails-with-callback-issue#except-dynamoid:
+      # :only-rails5-plus#only-rails-without-callback-issue#except-dynamoid:
+      # :except-rails5-plus#only-rails-with-callback-issue#except-dynamoid:
+      # :except-rails5-plus#only-rails-without-callback-issue#except-dynamoid:
     end
 
     class_methods do
@@ -95,7 +123,7 @@ module ActivityNotification
         optional_target_names.each do |optional_target_name|
           new_attributes[:optional_targets] = new_attributes[:optional_targets].merge(
             Subscription.to_optional_target_key(optional_target_name) => true,
-            Subscription.to_optional_target_subscribed_at_key(optional_target_name) => subscribed_at)
+            Subscription.to_optional_target_subscribed_at_key(optional_target_name) => Subscription.convert_time_as_hash(subscribed_at))
         end
       end
       update(new_attributes)
@@ -114,7 +142,7 @@ module ActivityNotification
       optional_target_names.each do |optional_target_name|
         new_attributes[:optional_targets] = new_attributes[:optional_targets].merge(
           Subscription.to_optional_target_key(optional_target_name) => false,
-          Subscription.to_optional_target_unsubscribed_at_key(optional_target_name) => subscribed_at)
+          Subscription.to_optional_target_unsubscribed_at_key(optional_target_name) => Subscription.convert_time_as_hash(subscribed_at))
       end
       update(new_attributes)
     end
@@ -161,7 +189,7 @@ module ActivityNotification
       subscribed_at = options[:subscribed_at] || Time.current
       update(optional_targets: optional_targets.merge(
         Subscription.to_optional_target_key(optional_target_name) => true,
-        Subscription.to_optional_target_subscribed_at_key(optional_target_name) => subscribed_at)
+        Subscription.to_optional_target_subscribed_at_key(optional_target_name) => Subscription.convert_time_as_hash(subscribed_at))
       )
     end
 
@@ -175,7 +203,7 @@ module ActivityNotification
       unsubscribed_at = options[:unsubscribed_at] || Time.current
       update(optional_targets: optional_targets.merge(
         Subscription.to_optional_target_key(optional_target_name) => false,
-        Subscription.to_optional_target_unsubscribed_at_key(optional_target_name) => unsubscribed_at)
+        Subscription.to_optional_target_unsubscribed_at_key(optional_target_name) => Subscription.convert_time_as_hash(unsubscribed_at))
       )
     end
 
@@ -185,7 +213,6 @@ module ActivityNotification
       optional_targets.keys.select { |key| key.to_s.start_with?("subscribing_to_") }.map { |key| key.slice(15..-1) }
     end
 
-
     protected
 
       # Validates subscribing_to_email cannot be true when subscribing is false.

data/lib/activity_notification/common.rb

@@ -106,20 +106,20 @@ module ActivityNotification
     # Convets to singularized model name (resource name).
     # @return [String] Singularized model name (resource name)
     def to_resource_name
-      self.class.name.demodulize.singularize.underscore
+      self.to_class_name.demodulize.singularize.underscore
     end
 
     # Convets to pluralized model name (resources name).
     # @return [String] Pluralized model name (resources name)
     def to_resources_name
-      self.class.name.demodulize.pluralize.underscore
+      self.to_class_name.demodulize.pluralize.underscore
     end
 
     # Convets to printable model type name to be humanized.
     # @return [String] Printable model type name
     # @todo Is this the best to make readable?
     def printable_type
-      "#{self.class.name.demodulize.humanize}"
+      "#{self.to_class_name.demodulize.humanize}"
     end
 
     # Convets to printable model name to show in view or email.

data/lib/activity_notification/config.rb

@@ -1,6 +1,12 @@
 module ActivityNotification
   # Class used to initialize configuration object.
   class Config
+
+    # @overload :orm
+    #   Returns ORM name for ActivityNotification (:active_record, :mongoid or :dynamodb)
+    #   @return [Boolean] ORM name for ActivityNotification (:active_record, :mongoid or :dynamodb).
+    attr_reader :orm
+
     # @overload enabled
     #   Returns whether ActivityNotification is enabled
     #   @return [Boolean] Whether ActivityNotification is enabled.
@@ -10,16 +16,6 @@ module ActivityNotification
     #   @return [Boolean] Whether ActivityNotification is enabled.
     attr_accessor :enabled
 
-    # @deprecated as of 1.1.0
-    # @overload table_name
-    #   Returns table name to store notifications
-    #   @return [String] Table name to store notifications.
-    # @overload table_name=(value)
-    #   Sets table name to store notifications
-    #   @param [String] table_name The new notification_table_name
-    #   @return [String] Table name to store notifications.
-    attr_accessor :table_name
-
     # @overload notification_table_name
     #   Returns table name to store notifications
     #   @return [String] Table name to store notifications.
@@ -110,6 +106,15 @@ module ActivityNotification
     #   @return [String] Base controller class for notifications_controller.
     attr_accessor :parent_controller
 
+    # @overload parent_channel
+    #   Returns base channel class for notification_channel
+    #   @return [String] Base channel class for notification_channel.
+    # @overload parent_channel=(value)
+    #   Sets base channel class for notification_channel
+    #   @param [String] parent_channel The new parent_channel
+    #   @return [String] Base channel class for notification_channel.
+    attr_accessor :parent_channel
+
     # @overload mailer_templates_dir
     #   Returns custom mailer templates directory
     #   @return [String] Custom mailer templates directory.
@@ -137,37 +142,88 @@ module ActivityNotification
     #   @return [Symbol] ActiveJob queue name for delayed notifications.
     attr_accessor :active_job_queue
 
-    # @overload :orm
-    #   Returns ORM name for ActivityNotification (:active_record or :mongoid)
-    #   @return [Boolean] ORM name for ActivityNotification (:active_record or :mongoid).
-    attr_reader :orm
+    # @overload composite_key_delimiter
+    #   Returns Delimiter of composite key for DynamoDB
+    #   @return [String] Delimiter of composite key for DynamoDB.
+    # @overload composite_key_delimiter=(value)
+    #   Sets delimiter of composite key for DynamoDB
+    #   @param [Symbol] composite_key_delimiter The new delimiter of composite key for DynamoDB
+    #   @return [Symbol] Delimiter of composite key for DynamoDB.
+    attr_accessor :composite_key_delimiter
+
+    # @overload store_with_associated_records
+    #   Returns whether activity_notification stores notificaion records including associated records like target and notifiable
+    #   @return [Boolean] Whether activity_notification stores notificaion records including associated records like target and notifiable.
+    attr_reader :store_with_associated_records
+
+    # @overload action_cable_enabled
+    #   Returns whether WebSocket subscription using ActionCable is enabled
+    #   @return [Boolean] Whether WebSocket subscription using ActionCable is enabled.
+    # @overload action_cable_enabled=(value)
+    #   Sets whether WebSocket subscription using ActionCable is enabled
+    #   @param [Boolean] action_cable_enabled The new action_cable_enabled
+    #   @return [Boolean] Whether WebSocket subscription using ActionCable is enabled.
+    attr_accessor :action_cable_enabled
+
+    # @overload action_cable_with_devise
+    #   Returns whether activity_notification publishes WebSocket notifications using ActionCable only to authenticated target with Devise
+    #   @return [Boolean] Whether activity_notification publishes WebSocket notifications using ActionCable only to authenticated target with Devise.
+    # @overload action_cable_with_devise=(value)
+    #   Sets whether activity_notification publishes WebSocket notifications using ActionCable only to authenticated target with Devise
+    #   @param [Boolean] action_cable_with_devise The new action_cable_with_devise
+    #   @return [Boolean] Whether activity_notification publishes WebSocket notifications using ActionCable only to authenticated target with Devise.
+    attr_accessor :action_cable_with_devise
+
+    # @overload notification_channel_prefix
+    #   Returns notification channel prefix for ActionCable
+    #   @return [String] Notification channel prefix for ActionCable.
+    # @overload notification_channel_prefix=(value)
+    #   Sets notification channel prefix for ActionCable
+    #   @param [String] notification_channel_prefix The new notification_channel_prefix
+    #   @return [String] Notification channel prefix for ActionCable.
+    attr_accessor :notification_channel_prefix
 
     # Initialize configuration for ActivityNotification.
-    # These configuration can be overriden in initializer.
+    # These configuration can be overridden in initializer.
     # @return [Config] A new instance of Config
     def initialize
-      @enabled                 = true
-      @notification_table_name = 'notifications'
-      @subscription_table_name = 'subscriptions'
-      @email_enabled           = false
-      @subscription_enabled    = false
-      @subscribe_as_default    = true
-      @mailer_sender           = nil
-      @mailer                  = 'ActivityNotification::Mailer'
-      @parent_mailer           = 'ActionMailer::Base'
-      @parent_job              = 'ActiveJob::Base'
-      @parent_controller       = 'ApplicationController'
-      @mailer_templates_dir    = 'activity_notification/mailer'
-      @opened_index_limit      = 10
-      @active_job_queue        = :activity_notification
-      @orm                     = :active_record
+      @enabled                       = true
+      @orm                           = :active_record
+      @notification_table_name       = 'notifications'
+      @subscription_table_name       = 'subscriptions'
+      @email_enabled                 = false
+      @subscription_enabled          = false
+      @subscribe_as_default          = true
+      @mailer_sender                 = nil
+      @mailer                        = 'ActivityNotification::Mailer'
+      @parent_mailer                 = 'ActionMailer::Base'
+      @parent_job                    = 'ActiveJob::Base'
+      @parent_controller             = 'ApplicationController'
+      @parent_channel                = 'ActionCable::Channel::Base'
+      @mailer_templates_dir          = 'activity_notification/mailer'
+      @opened_index_limit            = 10
+      @active_job_queue              = :activity_notification
+      @composite_key_delimiter       = '#'
+      @store_with_associated_records = false
+      @action_cable_enabled          = false
+      @action_cable_with_devise      = false
+      @notification_channel_prefix   = 'activity_notification_channel'
     end
 
-    # Sets ORM name for ActivityNotification (:active_record or :mongoid)
-    # @param [Symbol, String] orm The new ORM name for ActivityNotification (:active_record or :mongoid)
-    # @return [Symbol] ORM name for ActivityNotification (:active_record or :mongoid).
+    # Sets ORM name for ActivityNotification (:active_record, :mongoid or :dynamodb)
+    # @param [Symbol, String] orm The new ORM name for ActivityNotification (:active_record, :mongoid or :dynamodb)
+    # @return [Symbol] ORM name for ActivityNotification (:active_record, :mongoid or :dynamodb).
     def orm=(orm)
       @orm = orm.to_sym
     end
+
+    # Sets whether activity_notification stores notificaion records including associated records like target and notifiable.
+    # This store_with_associated_records option can be set true only when you use mongoid or dynamoid ORM.
+    # @param [Boolean] store_with_associated_records The new store_with_associated_records
+    # @return [Boolean] Whether activity_notification stores notificaion records including associated records like target and notifiable.
+    def store_with_associated_records=(store_with_associated_records)
+      if store_with_associated_records && [:mongoid, :dynamoid].exclude?(@orm) then raise ActivityNotification::ConfigError, "config.store_with_associated_records can be set true only when you use mongoid or dynamoid ORM." end
+      @store_with_associated_records = store_with_associated_records
+    end
   end
 end

data/lib/activity_notification/controllers/common_controller.rb

@@ -42,7 +42,7 @@ module ActivityNotification
       end
 
       # Sets options to load resource index from request parameters.
-      # This method is to be overriden.
+      # This method is to be overridden.
       # @api protected
       # @return [Hash] options to load resource index
       def set_index_options
@@ -50,7 +50,7 @@ module ActivityNotification
       end
 
       # Loads resource index with request parameters.
-      # This method is to be overriden.
+      # This method is to be overridden.
       # @api protected
       # @return [Array] Array of resource index
       def load_index
@@ -58,7 +58,7 @@ module ActivityNotification
       end
 
       # Returns controller path.
-      # This method is called from target_view_path method and can be overriden.
+      # This method is called from target_view_path method and can be overridden.
       # @api protected
       # @return [String] "activity_notification" as controller path
       def controller_path
@@ -101,17 +101,29 @@ module ActivityNotification
       # @api protected
       # @return [Boolean] True
       def compatibly_redirect_back(request_params = {})
-        # :only-rails5+:
+        # :only-rails5-plus#only-rails-with-callback-issue:
+        # :only-rails5-plus#only-rails-without-callback-issue:
+        # :only-rails5-plus#only-rails-with-callback-issue#except-dynamoid:
+        # :only-rails5-plus#only-rails-without-callback-issue#except-dynamoid:
         if Rails::VERSION::MAJOR >= 5
           redirect_back fallback_location: { action: :index }, **request_params
-        # :only-rails5+:
-        # :except-rails5+:
+        # :only-rails5-plus#only-rails-with-callback-issue:
+        # :only-rails5-plus#only-rails-without-callback-issue:
+        # :only-rails5-plus#only-rails-with-callback-issue#except-dynamoid:
+        # :only-rails5-plus#only-rails-without-callback-issue#except-dynamoid:
+        # :except-rails5-plus#only-rails-with-callback-issue:
+        # :except-rails5-plus#only-rails-without-callback-issue:
+        # :except-rails5-plus#only-rails-with-callback-issue#except-dynamoid:
+        # :except-rails5-plus#only-rails-without-callback-issue#except-dynamoid:
         elsif request.referer
           redirect_to :back, **request_params
         else
           redirect_to action: :index, **request_params
         end
-        # :except-rails5+:
+        # :except-rails5-plus#only-rails-with-callback-issue:
+        # :except-rails5-plus#only-rails-without-callback-issue:
+        # :except-rails5-plus#only-rails-with-callback-issue#except-dynamoid:
+        # :except-rails5-plus#only-rails-without-callback-issue#except-dynamoid:
         true
       end
   end

data/lib/activity_notification/helpers/errors.rb

@@ -0,0 +1,4 @@
+module ActivityNotification
+  class ConfigError < StandardError; end
+  class DeleteRestrictionError < StandardError; end
+end

data/lib/activity_notification/helpers/view_helpers.rb

@@ -18,7 +18,7 @@ module ActivityNotification
       if notifications.is_a? ActivityNotification::Notification
         notifications.render self, options
       elsif notifications.respond_to?(:map)
-        return nil if notifications.empty?
+        return nil if (notifications.respond_to?(:empty?) ? notifications.empty? : notifications.to_a.empty?)
         notifications.map {|notification| notification.render self, options.dup }.join.html_safe
       end
     end

data/lib/activity_notification/models/concerns/notifiable.rb

@@ -12,22 +12,23 @@ module ActivityNotification
       include Rails.application.routes.url_helpers
 
       # Has many notification instances for this notifiable.
-      # Dependency for these notifications can be overriden from acts_as_notifiable.
+      # Dependency for these notifications can be overridden from acts_as_notifiable.
       # @scope instance
       # @return [Array<Notificaion>, Mongoid::Criteria<Notificaion>] Array or database query of notifications for this notifiable
       has_many_records :generated_notifications_as_notifiable,
         class_name: "::ActivityNotification::Notification",
         as: :notifiable
 
-      class_attribute  :_notification_targets,
-                       :_notification_group,
-                       :_notification_group_expiry_delay,
-                       :_notifier,
-                       :_notification_parameters,
-                       :_notification_email_allowed,
-                       :_notifiable_path,
-                       :_printable_notifiable_name,
-                       :_optional_targets
+      class_attribute :_notification_targets,
+                      :_notification_group,
+                      :_notification_group_expiry_delay,
+                      :_notifier,
+                      :_notification_parameters,
+                      :_notification_email_allowed,
+                      :_notification_action_cable_allowed,
+                      :_notifiable_path,
+                      :_printable_notifiable_name,
+                      :_optional_targets
       set_notifiable_class_defaults
     end
 
@@ -47,21 +48,22 @@ module ActivityNotification
       # Sets default values to notifiable class fields.
       # @return [NilClass] nil
       def set_notifiable_class_defaults
-        self._notification_targets            = {}
-        self._notification_group              = {}
-        self._notification_group_expiry_delay = {}
-        self._notifier                        = {}
-        self._notification_parameters         = {}
-        self._notification_email_allowed      = {}
-        self._notifiable_path                 = {}
-        self._printable_notifiable_name       = {}
-        self._optional_targets                = {}
+        self._notification_targets              = {}
+        self._notification_group                = {}
+        self._notification_group_expiry_delay   = {}
+        self._notifier                          = {}
+        self._notification_parameters           = {}
+        self._notification_email_allowed        = {}
+        self._notification_action_cable_allowed = {}
+        self._notifiable_path                   = {}
+        self._printable_notifiable_name         = {}
+        self._optional_targets                  = {}
         nil
       end
     end
 
-    # Returns notification targets from configured field or overriden method.
-    # This method is able to be overriden.
+    # Returns notification targets from configured field or overridden method.
+    # This method is able to be overridden.
     #
     # @param [String] target_type Target type to notify
     # @param [Hash] options Options for notifications
@@ -82,8 +84,8 @@ module ActivityNotification
       resolved_parameter
     end
 
-    # Returns group unit of the notifications from configured field or overriden method.
-    # This method is able to be overriden.
+    # Returns group unit of the notifications from configured field or overridden method.
+    # This method is able to be overridden.
     #
     # @param [String] target_type Target type to notify
     # @param [String] key Key of the notification
@@ -96,8 +98,8 @@ module ActivityNotification
         key)
     end
 
-    # Returns group expiry period of the notifications from configured field or overriden method.
-    # This method is able to be overriden.
+    # Returns group expiry period of the notifications from configured field or overridden method.
+    # This method is able to be overridden.
     #
     # @param [String] target_type Target type to notify
     # @param [String] key Key of the notification
@@ -110,8 +112,8 @@ module ActivityNotification
         key)
     end
 
-    # Returns additional notification parameters from configured field or overriden method.
-    # This method is able to be overriden.
+    # Returns additional notification parameters from configured field or overridden method.
+    # This method is able to be overridden.
     #
     # @param [String] target_type Target type to notify
     # @param [String] key Key of the notification
@@ -124,8 +126,8 @@ module ActivityNotification
         key)
     end
 
-    # Returns notifier of the notification from configured field or overriden method.
-    # This method is able to be overriden.
+    # Returns notifier of the notification from configured field or overridden method.
+    # This method is able to be overridden.
     #
     # @param [String] target_type Target type to notify
     # @param [String] key Key of the notification
@@ -138,8 +140,8 @@ module ActivityNotification
         key)
     end
 
-    # Returns if sending notification email is allowed for the notifiable from configured field or overriden method.
-    # This method is able to be overriden.
+    # Returns if sending notification email is allowed for the notifiable from configured field or overridden method.
+    # This method is able to be overridden.
     #
     # @param [Object] target Target instance to notify
     # @param [String] key Key of the notification
@@ -152,8 +154,22 @@ module ActivityNotification
         target, key)
     end
 
-    # Returns notifiable_path to move after opening notification from configured field or overriden method.
-    # This method is able to be overriden.
+    # Returns if publishing WebSocket using ActionCable is allowed for the notifiable from configured field or overridden method.
+    # This method is able to be overridden.
+    #
+    # @param [Object] target Target instance to notify
+    # @param [String] key Key of the notification
+    # @return [Boolean] If publishing WebSocket using ActionCable is allowed for the notifiable
+    def notification_action_cable_allowed?(target, key = nil)
+      resolve_parameter(
+        "notification_action_cable_allowed_for_#{cast_to_resources_name(target.class)}?",
+        _notification_action_cable_allowed[cast_to_resources_sym(target.class)],
+        ActivityNotification.config.action_cable_enabled,
+        target, key)
+    end
+
+    # Returns notifiable_path to move after opening notification from configured field or overridden method.
+    # This method is able to be overridden.
     #
     # @param [String] target_type Target type to notify
     # @param [String] key Key of the notification
@@ -186,8 +202,8 @@ module ActivityNotification
         target, key)
     end
 
-    # Returns optional_targets of the notification from configured field or overriden method.
-    # This method is able to be overriden.
+    # Returns optional_targets of the notification from configured field or overridden method.
+    # This method is able to be overridden.
     #
     # @param [String] target_type Target type to notify
     # @param [String] key Key of the notification
@@ -200,8 +216,8 @@ module ActivityNotification
         key)
     end
 
-    # Returns optional_target names of the notification from configured field or overriden method.
-    # This method is able to be overriden.
+    # Returns optional_target names of the notification from configured field or overridden method.
+    # This method is able to be overridden.
     #
     # @param [String] target_type Target type to notify
     # @param [String] key Key of the notification
@@ -353,7 +369,7 @@ module ActivityNotification
     end
 
     # Returns default key of the notification.
-    # This method is able to be overriden.
+    # This method is able to be overridden.
     # "#{to_resource_name}.default" is defined as default key.
     #
     # @return [String] Default key of the notification
@@ -362,7 +378,7 @@ module ActivityNotification
     end
 
     # Returns key of the notification for tracked notifiable creation.
-    # This method is able to be overriden.
+    # This method is able to be overridden.
     # "#{to_resource_name}.create" is defined as default creation key.
     #
     # @return [String] Key of the notification for tracked notifiable creation
@@ -371,7 +387,7 @@ module ActivityNotification
     end
 
     # Returns key of the notification for tracked notifiable update.
-    # This method is able to be overriden.
+    # This method is able to be overridden.
     # "#{to_resource_name}.update" is defined as default update key.
     #
     # @return [String] Key of the notification for tracked notifiable update
@@ -384,10 +400,10 @@ module ActivityNotification
       # Used to transform parameter value from configured field or defined method.
       # @api private
       #
-      # @param [String] target_typed_method_name Method name overriden for the target type
+      # @param [String] target_typed_method_name Method name overridden for the target type
       # @param [Object] parameter_field Parameter Configured field in this model
       # @param [Object] default_value Default parameter value
-      # @param [Array] args Arguments to pass to the method overriden or defined as parameter field
+      # @param [Array] args Arguments to pass to the method overridden or defined as parameter field
       # @return [Object] Resolved parameter value
       def resolve_parameter(target_typed_method_name, parameter_field, default_value, *args)
         if respond_to?(target_typed_method_name)
@@ -419,20 +435,12 @@ module ActivityNotification
         generated_notifications = generated_notifications_as_notifiable_for(target_type)
         case dependent
         when :restrict_with_exception
-          ActivityNotification::Notification.raise_delete_restriction_error("generated_notifications_as_notifiable_for_#{target_type.to_s.pluralize.underscore}") unless generated_notifications.empty?
+          ActivityNotification::Notification.raise_delete_restriction_error("generated_notifications_as_notifiable_for_#{target_type.to_s.pluralize.underscore}") unless generated_notifications.to_a.empty?
         when :restrict_with_error
-          unless generated_notifications.empty?
+          unless generated_notifications.to_a.empty?
             record = self.class.human_attribute_name("generated_notifications_as_notifiable_for_#{target_type.to_s.pluralize.underscore}").downcase
             self.errors.add(:base, :'restrict_dependent_destroy.has_many', record: record)
-            # :only-rails5+:
-            if Rails::VERSION::MAJOR >= 5
-              throw(:abort)
-            # :only-rails5+:
-            # :except-rails5+:
-            else
-              false
-            end
-            # :except-rails5+:
+            if Rails::VERSION::MAJOR >= 5 then throw(:abort) else false end
           end
         when :destroy
           generated_notifications.each { |n| n.destroy }