active_delivery 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f3637c02e517255d0d91c59b1dd3abf61f6ffd1aaf34f28723a3be0e3209cf
-  data.tar.gz: 48bd825dab16b2937d6275ff21ec04868a5a97bd3b98cfcc9a297bfc6c064d76
+  metadata.gz: 5798b0d549774cc32295198d1f1ebcd155c07e0624ff8260b427d437cd0ac465
+  data.tar.gz: '086acc7c7080f9170663353740d462acbd065d4eb105a23193aa9150bdb84327'
 SHA512:
-  metadata.gz: 5284e71b7e9e84747f71bf78476536c50e16e912959fd0c2f97c9a533f86e4a589c47766f09890324459003b36113f677461c8a1e406c58e1b4263c2fcf71f21
-  data.tar.gz: 4d14d2914d4beec54d73cf9c08a4342b6775ee4941530394cd827d09ae4f7dfbd5f28c659e4c76be2dc193697e4d6ea3d86ca6956c2d7dfc241103b5558ff0fe
+  metadata.gz: b74b9673fd219caec608b4a20cfc0cd94eb55df0b4a52b95edd799d5aea9552e0913c9861d06412494cd160fa7fd6f77c27bae603e60659bf58ad5adda9b71f0
+  data.tar.gz: 3a0e73e048db14768401cc0f1406ad0aaa09888ef2c18c739d15b2daaf0199375eee437b229e60b8aab7af38659d2bd815a7cd8402620618def7498a6d1373ac

data/.gem_release.yml

@@ -0,0 +1,3 @@
+bump:
+  file: lib/active_delivery/version.rb
+  skip_ci: true

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: palkan
+
+---
+
+## What did you do?
+
+## What did you expect to happen?
+
+## What actually happened?
+
+## Additional context
+
+## Environment
+
+**Ruby Version:**
+
+**Framework Version (Rails, whatever):**
+
+**Active Delivery Version:**

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: palkan
+
+---
+
+## Is your feature request related to a problem? Please describe.
+
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+## Describe the solution you'd like
+
+A clear and concise description of what you want to happen.
+
+## Describe alternatives you've considered
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+## Additional context
+
+Add any other context or screenshots about the feature request here.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+<!--
+  First of all, thanks for contributing!
+
+  If it's a typo fix or minor documentation update feel free to skip the rest of this template!
+-->
+
+## What is the purpose of this pull request?
+
+<!--
+  If it's a bug fix, then link it to the issue, for example:
+
+  Fixes #xxx
+-->
+
+## What changes did you make? (overview)
+
+## Is there anything you'd like reviewers to focus on?
+
+## Checklist
+
+- [ ] I've added tests for this change
+- [ ] I've added a Changelog entry
+- [ ] I've updated a documentation

data/.github/workflows/docs-lint.yml

@@ -0,0 +1,72 @@
+name: Lint Docs
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+    - "*.md"
+    - "**/*.md"
+  pull_request:
+    paths:
+    - "*.md"
+    - "**/*.md"
+
+jobs:
+  markdownlint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Run Markdown linter
+      run: |
+        gem install mdl
+        mdl *.md
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Lint Markdown files with RuboCop
+      run: |
+        gem install bundler
+        bundle install --gemfile gemfiles/rubocop.gemfile --jobs 4 --retry 3
+        bundle exec --gemfile gemfiles/rubocop.gemfile rubocop -c .rubocop-md.yml
+  forspell:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Hunspell
+      run: |
+        sudo apt-get install hunspell
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Cache installed gems
+      uses: actions/cache@v1
+      with:
+        path: /home/runner/.rubies/ruby-2.7.0/lib/ruby/gems/2.7.0
+        key: gems-cache-${{ runner.os }}
+    - name: Install Forspell
+      run: gem install forspell
+    - name: Run Forspell
+      run: forspell *.md .github/**/*.md
+  liche:
+    runs-on: ubuntu-latest
+    env:
+      GO111MODULE: on
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.13.x
+    - name: Run liche
+      run: |
+        export PATH=$PATH:$(go env GOPATH)/bin
+        go get -u github.com/raviqqe/liche
+        liche README.md CHANGELOG.md

data/.github/workflows/rspec-jruby.yml

@@ -0,0 +1,35 @@
+name: JRuby Build
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      CI: true
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/cache@v1
+      with:
+        path: /home/runner/bundle
+        key: bundle-${{ hashFiles('**/gemfiles/jruby.gemfile') }}-${{ hashFiles('**/*.gemspec') }}
+        restore-keys: |
+          bundle-
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: jruby
+    - name: Bundle install
+      run: |
+        bundle config --global gemfile gemfiles/jruby.gemfile
+        bundle config path /home/runner/bundle
+        bundle install
+        bundle update
+    - name: Run RSpec
+      run: |
+        bundle exec rspec

data/.github/workflows/rspec.yml

@@ -0,0 +1,51 @@
+name: Build
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      CI: true
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7"]
+        gemfile: [
+          "gemfiles/rails6.gemfile"
+        ]
+        include:
+        - ruby: "2.5"
+          gemfile: "gemfiles/rails42.gemfile"
+        - ruby: "2.6"
+          gemfile: "gemfiles/rails50.gemfile"
+        - ruby: "2.6"
+          gemfile: "gemfiles/rails5.gemfile"
+        - ruby: "2.7"
+          gemfile: "gemfiles/railsmaster.gemfile"
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/cache@v1
+      with:
+        path: /home/runner/bundle
+        key: bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles(matrix.gemfile) }}-${{ hashFiles('**/*.gemspec') }}
+        restore-keys: |
+          bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Bundle install
+      run: |
+        bundle config path /home/runner/bundle
+        bundle config --global gemfile ${{ matrix.gemfile }}
+        bundle install
+        bundle update
+    - name: Run RSpec
+      run: |
+        bundle exec rspec

data/.github/workflows/rubocop.yml

@@ -0,0 +1,21 @@
+name: Lint Ruby
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Lint Ruby code with RuboCop
+      run: |
+        gem install bundler
+        bundle install --gemfile gemfiles/rubocop.gemfile --jobs 4 --retry 3
+        bundle exec --gemfile gemfiles/rubocop.gemfile rubocop

data/.gitignore

@@ -1,10 +1,43 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+*.sass-cache
+*.iml
+.idea/
+
+# Sublime
+*.sublime-project
+*.sublime-workspace
+
+# OS or Editor folders
+.DS_Store
+.cache
+.project
+.settings
+.tmproj
+Thumbs.db
+
+.bundle/
+log/*.log
+pkg/
+spec/dummy/db/*.sqlite3
+spec/dummy/db/*.sqlite3-journal
+spec/dummy/tmp/
+
 Gemfile.lock
 Gemfile.local
+.rspec
+.ruby-version
+*.gem
+
+tmp/
+.rbnext/
+
+gemfiles/*.lock

data/.mdlrc

@@ -0,0 +1 @@
+rules "~MD013", "~MD033", "~MD034", "~MD029", "~MD026", "~MD002"

data/.rspec

@@ -1,2 +1,2 @@
---format documentation
+-f d
 --color

data/.rubocop-md.yml

@@ -0,0 +1,16 @@
+inherit_from: ".rubocop.yml"
+
+require:
+  - rubocop-md
+
+AllCops:
+  Include:
+    - '**/*.md'
+
+Lint/Void:
+  Exclude:
+    - '**/*.md'
+
+Lint/DuplicateMethods:
+  Exclude:
+    - '**/*.md'

data/.rubocop.yml

@@ -13,7 +13,7 @@ AllCops:
     - 'vendor/**/*'
     - 'gemfiles/**/*'
   DisplayCopNames: true
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 Standard/SemanticBlocks:
   Enabled: false
@@ -26,6 +26,3 @@ Style/TrailingCommaInArrayLiteral:
 
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: no_comma
-
-Layout/AlignParameters:
-  EnforcedStyle: with_first_parameter

data/CHANGELOG.md

@@ -2,11 +2,35 @@
 
 ## master
 
+## 0.4.3 (2020-08-21)
+
+- Fix parameterized mailers support in Rails >= 5.0, <5.2 ([@dmitryzuev][])
+
+## 0.4.2 (2020-04-28)
+
+- Allow resolve mailer class with custom pattern ([@brovikov][])
+
+## 0.4.1 (2020-04-22)
+
+- Fixed TestDelivery fiber support. ([@pauldub](https://github.com/pauldub))
+
+## 0.4.0 (2020-03-02)
+
+- **Drop Ruby 2.4 support**. ([@palkan][])
+
+- Allow passing keyword arguments to `notify`. ([@palkan][])
+
+## 0.3.1 (2020-02-21)
+
+- Fixed RSpec detection. ([@palkan][])
+
+- Add note about usage with Spring. ([@iBublik][])
+
 ## 0.3.0 (2019-12-25)
 
 - Add support of :only, :except params for callbacks. ([@curpeng][])
 
-- Add negation rspec matcher: `have_not_delivered_to`. ([@StanisLove][])
+- Add negation rspec matcher: `have_not_delivered_to`. ([@StanisLove](https://github.com/stanislove))
 
 - Improve RSpec matcher's failure message. ([@iBublik][])
 
@@ -26,3 +50,6 @@ Initial version.
 
 [@palkan]: https://github.com/palkan
 [@curpeng]: https://github.com/curpeng
+[@iBublik]: https://github.com/ibublik
+[@brovikov]: https://github.com/brovikov
+[@dmitryzuev]: https://github.com/dmitryzuev

data/Gemfile

@@ -1,13 +1,17 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'pry-byebug', platform: :mri
 
 gemspec
 
-gem "pry-byebug"
+eval_gemfile "gemfiles/rubocop.gemfile"
 
-local_gemfile = File.join(__dir__, "Gemfile.local")
+local_gemfile = "#{File.dirname(__FILE__)}/Gemfile.local"
 
 if File.exist?(local_gemfile)
   eval(File.read(local_gemfile)) # rubocop:disable Security/Eval
 else
-  gem "rails", "~> 5.2"
+  gem "rails", "~> 6.0"
 end

data/README.md

@@ -1,5 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/active_delivery.svg)](https://badge.fury.io/rb/active_delivery)
-[![Build Status](https://travis-ci.org/palkan/active_delivery.svg?branch=master)](https://travis-ci.org/palkan/active_delivery)
+![Build](https://github.com/palkan/active_delivery/workflows/Build/badge.svg)
+![JRuby Build](https://github.com/palkan/active_delivery/workflows/JRuby%20Build/badge.svg)
 
 # Active Delivery
 
@@ -11,7 +12,8 @@ Framework providing an entry point (single _interface_) for all types of notific
 <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54"></a>
 
 Requirements:
-- Ruby ~> 2.4
+
+- Ruby ~> 2.5
 
 **NOTE**: although most of the examples in this readme are Rails-specific, this gem could be used without Rails/ActiveSupport.
 
@@ -28,7 +30,8 @@ Here comes _Active Delivery_.
 In the simplest case when we have only mailers Active Delivery is just a wrapper for Mailer with (possibly) some additional logic provided (e.g., preventing emails to unsubscribed users).
 
 Motivations behind Active Delivery:
-- organize notifications related logic:
+
+- Organize notifications related logic:
 
 ```ruby
 # Before
@@ -43,20 +46,20 @@ def after_some_action
 end
 ```
 
-- better testability (see [Testing](#testing)).
+- Better testability (see [Testing](#testing)).
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'active_delivery'
+gem "active_delivery"
 ```
 
 And then execute:
 
 ```sh
-$ bundle
+bundle
 ```
 
 ## Usage
@@ -84,15 +87,23 @@ PostsNotifier.published(user, post).notify_later
 
 P.S. Naming ("delivery") is inspired by Basecamp: https://www.youtube.com/watch?v=m1jOWu7woKM.
 
+**NOTE**: You could specify Mailer class explicitly or by custom pattern, using resolver:
+
+```ruby
+class PostsDelivery < ActiveDelivery::Base
+  register_line :custom_mailer, ActiveDelivery::Lines::Mailer, resolver: ->(name) { CustomMailer }
+end
+```
+
 Delivery also supports _parameterized_ calling:
 
 ```ruby
-   PostsDelivery.with(user: user).notify(:published, post)
+PostsDelivery.with(user: user).notify(:published, post)
 ```
 
 The parameters could be accessed through the `params` instance method (e.g., to implement guard-like logic).
 
-**NOTE**: When params are presents the parametrized mailer is used, i.e.:
+**NOTE**: When params are presents the parameterized mailer is used, i.e.:
 
 ```ruby
 PostsMailer.with(user: user).published(post)
@@ -149,14 +160,15 @@ Active Delivery provides an elegant way to test deliveries in your code (i.e., w
 it "delivers notification" do
   expect { subject }.to have_delivered_to(Community::EventsDelivery, :modified, event)
     .with(profile: profile)
+end
 ```
 
 You can also use such RSpec features as [compound expectations](https://relishapp.com/rspec/rspec-expectations/docs/compound-expectations) and [composed matchers](https://relishapp.com/rspec/rspec-expectations/v/3-8/docs/composing-matchers):
 
 ```ruby
 it "delivers to RSVPed members via .notify" do
-  expect { subject }.
-    to have_delivered_to(Community::EventsDelivery, :canceled, an_instance_of(event)).with(
+  expect { subject }
+    .to have_delivered_to(Community::EventsDelivery, :canceled, an_instance_of(event)).with(
       a_hash_including(profile: another_profile)
     ).and have_delivered_to(Community::EventsDelivery, :canceled, event).with(
       profile: profile
@@ -184,7 +196,7 @@ specify "when event is not found" do
 end
 ```
 
-*NOTE:** test mode activated automatically if `RAILS_ENV` or `RACK_ENV` env variable is equal to "test". Otherwise add `require "active_delivery/testing"` to your `spec_helper.rb` / `rails_helper.rb` manually.
+**NOTE:** test mode activated automatically if `RAILS_ENV` or `RACK_ENV` env variable is equal to "test". Otherwise add `require "active_delivery/testing/rspec"` to your `spec_helper.rb` / `rails_helper.rb` manually. This is also required if you're using Spring in test environment (e.g. with help of [spring-commands-rspec](https://github.com/jonleighton/spring-commands-rspec)).
 
 ## Custom "lines"
 
@@ -226,7 +238,6 @@ we call `EventDelivery.notify(:message_arrived, "ping-pong!")`.
 Line class has the following API:
 
 ```ruby
-
 class PigeonLine < ActiveDelivery::Lines::Base
   # This method is used to infer sender class
   # `name` is the name of the delivery class
@@ -243,17 +254,17 @@ class PigeonLine < ActiveDelivery::Lines::Base
   # Called when we want to send message synchronously
   # `sender` here either `sender_class` or `sender_class.with(params)`
   # if params passed.
-  def notify_now(sender, delivery_action, *args)
+  def notify_now(sender, delivery_action, *args, **kwargs)
     # For example, our EventPigeon class returns some `Pigeon` object
-    pigeon = sender.public_send(delivery_action, *args)
+    pigeon = sender.public_send(delivery_action, *args, **kwargs)
     # PigeonLaunchService do all the sending job
     PigeonService.launch pigeon
   end
 
   # Called when we want to send a message asynchronously.
   # For example, you can use a background job here.
-  def notify_later(sender, delivery_action, *args)
-    pigeon = sender.public_send(delivery_action, *args)
+  def notify_later(sender, delivery_action, *args, **kwargs)
+    pigeon = sender.public_send(delivery_action, *args, **kwargs)
     # PigeonLaunchService do all the sending job
     PigeonLaunchJob.perform_later pigeon
   end

data/RELEASING.md

@@ -0,0 +1,43 @@
+# How to release a gem
+
+This document describes a process of releasing a new version of a gem.
+
+1. Bump version.
+
+```sh
+git commit -m "Bump 1.<x>.<y>"
+```
+
+We're (kinda) using semantic versioning:
+
+- Bugfixes should be released as fast as possible as patch versions.
+- New features could be combined and released as minor or patch version upgrades (depending on the _size of the feature_—it's up to maintainers to decide).
+- Breaking API changes should be avoided in minor and patch releases.
+- Breaking dependencies changes (e.g., dropping older Ruby support) could be released in minor versions.
+
+How to bump a version:
+
+- Change the version number in `lib/active_delivery/version.rb` file.
+- Update the changelog (add new heading with the version name and date).
+- Update the installation documentation if necessary (e.g., during minor and major updates).
+
+2. Push code to GitHub and make sure CI passes.
+
+```sh
+git push
+```
+
+3. Release a gem.
+
+```sh
+gem release -t
+git push --tags
+```
+
+We use [gem-release](https://github.com/svenfuchs/gem-release) for publishing gems with a single command:
+
+```sh
+gem release -t
+```
+
+Don't forget to push tags and write release notes on GitHub (if necessary).

data/Rakefile

@@ -2,9 +2,19 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require "rubocop/rake_task"
 
-RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:rubocop, :spec]
+begin
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new
+
+  RuboCop::RakeTask.new("rubocop:md") do |task|
+    task.options << %w[-c .rubocop-md.yml]
+  end
+rescue LoadError
+  task(:rubocop) {}
+  task("rubocop:md") {}
+end
+
+task default: %w[rubocop rubocop:md spec]

data/active_delivery.gemspec

@@ -5,17 +5,17 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "active_delivery/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "active_delivery"
-  spec.version       = ActiveDelivery::VERSION
-  spec.authors       = ["Vladimir Dementyev"]
-  spec.email         = ["dementiev.vm@gmail.com"]
+  spec.name = "active_delivery"
+  spec.version = ActiveDelivery::VERSION
+  spec.authors = ["Vladimir Dementyev"]
+  spec.email = ["dementiev.vm@gmail.com"]
 
-  spec.summary       = "Rails framework for managing all types of notifications in one place"
-  spec.description   = "Rails framework for managing all types of notifications in one place"
-  spec.homepage      = "https://github.com/palkan/active_delivery"
-  spec.license       = "MIT"
+  spec.summary = "Rails framework for managing all types of notifications in one place"
+  spec.description = "Rails framework for managing all types of notifications in one place"
+  spec.homepage = "https://github.com/palkan/active_delivery"
+  spec.license = "MIT"
 
-  spec.required_ruby_version = ">= 2.4"
+  spec.required_ruby_version = ">= 2.5"
 
   spec.metadata = {
     "bug_tracker_uri" => "http://github.com/palkan/active_delivery/issues",
@@ -25,11 +25,11 @@ Gem::Specification.new do |spec|
     "source_code_uri" => "http://github.com/palkan/active_delivery"
   }
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", ">= 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "standard", "~> 0.0.12"
+  spec.add_development_dependency "standard", "~> 0.2.0"
 end

data/forspell.dict

@@ -0,0 +1,8 @@
+# Format: one word per line. Empty lines and #-comments are supported too.
+# If you want to add word with its forms, you can write 'word: example' (without quotes) on the line,
+# where 'example' is existing word with the same possible forms (endings) as your word.
+# Example: deduplicate: duplicate
+assignees
+matchers
+palkan
+testability

data/gemfiles/jruby.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.0'
+
+gemspec path: '..'

data/gemfiles/rails5.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.0'
+
+gemspec path: '..'

data/gemfiles/rails50.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.0.7"
+gem "actionmailer", "~> 5.0.7"
+
+gemspec path: ".."

data/gemfiles/rails6.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.0'
+
+gemspec path: '..'

data/gemfiles/railsmaster.gemfile

@@ -1,8 +1,6 @@
-# frozen_string_literal: true
+source 'https://rubygems.org'
 
-source "https://rubygems.org"
+gem 'arel', github: 'rails/arel'
+gem 'rails', github: 'rails/rails'
 
-gem "rails", github: "rails/rails"
-gem "rubocop", github: "rubocop-hq/rubocop"
-
-gemspec path: ".."
+gemspec path: '..'

data/gemfiles/rubocop.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org" do
+  gem "rubocop-md", "~> 0.3"
+  gem "standard", "~> 0.2.0"
+end

data/lefthook.yml

@@ -0,0 +1,18 @@
+pre-commit:
+  commands:
+    mdl:
+      tags: style
+      glob: "**/*.md"
+      run: mdl {staged_files}
+    liche:
+      tags: links
+      glob: "docs/*.md"
+      run: liche -d docs/ -r docs/* && test {staged_files}
+    forspell:
+      tags: grammar
+      glob: "**/*.md"
+      run: forspell {staged_files}
+    rubocop:
+      tags: style
+      glob: "**/*.md"
+      run: BUNDLE_GEMFILE=gemfiles/rubocop.gemfile bundle exec rubocop {staged_files}

data/lib/active_delivery/action_mailer/parameterized.rb

@@ -43,6 +43,8 @@ module ActionMailer
     class MessageDelivery < ActionMailer::MessageDelivery # :nodoc:
       def initialize(mailer_class, action, params, *args)
         super(mailer_class, action, *args)
+        @mailer ||= mailer_class
+        @mail_method ||= action
         @params = params
       end
 
@@ -57,12 +59,16 @@ module ActionMailer
       private
 
       def processed_mailer
-        @processed_mailer ||= @mailer.send(:new, nil, *@args).tap do |m|
+        @processed_mailer ||= @mailer.send(*mailer_args).tap do |m|
           m.params = @params
           m.process @mail_method, *@args
         end
       end
 
+      def mailer_args
+        ActionMailer::VERSION::MAJOR < 5 ? [:new, nil, *@args] : [:new]
+      end
+
       def enqueue_delivery(delivery_method, options = {})
         if processed?
           super

data/lib/active_delivery/base.rb

@@ -37,8 +37,8 @@ module ActiveDelivery
       alias with new
 
       # Enqueues delivery (i.e. uses #deliver_later for mailers)
-      def notify(*args)
-        new.notify(*args)
+      def notify(*args, **kwargs)
+        new.notify(*args, **kwargs)
       end
 
       # The same as .notify but delivers synchronously
@@ -86,9 +86,9 @@ module ActiveDelivery
     end
 
     # Enqueues delivery (i.e. uses #deliver_later for mailers)
-    def notify(mid, *args)
+    def notify(mid, *args, **kwargs)
       @notification_name = mid
-      do_notify(*args)
+      do_notify(*args, **kwargs)
     end
 
     # The same as .notify but delivers synchronously
@@ -99,17 +99,17 @@ module ActiveDelivery
 
     private
 
-    def do_notify(*args, sync: false)
+    def do_notify(*args, sync: false, **kwargs)
       delivery_lines.each do |type, line|
         next if line.handler_class.nil?
         next unless line.notify?(notification_name)
 
-        notify_line(type, *args, params: params, sync: sync)
+        notify_line(type, *args, params: params, sync: sync, **kwargs)
       end
     end
 
-    def notify_line(type, *args)
-      delivery_lines[type].notify(notification_name, *args)
+    def notify_line(type, *args, **kwargs)
+      delivery_lines[type].notify(notification_name, *args, **kwargs)
     end
 
     def delivery_lines

data/lib/active_delivery/callbacks.rb

@@ -41,17 +41,17 @@ module ActiveDelivery
     end
 
     module InstanceExt
-      def do_notify(*)
-        run_callbacks(:notify) { super }
+      def do_notify(*args, **kwargs)
+        run_callbacks(:notify) { super(*args, **kwargs) }
       end
 
-      def notify_line(type, *)
-        run_callbacks(type) { super }
+      def notify_line(*args, **kwargs)
+        run_callbacks(args.first) { super(*args, **kwargs) }
       end
     end
 
     module SingltonExt
-      def register_line(line_id, *args)
+      def register_line(line_id, *args, **kwargs)
         super
         define_line_callbacks line_id
       end
@@ -73,24 +73,24 @@ module ActiveDelivery
 
       def define_line_callbacks(name)
         define_callbacks name,
-                         terminator: CALLBACK_TERMINATOR,
-                         skip_after_callbacks_if_terminated: true
+          terminator: CALLBACK_TERMINATOR,
+          skip_after_callbacks_if_terminated: true
       end
 
-      def before_notify(method_or_block = nil, on: :notify, **options)
-        method_or_block ||= Proc.new
+      def before_notify(method_or_block = nil, on: :notify, **options, &block)
+        method_or_block ||= block
         _normalize_callback_options(options)
         set_callback on, :before, method_or_block, options
       end
 
-      def after_notify(method_or_block = nil, on: :notify, **options)
-        method_or_block ||= Proc.new
+      def after_notify(method_or_block = nil, on: :notify, **options, &block)
+        method_or_block ||= block
         _normalize_callback_options(options)
         set_callback on, :after, method_or_block, options
       end
 
-      def around_notify(method_or_block = nil, on: :notify, **options)
-        method_or_block ||= Proc.new
+      def around_notify(method_or_block = nil, on: :notify, **options, &block)
+        method_or_block ||= block
         _normalize_callback_options(options)
         set_callback on, :around, method_or_block, options
       end

data/lib/active_delivery/lines/base.rb

@@ -11,6 +11,7 @@ module ActiveDelivery
         @id = id
         @owner = owner
         @options = options.tap(&:freeze)
+        @resolver = options[:resolver]
       end
 
       def dup_for(new_owner)
@@ -18,21 +19,22 @@ module ActiveDelivery
       end
 
       def resolve_class(name)
+        resolver&.call(name)
       end
 
       def notify?(method_name)
         handler_class.respond_to?(method_name)
       end
 
-      def notify_now(handler, mid, *args)
+      def notify_now(handler, mid, *args, **kwargs)
       end
 
-      def notify_later(handler, mid, *args)
+      def notify_later(handler, mid, *args, **kwargs)
       end
 
-      def notify(mid, *args, params:, sync:)
-        clazz = params.empty? ? handler_class : handler_class.with(params)
-        sync ? notify_now(clazz, mid, *args) : notify_later(clazz, mid, *args)
+      def notify(mid, *args, params:, sync:, **kwargs)
+        clazz = params.empty? ? handler_class : handler_class.with(**params)
+        sync ? notify_now(clazz, mid, *args, **kwargs) : notify_later(clazz, mid, *args, **kwargs)
       end
 
       def handler_class
@@ -54,6 +56,8 @@ module ActiveDelivery
 
         owner.superclass.public_send(handler_method)
       end
+
+      attr_reader :resolver
     end
   end
 end

data/lib/active_delivery/lines/mailer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if ActionMailer::VERSION::MAJOR < 5
+if ActionMailer::VERSION::MAJOR < 5 || (ActionMailer::VERSION::MAJOR == 5 && ActionMailer::VERSION::MINOR < 2)
   require "active_delivery/action_mailer/parameterized"
 end
 
@@ -9,23 +9,29 @@ module ActiveDelivery
     class Mailer < Base
       alias mailer_class handler_class
 
-      def resolve_class(name)
-        name.gsub(/Delivery$/, "Mailer").safe_constantize
-      end
+      DEFAULT_RESOLVER = ->(name) { name.gsub(/Delivery$/, "Mailer").safe_constantize }
 
       def notify?(method_name)
         mailer_class.action_methods.include?(method_name.to_s)
       end
 
-      def notify_now(mailer, mid, *args)
-        mailer.public_send(mid, *args).deliver_now
+      def notify_now(mailer, mid, *args, **kwargs)
+        if kwargs.empty?
+          mailer.public_send(mid, *args).deliver_now
+        else
+          mailer.public_send(mid, *args, **kwargs).deliver_now
+        end
       end
 
-      def notify_later(mailer, mid, *args)
-        mailer.public_send(mid, *args).deliver_later
+      def notify_later(mailer, mid, *args, **kwargs)
+        if kwargs.empty?
+          mailer.public_send(mid, *args).deliver_later
+        else
+          mailer.public_send(mid, *args, **kwargs).deliver_later
+        end
       end
     end
 
-    ActiveDelivery::Base.register_line :mailer, Mailer
+    ActiveDelivery::Base.register_line :mailer, Mailer, resolver: Mailer::DEFAULT_RESOLVER
   end
 end

data/lib/active_delivery/testing.rb

@@ -4,18 +4,18 @@ module ActiveDelivery
   module TestDelivery
     class << self
       def enable
-        raise ArgumentError, "block is reauired" unless block_given?
+        raise ArgumentError, "block is required" unless block_given?
         begin
           clear
-          Thread.current[:active_delivery_testing] = true
+          Thread.current.thread_variable_set(:active_delivery_testing, true)
           yield
         ensure
-          Thread.current[:active_delivery_testing] = false
+          Thread.current.thread_variable_set(:active_delivery_testing, false)
         end
       end
 
       def enabled?
-        Thread.current[:active_delivery_testing] == true
+        Thread.current.thread_variable_get(:active_delivery_testing) == true
       end
 
       def track(delivery, event, args, options)
@@ -45,4 +45,4 @@ end
 
 ActiveDelivery::Base.prepend ActiveDelivery::TestDelivery
 
-require "active_delivery/testing/rspec" if defined?(RSpec)
+require "active_delivery/testing/rspec" if defined?(RSpec::Core)

data/lib/active_delivery/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveDelivery
-  VERSION = "0.3.0"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_delivery
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.2.0
 description: Rails framework for managing all types of notifications in one place
 email:
 - dementiev.vm@gmail.com
@@ -73,20 +73,37 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gem_release.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/docs-lint.yml"
+- ".github/workflows/rspec-jruby.yml"
+- ".github/workflows/rspec.yml"
+- ".github/workflows/rubocop.yml"
 - ".gitignore"
+- ".mdlrc"
 - ".rspec"
+- ".rubocop-md.yml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASING.md
 - Rakefile
 - active_delivery.gemspec
 - bin/console
 - bin/setup
+- forspell.dict
+- gemfiles/jruby.gemfile
 - gemfiles/rails42.gemfile
+- gemfiles/rails5.gemfile
+- gemfiles/rails50.gemfile
+- gemfiles/rails6.gemfile
 - gemfiles/railsmaster.gemfile
+- gemfiles/rubocop.gemfile
+- lefthook.yml
 - lib/active_delivery.rb
 - lib/active_delivery/action_mailer/parameterized.rb
 - lib/active_delivery/base.rb
@@ -113,14 +130,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Rails framework for managing all types of notifications in one place

data/.travis.yml

@@ -1,31 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-
-notifications:
-  email: false
-
-before_install:
-  - gem update --system
-  - gem install bundler -v '< 2'
-
-matrix:
-  fast_finish: true
-  include:
-    - rvm: ruby-head
-      gemfile: gemfiles/railsmaster.gemfile
-    - rvm: 2.5.3
-      gemfile: Gemfile
-    - rvm: 2.6.0
-      gemfile: Gemfile
-    - rvm: 2.5.3
-      gemfile: Gemfile
-      env:
-        - NO_RAILS=1
-    - rvm: 2.4.3
-      gemfile: Gemfile
-    - rvm: 2.4.3
-      gemfile: gemfiles/rails42.gemfile
-  allow_failures:
-    - rvm: ruby-head
-      gemfile: gemfiles/railsmaster.gemfile