pboling-sanitize_email 0.3.1 → 0.3.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 1
+:patch: 2

data/lib/sanitize_email/custom_environments.rb

@@ -9,18 +9,12 @@ module NinthBit
   
       base.cattr_accessor :local_environments
       base.local_environments = %w( development test )
-      
-      base.cattr_accessor :deployed_environments
-      base.deployed_environments = %w( production staging )
     end
 
     module ClassMethods
       def consider_local?
         local_environments.include?(defined?(Rails) ? Rails.env : RAILS_ENV)
       end
-      def consider_deployed?
-        deployed_environments.include?(defined?(Rails) ? Rails.env : RAILS_ENV)
-      end
     end
     
   end

data/lib/sanitize_email/sanitize_email.rb

@@ -24,15 +24,21 @@ module NinthBit
       base.sanitized_recipients = nil
       
       # Use the 'real' email address as the username for the sanitized email address
-      # e.g. "real@email.com <sanitized@email.com>"
+      # e.g. "real@example.com <sanitized@example.com>"
       base.cattr_accessor :use_actual_email_as_sanitized_user_name
       base.use_actual_email_as_sanitized_user_name = false
-      
+
+      # Prepend the 'real' email address onto the Subject line of the message
+      # e.g. "real@example.com rest of subject"
+      base.cattr_accessor :use_actual_email_prepended_to_subject
+      base.use_actual_email_prepended_to_subject = false
+
       base.class_eval do
         # We need to alias these methods so that our new methods get used instead
         alias :real_bcc :bcc
         alias :real_cc :cc
         alias :real_recipients :recipients
+        alias :real_subject :subject
 
         def localish?
           # consider_local is a method in sanitize_email/lib/custom_environments.rb
@@ -40,11 +46,16 @@ module NinthBit
           !self.class.force_sanitize.nil? ? self.class.force_sanitize : self.class.consider_local?
         end
 
+        def subject(*lines)
+          real_subject(*lines)
+          localish? ? override_subject : real_subject
+        end
+
         def recipients(*addresses)
           real_recipients(*addresses)
           if localish? 
             puts "sanitize_email error: sanitized_recipients is not set" if self.class.sanitized_recipients.nil?
-            override(:recipients)
+            override_email(:recipients)
           else
             real_recipients
           end
@@ -52,19 +63,23 @@ module NinthBit
 
         def cc(*addresses)
           real_cc(*addresses)
-          localish? ? override(:cc) : real_cc
+          localish? ? override_email(:cc) : real_cc
         end
 
         def bcc(*addresses)
           real_bcc(*addresses)
-          localish? ? override(:bcc) : real_bcc
+          localish? ? override_email(:bcc) : real_bcc
         end
         
         #######
         private
         #######
 
-        def override(type)
+        def override_subject
+          real_recipients.nil? ? real_subject : "(#{real_recipients}) #{real_subject}"
+        end
+
+        def override_email(type)
           real_addresses, sanitized_addresses = 
             case type
             when :recipients
@@ -75,7 +90,9 @@ module NinthBit
               [real_bcc, self.class.sanitized_bcc]
             else raise "sanitize_email error: unknown email override"
             end
-          
+
+          # If there were no original recipients, then we DO NOT override the nil with the sanitized recipients
+          return nil if real_addresses.nil?
           return sanitized_addresses if sanitized_addresses.nil? || !self.class.use_actual_email_as_sanitized_user_name
 
           out = real_addresses.inject([]) do |result, real_recipient|

data/sanitize_email.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name = %q{sanitize_email}
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.extra_rdoc_files = ["README.rdoc"]
-  s.version = "0.3.1"
+  s.version = "0.3.2"
   s.authors = ["Peter Boling", "John Trupiano", "George Anderson"]
   s.date = %q{2009-08-13}
   s.description = %q{allows you to play with your application's email abilities without worrying that emails will get sent to actual live addresses}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pboling-sanitize_email
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Peter Boling