alovak-network 1.1.0 → 1.1.1

data/lib/network.rb

@@ -1,11 +1,8 @@
+require 'benchmark'
 require 'net/https'
 require 'network/connection'
-module Network
-  class Error < Exception
-  end
-
-  VERSION = '1.0.0'
 
+module Network
   def self.post(url, data)
     Connection.new(url).post(data)
   end

data/lib/network/connection.rb

@@ -1,4 +1,18 @@
 module Network
+  class Error < Exception
+  end
+
+  class ResponseError < Error
+    attr_reader :response
+    def initialize(response)
+      @response = response
+    end
+
+    def to_s
+      "Failed with #{@response.code} #{@response.message if @response.respond_to?(:message)}"
+    end
+  end
+
   class Connection
     attr_reader   :uri, :pem
 
@@ -22,17 +36,14 @@ module Network
     end
 
     def post(data)
-      begin
+      try_request do
         log_request(data)
-        http.post(uri.path, data, post_headers(data))
-      rescue Timeout::Error, Errno::ETIMEDOUT, Timeout::ExitException
-        raise Error, "The connection to the remote server is timed out"
-      rescue EOFError
-        raise Error, "The connection to the remote server was dropped"
-      rescue Errno::ECONNRESET, Errno::ECONNABORTED
-        raise Error, "The remote server reset the connection"
-      rescue Errno::ECONNREFUSED
-        raise Error, "The connection was refused by the remote server"
+        response = nil
+        ms = Benchmark.realtime do 
+          response = http.post(uri.path, data, post_headers(data))
+        end
+        log_response(response, ms)
+        handle_response(response)
       end
     end
 
@@ -55,9 +66,32 @@ module Network
       http
     end
 
+    def handle_response(response)
+      case response.code.to_i
+      when 200...300
+        response.body
+      else
+        raise ResponseError.new(response)
+      end
+    end
+
+    def try_request(&block)
+      begin
+        block.call
+      rescue Timeout::Error, Errno::ETIMEDOUT, Timeout::ExitException
+        raise Error, "The connection to the remote server is timed out"
+      rescue EOFError
+        raise Error, "The connection to the remote server was dropped"
+      rescue Errno::ECONNRESET, Errno::ECONNABORTED
+        raise Error, "The remote server reset the connection"
+      rescue Errno::ECONNREFUSED
+        raise Error, "The connection was refused by the remote server"
+      end
+    end
+
     def post_headers(data)
       @headers['Content-Type']   ||= 'application/x-www-form-urlencoded'
-      @headers['Content-Length'] ||= data.size.to_s
+      @headers['Content-Length'] ||= data.bytesize.to_s
       @headers
     end
 
@@ -105,9 +139,9 @@ module Network
       log (request_filter ? request_filter.call(data) : data)
     end
 
-    def log_response(data)
-      log "<---"
-      log (response_filter ? response_filter.call(data) : data)
+    def log_response(response, ms_time = -1)
+      log "<-- %s %s (%d bytes %.2fms)" % [response.code, response.message, (response.body ? response.body.bytesize : 0), ms_time]
+      log (response_filter ? response_filter.call(response.body) : response.body) if response.body
       log "----"
     end
   end

data/test/network/test_connection.rb

@@ -9,7 +9,10 @@ class TestLogger
   end
 end
 
+ResponseStub = Struct.new(:code, :message, :body)
+
 class TestConnectionLogging < Test::Unit::TestCase
+
   def setup
     @connection = Network::Connection.new("http://example.com/path")
     @connection.logger = TestLogger.new
@@ -31,10 +34,11 @@ class TestConnectionLogging < Test::Unit::TestCase
   end
 
   def test_log_response
-    @connection.send(:log_response, "response data")
+    response = ResponseStub.new("200", "OK", "response data")
+    @connection.send(:log_response, response, 0.16)
     log = @connection.logger.log
 
-    assert_match /<---/,                    log
+    assert_match /<-- 200 OK \(13 bytes 0.16ms\)/,    log
     assert_match /response data/,           log
     assert_match /----/,                    log
   end
@@ -46,13 +50,15 @@ class TestConnectionLogging < Test::Unit::TestCase
   end
 
   def test_response_filtering
+    response = ResponseStub.new("200", "OK", "response")
     @connection.response_filter = Proc.new {|req| "#{req} is filtered"}
-    @connection.send(:log_response, "response")
+    @connection.send(:log_response, response)
     assert_match /response is filtered/, @connection.logger.log
   end
 end
 
 class TestConnection < Test::Unit::TestCase
+
   def setup
     @connection = Network::Connection.new("http://example.com/path")
     @http = mock('http')
@@ -65,14 +71,37 @@ class TestConnection < Test::Unit::TestCase
       { :class => Errno::ECONNABORTED,  :message => "The remote server reset the connection"},
       { :class => Errno::ECONNREFUSED,  :message => "The connection was refused by the remote server"},
     ].each do |exception|
-      Net::HTTP.any_instance.expects(:request).raises exception[:class]
       e = assert_raise Network::Error do
-        @connection.post("some data")
+        @connection.send(:try_request) do
+          raise exception[:class]
+        end
       end
       assert_equal exception[:message], e.message
     end
   end
 
+  def test_post_methods
+    sec = sequence('order')
+    @connection.expects(:log_request).in_sequence(sec)
+    @connection.expects(:http).in_sequence(sec).returns(stub('http', :post => true))
+    @connection.expects(:log_response).in_sequence(sec)
+    @connection.expects(:handle_response).in_sequence(sec)
+
+    @connection.post("hello")
+  end
+
+  def test_response_handler_raises_response_error_if_response_code_not_in_200_299
+    [300, 400, 500].each do |code|
+      assert_raise Network::ResponseError do
+        @connection.send(:handle_response, ResponseStub.new(code))
+      end
+    end
+  end
+
+  def test_response_handler_returns_response_body_if_response_code_200_299
+    assert_equal "response", @connection.send(:handle_response, ResponseStub.new(200, "OK", "response"))
+  end
+
   def test_default_timeouts
     assert_equal Network::Connection::READ_TIMEOUT, @connection.read_timeout
     assert_equal Network::Connection::OPEN_TIMEOUT, @connection.open_timeout
@@ -86,24 +115,21 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_default_headers_for_post_request
-    Net::HTTP.any_instance.expects(:post).with("/path", "data", 
-                                               { 'Content-Type'   => 'application/x-www-form-urlencoded',
-                                                 'Content-Length' => '4' })
-    @connection.post("data")
+    expected_headers = { 'Content-Type'   => 'application/x-www-form-urlencoded',
+                         'Content-Length' => '4' }
+
+    assert_equal expected_headers, @connection.send(:post_headers, "data")
   end
 
   def test_user_headers_are_not_overwrited_by_default_headers
-    excepted_headers = {
-      'Content-Type' => 'application/xml',
-      'Accept'       => 'text/plain'
-    }
+    user_headers = { 'Content-Type' => 'application/xml', 
+                     'Accept'       => 'text/plain' }
 
-    Net::HTTP.any_instance.expects(:post).with("/path",
-                                               "data", 
-                                               excepted_headers.update('Content-Length' => '4'))
+    expected_headers = { 'Content-Length' => '4' }.update(user_headers)
+    
+    @connection.headers = user_headers
 
-    @connection.headers = excepted_headers
-    @connection.post("data")
+    assert_equal expected_headers, @connection.send(:post_headers, "data")
   end
 
   def test_configure_ssl_if_scheme_is_https

data/test/test_helper.rb

@@ -1,6 +1,5 @@
-require "test/unit"
-require "rubygems"
-require "mocha"
-require 'turn'
+require 'rubygems'
+require 'test/unit'
+require 'mocha'
 
 require 'lib/network'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alovak-network
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Pavel Gabriel
@@ -43,7 +43,6 @@ extra_rdoc_files: []
 files: 
 - lib/network/connection.rb
 - lib/network.rb
-- test/network/test_connection.rb
 has_rdoc: false
 homepage: http://github.com/alovak/network/
 licenses: 
@@ -73,4 +72,5 @@ specification_version: 2
 summary: HTTP/HTTPS communication module based on ruby net/http, net/https modules
 test_files: 
 - test/network/test_network.rb
+- test/network/test_connection.rb
 - test/test_helper.rb