tddium_client 0.3.0 → 0.4.0

data/Gemfile.lock

@@ -1,47 +1,48 @@
 PATH
   remote: .
   specs:
-    tddium_client (0.2.0)
-      httparty (>= 0.8.1)
+    tddium_client (0.4.0)
+      httpclient (>= 2.2.5)
       json
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.8)
+    crack (0.3.1)
     diff-lcs (1.1.3)
     fakefs (0.4.0)
-    fakeweb (1.3.0)
-    httparty (0.8.1)
-      multi_json
-      multi_xml
-    json (1.6.1)
-    multi_json (1.0.3)
-    multi_xml (0.4.1)
-    rack (1.3.5)
+    httpclient (2.2.5)
+    json (1.7.4)
+    multi_json (1.3.6)
+    rack (1.4.1)
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    simplecov (0.5.3)
-      multi_json (~> 1.0.3)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    webmock (1.8.8)
+      addressable (~> 2.2.8)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   fakefs
-  fakeweb
   rack-test
   rake
   rspec
   simplecov
   tddium_client!
+  webmock

data/lib/tddium_client.rb

@@ -1,14 +1,14 @@
 # Copyright (c) 2011, 2012 Solano Labs All Rights Reserved
 
 require 'rubygems'
-require 'httparty'
 require 'json'
+require 'httpclient'
 require 'securerandom'
 require File.expand_path("../tddium_client/version", __FILE__)
 
 module TddiumClient
-  API_KEY_HEADER = "X-tddium-api-key"
-  CLIENT_VERSION_HEADER = "X-tddium-client-version"
+  API_KEY_HEADER = "X-Tddium-Api-Key"
+  CLIENT_VERSION_HEADER = "X-Tddium-Client-Version"
   API_ERROR_TEXT = "An error occured: "
 
   module Error
@@ -28,7 +28,8 @@ module TddiumClient
       end
 
       def http_message
-        http_response.response.header.msg.to_s
+        v = http_response.header.send(:reason_phrase)
+	return v
       end
     end
 
@@ -102,11 +103,10 @@ module TddiumClient
   end
 
   class InternalClient
-    include HTTParty
+    attr_reader :client
 
-    format :json
-
-    def initialize(host, port=nil, scheme='https', version=1, caller_version=nil)
+    def initialize(host, port=nil, scheme='https', version=1, caller_version=nil, options={})
+      @client = HTTPClient.new
       @tddium_config = {"host" => host,
                         "port" => port,
                         "scheme" => scheme,
@@ -125,9 +125,11 @@ module TddiumClient
       tries = 0
 
       begin
-        http = self.class.send(method, tddium_uri(api_path), :body => call_params.to_json, :headers => headers)
+        http = @client.send(method, tddium_uri(api_path), :body => call_params.to_json, :header => headers)
       rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Timeout::Error, OpenSSL::SSL::SSLError, OpenSSL::SSL::Session::SessionError
         tries += 1
+        delay = (tries>>1)*0.05*rand()
+        Kernel.sleep(delay)
         retry if retries > 0 && tries <= retries
       end
 
@@ -173,10 +175,12 @@ module TddiumClient
   class Client < InternalClient
     attr_reader :environment
 
-    def initialize(env = :development, caller_version=nil)
+    def initialize(env = :development, caller_version=nil, options={})
       @all_config = YAML.load(File.read(config_path))
       self.environment = env.to_s
       self.caller_version = caller_version
+
+      super(host, port, scheme, version, caller_version, options)
     end
 
     def environment=(new_environment)
@@ -198,6 +202,14 @@ module TddiumClient
       @tddium_config["port"]
     end
 
+    def scheme
+      @tddium_config["scheme"]
+    end
+
+    def version
+      @tddium_config["version"]
+    end
+
     private
 
       def config_path

data/lib/tddium_client/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2011, 2012 Solano Labs All Rights Reserved
 
 module TddiumClient
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/spec_helper.rb

@@ -6,13 +6,34 @@ require "simplecov"
 SimpleCov.start
 require "tddium_client"
 require "rspec"
-require "fakeweb"
 require "rack/test"
+require "webmock/rspec"
 require "fakefs/spec_helpers"
 require "tddium_client/tddium_spec_helpers"
 
-FakeWeb.allow_net_connect = false
-
 def fixture_path(fixture_name)
   File.join File.dirname(__FILE__), "fixtures", fixture_name
 end
+
+def fixture_data(fixture_name)
+  path = File.join File.dirname(__FILE__), "fixtures", fixture_name
+  FakeFS.deactivate!
+  data = File.read(path)
+  FakeFS.activate!
+  return data
+end
+
+module LastRequest
+  def last_request
+    @last_request
+  end
+
+  def last_request=(request_signature)
+    @last_request = request_signature
+  end
+end
+
+WebMock.extend(LastRequest)
+WebMock.after_request do |request_signature, response|
+  WebMock.last_request = request_signature
+end

data/spec/tddium_client_spec.rb

@@ -22,16 +22,16 @@ describe "TddiumClient" do
   end
 
   def stub_http_message(message = "Unauthorized")
-    http_response.stub_chain(:response, :header, :msg).and_return(message)
+    http_response.stub_chain(:header, :reason_phrase).and_return(message)
   end
 
   describe "Response" do
 
     shared_examples_for "base" do
       describe "#http_code" do
-        before {stub_http_code("200")}
+        before {stub_http_code(200)}
         it "should return the http status code from the response" do
-          base.http_code.should == "200"
+          base.http_code.should == 200
         end
       end
 
@@ -222,12 +222,12 @@ describe "TddiumClient" do
 
     def stub_http_response(method, path, options = {})
       uri = api_uri(path)
-      FakeWeb.register_uri(method, uri, register_uri_options(options))
+      stub_request(method, uri).to_return(options)
     end
 
     def parse_request_params
       #Rack::Utils.parse_nested_query(FakeWeb.last_request.body)
-      JSON.parse(FakeWeb.last_request.body)
+      JSON.parse(WebMock.last_request.body)
     end
 
     let(:tddium_client) { TddiumClient::Client.new }
@@ -263,32 +263,32 @@ describe "TddiumClient" do
 
     describe "#call_api" do
       before do
-        FakeWeb.clean_registry
+        WebMock.reset!
         stub_tddium_client_config
-        stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, :response => fixture_path("post_suites_201.json"))
+        stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, fixture_data("post_suites_201.json"))
       end
 
       context "('#{EXAMPLE_HTTP_METHOD}', '#{EXAMPLE_TDDIUM_RESOURCE}')" do
         it "should make a '#{EXAMPLE_HTTP_METHOD.to_s.upcase}' request to the api" do
           tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)
-          FakeWeb.last_request.method.downcase.to_sym.should == EXAMPLE_HTTP_METHOD
+          WebMock.last_request.method.downcase.to_sym.should == EXAMPLE_HTTP_METHOD
         end
 
         it "should make a request to the correct resource" do
           tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)
-          FakeWeb.last_request.path.should =~ /#{EXAMPLE_TDDIUM_RESOURCE}$/
+          WebMock.last_request.uri.path.should =~ /#{EXAMPLE_TDDIUM_RESOURCE}$/
         end
       end
 
       shared_examples_for "retry on exception" do
-        before { TddiumClient::InternalClient.stub(EXAMPLE_HTTP_METHOD).and_raise(raised_exception) }
+        before { tddium_client.client.stub(EXAMPLE_HTTP_METHOD).and_raise(raised_exception) }
         it "should retry 5 times by default to contact the API" do
-          TddiumClient::InternalClient.should_receive(EXAMPLE_HTTP_METHOD).exactly(6).times
+          tddium_client.client.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
-          TddiumClient::InternalClient.should_receive(EXAMPLE_HTTP_METHOD).exactly(3).times
+          tddium_client.client.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
@@ -314,16 +314,16 @@ describe "TddiumClient" do
       context "('#{EXAMPLE_HTTP_METHOD}', '#{EXAMPLE_TDDIUM_RESOURCE}', {}, #{EXAMPLE_API_KEY}) # with api_key" do
         it "should include #{TddiumClient::API_KEY_HEADER}=#{EXAMPLE_API_KEY} in the request headers" do
           tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {}, EXAMPLE_API_KEY)
-          FakeWeb.last_request[TddiumClient::API_KEY_HEADER].should == EXAMPLE_API_KEY
-          FakeWeb.last_request[TddiumClient::CLIENT_VERSION_HEADER].should =~ /#{TddiumClient::VERSION}/
+          WebMock.last_request.headers[TddiumClient::API_KEY_HEADER].should == EXAMPLE_API_KEY
+          WebMock.last_request.headers[TddiumClient::CLIENT_VERSION_HEADER].should =~ /#{TddiumClient::VERSION}/
         end
       end
 
       context "('#{EXAMPLE_HTTP_METHOD}', '#{EXAMPLE_TDDIUM_RESOURCE}') # without api_key" do
         it "should not include #{TddiumClient::API_KEY_HEADER} in the request headers" do
           tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {})
-          FakeWeb.last_request[TddiumClient::API_KEY_HEADER].should be_nil
-          FakeWeb.last_request[TddiumClient::CLIENT_VERSION_HEADER].should =~ /#{TddiumClient::VERSION}/
+          WebMock.last_request.headers[TddiumClient::API_KEY_HEADER].should be_nil
+          WebMock.last_request.headers[TddiumClient::CLIENT_VERSION_HEADER].should =~ /#{TddiumClient::VERSION}/
         end
       end
 
@@ -332,8 +332,8 @@ describe "TddiumClient" do
           ver = "tddium-preview-0.8.1"
           tddium_client.caller_version = ver
           tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {})
-          FakeWeb.last_request[TddiumClient::API_KEY_HEADER].should be_nil
-          FakeWeb.last_request[TddiumClient::CLIENT_VERSION_HEADER].should =~ /#{TddiumClient::VERSION};#{ver}/
+          WebMock.last_request.headers[TddiumClient::API_KEY_HEADER].should be_nil
+          WebMock.last_request.headers[TddiumClient::CLIENT_VERSION_HEADER].should =~ /#{TddiumClient::VERSION};#{ver}/
         end
       end
 
@@ -348,19 +348,19 @@ describe "TddiumClient" do
         it "should not include any request params" do
           tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)
           params = parse_request_params
-	  params.member?('xid').should be_true
-	  params.delete('xid')
-	  params.should == {}
+          params.member?('xid').should be_true
+          params.delete('xid')
+          params.should == {}
         end
       end
 
       context "results in a successful response" do
         before do
-          stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, :response => fixture_path("post_suites_201.json"))
+          stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, fixture_data("post_suites_201.json"))
         end
 
         it "should try to contact the api only once" do
-          TddiumClient::InternalClient.should_receive(EXAMPLE_HTTP_METHOD).exactly(1).times.and_return(mock(HTTParty).as_null_object)
+          tddium_client.client.should_receive(EXAMPLE_HTTP_METHOD).exactly(1).times.and_return(mock(HTTPClient).as_null_object)
           tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {}, nil) rescue {}
         end
 
@@ -386,7 +386,7 @@ describe "TddiumClient" do
       end
 
       context "where the http request was successful but API status is not 0" do
-        before { stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, :response => fixture_path("post_suites_269_json_status_1.json")) }
+        before { stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, fixture_data("post_suites_269_json_status_1.json")) }
 
         it "should raise a TddiumClient::Error::API Error" do
           expect { tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE) }.to raise_error(TddiumClient::Error::API)

data/tddium_client.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("httparty", ">= 0.8.1")
+  s.add_runtime_dependency("httpclient", ">= 2.2.5")
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec")
-  s.add_development_dependency("fakeweb")
+  s.add_development_dependency("webmock")
   s.add_development_dependency("fakefs")
   s.add_development_dependency("rack-test")
   s.add_development_dependency("simplecov")

metadata

@@ -1,115 +1,151 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tddium_client
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Jay Moorthi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-08-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.5
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Internal Gem used to call the Tddium API
-email: 
+email:
 - info@tddium.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -129,30 +165,26 @@ files:
 - tddium_client.gemspec
 homepage: http://www.tddium.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: tddium_client
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: tddium Client Gem
 test_files: []
-