spider-gazelle 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89774225b2801a3f2556563940da21588a6fef70
-  data.tar.gz: 441d840391e7ccb87d98b4bd2830b80a2ed6b1e6
+  metadata.gz: be341884962cab440eacc49473a1fe8727e74023
+  data.tar.gz: fac733a36868410a4733d2720faa79fb1435d3db
 SHA512:
-  metadata.gz: 96c3c3b76bf21d2756db7e9b51a50f4125ed26a8b60f12ba8e789b0e73aff65ccdd0a933254485bb600f340ce82b42f9bc8c324deb27eec29a1f14002c762712
-  data.tar.gz: 1208f6382502b44b2f02099fd527441d0e923100c7c26801fd5582a48fb53c698d25672e7b85f4f95ddd159ca7c29d7570523bf514b389a64fdbf137855d75b4
+  metadata.gz: edf7132a30603414e03d3fca0399851b02bd94dcedb6895ca6f30ca1323901e79ef163ca336b80f521aab52eb705b2e7e15214dd1f297d8a265d88c573668e73
+  data.tar.gz: e87a60598ea47211402366ca3c6d8fce2bdcb161998720ea7e03f17f311cd22fb3422005bcfd93bc2a45cb9168b3408efc8c752b9d6f6f8b0ce93f99305d4be4

data/lib/spider-gazelle/gazelle.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rack"            # Ruby webserver abstraction
+require 'rack' # Ruby webserver abstraction
 require 'spider-gazelle/gazelle/app_store'
 require 'spider-gazelle/gazelle/http1'
 
@@ -11,8 +11,6 @@ require "spider-gazelle/upgrades/websocket"
 
 module SpiderGazelle
     class Gazelle
-        SPACE = ' '
-
         def initialize(thread, type)
             raise ArgumentError, "type must be one of #{MODES}" unless MODES.include?(type)
             

data/lib/spider-gazelle/gazelle/http1.rb

@@ -246,15 +246,31 @@ module SpiderGazelle
 
                     # If a file, stream the body in a non-blocking fashion
                     if body.respond_to? :to_path
-                        file = @thread.file body.to_path, File::RDONLY
+                        begin
+                            file = @thread.file body.to_path, File::RDONLY, wait: true
+
+                            file.catch do |err|
+                                @logger.warn "Error reading file: #{err}"
+
+                                if data_written
+                                    file.close
+                                    @socket.shutdown
+                                else
+                                    send_internal_error
+                                end
+                            end
+
+                            # Request has completed - send the next one
+                            file.finally do
+                                send_next_response
+                            end
 
-                        # Send the body in parallel without blocking the next request in dev
-                        # Also if this is a head request we still want the body closed
-                        body.close if body.respond_to?(:close)
-                        data_written = false
+                            # Send the body in parallel without blocking the next request in dev
+                            # Also if this is a head request we still want the body closed
+                            body.close if body.respond_to?(:close)
+                            data_written = false
 
-                        file.progress do
-                            statprom = file.stat
+                            statprom = file.stat wait: false
                             statprom.then do |stats|
                                 #etag = ::Digest::MD5.hexdigest "#{stats[:st_mtim][:tv_sec]}#{body.to_path}"
                                 #if etag == request.env[HTTP_ETAG]
@@ -278,7 +294,7 @@ module SpiderGazelle
 
                                 if send_body
                                     # File is open and available for reading
-                                    promise = file.send_file(@socket, type)
+                                    promise = file.send_file(@socket, using: type)
                                     promise.then do
                                         file.close
                                         @socket.shutdown if request.keep_alive == false
@@ -298,22 +314,9 @@ module SpiderGazelle
                                 file.close
                                 send_internal_error
                             end
-                        end
-
-                        file.catch do |err|
+                        rescue => err
                             @logger.warn "Error reading file: #{err}"
-
-                            if data_written
-                                file.close
-                                @socket.shutdown
-                            else
-                                send_internal_error
-                            end
-                        end
-
-                        # Request has completed - send the next one
-                        file.finally do
-                            send_next_response
+                            send_internal_error
                         end
                     else
                         # Optimize the response

data/lib/spider-gazelle/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module SpiderGazelle
-    VERSION = '3.0.3'
+    VERSION = '3.0.4'
     EXEC_NAME = 'sg'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-parser
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A fast, parallel and concurrent web server for ruby