activity_notification 2.1.4 → 2.2.0

data/spec/generators/migration/migration_generator_spec.rb

@@ -31,11 +31,7 @@ describe ActivityNotification::Generators::MigrationGenerator, type: :generator
       describe 'CreateNotifications migration file' do
         subject { file(Dir["tmp/db/migrate/*_create_activity_notification_tables.rb"].first.gsub!('tmp/', '')) }
         it { is_expected.to exist }
-        if Rails::VERSION::MAJOR >= 5
-          it { is_expected.to contain(/class CreateActivityNotificationTables < ActiveRecord::Migration\[\d\.\d\]/) }
-        else
-          it { is_expected.to contain(/class CreateActivityNotificationTables < ActiveRecord::Migration/) }
-        end
+        it { is_expected.to contain(/class CreateActivityNotificationTables < ActiveRecord::Migration\[\d\.\d\]/) }
 
         if ActivityNotification.config.orm == :active_record
           it 'can be executed to migrate scheme' do
@@ -55,11 +51,7 @@ describe ActivityNotification::Generators::MigrationGenerator, type: :generator
       describe 'CreateCustomNotifications migration file' do
         subject { file(Dir["tmp/db/migrate/*_create_custom_notifications.rb"].first.gsub!('tmp/', '')) }
         it { is_expected.to exist }
-        if Rails::VERSION::MAJOR >= 5
-          it { is_expected.to contain(/class CreateCustomNotifications < ActiveRecord::Migration\[\d\.\d\]/) }
-        else
-          it { is_expected.to contain(/class CreateCustomNotifications < ActiveRecord::Migration/) }
-        end
+        it { is_expected.to contain(/class CreateCustomNotifications < ActiveRecord::Migration\[\d\.\d\]/) }
 
         if ActivityNotification.config.orm == :active_record
           it 'can be executed to migrate scheme' do

data/spec/helpers/view_helpers_spec.rb

@@ -1,5 +1,5 @@
 describe ActivityNotification::ViewHelpers, type: :helper do
-  let(:view_context)         { ActionView::Base.new }
+  let(:view_context)         { ActionView::Base.new(ActionView::LookupContext.new(ActionController::Base.view_paths)) }
   let(:notification)         {
     create(:notification, target: create(:confirmed_user))
   }

data/spec/optional_targets/action_cable_api_channel_spec.rb

@@ -1,37 +1,34 @@
-if Rails::VERSION::MAJOR >= 5
-  require 'activity_notification/optional_targets/action_cable_api_channel'
-  describe ActivityNotification::OptionalTarget::ActionCableApiChannel do
-    let(:test_instance) { ActivityNotification::OptionalTarget::ActionCableApiChannel.new(skip_initializing_target: true) }
+require 'activity_notification/optional_targets/action_cable_api_channel'
+describe ActivityNotification::OptionalTarget::ActionCableApiChannel do
+  let(:test_instance) { ActivityNotification::OptionalTarget::ActionCableApiChannel.new(skip_initializing_target: true) }
 
-    describe "as public instance methods" do
-      describe "#to_optional_target_name" do
-        it "is return demodulized symbol class name" do
-          expect(test_instance.to_optional_target_name).to eq(:action_cable_api_channel)
-        end
+  describe "as public instance methods" do
+    describe "#to_optional_target_name" do
+      it "is return demodulized symbol class name" do
+        expect(test_instance.to_optional_target_name).to eq(:action_cable_api_channel)
       end
+    end
 
-      describe "#initialize_target" do
-        it "does not raise NotImplementedError" do
-          test_instance.initialize_target
-        end
+    describe "#initialize_target" do
+      it "does not raise NotImplementedError" do
+        test_instance.initialize_target
       end
+    end
 
-      describe "#notify" do
-        it "does not raise NotImplementedError" do
-          test_instance.notify(create(:notification))
-        end
+    describe "#notify" do
+      it "does not raise NotImplementedError" do
+        test_instance.notify(create(:notification))
       end
     end
+  end
 
-    describe "as protected instance methods" do
-      describe "#render_notification_message" do
-        context "as default" do
-          it "renders notification message as formatted JSON" do
-            expect(test_instance.send(:render_notification_message, create(:notification)).with_indifferent_access[:notification].has_key?(:id)).to be_truthy
-          end
+  describe "as protected instance methods" do
+    describe "#render_notification_message" do
+      context "as default" do
+        it "renders notification message as formatted JSON" do
+          expect(test_instance.send(:render_notification_message, create(:notification)).with_indifferent_access[:notification].has_key?(:id)).to be_truthy
         end
       end
     end
-
   end
 end

data/spec/optional_targets/action_cable_channel_spec.rb

@@ -1,44 +1,41 @@
-if Rails::VERSION::MAJOR >= 5
-  require 'activity_notification/optional_targets/action_cable_channel'
-  describe ActivityNotification::OptionalTarget::ActionCableChannel do
-    let(:test_instance) { ActivityNotification::OptionalTarget::ActionCableChannel.new(skip_initializing_target: true) }
+require 'activity_notification/optional_targets/action_cable_channel'
+describe ActivityNotification::OptionalTarget::ActionCableChannel do
+  let(:test_instance) { ActivityNotification::OptionalTarget::ActionCableChannel.new(skip_initializing_target: true) }
 
-    describe "as public instance methods" do
-      describe "#to_optional_target_name" do
-        it "is return demodulized symbol class name" do
-          expect(test_instance.to_optional_target_name).to eq(:action_cable_channel)
-        end
+  describe "as public instance methods" do
+    describe "#to_optional_target_name" do
+      it "is return demodulized symbol class name" do
+        expect(test_instance.to_optional_target_name).to eq(:action_cable_channel)
       end
+    end
 
-      describe "#initialize_target" do
-        it "does not raise NotImplementedError" do
-          test_instance.initialize_target
-        end
+    describe "#initialize_target" do
+      it "does not raise NotImplementedError" do
+        test_instance.initialize_target
       end
+    end
 
-      describe "#notify" do
-        it "does not raise NotImplementedError" do
-          test_instance.notify(create(:notification))
-        end
+    describe "#notify" do
+      it "does not raise NotImplementedError" do
+        test_instance.notify(create(:notification))
       end
     end
+  end
 
-    describe "as protected instance methods" do
-      describe "#render_notification_message" do
-        context "as default" do
-          it "renders notification message with default template" do
-            expect(test_instance.send(:render_notification_message, create(:notification))).to be_include("<div class='notification_list") 
-          end
+  describe "as protected instance methods" do
+    describe "#render_notification_message" do
+      context "as default" do
+        it "renders notification message with default template" do
+          expect(test_instance.send(:render_notification_message, create(:notification))).to be_include("<div class='notification_list") 
         end
+      end
 
-        context "with unexisting template as fallback option" do
-          it "raise ActionView::MissingTemplate" do
-            expect { expect(test_instance.send(:render_notification_message, create(:notification), fallback: :hoge)) }
-              .to raise_error(ActionView::MissingTemplate)
-          end
+      context "with unexisting template as fallback option" do
+        it "raise ActionView::MissingTemplate" do
+          expect { expect(test_instance.send(:render_notification_message, create(:notification), fallback: :hoge)) }
+            .to raise_error(ActionView::MissingTemplate)
         end
       end
     end
-
   end
 end

data/spec/rails_app/config/application.rb

@@ -24,18 +24,14 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
-require 'action_cable/engine' if Rails::VERSION::MAJOR >= 5
+require 'action_cable/engine'
 
 Bundler.require(*Rails.groups)
 require "activity_notification"
 
 module Dummy
   class Application < Rails::Application
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2 && ENV['AN_TEST_DB'] != 'mongodb'
-      config.active_record.raise_in_transactional_callbacks = true
-    end
-    if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 2 && ENV['AN_TEST_DB'] != 'mongodb'
+    if Gem::Version.new("5.2.0") <= Rails.gem_version && Rails.gem_version < Gem::Version.new("6.0.0") && ENV['AN_TEST_DB'] != 'mongodb'
       config.active_record.sqlite3.represent_boolean_as_integer = true
     end
 

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/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.0
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2020-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -385,7 +385,6 @@ 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
@@ -662,7 +661,6 @@ 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:
@@ -683,7 +681,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Integrated user activity notifications for Ruby on Rails
@@ -882,5 +880,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/gemfiles/Gemfile.rails-4.2

@@ -1,24 +0,0 @@
-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'
-
-group :development do
-  gem 'bullet'
-  gem 'rack-cors'
-end
-
-group :test do
-  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/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