gibbon 0.1.4 → 0.1.5

data/Gemfile

@@ -10,4 +10,7 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.1"
   gem "rcov", ">= 0"
+  gem "json", "> 1.4.0"
+  gem "httparty", "> 0.6.0"
+  gem "mocha", "> 0.9.11"
 end

data/Gemfile.lock

@@ -1,11 +1,16 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    crack (0.1.8)
     git (1.2.5)
-    jeweler (1.5.1)
+    httparty (0.7.4)
+      crack (= 0.1.8)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    json (1.5.1)
+    mocha (0.9.12)
     rake (0.8.7)
     rcov (0.9.9)
     shoulda (2.11.3)
@@ -15,6 +20,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  httparty (> 0.6.0)
   jeweler (~> 1.5.1)
+  json (> 1.4.0)
+  mocha (> 0.9.11)
   rcov
   shoulda

data/Rakefile

@@ -21,9 +21,12 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Amro Mousa"]
   # 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 'json', '> 1.4.0'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.add_runtime_dependency 'httparty', '> 0.6.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'
+  gem.add_development_dependency 'mocha', '> 0.9.11'
+  #gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/gibbon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gibbon}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amro Mousa"]
-  s.date = %q{2011-03-18}
+  s.date = %q{2011-04-05}
   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 = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/amro/gibbon}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Gibbon is a simple API wrapper for interacting with MailChimp API 1.3}
   s.test_files = [
     "test/helper.rb",
@@ -47,23 +47,41 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<json>, ["> 1.4.0"])
+      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<json>, ["> 1.4.0"])
+      s.add_development_dependency(%q<httparty>, ["> 0.6.0"])
+      s.add_development_dependency(%q<json>, ["> 1.4.0"])
+      s.add_development_dependency(%q<mocha>, ["> 0.9.11"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<json>, ["> 1.4.0"])
+      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<json>, ["> 1.4.0"])
       s.add_dependency(%q<httparty>, ["> 0.6.0"])
       s.add_dependency(%q<json>, ["> 1.4.0"])
+      s.add_dependency(%q<mocha>, ["> 0.9.11"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<json>, ["> 1.4.0"])
+    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<json>, ["> 1.4.0"])
     s.add_dependency(%q<httparty>, ["> 0.6.0"])
     s.add_dependency(%q<json>, ["> 1.4.0"])
+    s.add_dependency(%q<mocha>, ["> 0.9.11"])
   end
 end
 

data/lib/gibbon.rb

@@ -26,8 +26,7 @@ module Gibbon
 
     def call(method, params = {})
       url = base_api_url + method
-      params = @default_params.merge(params)
-      params.each_pair {|k,v| params[k] = CGI::escape(v) if v.class == String}
+      params = escape_params(@default_params.merge(params))
       response = API.post(url, :body => params.to_json, :timeout => @timeout)
 
       begin
@@ -45,5 +44,20 @@ module Gibbon
       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
+    end
   end
 end

data/test/helper.rb

@@ -9,6 +9,7 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_gibbon.rb

@@ -1,7 +1,74 @@
 require 'helper'
 
 class TestGibbon < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+
+  context "build api url" do
+    
+    setup do
+      @gibbon = Gibbon::API.new
+    end
+    
+    should "handle empty api key" do
+      expect_post("https://api.mailchimp.com/1.3/?method=sayHello", {"apikey" => nil})
+
+      @gibbon.say_hello
+    end
+    
+    should "handle timeout" do
+      expect_post("https://api.mailchimp.com/1.3/?method=sayHello", {"apikey" => nil}, 120)
+      @gibbon.timeout=120
+      @gibbon.say_hello
+    end
+    
+    should "handle api key with dc" do
+      @gibbon.apikey="TESTKEY-us1"
+      expect_post("https://us1.api.mailchimp.com/1.3/?method=sayHello", {"apikey" => "TESTKEY-us1"})
+
+      @gibbon.say_hello
+    end
+  end
+  
+  context "build api body" do
+    setup do
+      @key = "TESTKEY-us1"
+      @gibbon = Gibbon::API.new(@key)
+      @url = "https://us1.api.mailchimp.com/1.3/?method=sayHello"
+    end
+
+    should "escape string parameters" do
+      expect_post(@url, {"apikey" => @key, "message" => "simon+says"})
+      @gibbon.say_hello(:message => "simon says")
+    end
+    
+    should "escape string parameters in an array" do
+      expect_post(@url, {"apikey" => @key, "messages" => ["simon+says", "do+this"]})
+      @gibbon.say_hello(:messages => ["simon says", "do this"])
+    end
+    
+    should "escape string parameters in a hash" do
+      expect_post(@url, {"apikey" => @key, "messages" => {"simon+says" => "do+this"}})
+      @gibbon.say_hello(:messages => {"simon says" => "do this"})
+    end
+    
+    should "escape nested string parameters" do 
+      expect_post(@url, {"apikey" => @key, "messages" => {"simon+says" => ["do+this", "and+this"]}})
+      @gibbon.say_hello(:messages => {"simon says" => ["do this", "and this"]})
+    end
+    
+    should "pass through non string parameters" do
+      expect_post(@url, {"apikey" => @key, "fee" => 99})
+      @gibbon.say_hello(:fee => 99)
+    end  
+    
   end
+    
+  private
+  
+  def expect_post(expected_url, expected_body, expected_timeout=nil)
+    Gibbon::API.expects(:post).with do |url, opts|
+      url == expected_url && 
+      JSON.parse(opts[:body]) == expected_body &&
+      opts[:timeout] == expected_timeout
+    end.returns(Struct.new(:body).new("") )
+  end   
 end

metadata

@@ -2,7 +2,7 @@
 name: gibbon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Amro Mousa
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 -04:00
+date: 2011-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,8 +58,41 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: json
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.9.11
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -67,10 +100,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: json
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -78,7 +111,40 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: json
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.9.11
+  type: :development
+  prerelease: false
+  version_requirements: *id012
 description: Gibbon is a simple API wrapper for interacting with MailChimp API version 1.3.
 email: amromousa@gmail.com
 executables: []
@@ -114,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3438354439166932671
+      hash: 2466538827739644299
       segments: 
       - 0
       version: "0"
@@ -127,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Gibbon is a simple API wrapper for interacting with MailChimp API 1.3