web_client 0.0.5 → 0.0.6

data/lib/web_client/connection.rb

@@ -28,16 +28,14 @@ module WebClient
         WebClient.logger.debug "[WebClient] #{request.type.to_s.upcase} Url: http://#{host}#{(port != 80) ? ":#{port}" : ''}#{request.url} | Body: #{request.body} | Headers: #{request.headers}"
         response = Response.new @http.request(request.to_http)
         WebClient.logger.debug "[WebClient] RESPONSE Status: #{response.code} | Content: #{response.body}"
-        if block_given?
-          if response.success?
-            yield(response)
-          else
-            WebClient.logger.error "[WebClient] #{response.code} - Unexpected error\n#{response.body}"
-            nil
-          end
-        else
-          response
+
+        unless response.success?
+          WebClient.logger.error "[WebClient] #{response.code} - Unexpected error\n#{response.body}"
+          raise Error, response.body ? response.body.force_encoding('utf-8') : 'Unexpected error'
         end
+
+        block_given? ? yield(response) : response
+
       rescue Timeout::Error,
           Errno::EHOSTUNREACH,
           Errno::EINVAL,
@@ -49,7 +47,7 @@ module WebClient
           SocketError,
           Errno::ECONNREFUSED => e
         WebClient.logger.error "[WebClient] #{e.class}: #{e.message}\nServer: #{host}:#{port}\nRequest: #{request.to_json}"
-        raise Error, e
+        raise ConnectionFail, e
       end
     end
 

data/lib/web_client/error.rb

@@ -1,6 +1,9 @@
 module WebClient
 
   class Error < StandardError
+  end
+
+  class ConnectionFail < Error
     def initialize(inner_error)
       @inner_error = inner_error
     end

data/lib/web_client/version.rb

@@ -1,3 +1,3 @@
 module WebClient
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/connection_spec.rb

@@ -172,18 +172,14 @@ describe WebClient::Connection do
       json.should eq 'id' => 1, 'name' => 'John'
     end
 
-    it 'Invalid response' do
+    it 'Client error' do
       stub_request(:get, "#{HOST}/get_stub").to_return(status: 404)
-      json = connection.get!('/get_stub') do |response|
-        JSON.parse response.body
-      end
-
-      json.should be_nil
+      expect { connection.get!('/get_stub') }.to raise_error WebClient::Error
     end
 
-    it 'Request error' do
+    it 'Server error' do
       stub_request(:get, "#{HOST}/get_stub").to_timeout
-      expect { connection.get!('/get_stub') { |r| JSON.parse r.body } }.to raise_error WebClient::Error
+      expect { connection.get!('/get_stub') }.to raise_error WebClient::ConnectionFail
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec