hatetepe 0.5.1 → 0.5.2

data/Gemfile

@@ -1,4 +1,6 @@
-source :rubygems
+source "https://rubygems.org"
+
+ruby "1.9.3"
 
 gemspec
 

data/Gemfile.lock

@@ -0,0 +1,46 @@
+PATH
+  remote: .
+  specs:
+    hatetepe (0.5.1)
+      em-synchrony (~> 1.0)
+      eventmachine (~> 1.0.0.beta.4)
+      http_parser.rb (~> 0.6.0.beta.2)
+      rack
+      thor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    awesome_print (1.1.0)
+    diff-lcs (1.2.4)
+    em-synchrony (1.0.3)
+      eventmachine (>= 1.0.0.beta.1)
+    eventmachine (1.0.3)
+    eventmachine (1.0.3-java)
+    http_parser.rb (0.6.0.beta.2)
+    http_parser.rb (0.6.0.beta.2-java)
+    kramdown (1.1.0)
+    rack (1.5.2)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.1)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    thor (0.18.1)
+    yard (0.8.7)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  awesome_print
+  hatetepe!
+  kramdown
+  rake
+  rspec
+  yard

data/Procfile

@@ -0,0 +1 @@
+web: bundle exec hatetepe -p $PORT -b 0.0.0.0

data/README.md

@@ -182,13 +182,15 @@ Hatetepe is subject to an MIT-style license (see LICENSE file).
 Roadmap
 -------
 
-- 0.5.0
-  - Direct IO via EM.enable_proxy
+- 0.6.0
+  - Direct recv<->send IO via EM.enable_proxy
+  - SSL/TLS
+  - HTTP proxying (in client and server)
+- later
   - Encoding support (ref. [github.com/tmm1/http_parser.rb#1](https://github.com/tmm1/http_parser.rb/pull/1))
   - Optimize for performance
   - Propagate connection errors to the app
 
-
 Ideas
 -----
 

data/config.ru

@@ -0,0 +1,7 @@
+Hatetepe::Server::CONFIG_DEFAULTS[:app] = [ Hatetepe::Server::KeepAlive, Hatetepe::Server::RackApp ]
+
+use Rack::ContentLength
+
+run proc {|_|
+  [200, {'Content-Type' => 'text/html'}, ['hello, world']]
+}

data/hatetepe.gemspec

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "hatetepe/version"
+require "date"
 
 Gem::Specification.new do |s|
   s.name        = "hatetepe"
@@ -13,7 +14,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{The HTTP toolkit}
   #s.description = %q{TODO: write description}
 
-  s.add_dependency "http_parser.rb", "~> 0.5.3"
+  s.add_dependency "http_parser.rb", "~> 0.6.0.beta.2"
   s.add_dependency "eventmachine",   "~> 1.0.0.beta.4"
   s.add_dependency "em-synchrony",   "~> 1.0"
   s.add_dependency "rack"

data/lib/hatetepe/client.rb

@@ -7,6 +7,13 @@ require "hatetepe/parser"
 require "hatetepe/request"
 require "hatetepe/version"
 
+module Hatetepe
+  HatetepeError = Class.new(StandardError)
+  RequestError  = Class.new(HatetepeError)
+  ClientError   = Class.new(RequestError)
+  ServerError   = Class.new(RequestError)
+end
+
 module Hatetepe::Client
   include Hatetepe::Connection
 
@@ -39,12 +46,11 @@ module Hatetepe::Client
   # @api semipublic
   def initialize(config)
     @config = CONFIG_DEFAULTS.merge(config)
+    @ssl_handshake_completed = EM::DefaultDeferrable.new
   end
 
   # Initializes the parser, request queue, and middleware pipe.
   #
-  # TODO: Use +Rack::Builder+ for building the app pipe. 
-  #
   # @see EM::Connection#post_init
   #
   # @api semipublic
@@ -60,6 +66,12 @@ module Hatetepe::Client
 
     self.comm_inactivity_timeout = config[:timeout]
     self.pending_connect_timeout = config[:connect_timeout]
+
+    start_tls if config[:ssl]
+  end
+
+  def ssl_handshake_completed
+    EM::Synchrony.next_tick { @ssl_handshake_completed.succeed }
   end
 
   # Feeds response data into the parser.
@@ -101,6 +113,8 @@ module Hatetepe::Client
   # @api public
   def <<(request)
     Fiber.new do
+      EM::Synchrony.sync(@ssl_handshake_completed) if config[:ssl]
+
       response = @app.call(request)
 
       if response && (request.verb == "HEAD" || response.status == 204)
@@ -108,7 +122,7 @@ module Hatetepe::Client
       end
 
       if !response
-        request.fail(nil, self)
+        request.fail
       elsif response.failure?
         request.fail(response)
       else
@@ -133,11 +147,52 @@ module Hatetepe::Client
   #
   # @api public
   def request(verb, uri, headers = {}, body = [])
-    request =  Hatetepe::Request.new(verb, URI(uri), headers, body)
+    uri = URI(uri)
+    uri.scheme ||= @config[:ssl] ? 'http' : 'https'
+    uri.host ||= @config[:host]
+    uri.port ||= @config[:port]
+
+    headers['Host'] ||= "#{uri.host}:#{uri.port}"
+
+    request =  Hatetepe::Request.new(verb, URI(uri.to_s), headers, body)
     self    << request
     EM::Synchrony.sync(request)
   end
 
+  # Like +#request+, but raises errors for 4xx and 5xx responses.
+  #
+  # @param [Symbol, String] verb
+  #   The HTTP method verb, e.g. +:get+ or +"PUT"+.
+  # @param [String, URI]    uri
+  #   The request URI.
+  # @param [Hash]           headers (optional)
+  #   The request headers.
+  # @param [#each]          body    (optional)
+  #   A request body object whose +#each+ method yields objects that respond
+  #   to +#to_s+.
+  #
+  # @return [Hatetepe]::Response, nil]
+  #
+  # @raise [Hatetepe::ClientError]
+  #   If the server responded with a 4xx status code.
+  # @raise [Hatetepe::ServerError]
+  #   If the server responded with a 5xx status code.
+  # @raise [Hatetepe::RequestError]
+  #   If the client failed to receive any response at all.
+  def request!(verb, uri, headers = {}, body = [])
+    response = request(verb, uri, headers, body)
+
+    if response.nil?
+      raise Hatetepe::RequestError
+    elsif response.status >= 500
+      raise Hatetepe::ServerError
+    elsif response.status >= 400
+      raise Hatetepe::ClientError
+    end
+
+    response
+  end
+
   # Gracefully stops the client.
   #
   # Waits for all requests to finish and then stops the client.
@@ -188,10 +243,8 @@ module Hatetepe::Client
   # @api public
   def self.request(verb, uri, headers = {}, body = [])
     uri    = URI(uri)
-    client = start(host: uri.host, port: uri.port)
+    client = start(host: uri.host, port: uri.port, ssl: uri.scheme == 'https')
     client.request(verb, uri, headers, body)
-  ensure
-    client.stop
   end
 
   # Feeds the request into the builder and blocks while waiting for the

data/lib/hatetepe/version.rb

@@ -1,3 +1,3 @@
 module Hatetepe
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/unit/body_spec.rb

@@ -26,7 +26,7 @@ describe Hatetepe::Body do
   end
   
   context "#sync" do
-    let(:conn) { stub "conn", :paused? => true }
+    let(:conn) { double "conn", :paused? => true }
     
     it "resumes the source connection if any" do
       body.source = conn
@@ -43,7 +43,7 @@ describe Hatetepe::Body do
   end
   
   context "#length" do
-    let(:length) { stub "length" }
+    let(:length) { double "length" }
     
     it "forwards to io#length" do
       body.stub :sync
@@ -79,7 +79,7 @@ describe Hatetepe::Body do
   end
   
   context "#pos" do
-    let(:pos) { stub "pos" }
+    let(:pos) { double "pos" }
     
     it "forwards to io#pos" do
       body.io.stub :pos => pos
@@ -109,7 +109,7 @@ describe Hatetepe::Body do
   
   context "#closed_write?" do
     it "forwards to io#closed_write?" do
-      ret = stub("return")
+      ret = double("return")
       body.io.should_receive(:closed_write?) { ret }
       
       body.closed_write?.should equal(ret)
@@ -143,7 +143,7 @@ describe Hatetepe::Body do
     end
 
     describe "without a block" do
-      let(:enumerator) { stub }
+      let(:enumerator) { double }
 
       before { body.stub(:to_enum).with(:each) { enumerator } }
 
@@ -167,7 +167,7 @@ describe Hatetepe::Body do
     
     it "forwards to io#read" do
       body.succeed
-      args, ret = [stub("arg#1"), stub("arg#2")], stub("ret")
+      args, ret = [double("arg#1"), double("arg#2")], double("ret")
 
       body.io.should_receive(:read).with(*args) { ret }
       body.read(*args).should equal(ret)
@@ -187,7 +187,7 @@ describe Hatetepe::Body do
     
     it "forwards to io#gets" do
       body.succeed
-      ret = stub("ret")
+      ret = double("ret")
 
       body.io.should_receive(:gets) { ret }
       body.gets.should equal(ret)
@@ -196,7 +196,7 @@ describe Hatetepe::Body do
   
   context "#write(chunk)" do
     it "forwards to io#write" do
-      arg, ret = stub("arg"), stub("ret")
+      arg, ret = double("arg"), double("ret")
       body.io.should_receive(:write).with(arg) { ret }
       
       body.write(arg).should equal(ret)

data/spec/unit/builder_spec.rb

@@ -73,7 +73,7 @@ describe Hatetepe::Builder do
   describe "#chunked?"
 
   describe "#request(array)" do
-    let(:req) { [:get, "/foo", {"Key" => "value"}, stub("body")] }
+    let(:req) { [:get, "/foo", {"Key" => "value"}, double("body")] }
     
     before { builder.send :initialize }
     
@@ -137,7 +137,7 @@ describe Hatetepe::Builder do
   end
   
   describe "#response(array)" do
-    let(:res) { [201, {"Key" => "value"}, stub("body")] }
+    let(:res) { [201, {"Key" => "value"}, double("body")] }
     
     before { builder.send :initialize }
     
@@ -230,7 +230,7 @@ describe Hatetepe::Builder do
   end
   
   describe "#body(#each)" do
-    let(:body) { [stub("chunk#1"), stub("chunk#2")] }
+    let(:body) { [double("chunk#1"), double("chunk#2")] }
     
     it "calls #body_chunk for each element" do
       builder.should_receive(:body_chunk).with body[0]
@@ -318,7 +318,7 @@ describe Hatetepe::Builder do
       builder.complete
     end
     
-    let(:hook) { stub "hook", :call => nil }
+    let(:hook) { double "hook", :call => nil }
     
     it "calls the on_complete hooks" do
       builder.on_complete << hook
@@ -333,8 +333,8 @@ describe Hatetepe::Builder do
   end
   
   describe "#write(data)" do
-    let(:hook) { stub "hook" }
-    let(:data) { stub "data" }
+    let(:hook) { double "hook" }
+    let(:data) { double "data" }
     
     before { builder.send :initialize }
     
@@ -346,10 +346,10 @@ describe Hatetepe::Builder do
   end
   
   describe "#error(message)" do
-    let(:hook1) { stub "hook#1" }
-    let(:hook2) { stub "hook#2" }
+    let(:hook1) { double "hook#1" }
+    let(:hook2) { double "hook#2" }
     let(:message) { "error! error!" }
-    let(:exception) { stub "exception" }
+    let(:exception) { double "exception" }
     
     before do
       builder.send :initialize

data/spec/unit/client_spec.rb

@@ -72,10 +72,10 @@ describe Hatetepe::Client do
   end
 
   describe ".request" do
-    let(:client)   { stub("client", request: res, stop: nil)  }
-    let(:headers)  { stub("headers") }
-    let(:body)     { stub("body") }
-    let(:res)      { stub("response") }
+    let(:client)   { double("client", request: res, stop: nil)  }
+    let(:headers)  { double("headers") }
+    let(:body)     { double("body") }
+    let(:res)      { double("response") }
     let(:response) { Hatetepe::Client.request(:put, "/test", headers, body) }
 
     before { Hatetepe::Client.stub(start: client) }
@@ -84,18 +84,13 @@ describe Hatetepe::Client do
       client.should_receive(:request).with(:put, URI("/test"), headers, body)
       response.should equal(res)
     end
-
-    it "stops the client afterwards" do
-      client.should_receive(:stop)
-      response
-    end
   end
 
   describe "#request" do
     let(:body)     { [ "Hello,", " world!" ]            }
     let(:headers)  { { "Content-Type" => "text/plain" } }
-    let(:request)  { stub("request")                    }
-    let(:response) { stub("response")                   }
+    let(:request)  { double("request")                    }
+    let(:response) { double("response")                   }
 
     before do
       client.stub(:<<)
@@ -125,6 +120,46 @@ describe Hatetepe::Client do
     end
   end
 
+  describe "#request!" do
+    subject do
+      proc { client.request!(:get, "/") }
+    end
+
+    let(:status)   { 200 }
+    let(:response) { double("response", :status => status) }
+
+    before do
+      client.stub(:request).with(:get, "/", {}, []) { response }
+    end
+
+    it "forwards to #request" do
+      subject.call.should eq(response)
+    end
+
+    describe "for a 4xx response" do
+      let(:status) { 404 }
+
+      it "raises a ClientError" do
+        subject.should raise_error(Hatetepe::ClientError)
+      end
+    end
+
+    describe "for a 5xx response" do
+      let(:status) { 502 }
+
+      it "raises a ServerError" do
+        subject.should raise_error(Hatetepe::ServerError)
+      end
+    end
+
+    describe "if no response could be received" do
+      it "raises a ServerError" do
+        client.stub(:request) { nil }
+        subject.should raise_error(Hatetepe::RequestError)
+      end
+    end
+  end
+
   describe "#<<" do
     let :request do
       Hatetepe::Request.new :head, "/test"
@@ -152,7 +187,7 @@ describe Hatetepe::Client do
       let(:response) { nil }
 
       it "fails the request" do
-        request.should_receive(:fail).with(nil, client)
+        request.should_receive(:fail)
         client << request
       end
     end

data/spec/unit/parser_spec.rb

@@ -68,7 +68,7 @@ describe Hatetepe::Parser do
   end
   
   let(:block) {
-    stub("block").tap {|blk|
+    double("block").tap {|blk|
       blk.stub :to_proc => proc {|*args| blk.call *args }
     }
   }

data/spec/unit/rack_handler_spec.rb

@@ -2,14 +2,14 @@ require "spec_helper"
 require "rack/handler/hatetepe"
 
 describe Rack::Handler::Hatetepe do
-  let(:app) { stub "app" }
+  let(:app) { double "app" }
   let(:options) {
     {
-      :Host => stub("host"),
-      :Port => stub("port")
+      :Host => double("host"),
+      :Port => double("port")
     }
   }
-  let(:server) { stub "server" }
+  let(:server) { double "server" }
   
   describe ".run(app, options) {|server| ... }" do
     before {

data/spec/unit/server_spec.rb

@@ -39,7 +39,7 @@ describe Hatetepe::Server, "(public API)" do
     end
 
     let :app do
-      stub("app", :call => nil)
+      double("app", :call => nil)
     end
 
     let :http_request do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hatetepe
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0.beta.2
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -148,10 +148,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - LICENSE
+- Procfile
 - README.md
 - Rakefile
 - bin/hatetepe
+- config.ru
 - examples/parallel_requests.rb
 - hatetepe.gemspec
 - lib/hatetepe.rb
@@ -205,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The HTTP toolkit