gibbon 0.4.1 → 0.4.2

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.1"
+  s.version     = "0.4.2"
   s.authors     = ["Amro Mousa"]
   s.email       = ["amromousa@gmail.com"]
   s.homepage    = "http://github.com/amro/gibbon"

data/lib/gibbon.rb

@@ -6,7 +6,6 @@ class Gibbon
   include HTTParty
   format :plain
   default_timeout 30
-  disable_rails_query_string_format
 
   attr_accessor :api_key, :timeout, :throws_exceptions
 
@@ -14,6 +13,7 @@ class Gibbon
 
   def initialize(api_key = nil, default_parameters = {})
     @api_key = api_key || self.class.api_key || ENV['MAILCHIMP_API_KEY']
+    @api_key = @api_key.strip if @api_key
 
     @timeout = default_parameters.delete(:timeout)
     @throws_exceptions = default_parameters.delete(:throws_exceptions)
@@ -24,7 +24,7 @@ class Gibbon
   end
   
   def api_key=(value)
-    @api_key = value
+    @api_key = value.strip if value
     @default_params = @default_params.merge({apikey: @api_key})
   end
 
@@ -34,10 +34,6 @@ class Gibbon
 
   protected
 
-  def base_api_url
-    "https://#{dc_from_api_key}api.mailchimp.com/1.3/?method="
-  end
-  
   def call(method, params = {})
     api_url = base_api_url + method
     params = @default_params.merge(params)
@@ -120,7 +116,7 @@ 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: params, timeout: @timeout)
+    response = self.class.post(api_url, body: CGI::escape(params.to_json), timeout: @timeout)
 
     lines = response.body.lines
     if @throws_exceptions

data/test/test_gibbon.rb

@@ -178,7 +178,7 @@ class TestGibbon < Test::Unit::TestCase
       @api_key = "TESTKEY-us2"
       @gibbon = GibbonExport.new(@api_key)
 
-      params = {:body => @body, :timeout => 30}
+      params = {:body => CGI::escape(@body.to_json), :timeout => 30}
     
       url = @url.gsub('us1', 'us2') + "sayHello/"
       GibbonExport.expects(:post).with(url, params).returns(@returns)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gibbon
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-12-07 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: -3416610487352320501
+      hash: -3179845678375072173
 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: -3416610487352320501
+      hash: -3179845678375072173
 requirements: []
 rubyforge_project: gibbon
 rubygems_version: 1.8.24