falcon 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5998b68f454477fcb11ec2571d14eac6f231345175f8bebac905b951ba391dbd
-  data.tar.gz: b2c5eb9aa083eee62480aea639855a7eb5244f1485aab7b8cb65e936e69b132c
+  metadata.gz: f3429e33911513a17a66a9dad747942f377f57dd4f2351ec59cb3e17047407ca
+  data.tar.gz: 7b6339640be53ec16971524684e12e1e1a77a9bd2f1ebacfbc1abeb5eb3754be
 SHA512:
-  metadata.gz: cf9842920c7c80129a1f4660ae4a769530660c88696bc22464f8211b6d3cb0c358b9ea63f655f22d7c9676970400214ca8eb56efc65c97eeb967bb091264178e
-  data.tar.gz: 8645f34edab0d4365eb8092421a2a72b77416ca71546fdad28c7c278c3e7de99f0f1d0ff6c20dc84d1fcf7d9831a120db8e7b114a68cc4d7dad703a0b754a1b0
+  metadata.gz: 1c1780fd09c7840daafb3b4f4472c622a87f077182bc334ca09406a38bd3d7616bcd1bc78be85debb5fdc48d368460d8d79fd893b99e3e45659f5cce975277f2
+  data.tar.gz: 80fa7d8d306a2c4cb4e967051e1e8353d5ac4e41ab41a1cf3ba43fb842713f74a32e8d64e2b201d30350c7f5b5bd30c77a5c60fad4c04e83321b12687806807b

data/falcon.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 
 	spec.add_dependency("async-io", "~> 1.6")
-	spec.add_dependency("async-http", "~> 0.10")
+	spec.add_dependency("async-http", "~> 0.11")
 	spec.add_dependency("async-container", "~> 0.3")
 	
 	spec.add_dependency("rack", ">= 1.0")

data/lib/falcon/input.rb

@@ -0,0 +1,84 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'async/http/server'
+
+module Falcon
+	class Input
+		def initialize(body)
+			@body = body
+			@chunks = []
+			
+			@buffer = nil
+			@closed = false
+		end
+		
+		def each(&block)
+			while @index < @chunks.count
+				chunk = @chunks[@index]
+				@index += 1
+				yield chunk
+			end
+			
+			@body.each do |chunk|
+				@chunks << chunk
+				yield chunk
+			end
+			
+			@closed = true
+		end
+		
+		def rewind
+			@index = 0
+			@closed = false
+		end
+		
+		def read(length = nil, buffer = nil)
+			unless @buffer
+				self.each do |chunk|
+					@buffer = chunk
+					break
+				end
+			end
+			
+			if @buffer
+				if length and @buffer.bytesize < length
+					return @buffer.slice!(0, length)
+				else
+					buffer = @buffer
+					@buffer = nil
+					return buffer
+				end
+			end
+		end
+		
+		def eof?
+			@closed and @buffer.nil?
+		end
+		
+		def gets
+			read
+		end
+		
+		def close
+			@body.close
+		end
+	end
+end

data/lib/falcon/server.rb

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative 'input'
+
 require 'async/http/server'
 
 module Falcon
@@ -36,15 +38,10 @@ module Falcon
 			request_path, query_string = request.path.split('?', 2)
 			server_name, server_port = (request.authority || '').split(':', 2)
 			
-			input = StringIO.new(request.body || '')
-			input.set_encoding(Encoding::BINARY)
-			
-			headers = request.headers.to_http_hash
-			
 			env = {
 				'rack.version' => [2, 0, 0],
 				
-				'rack.input' => input,
+				'rack.input' => Input.new(request.body),
 				'rack.errors' => $stderr,
 				
 				'rack.multithread' => true,
@@ -70,7 +67,15 @@ module Falcon
 				# I'm not sure what sane defaults should be here:
 				'SERVER_NAME' => server_name || '',
 				'SERVER_PORT' => server_port || '',
-			}.merge(headers)
+			}
+			
+			if content_type = request.headers['content-type']
+				env['CONTENT_TYPE'] = content_type
+			end
+			
+			request.headers.each do |key, value|
+				env["HTTP_#{key.upcase.tr('-', '_')}"] = value
+			end
 			
 			env['rack.hijack?'] = true
 			env['rack.hijack'] = lambda do

data/lib/falcon/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.9.0"
+	VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-io
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,7 @@ files:
 - lib/falcon.rb
 - lib/falcon/command.rb
 - lib/falcon/command/serve.rb
+- lib/falcon/input.rb
 - lib/falcon/server.rb
 - lib/falcon/verbose.rb
 - lib/falcon/version.rb