mailchimp 0.0.7.alpha → 0.0.8

data/CONTRIBUTORS.markdown

@@ -14,4 +14,5 @@
 * [Dave Worth](https://github.com/daveworth)
 * [Mike Skalnik](https://github.com/skalnik)
 * [Kristopher Murata](https://github.com/krsmurata)
-* [Michael Klishin](https://github.com/michaelklishin)
+* [Michael Klishin](https://github.com/michaelklishin)
+* [Ben Simpson](https://github.com/bsimpson)

data/README-api.markdown

@@ -63,15 +63,9 @@ or
 ### Export API usage
 
 In addition to the standard API you can make calls to the
-[MailChimp Export API](http://apidocs.mailchimp.com/export/1.0/) using a APIExport object.  Given an existing
-Mailchimp::API object you can request a new Mailchimp::APIExporter object:
-
-    api = Mailchimp::API.new(@api_key)
-    mailchimp_export = api.get_exporter
-
-or you can construct a new object directly:
-
-    mailchimp_export = Mailchimp::APIExport.new(@api_key)
+[MailChimp Export API](http://apidocs.mailchimp.com/export/1.0/) using a Mailchimp::Export object:
+  
+  mailchimp_export = Mailchimp::Export.new(@api_key)
 
 Calling Export API functions is identical to making standard API calls but the
 return value is an Enumerator which loops over the lines returned from the

data/README-mandrill.markdown

@@ -32,7 +32,7 @@ To check if your api_key is valid:
 
 ### Sending a message
 
-Send a message so a single email:
+Send a message to a single email:
 
     response = mandrill.messages_send({
         :message      => { 
@@ -41,7 +41,7 @@ Send a message so a single email:
             :text => 'hello world', 
             :from_name => 'John Smith', 
             :from_email => 'support@somedomain.com', 
-            :to => ['user@someotherdomain.com']
+            :to => [{'email' => 'user@someotherdomain.com', 'name' => 'User Name'}]
         }
     })
 

data/README.markdown

@@ -14,7 +14,7 @@ confident that it should work out of the box for most usage scenarios.
 ##Installation
 
         # This supercedes uakari and gibbon
-        $ gem install mailchimp
+        $ gem install mailchimp --pre
 
 ##Requirements
 

data/lib/mailchimp/export.rb

@@ -1,5 +1,8 @@
 module Mailchimp
   class Export < Base
+    
+    format :plain
+    
     def initialize(api_key = nil, default_parameters = {})
       super(api_key, {:apikey => api_key}.merge(default_parameters))
     end

data/lib/mailchimp/handlers/mandrill_delivery_handler.rb

@@ -7,28 +7,10 @@ module Mailchimp
     end
 
     def deliver!(message)
-      
-      message_payload = {
-        :track_opens => settings[:track_opens],
-        :track_clicks => settings[:track_clicks],
-        :message => {
-          :subject => message.subject,
-          :from_name => settings[:from_name],
-          :from_email => message.from.first,
-          :to => message.to
-        }
-      }
-
-      [:html, :text].each do |format|
-        content = get_content_for(message, format)
-        message_payload[:message][format] = content if content
-      end
-
-      message_payload[:tags] = settings[:tags] if settings[:tags]
-      
       api_key = message.header['api-key'].blank? ? settings[:api_key] : message.header['api-key']
       
-      Mailchimp::Mandrill.new(api_key).messages_send(message_payload)
+      message_payload = get_message_payload(message)
+      self.settings[:return_response] = Mailchimp::Mandrill.new(api_key).messages_send(message_payload)
     end
     
     private
@@ -43,7 +25,28 @@ module Mailchimp
       content ||= message.body if message.mime_type == mime_types[format]
       content
     end
-    
+
+    def get_message_payload(message)
+      message_payload = {
+        :track_opens => settings[:track_opens],
+        :track_clicks => settings[:track_clicks],
+        :message => {
+          :subject => message.subject,
+          :from_name => message.header['from-name'].blank? ? settings[:from_name] : message.header['from-name'],
+          :from_email => message.from.first,
+          :to => message.to.map {|email| { :email => email, :name => email } },
+          :headers => {'Reply-To' => message.reply_to.nil? ? nil : message.reply_to }
+        }
+      }
+      message_payload[:message][:bcc_address] = message.bcc.first if message.bcc && !message.bcc.empty?
+      [:html, :text].each do |format|
+        content = get_content_for(message, format)
+        message_payload[:message][format] = content if content
+      end
+
+      message_payload[:tags] = settings[:tags] if settings[:tags]
+      message_payload
+    end
   end
 end
 

data/lib/mailchimp/version.rb

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

data/mailchimp.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Mailchimp::VERSION
   s.authors     = ["Chris Kelly"]
   s.email       = ["chris@highgroove.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/mailchimp/mailchimp-gem"
   s.summary     = %q{Mailchimp APIs in Ruby}
   s.description = %q{This provides Ruby access to (eventually) all of Mailchimp's APIs}
 

data/test/integration/export_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+
+class ExportIntegrationTest < Test::Unit::TestCase
+  
+  should "send request List Data from the Mailchimp Export API" do
+    
+    FakeWeb.register_uri(
+      :post,
+      'http://us2.api.mailchimp.com/export/1.0/list/',
+      body: '["Email Address","First Name","Last Name","Salesforce ID","EMAIL_TYPE","MEMBER_RATING","OPTIN_TIME","OPTIN_IP","CONFIRM_TIME","CONFIRM_IP","LATITUDE","LONGITUDE","GMTOFF","DSTOFF","TIMEZONE","CC","REGION","LAST_CHANGED"]
+["highgroove@example.com","Daniel","Rice","00Qd0000005MKaEEAW","html",2,"2011-10-06 20:06:46","173.160.74.121","2011-10-06 20:07:28","173.160.74.121","33.7490000","-84.3880000","-5","-4","America\/Kentucky\/Monticello","US","GA","2012-03-12 17:45:18"]
+["chimpy@example.com","Daniel","Rice","00Qd0000006AjjtEAC","html",2,"",null,"2012-03-08 20:52:31","173.160.74.121",null,null,null,null,null,null,null,"2012-03-12 17:45:20"]
+["wolfbrain@example.com","George P","Burdell","00Qd0000006AjjuEAC","html",2,"",null,"2012-03-08 20:53:10","173.160.74.121",null,null,null,null,null,null,null,"2012-03-12 17:45:22"]'
+    )
+    
+    m = Mailchimp::Export.new('abc123-us2')
+    response = m.list(:id => 'xxxxxxxx')
+    
+    assert_kind_of Enumerator, response
+    
+  end
+  
+  should "get campaign subscriber activity" do
+
+    FakeWeb.register_uri(
+      :post,
+      'http://us2.api.mailchimp.com/export/1.0/campaignSubscriberActivity/',
+      body: '{"highgroove@example.com":[{"action":"open","timestamp":"2012-03-12 20:14:17","url":null,"ip":"184.77.22.196"}]} {"wolfbrain@example.com":[{"action":"open","timestamp":"2012-03-12 20:14:20","url":null,"ip":"184.77.22.196"}]}'.to_json
+    )
+    response = Mailchimp::Export.new('abc123-us2').campaign_subscriber_activity(:id => 'xxxxxxxx')
+    
+    assert_kind_of Enumerator, response
+  end
+end

data/test/test_helper.rb

@@ -38,6 +38,8 @@ def mock_mail_message(options = {})
   message.stubs(:mime_type).returns('text/html')
   message.stubs(:html_part).returns(nil)
   message.stubs(:text_part).returns(nil)
-  
+  message.stubs(:reply_to).returns('replyto@example.com')
+  message.stubs(:bcc).returns(nil)
+
   message
 end

data/test/unit/handlers/mandrill_deliver_handler_test.rb

@@ -4,7 +4,7 @@ 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
+      @mandrill_delivery_handler = Mailchimp::MandrillDeliveryHandler.new(:from_name => "Foo Bar")
       @fake_mandrill_api_response = [{"email"=>"foo@bar.com", "status"=>"sent"}]
       
       FakeWeb.register_uri(
@@ -19,5 +19,36 @@ class MandrillDeliveryHandlerTest < Test::Unit::TestCase
       response = @mandrill_delivery_handler.deliver!(message)
       assert_equal @fake_mandrill_api_response, response 
     end
+
+    should "store the api response in the settings[:return_response] hash key" do
+      message = mock_mail_message
+      response = @mandrill_delivery_handler.deliver!(message)
+      assert_equal @fake_mandrill_api_response, @mandrill_delivery_handler.settings[:return_response]
+    end
+
+    context "for the mandrill api payload" do
+      should "build a valid Mandrill API payload" do
+        message = mock_mail_message
+        @mandrill_delivery_handler.deliver!(message)
+        message_payload = @mandrill_delivery_handler.send(:get_message_payload, message)
+
+        assert_equal true, message_payload[:track_opens]
+        assert_equal true, message_payload[:track_clicks]
+        assert_equal 'Subject', message_payload[:message][:subject]
+        assert_equal 'foo@bar.com', message_payload[:message][:from_email]
+        assert_equal 'Foo Bar', message_payload[:message][:from_name]
+        assert_equal 'foo@bar.com has moved use awesome@awesomesauce.com now', message_payload[:message][:html]
+        assert_equal [{email: 'foo@bar.com', name: 'foo@bar.com'}], message_payload[:message][:to]
+        assert_equal({'Reply-To' => 'replyto@example.com'}, message_payload[:message][:headers])
+      end
+
+      should "handle bcc correctly" do
+        message = mock_mail_message
+        message.stubs(:bcc).returns(["bar@bar.com"])
+        @mandrill_delivery_handler.deliver!(message)
+        message_payload = @mandrill_delivery_handler.send(:get_message_payload, message)
+        assert_equal 'bar@bar.com', message_payload[:message][:bcc_address]
+      end
+    end
   end
-end
+end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.0.7.alpha
-  prerelease: 6
+  version: 0.0.8
+  prerelease: 
 platform: ruby
 authors:
 - Chris Kelly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70308507199520 !ruby/object:Gem::Requirement
+  requirement: &70361207201980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308507199520
+  version_requirements: *70361207201980
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70308507199020 !ruby/object:Gem::Requirement
+  requirement: &70361207201240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308507199020
+  version_requirements: *70361207201240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70308507198560 !ruby/object:Gem::Requirement
+  requirement: &70361207200740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308507198560
+  version_requirements: *70361207200740
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70308507198140 !ruby/object:Gem::Requirement
+  requirement: &70361207200240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308507198140
+  version_requirements: *70361207200240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70308507197640 !ruby/object:Gem::Requirement
+  requirement: &70361207199720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308507197640
+  version_requirements: *70361207199720
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70308507197140 !ruby/object:Gem::Requirement
+  requirement: &70361207199260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308507197140
+  version_requirements: *70361207199260
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70308507196700 !ruby/object:Gem::Requirement
+  requirement: &70361207198760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308507196700
+  version_requirements: *70361207198760
 description: This provides Ruby access to (eventually) all of Mailchimp's APIs
 email:
 - chris@highgroove.com
@@ -120,6 +120,7 @@ files:
 - mailchimp.gemspec
 - test/integration/api_test.rb
 - test/integration/base_test.rb
+- test/integration/export_test.rb
 - test/integration/mandrill_test.rb
 - test/integration/sts_test.rb
 - test/lib/api_test.rb
@@ -129,7 +130,7 @@ files:
 - test/lib/sts_test.rb
 - test/test_helper.rb
 - test/unit/handlers/mandrill_deliver_handler_test.rb
-homepage: ''
+homepage: https://github.com/mailchimp/mailchimp-gem
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -144,18 +145,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: mailchimp
-rubygems_version: 1.8.6
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Mailchimp APIs in Ruby
 test_files:
 - test/integration/api_test.rb
 - test/integration/base_test.rb
+- test/integration/export_test.rb
 - test/integration/mandrill_test.rb
 - test/integration/sts_test.rb
 - test/lib/api_test.rb