hatetepe 0.2.2 → 0.2.3

data/hatetepe.gemspec

@@ -12,16 +12,16 @@ Gem::Specification.new do |s|
   s.summary     = %q{The HTTP toolkit}
   #s.description = %q{TODO: write description}
 
-  s.add_dependency "http_parser.rb"
+  s.add_dependency "http_parser.rb", "~> 0.5.3"
   s.add_dependency "eventmachine"
-  s.add_dependency "em-synchrony"
+  s.add_dependency "em-synchrony", "~> 1.0"
   s.add_dependency "rack"
   s.add_dependency "async-rack"
   s.add_dependency "thor"
   
   s.add_development_dependency "rspec"
   s.add_development_dependency "fakefs"
-  s.add_development_dependency "em-http-request"
+  s.add_development_dependency "em-http-request", "~> 1.0"
 
   s.files         = `git ls-files`.split("\n") - [".gitignore"]
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/hatetepe/builder.rb

@@ -107,7 +107,7 @@ module Hatetepe
       
       if header[0..13] == "Content-Length"
         @chunked = false
-      elsif header[0..16] == "Transfer-Encoding"
+      elsif @chunked.nil? && header[0..16] == "Transfer-Encoding"
         @chunked = true
       end
       
@@ -115,7 +115,7 @@ module Hatetepe
     end
     
     def body(chunk)
-      if Body === chunk
+      if chunk.respond_to? :each
         chunk.each &method(:body)
         return
       end
@@ -142,12 +142,10 @@ module Hatetepe
     def complete
       return if ready?
       
-      if writing_body? && chunked?
-        write "0\r\n"
-        write "\r\n"
-      elsif writing_headers? || writing_trailing_headers?
-        write "\r\n"
+      if writing_headers? || writing_trailing_headers?
+        header "Content-Length", "0"
       end
+      body ""
       
       on_complete.each {|blk| blk.call }
       reset

data/lib/hatetepe/cli.rb

@@ -27,12 +27,11 @@ module Hatetepe
       $stderr.flush
       app = Rack::Builder.parse_file(rackup)[0]
 
+      EM.epoll
       EM.synchrony do
         trap("INT") { EM.stop }
         trap("TERM") { EM.stop }
         
-        EM.epoll
-        
         host = options[:bind] || "127.0.0.1"
         port = options[:port] || 3000
         

data/lib/hatetepe/client.rb

@@ -59,6 +59,7 @@ module Hatetepe
       parser.on_headers {
         requests.reverse.find {|req| !!req.response }.tap {|req|
           req.succeed req.response
+          parser.complete if req.verb == :head
         }
       }
       
@@ -74,8 +75,25 @@ module Hatetepe
       requests << request
       Fiber.new {
         builder.request request.verb, request.uri
+        
+        if request.headers["Content-Type"] == "application/x-www-form-urlencoded"
+          if request.body.respond_to? :read
+            request.headers["Content-Length"] = request.body.read.bytesize
+          else
+            request.headers["Content-Length"] = request.body.length
+          end
+        end
         builder.headers request.headers
-        builder.body request.body unless request.body.empty?
+        
+        b = request.body
+        if Body === b || b.respond_to?(:each)
+          builder.body b
+        elsif b.respond_to? :read
+          builder.body b.read
+        else
+          builder.body [b]
+        end
+        
         builder.complete
       }.resume
     end

data/lib/hatetepe/parser.rb

@@ -41,11 +41,7 @@ module Hatetepe
           message.body << chunk unless message.body.closed_write?
         }
         
-        p.on_message_complete = proc {
-          message.body.rewind
-          message.body.close_write unless message.body.closed_write?
-          event! :complete
-        }
+        p.on_message_complete = method(:complete)
       }
       
       reset
@@ -61,6 +57,12 @@ module Hatetepe
       @message = nil
     end
     
+    def complete
+      message.body.rewind
+      message.body.close_write unless message.body.closed_write?
+      event! :complete
+    end
+    
     def <<(data)
       @parser << data
     rescue HTTP::Parser::Error => e

data/lib/hatetepe/version.rb

@@ -1,3 +1,3 @@
 module Hatetepe
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/rack/handler/hatetepe.rb

@@ -14,9 +14,8 @@ module Rack
         Signal.trap("INT") { EM.stop }
         Signal.trap("TERM") { EM.stop }
         
-        EM.run {
-          EM.epoll
-          
+        EM.epoll
+        EM.synchrony {
           server = ::Hatetepe::Server.start options
           yield server if block_given?
         }

data/spec/spec_helper.rb

@@ -7,9 +7,8 @@ require "em-synchrony/em-http"
 require "fakefs/safe"
 
 RSpec.configure {|config|
-  config.before {
+  config.before(:all) {
     EM.class_eval {
-      @spec_hooks = []
       class << self
         attr_reader :spec_hooks
         def synchrony_with_hooks(blk = nil, tail = nil, &block)
@@ -24,9 +23,8 @@ RSpec.configure {|config|
     }
   }
   
-  config.after {
+  config.after(:all) {
     EM.class_eval {
-      @spec_hooks = nil
       class << self
         remove_method :spec_hooks
         alias_method :synchrony, :synchrony_without_hooks
@@ -34,4 +32,12 @@ RSpec.configure {|config|
       end
     }
   }
+  
+  config.before(:each) {
+    EM.instance_variable_set :@spec_hooks, []
+  }
+  
+  config.after(:each) {
+    EM.instance_variable_set :@spec_hooks, nil
+  }
 }

data/spec/unit/rack_handler_spec.rb

@@ -19,8 +19,8 @@ describe Rack::Handler::Hatetepe do
     }
     
     it "starts an Hatetepe server" do
-      EM.should_receive(:run) {|&block|
-        EM.should_receive(:epoll)
+      EM.should_receive :epoll
+      EM.should_receive(:synchrony) {|&block|
         Hatetepe::Server.should_receive(:start) {|opts|
           opts[:host].should equal(options[:Host])
           opts[:port].should equal(options[:Port])
@@ -43,7 +43,7 @@ describe Rack::Handler::Hatetepe do
     end
     
     it "can be stopped by sending SIGTERM or SIGINT" do
-      EM.should_receive(:run) {|&block| block.call }
+      EM.should_receive(:synchrony) {|&block| block.call }
       
       trapped_signals = []
       Signal.should_receive(:trap).twice {|sig, &block|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hatetepe
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-10-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &71760510 !ruby/object:Gem::Requirement
+  requirement: &75172870 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *71760510
+  version_requirements: *75172870
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &71757150 !ruby/object:Gem::Requirement
+  requirement: &75172660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71757150
+  version_requirements: *75172660
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &71756500 !ruby/object:Gem::Requirement
+  requirement: &75172390 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *71756500
+  version_requirements: *75172390
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &71755350 !ruby/object:Gem::Requirement
+  requirement: &75172180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71755350
+  version_requirements: *75172180
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: &71754470 !ruby/object:Gem::Requirement
+  requirement: &75171950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71754470
+  version_requirements: *75171950
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &71753440 !ruby/object:Gem::Requirement
+  requirement: &75171740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71753440
+  version_requirements: *75171740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71749920 !ruby/object:Gem::Requirement
+  requirement: &75171530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71749920
+  version_requirements: *75171530
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &71749060 !ruby/object:Gem::Requirement
+  requirement: &75171320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,18 +98,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71749060
+  version_requirements: *75171320
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &71748040 !ruby/object:Gem::Requirement
+  requirement: &75171070 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *71748040
+  version_requirements: *75171070
 description: 
 email:
 - lars.gierth@gmail.com