hatetepe 0.3.0 → 0.3.1

data/lib/hatetepe/app.rb

@@ -17,7 +17,7 @@ module Hatetepe
     # Initializes a new App object.
     #
     # @param [#call] app
-    #   The Rack app
+    #   The Rack app.
     #
     def initialize(app)
       @app = app
@@ -30,43 +30,48 @@ module Hatetepe
     # 500 response if the Rack app raises an error.
     #
     # @param [Hash] env
-    #   The Rack environment
+    #   The Rack environment.
     #
     def call(env)
-      env["async.callback"] = proc {|response|
+      env["async.callback"] = proc do |response|
         postprocess env, response
-      }
+      end
       
       response = ASYNC_RESPONSE
-      catch(:async) {
+      catch :async do
         response = app.call(env) rescue ERROR_RESPONSE
-      }
+      end
+      
       postprocess env, response
     end
     
     # Sends the response.
     #
     # Does nothing if response status is indicating an asynchronous response.
-    # This is the case if the response Array's first element equals -1.
+    # This is the case if the response +Array+'s first element equals -1.
     # Otherwise it will start sending the response (status and headers).
     #
     # If the body indicates streaming it will return after sending the status
-    # and headers. This happens if the body equals Rack::STREAMING. Otherwise
-    # it sends each body chunk and then closes the response stream.
+    # and headers. This happens if the body equals +Rack::STREAMING+ or isn't
+    # set. Otherwise it sends each body chunk and then closes the response
+    # stream.
+    #
+    # Sending an empty body is as simple as passing an object that responds to
+    # +each+ but doesn't actually yield anything.
     #
     # @param [Hash] env
-    #   The Rack environment
+    #   The Rack environment.
     # @param [Array] response
-    #   An array of 1..3 length containing the status, headers, body
+    #   An array of 1..3 length containing the status, headers, body.
     #
     def postprocess(env, response)
       return if response[0] == ASYNC_RESPONSE[0]
       
       env["stream.start"].call response[0..1]
-      return if response[2] == Rack::STREAMING
+      return if !response[2] || response[2] == Rack::STREAMING
       
       begin
-        response[2].each {|chunk| env["stream.send"].call chunk }
+        response[2].each &env["stream.send"]
       ensure
         env["stream.close"].call
       end

data/lib/hatetepe/body.rb

@@ -98,7 +98,7 @@ module Hatetepe
     # Immediately yields all data that has already arrived. Blocks until the
     # Body is write-closed and yields for each call to #write until then.
     #
-    # @yield [String] Block to execute for each incoming data chunk
+    # @yield [String] Block to execute for each incoming data chunk.
     #
     # @return [undefined]
     def each(&block)
@@ -152,15 +152,15 @@ module Hatetepe
     # number of bytes written.
     #
     # @param [String] data
-    #   The data to append
+    #   The data to append.
     #
     # @return [Fixnum]
     #   The number of bytes written.
     def write(data)
       ret = io.write data
-      Fiber.new {
+      Fiber.new do
         @receivers.each {|r| r.call data }
-      }.resume
+      end.resume
       ret
     end
   end

data/lib/hatetepe/builder.rb

@@ -158,9 +158,9 @@ module Hatetepe
     def error(message)
       exception = BuilderError.new(message)
       unless on_error.empty?
-        on_error.each {|blk| blk.call(exception) }
+        on_error.each {|blk| blk.call exception }
       else
-        raise(exception)
+        raise exception
       end
     end
   end

data/lib/hatetepe/client.rb

@@ -21,24 +21,25 @@ module Hatetepe
       
       headers["User-Agent"] ||= "hatetepe/#{VERSION}"
       
-      EM::Synchrony.sync Request.new(verb, uri.request_uri).tap {|req|
+      Request.new(verb, uri.request_uri).tap do |req|
         req.headers = headers
         req.body = body || Body.new.tap {|b| b.close_write }
         client << req
-      }
+        EM::Synchrony.sync req
+      end.response
     end
     
     class << self
-      [:get, :head].each {|verb|
-        define_method(verb) {|uri, headers = {}|
+      [:get, :head].each do |verb|
+        define_method verb do |uri, headers = {}|
           request verb.to_s.upcase, uri, headers
-        }
-      }
-      [:options, :post, :put, :delete, :trace, :connect].each {|verb|
-        define_method(verb) {|uri, headers = {}, body = nil|
+        end
+      end
+      [:options, :post, :put, :delete, :trace, :connect].each do |verb|
+        define_method verb do |uri, headers = {}, body = nil|
           request verb.to_s.upcase, uri, headers, body
-        }
-      }
+        end
+      end
     end
     
     attr_reader :config
@@ -52,17 +53,16 @@ module Hatetepe
     end
     
     def post_init
-      parser.on_response {|response|
+      parser.on_response do |response|
         requests.find {|req| !req.response }.response = response
-      }
+      end
       
-      parser.on_headers {
-        requests.reverse.find {|req| !!req.response }.tap {|req|
+      parser.on_headers do
+        requests.reverse.find {|req| !!req.response }.tap do |req|
+          req.response.body.source = self
           req.succeed req.response
-          # XXX do i want to treat HEAD individually?
-          parser.complete if req.verb == :head
-        }
-      }
+        end
+      end
       
       #builder.on_write {|chunk|
       # ap "-> #{chunk}"
@@ -74,7 +74,7 @@ module Hatetepe
       request.headers["Host"] = "#{config[:host]}:#{config[:port]}"
 
       requests << request
-      Fiber.new {
+      Fiber.new do
         builder.request_line request.verb, request.uri
         
         if request.headers["Content-Type"] == "application/x-www-form-urlencoded"
@@ -96,7 +96,7 @@ module Hatetepe
         end
         
         builder.complete
-      }.resume
+      end.resume
     end
     
     def receive_data(data)
@@ -105,11 +105,7 @@ module Hatetepe
     end
     
     def stop
-      close_connection_after_writing
-    end
-    
-    def responses
-      requests.map(&:response).compact
+      close_connection
     end
   end
 end

data/lib/hatetepe/events.rb

@@ -12,23 +12,23 @@ module Hatetepe
     
     def event!(name, *args)
       @state = name
-      event(name, *args)
+      event name, *args
     end
     
     module ClassMethods
       def event(name, *more_names)
-        define_method(:"on_#{name}") {|&block|
+        define_method :"on_#{name}" do |&block|
           ivar = :"@on_#{name}"
           store = instance_variable_get(ivar)
           store ||= instance_variable_set(ivar, [])
           
           return store unless block
           store << block
-        }
+        end
         
         define_method(:"#{name}?") { state == name }
         
-        more_names.each {|n| event n }
+        more_names.each &method(:event)
       end
     end
   end

data/lib/hatetepe/parser.rb

@@ -19,8 +19,8 @@ module Hatetepe
     attr_reader :message
     
     def initialize(&block)
-      @parser = HTTP::Parser.new.tap {|p|
-        p.on_headers_complete = proc {
+      @parser = HTTP::Parser.new.tap do |p|
+        p.on_headers_complete = proc do
           version = p.http_version.join(".")
           if p.http_method
             @message = Request.new(p.http_method, p.request_url, version)
@@ -35,14 +35,14 @@ module Hatetepe
           
           event! :body, message.body
           nil
-        }
+        end
         
-        p.on_body = proc {|chunk|
+        p.on_body = proc do |chunk|
           message.body.write chunk unless message.body.closed_write?
-        }
+        end
         
         p.on_message_complete = method(:complete)
-      }
+      end
       
       reset
       

data/lib/hatetepe/pipeline.rb

@@ -0,0 +1,27 @@
+module Hatetepe
+  # TODO move specs from server_spec.rb to pipeline_spec.rb
+  class Pipeline
+    attr_reader :app
+    
+    def initialize(app)
+      @app = app
+    end
+    
+    def call(env)
+      previous, request = env["hatetepe.connection"].requests.values_at(-2, -1)
+      blocks = env.values_at("stream.start", "stream.close")
+      
+      env["stream.start"] = proc do |response|
+        EM::Synchrony.sync previous if previous
+        blocks[0].call response
+      end
+      
+      env["stream.close"] = proc do
+        blocks[1].call
+        request.succeed
+      end
+      
+      app.call env
+    end
+  end
+end

data/lib/hatetepe/proxy.rb

@@ -27,12 +27,12 @@ module Hatetepe
       build_request(env, target).tap do |req|
         cl << req
         EM::Synchrony.sync req
-        cl.stop unless client
+        req.response.body.callback { cl.stop } unless client
         env["proxy.callback"].call req.response
       end
     end
     
-    # TODO only use +env+ to build the request
+    # TODO use only +env+ to build the request
     def build_request(env, target)
       unless base = env["hatetepe.request"]
         raise ArgumentError, "Proxying requires env[hatetepe.request] to be set"

data/lib/hatetepe/request.rb

@@ -18,16 +18,16 @@ module Hatetepe
         "rack.input" => body,
         "REQUEST_METHOD" => verb.dup,
         "REQUEST_URI" => uri.dup
-      }.tap {|hsh|
-        headers.each {|key, value|
+      }.tap do |hsh|
+        headers.each do |key, value|
           key = key.upcase.gsub! /[^A-Z]/, "_"
           key = "HTTP_#{key}" unless key =~ /^CONTENT_(TYPE|LENGTH)$/
-          hsh[key] = value
-        }
+          hsh[key] = value.dup
+        end
 
         hsh["REQUEST_PATH"], qm, hsh["QUERY_STRING"] = uri.partition("?")
         hsh["PATH_INFO"], hsh["SCRIPT_NAME"] = hsh["REQUEST_PATH"].dup, ""
-      }
+      end
     end
   end
 end

data/lib/hatetepe/response.rb

@@ -13,8 +13,8 @@ module Hatetepe
       [status, headers, body]
     end
     
-    def [](i)
-      to_a[i]
+    def [](idx)
+      to_a[idx]
     end
   end
 end

data/lib/hatetepe/server.rb

@@ -5,14 +5,15 @@ require "rack"
 require "hatetepe/app"
 require "hatetepe/builder"
 require "hatetepe/parser"
+require "hatetepe/pipeline"
+require "hatetepe/proxy"
 require "hatetepe/request"
 require "hatetepe/version"
 
 module Hatetepe
   class Server < EM::Connection
     def self.start(config)
-      server = EM.start_server(config[:host], config[:port], self, config)
-      #Prefork.run server if config[:prefork]
+      EM.start_server config[:host], config[:port], self, config
     end
     
     attr_reader :app, :config, :errors
@@ -21,12 +22,13 @@ module Hatetepe
     def initialize(config)
       @config = config
       @errors = config[:errors] || $stderr
-      
-      @app = Rack::Builder.new.tap {|b|
+
+      @app = Rack::Builder.new.tap do |b|
+        b.use Hatetepe::Pipeline
         b.use Hatetepe::App
         b.use Hatetepe::Proxy
         b.run config[:app]
-      }
+      end.to_app
 
       super
     end
@@ -53,49 +55,53 @@ module Hatetepe
     end
     
     def process(*)
-      previous, request = requests.values_at(-2, -1)
+      request = requests.last
       
-      env = request.to_hash.tap {|e|
-        e["hatetepe.connection"] = self
-        e["rack.url_scheme"] = "http"
-        e["rack.input"].source = self
-        e["rack.errors"] = errors
-        
-        e["rack.multithread"] = false
-        e["rack.multiprocess"] = false
-        e["rack.run_once"] = false
-        
-        e["SERVER_NAME"] = config[:host].dup
-        e["SERVER_PORT"] = String(config[:port])
-        
-        host = e["HTTP_HOST"] || config[:host].dup
-        host += ":#{config[:port]}" unless host.include? ":"
-        e["HTTP_HOST"] = host
-        
-        e["stream.start"] = proc {|response|
+      env = request.to_hash.tap do |e|
+        inject_environment e
+        e["stream.start"] = proc do |response|
           e.delete "stream.start"
-          EM::Synchrony.sync previous if previous
-          
-          builder.response_line response[0]
-          response[1]["Server"] = "hatetepe/#{VERSION}"
-          builder.headers response[1]
-        }
-        
+          start_response response
+        end
         e["stream.send"] = builder.method(:body_chunk)
-        
-        e["stream.close"] = proc {
+        e["stream.close"] = proc do
           e.delete "stream.send"
           e.delete "stream.close"
-          
-          builder.complete
-          requests.delete request
-          request.succeed
-          
-          close_connection_after_writing if requests.empty?
-        }
-      }
+          close_response request
+        end
+      end
       
       Fiber.new { app.call env }.resume
     end
+    
+    def start_response(response)
+      builder.response_line response[0]
+      response[1]["Server"] = "hatetepe/#{VERSION}"
+      builder.headers response[1]
+    end
+    
+    def close_response(request)
+      builder.complete
+      requests.delete request
+      close_connection_after_writing if requests.empty?
+    end
+      
+    def inject_environment(env)
+      env["hatetepe.connection"] = self
+      env["rack.url_scheme"] = "http"
+      env["rack.input"].source = self
+      env["rack.errors"] = errors
+      
+      env["rack.multithread"] = false
+      env["rack.multiprocess"] = false
+      env["rack.run_once"] = false
+      
+      env["SERVER_NAME"] = config[:host].dup
+      env["SERVER_PORT"] = String(config[:port])
+      
+      host = env["HTTP_HOST"] || config[:host].dup
+      host += ":#{config[:port]}" unless host.include? ":"
+      env["HTTP_HOST"] = host
+    end
   end
 end

data/lib/hatetepe/version.rb

@@ -1,3 +1,3 @@
 module Hatetepe
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/hatetepe.rb

@@ -1,7 +1,6 @@
 require "hatetepe/builder"
 require "hatetepe/client"
 require "hatetepe/parser"
-require "hatetepe/proxy"
 require "hatetepe/request"
 require "hatetepe/response"
 require "hatetepe/server"

data/lib/rack/handler/hatetepe.rb

@@ -15,10 +15,10 @@ module Rack
         Signal.trap("TERM") { EM.stop }
         
         EM.epoll
-        EM.synchrony {
+        EM.synchrony do
           server = ::Hatetepe::Server.start options
           yield server if block_given?
-        }
+        end
       end
 
       def self.valid_options

data/spec/unit/app_spec.rb

@@ -6,9 +6,9 @@ describe Hatetepe::App do
   let(:app) { Hatetepe::App.new inner_app }
   let(:env) {
     {
-      "stream.start" => stub("stream.start", :call => nil),
-      "stream.send" => stub("stream.send", :call => nil),
-      "stream.close" => stub("stream.close", :call => nil)
+      "stream.start" => proc {},
+      "stream.send" => proc {},
+      "stream.close" => proc {}
     }
   }
   
@@ -81,16 +81,22 @@ describe Hatetepe::App do
     end
     
     it "streams the body" do
-      env["stream.send"].should_receive(:call).with(body[0])
-      env["stream.send"].should_receive(:call).with(body[1])
+      body.should_receive :each do |&blk|
+        blk.should equal(env["stream.send"])
+      end
       app.postprocess env, [status, headers, body]
     end
     
     it "doesn't stream the body if it equals Rack::STREAMING" do
-      env["stream.send"].should_not_receive :call
+      body.should_not_receive :each
       app.postprocess env, [status, headers, Rack::STREAMING]
     end
     
+    it "doesn't try to stream a body that isn't set" do
+      body.should_not_receive :each
+      app.postprocess env, [status, headers]
+    end
+    
     it "closes the response stream after streaming the body" do
       env["stream.close"].should_receive :call
       app.postprocess env, [status, headers, body]

data/spec/unit/client_spec.rb

@@ -162,7 +162,7 @@ describe Hatetepe::Client do
         }
       }
     }
-    let(:response) { stub "response" }
+    let(:response) { stub "response", :body => Hatetepe::Body.new }
     
     before {
       client.post_init
@@ -246,25 +246,8 @@ describe Hatetepe::Client do
   
   context "#stop" do
     it "closes the connection" do
-      client.should_receive :close_connection_after_writing
+      client.should_receive :close_connection
       client.stop
     end
   end
-  
-  context "#responses" do
-    let(:requests) {
-      4.times.map {|i| stub "request##{i}", :response => responses[i] }
-    }
-    let(:responses) {
-      2.times.map {|i| stub "response##{i}" }
-    }
-    
-    before {
-      client.stub :requests => requests
-    }
-    
-    it "returns all requests' responses" do
-      client.responses.should == responses
-    end
-  end
 end

data/spec/unit/server_spec.rb

@@ -40,16 +40,18 @@ describe Hatetepe::Server do
   
   context "#initialize(config)" do
     let(:server) { Hatetepe::Server.allocate }
-    let(:builder) { stub "app builder" }
+    let(:builder) { stub "app builder", :to_app => to_app }
+    let(:to_app) { stub "to_app" }
 
     it "builds the app" do
       Rack::Builder.stub :new => builder
+      builder.should_receive(:use).with Hatetepe::Pipeline
       builder.should_receive(:use).with Hatetepe::App
       builder.should_receive(:use).with Hatetepe::Proxy
       builder.should_receive(:run).with app
       
       server.send :initialize, config
-      server.app.should equal(builder)
+      server.app.should equal(to_app)
     end
     
     it "sets up the error stream" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hatetepe
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2011-11-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &85707400 !ruby/object:Gem::Requirement
+  requirement: &83959440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *85707400
+  version_requirements: *83959440
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &85706930 !ruby/object:Gem::Requirement
+  requirement: &83959120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85706930
+  version_requirements: *83959120
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &85706430 !ruby/object:Gem::Requirement
+  requirement: &83958600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *85706430
+  version_requirements: *83958600
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &85705840 !ruby/object:Gem::Requirement
+  requirement: &83958210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85705840
+  version_requirements: *83958210
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: &85705450 !ruby/object:Gem::Requirement
+  requirement: &83957590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85705450
+  version_requirements: *83957590
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &85705070 !ruby/object:Gem::Requirement
+  requirement: &83957070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85705070
+  version_requirements: *83957070
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85704360 !ruby/object:Gem::Requirement
+  requirement: &83956480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85704360
+  version_requirements: *83956480
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &85703690 !ruby/object:Gem::Requirement
+  requirement: &83956060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85703690
+  version_requirements: *83956060
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &85703190 !ruby/object:Gem::Requirement
+  requirement: &83955480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *85703190
+  version_requirements: *83955480
 description: 
 email:
 - lars.gierth@gmail.com
@@ -136,6 +136,7 @@ files:
 - lib/hatetepe/events.rb
 - lib/hatetepe/message.rb
 - lib/hatetepe/parser.rb
+- lib/hatetepe/pipeline.rb
 - lib/hatetepe/proxy.rb
 - lib/hatetepe/request.rb
 - lib/hatetepe/response.rb