activity_notification 2.1.4 → 2.2.3

data/spec/rails_app/config/environments/test.rb

@@ -13,17 +13,8 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  if Rails::VERSION::MAJOR >= 5
-    config.public_file_server.enabled = true
-  else
-    config.serve_static_files = true
-  end
-
-  if Rails::VERSION::MAJOR >= 5
-    config.public_file_server.headers = {'Cache-Control' => 'public, max-age=3600'}
-  else
-    config.static_cache_control = "public, max-age=3600"
-  end
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {'Cache-Control' => 'public, max-age=3600'}
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = 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'
@@ -87,4 +97,8 @@ ActivityNotification.configure do |config|
   # Configure notification API channel prefix for ActionCable.
   config.notification_api_channel_prefix = 'activity_notification_api_channel'
 
+  # Configure if activity_notification internally rescues optional target errors. Default value is true.
+  # See https://github.com/simukappu/activity_notification/issues/155 for more details.
+  config.rescue_optional_target_errors = true
+
 end

data/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"
 }

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 ENV["RAILS_ENV"] ||= "test"
+Warning[:deprecated] = true if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.2")
 
 require 'bundler/setup'
 Bundler.setup
@@ -25,11 +26,6 @@ SimpleCov.start('rails') do
     add_filter '/lib/activity_notification/orm/mongoid'
     add_filter '/lib/activity_notification/orm/dynamoid'
   end
-  if Rails::VERSION::MAJOR < 5
-    add_filter '/app/channels/'
-    add_filter '/lib/activity_notification/optional_targets/action_cable_channel'
-    add_filter '/lib/activity_notification/optional_targets/action_cable_api_channel'
-  end
 end
 
 # Dummy application

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.3
 platform: ruby
 authors:
 - Shota Yamazaki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2022-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -316,10 +316,10 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/pull_request_template.md"
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -385,11 +385,12 @@ files:
 - docs/Functions.md
 - docs/Setup.md
 - docs/Testing.md
-- gemfiles/Gemfile.rails-4.2
 - 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
 - lib/activity_notification.rb
 - lib/activity_notification/apis/notification_api.rb
 - lib/activity_notification/apis/subscription_api.rb
@@ -662,13 +663,12 @@ files:
 - spec/roles/acts_as_notifier_spec.rb
 - spec/roles/acts_as_target_spec.rb
 - spec/spec_helper.rb
-- spec/support/patch_rails_42_action_controller_test_response.rb
 - spec/version_spec.rb
 homepage: https://github.com/simukappu/activity_notification
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -683,8 +683,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Integrated user activity notifications for Ruby on Rails
 test_files:
@@ -882,5 +882,4 @@ test_files:
 - spec/roles/acts_as_notifier_spec.rb
 - spec/roles/acts_as_target_spec.rb
 - spec/spec_helper.rb
-- spec/support/patch_rails_42_action_controller_test_response.rb
 - spec/version_spec.rb

data/.travis.yml

@@ -1,76 +0,0 @@
-language: ruby
-
-branches:
-  except:
-    - images
-
-rvm:
-#  - 2.7.0 # Need to respond to warnings for Ruby 3.0
-  - 2.6.5
-#  - 2.5.7
-#  - 2.4.9
-#  - 2.3.8 #EOL
-
-gemfile:
-  - gemfiles/Gemfile.rails-4.2
-  - gemfiles/Gemfile.rails-5.0
-  - gemfiles/Gemfile.rails-5.1
-  - gemfiles/Gemfile.rails-5.2
-  - gemfiles/Gemfile.rails-6.0
-
-env:
-  - AN_ORM=active_record
-  - AN_ORM=active_record AN_TEST_DB=mysql
-  - AN_ORM=active_record AN_TEST_DB=postgresql
-  - AN_ORM=mongoid
-  - AN_ORM=mongoid AN_TEST_DB=mongodb
-  - AN_ORM=dynamoid
-
-matrix:
-  exclude:
-    - gemfile: gemfiles/Gemfile.rails-4.2
-      env: AN_ORM=dynamoid
-  include:
-    - rvm: ruby-head
-      gemfile: Gemfile
-      env: AN_ORM=active_record
-    - rvm: ruby-head
-      gemfile: Gemfile
-      env: AN_ORM=mongoid
-    - rvm: ruby-head
-      gemfile: Gemfile
-      env: AN_ORM=dynamoid
-  allow_failures:
-    - rvm: ruby-head
-  fast_finish: true
-
-services:
-  - mysql
-  - postgresql
-  - mongodb
-
-sudo: false
-
-cache: bundler
-
-before_install:
-  # Specify bundler version as '< 2.0' for Rails 4.2
-  - gem install bundler --no-document -v '1.17.3'
-
-install:
-  # Specify bundler version as '< 2.0' for Rails 4.2
-  - bundle _1.17.3_ install
-  - if [ "$AN_ORM" = "dynamoid" ]; then bin/install_dynamodblocal.sh; fi
-
-before_script:
-  # Specify bundler version as '< 2.0' for Rails 4.2
-  - bundle _1.17.3_ update
-  - if [ "$AN_TEST_DB" = "mysql" ]; then mysql -e 'create database activity_notification_test'; fi
-  - if [ "$AN_TEST_DB" = "postgresql" ]; then psql -c 'create database activity_notification_test' -U postgres; fi
-  - if [ "$AN_ORM" = "dynamoid" ]; then bin/start_dynamodblocal.sh; fi
-  - if [ "$AN_ORM" = "dynamoid" ]; then export AWS_DEFAULT_REGION=ap-northeast-1 AWS_ACCESS_KEY_ID=dummy AWS_SECRET_ACCESS_KEY=dummy; fi
-
-script: bundle exec rspec
-
-notifications:
-  email: true

data/spec/support/patch_rails_42_action_controller_test_response.rb

@@ -1,11 +0,0 @@
-# Rails 4.2 call `initialize` inside `recycle!`. However Ruby 2.6 doesn't allow calling `initialize` twice.
-# See for detail: https://github.com/rails/rails/issues/34790
-if RUBY_VERSION.to_f >= 2.6 && Rails::VERSION::MAJOR < 5
-  class ActionController::TestResponse < ActionDispatch::TestResponse
-    def recycle!
-      @mon_mutex_owner_object_id = nil
-      @mon_mutex = nil
-      initialize
-    end
-  end
-end