tddium_client 0.0.2 → 0.0.3

data/.gitignore

@@ -5,3 +5,5 @@ nbproject
 .DS_Store
 *.swp
 Gemfile.lock
+coverage/
+.rvmrc

data/lib/tddium_client.rb

@@ -36,16 +36,12 @@ class TddiumClient
     response = JSON.parse(http.body) rescue {}
 
     if http.success?
-      if response["status"] == 0
-        yield response
-      else
-        message = API_ERROR_TEXT + response["explanation"].to_s
-      end
+      (response["status"] == 0 && block_given?) ? yield(response) : message = API_ERROR_TEXT + response["explanation"].to_s
     else
       message = API_ERROR_TEXT + http.response.header.msg.to_s
       message << " #{response["explanation"]}" if response["status"].to_i > 0
     end
-    [response["status"] || http.code, message]
+    [response["status"], http.code, message]
   end
 
   private
@@ -59,12 +55,7 @@ class TddiumClient
   end
 
   def tddium_config
-   unless @tddium_config
-     @tddium_config = YAML.load(
-       File.read(File.join(File.dirname(__FILE__), "..", "config", "environment.yml"))
-     )[environment.to_s]
-   end
+   @tddium_config = YAML.load(File.read(File.join(File.dirname(__FILE__), "..", "config", "environment.yml")))[environment.to_s] unless @tddium_config
    @tddium_config
   end
 end
-

data/lib/tddium_client/version.rb

@@ -3,5 +3,5 @@ Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
 module TddiumClientVersion
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/spec_helper.rb

@@ -2,7 +2,10 @@
 Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
+require "simplecov"
+SimpleCov.start
 require "tddium_client"
+require "rspec"
 require "fakeweb"
 require "rack/test"
 require "fakefs/spec_helpers"

data/spec/tddium_client_spec.rb

@@ -97,78 +97,109 @@ describe TddiumClient do
         parse_request_params.should == {}
       end
     end
-
+    
     context "results in a successful response" do
-      let(:dummy_block) { Proc.new { |response| @parsed_http_response = response } }
       before do
         stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, :response => fixture_path("post_suites_201.json"))
       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)
-        tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {}, nil, &dummy_block)
-      end
+      context "called with a block" do
+        let(:dummy_block) { Proc.new { |response| @parsed_http_response = response } }
 
-      it "should parse the JSON response" do
-        tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {}, nil, &dummy_block)
-        @parsed_http_response.should be_a(Hash)
-        @parsed_http_response["status"].should == 0
-        @parsed_http_response["suite"]["id"].should == 19
+        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)
+          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {}, nil, &dummy_block)
+        end
+
+        it "should parse the JSON response" do
+          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {}, nil, &dummy_block)
+          @parsed_http_response.should be_a(Hash)
+          @parsed_http_response["status"].should == 0
+          @parsed_http_response["suite"]["id"].should == 19
+        end
+
+        it "should return a triple with element[0]==json_status, element[1]==http_status, element[2]==error_message" do
+          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {}, nil, &dummy_block).should == [0, 201, nil]
+        end
       end
 
-      it "should return a tuple with element[0]==status and element[1]==nil" do
-        tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, {}, nil, &dummy_block).should == [0, nil]
+      context "called without a block" do
+        it "should not yield" do
+          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)
+        end
       end
     end
 
-    context "results in an unsuccessful response" do
+    context "results for an unsuccessful response" do
       before { stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, :status => ["404", "Not Found"]) }
 
       shared_examples_for "returning that an error occured" do
-        it "should return that an error occured in the second element" do
-          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[1].should =~ /^#{TddiumClient::API_ERROR_TEXT}/
+        it "should return that an error occured in the third element" do
+          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[2].should =~ /^#{TddiumClient::API_ERROR_TEXT}/
         end
       end
 
       shared_examples_for("returning the API error") do
-        it "should return the API error in the second element" do
-          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[1].should =~ /\{\:suite_name\=\>\[\"has already been taken\"\]\}$/
+        it "should return the API error message in the third element" do
+          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[2].should =~ /\{\:suite_name\=\>\[\"has already been taken\"\]\}$/
         end
       end
 
-      it "should return an array with two elements" do
-        tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE).size.should == 2
+      shared_examples_for("returning the HTTP status code") do
+        it "should return the HTTP status code in the second element" do
+          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[1].should == http_status_code
+        end
       end
 
+      it "should return an array with three elements" do
+        tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE).size.should == 3
+      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_201_json_status_1.json")) }
+        before { stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, :response => fixture_path("post_suites_269_json_status_1.json")) }
         it_should_behave_like("returning that an error occured")
         it_should_behave_like("returning the API error")
 
         it "should return the API error code in the first element" do
           tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[0].should == 1
         end
+
+        it_should_behave_like("returning the HTTP status code") do
+          let(:http_status_code) {269}
+        end
       end
 
       context "where the http request was unsuccessful" do
         before { stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, :status => ["501", "Internal Server Error"]) }
         it_should_behave_like("returning that an error occured")
 
-        it "should return the HTTP error message in the second element" do
-          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[1].should =~ /Internal Server Error/
+        it_should_behave_like("returning the HTTP status code") do
+          let(:http_status_code) {501}
+        end
+
+        it "should return the HTTP error message in the third element" do
+          tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[2].should =~ /Internal Server Error/
         end
 
         context "and an API error is returned" do
           before { stub_http_response(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE, :response => fixture_path("post_suites_409.json")) }
           it_should_behave_like("returning the API error")
-          it "should return the HTTP error code in the first element" do
+          it "should return the API error code in the first element" do
             tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[0].should == 1
           end
+
+          it_should_behave_like("returning the HTTP status code") do
+            let(:http_status_code) {409}
+          end
         end
 
         context "and no API error is returned" do
-          it "should return the HTTP error code in the first element" do
-            tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[0].should == 501
+          it "should return a nil API error code in the first element" do
+            tddium_client.call_api(EXAMPLE_HTTP_METHOD, EXAMPLE_TDDIUM_RESOURCE)[0].should be_nil
+          end
+          
+          it_should_behave_like("returning the HTTP status code") do
+            let(:http_status_code) {501}
           end
         end
       end

data/tddium_client.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("fakeweb")
   s.add_development_dependency("fakefs")
   s.add_development_dependency("rack-test")
+  s.add_development_dependency("simplecov")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tddium_client
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jay Moorthi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
+date: 2011-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Internal Gem used to call the Tddium API
 email: 
 - info@tddium.com
@@ -113,7 +127,6 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- .rvmrc
 - Gemfile
 - README
 - Rakefile
@@ -122,7 +135,7 @@ files:
 - lib/tddium_client/tddium_spec_helpers.rb
 - lib/tddium_client/version.rb
 - spec/fixtures/post_suites_201.json
-- spec/fixtures/post_suites_201_json_status_1.json
+- spec/fixtures/post_suites_269_json_status_1.json
 - spec/fixtures/post_suites_409.json
 - spec/spec_helper.rb
 - spec/tddium_client_spec.rb
@@ -163,7 +176,7 @@ specification_version: 3
 summary: tddium Client Gem
 test_files: 
 - spec/fixtures/post_suites_201.json
-- spec/fixtures/post_suites_201_json_status_1.json
+- spec/fixtures/post_suites_269_json_status_1.json
 - spec/fixtures/post_suites_409.json
 - spec/spec_helper.rb
 - spec/tddium_client_spec.rb

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm use ruby-1.8.7-p302@tddium_client
-