activity_notification 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d29e3ff0106686c4b32231c8ffcd70fe1046f8eb02c0740c81c814d21eb969ef
-  data.tar.gz: '0886dc334077573da144b5929dbf623a289796f9a576fe3a0abd04b1bb7ce759'
+  metadata.gz: 30c5b3d148d4606e3ebd7c26a14a746180f2ccde5c6197bf28c95aaeceba8d48
+  data.tar.gz: 63454217d875157c64d22dd0e15e947912a73d7f6a1bba371cba05a0973ba680
 SHA512:
-  metadata.gz: db72a6b3d2babc00e7ae2e6062952719f267ff5c1254e3a187bda52fab18e216f4792fe5de8a4d4ff576bbc2ca6221ef566b559b2916e33f290afa0b5b291961
-  data.tar.gz: 3e17d6dcae61a97efdfd7ca586503d29c84abd1e137c6ff6ecbf682a78e3ee99132037949f3d44c17c6e8a1ad1f6ddf0a283bf35b325b619aa7e12f37d0c63e7
+  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,12 @@
+## 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)
 

data/README.md

@@ -1,6 +1,6 @@
 # ActivityNotification
 
-[![Build Status](https://travis-ci.com/simukappu/activity_notification.svg?branch=master)](https://travis-ci.com/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)

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', '>= 5.0.0', '< 6.2'
+  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/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/config.rb

@@ -213,6 +213,15 @@ 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
@@ -242,6 +251,7 @@ module ActivityNotification
       @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)

data/lib/activity_notification/models/concerns/swagger/notification_schema.rb

@@ -49,22 +49,22 @@ module ActivityNotification
             key :example, "Article"
           end
           property :group_id do
-            key :oneOf, [
-              { type: :integer },
-              { type: :string },
-              { nullable: true }
-            ]
+            # key :oneOf, [
+            #   { type: :integer },
+            #   { type: :string },
+            #   { nullable: true }
+            # ]
             key :description, "This parameter type is integer with ActiveRecord, but will be string with Mongoid or Dynamoid ORMs."
             key :nullable, true
             key :example, 11
           end
           property :group_owner_id do
-            key :oneOf, [
-              { type: :integer },
-              { type: :string },
-              { type: :object },
-              { nullable: true }
-            ]
+            # key :oneOf, [
+            #   { type: :integer },
+            #   { type: :string },
+            #   { type: :object },
+            #   { nullable: true }
+            # ]
             key :description, "This parameter type is integer with ActiveRecord, but will be string or object including $oid with Mongoid or Dynamoid ORMs."
             key :nullable, true
             key :example, 123
@@ -75,11 +75,11 @@ module ActivityNotification
             key :example, "User"
           end
           property :notifier_id do
-            key :oneOf, [
-              { type: :integer },
-              { type: :string },
-              { nullable: true }
-            ]
+            # key :oneOf, [
+            #   { type: :integer },
+            #   { type: :string },
+            #   { nullable: true }
+            # ]
             key :description, "This parameter type is integer with ActiveRecord, but will be string with Mongoid or Dynamoid ORMs."
             key :nullable, true
             key :example, 2

data/lib/activity_notification/version.rb

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

data/lib/generators/templates/activity_notification.rb

@@ -97,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/concerns/apis/notification_api_spec.rb

@@ -136,9 +136,32 @@ shared_examples_for :notification_api do
           Comment._optional_targets[:users] = @current_optional_target
         end
 
-        it "generates notifications even if some optional targets raise error" do
-          notifications = described_class.notify(:users, @comment_2)
-          expect(notifications.size).to eq(2)  
+        context "with true as ActivityNotification.config.rescue_optional_target_errors" do
+          it "generates notifications even if some optional targets raise error" do
+            rescue_optional_target_errors = ActivityNotification.config.rescue_optional_target_errors
+            ActivityNotification.config.rescue_optional_target_errors = true
+            notifications = described_class.notify(:users, @comment_2)
+            expect(notifications.size).to eq(2)
+            ActivityNotification.config.rescue_optional_target_errors = rescue_optional_target_errors
+          end
+        end
+
+        context "with false as ActivityNotification.config.rescue_optional_target_errors" do
+          it "raises an capturable exception" do
+            rescue_optional_target_errors = ActivityNotification.config.rescue_optional_target_errors
+            ActivityNotification.config.rescue_optional_target_errors = false
+            expect { described_class.notify(:users, @comment_2) }.to raise_error(RuntimeError)
+            ActivityNotification.config.rescue_optional_target_errors = rescue_optional_target_errors
+          end
+        end
+
+        it "allows an exception to be captured to continue" do
+          begin
+            notifications = described_class.notify(:users, @comment_2)
+            expect(notifications.size).to eq(2)
+          rescue => e
+            next
+          end
         end
       end
     end

data/spec/rails_app/config/database.yml

@@ -23,7 +23,7 @@ mongodb: &mongodb
 default: &default
   pool: 5
   timeout: 5000
-  host: localhost
+  host: 127.0.0.1
   <<: *<%= ENV['AN_TEST_DB'].blank? ? "sqlite" : ENV['AN_TEST_DB'] %>
 
 development:

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

@@ -97,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Shota Yamazaki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-18 00:00:00.000000000 Z
+date: 2022-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,7 +19,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        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
@@ -390,6 +390,7 @@ files:
 - 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
@@ -667,7 +668,7 @@ homepage: https://github.com/simukappu/activity_notification
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -682,8 +683,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Integrated user activity notifications for Ruby on Rails
 test_files:

data/.travis.yml

@@ -1,70 +0,0 @@
-language: ruby
-
-branches:
-  except:
-    - images
-
-rvm:
-  - 2.7.2
-#  - 2.6.6
-#  - 2.5.8
-#  - 2.4.10 #EOL
-#  - 2.3.8 #EOL
-
-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
-
-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:
-  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
-  exclude:
-    - gemfile: gemfiles/Gemfile.rails-6.1
-      env: AN_ORM=dynamoid
-  allow_failures:
-    - rvm: ruby-head
-  fast_finish: true
-
-services:
-  - mysql
-  - postgresql
-  - mongodb
-
-sudo: false
-
-cache: bundler
-
-install:
-  - bundle install
-  - if [ "$AN_ORM" = "dynamoid" ]; then bin/install_dynamodblocal.sh; fi
-
-before_script:
-  - bundle 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