outbox-rails 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d65a311c6c875177f8f0e77ed219b78b7593a7e7a9b661f652263ceef5a301de
-  data.tar.gz: f88eb5bed33a7f8b54f012d818ef5752b78ce55f72175b7aae4298fea2c21455
+  metadata.gz: bef27790295cecc443c8033e15c8ee115d2d53046294e0d73d0b2a41104116a5
+  data.tar.gz: 2cc95dd43778dd20a711fb88613f3761d86700a5e321e22f7dfd2cd5945a3199
 SHA512:
-  metadata.gz: 55c2ee50e899cd96e4ae5e417eb00742f4449fa7a43929fa44ebada8d50bb90e6cae44d59e05670bd58ae02fed5019c7dc87187df5b7d6072daf7a1ca58d5e7f
-  data.tar.gz: 58bc6d3d794c7cfbe99039ff7c803f0db037330b656829fef18a260105dba33f31a1fd477c64ce660cb456c6d0e7e5b4bd23d2c2c161288df121544dd021b690
+  metadata.gz: 20b174a486df85b5ad6cd72f3cc73b85dd30fa25bc82abedacb70bf483e4fbd03c20b2c28daba5b55fc0dd01ac864c3328b8b4ece244f505ea5b1a978866677d
+  data.tar.gz: f5d6846935fac03be5550f48ccef6b88d69986227da4b22fbe4129c19e2db068f2165c8eeba23edca7653bbb2dfb790014b3d4c330eaedecddf884abc665eeea

data/.rubocop.yml

@@ -5,6 +5,13 @@ AllCops:
     - 'lib/generators/*/notifier/templates/*'
   DisplayCopNames: true
   DisplayStyleGuide: true
+  NewCops: enable
+
+Layout/LineLength:
+  Exclude:
+    - 'outbox-rails.gemspec'
+  IgnoreCopDirectives: true
+  Max: 100
 
 Metrics/BlockLength:
   Exclude:
@@ -13,18 +20,13 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Max: 150
 
-Metrics/LineLength:
-  Exclude:
-    - 'outbox-rails.gemspec'
-  IgnoreCopDirectives: true
-  Max: 100
-
 Metrics/MethodLength:
   Max: 15
 
-Style/Documentation:
-  Enabled: false
-
-Style/FileName:
+Naming/FileName:
   Exclude:
     - 'Appraisals'
+    - 'lib/outbox-rails.rb'
+
+Style/Documentation:
+  Enabled: false

data/Appraisals

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise 'rails-5.0' do
   gem 'rails', '~> 5.0.0'
 end

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in outbox-rails.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
 

data/gemfiles/rails_5.0.gemfile.lock

@@ -64,6 +64,7 @@ GEM
       activesupport (>= 4.2.0)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
     loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -78,9 +79,9 @@ GEM
       mini_portile2 (~> 2.4.0)
     outbox (0.2.1)
       mail (~> 2.6)
+    parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
-    powerpack (0.1.2)
     rack (2.2.3)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -107,9 +108,9 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (13.0.1)
+    rexml (3.2.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -131,12 +132,14 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
@@ -166,7 +169,7 @@ DEPENDENCIES
   rake (>= 12.3.3)
   rspec (~> 3.5.0)
   rspec-rails (~> 3.5.2)
-  rubocop (~> 0.48.1)
+  rubocop (~> 0.82.0)
   sqlite3
 
 BUNDLED WITH

data/gemfiles/rails_5.1.gemfile.lock

@@ -64,6 +64,7 @@ GEM
       activesupport (>= 4.2.0)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
     loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -78,9 +79,9 @@ GEM
       mini_portile2 (~> 2.4.0)
     outbox (0.2.1)
       mail (~> 2.6)
+    parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
-    powerpack (0.1.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -107,9 +108,9 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (13.0.1)
+    rexml (3.2.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -131,12 +132,14 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
@@ -166,7 +169,7 @@ DEPENDENCIES
   rake (>= 12.3.3)
   rspec (~> 3.5.0)
   rspec-rails (~> 3.5.2)
-  rubocop (~> 0.48.1)
+  rubocop (~> 0.82.0)
   sqlite3
 
 BUNDLED WITH

data/gemfiles/rails_5.2.gemfile.lock

@@ -68,6 +68,7 @@ GEM
       activesupport (>= 4.2.0)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
     loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -85,9 +86,9 @@ GEM
       mini_portile2 (~> 2.4.0)
     outbox (0.2.1)
       mail (~> 2.6)
+    parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
-    powerpack (0.1.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -115,9 +116,9 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (13.0.1)
+    rexml (3.2.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -139,12 +140,14 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
@@ -174,7 +177,7 @@ DEPENDENCIES
   rake (>= 12.3.3)
   rspec (~> 3.5.0)
   rspec-rails (~> 3.5.2)
-  rubocop (~> 0.48.1)
+  rubocop (~> 0.82.0)
   sqlite3
 
 BUNDLED WITH

data/gemfiles/rails_6.0.gemfile.lock

@@ -81,6 +81,7 @@ GEM
       activesupport (>= 4.2.0)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
     loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -98,9 +99,9 @@ GEM
       mini_portile2 (~> 2.4.0)
     outbox (0.2.1)
       mail (~> 2.6)
+    parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
-    powerpack (0.1.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -130,9 +131,9 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (13.0.1)
+    rexml (3.2.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -154,12 +155,14 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
@@ -190,7 +193,7 @@ DEPENDENCIES
   rake (>= 12.3.3)
   rspec (~> 3.5.0)
   rspec-rails (~> 3.5.2)
-  rubocop (~> 0.48.1)
+  rubocop (~> 0.82.0)
   sqlite3
 
 BUNDLED WITH

data/lib/generators/erb/notifier/notifier_generator.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'rails/generators/erb/controller/controller_generator'
 
 module Erb # :nodoc:
   module Generators # :nodoc:
     class NotifierGenerator < ControllerGenerator # :nodoc:
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       protected
 

data/lib/generators/outbox/notifier/notifier_generator.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Outbox
   module Generators
     class NotifierGenerator < ::Rails::Generators::NamedBase
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       argument :actions, type: :array, default: [], banner: 'method method'
       check_class_collision

data/lib/generators/rspec/notifier/notifier_generator.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Rspec
   module Generators
     class NotifierGenerator < ::Rails::Generators::NamedBase
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       argument :actions, type: :array, default: [], banner: 'method method'
 

data/lib/generators/test_unit/notifier/notifier_generator.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module TestUnit
   module Generators
     class NotifierGenerator < ::Rails::Generators::NamedBase
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
       check_class_collision suffix: 'Test'
 
       argument :actions, type: :array, default: [], banner: 'method method'

data/lib/outbox-rails.rb

@@ -1,2 +1,3 @@
-# rubocop:disable Style/FileName
+# frozen_string_literal: true
+
 require 'outbox/rails'

data/lib/outbox/notifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'action_mailer'
 
 module Outbox
@@ -10,8 +12,21 @@ module Outbox
     alias _render_email mail
     undef :mail
 
+    class_attribute :default_message_options
+    self.default_message_options = {}
+
     class << self
-      alias defaults default
+      # Sets the default options for a message for this Notifier and its descendants.
+      # This is similar to ActionMailer's `default` method, but allows you to
+      # set options for multiple message types at once:
+      #
+      #     class UsersNotifier < OutboxNotifier
+      #       defaults email: { from: 'noreply@myapp.com' }, sms: { from: '+12255551234' }
+      #     end
+      def defaults(value = nil)
+        self.default_message_options = default_message_options.merge(value).freeze if value
+        default_message_options
+      end
 
       # Returns the name of current notifier. This method is also being used
       # as a path for a view lookup. If this is an anonymous notifier,
@@ -27,7 +42,7 @@ module Outbox
 
       protected
 
-      # rubocop:disable Style/MethodMissing
+      # rubocop:disable Style/MissingRespondToMissing
       def method_missing(method_name, *args) # :nodoc:
         if respond_to?(method_name)
           new(method_name, *args).message
@@ -35,6 +50,7 @@ module Outbox
           super
         end
       end
+      # rubocop:enable Style/MissingRespondToMissing
     end
 
     def initialize(method_name = nil, *args) # :nodoc:
@@ -96,7 +112,7 @@ module Outbox
     end
 
     def build_message
-      message = Outbox::Message.new(self.class.default_params.dup)
+      message = Outbox::Message.new(self.class.default_message_options.dup)
       Outbox::Message.message_types.each_key do |message_type|
         message.public_send(message_type, {})
       end
@@ -149,9 +165,7 @@ module Outbox
           message_types_without_email
         end
       @_message.each_message_type do |message_type, message|
-        if message && message.body.nil? && message_type.in?(only_message_types)
-          message.body = body
-        end
+        message.body = body if message && message.body.nil? && message_type.in?(only_message_types)
       end
     end
 

data/lib/outbox/notifier_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Outbox
   module NotifierTypes
     extend ActiveSupport::Concern

data/lib/outbox/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'outbox'
 require 'outbox/rails/version'
 require 'outbox/rails/railtie'

data/lib/outbox/rails/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails'
 
 module Outbox

data/lib/outbox/rails/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Outbox
   module Rails
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.1.0'
   end
 end

data/outbox-rails.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'outbox/rails/version'
 
@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.5.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.5.2'
-  spec.add_development_dependency 'rubocop', '~> 0.48.1'
+  spec.add_development_dependency 'rubocop', '~> 0.82.0'
   spec.add_development_dependency 'sqlite3'
 end

data/spec/internal/app/notifiers/base_notifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BaseNotifier < Outbox::Notifier
   layout :set_layout
 
@@ -6,9 +8,7 @@ class BaseNotifier < Outbox::Notifier
   end
 
   def implicit_multipart(hash = {})
-    if hash.delete(:attachments)
-      attachments['invoice.pdf'] = 'This is test File content'
-    end
+    attachments['invoice.pdf'] = 'This is test File content' if hash.delete(:attachments)
     render_message(hash)
   end
 

data/spec/internal/app/notifiers/customized_notifier.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class CustomizedNotifier < Outbox::Notifier
-  defaults email: { from: 'noreply@myapp.com' }
+  defaults email: { from: 'noreply@myapp.com' }, sms: { from: '+12255551234' }
 
   def with_defaults; end
 end

data/spec/internal/config/routes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
-  #
 end

data/spec/internal/db/schema.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
-  #
 end

data/spec/outbox/notifier_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Outbox::Notifier do
@@ -21,6 +23,9 @@ describe Outbox::Notifier do
     it 'sets the default values' do
       message = CustomizedNotifier.with_defaults
       expect(message.email.from).to eq(['noreply@myapp.com'])
+      expect(message.sms.from).to eq('+12255551234')
+      expect(message.email['email']).to be_nil
+      expect(message.email['sms']).to be_nil
     end
   end
 
@@ -110,7 +115,7 @@ describe Outbox::Notifier do
       expect(message.sms.body.strip).to eql('SMS Layout: SMS Variant')
     end
 
-    it 'only renders the SMS template once', :focus do
+    it 'only renders the SMS template once' do
       notifier = BaseNotifier.new(:only_sms_template)
       expect(notifier).to receive(:render).once.and_return('Only SMS')
       message = notifier.message

data/spec/outbox/rails/railtie_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Outbox::Rails::Railtie do

data/spec/outbox/rails_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Outbox::Rails do

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 require 'combustion'
 
-Combustion.initialize!(:action_mailer) do
+::Combustion.initialize!(:action_mailer) do
   config.outbox.use_test_client = true
   config.outbox.default_email_client_settings = { option_1: true }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: outbox-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Pete Browne
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: outbox
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.82.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.82.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +211,7 @@ homepage: https://github.com/localmed/outbox-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,8 +226,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Rails Railtie for sending email, SMS, and push notifications using the Outbox
   gem.