whitelist_mail_proxy 0.4.0 → 0.4.1

data/Rakefile

@@ -45,7 +45,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "whitelist_mail_proxy"
-  s.version           = "0.4.0"
+  s.version           = "0.4.1"
   s.summary           = "A thin proxy for Mail and ActionMailer to enable whitelisting"
   s.author            = "Matthew Rudy Jacobs"
   s.email             = "MatthewRudyJacobs@gmail.com"

data/lib/whitelist_mail_proxy.rb

@@ -19,7 +19,7 @@ class WhitelistMailProxy
     end
   
     if blocked.any?
-      raise BlockedDelivery.new("cannot send to #{blocked.inspect}, whitelist is #{regexp.inspect}")
+      raise BlockedDelivery.new("cannot send to #{blocked.inspect}, whitelist is #{whitelist_description}")
     else
       real_delivery_method.deliver!(mail)
     end
@@ -40,6 +40,14 @@ class WhitelistMailProxy
     block_by_regexp?(string) || block_by_domain?(string)
   end
   
+  def whitelist_description
+    bits = []
+    bits << "addresses LIKE #{regexp.inspect}" if self.regexp
+    bits << "domains IN #{domains.inspect}"    if self.domains
+  
+    bits.join(" OR ")
+  end
+  
   protected
   
   def block_by_regexp?(string)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whitelist_mail_proxy
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Matthew Rudy Jacobs