gibbon 0.1.5 → 0.1.6

data/README.markdown

@@ -55,8 +55,18 @@ Gibbon defaults to a 30 second timeout. You can optionally set your own timeout
 
     gb.timeout = 5
 
+### Notes
+
+As of 0.1.6, gibbon uses ActiveSupport::JSON.decode(). This means code that checked for weird API responses (like "true" 
+on a successful call to "listSubscribe" or similar) will need to be tweaked to handle the boolean JSON.decode() returns 
+as opposed to the string the MailChimp API returns. I understand the extra dependency might be a pain for some.
+
 ##Thanks
 
+* [Justin Ip](https://github.com/ippy04)
+* [elshimone](https://github.com/elshimone)
+* [jlxw](https://github.com/jlxw)
+
 * Rails for camelize gsub
 
 ##Copyrights

data/Rakefile

@@ -22,6 +22,7 @@ Jeweler::Tasks.new do |gem|
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   gem.add_runtime_dependency 'httparty', '> 0.6.0'
+  gem.add_runtime_dependency 'activesupport', '> 3.0.0'
   gem.add_runtime_dependency 'json', '> 1.4.0'
   gem.add_development_dependency 'httparty', '> 0.6.0'
   gem.add_development_dependency 'json', '> 1.4.0'

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/gibbon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gibbon}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amro Mousa"]
-  s.date = %q{2011-04-05}
+  s.date = %q{2011-06-02}
   s.description = %q{Gibbon is a simple API wrapper for interacting with MailChimp API version 1.3.}
   s.email = %q{amromousa@gmail.com}
   s.extra_rdoc_files = [
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<httparty>, ["> 0.6.0"])
       s.add_development_dependency(%q<mocha>, ["> 0.9.11"])
       s.add_runtime_dependency(%q<httparty>, ["> 0.6.0"])
+      s.add_runtime_dependency(%q<activesupport>, ["> 3.0.0"])
       s.add_runtime_dependency(%q<json>, ["> 1.4.0"])
       s.add_development_dependency(%q<httparty>, ["> 0.6.0"])
       s.add_development_dependency(%q<json>, ["> 1.4.0"])
@@ -64,6 +65,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httparty>, ["> 0.6.0"])
       s.add_dependency(%q<mocha>, ["> 0.9.11"])
       s.add_dependency(%q<httparty>, ["> 0.6.0"])
+      s.add_dependency(%q<activesupport>, ["> 3.0.0"])
       s.add_dependency(%q<json>, ["> 1.4.0"])
       s.add_dependency(%q<httparty>, ["> 0.6.0"])
       s.add_dependency(%q<json>, ["> 1.4.0"])
@@ -78,6 +80,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, ["> 0.6.0"])
     s.add_dependency(%q<mocha>, ["> 0.9.11"])
     s.add_dependency(%q<httparty>, ["> 0.6.0"])
+    s.add_dependency(%q<activesupport>, ["> 3.0.0"])
     s.add_dependency(%q<json>, ["> 1.4.0"])
     s.add_dependency(%q<httparty>, ["> 0.6.0"])
     s.add_dependency(%q<json>, ["> 1.4.0"])

data/lib/gibbon.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'httparty'
 require 'json'
 require 'cgi'
@@ -24,40 +25,26 @@ module Gibbon
       "https://#{dc}api.mailchimp.com/1.3/?method="
     end
 
-    def call(method, params = {})
-      url = base_api_url + method
-      params = escape_params(@default_params.merge(params))
-      response = API.post(url, :body => params.to_json, :timeout => @timeout)
-
-      begin
-        response = JSON.parse(response.body)
-      rescue
-        response = response.body
-      end
-      response
-    end
+  def call(method, params = {})
+    url = base_api_url + method
+    params = @default_params.merge(params)
+    response = Gibbon::API.post(url, :body => CGI::escape(params.to_json), :timeout => @timeout)
 
-    def method_missing(method, *args)
-      method = method.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase } #Thanks for the gsub, Rails
-      method = method[0].chr.downcase + method[1..-1].gsub(/aim$/i, 'AIM')
-      args = {} unless args.length > 0
-      args = args[0] if (args.class.to_s == "Array")
-      call(method, args)
-    end
-    
-    private
-    
-    def escape_params(param)
-      case param
-      when String
-        CGI::escape(param)
-      when Array
-        param.collect{|v| escape_params(v)}
-      when Hash
-        param.keys.inject({}) {|r,k| r[escape_params(k)] = escape_params(param[k]) ;r} 
-      else
-        param
-      end
+    begin
+      response = ActiveSupport::JSON.decode(response.body)
+    rescue
+      response = response.body
     end
+    response
+  end
+
+  def method_missing(method, *args)
+    method = method.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase } #Thanks for the gsub, Rails
+    method = method[0].chr.downcase + method[1..-1].gsub(/aim$/i, 'AIM')
+    args = {} unless args.length > 0
+    args = args[0] if (args.class.to_s == "Array")
+    call(method, args)
+  end
+
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: gibbon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Amro Mousa
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -04:00
+date: 2011-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,19 +102,30 @@ dependencies:
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: activesupport
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: json
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -122,10 +133,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: json
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -133,10 +144,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -144,7 +155,7 @@ dependencies:
         version: 0.9.11
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id013
 description: Gibbon is a simple API wrapper for interacting with MailChimp API version 1.3.
 email: amromousa@gmail.com
 executables: []
@@ -180,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2466538827739644299
+      hash: -4187933229700536350
       segments: 
       - 0
       version: "0"