activity_notification 1.4.4 → 2.2.4

data/lib/activity_notification/apis/subscription_api.rb

@@ -4,55 +4,77 @@ 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])
+      # :nocov:
+      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
+      # :nocov:
     end
 
     class_methods do
@@ -78,6 +100,24 @@ module ActivityNotification
       end
     end
 
+    # Override as_json method for optional_targets representation
+    #
+    # @param [Hash] options Options for as_json method
+    # @return [Hash] Hash representing the subscription model
+    def as_json(options = {})
+      json = super(options).with_indifferent_access
+      optional_targets_json = {}
+      optional_target_names.each do |optional_target_name|
+        optional_targets_json[optional_target_name] = {
+          subscribing:   json[:optional_targets][Subscription.to_optional_target_key(optional_target_name)],
+          subscribed_at: json[:optional_targets][Subscription.to_optional_target_subscribed_at_key(optional_target_name)],
+          unsubscribed_at: json[:optional_targets][Subscription.to_optional_target_unsubscribed_at_key(optional_target_name)]
+        }
+      end
+      json[:optional_targets] = optional_targets_json
+      json
+    end
+
     # Subscribes to the notification and notification email.
     #
     # @param [Hash] options Options for subscribing to the notification
@@ -87,15 +127,15 @@ module ActivityNotification
     # @return [Boolean] If successfully updated subscription instance
     def subscribe(options = {})
       subscribed_at = options[:subscribed_at] || Time.current
-      with_email_subscription = options.has_key?(:with_email_subscription) ? options[:with_email_subscription] : true
-      with_optional_targets   = options.has_key?(:with_optional_targets) ? options[:with_optional_targets] : true
+      with_email_subscription = options.has_key?(:with_email_subscription) ? options[:with_email_subscription] : ActivityNotification.config.subscribe_to_email_as_default
+      with_optional_targets   = options.has_key?(:with_optional_targets) ? options[:with_optional_targets] : ActivityNotification.config.subscribe_to_optional_targets_as_default
       new_attributes = { subscribing: true, subscribed_at: subscribed_at, optional_targets: optional_targets }
       new_attributes = new_attributes.merge(subscribing_to_email: true, subscribed_to_email_at: subscribed_at) if with_email_subscription
       if with_optional_targets
         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 +154,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
@@ -144,7 +184,7 @@ module ActivityNotification
     # @param [Symbol]  optional_target_name Symbol class name of the optional target implementation (e.g. :amazon_sns, :slack)
     # @param [Boolean] subscribe_as_default Default subscription value to use when the subscription record does not configured
     # @return [Boolean] If the target subscribes to the specified optional target
-    def subscribing_to_optional_target?(optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_as_default)
+    def subscribing_to_optional_target?(optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_to_optional_targets_as_default)
       optional_target_key = Subscription.to_optional_target_key(optional_target_name)
       subscribe_as_default ?
         !optional_targets.has_key?(optional_target_key) || optional_targets[optional_target_key] :
@@ -161,7 +201,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 +215,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,17 +225,16 @@ 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 isfalse.
+      # Validates subscribing_to_email cannot be true when subscribing is false.
       def subscribing_to_email_cannot_be_true_when_subscribing_is_false
         if !subscribing && subscribing_to_email?
           errors.add(:subscribing_to_email, "cannot be true when subscribing is false")
         end
       end
 
-      # Validates subscribing_to_optional_target cannot be true when subscribing isfalse.
+      # Validates subscribing_to_optional_target cannot be true when subscribing is false.
       def subscribing_to_optional_target_cannot_be_true_when_subscribing_is_false
         optional_target_names.each do |optional_target_name|
           if !subscribing && subscribing_to_optional_target?(optional_target_name)
@@ -205,4 +244,4 @@ module ActivityNotification
       end
 
   end
-end
+end

data/lib/activity_notification/apis/swagger.rb

@@ -0,0 +1,6 @@
+require 'swagger/blocks'
+
+module ActivityNotification #:nodoc:
+  module Swagger #:nodoc:
+  end
+end

data/lib/activity_notification/common.rb

@@ -16,7 +16,11 @@ module ActivityNotification
     when Symbol
       symbol_method = context.method(thing)
       if symbol_method.arity > 1
-        symbol_method.call(ActivityNotification.get_controller, *args)
+        if args.last.kind_of?(Hash)
+          symbol_method.call(ActivityNotification.get_controller, *args[0...-1], **args[-1])
+        else
+          symbol_method.call(ActivityNotification.get_controller, *args)
+        end
       elsif symbol_method.arity > 0
         symbol_method.call(ActivityNotification.get_controller)
       else
@@ -74,7 +78,11 @@ module ActivityNotification
       when Symbol
         symbol_method = method(thing)
         if symbol_method.arity > 0
-          symbol_method.call(*args)
+          if args.last.kind_of?(Hash)
+            symbol_method.call(*args[0...-1], **args[-1])
+          else
+            symbol_method.call(*args)
+          end
         else
           symbol_method.call
         end
@@ -98,28 +106,31 @@ module ActivityNotification
     end
 
     # Convets to class name.
+    # This function returns base_class name for STI models if the class responds to base_class method.
+    # @see https://github.com/simukappu/activity_notification/issues/89
+    # @see https://github.com/simukappu/activity_notification/pull/139
     # @return [String] Class name
     def to_class_name
-      self.class.name
+      self.class.respond_to?(:base_class) ? self.class.base_class.name : self.class.name
     end
 
     # 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.
@@ -128,4 +139,4 @@ module ActivityNotification
       "#{self.printable_type} (#{id})"
     end
   end
-end
+end

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.
@@ -65,6 +61,18 @@ module ActivityNotification
     #   @return [Boolean] Default subscription value to use when the subscription record does not configured.
     attr_accessor :subscribe_as_default
 
+    # @overload subscribe_to_email_as_default=(value)
+    #   Sets default email subscription value to use when the subscription record does not configured
+    #   @param [Boolean] subscribe_to_email_as_default The new subscribe_to_email_as_default
+    #   @return [Boolean] Default email subscription value to use when the subscription record does not configured.
+    attr_writer :subscribe_to_email_as_default
+
+    # @overload subscribe_to_optional_targets_as_default=(value)
+    #   Sets default optional target subscription value to use when the subscription record does not configured
+    #   @param [Boolean] subscribe_to_optional_targets_as_default The new subscribe_to_optional_targets_as_default
+    #   @return [Boolean] Default optional target subscription value to use when the subscription record does not configured.
+    attr_writer :subscribe_to_optional_targets_as_default
+
     # @overload mailer_sender
     #   Returns email address as sender of notification email
     #   @return [String] Email address as sender of notification email.
@@ -92,6 +100,15 @@ module ActivityNotification
     #   @return [String] Base mailer class for email notification.
     attr_accessor :parent_mailer
 
+    # @overload parent_job
+    #   Returns base job class for delayed notifications
+    #   @return [String] Base job class for delayed notifications.
+    # @overload parent_job=(value)
+    #   Sets base job class for delayed notifications
+    #   @param [String] parent_job The new parent_job
+    #   @return [String] Base job class for delayed notifications.
+    attr_accessor :parent_job
+
     # @overload parent_controller
     #   Returns base controller class for notifications_controller
     #   @return [String] Base controller class for notifications_controller.
@@ -101,6 +118,24 @@ 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.
+    # @overload mailer_templates_dir=(value)
+    #   Sets custom mailer templates directory
+    #   @param [String] mailer_templates_dir The new custom mailer templates directory
+    #   @return [String] Custom mailer templates directory.
+    attr_accessor :mailer_templates_dir
+
     # @overload opened_index_limit
     #   Returns default limit to query for opened notifications
     #   @return [Integer] Default limit to query for opened notifications.
@@ -110,34 +145,145 @@ module ActivityNotification
     #   @return [Integer] Default limit to query for opened notifications.
     attr_accessor :opened_index_limit
 
-    # @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 active_job_queue
+    #   Returns ActiveJob queue name for delayed notifications
+    #   @return [Symbol] ActiveJob queue name for delayed notifications.
+    # @overload active_job_queue=(value)
+    #   Sets ActiveJob queue name for delayed notifications
+    #   @param [Symbol] active_job_queue The new active_job_queue
+    #   @return [Symbol] ActiveJob queue name for delayed notifications.
+    attr_accessor :active_job_queue
+
+    # @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_api_enabled
+    #   Returns whether WebSocket API subscription using ActionCable is enabled
+    #   @return [Boolean] Whether WebSocket API subscription using ActionCable is enabled.
+    # @overload action_cable_api_enabled=(value)
+    #   Sets whether WebSocket API subscription using ActionCable is enabled
+    #   @param [Boolean] action_cable_enabled The new action_cable_api_enabled
+    #   @return [Boolean] Whether WebSocket API subscription using ActionCable is enabled.
+    attr_accessor :action_cable_api_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
+
+    # @overload notification_api_channel_prefix
+    #   Returns notification API channel prefix for ActionCable
+    #   @return [String] Notification API channel prefix for ActionCable.
+    # @overload notification_api_channel_prefix=(value)
+    #   Sets notification API channel prefix for ActionCable
+    #   @param [String] notification_api_channel_prefix The new notification_api_channel_prefix
+    #   @return [String] Notification API channel prefix for ActionCable.
+    attr_accessor :notification_api_channel_prefix
+
+    # @overload rescue_optional_target_errors
+    #   Returns whether activity_notification internally rescues optional target errors
+    #   @return [Boolean] Whether activity_notification internally rescues optional target errors.
+    # @overload rescue_optional_target_errors=(value)
+    #   Sets whether activity_notification internally rescues optional target errors
+    #   @param [Boolean] rescue_optional_target_errors The new rescue_optional_target_errors
+    #   @return [Boolean] Whether activity_notification internally rescues optional target errors.
+    attr_accessor :rescue_optional_target_errors
 
     # 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_controller       = 'ApplicationController'
-      @opened_index_limit      = 10
-      @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
+      @subscribe_to_email_as_default            = nil
+      @subscribe_to_optional_targets_as_default = nil
+      @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_api_enabled                 = false
+      @action_cable_with_devise                 = false
+      @notification_channel_prefix              = 'activity_notification_channel'
+      @notification_api_channel_prefix          = 'activity_notification_api_channel'
+      @rescue_optional_target_errors            = true
     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
+
+    # Returns default email subscription value to use when the subscription record does not configured
+    # @return [Boolean] Default email subscription value to use when the subscription record does not configured.
+    def subscribe_to_email_as_default
+      return false unless @subscribe_as_default
+
+      @subscribe_to_email_as_default.nil? ? @subscribe_as_default : @subscribe_to_email_as_default
+    end
+
+    # Returns default optional target subscription value to use when the subscription record does not configured
+    # @return [Boolean] Default optinal target subscription value to use when the subscription record does not configured.
+    def subscribe_to_optional_targets_as_default
+      return false unless @subscribe_as_default
+
+      @subscribe_to_optional_targets_as_default.nil? ? @subscribe_as_default : @subscribe_to_optional_targets_as_default
+    end
   end
 end

data/lib/activity_notification/controllers/common_api_controller.rb

@@ -0,0 +1,30 @@
+module ActivityNotification
+  # Module included in api controllers to select target
+  module CommonApiController
+    extend ActiveSupport::Concern
+
+    included do
+      rescue_from ActiveRecord::RecordNotFound,      with: :render_resource_not_found if defined?(ActiveRecord)
+      rescue_from Mongoid::Errors::DocumentNotFound, with: :render_resource_not_found if ActivityNotification.config.orm == :mongoid
+      rescue_from Dynamoid::Errors::RecordNotFound,  with: :render_resource_not_found if ActivityNotification.config.orm == :dynamoid
+    end
+
+    protected
+
+      # Override to do nothing instead of JavaScript view for ajax request or redirects to back.
+      # @api protected
+      def return_back_or_ajax
+      end
+
+      # Override to do nothing instead of redirecting to notifiable_path
+      # @api protected
+      def redirect_to_notifiable_path
+      end
+
+      # Override to do nothing instead of redirecting to subscription path
+      # @api protected
+      def redirect_to_subscription_path
+      end
+
+  end
+end