mailchimp 0.0.3.alpha → 0.0.4.alpha

data/README.markdown

@@ -51,7 +51,13 @@ Write tests before you change anything, run tests before you commit anything:
 
         $ rake test
 
-We welcome concise pull requests that match the style of this gem and have appropriate tests.
+We welcome concise pull requests that match the style of this gem and have appropriate tests. To get a
+console running where you can play, run:
+
+        irb
+        $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
+        $LOAD_PATH.unshift(File.dirname(__FILE__))
+        require 'mailchimp'
 
 ##Contributors
 

data/lib/mailchimp/ext/httparty.rb

@@ -1,3 +1,16 @@
+class MailchimpPsuedoJSONParser < HTTParty::Parser
+  # Unfornately Mailchimp's API returns invalid JSON for some valid requests,
+  # specifically mandrill's users/ping.  We need to just pass that through instead
+  # of blowing up inside of HTTParty so that we can do something with it later.
+  def json
+    begin
+      MultiJson.decode(body)
+    rescue
+      body
+    end
+  end
+end
+
 module HTTParty
   module HashConversions
     # @param key<Object> The key for the param.

data/lib/mailchimp/mandrill.rb

@@ -5,6 +5,7 @@ end
 module Mailchimp
   class Mandrill
     include HTTParty
+    parser MailchimpPsuedoJSONParser
     default_timeout 30
 
     attr_accessor :api_key, :timeout, :options
@@ -51,7 +52,7 @@ module Mailchimp
     end
     
     def valid_api_key?(*args)
-      'PONG!' == self.users_ping
+      '"PONG!"' == self.users_ping
     end
     
     class << self

data/lib/mailchimp/version.rb

@@ -1,3 +1,3 @@
 module Mailchimp
-  VERSION = "0.0.3.alpha"
+  VERSION = "0.0.4.alpha"
 end

data/test/integration/mandrill_test.rb

@@ -6,12 +6,12 @@ class MandrillIntegrationTest < Test::Unit::TestCase
     FakeWeb.register_uri(
       :post,
       'http://mandrillapp.com/api/1.0/users/ping',
-      body: "PONG!"
+      body: '"PONG!"'
     )
     expected_request = "key=abc123-us1&options[track_opens]=true&options[track_clicks]=true"
     
     m = Mailchimp::Mandrill.new('abc123-us1')
-    assert_equal "PONG!", m.users_ping
+    assert_equal '"PONG!"', m.users_ping
     assert_equal expected_request, URI::decode(FakeWeb.last_request.body)
   end
   
@@ -19,7 +19,7 @@ class MandrillIntegrationTest < Test::Unit::TestCase
     FakeWeb.register_uri(
       :post,
       'http://mandrillapp.com/api/1.0/users/ping',
-      body: "PONG!"
+      body: '"PONG!"'
     )
     
     m = Mailchimp::Mandrill.new('abc123-us1')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.0.3.alpha
+  version: 0.0.4.alpha
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000Z
+date: 2012-01-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70318249529140 !ruby/object:Gem::Requirement
+  requirement: &70284804810420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318249529140
+  version_requirements: *70284804810420
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70318249528720 !ruby/object:Gem::Requirement
+  requirement: &70284804810000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318249528720
+  version_requirements: *70284804810000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70318249528300 !ruby/object:Gem::Requirement
+  requirement: &70284804809560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318249528300
+  version_requirements: *70284804809560
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70318249527820 !ruby/object:Gem::Requirement
+  requirement: &70284804809140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318249527820
+  version_requirements: *70284804809140
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70318249527340 !ruby/object:Gem::Requirement
+  requirement: &70284804808680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318249527340
+  version_requirements: *70284804808680
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70318249526900 !ruby/object:Gem::Requirement
+  requirement: &70284804808260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318249526900
+  version_requirements: *70284804808260
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70318249526480 !ruby/object:Gem::Requirement
+  requirement: &70284804807840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318249526480
+  version_requirements: *70284804807840
 description: This provides Ruby access to (eventually) all of Mailchimp's APIs
 email:
 - chris@highgroove.com