rack-app 6.4.1 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0771df20b65be7fc4d6c2cc099de9028a4f498ea
-  data.tar.gz: 20ff855cf97e95e33493f65ef1215817eb41ba8b
+  metadata.gz: 4dacbebee0057a6e067e03df4561ebee1c67a79f
+  data.tar.gz: 926b31b67476555c9a6f6fe63f6c8df8dcf1f9a7
 SHA512:
-  metadata.gz: 3f5cdb427df01340331803e29457bd5e3367fad748d69430631bb9e8bb02408b59a4ff0b06edc2ec4d49b7723024df0bedd77a16b3eb83513c8eff2ac3173887
-  data.tar.gz: f47ce2c81275c04caf07ee0f76077695eabbf6455f21653a662e973e22049e2d45a3ed253b5f331a643d67df35fa13225de620f40695dccff2a99f96461d22c0
+  metadata.gz: 99a4ec962ab5be3ba58699ec0bcd1d7224d934caf338bba4722ecab41dc28530135606addce7ddb1cb30ccff66d4f1888ba1379a881e065cbb936d353c7084f8
+  data.tar.gz: 9652a7ce5a607bb8ccd6d06d9b965bdc4f0ff40d7f438ad149ada21f1fac427d2674ce03e821454e5ca6871cf080cb6ff0fe05838307705eb518e2657d2e1ad1

data/VERSION

@@ -1 +1 @@
-6.4.1
+6.5.0

data/lib/rack/app/endpoint.rb

@@ -6,6 +6,7 @@ class Rack::App::Endpoint
 
   require "rack/app/endpoint/config"
   require "rack/app/endpoint/builder"
+  require "rack/app/endpoint/catcher"
   require "rack/app/endpoint/executor"
 
   attr_reader :config

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

@@ -28,10 +28,14 @@ class Rack::App::Endpoint::Builder
       builder_block.call(builder)
     end
     builder.use(Rack::App::Middlewares::Configuration, @config)
+
     apply_hook_middlewares(builder)
   end
 
   def apply_hook_middlewares(builder)
+    if @config.app_class.before.length + @config.app_class.after.length > 0
+      builder.use(Rack::App::Endpoint::Catcher, @config)
+    end
     @config.app_class.before.each do |before_block|
       builder.use(Rack::App::Middlewares::Hooks::Before, before_block)
     end

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

@@ -0,0 +1,37 @@
+class Rack::App::Endpoint::Catcher
+
+  def initialize(app, endpoint_properties)
+    @app = app
+    @endpoint_properties = endpoint_properties
+  end
+
+  def call(env)
+    handle_rack_response do
+      handle_response_body(env) do
+        @app.call(env)
+      end
+    end
+  end
+
+  protected
+
+  def handle_rack_response
+    catch(:rack_response) { return yield }.finish
+  end
+
+  def handle_response_body(env)
+    body = catch(:response_body) { return yield }
+    request_handler = env[Rack::App::Constants::ENV::HANDLER]
+    set_response_body(request_handler, body)
+    throw :rack_response, request_handler.response
+  end
+
+  EXTNAME = ::Rack::App::Constants::ENV::EXTNAME
+
+  def set_response_body(handler, response_body)
+    extname = handler.request.env[EXTNAME]
+    handler.response.headers.merge!(@endpoint_properties.serializer.response_headers_for(extname))
+    handler.response.write(@endpoint_properties.serializer.serialize(extname, response_body))
+  end
+
+end

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

@@ -2,34 +2,22 @@ class Rack::App::Endpoint::Executor
 
   def initialize(endpoint_properties)
     @endpoint_properties = endpoint_properties
+    @catcher = Rack::App::Endpoint::Catcher.new(proc{ |env| execute(env) }, endpoint_properties)
   end
 
   def call(env)
-    return catch(:rack_response){ execute(env) }.finish
+    @catcher.call(env)
   end
 
   protected
 
   def execute(env)
-    request_handler = env[Rack::App::Constants::ENV::HANDLER]
-    set_response_body(request_handler, get_response_body(request_handler))
-    return request_handler.response
+    resp = evaluate_value(env[Rack::App::Constants::ENV::HANDLER])
+    throw type(resp), resp
   end
 
-  def get_response_body(request_handler)
-    catch :response_body do
-      evaluated_value = evaluate_value(request_handler)
-
-      evaluated_value
-    end
-  end
-
-  EXTNAME = ::Rack::App::Constants::ENV::EXTNAME
-
-  def set_response_body(handler, response_body)
-    extname = handler.request.env[EXTNAME]
-    handler.response.headers.merge!(@endpoint_properties.serializer.response_headers_for(extname))
-    handler.response.write(@endpoint_properties.serializer.serialize(extname, response_body))
+  def type(resp)
+    resp.is_a?(Rack::Response) ? :rack_response : :response_body
   end
 
   def evaluate_value(request_handler)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.5.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - lib/rack/app/constants/http_status_codes.rb
 - lib/rack/app/endpoint.rb
 - lib/rack/app/endpoint/builder.rb
+- lib/rack/app/endpoint/catcher.rb
 - lib/rack/app/endpoint/config.rb
 - lib/rack/app/endpoint/executor.rb
 - lib/rack/app/error_handler.rb