rack-singleshot 0.1.4 → 0.2.0

data/lib/rack/singleshot.rb

@@ -1,4 +1,5 @@
 require 'rack'
+require 'http/parser'
 
 module Rack
   module Handler
@@ -31,70 +32,65 @@ module Rack
       end
 
       def read_request
-        buffer, extra = drain(@stdin, CRLF * 2)
+        verb, path, version, headers, body = parse_request(@stdin)
 
-        heading, buffer = buffer.split(CRLF, 2)
-
-        verb, path, version = heading.split(' ')
+        env_for(verb, path, version, headers, body)
+      end
 
-        headers = parse_headers(buffer)
+      def parse_request(socket, chunksize = 1024)
+        finished = false
+        body     = StringIO.new('')
+        parser   = Http::Parser.new
 
-        if length = request_body_length(verb, headers)
-          body = StringIO.new(extra + @stdin.read(length - extra.size))
-        else
-          body = StringIO.new(extra)
-        end
+        body.set_encoding(Encoding::ASCII_8BIT) if body.respond_to?(:set_encoding)
 
-        env_for(verb, path, version, headers, body)
-      end
+        parser.on_message_complete = lambda { finished = true }
+        parser.on_body = lambda {|data| body << data }
 
-      def write_response(status, headers, body)
-        @stdout.write(['HTTP/1.1', status, Rack::Utils::HTTP_STATUS_CODES[status.to_i]].join(' ') << CRLF)
+        while(chunk = socket.readpartial(chunksize))
+          parser << chunk
 
-        headers.each do |key, values|
-          values.split("\n").each do |value|
-            @stdout.write([key, value].join(": ") << CRLF)
-          end
+          break if finished
         end
 
-        @stdout.write(CRLF)
+        return request_parts_from(parser) << body
+      rescue EOFError
+        return request_parts_from(parser) << body
+      end
 
-        body.each do |chunk|
-          @stdout.write(chunk)
-        end
+      def request_parts_from(parser)
+        [parser.http_method,
+         parser.request_path,
+         parser.http_version.join('.'),
+         parse_headers(parser.headers)]
       end
 
       def parse_headers(raw_headers)
-        raw_headers.split(CRLF).inject({}) do |h, pair|
-          key, value = pair.split(": ")
+        raw_headers.inject({}) do |h, (key,value)|
           h.update(header_key(key) => value)
         end
       end
 
-      def request_body_length(verb, headers)
-        return if %w[ POST PUT ].include?(verb.upcase)
+      def header_key(key)
+        key = key.upcase.gsub('-', '_')
 
-        if length = headers['CONTENT_LENGTH']
-          length.to_i
-        end
+        %w[CONTENT_TYPE CONTENT_LENGTH SERVER_NAME].include?(key) ? key : "HTTP_#{key}"
       end
 
-      def drain(socket, stop_at, chunksize = 1024)
-        buffer = ''
+      def write_response(status, headers, body)
+        @stdout.write(['HTTP/1.1', status, Rack::Utils::HTTP_STATUS_CODES[status.to_i]].join(' ') << CRLF)
 
-        while(chunk = socket.readpartial(chunksize))
-          buffer << chunk
+        headers.each do |key, values|
+          values.split("\n").each do |value|
+            @stdout.write([key, value].join(": ") << CRLF)
+          end
+        end
 
-          if buffer.include?(stop_at)
-            buffer, extra = buffer.split(stop_at, 2)
+        @stdout.write(CRLF)
 
-            return buffer, extra
-          end
+        body.each do |chunk|
+          @stdout.write(chunk)
         end
-        
-        return buffer, ''
-      rescue EOFError
-        return buffer, ''
       end
 
       def env_for(verb, path, version, headers, body)
@@ -123,11 +119,6 @@ module Rack
         env
       end
 
-      def header_key(key)
-        key = key.upcase.gsub('-', '_')
-
-        %w[CONTENT_TYPE CONTENT_LENGTH SERVER_NAME].include?(key) ? key : "HTTP_#{key}"
-      end
     end
 
     register 'singleshot', 'Rack::Handler::SingleShot'

metadata

@@ -1,120 +1,144 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rack-singleshot
-version: !ruby/object:Gem::Version
-  version: 0.1.4
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Ben Burkert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-19 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: http_parser.rb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'Handles a single request to/from STDIN/STDOUT. Exits when the response
-
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+description: |
+  Handles a single request to/from STDIN/STDOUT. Exits when the response
   has finished. Sutable for running via inetd.
 
-'
-email:
+email: 
 - ben@benburkert.com
-executables:
+executables: 
 - singleshot
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - ./lib/rack/singleshot.rb
 - ./spec/singleshot_spec.rb
 - ./spec/spec_helper.rb
 - bin/singleshot
+has_rdoc: true
 homepage: http://github.com/benburkert/rack-singleshot
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A single-shot rack handler.
-test_files:
+test_files: 
 - ./spec/singleshot_spec.rb
 - ./spec/spec_helper.rb