monkey_wrench 0.1.0 → 0.1.2

data/README.mdown

@@ -15,4 +15,9 @@ From there you've got a rich API for managing Lists and Members. To subscribe a
     
 ## Further Reading
 
-For more information, [check the documentation](http://rdoc.info/projects/rubypond/monkeywrench)
+For more information, [check the documentation](http://rdoc.info/projects/rubypond/monkeywrench)
+
+## Credits & Contributions
+
+* [David Heath](http://davidheath.org/)
+* [Maxime Guilbot](http://github.com/maxime)

data/Rakefile

@@ -1,11 +1,22 @@
 require 'rubygems'
 require 'rake'
+require 'rake/gempackagetask'
+require 'rake/rdoctask'
+
+spec_data = File.open('monkey_wrench.gemspec').read
+spec = nil
+Thread.new do
+  spec = eval("#{spec_data}")
+end.join
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_zip = false
+  pkg.need_tar = false
+end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = false
-end
-
-task :default => :test
+end

data/lib/monkey_wrench/base.rb

@@ -10,9 +10,10 @@ module MonkeyWrench
 
     @@apikey = nil
     @@datacenter = nil
+    @@dryrun = false
     
     class << self
-      def default_options
+      def default_query_params
         { :output => "json", :apikey=> @@apikey}
       end
       
@@ -20,14 +21,34 @@ module MonkeyWrench
         "http://#{datacenter}.api.mailchimp.com/1.2/"
       end
 
-      def get(params)
-        response = super(base_uri, :query => params.merge(default_options))
-        handle_errors(response.parsed_response)
+      def default_retry_limit
+        3
+      end
+
+      def get(params, http_options = {})
+        if @@dryrun
+          puts "GET #{base_uri} #{params.merge(default_query_params).inspect}"
+          return {}
+        else
+          robustly(http_options) do
+            response = super(base_uri, http_options.merge(:query => params.merge(default_query_params)))
+            handle_errors(response.parsed_response)
+          end
+        end
       end
       
-      def post(params)
-        response = super(base_uri, :query => params.merge(default_options))
-        handle_errors(response.parsed_response)
+      def post(params, http_options = {})
+        if @@dryrun
+          puts "POST #{base_uri} #{params.merge(default_query_params).inspect}"
+          return {}
+        else
+          robustly(http_options) do
+            post_params = params.dup
+            get_params = default_query_params.merge(:method => post_params.delete(:method))
+            response = super(base_uri, http_options.merge(:body => post_params, :query => get_params))
+            handle_errors(response.parsed_response)
+          end
+        end
       end
       
       def handle_errors(objects)
@@ -55,12 +76,27 @@ module MonkeyWrench
     end
     
     private
-      def get(params)
-        self.class.get(params)
+      def self.robustly(http_options, &block)
+        retry_limit = http_options[:retry_limit] || default_retry_limit
+        attempts = 0
+        while attempts < retry_limit
+          begin
+            attempts += 1
+            return yield
+          rescue Timeout::Error => e
+            if attempts == retry_limit
+              raise e
+            end
+          end
+        end
+      end
+
+      def get(*args)
+        self.class.get(*args)
       end
     
-      def post(params)
-        self.class.post(params)
+      def post(*args)
+        self.class.post(*args)
       end
     
   end

data/lib/monkey_wrench/config.rb

@@ -28,7 +28,8 @@ module MonkeyWrench
       end
       @@apikey = config[:apikey]
       @@datacenter = config[:datacenter]
+      @@dryrun = config[:dryrun] || false
       super({})
     end
   end
-end
+end

data/lib/monkey_wrench/hash.rb

@@ -21,7 +21,7 @@ module MonkeyWrench
     def escape_keys!
       collect_kv!{|k,v| [CGI.escape(k.to_s), v]}
     end
-    
+
     def to_mailchimp(index = nil, parent_name = nil)
       result = self.collect_kv do |k,v|
         if v.is_a?(Array) && v.first.is_a?(Hash)
@@ -35,7 +35,7 @@ module MonkeyWrench
           if parent_name
             v = v.collect_kv do |key,val| 
               keyname = CGI.escape("#{parent_name.to_s}[#{key.to_s.upcase}]")
-              [keyname, val]
+              [keyname, val.to_s]
             end
           else
             v = { k => v }.to_mailchimp(nil, k)
@@ -45,7 +45,7 @@ module MonkeyWrench
           i = 0
           v.each do |val|
             keyname = CGI.escape("#{k}[#{i}]")
-            results[keyname] = val
+            results[keyname] = val.to_s
             i += 1
           end
           v = results
@@ -66,4 +66,4 @@ end
 
 class Hash
   include MonkeyWrench::Hash
-end
+end

data/lib/monkey_wrench/list.rb

@@ -2,7 +2,6 @@ require 'cgi'
 
 module MonkeyWrench
   class List < MonkeyWrench::Base
-
     # Finds a given list by name
     # 
     # @example
@@ -13,6 +12,14 @@ module MonkeyWrench
     def self.find_by_name(list_name)
       lists = find_all.detect{|list| list.name == list_name}
     end
+
+    def ==(other_list)
+      other_list.is_a?(self.class) && self.id == other_list.id
+    end
+
+    def self.find(id)
+      new(:id => id)
+    end
     
     # Will compare another list against the current one and return true if 
     # they are the same (based on list ID)
@@ -47,10 +54,11 @@ module MonkeyWrench
     #
     # @return [Array<MonkeyWrench::List>] 
     def self.find_all
-      lists = post({ :method => "lists" }).map do |list|
+      @@lists ||= post({ :method => "lists" }).map do |list|
         List.new(list)
       end
     end
+
     class << self
       alias :all :find_all
     end
@@ -188,7 +196,7 @@ module MonkeyWrench
           opts = opts.merge(contact_details)
         else
           email_address = contact_details
-        end        
+        end
         subscribe_one(email_address, opts)
         return { :success => 1, :errors => []}
       end
@@ -255,14 +263,25 @@ module MonkeyWrench
         end
       end
 
-      def subscribe_in_batches(subscribers, opts)
-        cumulative_response = { :success => 0, :errors => [] }
+      def batch_size
+        1000
+      end
+
+      def each_batch(subscribers, batch_size, &block) 
         i = 0
         while i < subscribers.size
-          response = subscribe_one_batch(subscribers[i..i+9], opts)
-          cumulative_response[:success] += response['success_count']
-          cumulative_response[:errors] += response['errors']
-          i += 10
+          start = Time.now
+          yield subscribers[i..(i+batch_size-1)], i
+          i += batch_size
+        end
+      end
+
+      def subscribe_in_batches(subscribers, opts)
+        cumulative_response = { :success => 0, :errors => [] }
+        each_batch(subscribers, batch_size) do |batch, i|
+          response = subscribe_one_batch(batch, opts)
+          cumulative_response[:success] += (response["success_count"] || 0)
+          cumulative_response[:errors] += (response["errors"] || [])
         end
         cumulative_response
       end
@@ -273,7 +292,12 @@ module MonkeyWrench
         params[:update_existing] = opts[:update_existing] if opts.has_key?(:update_existing)
         params[:replace_interests] = opts[:replace_interests] if opts.has_key?(:replace_interests)
         params.merge!({ :batch => subscribers }.to_mailchimp)
-        post(params)
+        post(params, :timeout => timeout_for_batch(subscribers))
+      end
+
+      def timeout_for_batch(batch)
+        # 5 mins for a batch of 1000
+        ((batch.size.to_f / 1000) * (5 * 60)).to_i
       end
 
       def subscribe_one_at_a_time(subscribers, opts)
@@ -297,7 +321,7 @@ module MonkeyWrench
                   :update_existing => opts.delete(:update_existing),
                   :replace_interests => opts.delete(:replace_interests),
                   :send_welcome => opts.delete(:send_welcome),
-                  :email => email_address
+                  :email_address => email_address
                  }
         params.reject!{ |k,v| v.nil? }
         merge_vars = { :merge_vars => opts }.to_mailchimp

data/test/fixtures/listBatchSubscribe1000_success.json

@@ -0,0 +1 @@
+{"success_count":1000,"error_count":0,"errors":[]}

data/test/fixtures/listBatchSubscribe4_success.json

@@ -0,0 +1 @@
+{"success_count":4,"error_count":0,"errors":[]}

data/test/fixtures/listMemberInfo_success.json

@@ -1 +1 @@
-{"id":"a58cbece83","email":"david@email.com","email_type":"html","ip_opt":"66.132.220.59","ip_signup":null,"member_rating":4,"merges":{"EMAIL":"david@email.com","MERGE0":"david@email.com","FNAME":"David","MERGE1":"David","LNAME":"Heath","MERGE2":"Heath","EXPIRYDATE":"2008-02-04","MERGE5":"2008-02-04","USERNAME":"Test1","MERGE6":"Test1","DURATION":"1","MERGE3":"1","PRODUCT":"One week subscription","MERGE4":"One week subscription","CURRENCY":"GBP","MERGE7":"GBP","ROLLING":"false","MERGE8":"false","EXPIRED":"true","MERGE9":"true","TRIAL":"","MERGE10":"","MMERGE11":"","MERGE11":"","MMERGE12":"","MERGE12":"","MMERGE13":"","MERGE13":"","MMERGE14":"","MERGE14":"","TRACKER":"","MERGE15":"","SUBSTYPE":"","MERGE16":"","FIRSTEBOOK":"","MERGE17":"","MMERGE18":"","MERGE18":"","INTERESTS":"freetrial, tutorials"},"status":"subscribed","timestamp":"2009-11-16 14:11:57","lists":{"699791bff9":"unsubscribed"}}
+{"id":"a58cbece83","email":"david@email.com","email_type":"html","ip_opt":"66.132.220.59","ip_signup":null,"member_rating":4,"merges":{"EMAIL":"david@email.com","MERGE0":"david@email.com","FNAME":"David","MERGE1":"David","LNAME":"Heath","MERGE2":"Heath","EXPIRYDATE":"2008-02-04","MERGE5":"2008-02-04","USERNAME":"Test1","MERGE6":"Test1","DURATION":"1","MERGE3":"1","PRODUCT":"One week subscription","MERGE4":"One week subscription","CURRENCY":"GBP","MERGE7":"GBP","ROLLING":"false","MERGE8":"false","EXPIRED":"true","MERGE9":"true","TRIAL":"","MERGE10":"","MMERGE11":"","MERGE11":"","MMERGE12":"","MERGE12":"","MMERGE13":"","MERGE13":"","MMERGE14":"","MERGE14":"","TRACKER":"","MERGE15":"","SUBSTYPE":"","MERGE16":"","FIRSTEBOOK":"","MERGE17":"","MMERGE18":"","MERGE18":"","INTERESTS":"freetrial, tutorials"},"status":"subscribed","timestamp":"2009-11-16 14:11:57","lists":{"699791bff9":"unsubscribed"}}

data/test/monkey_wrench/base_test.rb

@@ -0,0 +1,55 @@
+$:.unshift File.expand_path("..", File.dirname(__FILE__))
+require "test_helper"
+
+class MonkeyWrench::BaseTest < Test::Unit::TestCase
+
+  context "making an HTTP GET" do
+    should "retry if HTTP GET times out" do
+      retries = sequence('retries')
+      response = mock('')
+      response.stubs(:parsed_response).returns("the response")
+      MonkeyWrench::Base.stubs(:base_uri).returns('http://example.com');
+      HTTParty::Request.any_instance.expects(:perform).in_sequence(retries).raises(Timeout::Error)
+      HTTParty::Request.any_instance.expects(:perform).in_sequence(retries).raises(Timeout::Error)
+      HTTParty::Request.any_instance.expects(:perform).in_sequence(retries).returns(response)
+      assert_equal MonkeyWrench::Base.get({}), 'the response'
+    end
+
+    should "rethrow Timeout::Error if retry limit exceeded" do
+      retries = sequence('retries')
+      response = mock('')
+      response.stubs(:parsed_response).returns("the response")
+      MonkeyWrench::Base.stubs(:base_uri).returns('http://example.com');
+      HTTParty::Request.any_instance.expects(:perform).in_sequence(retries).raises(Timeout::Error)
+      HTTParty::Request.any_instance.expects(:perform).in_sequence(retries).raises(Timeout::Error)
+      assert_raise Timeout::Error do
+        MonkeyWrench::Base.get({}, :retry_limit => 2)
+      end
+    end
+  end
+
+  context "making an HTTP POST" do
+    should "retry if HTTP POST times out" do
+      retries = sequence('retries')
+      response = mock('')
+      response.stubs(:parsed_response).returns("the response")
+      MonkeyWrench::Base.stubs(:base_uri).returns('http://example.com');
+      HTTParty::Request.any_instance.expects(:perform).in_sequence(retries).raises(Timeout::Error)
+      HTTParty::Request.any_instance.expects(:perform).in_sequence(retries).raises(Timeout::Error)
+      HTTParty::Request.any_instance.expects(:perform).in_sequence(retries).returns(response)
+      assert_equal MonkeyWrench::Base.post({}), 'the response'
+    end
+
+    should "rethrow Timeout::Error if retry limit exceeded" do
+      retries = sequence('retries')
+      response = mock('')
+      response.stubs(:parsed_response).returns("the response")
+      MonkeyWrench::Base.stubs(:base_uri).returns('http://example.com');
+      HTTParty::Request.any_instance.expects(:perform).in_sequence(retries).raises(Timeout::Error)
+      HTTParty::Request.any_instance.expects(:perform).in_sequence(retries).raises(Timeout::Error)
+      assert_raise Timeout::Error do
+        MonkeyWrench::Base.post({}, :retry_limit => 2)
+      end
+    end
+  end
+end

data/test/monkey_wrench/hash_test.rb

@@ -43,5 +43,15 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
       assert @example_hash.to_mailchimp.keys.include?("vars%5BEMAIL_ADDRESS%5D")
       assert @example_hash.to_mailchimp.keys.include?("vars%5BTYPE%5D")
     end
+
+    should "convert symbols to strings" do
+      assert_equal @example_hash.to_mailchimp['vars%5BTYPE%5D'], 'html'
+    end
+
+    should_eventually "recursively convert hashes" do
+      example = { :a => { :b => { :c => 1 }}}
+      expected = {"a%5BV%5D%5BC%5D" => 1}
+      assert_equal expected, example.to_mailchimp
+    end
   end
-end
+end

data/test/monkey_wrench/list_test.rb

@@ -7,14 +7,15 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
       setup_config
       mock_chimp_post(:lists)
       @list = MonkeyWrench::List.find_by_name("A test list")
-      clear_fakeweb
     end
     
     context "multiple subscribers at once" do
       should "subscribe users" do
-        form_params = {"batch[0][EMAIL]" => "mail@chimp.com", 
-                  "batch[0][TYPE]" => "html", 
-                  :id => "my-list-id"}
+        form_params = {
+          :batch => [{'EMAIL' => "mail@chimp.com", 
+                       'TYPE' => "html"
+                     }],
+          :id => "my-list-id"}
         mock_chimp_post(:listBatchSubscribe, form_params)
 
         subscribers = [{:email => "mail@chimp.com", :type => :html}]    
@@ -22,34 +23,23 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
         assert_equal expected, @list.subscribe(subscribers)
       end
       
-      should "split more than ten subscribers into batches" do
-        first_batch = {:id => "my-list-id"}
-        subscribers = []
-        10.times do |i|
-          first_batch["batch[#{i}][EMAIL]"] = "mail#{i}@chimp.com"
-          first_batch["batch[#{i}][TYPE]"] = "html"
-          subscribers << {:email => "mail#{i}@chimp.com", :type => :html}
-        end
-        mock_chimp_post(:listBatchSubscribe, first_batch,
-                        true, 'listBatchSubscribe10')
-
-        second_batch = {:id => "my-list-id"}
-        5.times do |i|
-          second_batch["batch[#{i}][EMAIL]"] = "mail1#{i}@chimp.com"
-          second_batch["batch[#{i}][TYPE]"] = "html"
-          subscribers << {:email => "mail1#{i}@chimp.com", :type => :html}
+      should "split more than one thousand subscribers into batches" do
+        subscribers = (1..1004).map do |i|
+          {:email => "mail#{i}@chimp.com", :type => :html}
         end
-        mock_chimp_post(:listBatchSubscribe, second_batch,
-                        true, 'listBatchSubscribe5')
-
-        expected = {:success => 15, :errors => []}      
+        response_sequence = [
+                             {:body => canned_response('listBatchSubscribe1000_success.json'), :headers => {'Content-Type' => 'application/json'}},
+                             {:body => canned_response('listBatchSubscribe4_success.json'), :headers => {'Content-Type' => 'application/json'}}
+                            ]
+        stub_request(:post, uri_for_remote_method('listBatchSubscribe')).to_return(response_sequence)
+        expected = {:success => 1004, :errors => []}      
         assert_equal expected, @list.subscribe(subscribers)
       end
       
       should "send welcome email" do
-        form_params = {"merge_vars[FOO]" => "bar", :id => "my-list-id", 
-                       :email => "mail@chimp.com", :type => :html,
-                       :send_welcome => true}
+        form_params = {:merge_vars => {"FOO" => "bar"}, :id => "my-list-id", 
+                       :email_address => "mail@chimp.com", :type => "html",
+                       :send_welcome => "true"}
         mock_chimp_post(:listSubscribe, form_params)
 
         subscribers = [{:email => "mail@chimp.com", :type => :html, :foo => "bar"}]    
@@ -62,10 +52,10 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
 
       should "collate errors" do
         form_params = {
-          "batch[0][EMAIL]" => "mail@chimp.com", 
-          "batch[0][TYPE]" => "html", 
-          "batch[1][EMAIL]" => "bademail@badmail", 
-          "batch[1][TYPE]" => "html", 
+          :batch => [
+                     {'EMAIL' => "mail@chimp.com", 'TYPE' => 'html'},
+                     {'EMAIL' => "bademail@badmail", 'TYPE' => 'html'}
+                    ],
           :id => "my-list-id"}
         mock_chimp_post(:listBatchSubscribe, form_params, true, 'listBatchSubscribe_with_error')
 
@@ -84,15 +74,14 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
     
     context "a single subscriber" do
       should "subsbscibe a user" do
-        form_params = { :type=>:html, 
-                        :update_existing=>true, 
-                        "merge_vars[MY_DATE]"=>"20090101", 
-                        :replace_interests=>false, 
-                        :double_optin=>false, 
-                        "merge_vars[FNAME]"=>"Joe", 
+        form_params = { :type=> "html", 
+                        :update_existing => "true", 
+                        :merge_vars => {'MY_DATE'=>"20090101", 'FNAME' => 'Joe'},
+                        :replace_interests => "false", 
+                        :double_optin => "false", 
                         :id => "my-list-id",
-                        :send_welcome=>true,
-                        :email => "mail@chimp.com" }
+                        :send_welcome => "true",
+                        :email_address => "mail@chimp.com" }
         mock_chimp_post(:listSubscribe, form_params)
 
         params = { :type => :html,
@@ -119,7 +108,7 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
     
     context "multiple subscribers at once" do
       should "unsubscribe" do
-        form_params = {"emails[0]" => "mail@chimp.com", :id => "my-list-id"}      
+        form_params = {"emails" => ["mail@chimp.com"], :id => "my-list-id"}      
         mock_chimp_post(:listBatchUnsubscribe, form_params)
         subscribers = ["mail@chimp.com"]
       
@@ -128,8 +117,8 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
       end
       
       should "delete subscriber" do
-        form_params = {"emails[0]" => "mail@chimp.com", :id => "my-list-id",
-                       :delete_member => true}
+        form_params = {"emails" => ["mail@chimp.com"], :id => "my-list-id",
+                       :delete_member => "true"}
         mock_chimp_post(:listBatchUnsubscribe, form_params)
         subscribers = ["mail@chimp.com"]
       
@@ -138,8 +127,8 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
       end
       
       should "send goodbye" do
-        form_params = {"emails[0]" => "mail@chimp.com", :id => "my-list-id",
-                       :send_goodbye => true}
+        form_params = {"emails" => ["mail@chimp.com"], :id => "my-list-id",
+                       :send_goodbye => "true"}
         mock_chimp_post(:listBatchUnsubscribe, form_params)
         subscribers = ["mail@chimp.com"]
       
@@ -148,8 +137,8 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
       end
       
       should "send unsubscribe notification" do
-        form_params = {"emails[0]" => "mail@chimp.com", :id => "my-list-id",
-                       :send_notify => true}
+        form_params = {"emails" => ["mail@chimp.com"], :id => "my-list-id",
+                       :send_notify => "true"}
         mock_chimp_post(:listBatchUnsubscribe, form_params)
         subscribers = ["mail@chimp.com"]
       
@@ -160,7 +149,7 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
     
     context "a single subscriber" do
       should "unsubscribe" do
-        form_params = { "emails[0]" => "mail@chimp.com", :id => "my-list-id" }
+        form_params = { "emails" => ["mail@chimp.com"], :id => "my-list-id" }
         mock_chimp_post(:listBatchUnsubscribe, form_params)
 
         expected = {:success => 1, :errors => []}      
@@ -178,12 +167,14 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
     
     context "multiple subscribers at once" do
       should "opt out" do
-        form_params = { "batch[0][EMAIL]" => "mail@chimp.com", :id => "my-list-id",
-                        "batch[1][EMAIL]" => "foo@bar.com"}
+        form_params = { :batch => [
+                                   {'EMAIL' => "mail@chimp.com"},
+                                   {'EMAIL' => 'foo@bar.com'}
+                                  ], :id => "my-list-id"
+                      }
         mock_chimp_post(:listBatchSubscribe, form_params)
-        form_params = { "emails[0]" => "mail@chimp.com", :id => "my-list-id",
-                        "emails[1]" => "foo@bar.com",
-                        :send_goodbye => false, :send_notify => false }
+        form_params = { :emails => ["mail@chimp.com", "foo@bar.com"], :id => "my-list-id",
+                        :send_goodbye => "false", :send_notify => "false" }
         mock_chimp_post(:listBatchUnsubscribe, form_params)
         subscribers = ["mail@chimp.com", "foo@bar.com"]
       
@@ -194,10 +185,10 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
     
     context "a single subscriber" do
       should "opt out" do
-        form_params = { "batch[0][EMAIL]" => "mail@chimp.com", :id => "my-list-id" }
+        form_params = { :batch => [{"EMAIL" => "mail@chimp.com"}], :id => "my-list-id" }
         mock_chimp_post(:listBatchSubscribe, form_params)
-        form_params = { "emails[0]" => "mail@chimp.com", :id => "my-list-id", 
-                        :send_goodbye => false, :send_notify => false}
+        form_params = { :emails => ["mail@chimp.com"], :id => "my-list-id", 
+                        :send_goodbye => "false", :send_notify => "false"}
         mock_chimp_post(:listBatchUnsubscribe, form_params)
 
         expected = {:success => 1, :errors => []}      
@@ -223,9 +214,13 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
     end
 
     should "iterate over all members" do
-      mock_chimp_post(:listMembers, {:id => "my-list-id", :start => 0, :limit => 15000 }, true, 'listMembers')
-      mock_chimp_post(:listMembers, {:id => "my-list-id", :start => 1, :limit => 15000 }, true, 'listMembers')
-      mock_chimp_post(:listMembers, {:id => "my-list-id", :start => 2, :limit => 15000 }, true, 'listMembers_none')
+      response_sequence = %w{listMembers listMembers listMembers_none}.map do |fixture|
+        {
+          :body => canned_response("#{fixture}_success.json"),
+          :headers => {'Content-Type' => 'application/json'}
+        }
+      end
+      stub_request(:post, uri_for_remote_method('listMembers')).to_return(response_sequence)
 
       expected = [ 
                   MonkeyWrench::Member.new({"timestamp"=>"2009-11-12 15:46:20", "email"=>"david@email.com"}), 
@@ -249,32 +244,39 @@ class MonkeyWrench::ListTest < Test::Unit::TestCase
     should "accept single member's email address change as hash" do
       member = {:email => "foo@bar.com", :new_email => "bar@foo.com"}
       form_params = {:email_address => "foo@bar.com", 
-                     "merge_vars[EMAIL]" => 'bar@foo.com', 
-                     :replace_interests => true, :id => "my-list-id"}
+                     :merge_vars => {"EMAIL" => 'bar@foo.com'},
+                     :replace_interests => "true", :id => "my-list-id"}
       mock_chimp_post(:listUpdateMember, form_params)
       @list.update_members(member, :replace_interests => true)
     end
 
     should "accept single member's email address change as list" do
       members = [{:email => "foo@bar.com", :new_email => "bar@foo.com"}]
-      form_params = {:email_address => "foo@bar.com", 
-                     "merge_vars[EMAIL]" => 'bar@foo.com', 
-                     :replace_interests => true, :id => "my-list-id"}
+      form_params = {
+        :email_address => "foo@bar.com", 
+        :merge_vars => {'EMAIL' => 'bar@foo.com'}, 
+        :replace_interests => "true", :id => "my-list-id"
+      }
       mock_chimp_post(:listUpdateMember, form_params)
       @list.update_members(members, :replace_interests => true)
     end
 
     should "update multiple members emails addresses" do
-      members = [{:email => "foo@bar.com", :new_email => "bar@foo.com"},
+      members = [
+                 {:email => "foo@bar.com", :new_email => "bar@foo.com"},
                  {:email => "spock@vulcan.com", :new_email => "sylar@heroes.com"}
                 ]
-      form_params = {:email_address => "foo@bar.com", 
-                     "merge_vars[EMAIL]" => 'bar@foo.com', 
-                     :replace_interests => true, :id => "my-list-id"}
+      form_params = {
+        :email_address => "foo@bar.com", 
+        :merge_vars => {"EMAIL" => 'bar@foo.com'},
+        :replace_interests => "true", :id => "my-list-id"
+      }
       mock_chimp_post(:listUpdateMember, form_params)
-      form_params = {:email_address => "spock@vulcan.com", 
-                     "merge_vars[EMAIL]" => 'sylar@heroes.com', 
-                     :replace_interests => true, :id => "my-list-id"}
+      form_params = {
+        :email_address => "spock@vulcan.com", 
+        :merge_vars => {'EMAIL' => 'sylar@heroes.com'}, 
+        :replace_interests => "true", :id => "my-list-id"
+      }
       mock_chimp_post(:listUpdateMember, form_params)
       @list.update_members(members, :replace_interests => true)
     end

data/test/test_helper.rb

@@ -2,66 +2,66 @@ require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 require 'net/http'
+require 'mocha'
+require 'webmock/test_unit'
+require 'yajl/json_gem'
 
 begin 
   require "redgreen"
 rescue LoadError; 
 end
 
-require File.expand_path(File.dirname(__FILE__)) + '/lib/fakeweb/lib/fake_web'
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require "#{File.dirname(__FILE__)}/../lib/monkey_wrench"
 
-FakeWeb.allow_net_connect = false
-
 class Test::Unit::TestCase
+  include WebMock
+
   protected
 
   def setup_config
     MonkeyWrench::Config.new(:apikey => "my-key", :datacenter => "my-dc")
   end
-  
-  def mock_response(method, api, dc, remote_method, params, fixture, is_success)
-    params.merge!({ :method => remote_method, :output => :json, :apikey => api})
-    form_params = map_form_params(params).gsub(/%5([b-d])/) {|s| s.upcase}  
-    uri = "http://#{dc}.api.mailchimp.com/1.2/?#{form_params}"
-    response = File.read(json_fixture_path(fixture, is_success))
-    store_response(uri, params, response)
-    FakeWeb.register_uri(method, uri, { :body => response, :content_type => 'application/json' })
+
+  def uri_for_remote_method(remote_method) 
+    get_params = { :method => remote_method, :output => :json, :apikey => "my-key"}
+    query_string = map_form_params(get_params).gsub(/%5([b-d])/) {|s| s.upcase}
+    "http://my-dc.api.mailchimp.com/1.2/?#{query_string}"
   end
-  
-  def mock_chimp_post(method, params = {}, is_success = true, fixture = nil)
-    mock_response(:post, "my-key", "my-dc", method, params, fixture || method, is_success)
+
+  def mock_chimp_posts(remote_method, sequence) 
+    uri = uri_for_remote_method(remote_method)
+    sequence.each do |response|
+      response_body = canned_response(fixture_filename(response[:fixture] || remote_method, response[:is_success]))
+      stub_request(:post, uri).with(:body => response[:params]).
+        to_return(:body => response_body, :headers => {'Content-Type' => 'application/json'})
+    end
   end
-  
-  def store_response(uri, params, response)
-    @stored_responses ||= {}
-    @stored_responses[uri] ||= {}
-    @stored_responses[uri][params.collect_kv{|k,v| [k.to_s, v.to_s]}.inspect] = response
+
+  def mock_chimp_post(remote_method, post_params = {}, is_success = true, fixture = nil)
+    mock_chimp_posts remote_method, [{:params => post_params, :is_success => is_success, :fixture => fixture}]
   end
   
-  def get_response(uri, actual_params)
-    response = @stored_responses[uri][actual_params.inspect]
-    raise "Unable to handle request to #{uri} with params: #{actual_params.inspect}" unless response
-    response
+  def escape(string)
+    URI.escape(string, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
   end
-  
+
   def map_form_params(params)
-    request = Net::HTTP::Post.new("http://localhost/")
-    request.set_form_data(params)
-    request.body
+    params.map { |k,v| escape(k.to_s) + '=' + escape(v.to_s) }.join('&')
   end
 
-  def json_fixture_path(fixture, is_success)
-    response = is_success ? "success" : "fail"
-    File.join(File.dirname(__FILE__), "fixtures", "#{fixture}_#{response}.json")
+  def canned_response(filename)
+    File.read(fixture_path(filename))
   end
-  
-  def clear_fakeweb
-    FakeWeb.clean_registry
-    FakeWeb.allow_net_connect = false
+
+  def fixture_filename(fixture, is_success)
+    outcome = is_success ? "success" : "fail"
+    "#{fixture}_#{outcome}.json"
   end
 
+  def fixture_path(filename)
+    File.join(File.dirname(__FILE__), "fixtures", filename)
+  end
+  
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: monkey_wrench
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Glenn Gillen
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +10:00
+date: 2010-10-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.9
-    version: 
+        hash: 13
+        segments: 
+        - 0
+        - 7
+        - 7
+        version: 0.7.7
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: httparty
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.4.5
-    version: 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :runtime
+  version_requirements: *id002
 description: A ruby API for managing lists, campaigns, subscribers, etc. within Mailchimp (http://www.mailchimp.com/)
 email: glenn@rubypond.com
 executables: []
@@ -58,7 +76,9 @@ files:
 - lib/monkey_wrench.rb
 - test/fixtures/api_fail.json
 - test/fixtures/campaigns_success.json
+- test/fixtures/listBatchSubscribe1000_success.json
 - test/fixtures/listBatchSubscribe10_success.json
+- test/fixtures/listBatchSubscribe4_success.json
 - test/fixtures/listBatchSubscribe5_success.json
 - test/fixtures/listBatchSubscribe_success.json
 - test/fixtures/listBatchSubscribe_with_error_success.json
@@ -71,6 +91,7 @@ files:
 - test/fixtures/listSubscribe_success.json
 - test/fixtures/listUnsubscribe_success.json
 - test/fixtures/listUpdateMember_success.json
+- test/monkey_wrench/base_test.rb
 - test/monkey_wrench/campaign_aim_test.rb
 - test/monkey_wrench/campaign_stats_test.rb
 - test/monkey_wrench/campaign_test.rb
@@ -90,28 +111,36 @@ require_paths:
 - .
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: A ruby wrapper for the Mailchimp API
 test_files: 
 - test/fixtures/api_fail.json
 - test/fixtures/campaigns_success.json
+- test/fixtures/listBatchSubscribe1000_success.json
 - test/fixtures/listBatchSubscribe10_success.json
+- test/fixtures/listBatchSubscribe4_success.json
 - test/fixtures/listBatchSubscribe5_success.json
 - test/fixtures/listBatchSubscribe_success.json
 - test/fixtures/listBatchSubscribe_with_error_success.json
@@ -124,6 +153,7 @@ test_files:
 - test/fixtures/listSubscribe_success.json
 - test/fixtures/listUnsubscribe_success.json
 - test/fixtures/listUpdateMember_success.json
+- test/monkey_wrench/base_test.rb
 - test/monkey_wrench/campaign_aim_test.rb
 - test/monkey_wrench/campaign_stats_test.rb
 - test/monkey_wrench/campaign_test.rb