sweet_notifications 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 22d1f8bfac5faefdd1e0d674ef62d2c6a47ea710
-  data.tar.gz: 481abe56ea486f52db706ede90d5aa4445f18c19
+SHA256:
+  metadata.gz: 5c1c62f7f37f8ccb5183e5319cfbd745533545be20c374ef14ac034081adacab
+  data.tar.gz: 0f73960d95c9cc6d0c8df39fb0d16bf451672fe6eee7cb924c7ca1354da24ab6
 SHA512:
-  metadata.gz: 680c84f5f82417b930ca6c37d5647ddcfea470bea18c0cbb0235ef4ba79e9b41c773f8d8226556af49c941e0bf3580e9f250b24458e03643fa491f3091f3eacb
-  data.tar.gz: 46d1a6f25d33236a7defafc42238a944c87717722fcbd6d7bad0bfd4566651fceb401a01b27288ce8d98180e3e5ef88bab912f41d5391864745020732c50ab6a
+  metadata.gz: 16da12ca9aeb6817725667ae40fee08bd25d0da2f1dd46fb1e93aebb67205a3b07d23993df789e7800702ed0aaf9bb56a678fa09ebd9428f3374f9eb67abfab0
+  data.tar.gz: 4591548d09478c09b16b6f12790e43e24a00dfe9163e6763944399ecafc65c984b132926c1e63b8fe8f26aa18a209572d8ef72c9711eeb38b052fb072dc6df28

data/.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: >-
+      Test (${{ matrix.gemfile }} ${{ matrix.ruby }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile:
+        - gemfiles/rails_5.2.gemfile
+        - gemfiles/rails_6.0.gemfile
+        - Gemfile
+        ruby:
+         - 2.5
+         - 2.6
+         - 2.7
+         - jruby
+        include:
+        - ruby: 2.7
+          gemfile: gemfiles/rails_head.gemfile
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake test
+  rubocop:
+    name: Rubocop
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+      - run: bundle exec rubocop --format github

data/.rubocop.yml

@@ -1,26 +1,74 @@
+require: rubocop-rails
+
 AllCops:
   Exclude:
     - sweet_notifications.gemspec
     - lib/sweet_notifications/version.rb
     - "vendor/**/*"
     - "gemfiles/vendor/**/*"
+  TargetRubyVersion: 2.5
 
 Rails:
   Enabled: true
 
-ClassAndModuleChildren:
+Rails/ApplicationController:
+  Enabled: false
+
+Rails/AssertNot:
+  Enabled: false
+
+Rails/RefuteMethods:
+  Enabled: false
+Rails/ActiveRecordCallbacksOrder:
+  Enabled: true
+Rails/AfterCommitOverride:
+  Enabled: true
+Rails/FindById:
+  Enabled: true
+Rails/Inquiry:
+  Enabled: true
+Rails/MailerName:
+  Enabled: true
+Rails/MatchRoute:
+  Enabled: true
+Rails/NegateInclude:
+  Enabled: true
+Rails/Pluck:
+  Enabled: true
+Rails/PluckInWhere:
+  Enabled: true
+Rails/RenderInline:
+  Enabled: true
+Rails/RenderPlainText:
+  Enabled: true
+Rails/ShortI18n:
+  Enabled: true
+Rails/SquishedSQLHeredocs:
+  Enabled: true
+Rails/WhereExists:
+  Enabled: true
+Rails/WhereNot:
+  Enabled: true
+
+Bundler/OrderedGems:
+  Enabled: false
+
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
   Exclude:
     - test/**/*.rb
 
-Documentation:
+Style/Documentation:
   Include:
     - lib/**/*.rb
 
-MethodLength:
+Metrics/MethodLength:
   Exclude:
     - lib/sweet_notifications/controller_runtime.rb
 
-ModuleFunction:
+Style/ModuleFunction:
   Enabled: false
 
 Metrics/AbcSize:
@@ -28,3 +76,39 @@ Metrics/AbcSize:
 
 Metrics/BlockLength:
   Enabled: false
+
+Style/FormatStringToken:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/StringConcatenation:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+Lint/EmptyBlock:
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+Lint/ToEnumArguments:
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+Style/ArgumentsForwarding:
+  Enabled: true
+Style/CollectionCompact:
+  Enabled: true
+Style/DocumentDynamicEvalDefinition:
+  Enabled: true
+Style/NegatedIfElseCondition:
+  Enabled: true
+Style/SwapValues:
+  Enabled: true

data/Appraisals

@@ -1,24 +1,12 @@
-appraise "rails-4.0" do
-  gem 'rails', '~> 4.0.0'
+appraise 'rails-5.2' do
+  gem 'rails', '~> 5.2.0'
 end
 
-appraise "rails-4.1" do
-  gem 'rails', '~> 4.1.0'
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0'
 end
 
-appraise "rails-4.2" do
-  gem 'rails', '~> 4.2.0'
-end
-
-appraise "rails-5.0" do
-  gem 'rails', '~> 5.0.0'
-end
-
-appraise "rails-5.1" do
-  gem 'rails', '~> 5.1.0'
-end
-
-appraise "rails-head" do
+appraise 'rails-head' do
   gem 'rails', github: 'rails'
   gem 'arel', github: 'rails/arel'
   gem 'rack', github: 'rack'

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.0 (8 November 2020)
+
+- drop support for old Ruby and Rails versions
+- call super in log subscriber inheriting hook
+
 ## 1.0.0 (18 January 2017)
 
 - more robust Rails initialization testing

data/README.md

@@ -1,4 +1,4 @@
-# SweetNotifications [![Build Status](https://travis-ci.org/lautis/sweet_notifications.svg?branch=master)](https://travis-ci.org/lautis/sweet_notifications)
+# SweetNotifications
 
 Syntactic sugar for ActiveSupport::LogSubscriber for easy instrumentation and
 logging from third-party libraries.

data/Rakefile

@@ -15,4 +15,4 @@ end
 desc 'Check for code style'
 RuboCop::RakeTask.new
 
-task default: [:test, :rubocop]
+task default: %i[test rubocop]

data/gemfiles/{rails_5.0.gemfile → rails_5.2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0"
+gem "rails", "~> 5.2.0"
 
 gemspec path: "../"

data/gemfiles/{rails_4.0.gemfile → rails_6.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 6.0.0"
 
 gemspec path: "../"

data/lib/sweet_notifications/log_subscriber.rb

@@ -78,6 +78,7 @@ module SweetNotifications
       protected
 
       def inherited(base)
+        super
         base.class_eval do
           @name ||= SecureRandom.hex
         end

data/lib/sweet_notifications/version.rb

@@ -1,3 +1,3 @@
 module SweetNotifications
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/sweet_notifications.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sweet_notifications/version'
 
@@ -8,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.version       = SweetNotifications::VERSION
   spec.authors       = ["Ville Lautanala"]
   spec.email         = ["lautis@gmail.com"]
-  spec.summary       = %q{Syntactic sugar for ActiveSupport::LogSubscriber.}
-  spec.description   = %q{Syntactic sugar for ActiveSupport::LogSubscriber for easy instrumentation and logging from third-party libraries.}
+  spec.summary       = 'Syntactic sugar for ActiveSupport::LogSubscriber.'
+  spec.description   = 'Syntactic sugar for ActiveSupport::LogSubscriber for easy instrumentation and logging from third-party libraries.'
   spec.homepage      = "https://github.com/lautis/sweet_notifications"
   spec.license       = "MIT"
 
@@ -18,17 +17,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '~> 2.5'
 
-  spec.add_runtime_dependency "activesupport", ">= 4.0"
+  spec.add_runtime_dependency "activesupport", ">= 5.2"
+  spec.add_runtime_dependency "railties", ">= 5.2"
   spec.add_runtime_dependency "request_store", "~> 1.0"
-  spec.add_runtime_dependency "railties", ">= 4.0"
-  spec.add_development_dependency "actionpack", ">= 4.0"
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "actionpack", ">= 5.2"
+  spec.add_development_dependency "appraisal", "~> 2.0"
+  spec.add_development_dependency "bundler", ">= 1.6"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rubocop", "~> 1.2.0"
+  spec.add_development_dependency "rubocop-rails", "~> 2.0"
+  spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "yard", "~> 0.9.7"
-  spec.add_development_dependency "appraisal", "~> 2.0"
-  spec.add_development_dependency "simplecov", "~> 0.12.0"
-  spec.add_development_dependency "rubocop", "~> 0.46.0"
 end

data/test/controller_runtime_test.rb

@@ -6,7 +6,7 @@ describe SweetNotifications::ControllerRuntime do
 
   ControllerRuntime = SweetNotifications.controller_runtime('Test',
                                                             TestLogSubscriber)
-  ActionController::Base.send :include, ControllerRuntime
+  ActionController::Base.include ControllerRuntime
 
   class LogSubscribersController < ActionController::Base
     def create
@@ -55,11 +55,11 @@ describe SweetNotifications::ControllerRuntime do
     ActionController::Base.logger = @old_logger
   end
 
-  # rubocop:disable AccessorMethodName
+  # rubocop:disable Naming/AccessorMethodName
   def set_logger(logger)
     ActionController::Base.logger = logger
   end
-  # rubocop:enable AccessorMethodName
+  # rubocop:enable Naming/AccessorMethodName
 
   describe '.log_process_action' do
     it 'emits runtime to log messages' do
@@ -78,7 +78,7 @@ describe SweetNotifications::ControllerRuntime do
     it 'appends non-zero runtime' do
       post :create, params: { test: 1 }
       wait
-      expected_message = /\(Views: [\d.]+ms \| Test: 100.0ms\)/
+      expected_message = /\(Views: [\d.]+ms \| Test: 100.0ms/
       assert_match(expected_message, @logger.logged(:info)[2])
     end
 
@@ -86,14 +86,14 @@ describe SweetNotifications::ControllerRuntime do
       TestLogSubscriber.runtime += 1000
       post :create, params: { test: 1 }
       wait
-      expected_message = /\(Views: [\d.]+ms \| Test: 100.0ms\)/
+      expected_message = /\(Views: [\d.]+ms \| Test: 100.0ms/
       assert_match(expected_message, @logger.logged(:info)[2])
     end
 
     it 'includes runtime after render' do
       post :destroy, params: { id: 1 }
       wait
-      expected_message = /\(Views: [\d.]+ms \| Test: 55.0ms\)/
+      expected_message = /\(Views: [\d.]+ms \| Test: 55.0ms/
       assert_match(expected_message, @logger.logged(:info)[2])
     end
   end

data/test/log_subscriber_test.rb

@@ -135,14 +135,14 @@ describe SweetNotifications::LogSubscriber do
       subject.colorize_logging = true
       odd = subject.message(event, 'Label', 'body')
       even = subject.message(event, 'Label', 'body')
-      assert !odd.include?(ActiveSupport::LogSubscriber::BOLD + 'body')
+      assert odd.exclude?(ActiveSupport::LogSubscriber::BOLD + 'body')
       assert even.include?(ActiveSupport::LogSubscriber::BOLD + 'body')
     end
 
     it 'does not use colors when setting is disabled' do
       subject.colorize_logging = false
       message = subject.message(event, 'Label', 'body')
-      assert !message.include?(ActiveSupport::LogSubscriber::CYAN)
+      assert message.exclude?(ActiveSupport::LogSubscriber::CYAN)
     end
   end
 end

data/test/sweet_notifications_test.rb

@@ -29,6 +29,7 @@ describe SweetNotifications do
   describe '.subscribe' do
     it 'creates a railtie' do
       railtie, = SweetNotifications.subscribe 'railtie_create' do
+        # empty block
       end
       assert railtie < Rails::Railtie
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweet_notifications
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ville Lautanala
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2020-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -39,45 +53,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+        version: '5.2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -100,30 +114,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -142,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.9.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.9.7
 description: Syntactic sugar for ActiveSupport::LogSubscriber for easy instrumentation
   and logging from third-party libraries.
 email:
@@ -172,9 +186,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -182,11 +196,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_head.gemfile
 - lib/sweet_notifications.rb
 - lib/sweet_notifications/controller_runtime.rb
@@ -203,7 +214,7 @@ homepage: https://github.com/lautis/sweet_notifications
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,16 +222,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Syntactic sugar for ActiveSupport::LogSubscriber.
 test_files:

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-gemfile:
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
-  - Gemfile
-rvm:
-  - '2.2.6'
-  - '2.3.3'
-  - '2.4.1'
-  - jruby-9.1.8.0
-matrix:
-  include:
-    - rvm: '2.3.3'
-      gemfile: 'gemfiles/rails_4.0.gemfile'
-    - rvm: '2.3.3'
-      gemfile: 'gemfiles/rails_4.1.gemfile'
-    - rvm: '2.4.1'
-      gemfile: gemfiles/rails_head.gemfile
-  allow_failures:
-    - gemfile: gemfiles/rails_head.gemfile

data/gemfiles/rails_4.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.1.0"
-
-gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.2.0"
-
-gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.1.0"
-
-gemspec path: "../"