active_mailer 0.0.6 → 0.0.7

data/ChangeLog.md

@@ -1,3 +1,9 @@
+= 0.0.7
+* support for setting custom email headers. Give us the hassssh.
+
+= 0.0.6
+* support for setting layouts
+
 = 0.0.5
 * Fixed bug where the subject was not being set correctly.
 * The ActionMailer object used behind the scenese is now available through #mailer

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_mailer (0.0.5)
+    active_mailer (0.0.7)
       activesupport (~> 3.2)
       rails (~> 3.2)
 

data/active_mailer.gemspec

@@ -7,16 +7,16 @@ Gem::Specification.new do |s|
   s.authors     = ["Matt Gordon"]
   s.email       = 'support@expectedbehavior.com'
   s.files = Dir["{app,lib,config}/**/*"] + ["MIT-LICENSE", "Rakefile", "Gemfile", "README.rdoc"]
-  s.version = "0.0.6"
+  s.version = "0.0.7"
   s.homepage    =
     'https://github.com/expectedbehavior/active_mailer'
-  
-  
+
+
   s.required_rubygems_version = "> 1.3.6"
- 
+
   s.add_dependency "activesupport" , "~> 3.2"
   s.add_dependency "rails"         , "~> 3.2"
- 
+
   s.files = `git ls-files`.split("\n")
   s.executables = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'

data/app/models/active_mailer/base.rb

@@ -6,24 +6,24 @@
 module ActiveMailer #:nodoc:
   class Base < ActiveRecord::Base
     self.abstract_class = true
-    
+
     has_many    :email_user_associations, :as => :emailable
     has_many    :recipients, :through => :email_user_associations, :source => "email_user"
     belongs_to  :sender, :class_name => "ActiveMailer::EmailUser", :foreign_key => "sender_id"
     attr_accessor :body     # leave this as an accessor for now since it's complicated
     attr_accessor :rendered_contents # contains the actual sent email after `send!` is called
-    
+
     validates_presence_of :sender
     validates_length_of   :subject,    :minimum => 1
-    
+
     validate :must_have_at_least_one_recipient_of_some_kind
-    
+
     def must_have_at_least_one_recipient_of_some_kind
       if self.recipients.blank? and self.cc.blank? and self.bcc.blank?
         self.errors[:base] << "You have to have at least one recipient in the to, cc, or bcc fields"
       end
     end
-    
+
     cattr_accessor :before_send_actions
     cattr_accessor :after_send_actions
 
@@ -35,7 +35,7 @@ module ActiveMailer #:nodoc:
         self.ar_sender = EmailUser.find_or_create_by_email_address(email)
       else
         self.ar_sender = email
-      end 
+      end
     end
 
     alias :ar_recipients= :recipients=
@@ -48,17 +48,16 @@ module ActiveMailer #:nodoc:
         else
           email
         end
-      end 
+      end
     end
-    
+
     def render(*args)
       ActionMailer::Base.send(:new).send(:render, *args)
     end
 
-
     before_save :do_before_send
     after_save  :do_after_send
-    
+
     def do_before_send
       self.before_send_actions.each do |m|
         self.send(m)
@@ -70,7 +69,7 @@ module ActiveMailer #:nodoc:
         self.send(m)
       end unless self.after_send_actions.blank?
     end
-    
+
     def self.before_send(action)
       self.before_send_actions ||= []
       self.before_send_actions << action
@@ -88,8 +87,8 @@ module ActiveMailer #:nodoc:
 #       self.delegate_to_action_mailer.flatten!
 #       create_delegator
 #     end
-    
-    
+
+
 #     cattr_accessor :template_variables
 #     def self.template_variable(variable_name)
 #       self.template_variables ||= []
@@ -97,23 +96,23 @@ module ActiveMailer #:nodoc:
 #       self.template_variables.flatten!
 #       attr_accessor variable_name
 #     end
-        
+
     def mailer_variables
       mvars = {}
 
       vars_to_include = self.class.mailer_variables + self.class.content_columns.map(&:name) + self.class.reflect_on_all_associations.map(&:name)
-      
+
       vars_to_include.each do |var|
         mvars[var] = self.send(var.to_sym)
       end
-            
+
       # TODO: this should be less ghetto
       mvars[:from] = self.sender.email_address unless mvars[:from]
       mvars[:recipients] = self.recipients.map(&:email_address) unless mvars[:recipients].all? {|r| r.is_a? String }
-      
+
       mvars
     end
-    
+
     # All the mailer methods will be defined on this ActionMailer class
     class DefaultActionMailer < ActionMailer::Base
 #       add_template_helper(ApplicationHelper)
@@ -121,13 +120,13 @@ module ActiveMailer #:nodoc:
       include Rails.application.routes.url_helpers
 #       def self.create_method(name, &block) # syntactically convenient
 #         self.send(:define_method, name, &block)
-#       end      
+#       end
     end
-    
+
     def mailer(reload = false)
       @mailer ||= DefaultActionMailer.send("#{self.class.default_email_method_name}".to_sym, self.mailer_variables)
     end
-        
+
     def send! # should take false to avoid validations i.e. sending it again
       if self.save!
         logger.info "sending email to #{self.recipients.join(", ")}"
@@ -138,11 +137,11 @@ module ActiveMailer #:nodoc:
         self.update_attribute("sent_at", Time.now)
       end
     end
-    
+
     def self.layout(*args)
       DefaultActionMailer.send("layout", *args)
     end
-    
+
     def self.mailer_variable(*variable_name)
       self.mailer_variables =  Set.new(variable_name.map(&:to_s)) + (mailer_variables || [])
       attr_accessor *variable_name
@@ -153,9 +152,9 @@ module ActiveMailer #:nodoc:
     mailer_variable :body
     mailer_variable :content_type
     mailer_variable :attachments
+    mailer_variable :headers
+
 
-    
-    
     class << self # Class methods
       def define_action_mailer_method
         method_name = default_email_method_name
@@ -170,26 +169,28 @@ module ActiveMailer #:nodoc:
               self.instance_eval("@#{k.to_s} = options[k]") if options[k]
 #              instance_variable_set(k.to_s, options[k])
             end
-            
-            attachments_to_set.each do |att|              
+
+            attachments_to_set.each do |att|
               attachment(
-                         :content_type => (att[:content_type]  || att.content_type), 
-                         :body         => File.read(att[:path] || att.path), 
-                         :filename    => (att[:file_name]     || att.file_name)
+                         :content_type => (att[:content_type]  || att.content_type),
+                         :body         => File.read(att[:path] || att.path),
+                         :filename     => (att[:file_name]     || att.file_name)
                          )
             end
 
-            mail :to => options[:recipients],
-            :subject => options[:subject],
-            :from => options[:sender].email_address
+            mail_options = {
+              :to      => options[:recipients],
+              :subject => options[:subject],
+              :from    => options[:sender].email_address }
+            mail_options[:headers] = options[:headers].to_json if options[:headers].present?
+            mail(mail_options)
           end
         end
       end
-      
+
       def default_email_method_name
         "#{self.name.underscore}"
       end
-      
     end
   end
 end

data/test/active_mailer_test.rb

@@ -5,7 +5,7 @@ class ActiveMailerTest < ActiveSupport::TestCase
   test "removes nil from recipients list automatically" do
     email = nil
     assert_nothing_raised do
-      email = InvitationEmail.new(:sender => "spammy@example.com", 
+      email = InvitationEmail.new(:sender => "spammy@example.com",
                                   :recipients => ["takesit@upemail.com", nil],
                                   :subject => "YOU GUYS!"
                                   )
@@ -13,16 +13,16 @@ class ActiveMailerTest < ActiveSupport::TestCase
     assert { email.save }
     deny   { email.recipients.length == 2 }
   end
-  
+
   test "sends with correct subject" do
-    email = InvitationEmail.new(:sender => "spammy@example.com", 
+    email = InvitationEmail.new(:sender => "spammy@example.com",
                                 :recipients => ["takesit@upemail.com", nil],
                                 :subject => "YOU GUYS!"
                                 )
     assert { email.send! }
     assert { email.mailer.subject == email.subject }
   end
-  
+
   test "sends with correct layout" do
     InvitationEmail.layout "email"
     email = create(:invitation_email)
@@ -30,4 +30,13 @@ class ActiveMailerTest < ActiveSupport::TestCase
     actual_layout = ActiveMailer::Base::DefaultActionMailer.instance_variable_get("@_layout")
     assert { "email" == actual_layout  }
   end
+
+  test "sends headers" do
+    email = InvitationEmail.new(:sender => "spammy@example.com",
+                                :recipients => ["takesit@upemail.com", nil],
+                                :subject => "YOU GUYS!")
+    email.headers = { :something => "else" }
+    assert { email.send! }
+    assert { email.mailer["headers"].to_s == '{"something":"else"}' }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport