active_delivery 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58549c626e3d38e914f029cb7b9b05f9dc47656ee0f7c21e995d84da6077b55b
-  data.tar.gz: 908b2c2c78171799a1373f832b24a1a6f10e59f3b5cce40ab28e7e6827b370ee
+  metadata.gz: cb5ab8a6ec56fff50826ab85c266e3feb22f621495b7004b52b3e57230f4cf22
+  data.tar.gz: 18cd0ec87390d72dfc358988f53d801f2bb7175c5fda373243705518bf66c7d9
 SHA512:
-  metadata.gz: a28d44569bcd3c15e52308b60bad60a7bb0eb3b25680099130afe8fd743ab5cacb43e1ef972306a0983f10d17375666e1fa0394e6cfbc17ee929cc05f338857a
-  data.tar.gz: 243c05d65a2b795ff2f4a0b3722f37e523a2169282345a226c3fba9f1924040cf1ae9feefce35f603d5287c38d7bd92992a72f57dd0ef32a30e8fd0e63ca8c28
+  metadata.gz: 1a154c82c76c588059e7c41a725c58118b9e9e5c59b5695846505f880e830d59ff27e8db90ef661b3a1a98739e62f0baba4efb48d4a453e2d1fe46b0f1358325
+  data.tar.gz: 5cab3665df3ee06eb878a9e78f15f754ef48ce3b2f71c5e9c14711215ffa584e8ecf3c18b84cfd03cdb00ece0e89da86ed4c812712e2f30f320d9a2ae70417ef

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/.travis.yml

@@ -14,17 +14,17 @@ matrix:
   include:
     - rvm: ruby-head
       gemfile: gemfiles/railsmaster.gemfile
-    - rvm: 2.5.3
+    - rvm: 2.7
       gemfile: Gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6
       gemfile: Gemfile
-    - rvm: 2.5.3
+    - rvm: 2.5
+      gemfile: Gemfile
+    - rvm: 2.5
       gemfile: Gemfile
       env:
         - NO_RAILS=1
-    - rvm: 2.4.3
-      gemfile: Gemfile
-    - rvm: 2.4.3
+    - rvm: 2.5
       gemfile: gemfiles/rails42.gemfile
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.4.0 (2020-03-02)
+
+- **Drop Ruby 2.4 support**. ([@palkan][])
+
+- Allow passing keyword arugments to `notify`. ([@palkan][])
+
 ## 0.3.1 (2020-02-21)
 
 - Fixed RSpec detection. ([@palkan][])

data/Gemfile

@@ -9,5 +9,5 @@ local_gemfile = File.join(__dir__, "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

@@ -243,17 +243,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/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/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

@@ -24,15 +24,15 @@ module ActiveDelivery
         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

data/lib/active_delivery/lines/mailer.rb

@@ -17,12 +17,20 @@ module ActiveDelivery
         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
 

data/lib/active_delivery/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_delivery
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-03-03 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
@@ -113,7 +113,7 @@ 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:
   - - ">="