catch_all 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b9ecfda75b7a73bcb32ada1f5e876e4e03e23a93
+  data.tar.gz: facd9a247bbc4416f5ad83df7442439f5174dfbe
+SHA512:
+  metadata.gz: 0d8821cf46adab5a2b268cdf5bcca4c3bec692ea04a3096fa4a96e857ea65280f6a6ad521fdcedd38b1831198ab10d8d10ea368013911935cef7402bab0c792b
+  data.tar.gz: 11afad6bec26b7c9c70ce4c6730a4fe1da9855c16ed0491ab4c772480299d54eabf8250b370a67d95c7fb3cfbde23c65f49360a5f707f49ed7ba4f30737d7616

data/.gitignore

@@ -1,3 +1,4 @@
 *.gem
 .DS_Store
-.tmproj
+.tmproj
+.byebug_history

data/Gemfile

@@ -6,4 +6,6 @@ gem 'actionmailer'
 group :development do
   gem 'rspec', '>= 2.3.0'
   gem 'ZenTest', "~> 4.4.2"
-end
+  gem 'byebug', platform: :mri
+  gem 'pry-byebug', platform: :mri
+end

data/Gemfile.lock

@@ -1,66 +1,91 @@
 PATH
   remote: .
   specs:
-    catch_all (0.0.1)
+    catch_all (0.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ZenTest (4.4.2)
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
-      mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    builder (3.0.4)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
-    polyglot (0.3.3)
-    rack (1.4.3)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    builder (3.2.3)
+    byebug (10.0.2)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    erubi (1.7.1)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
+      pry (~> 0.10)
+    rack (2.0.5)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -68,5 +93,10 @@ PLATFORMS
 DEPENDENCIES
   ZenTest (~> 4.4.2)
   actionmailer
+  byebug
   catch_all!
+  pry-byebug
   rspec (>= 2.3.0)
+
+BUNDLED WITH
+   1.16.1

data/README.md

@@ -2,6 +2,10 @@
 
 ActionMailer::CatchAll is a simple module to define a white-list of email addresses, used for staging environments.
 
+If the emailed user is on the whitelist, it sends to that user.
+
+If the user isn't on the whitelist, it sends to the fallback email address(es).
+
 ## Usage
 
   Gemfile:
@@ -14,4 +18,11 @@ ActionMailer::CatchAll is a simple module to define a white-list of email addres
       ActionMailer::CatchAll.enable('scott@railsnewbie.com')
     end
 
+  Or, if you want to use a whitelist of domains:
 
+    if Rails.env.staging?
+      ActionMailer::CatchAll.enable({
+        whitelist: [/\@railsnewbie.com$/, /\@example.com$/],
+        fallback: 'scott@railsnewbie.com',
+      })
+    end

data/lib/catch_all/version.rb

@@ -1,5 +1,5 @@
 module ActionMailer
   module CatchAll
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
-end
+end

data/lib/catch_all.rb

@@ -8,10 +8,18 @@ module ActionMailer
         ActionMailer::Base.instance_methods.include?(:mail_aliased_from_action_mailer_staging)
       end
 
-      def enable(*to_addresses)
-        to_addresses = to_addresses.flatten.compact
+      def enable(*options)
+        if options.length == 1 && options[0].is_a?(Hash)
+          hash = options[0]
 
-        if to_addresses.length == 0
+          whitelist_email_addresses = Array(hash[:whitelist]).flatten.compact
+          fallback_email_addresses = Array(hash[:fallback]).flatten.compact
+        else
+          whitelist_email_addresses = options.flatten.compact
+          fallback_email_addresses = whitelist_email_addresses
+        end
+
+        if fallback_email_addresses.length == 0
           Kernel.warn("No email addresses passed to ActionMailer::CatchAll!")
         end
 
@@ -31,11 +39,21 @@ module ActionMailer
 
             # save the original to header
             mailer['X-Action-Mailer-Staging-Original-Email-To'] = to_values.inspect
-            selected_to_addresses = to_values.select { |to| to_addresses.include?(to) }
+
+            selected_to_addresses = to_values.select do |to|
+              whitelist_email_addresses.any? do |email|
+                if email.is_a?(Regexp)
+                  email =~ to
+                else
+                  email == to
+                end
+              end
+            end
+
             if selected_to_addresses.any?
               mailer[:to] = selected_to_addresses
             else
-              mailer[:to] = to_addresses
+              mailer[:to] = fallback_email_addresses
             end
 
             mailer
@@ -53,4 +71,4 @@ module ActionMailer
       end
     end
   end
-end
+end

data/spec/catch_all_spec.rb

@@ -1,24 +1,24 @@
-require File.dirname(__FILE__) + '/../lib/catch_all'
+require 'spec_helper'
 
 class Notifier < ActionMailer::Base
   def notify
-    mail(:to => "scott@learnup.me")
+    mail(:to => "scott@learnup.me", body: "body")
   end
 
   def notify_multiple
-    mail(:to => ["scott@learnup.me", "kenny@learnup.me"])
+    mail(:to => ["scott@learnup.me", "kenny@learnup.me"], body: "body")
   end
 
   def notify_with_name
-    mail(:to => "Scott Taylor <scott@learnup.me>")
+    mail(:to => "Scott Taylor <scott@learnup.me>", body: "body")
   end
 
   def notify_no_address
-    mail()
+    mail(body: "body")
   end
 
   def notify_with_empty_to
-    mail(:to => [])
+    mail(:to => [], body: "body")
   end
 end
 
@@ -118,4 +118,16 @@ describe ActionMailer::CatchAll do
     mailer = Notifier.notify
     mailer.to.should == []
   end
-end
+
+  it "should work with a whitelist regex" do
+    ActionMailer::CatchAll.enable(fallback: 'fallback@example.com', whitelist: [/\@learnup.me$/])
+    mailer = Notifier.notify
+    mailer.to.should == ["scott@learnup.me"]
+  end
+
+  it "should work with a fallback" do
+    ActionMailer::CatchAll.enable(fallback: 'fallback@example.com')
+    mailer = Notifier.notify
+    mailer.to.should == ["fallback@example.com"]
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require 'byebug'
+require File.dirname(__FILE__) + '/../lib/catch_all'
+
+RSpec.configure do |config|
+  config.expect_with(:rspec) do |c|
+    c.syntax = :should
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :should
+  end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: catch_all
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Scott Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies: []
 description: Define a white-list only set of emails for ActionMailer
 email:
@@ -18,8 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -27,30 +26,31 @@ files:
 - lib/catch_all.rb
 - lib/catch_all/version.rb
 - spec/catch_all_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.6.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Define a white-list only set of emails for ActionMailer.  Used in staging
   environments.
 test_files:
 - spec/catch_all_spec.rb
+- spec/spec_helper.rb