mailchimp 0.0.6.alpha → 0.0.7.alpha

data/CONTRIBUTORS.markdown

@@ -1,3 +1,4 @@
+* [Daniel Rice](https://github.com/highgroovedan)
 * [wnadeau](https://github.com/wnadeau)
 * [Chris Kelly](https://github.com/ckdake)
 * [Stafford Brooke](https://github.com/srbiv)

data/README-mandrill.markdown

@@ -62,3 +62,26 @@ You can tell ActionMailer to send mail using Mandrill by adding the follow to to
 
 These setting will allow you to use ActionMailer as you normally would, any calls to mail() will be sent using Mandrill
 
+If your application will specify the API Key on a per email basis, you can configure your application like so:
+
+    config.action_mailer.delivery_method = :mailchimp_mandrill
+    config.action_mailer.mailchimp_mandrill_settings = {
+          :track_clicks => true,
+          :track_opens  => true, 
+          :from_name    => "Change Me"
+    }
+    
+Once this is specified, be sure to include the api_key in ActionMailer.mail()'s options:
+
+	class ExampleMailer < ActionMailer::Base
+	  default from: "no-reply@example.com"
+	  
+	  def test_email(object_with_api_key)
+	    
+	    mail(to: object_with_api_key.email,
+	         subject: "This is an example Mandrill Email",
+	         api_key: object_with_api_key.api_key)
+	  end
+	end
+	
+And the Mandrill Delivery Hander will read the api key from the email message object, instead of the application configuration

data/lib/mailchimp/api.rb

@@ -49,9 +49,7 @@ module Mailchimp
     def method_missing(method, *args)
       method = method.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase } #Thanks for the gsub, Rails
       method = method[0].chr.downcase + method[1..-1].gsub(/aim$/i, 'AIM')
-      args = {} unless args.length > 0
-      args = args[0] if args.is_a?(Array)
-      call(method, args)
+      call(method, *args)
     end
 
     class << self

data/lib/mailchimp/base.rb

@@ -47,9 +47,7 @@ module Mailchimp
       def method_missing(method, *args)
         method = method.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase } #Thanks for the gsub, Rails
         method = method[0].chr.downcase + method[1..-1].gsub(/aim$/i, 'AIM')
-        args = {} unless args.length > 0
-        args = args[0] if args.is_a?(Array)
-        call(method, args)
+        call(method, *args)
       end
 
     private

data/lib/mailchimp/handlers/mandrill_delivery_handler.rb

@@ -1,14 +1,13 @@
-require 'action_mailer'
-
 module Mailchimp
   class MandrillDeliveryHandler
     attr_accessor :settings
 
-    def initialize options
-      self.settings = {:track_opens => true, :track_clicks => true}.merge(options)
+    def initialize(options = {})
+      self.settings = {:track_opens => true, :track_clicks => true, :from_name => 'Mandrill Email Delivery Handler'}.merge(options)
     end
 
-    def deliver! message
+    def deliver!(message)
+      
       message_payload = {
         :track_opens => settings[:track_opens],
         :track_clicks => settings[:track_clicks],
@@ -16,32 +15,39 @@ module Mailchimp
           :subject => message.subject,
           :from_name => settings[:from_name],
           :from_email => message.from.first,
-          :to_email => message.to
+          :to => message.to
         }
       }
 
-      mime_types = {
-        :html => "text/html",
-        :text => "text/plain"
-      }
-
-      get_content_for = lambda do |format|
-        content = message.send(:"#{format}_part")
-        content ||= message if message.content_type =~ %r{#{mime_types[format]}}
-        content
-      end
-
       [:html, :text].each do |format|
-        content = get_content_for.call(format)
-        message_payload[:message][format] = content.body if content
+        content = get_content_for(message, format)
+        message_payload[:message][format] = content if content
       end
 
       message_payload[:tags] = settings[:tags] if settings[:tags]
-
-      Mandrill.new(settings[:api_key]).send_email(message_payload)
+      
+      api_key = message.header['api-key'].blank? ? settings[:api_key] : message.header['api-key']
+      
+      Mailchimp::Mandrill.new(api_key).messages_send(message_payload)
     end
-
+    
+    private
+    
+    def get_content_for(message, format)
+      mime_types = {
+        :html => "text/html",
+        :text => "text/plain"
+      }
+      
+      content = message.send(:"#{format.to_s}_part")
+      content ||= message.body if message.mime_type == mime_types[format]
+      content
+    end
+    
   end
 end
 
-ActionMailer::Base.add_delivery_method :mailchimp_mandrill, Mailchimp::MandrillDeliveryHandler
+if defined?(ActionMailer)
+  ActionMailer::Base.add_delivery_method(:mailchimp_mandrill, Mailchimp::MandrillDeliveryHandler)
+end
+

data/lib/mailchimp/mandrill.rb

@@ -27,9 +27,7 @@ module Mailchimp
     def method_missing(method, *args)
       match = method.to_s.match(/([a-z]*)_([a-z]*)_?([a-z]*)/)
       method = "#{match[1]}/#{match[2]}#{match[3] == '' ? "" : "-"+match[3]}"
-      args = {} unless args.length > 0
-      args = args[0] if (args.class.to_s == "Array")
-      call(method, args)
+      call(method, *args)
     end
 
     

data/lib/mailchimp/sts.rb

@@ -20,9 +20,7 @@ module Mailchimp
 
     def method_missing(method, *args)
       method = method.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase } #Thanks for the gsub, Rails
-      args = {} unless args.length > 0
-      args = args[0] if (args.class.to_s == "Array")
-      call(method, args)
+      call(method, *args)
     end
 
     class << self
@@ -39,4 +37,4 @@ module Mailchimp
         "https://#{dc_from_api_key}sts.mailchimp.com/1.0/"
       end
   end
-end
+end

data/lib/mailchimp/version.rb

@@ -1,3 +1,3 @@
 module Mailchimp
-  VERSION = "0.0.6.alpha"
+  VERSION = "0.0.7.alpha"
 end

data/test/test_helper.rb

@@ -19,4 +19,25 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'mailchimp'
 
-FakeWeb.allow_net_connect = false
+FakeWeb.allow_net_connect = false
+
+def mock_mail_message(options = {})
+  subject = options.fetch(:subject) { 'Subject' }
+  from = [ options.fetch(:from) { 'foo@bar.com' } ]
+  to = [ options.fetch(:to) {'foo@bar.com'} ]
+  body = options.fetch(:body) { 'foo@bar.com has moved use awesome@awesomesauce.com now' }
+  
+  message = mock('Mail::Message')
+  message.stubs(:subject).returns(subject)
+  message.stubs(:date).returns(Date.today)
+  message.stubs(:from).returns(from)
+  message.stubs(:to).returns(to)
+  message.stubs(:body).returns(body)
+  message.stubs(:header).returns('')
+  message.stubs(:multipart?).returns(false)
+  message.stubs(:mime_type).returns('text/html')
+  message.stubs(:html_part).returns(nil)
+  message.stubs(:text_part).returns(nil)
+  
+  message
+end

data/test/unit/handlers/mandrill_deliver_handler_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+require File.join('./lib/mailchimp','handlers', 'mandrill_delivery_handler')
+
+class MandrillDeliveryHandlerTest < Test::Unit::TestCase
+  context "when delivering a Mail::Message to the Mandrill API" do
+    setup do
+      @mandrill_delivery_handler = Mailchimp::MandrillDeliveryHandler.new
+      @fake_mandrill_api_response = [{"email"=>"foo@bar.com", "status"=>"sent"}]
+      
+      FakeWeb.register_uri(
+      :post,
+      'http://mandrillapp.com/api/1.0/messages/send',
+      body: @fake_mandrill_api_response.to_json
+    )
+    end
+    
+    should "deliver successfully" do
+      message = mock_mail_message
+      response = @mandrill_delivery_handler.deliver!(message)
+      assert_equal @fake_mandrill_api_response, response 
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.0.6.alpha
+  version: 0.0.7.alpha
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70206693975680 !ruby/object:Gem::Requirement
+  requirement: &70308507199520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206693975680
+  version_requirements: *70308507199520
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70206693975260 !ruby/object:Gem::Requirement
+  requirement: &70308507199020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206693975260
+  version_requirements: *70308507199020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70206693974820 !ruby/object:Gem::Requirement
+  requirement: &70308507198560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206693974820
+  version_requirements: *70308507198560
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70206693974400 !ruby/object:Gem::Requirement
+  requirement: &70308507198140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206693974400
+  version_requirements: *70308507198140
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70206693973940 !ruby/object:Gem::Requirement
+  requirement: &70308507197640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206693973940
+  version_requirements: *70308507197640
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70206693973480 !ruby/object:Gem::Requirement
+  requirement: &70308507197140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206693973480
+  version_requirements: *70308507197140
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70206693973020 !ruby/object:Gem::Requirement
+  requirement: &70308507196700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206693973020
+  version_requirements: *70308507196700
 description: This provides Ruby access to (eventually) all of Mailchimp's APIs
 email:
 - chris@highgroove.com
@@ -128,6 +128,7 @@ files:
 - test/lib/mandrill_test.rb
 - test/lib/sts_test.rb
 - test/test_helper.rb
+- test/unit/handlers/mandrill_deliver_handler_test.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -163,3 +164,4 @@ test_files:
 - test/lib/mandrill_test.rb
 - test/lib/sts_test.rb
 - test/test_helper.rb
+- test/unit/handlers/mandrill_deliver_handler_test.rb