hatetepe 0.5.0.pre.2 → 0.5.0.pre.3

data/README.md

@@ -1,4 +1,4 @@
-The HTTP Toolkit
+The HTTP Toolkit [![Build Status](https://secure.travis-ci.org/lgierth/hatetepe.png?branch=master)](http://travis-ci.org/lgierth/hatetepe) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/lgierth/hatetepe)
 ================
 
 Hatetepe is a framework for building HTTP servers, clients and proxies using the
@@ -14,8 +14,6 @@ automatic JSON or form-data encoding, have a look at
 [Hatetepe adapter](https://github.com/technoweenie/faraday/pull/108)
 for it being worked on.
 
-[![Build status](https://secure.travis-ci.org/lgierth/hatetepe.png?branch=master)](http://travis-ci.org/lgierth/hatetepe)
-
 
 Getting Started (Server)
 ------------------------

data/lib/hatetepe/body.rb

@@ -2,8 +2,6 @@ require "em-synchrony"
 require "eventmachine"
 require "stringio"
 
-require "hatetepe/deferred_status_fix"
-
 module Hatetepe
   # Thin wrapper around StringIO for asynchronous body processing.
   class Body
@@ -113,11 +111,15 @@ module Hatetepe
     #
     # @yield [String] Block to execute for each incoming data chunk.
     #
-    # @return [undefined]
+    # @return [Enumerator,self]
     def each(&block)
+      return to_enum(__method__) unless block
+
       @receivers << block
       block.call io.string.dup unless io.string.empty?
       sync
+
+      self
     end
     
     # Forwards to StringIO#read.

data/lib/hatetepe/request.rb

@@ -1,4 +1,3 @@
-require "hatetepe/deferred_status_fix"
 require "hatetepe/message"
 
 module Hatetepe

data/lib/hatetepe/server.rb

@@ -14,7 +14,10 @@ module Hatetepe::Server
 
   attr_reader :config, :requests
 
-  CONFIG_DEFAULTS = { :timeout => 5.0 }
+  CONFIG_DEFAULTS = {
+    :timeout => 5.0,
+    :app     => [ Pipeline, KeepAlive, RackApp ]
+  }
 
   # @api public
   def self.start(config)
@@ -23,7 +26,7 @@ module Hatetepe::Server
 
   # @api semipublic
   def initialize(config)
-    @config = CONFIG_DEFAULTS.merge(config)
+    @config = CONFIG_DEFAULTS.merge(config).freeze
   end
 
   # @api semipublic
@@ -33,11 +36,15 @@ module Hatetepe::Server
     @builder.on_write  &method(:send_data)
     # @builder.on_write {|data| p "<--| #{data}" }
 
-    @app = [
-      Pipeline,
-      KeepAlive,
-      RackApp
-    ].reverse.inject(config[:app]) {|inner, outer| outer.new(inner, self) }
+    app =
+      if config[:app].respond_to?(:call)
+        [ *CONFIG_DEFAULTS[:app], config[:app] ]
+      else
+        config[:app].dup
+      end
+    @app = app.inject(app.pop) do |inner, outer|
+      outer.new(inner, self)
+    end
 
     self.comm_inactivity_timeout = config[:timeout]
   end
@@ -47,7 +54,7 @@ module Hatetepe::Server
     # p "-->| #{data}"
     @parser << data
   rescue Object => ex
-    p ex
+    puts [ex.message, *ex.backtrace].join("\n\t")
     close_connection
   end
 

data/lib/hatetepe/version.rb

@@ -1,3 +1,3 @@
 module Hatetepe
-  VERSION = "0.5.0.pre.2"
+  VERSION = "0.5.0.pre.3"
 end

data/spec/unit/body_spec.rb

@@ -136,6 +136,22 @@ describe Hatetepe::Body do
       body.succeed
       succeeded.should be_true
     end
+
+    it "returns self" do
+      Fiber.new { body.each {}.should == body }.resume
+      body.succeed
+    end
+
+    describe "without a block" do
+      let(:enumerator) { stub }
+
+      before { body.stub(:to_enum).with(:each) { enumerator } }
+
+      it "immediately returns an Enumerator" do
+        Fiber.new { body.each.should == enumerator }.resume
+          body.succeed
+      end
+    end
   end
   
   context "#read(length, buffer)" do

data/spec/unit/server_spec.rb

@@ -28,17 +28,18 @@ describe Hatetepe::Server, "(public API)" do
           :config    => {
             :host => "127.0.5.1",
             :port => 3000,
-            :app  => stub("app")
+            :app  => app
           },
           :send_data => nil
         })
         s.stub(:comm_inactivity_timeout=)
+        s.stub(:close_connection)
         s.post_init
       end
     end
 
     let :app do
-      subject.config[:app]
+      stub("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.0.pre.2
+  version: 0.5.0.pre.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -160,7 +160,6 @@ files:
 - lib/hatetepe/cli.rb
 - lib/hatetepe/client.rb
 - lib/hatetepe/connection.rb
-- lib/hatetepe/deferred_status_fix.rb
 - lib/hatetepe/events.rb
 - lib/hatetepe/message.rb
 - lib/hatetepe/parser.rb

data/lib/hatetepe/deferred_status_fix.rb

@@ -1,11 +0,0 @@
-require "eventmachine"
-
-module EM::Deferrable
-  def set_deferred_status_with_status_fix(status, *args)
-    return if defined?(@deferred_status) && ![:unknown, status].include?(@deferred_status)
-    set_deferred_status_without_status_fix status, *args
-  end
-  
-  alias_method :set_deferred_status_without_status_fix, :set_deferred_status
-  alias_method :set_deferred_status, :set_deferred_status_with_status_fix
-end