hatetepe 0.5.2 → 0.6.0.pre

data/spec/unit/server_spec.rb

@@ -1,127 +1,92 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
-require "spec_helper"
-require "hatetepe/server"
-require "rack/lint"
+require 'spec_helper'
 
-describe Hatetepe::Server, "(public API)" do
-  describe ".start(config, &app)" do
-    it "starts a server that listens on the supplied interface and port"
-    it "passes the config to incoming connections"
-    it "uses the passed block as app if any was passed"
-  end
+describe Hatetepe::Server do
+  let(:server) { described_class.new(config, connection) }
 
-  describe ".stop" do
-    it "waits for all requests to finish"
-    it "stops the server"
+  let(:config) do
+    { address: localhost, port: random_port, handlers: [handler_class] }
+  end
+  let(:connection) do
+    double('connection', parse:     nil,
+                         closed:    double('closed', then: nil),
+                         serialize: nil,
+                         close: nil)
   end
+  let(:handler_class) { double('handler_class', new: handler) }
+  let(:handler)       { double('handler', post_init: nil, respond: nil) }
 
-  describe ".stop!" do
-    it "immediately stops the server"
+  describe '.start' do
+    specify { pending }
   end
 
-  describe "config[:app].call(env)" do
-    let :subject do
-      Object.new.tap do |s|
-        s.extend Hatetepe::Server
-        s.stub({
-          :config    => {
-            :host => "127.0.5.1",
-            :port => 3000,
-            :app  => app
-          },
-          :send_data => nil
-        })
-        s.stub(:comm_inactivity_timeout=)
-        s.stub(:close_connection)
-        s.post_init
-      end
-    end
+  describe '#initialize' do
+    subject! { server }
 
-    let :app do
-      double("app", :call => nil)
-    end
+    its(:config) { should be(config) }
 
-    let :http_request do
-      [
-        "POST /foo/bar?key=value HTTP/1.1",
-        "Host: themachine.local",
-        "Content-Length: 13",
-        "",
-        "Hello, world!"
-      ].join("\r\n")
+    it 'sets up connection' do
+      expect(connection).to        have_received(:parse)
+        .with(server.method(:serve))
+      expect(connection.closed).to have_received(:then)
+        .with(server.method(:shutdown))
     end
 
-    let :http_response do
-      [
-        "HTTP/1.1 403 Forbidden",
-        "Content-Type: text/plain",
-        "Transfer-Encoding: chunked",
-        "",
-        "b",
-        "Mmh, nöö.",
-        "0",
-        "",
-        ""
-      ].join("\r\n")
+    it 'sets up handlers' do
+      expect(handler_class).to have_received(:new)
+        .with(config, server, connection)
+      expect(handler).to       have_received(:post_init)
     end
+  end
 
-    it "receives the Rack Env hash as parameter" do
-      app.should_receive :call do |env|
-        Rack::Lint.new(app).check_env(env)
-        env["REQUEST_METHOD"].should  == "POST"
-        env["REQUEST_URI"].should     == "/foo/bar?key=value"
-        env["HTTP_HOST"].should       == "themachine.local"
-        env["rack.input"].read.should == "Hello, world!"
-        [ 200, {}, [] ]
-      end
-
-      subject.receive_data(http_request)
-    end
+  describe '#serve' do
+    let(:request)  { default_request }
+    let(:response) { default_response }
 
-    it "returns a response array that will be sent to the client" do
-      app.should_receive :call do |env|
-        [ 403, { "Content-Type" => "text/plain" }, [ "Mmh, nöö." ] ]
-      end
+    before do
+      allow(server).to  receive(:respond)
+      allow(handler).to receive(:serve) { @fiber = Fiber.current }
+    end
 
-      sent = ""
-      subject.stub(:send_data) {|data| sent << data }
+    subject! { server.serve(request) }
 
-      subject.receive_data(http_request)
-      sent.should == http_response
+    it 'sets up correlation' do
+      request.served.fulfill(response)
+      tick
+      expect(server).to have_received(:respond).with(request, response)
     end
 
-    it "returns asynchronously" do
-      app.should_receive :call do |env|
-        EM::Synchrony.add_timer 0.5 do
-          response = [ 403, { "Content-Type" => "text/plain" }, [ "Mmh, nöö." ] ]
-          env["async.callback"].call(response)
-        end
-        [ -1, {}, [] ]
-      end
-
-      sent = ""
-      subject.stub(:send_data) {|data| sent << data }
-
-      subject.receive_data(http_request)
-      EM::Synchrony.sleep(0.55)
-      sent.should == http_response
+    it 'notifies the handlers' do
+      expect(handler).to    have_received(:serve).with(request)
+      expect(@fiber).not_to be(Fiber.current)
     end
   end
-end
 
-describe Hatetepe::Server, "(EventMachine/sermipublic API)" do
-  describe "#initialize(config)"
+  describe '#respond' do
+    let(:request)  { default_request }
+    let(:response) { default_response }
 
-  describe "#post_init"
+    subject! { server.respond(request, response) }
 
-  describe "#receive_data(data)"
+    it 'writes response to underlying connection' do
+      expect(connection).to have_received(:serialize).with(response)
+    end
 
-  describe "#unbind(reason)"
-end
+    it 'notifies the handlers' do
+      expect(handler).to have_received(:respond).with(request, response)
+    end
+  end
 
-describe Hatetepe::Server, "(private API)" do
-  describe "#process_request(request)"
+  describe '#close' do
+    subject! { server.close }
 
-  describe "#send_response(response)"
+    it 'closes the underlying connection' do
+      expect(connection).to have_received(:close)
+    end
+  end
+
+  describe '#teardown' do
+    specify { pending }
+  end
 end

data/spec/unit/support/keep_alive_spec.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Hatetepe::Support::KeepAlive, '#close_connection?' do
+  let(:object)  { double.extend(Hatetepe::Support::KeepAlive) }
+  let(:subject) { object.close_connection?(http_version, header) }
+
+  describe 'with HTTP/1.0' do
+    let(:http_version) { 1.0 }
+
+    describe 'and no header' do
+      let(:header) { nil }
+
+      it { should be(true) }
+    end
+
+    describe 'and Connection: close' do
+      let(:header) { 'close' }
+
+      it { should be(true) }
+    end
+
+    describe 'and Connection: keep-alive' do
+      let(:header) { 'keep-alive' }
+
+      it { should be(false) }
+    end
+  end
+
+  describe 'with HTTP/1.1' do
+    let(:http_version) { 1.1 }
+
+    describe 'and no header' do
+      let(:header) { nil }
+
+      it { should be(false) }
+    end
+
+    describe 'and Connection: close' do
+      let(:header) { 'close' }
+
+      it { should be(true) }
+    end
+
+    describe 'and Connection: keep-alive' do
+      let(:header) { 'keep-alive' }
+
+      it { should be(false) }
+    end
+  end
+end

data/spec/unit/support/message_spec.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Hatetepe::Support::Message do
+  describe '.build', 'given a parser holding a request' do
+    let(:parser) do
+      Struct.new(:http_method, :request_url, :headers, :http_version)
+        .new('GET', '/', { 'Key' => 'value' }, [1, 1])
+    end
+    let(:args) { [:get, '/', { 'Key' => 'value' }] }
+    let(:request) { double }
+
+    subject { Hatetepe::Support::Message.build(parser) }
+
+    it 'returns a Request object' do
+      expect(Hatetepe::Request)
+        .to receive(:new).with(*args).and_return(request)
+      expect(request).to receive(:http_version=).with(1.1)
+      expect(subject).to be(request)
+    end
+  end
+
+  describe '.build', 'given a parser holding a response' do
+    let(:parser) do
+      Struct.new(:http_method, :status_code, :headers, :http_version)
+        .new(nil, 200, { 'Key' => 'value' }, [1, 0])
+    end
+    let(:args) { [200, { 'Key' => 'value' }] }
+    let(:response) { double }
+
+    subject { Hatetepe::Support::Message.build(parser) }
+
+    it 'returns a Response object' do
+      expect(Hatetepe::Response)
+        .to receive(:new).with(*args).and_return(response)
+      expect(response).to receive(:http_version=).with(1.0)
+      expect(subject).to be(response)
+    end
+  end
+end

metadata

@@ -1,66 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: hatetepe
 version: !ruby/object:Gem::Version
-  version: 0.5.2
-  prerelease: 
+  version: 0.6.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Lars Gierth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: http_parser.rb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0.beta.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0.beta.2
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
-- !ruby/object:Gem::Dependency
-  name: em-synchrony
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,30 +44,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: promise.rb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -124,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -139,7 +75,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: The HTTP toolkit
 email:
 - lars.gierth@gmail.com
 executables:
@@ -147,49 +83,62 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .rspec
+- .travis.yml
+- .yardopts
 - Gemfile
-- Gemfile.lock
-- LICENSE
-- Procfile
+- Gemfile.devtools
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/hatetepe
-- config.ru
-- examples/parallel_requests.rb
+- config/devtools.yml
+- config/flay.yml
+- config/flog.yml
+- config/mutant.yml
+- config/reek.yml
+- config/rubocop.yml
+- config/yardstick.yml
 - hatetepe.gemspec
 - lib/hatetepe.rb
-- lib/hatetepe/body.rb
-- lib/hatetepe/builder.rb
-- lib/hatetepe/cli.rb
 - lib/hatetepe/client.rb
-- lib/hatetepe/connection.rb
-- lib/hatetepe/events.rb
-- lib/hatetepe/message.rb
-- lib/hatetepe/parser.rb
+- lib/hatetepe/client/keep_alive.rb
+- lib/hatetepe/client/timeouts.rb
+- lib/hatetepe/connection/eventmachine.rb
+- lib/hatetepe/connection/status.rb
+- lib/hatetepe/errors.rb
+- lib/hatetepe/promise.rb
 - lib/hatetepe/request.rb
 - lib/hatetepe/response.rb
+- lib/hatetepe/serializer.rb
+- lib/hatetepe/serializer/encoding.rb
 - lib/hatetepe/server.rb
 - lib/hatetepe/server/keep_alive.rb
-- lib/hatetepe/server/pipeline.rb
-- lib/hatetepe/server/rack_app.rb
+- lib/hatetepe/server/timeouts.rb
+- lib/hatetepe/support/handlers.rb
+- lib/hatetepe/support/keep_alive.rb
+- lib/hatetepe/support/message.rb
 - lib/hatetepe/version.rb
-- lib/rack/handler/hatetepe.rb
-- spec/integration/cli/start_spec.rb
-- spec/integration/client/keep_alive_spec.rb
-- spec/integration/client/timeout_spec.rb
-- spec/integration/server/keep_alive_spec.rb
-- spec/integration/server/timeout_spec.rb
+- spec/integration/error_handling_spec.rb
+- spec/integration/keep_alive_spec.rb
+- spec/integration/smoke_spec.rb
+- spec/integration/streaming_spec.rb
+- spec/integration/timeouts_spec.rb
+- spec/shared/integration/server_client_pair.rb
 - spec/spec_helper.rb
-- spec/unit/body_spec.rb
-- spec/unit/builder_spec.rb
+- spec/support/handler.rb
+- spec/support/helper.rb
 - spec/unit/client_spec.rb
-- spec/unit/connection_spec.rb
-- spec/unit/events_spec.rb
-- spec/unit/parser_spec.rb
-- spec/unit/rack_handler_spec.rb
+- spec/unit/connection/eventmachine_spec.rb
+- spec/unit/request_spec.rb
+- spec/unit/response_spec.rb
 - spec/unit/server_spec.rb
+- spec/unit/support/keep_alive_spec.rb
+- spec/unit/support/message_spec.rb
 homepage: https://github.com/lgierth/hatetepe
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -203,14 +152,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: The HTTP toolkit
-test_files: []
+summary: General purpose toolkit for HTTP clients and servers
+test_files:
+- spec/integration/error_handling_spec.rb
+- spec/integration/keep_alive_spec.rb
+- spec/integration/smoke_spec.rb
+- spec/integration/streaming_spec.rb
+- spec/integration/timeouts_spec.rb
+- spec/shared/integration/server_client_pair.rb
+- spec/spec_helper.rb
+- spec/support/handler.rb
+- spec/support/helper.rb
+- spec/unit/client_spec.rb
+- spec/unit/connection/eventmachine_spec.rb
+- spec/unit/request_spec.rb
+- spec/unit/response_spec.rb
+- spec/unit/server_spec.rb
+- spec/unit/support/keep_alive_spec.rb
+- spec/unit/support/message_spec.rb
 has_rdoc: 

data/Gemfile.lock

@@ -1,46 +0,0 @@
-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/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2011 Lars Gierth
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/Procfile

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

data/config.ru

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

data/examples/parallel_requests.rb

@@ -1,32 +0,0 @@
-require "hatetepe"
-require "awesome_print"
-
-EM.synchrony do
-  # one server
-  app = proc do |env|
-    [200, {"Content-Type" => "text/plain"}, ["Hello, world!"]]
-  end
-  Hatetepe::Server.start :host => "127.0.0.1", :port => 3123, :app => app
-
-  # two clients
-  clients = 2.times.map { Hatetepe::Client.start :host => "127.0.0.1", :port => 3123 }
-
-  # six requests
-  requests = 6.times.map do |i|
-    # no extra headers, empty body
-    req = Hatetepe::Request.new(:get, "/", {}, [])
-
-    # response status between 100 and 399
-    req.callback {|res| puts "request ##{i} finished with #{res.status} response" }
-
-    # response status between 400 and 599 or connection failure
-    req.errback {|res| puts "request ##{i} finished with #{res ? res.status : 'no'} response" }
-
-    clients[i % clients.length] << req
-    req
-  end
-
-  # Client#stop waits until all of its requests have finished
-  clients.map &:stop
-  EM.stop
-end