gibbon 0.4.3 → 0.4.4

data/gibbon.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "gibbon"
-  s.version     = "0.4.3"
+  s.version     = "0.4.4"
   s.authors     = ["Amro Mousa"]
   s.email       = ["amromousa@gmail.com"]
   s.homepage    = "http://github.com/amro/gibbon"

data/lib/gibbon.rb

@@ -1,5 +1,5 @@
 require 'httparty'
-require 'json'
+require 'multi_json'
 require 'cgi'
 
 class Gibbon
@@ -38,12 +38,12 @@ class Gibbon
   def call(method, params = {})
     api_url = base_api_url + method
     params = @default_params.merge(params)
-    response = self.class.post(api_url, body: CGI::escape(params.to_json), timeout: @timeout)
-    
+    response = self.class.post(api_url, body: CGI::escape(MultiJson.dump(params)), timeout: @timeout)
+
     # MailChimp API sometimes returns JSON fragments (e.g. true from listSubscribe)
     # so we parse after adding brackets to create a JSON array so 
-    # JSON.parse succeeds in those cases.
-    parsed_response = JSON.parse("[#{response.body}]").first
+    # parsing succeeds. This also handles the case of an empty response
+    parsed_response = MultiJson.load("[#{response.body}]").first
 
     if should_raise_for_response?(parsed_response)
       raise MailChimpError.new("MailChimp API Error: #{parsed_response["error"]} (code #{parsed_response["code"]})")
@@ -121,11 +121,11 @@ class GibbonExport < Gibbon
   def call(method, params = {})
     api_url = export_api_url + method + "/"
     params = @default_params.merge(params)
-    response = self.class.post(api_url, body: CGI::escape(params.to_json), timeout: @timeout)
+    response = self.class.post(api_url, body: CGI::escape(MultiJson.dump(params)), timeout: @timeout)
 
     lines = response.body.lines
     if @throws_exceptions
-      first_line = JSON.parse(lines.first) if lines.first
+      first_line = MultiJson.load(lines.first) if lines.first
       
       if should_raise_for_response?(first_line)
         raise MailChimpError.new("MailChimp Export API Error: #{first_line["error"]} (code #{first_line["code"]})")

data/test/test_gibbon.rb

@@ -162,7 +162,7 @@ class TestGibbon < Test::Unit::TestCase
       @gibbon = Gibbon.new(@key)
       @url = "https://us1.api.mailchimp.com/1.3/?method=sayHello"
       @body = {"apikey" => @key}
-      @returns = Struct.new(:body).new(["array", "entries"].to_json)
+      @returns = Struct.new(:body).new(MultiJson.dump(["array", "entries"]))
     end
 
     should "produce a good exporter" do
@@ -172,7 +172,7 @@ class TestGibbon < Test::Unit::TestCase
 
     should "not throw exception if configured to and the API replies with a JSON hash containing a key called 'error'" do
       @gibbon.throws_exceptions = false
-      Gibbon.stubs(:post).returns(Struct.new(:body).new({'error' => 'bad things'}.to_json))
+      Gibbon.stubs(:post).returns(Struct.new(:body).new(MultiJson.dump({'error' => 'bad things'})))
       assert_nothing_raised do
         @gibbon.say_hello
       end
@@ -180,7 +180,7 @@ class TestGibbon < Test::Unit::TestCase
 
     should "throw exception if configured to and the API replies with a JSON hash containing a key called 'error'" do
       @gibbon.throws_exceptions = true
-      Gibbon.stubs(:post).returns(Struct.new(:body).new({'error' => 'bad things'}.to_json))
+      Gibbon.stubs(:post).returns(Struct.new(:body).new(MultiJson.dump({'error' => 'bad things'})))
       assert_raise Gibbon::MailChimpError do
         @gibbon.say_hello
       end
@@ -198,14 +198,14 @@ class TestGibbon < Test::Unit::TestCase
       @gibbon = GibbonExport.new(@key)
       @url = "http://us1.api.mailchimp.com/export/1.0/"
       @body = {:apikey => @key, :id => "listid"}
-      @returns = Struct.new(:body).new(["array", "entries"].to_json)
+      @returns = Struct.new(:body).new(MultiJson.dump(["array", "entries"]))
     end
 
     should "handle api key with dc" do
       @api_key = "TESTKEY-us2"
       @gibbon = GibbonExport.new(@api_key)
 
-      params = {:body => CGI::escape(@body.to_json), :timeout => 30}
+      params = {:body => CGI::escape(MultiJson.dump(@body)), :timeout => 30}
     
       url = @url.gsub('us1', 'us2') + "sayHello/"
       GibbonExport.expects(:post).with(url, params).returns(@returns)
@@ -214,7 +214,7 @@ class TestGibbon < Test::Unit::TestCase
 
     should "not throw exception if the Export API replies with a JSON hash containing a key called 'error'" do
       @gibbon.throws_exceptions = false
-      GibbonExport.stubs(:post).returns(Struct.new(:body).new({'error' => 'bad things'}.to_json))
+      GibbonExport.stubs(:post).returns(Struct.new(:body).new(MultiJson.dump({'error' => 'bad things'})))
 
       assert_nothing_raised do
         @gibbon.say_hello(@body)
@@ -224,7 +224,7 @@ class TestGibbon < Test::Unit::TestCase
     should "throw exception if configured to and the Export API replies with a JSON hash containing a key called 'error'" do
       @gibbon.throws_exceptions = true
       params = {:body => @body, :timeout => 30}
-      GibbonExport.stubs(:post).returns(Struct.new(:body).new({'error' => 'bad things', 'code' => '123'}.to_json))
+      GibbonExport.stubs(:post).returns(Struct.new(:body).new(MultiJson.dump({'error' => 'bad things', 'code' => '123'})))
 
       assert_raise Gibbon::MailChimpError do
         @gibbon.say_hello(@body)
@@ -238,8 +238,8 @@ class TestGibbon < Test::Unit::TestCase
   def expect_post(expected_url, expected_body, expected_timeout=30)
     Gibbon.expects(:post).with do |url, opts|
       url == expected_url &&
-      JSON.parse(URI::decode(opts[:body])) == expected_body &&
+      MultiJson.load(URI::decode(opts[:body])) == expected_body &&
       opts[:timeout] == expected_timeout
-    end.returns(Struct.new(:body).new("") )
+    end.returns(Struct.new(:body).new(""))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gibbon
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2873655008867381541
+      hash: -509516147355860148
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2873655008867381541
+      hash: -509516147355860148
 requirements: []
 rubyforge_project: gibbon
 rubygems_version: 1.8.24