http-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53ce70d44f5b7cf0dbc85317ce3d6f6606b9c8e1
-  data.tar.gz: 4eaa5aee72f9e60d288b6c9b52ba883ef88798a4
+  metadata.gz: 8833622cfb8dd5390e0daae8a669265432903ba5
+  data.tar.gz: 76efa57c394ef3b0ea0073426161c8cb9e7f04db
 SHA512:
-  metadata.gz: fae9eb821a1e374769f9dd8c2134f00817f62de88d77fcfaf3f02db284c45fc0e3c2faaef9bb88bec627c9dd055e3ac20a69af2f522133e955f1c667f081cb71
-  data.tar.gz: 8fb4cbc0035594e46e4f2d66b76e59cd639dc95d41906c6757c77e2162ab5576a2db4f5f507cdd3e2908adcd331bebe1280ea76d9c12eaf2bd0720c000883520
+  metadata.gz: 28020a9dd60ca5f2415e4dcb3b44005550147afea1cf39232c962c22c06210b924ba3366b32b2f88137696499817b7abda4c5f1adff55ebaad07f6178df0687c
+  data.tar.gz: 6c2cc5c1e1e9e92e994e4e7164b98771d1eed5f3ceb019a01fc6ece374e7e26c8c759e3e7d72214550ea7985e07528dfd57a99a8b7940aacebd453db6adf112a

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.1.1 (2016-06-08)
+
+* Less restrictive dependency versions.
+* Fix body assignment in requests.
+* Tests
+
 == 0.1.0 (2016-06-08)
 
 * Initial version.

data/README.md

@@ -16,7 +16,11 @@ res = HTTP::Client::Request.new(:get, "http://www.example.org", max_redirects: 2
 
 # save a few keystrokes.
 res = HTTP::Client.get("http://www.example.org/", max_redirects: 2)
-res = HTTP::Client.post("http://www.example.org/", files: {pic: "kittens.jpg"}, query: {title: "the usual suspects"})
+res = HTTP::Client.post(
+  "http://www.example.org/",
+  files: {pic: "kittens.jpg"},
+  query: {title: "the usual suspects"}
+)
 ```
 
 ## API
@@ -36,20 +40,20 @@ HTTP::Client::Response
 
 ### Request parameters
 
-Required:
+#### Required
 
 | Name | Type | Description |
 |------|------|-------------|
 | verb | Symbol | HTTP verb, one of :get, :head, :put, :post, :delete, :options, :trace. |
-| uri | String | Remote URI |
+| uri | String or URI | Remote URI |
 
-Optional arguments hash:
+#### Optional arguments hash
 
 | Name | Type | Description |
 |------|------|-------------|
 | headers | Hash | Net::HTTP headers, in key-value pairs. |
 | query | Hash | Net::HTTP query-string in key-value pairs. |
-| files | Hash | Multi-part file uploads, in key-value pairs of {name => path_to_file} or {name => File} |
+| files | Hash | Multi-part file uploads, in key-value pairs of {name => path_to_file} or {name => [File]} |
 | body | String | Request body. |
 | auth | Hash | Basic-Auth hash. {username: "...", password: "..."} |
 | timeout | Integer | Fixed timeout for connection, read and ssl handshake in seconds. |
@@ -60,6 +64,10 @@ Optional arguments hash:
 | ssl_verify | Integer | OpenSSL verification, HTTP::Client::SSL_VERIFY_PEER or HTTP::Client::SSL_VERIFY_NONE, defaults to SSL_VERIFY_PEER. |
 | jar | HTTP::CookieJar | Optional cookie jar to use. Relies on HTTP::CookieJar from http-cookie gem. |
 
+## TODO
+
+Extensive testing :/
+
 ## License
 
 MIT

data/lib/http-client.rb

@@ -1,3 +1,3 @@
-require 'http/simple'
+require_relative 'http/client'
 
 

data/lib/http/client.rb

@@ -7,7 +7,7 @@ require 'http-cookie'
 
 module HTTP
   module Client
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
 
     GET                     = Net::HTTP::Get
     HEAD                    = Net::HTTP::Head
@@ -32,7 +32,7 @@ module HTTP
       # Create a new HTTP Client Request.
       #
       # @param verb          [Symbol]          HTTP verb, one of :get, :head, :put, :post, :delete, :options, :trace.
-      # @param uri           [String]          Remote URI
+      # @param uri           [String] or [URI] Remote URI.
       # @param headers       [Hash]            Net::HTTP headers, in key-value pairs.
       # @param query         [Hash]            Net::HTTP query-string in key-value pairs.
       # @param files         [Hash]            Multi-part file uploads, in key-value pairs of {name => path_to_file} or {name => File}
@@ -57,7 +57,7 @@ module HTTP
         setup_request_delegate! verb, args
 
         if body = args[:body]
-          raise ArgumentError, "#{verb} cannot have body" unless klass.const_get(:REQUEST_HAS_BODY)
+          raise ArgumentError, "#{verb} cannot have body" unless @delegate.class.const_get(:REQUEST_HAS_BODY)
           @delegate.body = body
         end
 
@@ -115,7 +115,7 @@ module HTTP
 
       private
         def parse_uri! uri
-          @uri = URI.parse(uri)
+          @uri = uri.kind_of?(URI) ? uri : URI.parse(uri)
           case @uri
             when URI::HTTP, URI::HTTPS
               # ok
@@ -209,7 +209,7 @@ module HTTP
       end
 
       def headers
-        @headers ||= @response.each_header.entries
+        @headers ||= Hash[@response.each_header.entries]
       end
 
       def body

data/test/helper.rb

@@ -1,9 +1,9 @@
 require 'bundler/setup'
-
-require 'http/client'
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'minitest/reporters'
+require 'server'
+require 'http-client'
 
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 

data/test/server.rb

@@ -0,0 +1,54 @@
+require 'webrick'
+require 'stringio'
+require 'socket'
+require 'uri'
+
+class TestServer
+  attr_reader :port
+
+  def initialize app
+    @app      = app
+    @port     = find_port
+  end
+
+  def run path = '/'
+    logfile   = StringIO.new
+    logger    = WEBrick::Log.new logfile
+    accesslog = [[logfile, WEBrick::AccessLog::COMBINED_LOG_FORMAT]]
+
+    @server = WEBrick::HTTPServer.new Port: @port, Logger: logger, AccessLog: accesslog
+    @server.mount_proc(path) do |req, res|
+      code, headers, body = @app.call(req)
+      res.status = code
+      headers.each do |k, v|
+        res[k] = v
+      end
+      res.body = [body].flatten.join
+    end
+
+    Thread.abort_on_exception = true
+    @thread = Thread.new {@server.start}
+  end
+
+  def stop
+    @thread && @thread.kill
+  end
+
+  def root
+    URI.parse("http://127.0.0.1:#{port}/")
+  end
+
+  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 or raise RuntimeError 'Unable to find a local TCP port to bind.'
+      port = @tcp.addr[1]
+      @tcp.close
+      port
+    end
+end

data/test/test_request.rb

@@ -19,16 +19,89 @@ describe 'HTTP Client Request' do
       files:         {test1: __FILE__, test2: __FILE__},
       max_redirects: 2,
       timeout:       10,
-      ssl_verify:    HTTP::Client::SSL_VERIFY_NONE
+      ssl_verify:    HTTP::Client::SSL_VERIFY_NONE,
+      body:          'Hello world!'
     )
   end
 
-  # TODO: mock http endpoint
   it 'executes a request and returns reponse' do
-    assert HTTP::Client.get("http://www.google.com")
+    app    = proc {|req| [200, {}, "Hello World!"]}
+    server = TestServer.new(app)
+    server.run
+
+    response = HTTP::Client.get(server.root)
+    server.stop
+    assert response
+    assert_kind_of Hash, response.headers
   end
 
   it 'raises timeout errors' do
-    assert_raises(Net::OpenTimeout) {HTTP::Client.get("http://dingus.in:1000/", timeout: 0.2)}
+    app    = proc {|req| sleep }
+    server = TestServer.new(app)
+    server.run
+    assert_raises(Net::ReadTimeout) {HTTP::Client.get(server.root, timeout: 0.2)}
+  end
+
+  it 'handles redirects' do
+    app = proc do |req|
+      case req.path
+        when '/redirect2'
+          [200, {}, "Hello World!"]
+        when '/redirect1'
+          [302, {'Location' => '/redirect2'}, "Moved!"]
+        when '/'
+          [302, {'Location' => '/redirect1'}, "Moved!"]
+      end
+    end
+    server = TestServer.new(app)
+    server.run
+
+    response = HTTP::Client.get(server.root)
+    assert_equal 302, response.code
+    assert_equal %Q{#{server.root + "/redirect1"}}, response.headers['location']
+
+    response = HTTP::Client.get(server.root, max_redirects: 1)
+    assert_equal 302, response.code
+    assert_equal %Q{#{server.root + "/redirect1"}}, response.last_effective_uri.to_s
+    assert_equal %Q{#{server.root + "/redirect2"}}, response.headers['location']
+
+    response = HTTP::Client.get(server.root, max_redirects: 2)
+    assert_equal 200, response.code
+    assert_equal %Q{#{server.root + "/redirect2"}}, response.last_effective_uri.to_s
+  end
+
+  it 'posts url encoded form' do
+    qs = {}
+    app = proc do |req|
+      qs = req.query
+      [200, {}, "OK!"]
+    end
+    server = TestServer.new(app)
+    server.run
+
+    response = HTTP::Client.post(server.root, query: {test1: "test2"})
+    server.stop
+    assert_equal 200,     response.code
+    assert_equal "test2", qs["test1"]
+  end
+
+  it 'posts multi-part encoded data' do
+    qs = {}
+    app = proc do |req|
+      qs = req.query
+      [200, {}, "OK!"]
+    end
+    server = TestServer.new(app)
+    server.run
+
+    response = HTTP::Client.post(server.root, files: {this: __FILE__}, query: {test1: "test2"})
+    server.stop
+
+    assert_equal 200,     response.code
+    assert_equal "test2", qs["test1"]
+
+    data = IO.read(__FILE__)
+    assert_equal data, qs["this"]
+    assert_equal File.basename(__FILE__), qs["this"].filename # people should stop overloading / extending String!
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Bharanee Rathna
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: http-cookie
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,34 +47,49 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Light weight wrapper around Net::HTTP
 email:
 - deepfryed@gmail.com
@@ -78,6 +102,7 @@ files:
 - lib/http-client.rb
 - lib/http/client.rb
 - test/helper.rb
+- test/server.rb
 - test/test_request.rb
 homepage: http://github.com/deepfryed/http-client
 licenses: