activity_notification 1.4.4 → 2.2.4

data/lib/activity_notification/roles/acts_as_notifiable.rb

@@ -95,6 +95,30 @@ module ActivityNotification
       #     acts_as_notifiable :users, targets: User.all, email_allowed: true
       #   end
       #
+      # * :action_cable_allowed
+      #   * Whether activity_notification publishes notifications to ActionCable channel.
+      #     Specified method or symbol is expected to return true (not nil) or false (nil).
+      #     This parameter is a optional since default value is false.
+      #     To use ActionCable for notifications, action_cable_allowed option of target model must also return true (not nil).
+      #     This can be also configured default option in initializer as action_cable_enabled.
+      # @example Enable notification ActionCable for this notifiable model
+      #   # app/models/comment.rb
+      #   class Comment < ActiveRecord::Base
+      #     acts_as_notifiable :users, targets: User.all, action_cable_allowed: true
+      #   end
+      #
+      # * :action_cable_api_allowed
+      #   * Whether activity_notification publishes notifications to ActionCable API channel.
+      #     Specified method or symbol is expected to return true (not nil) or false (nil).
+      #     This parameter is a optional since default value is false.
+      #     To use ActionCable for notifications, action_cable_allowed option of target model must also return true (not nil).
+      #     This can be also configured default option in initializer as action_cable_api_enabled.
+      # @example Enable notification ActionCable for this notifiable model
+      #   # app/models/comment.rb
+      #   class Comment < ActiveRecord::Base
+      #     acts_as_notifiable :users, targets: User.all, action_cable_api_allowed: true
+      #   end
+      #
       # * :notifiable_path
       #   * Path to redirect from open or move action of notification controller.
       #     You can also use this notifiable_path as notifiable link in notification view.
@@ -115,6 +139,8 @@ module ActivityNotification
       #     Tracked notifications are disabled as default.
       #     When you set true as this :tracked option, default callbacks will be enabled for [:create, :update].
       #     You can use :only, :except and other notify options as hash for this option.
+      #     Tracked notifications are generated synchronously as default configuration.
+      #     You can use :notify_later option as notify options to make tracked notifications generated asynchronously.
       # @example Add all callbacks to generate notifications for creation and update
       #   # app/models/comment.rb
       #   class Comment < ActiveRecord::Base
@@ -133,6 +159,12 @@ module ActivityNotification
       #     belongs_to :article
       #     acts_as_notifiable :users, targets: User.all, tracked: { except: [:update], key: "comment.edited", send_later: false }
       #   end
+      # @example Add callbacks to generate notifications asynchronously for creation only
+      #   # app/models/comment.rb
+      #   class Comment < ActiveRecord::Base
+      #     belongs_to :article
+      #     acts_as_notifiable :users, targets: User.all, tracked: { only: [:create], notify_later: true }
+      #   end
       #
       # * :printable_name or :printable_notifiable_name
       #   * Printable notifiable name.
@@ -188,6 +220,7 @@ module ActivityNotification
       # @option options [Symbol, Proc, Object]  :notifier                (nil)                    Notifier of the notifications
       # @option options [Symbol, Proc, Hash]    :parameters              ({})                     Additional parameters of the notifications
       # @option options [Symbol, Proc, Boolean] :email_allowed           (ActivityNotification.config.email_enabled) Whether activity_notification sends notification email
+      # @option options [Symbol, Proc, Boolean] :action_cable_allowed    (ActivityNotification.config.action_cable_enabled) Whether activity_notification publishes WebSocket using ActionCable
       # @option options [Symbol, Proc, String]  :notifiable_path         (polymorphic_path(self)) Path to redirect from open or move action of notification controller
       # @option options [Boolean, Hash]         :tracked                 (nil)                    Flag or parameters for automatic tracked notifications
       # @option options [Symbol, Proc, String]  :printable_name          (ActivityNotification::Common.printable_name) Printable notifiable name
@@ -206,6 +239,22 @@ module ActivityNotification
           configured_params.update(add_destroy_dependency(target_type, options[:dependent_notifications]))
         end
 
+        if options[:action_cable_allowed] || (ActivityNotification.config.action_cable_enabled && options[:action_cable_allowed] != false)
+          options[:optional_targets] ||= {}
+          require 'activity_notification/optional_targets/action_cable_channel'
+          unless options[:optional_targets].has_key?(ActivityNotification::OptionalTarget::ActionCableChannel)
+            options[:optional_targets][ActivityNotification::OptionalTarget::ActionCableChannel] = {}
+          end
+        end
+
+        if options[:action_cable_api_allowed] || (ActivityNotification.config.action_cable_api_enabled && options[:action_cable_api_allowed] != false)
+          options[:optional_targets] ||= {}
+          require 'activity_notification/optional_targets/action_cable_api_channel'
+          unless options[:optional_targets].has_key?(ActivityNotification::OptionalTarget::ActionCableApiChannel)
+            options[:optional_targets][ActivityNotification::OptionalTarget::ActionCableApiChannel] = {}
+          end
+        end
+
         if options[:optional_targets].is_a?(Hash)
           options[:optional_targets] = arrange_optional_targets_option(options[:optional_targets])
         end
@@ -213,6 +262,7 @@ module ActivityNotification
         options[:printable_notifiable_name] ||= options.delete(:printable_name)
         configured_params
           .merge set_acts_as_parameters_for_target(target_type, [:targets, :group, :group_expiry_delay, :parameters, :email_allowed], options, "notification_")
+          .merge set_acts_as_parameters_for_target(target_type, [:action_cable_allowed, :action_cable_api_allowed], options, "notifiable_")
           .merge set_acts_as_parameters_for_target(target_type, [:notifier, :notifiable_path, :printable_notifiable_name, :optional_targets], options)
       end
 
@@ -225,6 +275,8 @@ module ActivityNotification
           :notifier,
           :parameters,
           :email_allowed,
+          :action_cable_allowed,
+          :action_cable_api_allowed,
           :notifiable_path,
           :printable_notifiable_name, :printable_name,
           :dependent_notifications,
@@ -270,7 +322,17 @@ module ActivityNotification
       # @param [Symbol]        tracked_action    Tracked action (:create or :update)
       # @param [Proc]          tracked_proc      Proc or lambda function to execute
       def add_tracked_callback(tracked_callbacks, tracked_action, tracked_proc)
-        if tracked_callbacks.include? tracked_action
+        return unless tracked_callbacks.include? tracked_action
+
+        # FIXME: Avoid Rails issue that after commit callbacks on update does not triggered when optimistic locking is enabled
+        # See the followings:
+        #   https://github.com/rails/rails/issues/30779
+        #   https://github.com/rails/rails/pull/32167
+
+        # :nocov:
+        if !(Gem::Version.new("5.1.6") <= Rails.gem_version && Rails.gem_version < Gem::Version.new("5.2.2")) && respond_to?(:after_commit)
+          after_commit tracked_proc, on: tracked_action
+        else
           case tracked_action
           when :create
             after_create tracked_proc
@@ -278,6 +340,7 @@ module ActivityNotification
             after_update tracked_proc
           end
         end
+        # :nocov:
       end
 
       # Adds destroy dependency.

data/lib/activity_notification/roles/acts_as_target.rb

@@ -34,10 +34,61 @@ module ActivityNotification
       #     acts_as_target email: :email, email_allowed: :confirmed_at
       #   end
       #
+      # * :batch_email_allowed
+      #   * Whether activity_notification sends batch notification email to this target.
+      #     Specified method or symbol is expected to return true (not nil) or false (nil).
+      #     This parameter is a optional since default value is false.
+      #     To use batch notification email, both of batch_email_allowed and subscription_allowed options must return true (not nil) in target model.
+      #     This can be also configured default option in initializer.
+      # @example Always enable batch email notification for this target
+      #   # app/models/user.rb
+      #   class User < ActiveRecord::Base
+      #     acts_as_target email: :email, batch_email_allowed: true
+      #   end
+      # @example Use confirmed_at of devise field to decide whether activity_notification sends batch notification email to this user
+      #   # app/models/user.rb
+      #   class User < ActiveRecord::Base
+      #     acts_as_target email: :email, batch_email_allowed: :confirmed_at
+      #   end
+      #
+      # * :subscription_allowed
+      #   * Whether activity_notification manages subscriptions of this target.
+      #     Specified method or symbol is expected to return true (not nil) or false (nil).
+      #     This parameter is a optional since default value is false.
+      #     This can be also configured default option in initializer.
+      # @example Subscribe notifications for this target
+      #   # app/models/user.rb
+      #   class User < ActiveRecord::Base
+      #     acts_as_target subscription_allowed: true
+      #   end
+      #
+      # * :action_cable_allowed
+      #   * Whether activity_notification publishes WebSocket notifications using ActionCable to this target.
+      #     Specified method or symbol is expected to return true (not nil) or false (nil).
+      #     This parameter is a optional since default value is false.
+      #     To use ActionCable for notifications, action_cable_enabled option must return true (not nil) in both of notifiable and target model.
+      #     This can be also configured default option in initializer.
+      # @example Enable notification ActionCable for this target
+      #   # app/models/user.rb
+      #   class User < ActiveRecord::Base
+      #     acts_as_target action_cable_allowed: true
+      #   end
+      #
+      # * :action_cable_with_devise
+      #   * Whether activity_notification publishes WebSocket notifications using ActionCable only to authenticated target with Devise.
+      #     Specified method or symbol is expected to return true (not nil) or false (nil).
+      #     This parameter is a optional since default value is false.
+      #     To use ActionCable for notifications, also action_cable_enabled option must return true (not nil) in the target model.
+      # @example Enable notification ActionCable for this target
+      #   # app/models/user.rb
+      #   class User < ActiveRecord::Base
+      #     acts_as_target action_cable_allowed: true, action_cable_with_devise* true
+      #   end
+      #
       # * :devise_resource
       #   * Integrated resource with devise authentication.
       #     This parameter is a optional since `self` is used as default value.
-      #     You also have to configure routing for devise inroutes.rb
+      #     You also have to configure routing for devise in routes.rb
       # @example No :devise_resource is needed when notification target is the same as authenticated resource
       #   # config/routes.rb
       #   devise_for :users
@@ -68,6 +119,42 @@ module ActivityNotification
       #       devise_resource: :user
       #   end
       #
+      # * :current_devise_target
+      #   * Current authenticated target by devise authentication.
+      #     This parameter is a optional since `current_<devise_resource_name>` is used as default value.
+      #     In addition, this parameter is only needed when :devise_default_route in your route.rb is enabled.
+      #     You also have to configure routing for devise in routes.rb
+      # @example No :current_devise_target is needed when notification target is the same as authenticated resource
+      #   # config/routes.rb
+      #   devise_for :users
+      #   notify_to :users
+      #
+      #   # app/models/user.rb
+      #   class User < ActiveRecord::Base
+      #     devise :database_authenticatable, :registerable, :confirmable
+      #     acts_as_target email: :email, email_allowed: :confirmed_at
+      #   end
+      #
+      # @example Send Admin model and use associated User model with devise authentication
+      #   # config/routes.rb
+      #   devise_for :users
+      #   notify_to :admins, with_devise: :users
+      #
+      #   # app/models/user.rb
+      #   class User < ActiveRecord::Base
+      #     devise :database_authenticatable, :registerable, :confirmable
+      #   end
+      #
+      #   # app/models/admin.rb
+      #   class Admin < ActiveRecord::Base
+      #     belongs_to :user
+      #     validates :user, presence: true
+      #     acts_as_notification_target email: :email,
+      #       email_allowed: ->(admin, key) { admin.user.confirmed_at.present? },
+      #       devise_resource: :user,
+      #       current_devise_target: ->(current_user) { current_user.admin }
+      #   end
+      #
       # * :printable_name or :printable_notification_target_name
       #   * Printable notification target name.
       #     This parameter is a optional since `ActivityNotification::Common.printable_name` is used as default value.
@@ -85,19 +172,22 @@ module ActivityNotification
       #   end
       #
       # @param [Hash] options Options for notifiable model configuration
-      # @option options [Symbol, Proc, String]  :email                (nil)                                              Email address to send notification email
-      # @option options [Symbol, Proc, Boolean] :email_allowed        (ActivityNotification.config.email_enabled)        Whether activity_notification sends notification email to this target
-      # @option options [Symbol, Proc, Boolean] :batch_email_allowed  (ActivityNotification.config.email_enabled)        Whether activity_notification sends batch notification email to this target
-      # @option options [Symbol, Proc, Boolean] :subscription_allowed (ActivityNotification.config.subscription_enabled) Whether activity_notification manages subscriptions of this target
-      # @option options [Symbol, Proc, Object]  :devise_resource      (nil)                                              Integrated resource with devise authentication
-      # @option options [Symbol, Proc, String]  :printable_name       (ActivityNotification::Common.printable_name)      Printable notification target name
+      # @option options [Symbol, Proc, String]  :email                    (nil)                                              Email address to send notification email
+      # @option options [Symbol, Proc, Boolean] :email_allowed            (ActivityNotification.config.email_enabled)        Whether activity_notification sends notification email to this target
+      # @option options [Symbol, Proc, Boolean] :batch_email_allowed      (ActivityNotification.config.email_enabled)        Whether activity_notification sends batch notification email to this target
+      # @option options [Symbol, Proc, Boolean] :subscription_allowed     (ActivityNotification.config.subscription_enabled) Whether activity_notification manages subscriptions of this target
+      # @option options [Symbol, Proc, Boolean] :action_cable_allowed     (ActivityNotification.config.action_cable_enabled) Whether activity_notification publishes WebSocket notifications using ActionCable to this target
+      # @option options [Symbol, Proc, Boolean] :action_cable_with_devise (false)                                            Whether activity_notification publishes WebSocket notifications using ActionCable only to authenticated target with Devise
+      # @option options [Symbol, Proc, Object]  :devise_resource          (->(model) { model })                              Integrated resource with devise authentication
+      # @option options [Symbol, Proc, Object]  :current_devise_target    (->(current_resource) { current_resource })        Current authenticated target by devise authentication
+      # @option options [Symbol, Proc, String]  :printable_name           (ActivityNotification::Common.printable_name)      Printable notification target name
       # @return [Hash] Configured parameters as target model
       def acts_as_target(options = {})
         include Target
 
         options[:printable_notification_target_name] ||= options.delete(:printable_name)
         options[:batch_notification_email_allowed] ||= options.delete(:batch_email_allowed)
-        acts_as_params = set_acts_as_parameters([:email, :email_allowed, :subscription_allowed, :devise_resource], options, "notification_")
+        acts_as_params = set_acts_as_parameters([:email, :email_allowed, :subscription_allowed, :action_cable_allowed, :action_cable_with_devise, :devise_resource, :current_devise_target], options, "notification_")
                            .merge set_acts_as_parameters([:batch_notification_email_allowed, :printable_notification_target_name], options)
         include Subscriber if subscription_enabled?
         acts_as_params
@@ -107,7 +197,7 @@ module ActivityNotification
       # Returns array of available target options in acts_as_target.
       # @return [Array<Symbol>] Array of available target options
       def available_target_options
-        [:email, :email_allowed, :batch_email_allowed, :subscription_allowed, :devise_resource, :printable_notification_target_name, :printable_name].freeze
+        [:email, :email_allowed, :batch_email_allowed, :subscription_allowed, :action_cable_enabled, :action_cable_with_devise, :devise_resource, :printable_notification_target_name, :printable_name].freeze
       end
     end
   end

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "1.4.4"
+  VERSION = "2.2.4"
 end

data/lib/activity_notification.rb

@@ -17,6 +17,7 @@ module ActivityNotification
   autoload :Config
   autoload :Renderable
   autoload :VERSION
+  autoload :GEM_VERSION
 
   module Mailers
     autoload :Helpers,        'activity_notification/mailers/helpers'
@@ -56,13 +57,26 @@ module ActivityNotification
 end
 
 # Load ActivityNotification helpers
+require 'activity_notification/helpers/errors'
 require 'activity_notification/helpers/polymorphic_helpers'
 require 'activity_notification/helpers/view_helpers'
 require 'activity_notification/controllers/common_controller'
+require 'activity_notification/controllers/common_api_controller'
 require 'activity_notification/controllers/store_controller'
 require 'activity_notification/controllers/devise_authentication_controller'
 require 'activity_notification/optional_targets/base'
 
+# Load Swagger API references
+require 'activity_notification/apis/swagger'
+require 'activity_notification/models/concerns/swagger/notification_schema'
+require 'activity_notification/models/concerns/swagger/subscription_schema'
+require 'activity_notification/models/concerns/swagger/error_schema'
+require 'activity_notification/controllers/concerns/swagger/notifications_parameters'
+require 'activity_notification/controllers/concerns/swagger/subscriptions_parameters'
+require 'activity_notification/controllers/concerns/swagger/error_responses'
+require 'activity_notification/controllers/concerns/swagger/notifications_api'
+require 'activity_notification/controllers/concerns/swagger/subscriptions_api'
+
 # Load role for models
 require 'activity_notification/models'
 

data/lib/generators/activity_notification/controllers_generator.rb

@@ -6,7 +6,8 @@ module ActivityNotification
     # @example Run controller generator for users as target
     #   rails generate activity_notification:controllers users
     class ControllersGenerator < Rails::Generators::Base
-      CONTROLLERS = ['notifications', 'notifications_with_devise', 'subscriptions', 'subscriptions_with_devise'].freeze
+      CONTROLLERS = ['notifications', 'notifications_with_devise', 'notifications_api', 'notifications_api_with_devise',
+                     'subscriptions', 'subscriptions_with_devise', 'subscriptions_api', 'subscriptions_api_with_devise'].freeze
 
       desc <<-DESC.strip_heredoc
         Create inherited ActivityNotification controllers in your app/controllers folder.

data/lib/generators/templates/activity_notification.rb

@@ -1,14 +1,14 @@
 ActivityNotification.configure do |config|
 
-  # Configure ORM name for ActivityNotification.
-  # Set :active_record or :mongoid.
-  ENV['AN_ORM'] = 'active_record' unless ENV['AN_ORM'] == 'mongoid'
-  config.orm = ENV['AN_ORM']
-
-  # Configure if all activity notifications are enabled.
-  # Set false when you want to turn off activity notifications.
+  # Configure if all activity notifications are enabled
+  # Set false when you want to turn off activity notifications
   config.enabled = true
 
+  # Configure ORM name for ActivityNotification.
+  # Set :active_record, :mongoid or :dynamoid.
+  ENV['AN_ORM'] = 'active_record' if ['mongoid', 'dynamoid'].exclude?(ENV['AN_ORM'])
+  config.orm = ENV['AN_ORM'].to_sym
+
   # Configure table name to store notification data.
   config.notification_table_name = "notifications"
 
@@ -31,6 +31,16 @@ ActivityNotification.configure do |config|
   # Set false when you want to unsubscribe to any notifications as default.
   config.subscribe_as_default = true
 
+  # Configure default email subscription value to use when the subscription record does not configured.
+  # Note that you can configure them for each method calling as default argument.
+  # Set false when you want to unsubscribe to email notifications as default.
+  # config.subscribe_to_email_as_default = true
+
+  # Configure default optional target subscription value to use when the subscription record does not configured.
+  # Note that you can configure them for each method calling as default argument.
+  # Set false when you want to unsubscribe to optinal target notifications as default.
+  # config.subscribe_to_optional_targets_as_default = true
+
   # Configure the e-mail address which will be shown in ActivityNotification::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
   config.mailer_sender = 'please-change-me-at-config-initializers-activity_notification@example.com'
@@ -41,10 +51,54 @@ ActivityNotification.configure do |config|
   # Configure the parent class responsible to send e-mails.
   # config.parent_mailer = 'ActionMailer::Base'
 
+  # Configure the parent job class for delayed notifications.
+  # config.parent_job = 'ActiveJob::Base'
+
   # Configure the parent class for activity_notification controllers.
   # config.parent_controller = 'ApplicationController'
 
+  # Configure the parent class for activity_notification channels.
+  # config.parent_channel = 'ActionCable::Channel::Base'
+
+  # Configure the custom mailer templates directory
+  # config.mailer_templates_dir = 'activity_notification/mailer'
+
   # Configure default limit number of opened notifications you can get from opened* scope
   config.opened_index_limit = 10
 
+  # Configure ActiveJob queue name for delayed notifications.
+  config.active_job_queue = :activity_notification
+
+  # Configure delimiter of composite key for DynamoDB.
+  # config.composite_key_delimiter = '#'
+
+  # Configure if 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.
+  config.store_with_associated_records = false
+
+  # Configure if WebSocket subscription using ActionCable is enabled.
+  # Note that you can configure them for each model by acts_as roles.
+  # Set true when you want to turn on WebSocket subscription using ActionCable as default.
+  config.action_cable_enabled = false
+
+  # Configure if WebSocket API subscription using ActionCable is enabled.
+  # Note that you can configure them for each model by acts_as roles.
+  # Set true when you want to turn on WebSocket API subscription using ActionCable as default.
+  config.action_cable_api_enabled = false
+
+  # Configure if activity_notification publishes WebSocket notifications using ActionCable only to authenticated target with Devise.
+  # Note that you can configure them for each model by acts_as roles.
+  # Set true when you want to use Device integration with WebSocket subscription using ActionCable as default.
+  config.action_cable_with_devise = false
+
+  # Configure notification channel prefix for ActionCable.
+  config.notification_channel_prefix = 'activity_notification_channel'
+
+  # Configure notification API channel prefix for ActionCable.
+  config.notification_api_channel_prefix = 'activity_notification_api_channel'
+
+  # Configure if activity_notification internally rescues optional target errors. Default value is true.
+  # See https://github.com/simukappu/activity_notification/issues/155 for more details.
+  config.rescue_optional_target_errors = true
+
 end

data/lib/generators/templates/controllers/README

@@ -6,8 +6,8 @@ Some setup you must do manually if you haven't yet:
   For example:
 
     Rails.application.routes.draw do
-      notify_to :users,                       controllers: 'users/notifications'
-      notify_to :admins, with_devise: :users, controllers: 'admins/notifications_with_devise'
+      notify_to :users,                       controller: 'users/notifications'
+      notify_to :admins, with_devise: :users, controller: 'admins/notifications_with_devise'
     end
 
 ===============================================================================

data/lib/generators/templates/controllers/notifications_api_controller.rb

@@ -0,0 +1,31 @@
+class <%= @target_prefix %>NotificationsController < ActivityNotification::NotificationsController
+  # GET /:target_type/:target_id/notifications
+  # def index
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/notifications/open_all
+  # def open_all
+  #   super
+  # end
+
+  # GET /:target_type/:target_id/notifications/:id
+  # def show
+  #   super
+  # end
+
+  # DELETE /:target_type/:target_id/notifications/:id
+  # def destroy
+  #   super
+  # end
+
+  # PUT /:target_type/:target_id/notifications/:id/open
+  # def open
+  #   super
+  # end
+
+  # GET /:target_type/:target_id/notifications/:id/move
+  # def move
+  #   super
+  # end
+end

data/lib/generators/templates/controllers/notifications_api_with_devise_controller.rb

@@ -0,0 +1,31 @@
+class <%= @target_prefix %>NotificationsWithDeviseController < ActivityNotification::NotificationsWithDeviseController
+  # GET /:target_type/:target_id/notifications
+  # def index
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/notifications/open_all
+  # def open_all
+  #   super
+  # end
+
+  # GET /:target_type/:target_id/notifications/:id
+  # def show
+  #   super
+  # end
+
+  # DELETE /:target_type/:target_id/notifications/:id
+  # def destroy
+  #   super
+  # end
+
+  # PUT /:target_type/:target_id/notifications/:id/open
+  # def open
+  #   super
+  # end
+
+  # GET /:target_type/:target_id/notifications/:id/move
+  # def move
+  #   super
+  # end
+end

data/lib/generators/templates/controllers/notifications_controller.rb

@@ -19,7 +19,7 @@ class <%= @target_prefix %>NotificationsController < ActivityNotification::Notif
   #   super
   # end
 
-  # POST /:target_type/:target_id/notifications/:id/open
+  # PUT /:target_type/:target_id/notifications/:id/open
   # def open
   #   super
   # end
@@ -28,40 +28,4 @@ class <%= @target_prefix %>NotificationsController < ActivityNotification::Notif
   # def move
   #   super
   # end
-
-  # No action routing
-  # This method needs to be public since it is called from view helper
-  # def target_view_path
-  #   super
-  # end
-
-  # protected
-
-  # def set_target
-  #   super
-  # end
-
-  # def set_notification
-  #   super
-  # end
-
-  # def set_index_options
-  #   super
-  # end
-
-  # def load_index
-  #   super
-  # end
-
-  # def controller_path
-  #   super
-  # end
-
-  # def set_view_prefixes
-  #   super
-  # end
-
-  # def return_back_or_ajax
-  #   super
-  # end
 end

data/lib/generators/templates/controllers/notifications_with_devise_controller.rb

@@ -19,7 +19,7 @@ class <%= @target_prefix %>NotificationsWithDeviseController < ActivityNotificat
   #   super
   # end
 
-  # POST /:target_type/:target_id/notifications/:id/open
+  # PUT /:target_type/:target_id/notifications/:id/open
   # def open
   #   super
   # end
@@ -28,48 +28,4 @@ class <%= @target_prefix %>NotificationsWithDeviseController < ActivityNotificat
   # def move
   #   super
   # end
-
-  # No action routing
-  # This method needs to be public since it is called from view helper
-  # def target_view_path
-  #   super
-  # end
-
-  # protected
-
-  # def set_target
-  #   super
-  # end
-
-  # def set_notification
-  #   super
-  # end
-
-  # def set_index_options
-  #   super
-  # end
-
-  # def load_index
-  #   super
-  # end
-
-  # def controller_path
-  #   super
-  # end
-
-  # def set_view_prefixes
-  #   super
-  # end
-
-  # def return_back_or_ajax
-  #   super
-  # end
-
-  # def authenticate_devise_resource!
-  #   super
-  # end
-
-  # def authenticate_target!
-  #   super
-  # end
 end

data/lib/generators/templates/controllers/subscriptions_api_controller.rb

@@ -0,0 +1,61 @@
+class <%= @target_prefix %>SubscriptionsController < ActivityNotification::SubscriptionsController
+  # GET /:target_type/:target_id/subscriptions
+  # def index
+  #   super
+  # end
+
+  # PUT /:target_type/:target_id/subscriptions
+  # def create
+  #   super
+  # end
+
+  # GET /:target_type/:target_id/subscriptions/find
+  def find
+    super
+  end
+
+  # GET /:target_type/:target_id/subscriptions/optional_target_names
+  def optional_target_names
+    super
+  end
+
+  # GET /:target_type/:target_id/subscriptions/:id
+  # def show
+  #   super
+  # end
+
+  # DELETE /:target_type/:target_id/subscriptions/:id
+  # def destroy
+  #   super
+  # end
+
+  # PUT /:target_type/:target_id/subscriptions/:id/subscribe
+  # def subscribe
+  #   super
+  # end
+
+  # PUT /:target_type/:target_id/subscriptions/:id/unsubscribe
+  # def unsubscribe
+  #   super
+  # end
+
+  # PUT /:target_type/:target_id/subscriptions/:id/subscribe_to_email
+  # def subscribe_to_email
+  #   super
+  # end
+
+  # PUT /:target_type/:target_id/subscriptions/:id/unsubscribe_to_email
+  # def unsubscribe_to_email
+  #   super
+  # end
+
+  # PUT /:target_type/:target_id/subscriptions/:id/subscribe_to_optional_target
+  # def subscribe_to_optional_target
+  #   super
+  # end
+
+  # PUT /:target_type/:target_id/subscriptions/:id/unsubscribe_to_optional_target
+  # def unsubscribe_to_optional_target
+  #   super
+  # end
+end