tddium_client 0.1.5 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tddium_client (0.1.5)
+    tddium_client (0.2.0)
       httparty (>= 0.8.1)
       json
 

data/lib/tddium_client/version.rb

@@ -3,5 +3,5 @@ Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
 module TddiumClient
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/lib/tddium_client.rb

@@ -103,6 +103,10 @@ module TddiumClient
   end
 
   class InternalClient
+    include HTTParty
+
+    format :json
+
     def initialize(host, port=nil, scheme='https', version=1, caller_version=nil)
       @tddium_config = {"host" => host,
                         "port" => port,
@@ -112,14 +116,14 @@ module TddiumClient
     end
 
     def call_api(method, api_path, params = {}, api_key = nil, retries = 5)
-      headers = {}
+      headers = {'Content-Type' => 'application/json'}
       headers.merge!(API_KEY_HEADER => api_key) if api_key
       headers.merge!(CLIENT_VERSION_HEADER => version_header)
 
       tries = 0
 
       begin
-        http = HTTParty.send(method, tddium_uri(api_path), :body => params, :headers => headers)
+        http = self.class.send(method, tddium_uri(api_path), :body => params.to_json, :headers => headers)
       rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Timeout::Error, OpenSSL::SSL::SSLError, OpenSSL::SSL::Session::SessionError
         tries += 1
         retry if retries > 0 && tries <= retries
@@ -177,6 +181,10 @@ module TddiumClient
       @environment = env
     end
 
+    def host
+      @tddium_config["host"]
+    end
+
     def port=(port)
       @tddium_config["port"] = port
     end

data/spec/tddium_client_spec.rb

@@ -228,7 +228,8 @@ describe "TddiumClient" do
     end
 
     def parse_request_params
-      Rack::Utils.parse_nested_query(FakeWeb.last_request.body)
+      #Rack::Utils.parse_nested_query(FakeWeb.last_request.body)
+      JSON.parse(FakeWeb.last_request.body)
     end
 
     let(:tddium_client) { TddiumClient::Client.new }
@@ -282,14 +283,14 @@ describe "TddiumClient" do
       end
 
       shared_examples_for "retry on exception" do
-        before { HTTParty.stub(EXAMPLE_HTTP_METHOD).and_raise(raised_exception) }
+        before { TddiumClient::InternalClient.stub(EXAMPLE_HTTP_METHOD).and_raise(raised_exception) }
         it "should retry 5 times by default to contact the API" do
-          HTTParty.should_receive(EXAMPLE_HTTP_METHOD).exactly(6).times
+          TddiumClient::InternalClient.should_receive(EXAMPLE_HTTP_METHOD).exactly(6).times
           expect { tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE) }.to raise_error(TddiumClient::Error::Timeout)
         end
 
         it "should retry as many times as we want to contact the API" do
-          HTTParty.should_receive(EXAMPLE_HTTP_METHOD).exactly(3).times
+          TddiumClient::InternalClient.should_receive(EXAMPLE_HTTP_METHOD).exactly(3).times
           expect { tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {}, nil, 2) }.to raise_error(TddiumClient::Error::Timeout)
         end
       end
@@ -358,7 +359,7 @@ describe "TddiumClient" do
         end
 
         it "should try to contact the api only once" do
-          HTTParty.should_receive(EXAMPLE_HTTP_METHOD).exactly(1).times.and_return(mock(HTTParty).as_null_object)
+          TddiumClient::InternalClient.should_receive(EXAMPLE_HTTP_METHOD).exactly(1).times.and_return(mock(HTTParty).as_null_object)
           tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {}, nil) rescue {}
         end
 

metadata

@@ -2,7 +2,7 @@
 name: tddium_client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jay Moorthi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 Z
+date: 2012-04-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty