http 0.5.1 → 0.6.0.pre

data/spec/support/proxy_server.rb

@@ -1,17 +1,33 @@
 require 'webrick/httpproxy'
 
-ProxyServer     = WEBrick::HTTPProxyServer.new(:Port => 8080, :AccessLog => [])
+handler = proc do | req, res |
+  res['X-PROXIED'] = true
+end
 
-t = Thread.new { ProxyServer.start }
-trap("INT")    { ProxyServer.shutdown; exit }
+ProxyServer = WEBrick::HTTPProxyServer.new(
+  :Port => 8080,
+  :AccessLog => [],
+  :RequestCallback => handler
+)
 
-AuthenticatedProxyServer = WEBrick::HTTPProxyServer.new(:Port => 8081,
-                  :ProxyAuthProc => Proc.new do | req, res |
-                    WEBrick::HTTPAuth.proxy_basic_auth(req, res, 'proxy') do | user, pass |
-                      user == 'username' and pass == 'password'
-                    end
-                  end)
+AuthenticatedProxyServer = WEBrick::HTTPProxyServer.new(
+  :Port => 8081,
+  :ProxyAuthProc => proc do | req, res |
+    WEBrick::HTTPAuth.proxy_basic_auth(req, res, 'proxy') do | user, pass |
+      user == 'username' && pass == 'password'
+    end
+  end,
+  :RequestCallback => handler
+)
 
+Thread.new  { ProxyServer.start }
+trap('INT') do
+  ProxyServer.shutdown
+  exit
+end
 
-t = Thread.new { AuthenticatedProxyServer.start }
-trap("INT")    { AuthenticatedProxyServer.shutdown; exit }
+Thread.new  { AuthenticatedProxyServer.start }
+trap('INT') do
+  AuthenticatedProxyServer.shutdown
+  exit
+end

metadata

@@ -1,71 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0.pre
 platform: ruby
 authors:
-- Tony Arcieri
+- Tony
+- Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: HTTP so awesome it will lure Catherine Zeta Jones into your unicorn petting
   zoo
 email:
@@ -77,6 +50,7 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
@@ -87,37 +61,58 @@ files:
 - examples/parallel_requests_with_celluloid.rb
 - http.gemspec
 - lib/http.rb
+- lib/http/authorization_header.rb
+- lib/http/authorization_header/basic_auth.rb
+- lib/http/authorization_header/bearer_token.rb
+- lib/http/backports.rb
+- lib/http/backports/base64.rb
+- lib/http/backports/uri.rb
 - lib/http/chainable.rb
 - lib/http/client.rb
-- lib/http/header.rb
+- lib/http/content_type.rb
+- lib/http/errors.rb
+- lib/http/headers.rb
+- lib/http/headers/mixin.rb
 - lib/http/mime_type.rb
-- lib/http/mime_types/json.rb
+- lib/http/mime_type/adapter.rb
+- lib/http/mime_type/json.rb
 - lib/http/options.rb
 - lib/http/redirector.rb
 - lib/http/request.rb
-- lib/http/request_stream.rb
+- lib/http/request/writer.rb
 - lib/http/response.rb
-- lib/http/response_parser.rb
-- lib/http/uri_backport.rb
+- lib/http/response/body.rb
+- lib/http/response/parser.rb
 - lib/http/version.rb
+- logo.png
+- spec/http/authorization_header/basic_auth_spec.rb
+- spec/http/authorization_header/bearer_token_spec.rb
+- spec/http/authorization_header_spec.rb
+- spec/http/backports/base64_spec.rb
+- spec/http/client_spec.rb
+- spec/http/content_type_spec.rb
+- spec/http/headers/mixin_spec.rb
+- spec/http/headers_spec.rb
 - spec/http/options/body_spec.rb
-- spec/http/options/callbacks_spec.rb
 - spec/http/options/form_spec.rb
 - spec/http/options/headers_spec.rb
+- spec/http/options/json_spec.rb
 - spec/http/options/merge_spec.rb
 - spec/http/options/new_spec.rb
 - spec/http/options/proxy_spec.rb
-- spec/http/options/response_spec.rb
 - spec/http/options_spec.rb
+- spec/http/redirector_spec.rb
+- spec/http/request/writer_spec.rb
 - spec/http/request_spec.rb
-- spec/http/request_stream_spec.rb
+- spec/http/response/body_spec.rb
 - spec/http/response_spec.rb
 - spec/http_spec.rb
 - spec/spec_helper.rb
 - spec/support/example_server.rb
 - spec/support/proxy_server.rb
 homepage: https://github.com/tarcieri/http
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -130,29 +125,39 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
 test_files:
+- spec/http/authorization_header/basic_auth_spec.rb
+- spec/http/authorization_header/bearer_token_spec.rb
+- spec/http/authorization_header_spec.rb
+- spec/http/backports/base64_spec.rb
+- spec/http/client_spec.rb
+- spec/http/content_type_spec.rb
+- spec/http/headers/mixin_spec.rb
+- spec/http/headers_spec.rb
 - spec/http/options/body_spec.rb
-- spec/http/options/callbacks_spec.rb
 - spec/http/options/form_spec.rb
 - spec/http/options/headers_spec.rb
+- spec/http/options/json_spec.rb
 - spec/http/options/merge_spec.rb
 - spec/http/options/new_spec.rb
 - spec/http/options/proxy_spec.rb
-- spec/http/options/response_spec.rb
 - spec/http/options_spec.rb
+- spec/http/redirector_spec.rb
+- spec/http/request/writer_spec.rb
 - spec/http/request_spec.rb
-- spec/http/request_stream_spec.rb
+- spec/http/response/body_spec.rb
 - spec/http/response_spec.rb
 - spec/http_spec.rb
 - spec/spec_helper.rb
 - spec/support/example_server.rb
 - spec/support/proxy_server.rb
+has_rdoc: 

data/lib/http/header.rb

@@ -1,11 +0,0 @@
-module HTTP
-  module Header
-    # Matches HTTP header names when in "Canonical-Http-Format"
-    CANONICAL_HEADER = /^[A-Z][a-z]*(-[A-Z][a-z]*)*$/
-
-    # Transform to canonical HTTP header capitalization
-    def canonicalize_header(header)
-      header.to_s.split(/[\-_]/).map(&:capitalize).join('-')
-    end
-  end
-end

data/lib/http/mime_types/json.rb

@@ -1,19 +0,0 @@
-json = HTTP::MimeType.new 'application/json', :json
-
-json.parse_with do |obj|
-  if defined?(JSON) and JSON.respond_to? :parse
-    JSON.parse(obj)
-  else
-    obj
-  end
-end
-
-json.emit_with do |obj|
-  if obj.is_a? String
-    obj
-  elsif obj.respond_to? :to_json
-    obj.to_json
-  else
-    obj
-  end
-end

data/lib/http/request_stream.rb

@@ -1,77 +0,0 @@
-module HTTP
-  class RequestStream
-
-    # CRLF is the universal HTTP delimiter
-    CRLF = "\r\n"
-
-    def initialize(socket, body, headers, headerstart)
-      @body           = body
-      raise ArgumentError, "body of wrong type" unless valid_body_type
-      @socket         = socket
-      @headers        = headers
-      @request_header = [headerstart]
-    end
-
-    def valid_body_type
-      valid_types= [String, NilClass, Enumerable]
-      checks = valid_types.map {|type| @body.is_a? type}
-      checks.any?
-    end
-
-    #Adds headers to the request header from the headers array
-    def add_headers
-      @headers.each do |field, value|
-        @request_header << "#{field}: #{value}"
-      end
-    end
-
-    # Stream the request to a socket
-    def stream
-      self.send_request_header
-      self.send_request_body
-    end
-
-    # Adds the headers to the header array for the given request body we are working
-    # with
-    def add_body_type_headers
-      if @body.is_a? String and not @headers['Content-Length']
-        @request_header << "Content-Length: #{@body.length}"
-      elsif @body.is_a? Enumerable
-        if encoding = @headers['Transfer-Encoding'] and not encoding == "chunked"
-          raise ArgumentError, "invalid transfer encoding"
-        else
-          @request_header << "Transfer-Encoding: chunked"
-        end
-      end
-    end
-
-    # Joins the headers specified in the request into a correctly formatted
-    # http request header string
-    def join_headers
-      # join the headers array with crlfs, stick two on the end because
-      # that ends the request header
-      @request_header.join(CRLF) + (CRLF)*2
-    end
-
-    def send_request_header
-      self.add_headers
-      self.add_body_type_headers
-      header = self.join_headers
-
-      @socket << header
-    end
-
-    def send_request_body
-      if @body.is_a? String
-        @socket << @body
-      elsif @body.is_a? Enumerable
-        @body.each do |chunk|
-          @socket << chunk.bytesize.to_s(16) << CRLF
-          @socket << chunk
-        end
-
-        @socket << "0" << CRLF * 2
-      end
-    end
-  end
-end

data/spec/http/options/callbacks_spec.rb

@@ -1,62 +0,0 @@
-require 'spec_helper'
-
-describe HTTP::Options, "callbacks" do
-
-  let(:opts){ HTTP::Options.new }
-  let(:callback){ Proc.new{|r| nil } }
-
-  it 'recognizes invalid events' do
-    expect {
-      opts.with_callback(:notacallback, callback)
-    }.to raise_error(ArgumentError, /notacallback/)
-  end
-
-  it 'recognizes invalid callbacks' do
-    expect {
-      opts.with_callback(:request, Object.new)
-    }.to raise_error(ArgumentError, /invalid callback/)
-    expect {
-      opts.with_callback(:request, Proc.new{|a,b| nil})
-    }.to raise_error(ArgumentError, /only one argument/)
-  end
-
-  describe "request" do
-
-    it 'defaults to []' do
-      expect(opts.callbacks[:request]).to eq([])
-    end
-
-    it 'may be specified with with_callback(:request, ...)' do
-
-      opts2 = opts.with_callback(:request, callback)
-      expect(opts.callbacks[:request]).to eq([])
-      expect(opts2.callbacks[:request]).to eq([callback])
-
-      opts3 = opts2.with_callback(:request, callback)
-      expect(opts2.callbacks[:request]).to eq([callback])
-      expect(opts3.callbacks[:request]).to eq([callback, callback])
-    end
-
-  end
-
-  describe "response" do
-
-    it 'defaults to []' do
-      expect(opts.callbacks[:response]).to eq([])
-    end
-
-    it 'may be specified with with_callback(:response, ...)' do
-
-      opts2 = opts.with_callback(:response, callback)
-      expect(opts.callbacks[:response]).to eq([])
-      expect(opts2.callbacks[:response]).to eq([callback])
-
-      opts3 = opts2.with_callback(:response, callback)
-      expect(opts2.callbacks[:response]).to eq([callback])
-      expect(opts3.callbacks[:response]).to eq([callback, callback])
-    end
-
-  end
-
-end
-

data/spec/http/options/response_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe HTTP::Options, "response" do
-
-  let(:opts){ HTTP::Options.new }
-
-  it 'defaults to :auto' do
-    expect(opts.response).to eq(:auto)
-  end
-
-  it 'may be specified with with_response' do
-    opts2 = opts.with_response(:body)
-    expect(opts.response).to eq(:auto)
-    expect(opts2.response).to eq(:body)
-  end
-
-  it 'recognizes invalid responses' do
-    expect {
-      opts.with_response(:not_a_valid_response)
-    }.to raise_error(ArgumentError, /not_a_valid_response/)
-  end
-
-end
-