2Performant 0.0.8 → 0.1.0

data/2Performant.gemspec

@@ -1,46 +1,39 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{2Performant}
-  s.version = "0.0.8"
+  s.name = "2Performant"
+  s.version = ""
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["2Performant"]
-  s.date = %q{2010-07-26}
-  s.description = %q{Library for the 2Performant API}
-  s.email = %q{andrei@2performant.com}
+  s.date = "2012-09-20"
+  s.description = "Library for the 2Performant API"
+  s.email = "radu@2performant.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "2Performant.gemspec",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/two_performant.rb",
-     "lib/two_performant/oauth.rb",
-     "test/helper.rb",
-     "test/test_2performant.rb"
-  ]
-  s.homepage = %q{http://github.com/2performant/2Performant}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Library for the 2Performant API}
-  s.test_files = [
+    "2Performant.gemspec",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/two_performant.rb",
+    "lib/two_performant/oauth.rb",
     "test/helper.rb",
-     "test/test_2performant.rb"
+    "test/test_2performant.rb"
   ]
+  s.homepage = "http://github.com/2performant/2Performant"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Library for the 2Performant API"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/README.md

@@ -4,7 +4,7 @@ The API allows you to integrate any 2Performant network in your application.
 
 Its goal is to make sure developers can implement anything that can be done via the web interface using API functions.
 
-The API is RESTful XML over HTTP using all four verbs (GET/POST/PUT/DELETE).
+The API is RESTful JSON over HTTP using all four verbs (GET/POST/PUT/DELETE).
 
 The current implementation is a straight port of the PHP library, so the documentation applies, for the most part, to both libraries.
 

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.name = "2Performant"
     gem.summary = %Q{Library for the 2Performant API}
     gem.description = %Q{Library for the 2Performant API}
-    gem.email = "andrei@2performant.com"
+    gem.email = "radu@2performant.com"
     gem.homepage = "http://github.com/2performant/2Performant"
     gem.authors = ["2Performant"]
     gem.add_dependency "httparty"

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.1.0

data/lib/two_performant.rb

@@ -1,10 +1,11 @@
 require 'httparty'
+require 'json'
 require 'two_performant/oauth'
 
 class TwoPerformant
   include HTTParty
-  format :xml
-  headers 'Content-Type' => 'text/xml'
+  format :json
+  headers 'Content-Type' => 'text/json'
 
   attr_accessor :user, :pass, :host, :version, :auth_type, :oauth, :oauth_request
 
@@ -27,13 +28,13 @@ class TwoPerformant
   #  Users
   # =======
   def user_show(user_id)
-    self.hook("/users/#{user_id}.xml", "user");
+    self.hook("/users/#{user_id}.json", "user");
   end
 
 
   #  Display public information about the logged in user
   def user_loggedin
-    self.hook("/users/loggedin.xml", "user");
+    self.hook("/users/loggedin.json", "user");
   end
 
   # ===========
@@ -48,7 +49,7 @@ class TwoPerformant
       'perpage'      => perpage
     }
 
-    self.hook("/campaigns.xml", "campaign", request, 'GET')
+    self.hook("/campaigns.json", "campaign", request, 'GET')
   end
 
   #  Search for campaigns
@@ -59,27 +60,27 @@ class TwoPerformant
       'search'  => search
     }
 
-    self.hook("/campaigns/search.xml", "campaign", request, 'GET')
+    self.hook("/campaigns/search.json", "campaign", request, 'GET')
   end
 
   #  Display public information about a campaign
   def campaign_show(campaign_id)
-    self.hook("/campaigns/#{campaign_id}.xml", "campaign")
+    self.hook("/campaigns/#{campaign_id}.json", "campaign")
   end
 
   #  Affiliates: List campaigns which have the logged in user accepted
   def campaigns_listforaffiliate
-    self.hook("/campaigns/listforaffiliate.xml", "campaign")
+    self.hook("/campaigns/listforaffiliate.json", "campaign")
   end
 
   #  Merchants: List all campaigns created by the logged in user
   def campaigns_listforowner
-    self.hook("/campaigns/listforowner.xml", "campaign")
+    self.hook("/campaigns/listforowner.json", "campaign")
   end
 
   #  Merchants: Display complete information about a campaign (only available to owner)
   def campaign_showforowner(campaign_id)
-    self.hook("/campaigns/#{campaign_id}/showforowner.xml", "campaign")
+    self.hook("/campaigns/#{campaign_id}/showforowner.json", "campaign")
   end
 
   #  Merchants: Update a campaign
@@ -87,7 +88,7 @@ class TwoPerformant
     request = {
       'campaign' => campaign
     }
-    self.hook("/campaigns/#{campaign_id}.xml", "campaign", request, 'PUT')
+    self.hook("/campaigns/#{campaign_id}.json", "campaign", request, 'PUT')
   end
 
   #  Create a Deep Link. This method was created so it wouldn't make a request for every Quick Link.
@@ -111,7 +112,7 @@ class TwoPerformant
       'sale' => sale
     }
 
-    self.hook("/campaigns/#{campaign_id}/sales.xml", "sale", request, "POST")
+    self.hook("/campaigns/#{campaign_id}/sales.json", "sale", request, "POST")
   end
 
   # ============
@@ -123,7 +124,7 @@ class TwoPerformant
       'lead' => lead
     }
 
-    self.hook("/campaigns/#{campaign_id}/leads.xml", "lead", request, "POST")
+    self.hook("/campaigns/#{campaign_id}/leads.json", "lead", request, "POST")
   end
 
   # ============
@@ -138,7 +139,7 @@ class TwoPerformant
       'search'  => search
     }
 
-    self.hook("/affiliates/search.xml", "user", request, 'GET')
+    self.hook("/affiliates/search.json", "user", request, 'GET')
   end
 
   #  Merchants: List affiliates approved in campaigns
@@ -146,7 +147,7 @@ class TwoPerformant
     request = {
       'campaign_id' => campaign_id
     }
-    self.hook("/affiliates/listformerchant.xml", "user", request, 'GET')
+    self.hook("/affiliates/listformerchant.json", "user", request, 'GET')
   end
 
   # =============
@@ -165,7 +166,7 @@ class TwoPerformant
 
     request.merge(options)
 
-    self.hook("/commissions/search.xml", "commission", request, 'GET')
+    self.hook("/commissions/search.json", "commission", request, 'GET')
   end
 
   #  Merchants: List commissions on campaigns. Month: 01 to 12; Year: 20xx.
@@ -176,7 +177,7 @@ class TwoPerformant
       'year'        => year
     }
 
-    self.hook("/commissions/listformerchant.xml", "campaign", request, 'GET')
+    self.hook("/commissions/listformerchant.json", "campaign", request, 'GET')
   end
 
   #  Affiliates: List commissions on campaigns. Month: 01 to 12; Year: 20xx.
@@ -187,12 +188,12 @@ class TwoPerformant
       'year'        => year
     }
 
-    self.hook("/commissions/listforaffiliate.xml", "commission", request, 'GET')
+    self.hook("/commissions/listforaffiliate.json", "commission", request, 'GET')
   end
 
   #  Merchant Campaign Owner or Affiliate Commission Owner: Show information about a commission
   def commission_show(commission_id)
-    self.hook("/commissions/#{commission_id}.xml", "commission")
+    self.hook("/commissions/#{commission_id}.json", "commission")
   end
 
   #  Merchant: Update a commission
@@ -200,7 +201,7 @@ class TwoPerformant
     request = {
       'commission' => commission
     }
-    self.hook("/commissions/#{commission_id}.xml", "commission", request, 'PUT')
+    self.hook("/commissions/#{commission_id}.json", "commission", request, 'PUT')
   end
 
   # =======
@@ -215,12 +216,12 @@ class TwoPerformant
       'perpage'     => perpage
     }
 
-    self.hook("/sites.xml", "site", request)
+    self.hook("/sites.json", "site", request)
   end
 
   #  Display information about a site
   def site_show(site_id)
-    self.hook("/sites/#{site_id}.xml", "site")
+    self.hook("/sites/#{site_id}.json", "site")
   end
 
   #  Search for sites
@@ -231,12 +232,12 @@ class TwoPerformant
       'search'  => search
     }
 
-    self.hook("/sites/search.xml", "site", request, 'GET')
+    self.hook("/sites/search.json", "site", request, 'GET')
   end
 
   #  Affiliates: List all sites created by the logged in user
   def sites_listforowner
-    self.hook("/sites/listforowner.xml", "site")
+    self.hook("/sites/listforowner.json", "site")
   end
 
   #  Affiliates: Update a site
@@ -244,13 +245,13 @@ class TwoPerformant
     request = {
       'site' => site
     }
-    self.hook("/sites/#{site_id}.xml", "site", request, 'PUT')
+    self.hook("/sites/#{site_id}.json", "site", request, 'PUT')
   end
 
 
   #  Affiliates: Destroy a site
   def site_destroy(site_id)
-    self.hook("/sites/#{site_id}.xml", "site", request, 'DELETE')
+    self.hook("/sites/#{site_id}.json", "site", request, 'DELETE')
   end
 
   # ============
@@ -264,12 +265,12 @@ class TwoPerformant
       'perpage' => perpage
     }
 
-    self.hook("/campaigns/#{campaign_id}/txtlinks.xml", "txtlink", request, 'GET')
+    self.hook("/campaigns/#{campaign_id}/txtlinks.json", "txtlink", request, 'GET')
   end
 
   #  Display information about a text link
   def txtlink_show(campaign_id, txtlink_id)
-    self.hook("/campaigns/#{campaign_id}/txtlinks/#{txtlink_id}.xml", "txtlink")
+    self.hook("/campaigns/#{campaign_id}/txtlinks/#{txtlink_id}.json", "txtlink")
   end
 
   #  Search for text links in a campaign
@@ -281,7 +282,7 @@ class TwoPerformant
       'sort'    => sort,
     }
 
-    self.hook("/campaigns/#{campaign_id}/txtlinks/search.xml", "txtlink", request, 'GET')
+    self.hook("/campaigns/#{campaign_id}/txtlinks/search.json", "txtlink", request, 'GET')
   end
 
   #
@@ -298,7 +299,7 @@ class TwoPerformant
       'txtlink' => txtlink
     }
 
-    self.hook("/campaigns/#{campaign_id}/txtlinks.xml", "txtlink", request, 'POST')
+    self.hook("/campaigns/#{campaign_id}/txtlinks.json", "txtlink", request, 'POST')
   end
 
   #  Merchants: Update a text link
@@ -306,12 +307,12 @@ class TwoPerformant
     request = {
       'txtlink' => txtlink
     }
-    self.hook("/campaigns/#{campaign_id}/txtlinks/#{txtlink_id}.xml", "txtlink", request, 'PUT')
+    self.hook("/campaigns/#{campaign_id}/txtlinks/#{txtlink_id}.json", "txtlink", request, 'PUT')
   end
 
   #  Merchants: Destroy a text link
   def txtlink_destroy(campaign_id, txtlink_id)
-    self.hook("/campaigns/#{campaign_id}/txtlinks/#{txtlink_id}.xml", "txtlink", nil, 'DELETE')
+    self.hook("/campaigns/#{campaign_id}/txtlinks/#{txtlink_id}.json", "txtlink", nil, 'DELETE')
   end
 
   # ============
@@ -325,12 +326,12 @@ class TwoPerformant
       'perpage' => perpage
     }
 
-    self.hook("/campaigns/#{campaign_id}/txtads.xml", "txtad", request, 'GET')
+    self.hook("/campaigns/#{campaign_id}/txtads.json", "txtad", request, 'GET')
   end
 
   #  Display information about a text ad
   def txtad_show(campaign_id, txtad_id)
-    self.hook("/campaigns/#{campaign_id}/txtads/#{txtad_id}.xml", "txtad")
+    self.hook("/campaigns/#{campaign_id}/txtads/#{txtad_id}.json", "txtad")
   end
 
   #  Search for text ads in a campaign
@@ -342,7 +343,7 @@ class TwoPerformant
       'sort'    => sort
     }
 
-    self.hook("/campaigns/#{campaign_id}/txtads/search.xml", "txtad", request, 'GET')
+    self.hook("/campaigns/#{campaign_id}/txtads/search.json", "txtad", request, 'GET')
   end
 
   #
@@ -358,7 +359,7 @@ class TwoPerformant
       'txtad' => txtad
     }
 
-    self.hook("/campaigns/#{campaign_id}/txtads.xml", "txtad", request, 'POST')
+    self.hook("/campaigns/#{campaign_id}/txtads.json", "txtad", request, 'POST')
   end
 
 
@@ -368,12 +369,12 @@ class TwoPerformant
       'txtad' => txtad
     }
 
-    self.hook("/campaigns/#{campaign_id}/txtads/#{txtad_id}.xml", "txtad", request, 'PUT')
+    self.hook("/campaigns/#{campaign_id}/txtads/#{txtad_id}.json", "txtad", request, 'PUT')
   end
 
   #  Merchants: Destroy a text ad
   def txtad_destroy(campaign_id, txtad_id)
-    self.hook("/campaigns/#{campaign_id}/txtads/#{txtad_id}.xml", "txtad", nil, 'DELETE')
+    self.hook("/campaigns/#{campaign_id}/txtads/#{txtad_id}.json", "txtad", nil, 'DELETE')
   end
 
   # =========
@@ -387,12 +388,12 @@ class TwoPerformant
       'perpage' => perpage
     }
 
-    self.hook("/campaigns/#{campaign_id}/banners.xml", "banner", request, 'GET')
+    self.hook("/campaigns/#{campaign_id}/banners.json", "banner", request, 'GET')
   end
 
   #  Display information about a banner
   def banner_show(campaign_id, banner_id)
-    self.hook("/campaigns/#{campaign_id}/banners/#{banner_id}.xml", "banner")
+    self.hook("/campaigns/#{campaign_id}/banners/#{banner_id}.json", "banner")
   end
 
   #  Search for banners in a campaign
@@ -404,7 +405,7 @@ class TwoPerformant
       'sort'    => sort
     }
 
-    self.hook("/campaigns/#{campaign_id}/banners/search.xml", "banner", request, 'GET')
+    self.hook("/campaigns/#{campaign_id}/banners/search.json", "banner", request, 'GET')
   end
 
   # Merchants: Create a banner
@@ -414,7 +415,7 @@ class TwoPerformant
       'banner_picture' => banner_picture
     }
 
-    self.hook("/campaigns/#{campaign_id}/banners.xml", "banner", request, 'POST')
+    self.hook("/campaigns/#{campaign_id}/banners.json", "banner", request, 'POST')
   end
 
   #  Merchants: Update a banner
@@ -423,12 +424,12 @@ class TwoPerformant
       'banner' => banner
     }
 
-    self.hook("/campaigns/#{campaign_id}/banners/#{banner_id}.xml", "banner", request, 'PUT')
+    self.hook("/campaigns/#{campaign_id}/banners/#{banner_id}.json", "banner", request, 'PUT')
   end
 
   #  Merchants: Destroy a banner
   def banner_destroy(campaign_id, banner_id)
-    self.hook("/campaigns/#{campaign_id}/banners/#{banner_id}.xml", "banner", nil, 'DELETE')
+    self.hook("/campaigns/#{campaign_id}/banners/#{banner_id}.json", "banner", nil, 'DELETE')
   end
 
   # ===============
@@ -441,12 +442,12 @@ class TwoPerformant
       'campaign_id' => campaign_id
     }
 
-    self.hook("/product_stores.xml", "product-store", request)
+    self.hook("/product_stores.json", "product-store", request)
   end
 
   #  Show a Product Store
   def product_store_show(product_store_id)
-    self.hook("/product_stores/#{product_store_id}.xml", "product-store")
+    self.hook("/product_stores/#{product_store_id}.json", "product-store")
   end
 
   #  Show Products from a Product Store
@@ -459,7 +460,7 @@ class TwoPerformant
 
     request['uniq_products'] = uniq_products if (uniq_products)
 
-    self.hook("/product_stores/#{product_store_id}/showitems.xml", "product-store-data", request)
+    self.hook("/product_stores/#{product_store_id}/showitems.json", "product-store-data", request)
   end
 
   #  Show a Product from a Product Store
@@ -468,7 +469,7 @@ class TwoPerformant
       'product_id' => product_id
     }
 
-    self.hook("/product_stores/#{product_store_id}/showitem.xml", "product-store-data", request)
+    self.hook("/product_stores/#{product_store_id}/showitem.json", "product-store-data", request)
   end
 
 
@@ -487,7 +488,7 @@ class TwoPerformant
 
     product_store_id = 'all' if !product_store_id
 
-    self.hook("/product_stores/#{product_store_id}/searchpr.xml", "product-store-data", request, 'GET')
+    self.hook("/product_stores/#{product_store_id}/searchpr.json", "product-store-data", request, 'GET')
   end
 
   #  Merchants: Update a Product Store
@@ -496,12 +497,12 @@ class TwoPerformant
       'product_store' => product_store
     }
 
-    self.hook("/product_stores/#{product_store_id}.xml", "product-store", request, 'PUT')
+    self.hook("/product_stores/#{product_store_id}.json", "product-store", request, 'PUT')
   end
 
   #  Merchants: Destroy a Product Store
   def product_store_destroy(product_store_id)
-    self.hook("/product_stores/#{product_store_id}.xml", "product-store", nil, 'DELETE')
+    self.hook("/product_stores/#{product_store_id}.json", "product-store", nil, 'DELETE')
   end
 
   #
@@ -523,7 +524,7 @@ class TwoPerformant
       'product' => product
     }
 
-    self.hook("/product_stores/#{product_store_id}/createitem.xml", "product-store-data", request, 'POST')
+    self.hook("/product_stores/#{product_store_id}/createitem.json", "product-store-data", request, 'POST')
   end
 
   #  Merchants: Update a product
@@ -533,7 +534,7 @@ class TwoPerformant
       'product_id'   => product_id
     }
 
-    self.hook("/product_stores/#{product_store_id}/updateitem.xml", "product-store-data", request, 'PUT')
+    self.hook("/product_stores/#{product_store_id}/updateitem.json", "product-store-data", request, 'PUT')
   end
 
   #  Merchants: Destroy a product
@@ -542,7 +543,7 @@ class TwoPerformant
       'pr_id' => product_id
     }
 
-    self.hook("/product_stores/#{product_store_id}/destroyitem.xml", "product-store-data", request, 'DELETE')
+    self.hook("/product_stores/#{product_store_id}/destroyitem.json", "product-store-data", request, 'DELETE')
   end
 
   # =====================
@@ -551,12 +552,12 @@ class TwoPerformant
 
   #  Affiliates: List Ad Groups
   def ad_groups_list
-    self.hook("/ad_groups.xml", "ad_group", nil, "GET")
+    self.hook("/ad_groups.json", "ad_group", nil, "GET")
   end
 
   #  Affiliates: Display information about an Ad Group
   def ad_group_show(ad_group_id)
-    self.hook("/ad_groups/#{ad_group_id}.xml", "ad_group", nil, "GET")
+    self.hook("/ad_groups/#{ad_group_id}.json", "ad_group", nil, "GET")
   end
 
   # Affiliates: Add item to an Ad Group / Crate new Ad Group
@@ -568,12 +569,12 @@ class TwoPerformant
       'tool_id' => tool_id
     }
 
-    self.hook("/ad_groups/createitem.xml", "ad_group", request, 'POST')
+    self.hook("/ad_groups/createitem.json", "ad_group", request, 'POST')
   end
 
   #  Affiliates: Destroy an Ad Group
   def ad_group_destroy(ad_group_id)
-    self.hook("/ad_groups/#{ad_group_id}.xml", "ad_group", nil, "DELETE")
+    self.hook("/ad_groups/#{ad_group_id}.json", "ad_group", nil, "DELETE")
   end
 
   #  Affiliates: Delete an Tool from a Group. tooltype is one of 'txtlink', 'txtad' or 'banner'.
@@ -583,7 +584,7 @@ class TwoPerformant
       'tool_id'   => tool_id
     }
 
-    self.hook("/ad_groups/#{ad_group_id}/destroyitem.xml", "ad_group", request, "DELETE")
+    self.hook("/ad_groups/#{ad_group_id}/destroyitem.json", "ad_group", request, "DELETE")
   end
 
   #=================
@@ -592,7 +593,7 @@ class TwoPerformant
 
   # Affiliates: List Feeds
   def feeds_list()
-    self.hook("/feeds.xml", "feed", nil, "GET")
+    self.hook("/feeds.json", "feed", nil, "GET")
   end
 
   # Affiliates: Create a Feed
@@ -601,7 +602,7 @@ class TwoPerformant
       'feed' => feed
     }
 
-    self.hook("/feeds.xml", "feed", request, 'POST')
+    self.hook("/feeds.json", "feed", request, 'POST')
   end
 
   # Affiliates: Update a Feed
@@ -610,13 +611,13 @@ class TwoPerformant
       'feed' => feed
     }
 
-    self.hook("/feeds/#{feed_id}.xml", "feed", request, 'PUT')
+    self.hook("/feeds/#{feed_id}.json", "feed", request, 'PUT')
   end
 
 
   # Affiliates: Destroy a Feed
   def feed_destroy(feed_id)
-    self.hook("/feeds/#{feed_id}.xml", "feed", nil, "DELETE")
+    self.hook("/feeds/#{feed_id}.json", "feed", nil, "DELETE")
   end
 
   # ==========
@@ -630,7 +631,7 @@ class TwoPerformant
       'perpage'   => perpage
     }
 
-    self.hook("/messages.xml", "message", nil, "GET")
+    self.hook("/messages.json", "message", nil, "GET")
   end
 
   #  List sent messages. Displays the first 6 entries by default.
@@ -640,17 +641,17 @@ class TwoPerformant
       'perpage'   => perpage
     }
 
-    self.hook("/messages/sent.xml", "message", nil, "GET")
+    self.hook("/messages/sent.json", "message", nil, "GET")
   end
 
   #  Display information about a message
   def message_show(message_id)
-    self.hook("/messages/#{message_id}.xml", "message")
+    self.hook("/messages/#{message_id}.json", "message")
   end
 
   #  Destroy a message
   def message_destroy(message_id)
-    self.hook("/messages/#{message_id}.xml", "message", nil, 'DELETE')
+    self.hook("/messages/#{message_id}.json", "message", nil, 'DELETE')
   end
 
 
@@ -660,31 +661,31 @@ class TwoPerformant
 
   # List Hooks 
   def hooks_list(oauth_token_key = 'current')
-    hook("/oauth_clients/#{oauth_token_key}/hooks.xml", "hook", nil, 'GET')
+    self.hook("/oauth_clients/#{oauth_token_key}/hooks.json", "client_application_hook", nil, 'GET')
   end
 
 
   # Create a Hook 
-  def hook_create(hook, oauth_token_key = 'current')
+  def hook_create(name, opts, oauth_token_key = 'current')
     request = {
-      'hook' => hook
+      'name' => name,
+      'opts' => opts,
     }
 
-    hook("/oauth_clients/#{oauth_token_key}/hooks.xml", "hook", request, 'POST')
+    self.hook("/oauth_clients/#{oauth_token_key}/hooks.json", "client_application_hook", request, 'POST')
   end
 
   # Destroy a Hook 
   def hook_destroy(hook_id, oauth_token_key = 'current')
-    hook("/oauth_clients/#{oauth_token_key}/hooks/#{hook_id}.xml", "hook", nil, 'DELETE')
+    self.hook("/oauth_clients/#{oauth_token_key}/hooks/#{hook_id}.json", "client_application_hook", nil, 'DELETE')
   end
 
-  def hook(path, expected, send = nil, method = 'GET') #:nodoc:
-    params = normalize_params(send, method)
-
+  def hook(path, expected, send = nil, method = 'GET') #:nodoc:    
     if self.oauth
-      result = self.oauth.send(method.downcase, "/#{version}#{path}", send, params)
+      result = self.oauth.send(method.downcase, "/#{version}#{path}", send)
     else
-      result = self.class.send(method.downcase, "/#{version}#{path}", :body => params)
+      result = self.class.send(method.downcase, "/#{version}#{path}", :body => send)
+      result = result.parsed_response
     end
 
     # scrap the container
@@ -695,21 +696,4 @@ class TwoPerformant
     end
   end
 
-  def normalize_params(params, method)
-    hash_to_xml(:request => params).to_s
-  end
-
-  def hash_to_xml(var, document = nil)
-    document = REXML::Document.new if document.nil?
-
-    if var.respond_to? :keys
-      var.keys.each do |key|
-        hash_to_xml(var[key], document.add_element(key.to_s))
-      end
-    else
-      document.add_text(var.to_s)
-    end
-
-    document
-  end
 end

data/lib/two_performant/oauth.rb

@@ -1,4 +1,14 @@
 require 'oauth'
+require "addressable/uri"
+
+class Hash
+  def to_params
+    uri = Addressable::URI.new
+    uri.query_values = self 
+    uri.query
+  end
+end
+
 
 class TwoPerformant
   class OAuth
@@ -7,28 +17,28 @@ class TwoPerformant
     def initialize(options, host)
       consumer = ::OAuth::Consumer.new(options[:consumer_token], options[:consumer_secret], {:site => host})
       @access_token = ::OAuth::AccessToken.new(consumer, options[:access_token], options[:access_secret])
-      @headers = { 'Accept' => 'application/xml', 'Content-Type' => 'application/xml' }
+      @headers = { 'Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded' }
     end
 
-    def get(path, params_hash, params_xml) 
+    def get(path, params_hash) 
       params_hash ||= {}
       response = access_token.get("#{path}?#{params_hash.to_params}")
-      Crack::XML.parse(response.body)
+      JSON.parse(response.body)
     end
 
-    def post(path, params_hash, params_xml) 
-      response = access_token.post(path, params_xml, @headers)
-      Crack::XML.parse(response.body)
+    def post(path, params_hash)
+      response = access_token.post(path, params_hash.to_json, @headers)
+      JSON.parse(response.body)
     end
 
-    def put(path, params_hash, params_xml) 
-      response = access_token.put(path, params_xml, @headers)
-      Crack::XML.parse(response.body)
+    def put(path, params_hash) 
+      response = access_token.put(path, params_hash.to_json, @headers)
+      JSON.parse(response.body)
     end
 
     def delete(path, params) 
       response = access_token.delete("#{path}?#{params.to_params}")
-      Crack::XML.parse(response.body)
+      JSON.parse(response.body)
     end
   end
 end

metadata

@@ -1,77 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: 2Performant
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - 2Performant
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-26 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: oauth
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library for the 2Performant API
-email: andrei@2performant.com
+email: radu@2performant.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .document
-- .gitignore
 - 2Performant.gemspec
 - LICENSE
 - README.md
@@ -81,40 +77,28 @@ files:
 - lib/two_performant/oauth.rb
 - test/helper.rb
 - test/test_2performant.rb
-has_rdoc: true
 homepage: http://github.com/2performant/2Performant
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Library for the 2Performant API
-test_files: 
-- test/helper.rb
-- test/test_2performant.rb
+test_files: []

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-lib/test.rb