activity_notification 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6640bcffc0f4acb3afd7021387feb76db52dea7a
-  data.tar.gz: 2ecda41bc9b8e3a76e89a10263cdb805eee2cd63
+  metadata.gz: f16ad8322faabd5fec778b470437863df703dcf1
+  data.tar.gz: 87eb45c1c03c92836aa5a72b7b1e07cf2fb8548b
 SHA512:
-  metadata.gz: 961d0f2f0e201522b7e8e2899087dca1f868c0c9950b69d22aa2a69f64a46ddf6d3b0ec3f5f0e5cd22f33afdc27c7670226a3a493ac90848d5496430c6cbfd45
-  data.tar.gz: 2fe01f57e0f14964b77af8d9e9eac995cdb4e8c7a412c8491fe94fe6dd4731a28384dc4c5be4d902591803bcf88b212a88a99002492beda80663f690eeb88eb4
+  metadata.gz: 8a34fa413bd90c2fb8228115bc7f76f12ddb0ca8c7d981f761b10692ec3aa1bd4239781bdd3001c33aa5ed4497e4b7f842d05a77fe3e86ccddaa347df9e8d05f
+  data.tar.gz: ae29b5111bbef97182cd0fdbeab616c332a53779e19cb940afe2300e7672591a7ebb490044b006f97447cdb662371aff46311b7274eefd0ab9923476a7414c87

data/.travis.yml

@@ -5,14 +5,12 @@ branches:
     - images
 
 rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.7
-  - 2.2.10
-  - ruby-head
+  - 2.6.3
+#  - 2.5.5
+#  - 2.4.6
+#  - 2.3.8
 
 gemfile:
-  - Gemfile
   - gemfiles/Gemfile.rails-4.2
   - gemfiles/Gemfile.rails-5.0
   - gemfiles/Gemfile.rails-5.1
@@ -20,51 +18,18 @@ gemfile:
 
 env:
   - AN_ORM=active_record
-  - AN_ORM=mongoid
+  - AN_ORM=active_record AN_TEST_DB=mysql
+  - AN_ORM=active_record AN_TEST_DB=postgresql
+  - AN_ORM=mongoid AN_TEST_DB=mongodb
 
 matrix:
-  exclude:
+  include:
     - rvm: ruby-head
+      gemfile: Gemfile
+      env: AN_ORM=active_record
+    - rvm: ruby-head
+      gemfile: Gemfile
       env: AN_ORM=mongoid
-    - gemfile: Gemfile
-      env: AN_ORM=mongoid
-  include:
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-4.2
-      env: AN_ORM=active_record AN_TEST_DB=mysql
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-4.2
-      env: AN_ORM=active_record AN_TEST_DB=postgresql
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-4.2
-      env: AN_ORM=mongoid AN_TEST_DB=mongodb
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-5.0
-      env: AN_ORM=active_record AN_TEST_DB=mysql
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-5.0
-      env: AN_ORM=active_record AN_TEST_DB=postgresql
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-5.0
-      env: AN_ORM=mongoid AN_TEST_DB=mongodb
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-5.1
-      env: AN_ORM=active_record AN_TEST_DB=mysql
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-5.1
-      env: AN_ORM=active_record AN_TEST_DB=postgresql
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-5.1
-      env: AN_ORM=mongoid AN_TEST_DB=mongodb
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-5.2
-      env: AN_ORM=active_record AN_TEST_DB=mysql
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-5.2
-      env: AN_ORM=active_record AN_TEST_DB=postgresql
-    - rvm: 2.5.1
-      gemfile: gemfiles/Gemfile.rails-5.2
-      env: AN_ORM=mongoid AN_TEST_DB=mongodb
   allow_failures:
     - rvm: ruby-head
   fast_finish: true
@@ -77,14 +42,20 @@ sudo: false
 cache: bundler
 
 before_install:
-  - gem install bundler --no-document
+  # 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
 
 before_script:
-  - bundle update
+  # Specify bundler version as '< 2.0' for Rails 4.2
+  - bundle _1.17.3_ update
   - mysql -e 'create database activity_notification_test'
   - psql -c 'create database activity_notification_test' -U postgres
 
 script: bundle exec rspec
 
 notifications:
-  email: true 
+  email: true

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.7.0 / 2019-04-30
+[Full Changelog](http://github.com/simukappu/activity_notification/compare/v1.7.0...v1.7.1)
+
+Enhancements:
+
+* Use after_commit for tracked callbacks instead of after_create and after_update - [#99](https://github.com/simukappu/activity_notification/issues/99)
+
 ## 1.7.0 / 2018-12-09
 [Full Changelog](http://github.com/simukappu/activity_notification/compare/v1.6.1...v1.7.0)
 

data/activity_notification.gemspec

@@ -24,12 +24,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'i18n', '>= 0.5.0'
   s.add_dependency 'jquery-rails', '>= 3.1.1'
 
-  s.add_development_dependency 'sqlite3', '>= 1.3.13'
+  s.add_development_dependency 'sqlite3', '>= 1.3.13', '< 1.4.0'
   s.add_development_dependency 'mysql2', '>= 0.5.2'
   s.add_development_dependency 'pg', '>= 1.0.0'
   s.add_development_dependency 'mongoid', '>= 4.0.0', '< 7.0.0'
   s.add_development_dependency 'rspec-rails', '>= 3.8.0'
-  s.add_development_dependency 'factory_bot_rails', '>= 4.11.0'
+  s.add_development_dependency 'factory_bot_rails', '>= 4.11.0', '< 5.0.0'
   s.add_development_dependency 'simplecov', '~> 0'
   s.add_development_dependency 'yard', '>= 0.9.16'
   s.add_development_dependency 'yard-activesupport-concern', '>= 0.0.1'

data/lib/activity_notification/controllers/common_controller.rb

@@ -101,17 +101,17 @@ module ActivityNotification
       # @api protected
       # @return [Boolean] True
       def compatibly_redirect_back(request_params = {})
-        # :skip-rails4:
+        # :only-rails5+:
         if Rails::VERSION::MAJOR >= 5
           redirect_back fallback_location: { action: :index }, **request_params
-        # :skip-rails4:
-        # :skip-rails5:
+        # :only-rails5+:
+        # :except-rails5+:
         elsif request.referer
           redirect_to :back, **request_params
         else
           redirect_to action: :index, **request_params
         end
-        # :skip-rails5:
+        # :except-rails5+:
         true
       end
   end

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

@@ -424,15 +424,15 @@ module ActivityNotification
           unless generated_notifications.empty?
             record = self.class.human_attribute_name("generated_notifications_as_notifiable_for_#{target_type.to_s.pluralize.underscore}").downcase
             self.errors.add(:base, :'restrict_dependent_destroy.has_many', record: record)
-            # :skip-rails4:
+            # :only-rails5+:
             if Rails::VERSION::MAJOR >= 5
               throw(:abort)
-            # :skip-rails4:
-            # :skip-rails5:
+            # :only-rails5+:
+            # :except-rails5+:
             else
               false
             end
-            # :skip-rails5:
+            # :except-rails5+:
           end
         when :destroy
           generated_notifications.each { |n| n.destroy }

data/lib/activity_notification/roles/acts_as_notifiable.rb

@@ -278,7 +278,18 @@ module ActivityNotification
       # @param [Symbol]        tracked_action    Tracked action (:create or :update)
       # @param [Proc]          tracked_proc      Proc or lambda function to execute
       def add_tracked_callback(tracked_callbacks, tracked_action, tracked_proc)
-        if tracked_callbacks.include? tracked_action
+        return unless tracked_callbacks.include? tracked_action
+
+        # FIXME: Avoid Rails issue that after commit callbacks on update does not triggered when optimistic locking is enabled
+        # See the followings:
+        #   https://github.com/rails/rails/issues/30779
+        #   https://github.com/rails/rails/pull/32167
+        # :only-rails-without-callback-issue:
+        if !(Gem::Version.new("5.1.6") <= Rails.gem_version && Rails.gem_version < Gem::Version.new("5.2.2")) && respond_to?(:after_commit)
+          after_commit tracked_proc, on: tracked_action
+        # :only-rails-without-callback-issue:
+        # :only-rails-with-callback-issue:
+        else
           case tracked_action
           when :create
             after_create tracked_proc
@@ -286,6 +297,7 @@ module ActivityNotification
             after_update tracked_proc
           end
         end
+        # :only-rails-with-callback-issue:
       end
 
       # Adds destroy dependency.

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

data/spec/roles/acts_as_notifiable_spec.rb

@@ -12,6 +12,7 @@ describe ActivityNotification::ActsAsNotifiable do
         dummy_notifiable_class.reset_callbacks :create
         dummy_notifiable_class.reset_callbacks :update
         dummy_notifiable_class.reset_callbacks :destroy
+        dummy_notifiable_class.reset_callbacks :commit if dummy_notifiable_class.respond_to? :after_commit
         @notifiable = dummy_notifiable_class.create
       end
 

data/spec/spec_helper.rb

@@ -15,10 +15,15 @@ SimpleCov.start('rails') do
   add_filter '/spec/'
   add_filter '/lib/generators/templates/'
   add_filter '/lib/activity_notification/version.rb'
-  if Rails::VERSION::MAJOR == 5
-    nocov_token 'skip-rails5'
-  elsif Rails::VERSION::MAJOR == 4
-    nocov_token 'skip-rails4'
+  if Rails::VERSION::MAJOR >= 5
+    nocov_token 'except-rails5+'
+  else
+    nocov_token 'only-rails5+'
+  end
+  if Gem::Version.new("5.1.6") <= Rails.gem_version && Rails.gem_version < Gem::Version.new("5.2.2")
+    nocov_token 'only-rails-without-callback-issue'
+  else
+    nocov_token 'only-rails-with-callback-issue'
   end
   if ENV['AN_ORM'] == 'mongoid'
     add_filter '/lib/activity_notification/orm/active_record'
@@ -37,6 +42,8 @@ require 'ammeter/init'
 require 'factory_bot_rails'
 require 'activity_notification'
 
+Dir[Rails.root.join("../../spec/support/**/*.rb")].each { |file| require file }
+
 def clear_database
   [ActivityNotification::Notification, ActivityNotification::Subscription, Comment, Article, Admin, User].each do |model_class|
     model_class.delete_all

data/spec/support/patch_rails_42_action_controller_test_response.rb

@@ -0,0 +1,11 @@
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -65,6 +65,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.13
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,6 +75,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.13
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +147,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.11.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -148,6 +157,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.11.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -485,6 +497,7 @@ 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
 homepage: https://github.com/simukappu/activity_notification
 licenses:
 - MIT
@@ -645,3 +658,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