spider-gazelle 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6835ff8fc79a090958589cc6c64474d27446b98
-  data.tar.gz: be7c36e4a3a219ee14ee0c35d4099f534b2fa9ee
+  metadata.gz: 389b76b304d2c434532df00b18f0e772b7bca616
+  data.tar.gz: de17af1941a3ce3cf24a65ec069a1e33bf5490f6
 SHA512:
-  metadata.gz: 52c7dabc77dbe369030abff53cf86b1c120601de0fc88a03f5e84ce888c7513c99bbe7c2281597d525cb80eac92137e3ebb78e18fd2b0298f2a0b1f0ee47454d
-  data.tar.gz: 4b97ce2d2131da24f716d438c0d82c1e76ed7c94c3b5acdf9263c9175a0b7c8152737e7113ead316116c4fcfae7752ddb2b9548aef6ece7a6336ce22bc06d4d9
+  metadata.gz: d3751fe5f50137772b2b434cf8ab2bbbeb8c597e343977ca99fd43de1cc5592f7897d756ae04e1ba4d81adbe60de712ab6f8169a42eb3a62bc9b91b6ccd60d90
+  data.tar.gz: 1bd6d81f822682a1c52b0c1f843e0f3323f69cc80e7effd755c092874fd6019692f8a705d92d87509393654034ac3a0d885b4c43ad88660f2247fc6834df5734

data/bin/sg

@@ -82,7 +82,6 @@ ENV['SG_MODE'] = 'no_ipc' if ::FFI::Platform.windows?
             puts "#{e.message}\n#{e.backtrace.join("\n") unless e.backtrace.nil?}\n"
         }).finally do
             # This will execute if the TCP binding is lost
-            p 'server failed to load - shutting down'
             server.shutdown
         end
 

data/lib/spider-gazelle/connection.rb

@@ -5,6 +5,8 @@ module SpiderGazelle
     class Connection
         Hijack = Struct.new(:socket, :env)
 
+        REQUEST_METHOD = 'REQUEST_METHOD'.freeze # NOTE:: duplicate in gazelle.rb
+        HEAD = 'HEAD'.freeze
 
         RACK = 'rack'.freeze            # used for filtering headers
         CLOSE = 'close'.freeze
@@ -15,6 +17,10 @@ module SpiderGazelle
         COLON_SPACE = ': '.freeze
         EOF = "0\r\n\r\n".freeze
         CRLF = "\r\n".freeze
+        ZERO = '0'.freeze
+
+        HTTP_STATUS_CODES = ::Rack::Utils::HTTP_STATUS_CODES
+        HTTP_STATUS_DEFAULT = proc { 'CUSTOM' }
 
         HTTP_11_400 = "HTTP/1.1 400 Bad Request\r\n\r\n".freeze
 
@@ -187,6 +193,7 @@ module SpiderGazelle
                     @deferred_responses = nil if @deferred_responses
 
                     status, headers, body = result
+                    send_body = @request.env[REQUEST_METHOD] != HEAD
 
                     # If a file, stream the body in a non-blocking fashion
                     if body.respond_to? :to_path
@@ -201,19 +208,38 @@ module SpiderGazelle
 
                         write_headers(status, headers)
 
-                        file = @loop.file(body.to_path, File::RDONLY)
-                        file.progress do    # File is open and available for reading
-                            file.send_file(@socket, type).finally do
-                                file.close
-                                if @request.keep_alive == false
-                                    @socket.shutdown
+                        if send_body
+                            file = @loop.file(body.to_path, File::RDONLY)
+                            file.progress do    # File is open and available for reading
+                                file.send_file(@socket, type).finally do
+                                    file.close
+                                    if @request.keep_alive == false
+                                        @socket.shutdown
+                                    end
                                 end
                             end
+                            return file
                         end
-
-                        return file
                     else
-                        write_response(status, headers, body)
+                        # Optimize the response
+                        begin
+                            body_size = body.size
+                            if body_size < 2
+                                if body_size == 1
+                                    headers[CONTENT_LENGTH] = body[0].bytesize
+                                else
+                                    headers[CONTENT_LENGTH] = ZERO
+                                end
+                            end
+                        rescue # just in case
+                        end
+
+                        if send_body
+                            write_response(status, headers, body)
+                        else
+                            write_headers(status, headers)
+                            @socket.shutdown if @request.keep_alive == false
+                        end
                     end
                 end
             end
@@ -256,7 +282,7 @@ module SpiderGazelle
         end
 
         def write_headers(status, headers)
-            header = "HTTP/1.1 #{status}\r\n"
+            header = "HTTP/1.1 #{status} #{fetch_code(status)}\r\n"
             headers.each do |key, value|
                 next if key.start_with? RACK
 
@@ -274,6 +300,10 @@ module SpiderGazelle
             @socket.write chunk
         end
 
+        def fetch_code(status)
+            HTTP_STATUS_CODES.fetch(status, &HTTP_STATUS_DEFAULT)
+        end
+
 
         # ------------------------
         # Async response functions:

data/lib/spider-gazelle/spider.rb

@@ -352,12 +352,15 @@ module SpiderGazelle
 
         def log(*args)
             msg = ''
-            if args[0].respond_to? :backtrace
-                msg << "unhandled exception: #{args[0]}\n #{args[0].backtrace}"
+            err = args[-1]
+            if err && err.respond_to?(:backtrace)
+                msg << "unhandled exception: #{err.message} (#{args[0..-2]})"
+                msg << "\n#{err.backtrace.join("\n")}" if err.respond_to?(:backtrace) && err.backtrace
             else
                 msg << "unhandled exception: #{args}"
             end
             @logger.error msg
+            ::Libuv::Q.reject(@web, msg)
         end
     end
 end

data/lib/spider-gazelle/version.rb

@@ -1,3 +1,3 @@
 module SpiderGazelle
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake