gibbon 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/gibbon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gibbon"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amro Mousa"]
-  s.date = "2011-10-27"
+  s.date = "2011-12-06"
   s.description = "Gibbon is a simple API wrapper for interacting with MailChimp API version 1.3."
   s.email = "amromousa@gmail.com"
   s.extra_rdoc_files = [

data/lib/gibbon.rb

@@ -32,9 +32,9 @@ class Gibbon
 protected
 
   def call(method, params = {})
-    url = base_api_url + method
+    api_url = base_api_url + method
     params = @default_params.merge(params)
-    response = self.class.post(url, :body => CGI::escape(params.to_json), :timeout => @timeout)
+    response = self.class.post(api_url, :body => CGI::escape(params.to_json), :timeout => @timeout)
 
     begin
       response = ActiveSupport::JSON.decode(response.body)
@@ -82,10 +82,9 @@ protected
   end
 
   def call(method, params = {})
-    method_params = {:apikey => @api_key, :id => params[:id]}.to_a.map {|a| "#{a[0]}=#{CGI::escape(a[1])}"}.join("&")
-    url = export_api_url + method + "?" + method_params
+    api_url = export_api_url + method + "/"
     params = @default_params.merge(params)
-    response = self.class.post(url, :body => CGI::escape(params.to_json), :timeout => @timeout)
+    response = self.class.post(api_url, :body => params, :timeout => @timeout)
 
     lines = response.body.lines
     if @throws_exceptions
@@ -96,3 +95,38 @@ protected
     lines
   end
 end
+  
+module HTTParty
+  module HashConversions
+    # @param key<Object> The key for the param.
+    # @param value<Object> The value for the param.
+    #
+    # @return <String> This key value pair as a param
+    #
+    # @example normalize_param(:name, "Bob Jones") #=> "name=Bob%20Jones&"
+    def self.normalize_param(key, value)
+      param = ''
+      stack = []
+
+      if value.is_a?(Array)
+        param << Hash[*(0...value.length).to_a.zip(value).flatten].map {|i,element| normalize_param("#{key}[#{i}]", element)}.join
+      elsif value.is_a?(Hash)
+        stack << [key,value]
+      else
+        param << "#{key}=#{URI.encode(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}&"
+      end
+
+      stack.each do |parent, hash|
+        hash.each do |key, value|
+          if value.is_a?(Hash)
+            stack << ["#{parent}[#{key}]", value]
+          else
+            param << normalize_param("#{parent}[#{key}]", value)
+          end
+        end
+      end
+
+      param
+    end
+  end
+end

data/test/test_gibbon.rb

@@ -160,8 +160,9 @@ class TestGibbon < Test::Unit::TestCase
       @api_key = "TESTKEY-us2"
       @gibbon = GibbonExport.new(@api_key)
 
-      params = {:body => CGI::escape(@body.to_json), :timeout => nil}
-      url = @url.gsub('us1', 'us2') + "sayHello?apikey=TESTKEY-us2&id=listid"
+      params = {:body => @body, :timeout => nil}
+    
+      url = @url.gsub('us1', 'us2') + "sayHello/"
       GibbonExport.expects(:post).with(url, params).returns(@returns)
       @gibbon.say_hello(@body)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gibbon
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70244006352920 !ruby/object:Gem::Requirement
+  requirement: &70101746489620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244006352920
+  version_requirements: *70101746489620
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70244006351940 !ruby/object:Gem::Requirement
+  requirement: &70101746489020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244006351940
+  version_requirements: *70101746489020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70244006350600 !ruby/object:Gem::Requirement
+  requirement: &70101746488520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70244006350600
+  version_requirements: *70101746488520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70244006349220 !ruby/object:Gem::Requirement
+  requirement: &70101746487960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244006349220
+  version_requirements: *70101746487960
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70244006348240 !ruby/object:Gem::Requirement
+  requirement: &70101746487420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244006348240
+  version_requirements: *70101746487420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70244006347080 !ruby/object:Gem::Requirement
+  requirement: &70101746486900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70244006347080
+  version_requirements: *70101746486900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70244006346020 !ruby/object:Gem::Requirement
+  requirement: &70101746486380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *70244006346020
+  version_requirements: *70101746486380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70244006344960 !ruby/object:Gem::Requirement
+  requirement: &70101746485840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244006344960
+  version_requirements: *70101746485840
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70244006343960 !ruby/object:Gem::Requirement
+  requirement: &70101746485340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -109,10 +109,10 @@ dependencies:
         version: 0.9.11
   type: :development
   prerelease: false
-  version_requirements: *70244006343960
+  version_requirements: *70101746485340
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70244006343000 !ruby/object:Gem::Requirement
+  requirement: &70101746484800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244006343000
+  version_requirements: *70101746484800
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &70244006342180 !ruby/object:Gem::Requirement
+  requirement: &70101746484240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244006342180
+  version_requirements: *70101746484240
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70244006338500 !ruby/object:Gem::Requirement
+  requirement: &70101746483680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -142,10 +142,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244006338500
+  version_requirements: *70101746483680
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70244006336360 !ruby/object:Gem::Requirement
+  requirement: &70101746483100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70244006336360
+  version_requirements: *70101746483100
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70244006333660 !ruby/object:Gem::Requirement
+  requirement: &70101746482580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -164,10 +164,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244006333660
+  version_requirements: *70101746482580
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70244006332240 !ruby/object:Gem::Requirement
+  requirement: &70101746482080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -175,10 +175,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70244006332240
+  version_requirements: *70101746482080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70244006330920 !ruby/object:Gem::Requirement
+  requirement: &70101746481560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -186,10 +186,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70244006330920
+  version_requirements: *70101746481560
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70244006329600 !ruby/object:Gem::Requirement
+  requirement: &70101746481060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -197,7 +197,7 @@ dependencies:
         version: 0.9.11
   type: :development
   prerelease: false
-  version_requirements: *70244006329600
+  version_requirements: *70101746481060
 description: Gibbon is a simple API wrapper for interacting with MailChimp API version
   1.3.
 email: amromousa@gmail.com
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 487392987481492133
+      hash: -3087421404664197813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: