hatetepe 0.6.0.pre → 0.6.0.pre.1

data/spec/unit/server_spec.rb

@@ -15,7 +15,7 @@ describe Hatetepe::Server do
                          close: nil)
   end
   let(:handler_class) { double('handler_class', new: handler) }
-  let(:handler)       { double('handler', post_init: nil, respond: nil) }
+  let(:handler)       { double('handler', setup: nil, respond: nil) }
 
   describe '.start' do
     specify { pending }
@@ -36,36 +36,40 @@ describe Hatetepe::Server do
     it 'sets up handlers' do
       expect(handler_class).to have_received(:new)
         .with(config, server, connection)
-      expect(handler).to       have_received(:post_init)
+      expect(handler).to       have_received(:setup)
     end
   end
 
   describe '#serve' do
-    let(:request)  { default_request }
-    let(:response) { default_response }
+    let(:request)  { open_request }
+    let(:response) { open_response }
 
     before do
       allow(server).to  receive(:respond)
-      allow(handler).to receive(:serve) { @fiber = Fiber.current }
+      allow(handler).to receive(:serve) { |_, served|
+        @served = served
+        @fiber = Fiber.current
+      }
     end
 
     subject! { server.serve(request) }
 
     it 'sets up correlation' do
-      request.served.fulfill(response)
+      @served.fulfill(response)
       tick
       expect(server).to have_received(:respond).with(request, response)
     end
 
     it 'notifies the handlers' do
-      expect(handler).to    have_received(:serve).with(request)
+      expect(handler).to    have_received(:serve)
+        .with(request, kind_of(Hatetepe::Promise))
       expect(@fiber).not_to be(Fiber.current)
     end
   end
 
   describe '#respond' do
-    let(:request)  { default_request }
-    let(:response) { default_response }
+    let(:request)  { open_request }
+    let(:response) { open_response }
 
     subject! { server.respond(request, response) }
 

data/spec/unit/support/message_spec.rb

@@ -3,12 +3,15 @@
 require 'spec_helper'
 
 describe Hatetepe::Support::Message do
+  let(:body) { double('body') }
+  before { allow(Hatetepe::Body).to receive(:new) { body } }
+
   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(:args) { [:get, '/', { 'Key' => 'value' }, body] }
     let(:request) { double }
 
     subject { Hatetepe::Support::Message.build(parser) }
@@ -26,7 +29,7 @@ describe Hatetepe::Support::Message do
       Struct.new(:http_method, :status_code, :headers, :http_version)
         .new(nil, 200, { 'Key' => 'value' }, [1, 0])
     end
-    let(:args) { [200, { 'Key' => 'value' }] }
+    let(:args) { [200, { 'Key' => 'value' }, body] }
     let(:response) { double }
 
     subject { Hatetepe::Support::Message.build(parser) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hatetepe
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre
+  version: 0.6.0.pre.1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -102,6 +102,7 @@ files:
 - config/yardstick.yml
 - hatetepe.gemspec
 - lib/hatetepe.rb
+- lib/hatetepe/body.rb
 - lib/hatetepe/client.rb
 - lib/hatetepe/client/keep_alive.rb
 - lib/hatetepe/client/timeouts.rb
@@ -117,7 +118,6 @@ files:
 - lib/hatetepe/server/keep_alive.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
 - spec/integration/error_handling_spec.rb
@@ -133,8 +133,8 @@ files:
 - spec/unit/connection/eventmachine_spec.rb
 - spec/unit/request_spec.rb
 - spec/unit/response_spec.rb
+- spec/unit/server/keep_alive_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:
@@ -175,7 +175,7 @@ test_files:
 - spec/unit/connection/eventmachine_spec.rb
 - spec/unit/request_spec.rb
 - spec/unit/response_spec.rb
+- spec/unit/server/keep_alive_spec.rb
 - spec/unit/server_spec.rb
-- spec/unit/support/keep_alive_spec.rb
 - spec/unit/support/message_spec.rb
 has_rdoc: 

data/lib/hatetepe/support/keep_alive.rb

@@ -1,14 +0,0 @@
-# encoding: utf-8
-
-module Hatetepe
-  module Support
-    module KeepAlive
-      CLOSE = 'close'.freeze
-      KEEP_ALIVE = 'keep-alive'.freeze
-
-      def close_connection?(version, header)
-        (version < 1.1 && header != KEEP_ALIVE) || header == CLOSE
-      end
-    end
-  end
-end

data/spec/unit/support/keep_alive_spec.rb

@@ -1,52 +0,0 @@
-# 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