rack-app 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41c94a79f13a4ee69c813a267eb6a637a955ccbd
-  data.tar.gz: 48abde6b600e6a968b2c6dad2c72b821a7844bec
+  metadata.gz: 9db5bf57a1cc7db597b8f23aee6228a8d82412ef
+  data.tar.gz: d815b86a8348006082e616e1feccc6a2f4a90d2c
 SHA512:
-  metadata.gz: 7f1f75dbcda528fd377cb77f61eac7f5bf26246ffa9b0e7ba20534eaa5517ee4dce7a3bc0c790285381fbf90319b013c724b11e0f165539b5b0ac0fef9c3cc60
-  data.tar.gz: a187dda8b666fd342430facf104f4aeac8a124a5aa9253c3540d3b1964f48dc60a9b5c07095862a2e71641429d4fe45ad8b83ed5a510cc1eb34734e0fbc372f9
+  metadata.gz: da155363a4645977acaa3c49a6d5f5689919618b5ba4a4b25307ff6a8fa1405f3b731605dbd6e152087fdc5ad0a187a7dab7a6bb83f3e7966deba18b360b504f
+  data.tar.gz: 31e97114d7a842b112eb98e1f4e66e149a9b4b8484d118b6087e9ee3c26c916450473ab6bd6c47ad0bf2f212a24487b23a436f217cd7a3a1cdd6079d7aa7ddf4

data/VERSION

@@ -1 +1 @@
-0.16.0
+0.17.0

data/lib/rack/app.rb

@@ -64,11 +64,11 @@ class Rack::App
     def root(endpoint_path)
       options '/' do
         endpoint = self.class.router.fetch_endpoint('OPTIONS', Rack::App::Utils.normalize_path(endpoint_path))
-        endpoint.execute(request.env)
+        endpoint.get_response_body(request,response)
       end
       get '/' do
         endpoint = self.class.router.fetch_endpoint('GET', Rack::App::Utils.normalize_path(endpoint_path))
-        endpoint.execute(request.env)
+        endpoint.get_response_body(request,response)
       end
     end
 

data/lib/rack/app/endpoint.rb

@@ -2,6 +2,8 @@ class Rack::App::Endpoint
 
   attr_reader :properties
 
+  LAST_MODIFIED_HEADER = "Last-Modified".freeze
+
   def initialize(properties)
     @properties = properties
 
@@ -19,19 +21,20 @@ class Rack::App::Endpoint
     request = Rack::Request.new(request_env)
     response = Rack::Response.new
 
-    add_default_headers(response)
-    request_handler = @api_class.new
+    set_response_body(response, get_response_body(request, response))
 
-    request_handler.request = request
-    request_handler.response = response
-    request.env['rack.app.path_params_matcher']= @path_params_matcher.dup
+    return response.finish
 
-    call_return = @error_handler.execute_with_error_handling_for(request_handler, @endpoint_method_name)
+  end
 
-    return call_return if is_a_rack_response_finish?(call_return)
-    add_response_body_if_missing(call_return, response)
+  def get_response_body(rack_request, rack_response)
 
-    return response.finish
+    request_handler = @api_class.new
+    set_default_headers(rack_response)
+    request_handler.request = rack_request
+    request_handler.response = rack_response
+    rack_request.env['rack.app.path_params_matcher']= @path_params_matcher.dup
+    return @error_handler.execute_with_error_handling_for(request_handler, @endpoint_method_name)
 
   end
 
@@ -41,18 +44,20 @@ class Rack::App::Endpoint
 
   protected
 
-  def add_response_body_if_missing(call_return, response)
-    response.write(String(@serializer.serialize(call_return))) if response.body.empty?
-  end
+  def set_response_body(response, result)
+    if result.is_a?(::Rack::App::File::Streamer)
+      response.length += result.length
+      response.headers[LAST_MODIFIED_HEADER]= result.mtime
+      response.body = result
 
-  def is_a_rack_response_finish?(call_return)
-    call_return.is_a?(Array) and
-        call_return.length == 3 and
-        call_return[0].is_a?(Integer) and
-        call_return[1].is_a?(Hash)
+    else
+      response.write(String(@serializer.serialize(result)))
+
+    end
+    nil
   end
 
-  def add_default_headers(response)
+  def set_default_headers(response)
     @headers.each do |header, value|
       response.header[header]=value
     end

data/lib/rack/app/endpoint/not_found.rb

@@ -2,8 +2,7 @@ app_class = Class.new(Rack::App)
 not_found_properties = {
     :user_defined_logic => lambda {
       response.status= 404
-      response.write '404 Not Found'
-      response.finish
+      return '404 Not Found'
     },
     :default_headers => {},
     :request_method => 'GET',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler