activity_notification 1.0.2 → 1.1.0

data/lib/activity_notification/models/subscription.rb

@@ -0,0 +1,93 @@
+module ActivityNotification
+  # Subscription model implementation generated by ActivityNotification.
+  class Subscription < ActiveRecord::Base
+    include SubscriptionApi
+    self.table_name = ActivityNotification.config.subscription_table_name
+
+    # Belongs to target instance of this subscription as polymorphic association.
+    # @scope instance
+    # @return [Object] Target instance of this subscription
+    belongs_to :target,               polymorphic: true
+
+    # Serialize parameters Hash
+    serialize  :parameters, Hash
+
+    validates  :target,               presence: true
+    validates  :key,                  presence: true
+    validates_inclusion_of :subscribing,          in: [true, false]
+    validates_inclusion_of :subscribing_to_email, in: [true, false]
+    validate   :subscribing_to_email_cannot_be_true_when_subscribing_is_false
+    validates  :subscribed_at,            presence: true, if:     :subscribing
+    validates  :unsubscribed_at,          presence: true, unless: :subscribing
+    validates  :subscribed_to_email_at,   presence: true, if:     :subscribing_to_email
+    validates  :unsubscribed_to_email_at, presence: true, unless: :subscribing_to_email
+
+    # Selects filtered subscriptions by target instance.
+    #   ActivityNotification::Subscription.filtered_by_target(@user)
+    # is the same as
+    #   @user.subscriptions
+    # @scope class
+    # @param [Object] target Target instance for filter
+    # @return [ActiveRecord_AssociationRelation<Subscription>] Array or database query of filtered subscriptions
+    scope :filtered_by_target,  ->(target)       { where(target: target) }
+
+    # 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>] Array or 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<Notificaion>] Array or 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>] 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>] 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>] 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>] 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>] Database query of subscriptions ordered by key name
+    scope :key_order,                 -> { order(key: :asc) }
+
+    private
+      # Validates subscribing_to_email cannot be true when subscribing isfalse.
+      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
+
+  end
+end

data/lib/activity_notification/rails/routes.rb

@@ -4,7 +4,9 @@ require "active_support/core_ext/hash/slice"
 module ActionDispatch::Routing
   # Extended ActionDispatch::Routing::Mapper implementation to add routing method of ActivityNotification.
   class Mapper
-    # Includes notify_to method for routes, which is responsible to generate all necessary routes for activity_notification.
+    include ActivityNotification::PolymorphicHelpers
+
+    # Includes notify_to method for routes, which is responsible to generate all necessary routes for notifications of activity_notification.
     #
     # When you have an User model configured as a target (e.g. defined acts_as_target),
     # you can create as follows in your routes:
@@ -19,7 +21,7 @@ module ActionDispatch::Routing
     #       { controller:"activity_notification/notifications", action:"destroy", target_type:"users" }
     #     open_all_user_notifications POST   /users/:user_id/notifications/open_all(.:format)
     #       { controller:"activity_notification/notifications", action:"open_all", target_type:"users" }
-    #     move_user_notification      POST   /users/:user_id/notifications/:id/move(.:format)
+    #     move_user_notification      GET    /users/:user_id/notifications/:id/move(.:format)
     #       { controller:"activity_notification/notifications", action:"move", target_type:"users" }
     #     open_user_notification      POST   /users/:user_id/notifications/:id/open(.:format)
     #       { controller:"activity_notification/notifications", action:"open", target_type:"users" }
@@ -37,50 +39,46 @@ module ActionDispatch::Routing
     #       { controller:"activity_notification/notifications_with_devise", action:"destroy", target_type:"users", devise_type:"users" }
     #     open_all_user_notifications POST   /users/:user_id/notifications/open_all(.:format)
     #       { controller:"activity_notification/notifications_with_devise", action:"open_all", target_type:"users", devise_type:"users" }
-    #     move_user_notification      POST   /users/:user_id/notifications/:id/move(.:format)
+    #     move_user_notification      GET    /users/:user_id/notifications/:id/move(.:format)
     #       { controller:"activity_notification/notifications_with_devise", action:"move", target_type:"users", devise_type:"users" }
     #     open_user_notification      POST   /users/:user_id/notifications/:id/open(.:format)
     #       { controller:"activity_notification/notifications_with_devise", action:"open", target_type:"users", devise_type:"users" }
     #
+    # When you would like to define subscription management paths with notification paths,
+    # you can create as follows in your routes:
+    #   notify_to :users, with_subscription: true
+    # or you can also set options for subscription path:
+    #   notify_to :users, with_subscription: { except: [:index] }
+    # If you configure this :with_subscription option with :with_devise option, with_subscription paths are also automatically configured with devise authentication as the same as notifications
+    #   notify_to :users, with_devise: :users, with_subscription: true
+    #
     # @example Define notify_to in config/routes.rb
     #   notify_to :users
     # @example Define notify_to with options
     #   notify_to :users, only: [:open, :open_all, :move]
     # @example Integrated with Devise authentication
     #   notify_to :users, with_devise: :users
+    # @example Define notification paths including subscription paths
+    #   notify_to :users, with_subscription: true
     #
     # @overload notify_to(*resources, *options)
-    #   @param          [Symbol] resources Resources to notify
-    #   @option options [Symbol] :with_devise Devise resources name for devise integration. Devise integration will be enabled by this option.
-    #   @option options [String] :controller  controller option as resources routing
-    #   @option options [Symbol] :as          as option as resources routing
-    #   @option options [Array]  :only        only option as resources routing
-    #   @option options [Array]  :except      except option as resources routing
+    #   @param          [Symbol]       resources Resources to notify
+    #   @option options [Symbol]       :with_devise       (false)          Devise resources name for devise integration. Devise integration will be enabled by this option.
+    #   @option options [Hash|Boolean] :with_subscription (false)          Subscription path options to define subscription management paths with notification paths. Calls subscribed_by routing when truthy value is passed as this option.
+    #   @option options [String]       :model             (:notifications) Model name of notifications
+    #   @option options [String]       :controller        ("activity_notification/notifications" | activity_notification/notifications_with_devise") :controller option as resources routing
+    #   @option options [Symbol]       :as                (nil)            :as option as resources routing
+    #   @option options [Array]        :only              (nil)            :only option as resources routing
+    #   @option options [Array]        :except            (nil)            :except option as resources routing
     # @return [ActionDispatch::Routing::Mapper] Routing mapper instance
     def notify_to(*resources)
-      options = resources.extract_options!
-      
-      #TODO check resources if it includes target module
-
-      if (with_devise = options.delete(:with_devise)).present?
-        options[:controller] ||= "activity_notification/notifications_with_devise"
-        options[:as]         ||= "notifications"
-        #TODO check devise configuration in model
-        devise_defaults        = { devise_type: with_devise.to_s }
-      else
-        options[:controller] ||= "activity_notification/notifications"
-      end
-      options[:except]       ||= []
-      options[:except].concat( [:new, :create, :edit, :update] )
-      notification_resources   = options[:model] || :notifications
+      options = create_options(:notifications, resources.extract_options!, [:new, :create, :edit, :update])
 
-      #TODO other options
-      # :as, :path_prefix, :path_names ...
-
-      resources.each do |resource|
-        self.resources resource, only: :none do
-          options[:defaults] = (devise_defaults || {}).merge({ target_type: resource.to_s })
-          self.resources notification_resources, options do
+      resources.each do |target|
+        self.resources target, only: :none do
+          options[:defaults] = { target_type: target.to_s }.merge(options[:devise_defaults])
+          resources_options = options.select { |key, _| [:with_devise, :with_subscription, :subscription_option, :model, :devise_defaults].exclude? key }
+          self.resources options[:model], resources_options do
             collection do
               post :open_all unless ignore_path?(:open_all, options)
             end
@@ -90,18 +88,135 @@ module ActionDispatch::Routing
             end
           end
         end
+
+        if options[:with_subscription].present? && target.to_s.to_model_class.subscription_enabled?
+          subscribed_by target, options[:subscription_option]
+        end
       end
 
       self
     end
 
+    # Includes subscribed_by method for routes, which is responsible to generate all necessary routes for subscriptions of activity_notification.
+    #
+    # When you have an User model configured as a target (e.g. defined acts_as_target),
+    # you can create as follows in your routes:
+    #   subscribed_by :users
+    # This method creates the needed routes:
+    #   # Subscription routes
+    #     user_subscriptions          GET    /users/:user_id/subscriptions(.:format)
+    #       { controller:"activity_notification/subscriptions", action:"index", target_type:"users" }
+    #     user_subscription           GET    /users/:user_id/subscriptions/:id(.:format)
+    #       { controller:"activity_notification/subscriptions", action:"show", target_type:"users" }
+    #     open_all_user_subscriptions POST   /users/:user_id/subscriptions(.:format)
+    #       { controller:"activity_notification/subscriptions", action:"create", target_type:"users" }
+    #     user_subscription           DELETE /users/:user_id/subscriptions/:id(.:format)
+    #       { controller:"activity_notification/subscriptions", action:"destroy", target_type:"users" }
+    #     open_user_subscription      POST   /users/:user_id/subscriptions/:id/subscribe(.:format)
+    #       { controller:"activity_notification/subscriptions", action:"subscribe", target_type:"users" }
+    #     open_user_subscription      POST   /users/:user_id/subscriptions/:id/unsubscribe(.:format)
+    #       { controller:"activity_notification/subscriptions", action:"unsubscribe", target_type:"users" }
+    #     open_user_subscription      POST   /users/:user_id/subscriptions/:id/subscribe_to_email(.:format)
+    #       { controller:"activity_notification/subscriptions", action:"subscribe_to_email", target_type:"users" }
+    #     open_user_subscription      POST   /users/:user_id/subscriptions/:id/unsubscribe_to_email(.:format)
+    #       { controller:"activity_notification/subscriptions", action:"unsubscribe_to_email", target_type:"users" }
+    #
+    # When you use devise authentication and you want make subscription targets assciated with devise,
+    # you can create as follows in your routes:
+    #   notify_to :users, with_devise: :users
+    # This with_devise option creates the needed routes assciated with devise authentication:
+    #   # Subscription with devise routes
+    #     user_subscriptions          GET    /users/:user_id/subscriptions(.:format)
+    #       { controller:"activity_notification/subscriptions_with_devise", action:"index", target_type:"users", devise_type:"users" }
+    #     user_subscription           GET    /users/:user_id/subscriptions/:id(.:format)
+    #       { controller:"activity_notification/subscriptions_with_devise", action:"show", target_type:"users", devise_type:"users" }
+    #     open_all_user_subscriptions POST   /users/:user_id/subscriptions(.:format)
+    #       { controller:"activity_notification/subscriptions_with_devise", action:"create", target_type:"users", devise_type:"users" }
+    #     user_subscription           DELETE /users/:user_id/subscriptions/:id(.:format)
+    #       { controller:"activity_notification/subscriptions_with_devise", action:"destroy", target_type:"users", devise_type:"users" }
+    #     open_user_subscription      POST   /users/:user_id/subscriptions/:id/subscribe(.:format)
+    #       { controller:"activity_notification/subscriptions_with_devise", action:"subscribe", target_type:"users", devise_type:"users" }
+    #     open_user_subscription      POST   /users/:user_id/subscriptions/:id/unsubscribe(.:format)
+    #       { controller:"activity_notification/subscriptions_with_devise", action:"unsubscribe", target_type:"users", devise_type:"users" }
+    #     open_user_subscription      POST   /users/:user_id/subscriptions/:id/subscribe_to_email(.:format)
+    #       { controller:"activity_notification/subscriptions_with_devise", action:"subscribe_to_email", target_type:"users", devise_type:"users" }
+    #     open_user_subscription      POST   /users/:user_id/subscriptions/:id/unsubscribe_to_email(.:format)
+    #       { controller:"activity_notification/subscriptions_with_devise", action:"unsubscribe_to_email", target_type:"users", devise_type:"users" }
+    #
+    # @example Define subscribed_by in config/routes.rb
+    #   subscribed_by :users
+    # @example Define subscribed_by with options
+    #   subscribed_by :users, except: [:index, :show]
+    # @example Integrated with Devise authentication
+    #   subscribed_by :users, with_devise: :users
+    #
+    # @overload subscribed_by(*resources, *options)
+    #   @param          [Symbol]       resources Resources to notify
+    #   @option options [Symbol]       :with_devise (false)          Devise resources name for devise integration. Devise integration will be enabled by this option.
+    #   @option options [String]       :model       (:subscriptions) Model name of subscriptions
+    #   @option options [String]       :controller  ("activity_notification/subscriptions" | activity_notification/subscriptions_with_devise") :controller option as resources routing
+    #   @option options [Symbol]       :as          (nil)            :as option as resources routing
+    #   @option options [Array]        :only        (nil)            :only option as resources routing
+    #   @option options [Array]        :except      (nil)            :except option as resources routing
+    # @return [ActionDispatch::Routing::Mapper] Routing mapper instance
+    def subscribed_by(*resources)
+      options = create_options(:subscriptions, resources.extract_options!, [:new, :edit, :update])
+
+      resources.each do |target|
+        self.resources target, only: :none do
+          options[:defaults] = { target_type: target.to_s }.merge(options[:devise_defaults])
+          resources_options = options.select { |key, _| [:with_devise, :model, :devise_defaults].exclude? key }
+          self.resources options[:model], resources_options do
+            member do
+              post :subscribe            unless ignore_path?(:subscribe, options)
+              post :unsubscribe          unless ignore_path?(:unsubscribe, options)
+              post :subscribe_to_email   unless ignore_path?(:subscribe_to_email, options)
+              post :unsubscribe_to_email unless ignore_path?(:unsubscribe_to_email, options)
+            end
+          end
+        end
+      end
+
+      self
+    end
+
+
     private
 
+      # Check whether action path is ignored by :except or :only options
+      # @api private
+      # @return [Boolean] Whether action path is ignored
       def ignore_path?(action, options)
-        return true if options[:except].present? and     options[:except].include?(action)
-        return true if options[:only].present?   and not options[:only].include?(action)
+        options[:except].present? &&  options[:except].include?(action) and return true
+        options[:only].present?   && !options[:only].include?(action)   and return true
         false
       end
 
+      # Create options fo routing
+      # @api private
+      # @param [Symbol] resource Name of the resource model
+      # @return [Boolean] Whether action path is ignored
+      def create_options(resource, options = {}, except_actions = [])
+        #TODO check resources if it includes target module
+        resources_name = resource.to_s.pluralize.underscore
+        options[:model] ||= resources_name.to_sym
+        if options[:with_devise].present?
+          options[:controller] ||= "activity_notification/#{resources_name}_with_devise"
+          options[:as]         ||= resources_name
+          #TODO check devise configuration in model
+          options[:devise_defaults] = { devise_type: options[:with_devise].to_s }
+        else
+          options[:controller] ||= "activity_notification/#{resources_name}"
+          options[:devise_defaults] = {}
+        end
+        (options[:except] ||= []).concat(except_actions)
+        if options[:with_subscription].present?
+          options[:subscription_option] = (options[:with_subscription].is_a?(Hash) ? options[:with_subscription] : {})
+                                            .merge(with_devise: options[:with_devise])
+        end
+        #TODO other options like :as, :path_prefix, :path_names ...
+        options
+      end
+
   end
 end

data/lib/activity_notification/renderable.rb

@@ -120,7 +120,6 @@ module ActivityNotification
     # == Variables in templates
     #
     # From within a template there are three variables at your disposal:
-    #
     # * notification
     # * controller
     # * parameters [converted into a HashWithIndifferentAccess]
@@ -136,7 +135,7 @@ module ActivityNotification
     # @param [Hash] params Parameters for rendering notifications
     # @option params [String, Symbol] :target       (nil)                     Target type name to find template or i18n text
     # @option params [String]         :partial_root ("activity_notification/notifications/#{target}", controller.target_view_path, 'activity_notification/notifications/default') Partial template name
-    # @option params [String]         :partial      (self.key.gsub('.', '/')) Root path of partial template
+    # @option params [String]         :partial      (self.key.tr('.', '/'))   Root path of partial template
     # @option params [String]         :layout       (nil)                     Layout template name
     # @option params [String]         :layout_root  ('layouts')               Root path of layout template
     # @option params [String, Symbol] :fallback     (nil)                     Fallback template to use when MissingTemplate is raised. Set :text to use i18n text as fallback.
@@ -172,9 +171,9 @@ module ActivityNotification
     def partial_path(path = nil, root = nil, target = nil)
       controller = ActivityNotification.get_controller         if ActivityNotification.respond_to?(:get_controller)
       root ||= "activity_notification/notifications/#{target}" if target.present?
-      root ||= controller.target_view_path                     if controller.present? and controller.respond_to?(:target_view_path)
+      root ||= controller.target_view_path                     if controller.present? && controller.respond_to?(:target_view_path)
       root ||= 'activity_notification/notifications/default'
-      path ||= self.key.gsub('.', '/')
+      path ||= self.key.tr('.', '/')
       select_path(path, root)
     end
 

data/lib/activity_notification/roles/acts_as_notifiable.rb

@@ -39,6 +39,17 @@ module ActivityNotification
       #     acts_as_notifiable :users, targets: User.all, group: :article
       #   end
       #
+      # * :group_expiry_delay
+      #   * Expiry period of a notification group.
+      #     Notifications will be bundled within the group expiry period.
+      #     This parameter is a optional.
+      # @example All *unopened* notifications to the same target within 1 day will be grouped by `article`
+      #   # app/models/comment.rb
+      #   class Comment < ActiveRecord::Base
+      #     belongs_to :article
+      #     acts_as_notifiable :users, targets: User.all, group: :article, :group_expiry_delay: 1.day
+      #   end
+      #
       # * :notifier
       #   * Notifier of the notification.
       #     This will be stored as notifier with notification record.
@@ -119,6 +130,7 @@ module ActivityNotification
       # @param [Hash] options Options for notifiable model configuration
       # @option options [Symbol, Proc, Array]   :targets                 (nil)                    Targets to send notifications
       # @option options [Symbol, Proc, Object]  :group                   (nil)                    Group unit of the notifications
+      # @option options [Symbol, Proc, Object]  :group_expiry_delay      (nil)                    Expiry period of a notification group
       # @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
@@ -137,7 +149,7 @@ module ActivityNotification
         end
 
         options[:printable_notifiable_name] ||= options.delete(:printable_name)
-        set_acts_as_parameters_for_target(target_type, [:targets, :group, :parameters, :email_allowed], options, "notification_")
+        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, [:notifier, :notifiable_path, :printable_notifiable_name], options)
       end
 
@@ -146,6 +158,7 @@ module ActivityNotification
       def available_notifiable_options
         [ :targets,
           :group,
+          :group_expiry_delay,
           :notifier,
           :parameters,
           :email_allowed,

data/lib/activity_notification/roles/acts_as_target.rb

@@ -85,26 +85,29 @@ 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] :email_allowed   (ActivityNotification.config.email_enabled) Whether activity_notification sends batch notification email to 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, Object]  :devise_resource      (nil)                                              Integrated resource with 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)
-        set_acts_as_parameters([:email, :email_allowed, :devise_resource], options, "notification_")
-          .merge set_acts_as_parameters([:batch_notification_email_allowed, :printable_notification_target_name], options)
+        acts_as_params = set_acts_as_parameters([:email, :email_allowed, :subscription_allowed, :devise_resource], options, "notification_")
+                           .merge set_acts_as_parameters([:batch_notification_email_allowed, :printable_notification_target_name], options)
+        include Subscriber if subscription_enabled?
+        acts_as_params
       end
       alias_method :acts_as_notification_target, :acts_as_target
 
       # 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, :devise_resource, :printable_notification_target_name, :printable_name].freeze
+        [:email, :email_allowed, :batch_email_allowed, :subscription_allowed, :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.0.2"
+  VERSION = "1.1.0"
 end

data/lib/generators/activity_notification/controllers_generator.rb

@@ -6,7 +6,7 @@ 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'].freeze
+      CONTROLLERS = ['notifications', 'notifications_with_devise', 'subscriptions', 'subscriptions_with_devise'].freeze
 
       desc <<-DESC.strip_heredoc
         Create inherited ActivityNotification controllers in your app/controllers folder.
@@ -15,7 +15,7 @@ module ActivityNotification
         If you do no specify a controller, all controllers will be created.
         For example:
 
-          rails generate activity_notification:controllers users -c=notifications
+          rails generate activity_notification:controllers users -c notifications
 
         This will create a controller class at app/controllers/users/notifications_controller.rb like this: