http-client 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9e9eae81102b0be33c27dc85929a220ab8bfee5
-  data.tar.gz: 4a2f85ca306800e17f5ee29a459ff2747a70eacf
+  metadata.gz: 463b25c7e2306882b064f06c3b9d6a0b79b0c17c
+  data.tar.gz: a699f8db865ec291272e4405c2ceebb291253845
 SHA512:
-  metadata.gz: 770fd61b83f170d613ca39ee167fd652adbb88654e01b13f34fda61e68f93a038d44f8cd719e6327bbe6ba0ecd5cd4c6af94df90c65b5899ba332d3779ba548c
-  data.tar.gz: 2d96e1124de41b12e14ce29f6de8d9e78029a5b6ed70fb19d25781cc196f040e23a5c477363f01da49f448d624ae120a3825ff104f85b54bf7faa722952119bf
+  metadata.gz: f54e15e22e2cc94f29efd2c5a89143a6a9522b0c9afc2c6c9b6e82cbab0a9ba8f7f903033380e26a2c80f0a9da05737d9848630d65a7bdaad2c425e173467f33
+  data.tar.gz: f09b9d4be97f9b8c7f3f180fc8555982c286360c4db3f5be35042f2ccc7962b5dc9ddef08c8c9e8b9671f1422c230fb1bb50d750affe6ef900d13e0243d1f3e0

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.2.1 (2016-09-21)
+
+* Module scoped errors.
+
+== 0.2.0 (2016-06-10)
+
+* Uncompress gzip and deflate responses.
+
 == 0.1.2 (2016-06-09)
 
 * Fix YARD documentation.

data/lib/http/client.rb

@@ -4,10 +4,12 @@ require 'openssl'
 require 'uri'
 require 'mime/types'
 require 'http-cookie'
+require 'stringio'
+require 'zlib'
 
 module HTTP
   module Client
-    VERSION = '0.1.2'
+    VERSION = '0.2.1'
 
     GET                     = Net::HTTP::Get
     HEAD                    = Net::HTTP::Head
@@ -20,6 +22,12 @@ module HTTP
     SSL_VERIFY_NONE         = OpenSSL::SSL::VERIFY_NONE
     SSL_VERIFY_PEER         = OpenSSL::SSL::VERIFY_PEER
 
+    class Error < StandardError;
+    end
+
+    class ArgumentError < Error;
+    end
+
     class Request
       VALID_PARAMETERS        = %w(headers files query body auth timeout open_timeout ssl_timeout read_timeout max_redirects ssl_verify jar)
       DEFAULT_HEADERS         = {'User-Agent' => 'HTTP Client API/1.0'}
@@ -147,6 +155,7 @@ module HTTP
           uri = uri.kind_of?(URI) ? uri : URI.parse(uri)
           case uri
             when URI::HTTP, URI::HTTPS
+              raise ArgumentError, "Invalid URI #{uri}" if uri.host.nil?
               uri
             when URI::Generic
               if @delegate.uri
@@ -157,6 +166,8 @@ module HTTP
             else
               raise ArgumentError, "Invalid URI #{uri}"
           end
+        rescue URI::InvalidURIError => e
+          raise ArgumentError, "Invalid URI #{uri}"
         end
 
         def create_request_delegate verb, uri, args
@@ -225,7 +236,7 @@ module HTTP
                 r.body = @delegate.body
               end
             else
-              raise RuntimeError, "response #{code} should not result in redirection."
+              raise Error, "response #{code} should not result in redirection."
           end
         end
 
@@ -251,7 +262,7 @@ module HTTP
     end # Request
 
     class Response
-      attr_reader :last_effective_uri
+      attr_reader :last_effective_uri, :response
 
       def initialize response, last_effective_uri
         @response           = response
@@ -259,15 +270,27 @@ module HTTP
       end
 
       def code
-        @response.code.to_i
+        response.code.to_i
       end
 
       def headers
-        @headers ||= Hash[@response.each_header.entries]
+        @headers ||= Hash[response.each_header.entries]
       end
 
       def body
-        @response.body
+        case headers['content-encoding'].to_s.downcase
+          when 'gzip'
+            gz = Zlib::GzipReader.new(StringIO.new(response.body))
+            begin
+              gz.read
+            ensure
+              gz.close
+            end
+          when 'deflate'
+            Zlib.inflate(response.body)
+          else
+            response.body
+        end
       end
 
       def inspect

data/test/server.rb

@@ -40,12 +40,7 @@ class TestServer
 
   private
     def find_port
-      @tcp = nil
-      for port in 32768..65535
-        @tcp = TCPServer.new('127.0.0.1', port) rescue nil
-        break if @tcp
-      end
-
+      @tcp = TCPServer.new('127.0.0.1', 0) rescue nil
       @tcp or raise RuntimeError 'Unable to find a local TCP port to bind.'
       port = @tcp.addr[1]
       @tcp.close

data/test/test_request.rb

@@ -1,14 +1,21 @@
+require 'zlib'
+require 'stringio'
 require_relative 'helper'
 
 describe 'HTTP Client Request' do
   it 'should reject invalid arguments' do
-    assert_raises(ArgumentError, 'invalid verb')        {HTTP::Client::Request.new(:foo)}
-    assert_raises(URI::InvalidURIError, 'invalid uri')  {HTTP::Client::Request.new(:get, 'http://')}
-    assert_raises(ArgumentError, 'invalid argument')    {HTTP::Client::Request.new(:get, 'http://example.org/', foo: 1)}
+    assert_raises(HTTP::Client::ArgumentError, 'invalid verb') {HTTP::Client::Request.new(:foo, 'http://example.org/')}
+    assert_raises(HTTP::Client::ArgumentError, 'invalid uri')  {HTTP::Client::Request.new(:get, 'http://')}
+
+    assert_raises(HTTP::Client::ArgumentError, 'invalid argument')  do
+      HTTP::Client::Request.new(:get, 'http://example.org/', foo: 1)
+    end
   end
 
   it 'validates body based on request verb' do
-    assert_raises(ArgumentError, 'get cannot have body') {HTTP::Client::Request.new(:get, 'http://a.c', files: {test: __FILE__})}
+    assert_raises(HTTP::Client::ArgumentError, 'get cannot have body') do
+      HTTP::Client::Request.new(:get, 'http://a.c', files: {test: __FILE__})
+    end
   end
 
   it 'allows creation of valid request object' do
@@ -158,4 +165,33 @@ describe 'HTTP Client Request' do
     assert_equal data, qs['this']
     assert_equal File.basename(__FILE__), qs['this'].filename # people should stop overloading / extending String!
   end
+
+  it 'handles gzip and deflate compression schemes.' do
+    app = proc do |req|
+      case req.path
+        when '/gzip'
+          [
+            200,
+            {'content-encoding' => 'gzip'},
+            StringIO.new.tap {|io|
+              gz = Zlib::GzipWriter.new(io)
+              gz.write("Hello 1")
+              gz.close
+            }.string
+          ]
+        when '/deflate'
+          [200, {'content-encoding' => 'deflate'}, Zlib.deflate("Hello 2")]
+      end
+    end
+
+    server = TestServer.new(app)
+    server.run
+
+    response = HTTP::Client.get("#{server.root}/gzip", headers: {'accept-encoding' => 'gzip;deflate'})
+    assert_equal 'Hello 1', response.body, 'gunzip ok'
+
+    response = HTTP::Client.get("#{server.root}/deflate", headers: {'accept-encoding' => 'gzip;deflate'})
+    assert_equal 'Hello 2', response.body, 'inflate ok'
+    server.stop
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Bharanee Rathna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types