activity_notification 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0925836406b562667162fcddb33f8c4e872f2da0cb6e4bfef2fa00d727c48b76'
-  data.tar.gz: 1e9a79db20559fb3c19efb494c7b0d137d653fb79fc8db168df70e84b299224a
+  metadata.gz: d29e3ff0106686c4b32231c8ffcd70fe1046f8eb02c0740c81c814d21eb969ef
+  data.tar.gz: '0886dc334077573da144b5929dbf623a289796f9a576fe3a0abd04b1bb7ce759'
 SHA512:
-  metadata.gz: 6c8a1b7f11b9c88350c8565be038c3ac968b850aa8a3f50e683c6c7a4f162e6680c275147db9ad7bbed864b0082984e3e3dfc55bd7cace40592b3017e1ca8b58
-  data.tar.gz: 73f623e03fd9700b24dcbdeabaef9c732e2d22cea15f9b2a1b129812314f6d5dac672d22ed14a93f611903c05f543c344cc3a5e18e3b44d6af3fd677796321e9
+  metadata.gz: db72a6b3d2babc00e7ae2e6062952719f267ff5c1254e3a187bda52fab18e216f4792fe5de8a4d4ff576bbc2ca6221ef566b559b2916e33f290afa0b5b291961
+  data.tar.gz: 3e17d6dcae61a97efdfd7ca586503d29c84abd1e137c6ff6ecbf682a78e3ee99132037949f3d44c17c6e8a1ad1f6ddf0a283bf35b325b619aa7e12f37d0c63e7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.2.2 / 2021-04-18
+[Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.2.1...v2.2.2)
+
+Enhancements:
+
+* Configure default subscriptions for emails and optional targets - [#159](https://github.com/simukappu/activity_notification/issues/159) [#160](https://github.com/simukappu/activity_notification/pull/160)
+* Upgrade gem dependency in tests with Rails 6.1 - [#152](https://github.com/simukappu/activity_notification/issues/152)
+
 ## 2.2.1 / 2021-01-24
 [Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.2.0...v2.2.1)
 

data/README.md

@@ -1,6 +1,6 @@
 # ActivityNotification
 
-[![Build Status](https://travis-ci.org/simukappu/activity_notification.svg?branch=master)](https://travis-ci.org/simukappu/activity_notification)
+[![Build Status](https://travis-ci.com/simukappu/activity_notification.svg?branch=master)](https://travis-ci.com/simukappu/activity_notification)
 [![Coverage Status](https://coveralls.io/repos/github/simukappu/activity_notification/badge.svg?branch=master)](https://coveralls.io/github/simukappu/activity_notification?branch=master)
 [![Dependency](https://img.shields.io/depfu/simukappu/activity_notification.svg)](https://depfu.com/repos/simukappu/activity_notification)
 [![Inline docs](http://inch-ci.org/github/simukappu/activity_notification.svg?branch=master)](http://inch-ci.org/github/simukappu/activity_notification)

data/app/controllers/activity_notification/subscriptions_controller.rb

@@ -91,8 +91,8 @@ module ActivityNotification
     #   @option params [String] :filtered_by_key         (nil)     Key of the subscription for filter
     #   @return [Response] JavaScript view for ajax request or redirects to back as default
     def subscribe
-      @subscription.subscribe(with_email_subscription: params[:with_email_subscription].to_s.to_boolean(true),
-                              with_optional_targets:   params[:with_optional_targets].to_s.to_boolean(true))
+      @subscription.subscribe(with_email_subscription: params[:with_email_subscription].to_s.to_boolean(ActivityNotification.config.subscribe_to_email_as_default),
+                              with_optional_targets:   params[:with_optional_targets].to_s.to_boolean(ActivityNotification.config.subscribe_to_optional_targets_as_default))
       return_back_or_ajax
     end
 

data/app/views/activity_notification/subscriptions/default/_form.html.erb

@@ -37,7 +37,7 @@
         <div class="field">
           <div class="ui checkbox">
             <label>
-              <%= f.check_box :subscribing_to_email, { checked: ActivityNotification.config.subscribe_as_default }, 'true', 'false' %>
+              <%= f.check_box :subscribing_to_email, { checked: ActivityNotification.config.subscribe_to_email_as_default }, 'true', 'false' %>
               <div class="slider"></div>
             </label>
           </div>

data/app/views/activity_notification/subscriptions/default/_notification_keys.html.erb

@@ -38,7 +38,7 @@
             <div class="field">
               <div class="ui checkbox">
                 <label>
-                  <%= f.check_box :subscribing_to_email, { checked: ActivityNotification.config.subscribe_as_default }, 'true', 'false' %>
+                  <%= f.check_box :subscribing_to_email, { checked: ActivityNotification.config.subscribe_to_email_as_default }, 'true', 'false' %>
                   <div class="slider"></div>
                 </label>
               </div>
@@ -56,7 +56,7 @@
                 <div class="ui checkbox">
                   <label>
                     <%= hidden_field_tag "subscription[optional_targets][#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}]", 'false', id: "#{key}_subscription_optional_targets_subscribing_to_#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}_hidden" %>
-                    <%= check_box_tag "subscription[optional_targets][#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}]", 'true', ActivityNotification.config.subscribe_as_default, id: "#{key}_subscription_optional_targets_subscribing_to_#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}_check_box" %>
+                    <%= check_box_tag "subscription[optional_targets][#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}]", 'true', ActivityNotification.config.subscribe_to_optional_targets_as_default, id: "#{key}_subscription_optional_targets_subscribing_to_#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}_check_box" %>
                     <div class="slider"></div>
                   </label>
                 </div>

data/app/views/activity_notification/subscriptions/default/_subscription.html.erb

@@ -24,12 +24,12 @@
           <% end %>
         <% else %>
           <% if ActivityNotification.config.subscribe_as_default %>
-            <%= link_to subscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().find("input").prop("checked", true);$(this).parent().parent().parent().next().next().slideDown();$(this).parent().parent().parent().next().next().find("input").prop("checked", true);', method: :put, remote: true do %>
+            <%= link_to subscribe_path_for(subscription, option_params), onclick: "$(this).find(\"input\").prop(\"checked\", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().find(\"input\").prop(\"checked\", #{ActivityNotification.config.subscribe_to_email_as_default.to_s});$(this).parent().parent().parent().next().next().slideDown();$(this).parent().parent().parent().next().next().find(\"input\").prop(\"checked\", #{ActivityNotification.config.subscribe_to_optional_targets_as_default});", method: :put, remote: true do %>
               <%= check_box :subscribing, "", { checked: false }, 'true', 'false' %>
               <div class="slider"></div>
             <% end %>
           <% else %>
-            <%= link_to subscribe_path_for(subscription, option_params.merge(with_email_subscription: false)), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().next().slideDown();', method: :put, remote: true do %>
+            <%= link_to subscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().next().slideDown();', method: :put, remote: true do %>
               <%= check_box :subscribing, "", { checked: false }, 'true', 'false' %>
               <div class="slider"></div>
             <% end %>

data/app/views/activity_notification/subscriptions/default/index.html.erb

@@ -189,9 +189,9 @@
       $thisFieldWrapper = $(this).parent().parent().parent().parent();
       if ($(this).prop('checked')) {
         $thisFieldWrapper.next().slideDown();
-        $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+        $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_to_email_as_default %>);
         $thisFieldWrapper.next().next().slideDown();
-        $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+        $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_to_optional_targets_as_default %>);
       } else {
         $thisFieldWrapper.next().slideUp();
         $thisFieldWrapper.next().next().slideUp();

data/app/views/activity_notification/subscriptions/default/show.html.erb

@@ -165,9 +165,9 @@
       $thisFieldWrapper = $(this).parent().parent().parent().parent();
       if ($(this).prop('checked')) {
         $thisFieldWrapper.next().slideDown();
-        $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+        $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_to_email_as_default %>);
         $thisFieldWrapper.next().next().slideDown();
-        $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+        $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_to_optional_targets_as_default %>);
       } else {
         $thisFieldWrapper.next().slideUp();
         $thisFieldWrapper.next().next().slideUp();

data/docs/Functions.md

@@ -308,6 +308,8 @@ Subscriptions are managed by instances of **ActivityNotification::Subscription**
 *true* means the target will receive the notification email with this key including batch notification email with this *batch_key*.
 *false* means the target will not receive these notification email.
 
+##### Subscription defaults
+
 As default, all target subscribes to notification and notification email when subscription record does not exist in your database.
 You can change this **subscribe_as_default** parameter in initializer *activity_notification.rb*.
 
@@ -317,6 +319,20 @@ config.subscribe_as_default = false
 
 Then, all target does not subscribe to notification and notification email and will not receive any notifications as default.
 
+As default, email and optional target subscriptions will use the same default subscription value as defined in **subscribe_as_default**.
+You can disable them by providing **subscribe_to_email_as_default** or **subscribe_to_optional_targets_as_default** parameter(s) in initializer *activity_notification.rb*.
+
+```ruby
+# Enable subscribe as default, but disable it for emails
+config.subscribe_as_default = true
+config.subscribe_to_email_as_default = false
+config.subscribe_to_optional_targets_as_default = true
+```
+
+However if **subscribe_as_default** is not enabled, **subscribe_to_email_as_default** and **subscribe_to_optional_targets_as_default** won't change anything.
+
+##### Creating and updating subscriptions
+
 You can create subscription record from subscription API in your target model like this:
 
 ```ruby
@@ -574,7 +590,7 @@ To sign in and get *access-token* from Devise Token Auth, call *sign_in* API whi
 ```console
 $ curl -X POST -H "Content-Type: application/json" -D - -d '{"email": "ichiro@example.com","password": "changeit"}' https://activity-notification-example.herokuapp.com/api/v2/auth/sign_in
 
- 
+
 HTTP/1.1 200 OK
 ...
 Content-Type: application/json; charset=utf-8

data/gemfiles/Gemfile.rails-6.1

@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 gemspec path: '../'
 
 gem 'rails', '~> 6.1.0'
-gem 'mongoid', git: 'https://github.com/mongodb/mongoid.git'
-gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth'
 
 group :development do
   gem 'bullet'

data/lib/activity_notification/apis/subscription_api.rb

@@ -21,7 +21,7 @@ module ActivityNotification
         #   @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 [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 = {}) {
@@ -127,8 +127,8 @@ 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
@@ -184,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] :
@@ -244,4 +244,4 @@ module ActivityNotification
       end
 
   end
-end
+end

data/lib/activity_notification/config.rb

@@ -61,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.
@@ -205,29 +217,31 @@ module ActivityNotification
     # These configuration can be overridden in initializer.
     # @return [Config] A new instance of Config
     def initialize
-      @enabled                         = true
-      @orm                             = :active_record
-      @notification_table_name         = 'notifications'
-      @subscription_table_name         = 'subscriptions'
-      @email_enabled                   = false
-      @subscription_enabled            = false
-      @subscribe_as_default            = true
-      @mailer_sender                   = nil
-      @mailer                          = 'ActivityNotification::Mailer'
-      @parent_mailer                   = 'ActionMailer::Base'
-      @parent_job                      = 'ActiveJob::Base'
-      @parent_controller               = 'ApplicationController'
-      @parent_channel                  = 'ActionCable::Channel::Base'
-      @mailer_templates_dir            = 'activity_notification/mailer'
-      @opened_index_limit              = 10
-      @active_job_queue                = :activity_notification
-      @composite_key_delimiter         = '#'
-      @store_with_associated_records   = false
-      @action_cable_enabled            = false
-      @action_cable_api_enabled        = false
-      @action_cable_with_devise        = false
-      @notification_channel_prefix     = 'activity_notification_channel'
-      @notification_api_channel_prefix = 'activity_notification_api_channel'
+      @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'
     end
 
     # Sets ORM name for ActivityNotification (:active_record, :mongoid or :dynamodb)
@@ -245,5 +259,21 @@ module ActivityNotification
       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/models/concerns/subscriber.rb

@@ -61,7 +61,9 @@ module ActivityNotification
     def build_subscription(subscription_params = {})
       created_at = Time.current
       if subscription_params[:subscribing] == false && subscription_params[:subscribing_to_email].nil?
-        subscription_params[:subscribing_to_email] = subscription_params[:subscribing] 
+        subscription_params[:subscribing_to_email] = subscription_params[:subscribing]
+      elsif subscription_params[:subscribing_to_email].nil?
+        subscription_params[:subscribing_to_email] = ActivityNotification.config.subscribe_to_email_as_default
       end
       subscription = Subscription.new(subscription_params)
       subscription.assign_attributes(target: self)
@@ -157,7 +159,7 @@ module ActivityNotification
       # @param [String]  key                  Key of the notification
       # @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 notification
-      def _subscribes_to_notification_email?(key, subscribe_as_default = ActivityNotification.config.subscribe_as_default)
+      def _subscribes_to_notification_email?(key, subscribe_as_default = ActivityNotification.config.subscribe_to_email_as_default)
         evaluate_subscription(subscriptions.where(key: key).first, :subscribing_to_email?, subscribe_as_default)
       end
       alias_method :_subscribes_to_email?, :_subscribes_to_notification_email?
@@ -170,7 +172,7 @@ module ActivityNotification
       # @param [String, Symbol] optional_target_name 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 _subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_as_default)
+      def _subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_to_optional_targets_as_default)
         _subscribes_to_notification?(key, subscribe_as_default) &&
           evaluate_subscription(subscriptions.where(key: key).first, :subscribing_to_optional_target?, subscribe_as_default, optional_target_name, subscribe_as_default)
       end
@@ -189,4 +191,4 @@ module ActivityNotification
       end
 
   end
-end
+end

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

@@ -541,7 +541,7 @@ module ActivityNotification
     # @param [String]  key                  Key of the notification
     # @param [Boolean] subscribe_as_default Default subscription value to use when the subscription record does not configured
     # @return [Boolean] If the target subscribes the notification email or the subscription management is not allowed for the target
-    def subscribes_to_notification_email?(key, subscribe_as_default = ActivityNotification.config.subscribe_as_default)
+    def subscribes_to_notification_email?(key, subscribe_as_default = ActivityNotification.config.subscribe_to_email_as_default)
       !subscription_allowed?(key) || _subscribes_to_notification_email?(key, subscribe_as_default)
     end
     alias_method :subscribes_to_email?, :subscribes_to_notification_email?
@@ -553,7 +553,7 @@ module ActivityNotification
     # @param [String, Symbol] optional_target_name 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 the notification email or the subscription management is not allowed for the target
-    def subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_as_default)
+    def subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_to_optional_targets_as_default)
       !subscription_allowed?(key) || _subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default)
     end
 
@@ -689,4 +689,4 @@ module ActivityNotification
       end
 
   end
-end
+end

data/lib/activity_notification/orm/active_record/notification.rb

@@ -23,14 +23,14 @@ module ActivityNotification
         # Belongs to group instance of this notification as polymorphic association.
         # @scope instance
         # @return [Object] Group instance of this notification
-        belongs_to :group,         **{ polymorphic: true, optional: true }
+        belongs_to :group,         polymorphic: true, optional: true
 
         # Belongs to group owner notification instance of this notification.
         # Only group member instance has :group_owner value.
         # Group owner instance has nil as :group_owner association.
         # @scope instance
         # @return [Notification] Group owner notification instance of this notification
-        belongs_to :group_owner, **{ class_name: "ActivityNotification::Notification", optional: true }
+        belongs_to :group_owner,   class_name: "ActivityNotification::Notification", optional: true
 
         # Has many group member notification instances of this notification.
         # Only group owner instance has :group_members value.
@@ -42,7 +42,7 @@ module ActivityNotification
         # Belongs to :notifier instance of this notification.
         # @scope instance
         # @return [Object] Notifier instance of this notification
-        belongs_to :notifier,      **{ polymorphic: true, optional: true }
+        belongs_to :notifier,      polymorphic: true, optional: true
 
         # Serialize parameters Hash
         serialize  :parameters, Hash

data/lib/activity_notification/orm/dynamoid/subscription.rb

@@ -21,7 +21,7 @@ module ActivityNotification
 
         field :key,                       :string
         field :subscribing,               :boolean, default: ActivityNotification.config.subscribe_as_default
-        field :subscribing_to_email,      :boolean, default: ActivityNotification.config.subscribe_as_default
+        field :subscribing_to_email,      :boolean, default: ActivityNotification.config.subscribe_to_email_as_default
         field :subscribed_at,             :datetime
         field :unsubscribed_at,           :datetime
         field :subscribed_to_email_at,    :datetime

data/lib/activity_notification/orm/mongoid/subscription.rb

@@ -20,7 +20,7 @@ module ActivityNotification
 
         field :key,                       type: String
         field :subscribing,               type: Boolean, default: ActivityNotification.config.subscribe_as_default
-        field :subscribing_to_email,      type: Boolean, default: ActivityNotification.config.subscribe_as_default
+        field :subscribing_to_email,      type: Boolean, default: ActivityNotification.config.subscribe_to_email_as_default
         field :subscribed_at,             type: DateTime
         field :unsubscribed_at,           type: DateTime
         field :subscribed_to_email_at,    type: DateTime

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

data/lib/generators/templates/activity_notification.rb

@@ -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'
@@ -76,7 +86,7 @@ ActivityNotification.configure do |config|
   # Set true when you want to turn on WebSocket API subscription using ActionCable as default.
   config.action_cable_api_enabled = false
 
-  # Configure if ctivity_notification publishes WebSocket notifications using ActionCable only to authenticated target with Devise.
+  # 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

data/spec/concerns/apis/subscription_api_spec.rb

@@ -45,6 +45,41 @@ shared_examples_for :subscription_api do
           expect(test_instance.subscribed_to_email_at).to         eq(Time.current)
           Timecop.return
         end
+
+        context "with true as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "subscribe with current time" do
+            ActivityNotification.config.subscribe_to_email_as_default = true
+
+            expect(test_instance.subscribing?).to                   eq(false)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            Timecop.freeze(Time.at(Time.now.to_i))
+            test_instance.subscribe
+            expect(test_instance.subscribing?).to                   eq(true)
+            expect(test_instance.subscribing_to_email?).to          eq(true)
+            expect(test_instance.subscribed_at).to                  eq(Time.current)
+            expect(test_instance.subscribed_to_email_at).to         eq(Time.current)
+            Timecop.return
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "subscribe with current time" do
+            ActivityNotification.config.subscribe_to_email_as_default = false
+
+            expect(test_instance.subscribing?).to                   eq(false)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            Timecop.freeze(Time.at(Time.now.to_i))
+            test_instance.subscribe
+            expect(test_instance.subscribing?).to                   eq(true)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            expect(test_instance.subscribed_at).to                  eq(Time.current)
+            Timecop.return
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
       end
 
       context "with subscribed_at option" do
@@ -58,6 +93,39 @@ shared_examples_for :subscription_api do
           expect(test_instance.subscribed_at.to_i).to             eq(subscribed_at.to_i)
           expect(test_instance.subscribed_to_email_at.to_i).to    eq(subscribed_at.to_i)
         end
+
+        context "with true as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "subscribe with current time" do
+            ActivityNotification.config.subscribe_to_email_as_default = true
+
+            expect(test_instance.subscribing?).to                   eq(false)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            subscribed_at = Time.current - 1.months
+            test_instance.subscribe(subscribed_at: subscribed_at)
+            expect(test_instance.subscribing?).to                   eq(true)
+            expect(test_instance.subscribing_to_email?).to          eq(true)
+            expect(test_instance.subscribed_at.to_i).to             eq(subscribed_at.to_i)
+            expect(test_instance.subscribed_to_email_at.to_i).to    eq(subscribed_at.to_i)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "subscribe with current time" do
+            ActivityNotification.config.subscribe_to_email_as_default = false
+
+            expect(test_instance.subscribing?).to                   eq(false)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            subscribed_at = Time.current - 1.months
+            test_instance.subscribe(subscribed_at: subscribed_at)
+            expect(test_instance.subscribing?).to                   eq(true)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            expect(test_instance.subscribed_at.to_i).to             eq(subscribed_at.to_i)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
       end
 
       context "with false as with_email_subscription" do
@@ -79,6 +147,36 @@ shared_examples_for :subscription_api do
           expect(test_instance.subscribing?).to                                     eq(true)
           expect(test_instance.subscribing_to_optional_target?(:console_output)).to eq(true)
         end
+
+        context "with true as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+          it "also subscribes to optional targets" do
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = true
+
+            test_instance.unsubscribe_to_optional_target(:console_output)
+            expect(test_instance.subscribing?).to                                     eq(false)
+            expect(test_instance.subscribing_to_optional_target?(:console_output)).to eq(false)
+            test_instance.subscribe
+            expect(test_instance.subscribing?).to                                     eq(true)
+            expect(test_instance.subscribing_to_optional_target?(:console_output)).to eq(true)
+
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+          it "does not subscribe to optional targets" do
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = false
+
+            test_instance.unsubscribe_to_optional_target(:console_output)
+            expect(test_instance.subscribing?).to                                     eq(false)
+            expect(test_instance.subscribing_to_optional_target?(:console_output)).to eq(false)
+            test_instance.subscribe
+            expect(test_instance.subscribing?).to                                     eq(true)
+            expect(test_instance.subscribing_to_optional_target?(:console_output)).to eq(false)
+
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+          end
+        end
       end
 
       context "with false as with_optional_targets" do
@@ -210,7 +308,7 @@ shared_examples_for :subscription_api do
         test_instance.update(optional_targets: {})
       end
 
-      context "without configured optional target subscpriotion" do
+      context "without configured optional target subscription" do
         context "without subscribe_as_default argument" do
           context "with true as ActivityNotification.config.subscribe_as_default" do
             it "returns true" do
@@ -219,6 +317,28 @@ shared_examples_for :subscription_api do
               expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_truthy
               ActivityNotification.config.subscribe_as_default = subscribe_as_default
             end
+
+            context "with true as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+              it "returns true" do
+                subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                ActivityNotification.config.subscribe_as_default = true
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = true
+                expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_truthy
+                ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+              end
+            end
+
+            context "with false as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+              it "returns false" do
+                subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                ActivityNotification.config.subscribe_as_default = true
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = false
+                expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_falsey
+                ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+              end
+            end
           end
 
           context "with false as ActivityNotification.config.subscribe_as_default" do
@@ -228,11 +348,33 @@ shared_examples_for :subscription_api do
               expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_falsey
               ActivityNotification.config.subscribe_as_default = subscribe_as_default
             end
+
+            context "with true as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+              it "returns false" do
+                subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                ActivityNotification.config.subscribe_as_default = false
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = true
+                expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_falsey
+                ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+              end
+            end
+
+            context "with false as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+              it "returns false" do
+                subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                ActivityNotification.config.subscribe_as_default = false
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = false
+                expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_falsey
+                ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+              end
+            end
           end
         end
       end
 
-      context "with configured subscpriotion" do
+      context "with configured subscription" do
         context "subscribing to optional target" do
           it "returns true" do
             test_instance.subscribe_to_optional_target(:console_output)

data/spec/concerns/models/subscriber_spec.rb

@@ -86,8 +86,65 @@ shared_examples_for :subscriber do
           new_subscription = test_instance.create_subscription(params)
           expect(new_subscription.subscribing?).to           be_truthy
           expect(new_subscription.subscribing_to_email?).to  be_truthy
+          expect(new_subscription.subscribing_to_optional_target?(:console_output)).to be_truthy
           expect(test_instance.subscriptions.reload.size).to eq(1)
         end
+
+        context "with true as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_email_as_default = true
+
+            params = { key: 'key_1' }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_truthy
+            expect(new_subscription.subscribing_to_email?).to  be_truthy
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_email_as_default = false
+
+            params = { key: 'key_1' }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_truthy
+            expect(new_subscription.subscribing_to_email?).to  be_falsey
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
+
+        context "with true as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = true
+
+            params = { key: 'key_1' }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_truthy
+            expect(new_subscription.subscribing_to_optional_target?(:console_output)).to be_truthy
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = false
+
+            params = { key: 'key_1' }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_truthy
+            expect(new_subscription.subscribing_to_optional_target?(:console_output)).to be_falsey
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+          end
+        end
       end
 
       context "with false as subscribing params" do
@@ -98,6 +155,34 @@ shared_examples_for :subscriber do
           expect(new_subscription.subscribing_to_email?).to  be_falsey
           expect(test_instance.subscriptions.reload.size).to eq(1)
         end
+
+        context "with true as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_email_as_default = true
+
+            params = { key: 'key_1', subscribing: false }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_falsey
+            expect(new_subscription.subscribing_to_email?).to  be_falsey
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_email_as_default = false
+
+            params = { key: 'key_1', subscribing: false }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_falsey
+            expect(new_subscription.subscribing_to_email?).to  be_falsey
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
       end
 
       context "with false as subscribing_to_email params" do
@@ -462,7 +547,7 @@ shared_examples_for :subscriber do
           described_class._notification_subscription_allowed = true
         end
 
-        context "without configured subscpriotion" do
+        context "without configured subscription" do
           context "without subscribe_as_default argument" do
             context "with true as ActivityNotification.config.subscribe_as_default" do
               it "returns true" do
@@ -484,7 +569,7 @@ shared_examples_for :subscriber do
           end
         end
 
-        context "with configured subscpriotion" do
+        context "with configured subscription" do
           context "subscribing to notification" do
             it "returns true" do
               subscription = test_instance.create_subscription(key: @test_key)
@@ -521,7 +606,7 @@ shared_examples_for :subscriber do
           described_class._notification_subscription_allowed = true
         end
 
-        context "without configured subscpriotion" do
+        context "without configured subscription" do
           context "without subscribe_as_default argument" do
             context "with true as ActivityNotification.config.subscribe_as_default" do
               it "returns true" do
@@ -530,6 +615,28 @@ shared_examples_for :subscriber do
                 expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_truthy
                 ActivityNotification.config.subscribe_as_default = subscribe_as_default
               end
+
+              context "with true as ActivityNotification.config.subscribe_to_email_as_default" do
+                it "returns true" do
+                  subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                  ActivityNotification.config.subscribe_as_default = true
+                  ActivityNotification.config.subscribe_to_email_as_default = true
+                  expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_truthy
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_email_as_default = nil
+                end
+              end
+
+              context "with false as ActivityNotification.config.subscribe_to_email_as_default" do
+                it "returns false" do
+                  subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                  ActivityNotification.config.subscribe_as_default = true
+                  ActivityNotification.config.subscribe_to_email_as_default = false
+                  expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_falsey
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_email_as_default = nil
+                end
+              end
             end
 
             context "with false as ActivityNotification.config.subscribe_as_default" do
@@ -539,11 +646,33 @@ shared_examples_for :subscriber do
                 expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_falsey
                 ActivityNotification.config.subscribe_as_default = subscribe_as_default
               end
+
+              context "with true as ActivityNotification.config.subscribe_to_email_as_default" do
+                it "returns false" do
+                  subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                  ActivityNotification.config.subscribe_as_default = false
+                  ActivityNotification.config.subscribe_to_email_as_default = true
+                  expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_falsey
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_email_as_default = nil
+                end
+              end
+
+              context "with false as ActivityNotification.config.subscribe_to_email_as_default" do
+                it "returns false" do
+                  subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                  ActivityNotification.config.subscribe_as_default = false
+                  ActivityNotification.config.subscribe_to_email_as_default = false
+                  expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_falsey
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_email_as_default = nil
+                end
+              end
             end
           end
         end
 
-        context "with configured subscpriotion" do
+        context "with configured subscription" do
           context "subscribing to notification email" do
             it "returns true" do
               subscription = test_instance.create_subscription(key: @test_key)
@@ -581,7 +710,7 @@ shared_examples_for :subscriber do
           described_class._notification_subscription_allowed = true
         end
 
-        context "without configured subscpriotion" do
+        context "without configured subscription" do
           context "without subscribe_as_default argument" do
             context "with true as ActivityNotification.config.subscribe_as_default" do
               it "returns true" do
@@ -590,6 +719,28 @@ shared_examples_for :subscriber do
                 expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).to be_truthy
                 ActivityNotification.config.subscribe_as_default = subscribe_as_default
               end
+
+              context "with true as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+                it "returns true" do
+                  subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                  ActivityNotification.config.subscribe_as_default = true
+                  ActivityNotification.config.subscribe_to_optional_targets_as_default = true
+                  expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).to be_truthy
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+                end
+              end
+
+              context "with false as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+                it "returns false" do
+                  subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                  ActivityNotification.config.subscribe_as_default = true
+                  ActivityNotification.config.subscribe_to_optional_targets_as_default = false
+                  expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).to be_falsey
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+                end
+              end
             end
 
             context "with false as ActivityNotification.config.subscribe_as_default" do
@@ -599,11 +750,33 @@ shared_examples_for :subscriber do
                 expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).to be_falsey
                 ActivityNotification.config.subscribe_as_default = subscribe_as_default
               end
+
+              context "with true as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+                it "returns false" do
+                  subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                  ActivityNotification.config.subscribe_as_default = false
+                  ActivityNotification.config.subscribe_to_optional_targets_as_default = true
+                  expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).to be_falsey
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+                end
+              end
+
+              context "with false as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+                it "returns false" do
+                  subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                  ActivityNotification.config.subscribe_as_default = false
+                  ActivityNotification.config.subscribe_to_optional_targets_as_default = false
+                  expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).to be_falsey
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+                end
+              end
             end
           end
         end
 
-        context "with configured subscpriotion" do
+        context "with configured subscription" do
           context "subscribing to the specified optional target" do
             it "returns true" do
               subscription = test_instance.create_subscription(key: @test_key, optional_targets: { ActivityNotification::Subscription.to_optional_target_key(@optional_target_name) => true })

data/spec/rails_app/config/initializers/activity_notification.rb

@@ -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'

data/spec/rails_app/package.json

@@ -2,22 +2,22 @@
   "name": "activity_notification",
   "description": "Sample single page application for activity_notification using Vue.js",
   "dependencies": {
-    "@rails/webpacker": "^4.2.0",
-    "axios": "^0.19.0",
-    "vue": "^2.6.10",
-    "vuex": "^3.1.2",
-    "vuex-persistedstate": "^2.7.0",
-    "vue-loader": "^15.7.2",
-    "vue-router": "^3.1.3",
-    "vue-template-compiler": "^2.6.10",
-    "vue-moment": "^4.1.0",
-    "vue-moment-tz": "^2.1.1",
-    "vue-pluralize": "^0.0.2",
-    "actioncable-vue": "^1.5.1",
-    "push.js": "^1.0.12"
+    "@rails/webpacker": ">=4.3.0",
+    "axios": ">=0.21.1",
+    "vue": ">=2.6.10",
+    "vuex": ">=3.1.2",
+    "vuex-persistedstate": ">=2.7.0",
+    "vue-loader": ">=15.7.2",
+    "vue-router": ">=3.1.3",
+    "vue-template-compiler": ">=2.6.10",
+    "vue-moment": ">=4.1.0",
+    "vue-moment-tz": ">=2.1.1",
+    "vue-pluralize": ">=0.0.2",
+    "actioncable-vue": ">=1.5.1",
+    "push.js": ">=1.0.12"
   },
   "devDependencies": {
-    "webpack-dev-server": "^3.9.0"
+    "webpack-dev-server": ">=3.11.0"
   },
   "license": "MIT"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties