hatetepe 0.2.0 → 0.2.1

data/lib/hatetepe/body.rb

@@ -54,25 +54,27 @@ module Hatetepe
     
     def read(*args)
       sync
-      rewind
       @io.read *args
     end
     
     def gets
       sync
-      rewind
       @io.gets
     end
     
     def write(chunk)
       ret = @io.write chunk
-      @receivers.each {|r| r.call chunk }
+      Fiber.new {
+        @receivers.each {|r| r.call chunk }
+      }.resume
       ret
     end
     
     def <<(chunk)
       ret = @io << chunk
-      @receivers.each {|r| r.call chunk }
+      Fiber.new {
+        @receivers.each {|r| r.call chunk }
+      }.resume
       ret
     end
   end

data/lib/hatetepe/parser.rb

@@ -42,6 +42,7 @@ module Hatetepe
         }
         
         p.on_message_complete = proc {
+          message.body.rewind
           message.body.close_write unless message.body.closed_write?
           event! :complete
         }

data/lib/hatetepe/request.rb

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

data/lib/hatetepe/server.rb

@@ -74,7 +74,7 @@ module Hatetepe
         e["stream.start"] = proc {|response|
           e.delete "stream.start"
           EM::Synchrony.sync previous if previous
-          response[1]["Server"] = "hatetepe/#{VERSION}"
+          response[1]["Server"] = "hatetepe/#{Hatetepe::VERSION}"
           builder.response response[0..1]
         }
         

data/lib/hatetepe/version.rb

@@ -1,3 +1,3 @@
 module Hatetepe
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/rack/handler/hatetepe.rb

@@ -29,5 +29,7 @@ module Rack
         }
       end
     end
+    
+    register "hatetepe", Rack::Handler::Hatetepe
   end
 end

data/spec/unit/body_spec.rb

@@ -135,13 +135,6 @@ describe Hatetepe::Body do
       read.should be_true
     end
     
-    it "rewinds the body" do
-      body.succeed
-      
-      body.should_receive :rewind
-      body.read
-    end
-    
     it "forwards to io#read" do
       body.succeed
       args, ret = [stub("arg#1"), stub("arg#2")], stub("ret")
@@ -162,13 +155,6 @@ describe Hatetepe::Body do
       read.should be_true
     end
     
-    it "rewinds the body" do
-      body.succeed
-      
-      body.should_receive :rewind
-      body.gets
-    end
-    
     it "forwards to io#gets" do
       body.succeed
       ret = stub("ret")

data/spec/unit/parser_spec.rb

@@ -207,6 +207,7 @@ describe Hatetepe::Parser do
     
     it "finishes the body" do
       parser.on_body {|body|
+        body.should_receive :rewind
         body.should_receive :close_write
       }
       do_request

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hatetepe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000Z
+date: 2011-09-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &79236260 !ruby/object:Gem::Requirement
+  requirement: &73976140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79236260
+  version_requirements: *73976140
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &79148530 !ruby/object:Gem::Requirement
+  requirement: &73975870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79148530
+  version_requirements: *73975870
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &79148130 !ruby/object:Gem::Requirement
+  requirement: &73975650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79148130
+  version_requirements: *73975650
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &79147860 !ruby/object:Gem::Requirement
+  requirement: &73975440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79147860
+  version_requirements: *73975440
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: &79147580 !ruby/object:Gem::Requirement
+  requirement: &73975230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79147580
+  version_requirements: *73975230
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &79147180 !ruby/object:Gem::Requirement
+  requirement: &73975020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79147180
+  version_requirements: *73975020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79146740 !ruby/object:Gem::Requirement
+  requirement: &73974800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79146740
+  version_requirements: *73974800
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &79146280 !ruby/object:Gem::Requirement
+  requirement: &73974590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79146280
+  version_requirements: *73974590
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &79145760 !ruby/object:Gem::Requirement
+  requirement: &73974330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79145760
+  version_requirements: *73974330
 description: 
 email:
 - lars.gierth@gmail.com