rack-cargo 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74705fb4f2b4e71ae109218d020b4a656ecee186
-  data.tar.gz: 53678530b07f570861049feed0169459d528a9ae
+  metadata.gz: 18247c076dabaec48022379801e52ce2c0f42b7d
+  data.tar.gz: ac28a8c8840c795e602269072b6047969b092b86
 SHA512:
-  metadata.gz: d39972558dd1a23a65c1f676ff0156861126ce4520a7532d34a0412356bfb75fbcb6788ce6d8520988887279a63ea9189beac0fdb5efce04f6094964a354b227
-  data.tar.gz: 5fb134a797e14a55506dcac06f0a8bf6782859100e23a5fb34e0bda3d5e9767b8b6105feb87f7a08f2a663a13fc64a3052cd005e4bf539bdc03ed1afe32f3a76
+  metadata.gz: 7b0c706fe67a05b6bc27555d3387c42cae772fa35c8f1f3fa62b5d43cc788dc3ce15c2bb9bd1a8d8ca9f1be8b7da031065e95c55968df3d54558a340f9fc4da0
+  data.tar.gz: 7ee5d82be0ef27a7cf6bf5946d6cd2f823c47c4d656ab1debcfe9da043be415a2600962b2f8f24334500aae936d2c25c7a63babbf82f9d373b6ce6e41a2887e5

data/README.md

@@ -40,7 +40,8 @@ Initialize the middleware:
 
 ```ruby
 Rack::Cargo.configure do |config|
-    config.batch_path = '/batch'
+  config.batch_path = '/batch'
+  config.timeout = 1
 end
 ```
 
@@ -154,6 +155,20 @@ end
 
 Now your processors will be included in the pipeline.
 
+### Individual request timeout
+
+Individual requests in batch will be dropped after execution exceeds configured timeout. Default timeout is 1 second.
+
+Specify timeout for single request in configuration:
+
+```ruby
+Rack::Cargo.configure do |config|
+  config.timeout = 1
+end
+```
+
+Timed out requests' response is with status 504 (Gateway timeout) and with empty headers, body.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/rack/cargo.rb

@@ -12,6 +12,7 @@ module Rack
     ENV_PATH = "PATH_INFO"
     ENV_INPUT = "rack.input"
     ENV_METHOD = "REQUEST_METHOD"
+    ENV_QUERY_STRING = "QUERY_STRING"
 
     REQUEST_NAME = "name"
     REQUEST_PATH = "path"
@@ -19,6 +20,7 @@ module Rack
     REQUEST_BODY = "body"
 
     RESPONSE_NAME = "name"
+    RESPONSE_PATH = "path"
     RESPONSE_STATUS = "status"
     RESPONSE_HEADERS = "headers"
     RESPONSE_BODY = "body"

data/lib/rack/cargo/configuration.rb

@@ -5,6 +5,7 @@ module Rack
     class Configuration
       attr_accessor :batch_path
       attr_accessor :processors
+      attr_accessor :timeout
 
       def initialize
         self.batch_path = "/batch"
@@ -14,6 +15,7 @@ module Rack
           RequestExecutor,
           ResponseBuilder
         ]
+        self.timeout = 1 # seconds
       end
     end
   end

data/lib/rack/cargo/request_env_builder.rb

@@ -7,9 +7,13 @@ module Rack
     module RequestEnvBuilder
       def self.call(request, state)
         request_env = state.fetch(:env).deep_dup
-        request_env[ENV_PATH] = request[REQUEST_PATH]
+
+        path, query_string = request[REQUEST_PATH].split("?", 2)
+        request_env[ENV_PATH] = path
+        request_env[ENV_QUERY_STRING] = query_string || ""
         request_env[ENV_METHOD] = request[REQUEST_METHOD]
         request_env[ENV_INPUT] = StringIO.new(request[REQUEST_BODY].to_json)
+
         state[:request_env] = request_env
       end
     end

data/lib/rack/cargo/request_executor.rb

@@ -3,18 +3,33 @@
 module Rack
   module Cargo
     module RequestExecutor
-      def self.call(_request, state)
-        app = state.fetch(:app)
-        request_env = state.fetch(:request_env)
+      class << self
+        def call(_request, state)
+          app = state.fetch(:app)
+          request_env = state.fetch(:request_env)
 
-        status, headers, body = app.call(request_env)
-        body.close if body.respond_to?(:close)
+          status, headers, body = with_timeout(Rack::Cargo.config.timeout) do
+            app.call(request_env)
+          end
 
-        state[:app_response] = {
-          status: status,
-          headers: headers,
-          body: body
-        }
+          body.close if body.respond_to?(:close)
+
+          state[:app_response] = {
+            status: status,
+            headers: headers,
+            body: body
+          }
+        end
+
+        def with_timeout(seconds, &block)
+          Timeout.timeout(seconds, &block)
+        rescue Timeout::Error
+          timeout_response
+        end
+
+        def timeout_response
+          [504, {}, ["{}"]]
+        end
       end
     end
   end

data/lib/rack/cargo/response_builder.rb

@@ -7,19 +7,31 @@ module Rack
         def call(request, state)
           app_response = state.fetch(:app_response)
 
-          name = request.fetch("name", autogenerated_name)
+          name = request.fetch(REQUEST_NAME, autogenerated_name)
 
           state[:response] = {
             RESPONSE_NAME => name,
+            RESPONSE_PATH => request.fetch(REQUEST_PATH),
             RESPONSE_STATUS => app_response.fetch(:status),
             RESPONSE_HEADERS => app_response.fetch(:headers),
-            RESPONSE_BODY => JSON.parse(app_response.fetch(:body).join)
+            RESPONSE_BODY => response_body(app_response.fetch(:body))
           }
         end
 
+        private
+
         def autogenerated_name
           "unnamed_#{SecureRandom.hex(6)}"
         end
+
+        # Transform body object to String according to
+        # Rack specification requirements.
+        def response_body(app_response_body)
+          response_string = ""
+          app_response_body.each { |piece| response_string += piece }
+
+          JSON.parse(response_string)
+        end
       end
     end
   end

data/lib/rack/cargo/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   module Cargo
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-cargo
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Murdho
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler