active_delivery 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fab4f00d6e9540f490e987b355133449d9213d2a1f9cb683aced62e16ae36a84
-  data.tar.gz: e9728da5a0a19ba23e7412a2ed678cabb28e7c1c6ac16ae89246302a80b8f2dc
+  metadata.gz: 9cedb82b0e98de0ae19e5035da765b9ccdac620a1d06a278b078bd5154931f47
+  data.tar.gz: 29f91381de756f4b4ae8d67a4cc86e060fab9401c2f47926b4e9a3ad396301c3
 SHA512:
-  metadata.gz: c3be343f6a4151bcd434105b22c0e4a028dcc0bc4a22ea1e70e13de1213a3469d4cc6ef942959df8005784eab0d41b2bcf42858aa3d7915743a4b8b337e13f0e
-  data.tar.gz: ef751694baca35139d81ef11a277adde948e63b59528d040ef08390c36952a6ff35da49174b80070cf5df6d836c054d1d6d30ee23cbd7103ab0c73c32b723b83
+  metadata.gz: 1b0c9deef2835eddf0513893908c3a97320e4b883b3a3b96dde6026a7c96b4eb3330ec58ff6d294c3b319a3af09192d6f317af511a7ba171343847146898bad4
+  data.tar.gz: f13926f59dc414091d36b3a7b8fd238e1119fcc1a4da8b4c4070b0819b2c3015ff247d70bc663f653dcf85c4472bbd00069fb7a363fbf9488097eec9b9f22cc7

data/.rubocop.yml

@@ -11,7 +11,9 @@ AllCops:
     - 'Gemfile'
     - 'node_modules/**/*'
     - 'vendor/**/*'
+    - 'gemfiles/**/*'
   DisplayCopNames: true
+  TargetRubyVersion: 2.4
 
 Standard/SemanticBlocks:
   Enabled: false

data/.travis.yml

@@ -1,25 +1,30 @@
 sudo: false
 language: ruby
-rvm:
-  - 2.5.1
+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.1
+    - rvm: 2.5.3
+      gemfile: Gemfile
+    - rvm: 2.6.0
       gemfile: Gemfile
-    - rvm: 2.5.1
+    - rvm: 2.5.3
       gemfile: Gemfile
       env:
         - NO_RAILS=1
     - rvm: 2.4.3
       gemfile: Gemfile
-    - rvm: 2.3.1
+    - rvm: 2.4.3
       gemfile: gemfiles/rails42.gemfile
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 0.2.1 (2018-01-15)
+
+- Backport `ActionMailer::Paremeterized` for Rails <5. ([@palkan][])
+
 ## 0.2.0 (2018-01-11)
 
 - Add `#notification_name`. ([@palkan][])

data/README.md

@@ -5,11 +5,13 @@
 
 Framework providing an entry point (single _interface_) for all types of notifications: mailers, push notifications, whatever you want.
 
+📖 Read the introduction post: ["Crafting user notifications in Rails with Active Delivery"](https://dev.to/evilmartians/crafting-user-notifications-in-rails-with-active-delivery-5cn6")
+
 <a href="https://evilmartians.com/?utm_source=action_policy">
 <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54"></a>
 
 Requirements:
-- Ruby ~> 2.3
+- Ruby ~> 2.4
 
 **NOTE**: although most of the examples in this readme are Rails-specific, this gem could be used without Rails/ActiveSupport.
 

data/active_delivery.gemspec

@@ -15,10 +15,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/palkan/active_delivery"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 2.4"
+
   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 "bundler", ">= 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "standard", "~> 0.0.12"

data/lib/active_delivery/action_mailer/parameterized.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module ActionMailer
+  # See https://api.rubyonrails.org/classes/ActionMailer/Parameterized.html
+  module Parameterized
+    extend ActiveSupport::Concern
+
+    included do
+      attr_accessor :params
+    end
+
+    module ClassMethods
+      # Provide the parameters to the mailer in order to use them in the instance methods and callbacks.
+      #
+      #   InvitationsMailer.with(inviter: person_a, invitee: person_b).account_invitation.deliver_later
+      #
+      # See Parameterized documentation for full example.
+      def with(params)
+        ActionMailer::Parameterized::Mailer.new(self, params)
+      end
+    end
+
+    class Mailer # :nodoc:
+      def initialize(mailer, params)
+        @mailer, @params = mailer, params
+      end
+
+      private
+
+      def method_missing(method_name, *args)
+        if @mailer.action_methods.include?(method_name.to_s)
+          ActionMailer::Parameterized::MessageDelivery.new(@mailer, method_name, @params, *args)
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(method, include_all = false)
+        @mailer.respond_to?(method, include_all)
+      end
+    end
+
+    class MessageDelivery < ActionMailer::MessageDelivery # :nodoc:
+      def initialize(mailer_class, action, params, *args)
+        super(mailer_class, action, *args)
+        @params = params
+      end
+
+      def __getobj__ #:nodoc:
+        @obj ||= processed_mailer.message
+      end
+
+      def processed?
+        @processed_mailer || @obj
+      end
+
+      private
+
+      def processed_mailer
+        @processed_mailer ||= @mailer.send(:new, nil, *@args).tap do |m|
+          m.params = @params
+          m.process @mail_method, *@args
+        end
+      end
+
+      def enqueue_delivery(delivery_method, options = {})
+        if processed?
+          super
+        else
+          args = @mailer.name, @mail_method.to_s, delivery_method.to_s, @params, *@args
+          ActionMailer::Parameterized::DeliveryJob.set(options).perform_later(*args)
+        end
+      end
+    end
+
+    class DeliveryJob < ActionMailer::DeliveryJob # :nodoc:
+      def perform(mailer, mail_method, delivery_method, params, *args)
+        mailer.constantize.with(params).public_send(mail_method, *args).send(delivery_method)
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:action_mailer) do
+  include ActionMailer::Parameterized
+end

data/lib/active_delivery/lines/mailer.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+if ActionMailer::VERSION::MAJOR < 5
+  require "active_delivery/action_mailer/parameterized"
+end
+
 module ActiveDelivery
   module Lines
     class Mailer < Base

data/lib/active_delivery/testing/rspec.rb

@@ -93,7 +93,7 @@ module ActiveDelivery
         msg << " :#{event} notification" if event
         msg << " via #{delivery_class}#{sync_value ? " (sync)" : ""} with:"
         msg << "\n - params: #{params_description(params)}" if params
-        msg << "\n - args: #{args.present? ? args : "<none>"}"
+        msg << "\n - args: #{args.empty? ? "<none>" : args}"
         msg << "\n#{message_expectation_modifier}, but"
 
         if @unmatching_deliveries.any?
@@ -102,7 +102,7 @@ module ActiveDelivery
             msg << "\n  :#{event} via #{delivery.class}" \
                   "#{options[:sync] ? " (sync)" : ""}" \
                   " with:" \
-                  "\n   - params: #{delivery.params.present? ? delivery.params.to_s : "<none>"}" \
+                  "\n   - params: #{delivery.params.empty? ? "<none>" : delivery.params.to_s}" \
                   "\n   - args: #{args}"
           end
         else

data/lib/active_delivery/version.rb

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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: active_delivery
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -88,6 +88,7 @@ files:
 - gemfiles/rails42.gemfile
 - gemfiles/railsmaster.gemfile
 - lib/active_delivery.rb
+- lib/active_delivery/action_mailer/parameterized.rb
 - lib/active_delivery/base.rb
 - lib/active_delivery/callbacks.rb
 - lib/active_delivery/lines/base.rb
@@ -107,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="