activity_notification 2.1.4 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c77b0e25a955b70ea7753d4591e26eebaa5d8ac3ebd858fc0dbb1457a1443543
-  data.tar.gz: c3f39d43832aca955a9904cc9918ba247bc34b32fb5b9e2a99efdd11fb04fea5
+  metadata.gz: 30c5b3d148d4606e3ebd7c26a14a746180f2ccde5c6197bf28c95aaeceba8d48
+  data.tar.gz: 63454217d875157c64d22dd0e15e947912a73d7f6a1bba371cba05a0973ba680
 SHA512:
-  metadata.gz: 4ff3b5496a2f94cdc794c5fac124cdeb749738eb3b244f58e4622882dfbfdcddeb35518f41d7f801ad0f4c47d8695cc4c157e6d4244ae394fc2797f08f20a826
-  data.tar.gz: 93cf90f670ebca89d40812870f2e4ad526f5f373609a56ece0199ef50f63383204bd624a1e3af3ac65f31d431494fdac19a7c5b1bc62887fd20c961a3cb8daa2
+  metadata.gz: 2c7c724cdf1acb560ed8d02c56f80bc5cddee91fc0537779480efae64a40108f14fdcd55850ca121bf766416dad818dc664bdad196c17ef6ebe38d31c18ed2f2
+  data.tar.gz: 604d78217049389797f3508f621b54e0efd0962c075cf8c500d2b957c52e677584f1ec1eeea326bb12570cbe953c02581b248b9dfff54a80328bbf509b9871ee

data/.github/workflows/build.yml

@@ -0,0 +1,120 @@
+name: build
+
+on:
+  push:
+    branches:
+      - '**'
+      - '!images'
+  pull_request:
+    branches:
+      - '**'
+      - '!images'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile:
+          - gemfiles/Gemfile.rails-5.0
+          - gemfiles/Gemfile.rails-5.1
+          - gemfiles/Gemfile.rails-5.2
+          - gemfiles/Gemfile.rails-6.0
+          - gemfiles/Gemfile.rails-6.1
+          - gemfiles/Gemfile.rails-7.0
+        orm:
+          - active_record
+          - mongoid
+          - dynamoid
+        include:
+          # https://www.ruby-lang.org/en/downloads
+          - gemfile: gemfiles/Gemfile.rails-5.0
+            ruby-version: 2.7.5
+          - gemfile: gemfiles/Gemfile.rails-5.1
+            ruby-version: 2.7.5
+          - gemfile: gemfiles/Gemfile.rails-5.2
+            ruby-version: 2.7.5
+          - gemfile: gemfiles/Gemfile.rails-6.0
+            ruby-version: 3.0.3
+          - gemfile: gemfiles/Gemfile.rails-6.1
+            ruby-version: 3.0.3
+          - gemfile: gemfiles/Gemfile.rails-7.0
+            ruby-version: 3.0.3
+          - gemfile: Gemfile
+            ruby-version: 3.0.3
+            orm: active_record
+            test-db: mysql
+          - gemfile: Gemfile
+            ruby-version: 3.0.3
+            orm: active_record
+            test-db: postgresql
+          - gemfile: Gemfile
+            ruby-version: 3.0.3
+            orm: mongoid
+            test-db: mongodb
+          - gemfile: Gemfile
+            ruby-version: head
+            orm: active_record
+            allow_failures: 'true'
+        exclude:
+          - gemfile: gemfiles/Gemfile.rails-6.0
+            orm: dynamoid
+          - gemfile: gemfiles/Gemfile.rails-6.1
+            orm: dynamoid
+          - gemfile: gemfiles/Gemfile.rails-7.0
+            orm: dynamoid
+
+    env:
+      RAILS_ENV: test
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
+      AN_ORM: ${{ matrix.orm }}
+      AN_TEST_DB: ${{ matrix.test-db }}
+      AWS_DEFAULT_REGION: ap-northeast-1
+      AWS_ACCESS_KEY_ID: dummy
+      AWS_SECRET_ACCESS_KEY: dummy
+
+    services:
+      mysql:
+        image: mysql
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: activity_notification_test
+        options: --health-cmd "mysqladmin ping -h 127.0.0.1" --health-interval 10s --health-timeout 5s --health-retries 5
+      postgres:
+        image: postgres
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_DB: activity_notification_test
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      mongodb:
+        image: mongo
+        ports:
+          - 27017:27017
+        env:
+          MONGO_INITDB_DATABASE: activity_notification_test
+        options: --health-cmd mongo --health-interval 10s --health-timeout 5s --health-retries 5
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Install dependencies
+        run: |
+          bundle install
+          bundle update
+      - name: Setup Amazon DynamoDB Local
+        if: matrix.orm == 'dynamoid'
+        run: |
+          bin/install_dynamodblocal.sh
+          bin/start_dynamodblocal.sh
+      - name: Run tests with RSpec
+        run: bundle exec rspec
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+## 2.2.3 / 2022-02-12
+[Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.2.2...v2.2.3)
+
+Enhancements:
+
+* Allow use with Rails 7.0 - [#164](https://github.com/simukappu/activity_notification/issues/164) [#165](https://github.com/simukappu/activity_notification/pull/165)
+* Add *rescue_optional_target_errors* config option to capture errors on optional targets - [#155](https://github.com/simukappu/activity_notification/issues/155) [#156](https://github.com/simukappu/activity_notification/pull/156)
+* Remove type definition from several columns with nullable and multiple type in OpenAPI schema
+
+## 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)
+
+Enhancements:
+
+* Allow use with Rails 6.1 - [#152](https://github.com/simukappu/activity_notification/issues/152)
+
+## 2.2.0 / 2020-12-05
+[Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.1.4...v2.2.0)
+
+Enhancements:
+
+* Remove support for Rails 4.2 - [#151](https://github.com/simukappu/activity_notification/issues/151)
+* Turn on deprecation warnings in RSpec testing for Ruby 2.7 - [#122](https://github.com/simukappu/activity_notification/issues/122)
+* Remove Ruby 2.7 deprecation warnings - [#122](https://github.com/simukappu/activity_notification/issues/122)
+
+Breaking Changes:
+
+* Specify DynamoDB global secondary index name
+* Update additional fields to store into DynamoDB when *config.store_with_associated_records* is true
+
 ## 2.1.4 / 2020-11-07
 [Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.1.3...v2.1.4)
 

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://github.com/simukappu/activity_notification/actions/workflows/build.yml/badge.svg)](https://github.com/simukappu/activity_notification/actions/workflows/build.yml)
 [![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)
@@ -10,7 +10,7 @@
 
 *activity_notification* provides integrated user activity notifications for [Ruby on Rails](https://rubyonrails.org). You can easily use it to configure multiple notification targets and make activity notifications with notifiable models, like adding comments, responding etc.
 
-*activity_notification* supports Rails 4.2+ with [ActiveRecord](https://guides.rubyonrails.org/active_record_basics.html), [Mongoid](https://mongoid.org) and [Dynamoid](https://github.com/Dynamoid/dynamoid) ORM. It is tested for [MySQL](https://www.mysql.com), [PostgreSQL](https://www.postgresql.org), [SQLite3](https://www.sqlite.org) with ActiveRecord, [MongoDB](https://www.mongodb.com) with Mongoid and [Amazon DynamoDB](https://aws.amazon.com/dynamodb) with Dynamoid. The latest *activity_notification* [v2](https://rubygems.org/gems/activity_notification) is almost compatible with [v1](https://rubygems.org/gems/activity_notification/versions/1.7.1).
+*activity_notification* supports Rails 5.0+ with [ActiveRecord](https://guides.rubyonrails.org/active_record_basics.html), [Mongoid](https://mongoid.org) and [Dynamoid](https://github.com/Dynamoid/dynamoid) ORM. It is tested for [MySQL](https://www.mysql.com), [PostgreSQL](https://www.postgresql.org), [SQLite3](https://www.sqlite.org) with ActiveRecord, [MongoDB](https://www.mongodb.com) with Mongoid and [Amazon DynamoDB](https://aws.amazon.com/dynamodb) with Dynamoid. If you are using Rails 4.2, use [v2.1.4](https://rubygems.org/gems/activity_notification/versions/2.1.4) or older version of *activity_notification*.
 
 
 ## About

data/activity_notification.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.1.0'
 
-  s.add_dependency 'railties', '>= 4.2.0', '< 6.1'
+  s.add_dependency 'railties', '>= 5.0.0', '< 7.1'
   s.add_dependency 'i18n', '>= 0.5.0'
   s.add_dependency 'jquery-rails', '>= 3.1.1'
   s.add_dependency 'swagger-blocks', '>= 3.0.0'

data/app/controllers/activity_notification/notifications_controller.rb

@@ -117,26 +117,6 @@ module ActivityNotification
       super
     end
 
-    # :nocov:
-    if Rails::VERSION::MAJOR == 4
-      # Defines custom renderer class method for Rails 4.2
-      def self.renderer
-        view_context = ActionView::Base.new(ActionController::Base.view_paths, {})
-        view_context.class_eval do 
-          include Rails.application.routes.url_helpers
-          def default_url_options
-            ActionMailer::Base.default_url_options
-          end
-          def render(params = {})
-            assign(params[:assigns])
-            super(params)
-          end
-        end
-        view_context
-      end
-    end
-    # :nocov:
-
     protected
 
       # Sets @notification instance variable from request parameters.

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/bin/bundle_update.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 bundle update
-BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.2 bundle update
 BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.0 bundle update
 BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.1 bundle update
 BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.2 bundle update

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-4.2 → Gemfile.rails-6.1}

@@ -2,10 +2,7 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'rails', '~> 4.2.0'
-gem 'sqlite3', '~> 1.3.13'
-gem 'mysql2', '~> 0.4.10'
-gem 'pg', '~> 0.21.0'
+gem 'rails', '~> 6.1.0'
 
 group :development do
   gem 'bullet'
@@ -13,6 +10,7 @@ group :development do
 end
 
 group :test do
+  gem 'rails-controller-testing'
   gem 'ammeter'
   gem 'timecop'
   gem 'committee'

data/gemfiles/Gemfile.rails-7.0

@@ -0,0 +1,28 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'rails', '~> 7.0.0'
+# https://github.com/lynndylanhurley/devise_token_auth/pull/1517
+gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth.git'
+# https://jira.mongodb.org/browse/MONGOID-5193
+gem 'mongoid', git: 'https://github.com/mongodb/mongoid.git'
+
+gem 'sprockets-rails'
+
+group :development do
+  gem 'bullet'
+  gem 'rack-cors'
+end
+
+group :test do
+  gem 'rails-controller-testing'
+  gem 'ammeter'
+  gem 'timecop'
+  gem 'committee'
+  gem 'committee-rails'
+  # gem 'coveralls', require: false
+  gem 'coveralls_reborn', require: false
+end
+
+gem 'dotenv-rails', groups: [:development, :test]

data/lib/activity_notification/apis/notification_api.rb

@@ -542,7 +542,11 @@ module ActivityNotification
             [optional_target_name, true]
           rescue => e
             Rails.logger.error(e)
-            [optional_target_name, e]
+            if ActivityNotification.config.rescue_optional_target_errors
+              [optional_target_name, e]
+            else
+              raise e
+            end
           end
         else
           [optional_target_name, false]

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/common.rb

@@ -16,7 +16,11 @@ module ActivityNotification
     when Symbol
       symbol_method = context.method(thing)
       if symbol_method.arity > 1
-        symbol_method.call(ActivityNotification.get_controller, *args)
+        if args.last.kind_of?(Hash)
+          symbol_method.call(ActivityNotification.get_controller, *args[0...-1], **args[-1])
+        else
+          symbol_method.call(ActivityNotification.get_controller, *args)
+        end
       elsif symbol_method.arity > 0
         symbol_method.call(ActivityNotification.get_controller)
       else
@@ -74,7 +78,11 @@ module ActivityNotification
       when Symbol
         symbol_method = method(thing)
         if symbol_method.arity > 0
-          symbol_method.call(*args)
+          if args.last.kind_of?(Hash)
+            symbol_method.call(*args[0...-1], **args[-1])
+          else
+            symbol_method.call(*args)
+          end
         else
           symbol_method.call
         end
@@ -131,4 +139,4 @@ module ActivityNotification
       "#{self.printable_type} (#{id})"
     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.
@@ -201,33 +213,45 @@ module ActivityNotification
     #   @return [String] Notification API channel prefix for ActionCable.
     attr_accessor :notification_api_channel_prefix
 
+    # @overload rescue_optional_target_errors
+    #   Returns whether activity_notification internally rescues optional target errors
+    #   @return [Boolean] Whether activity_notification internally rescues optional target errors.
+    # @overload rescue_optional_target_errors=(value)
+    #   Sets whether activity_notification internally rescues optional target errors
+    #   @param [Boolean] rescue_optional_target_errors The new rescue_optional_target_errors
+    #   @return [Boolean] Whether activity_notification internally rescues optional target errors.
+    attr_accessor :rescue_optional_target_errors
+
     # Initialize configuration for ActivityNotification.
     # These configuration can be 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'
+      @rescue_optional_target_errors            = true
     end
 
     # Sets ORM name for ActivityNotification (:active_record, :mongoid or :dynamodb)
@@ -245,5 +269,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/controllers/common_controller.rb

@@ -130,25 +130,9 @@ module ActivityNotification
             load_index if params[:reload].to_s.to_boolean(true)
             format.js
           else
-            compatibly_redirect_back(@index_options) and return
+            redirect_back(fallback_location: { action: :index }, **@index_options) and return
           end
         end
       end
-
-      # Redirect to back.
-      # @api protected
-      # @return [Boolean] True
-      def compatibly_redirect_back(request_params = {})
-        # :nocov:
-        if Rails::VERSION::MAJOR >= 5
-          redirect_back fallback_location: { action: :index }, **request_params
-        elsif request.referer
-          redirect_to :back, **request_params
-        else
-          redirect_to action: :index, **request_params
-        end
-        # :nocov:
-        true
-      end
   end
 end