rack-app 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54ad60f95e02d3a3d1cdd12869c110ebd8936c20
-  data.tar.gz: 7acb5847ee8f8a9b12939572a316e0bd2e543b62
+  metadata.gz: 61fb1f8227a3ca529ee22caefa0d7bc8e5b46993
+  data.tar.gz: 3c7bdc49faff05050c558f98d22919cf14f1ae22
 SHA512:
-  metadata.gz: 434df103635f1c9376d83c6736652337156e685ded88130846b62371beac56a3b9dd620e730e1dbe52c5127985d7247c223a8f515061b9c097dc8625339262cf
-  data.tar.gz: 65712cce379e85a8183799f0d1aa0e37714c4e7e6642dce3005b83336812670afdaecd3f4431376d92f6f6d57d64e014a85ae7cce37a08c50da0c750a64d37c6
+  metadata.gz: f081f2de5494f5b2730a85722bc4eeeb2df25dbd16cae9d9ce01842ed5c085877dfd1b258e68898bf452999c212ea80630f25f75adf34647dc7321e7b9bc0944
+  data.tar.gz: 28684ea25e3c2a78370ebd696622a340a7d0dbb6303f2d051103ea8aa3f1f94f0325c6e8c8c35c2c448fbb055b2a6009aff2a36e8a22359e34c25ebabcef7767

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

data/lib/rack/app.rb

@@ -15,6 +15,7 @@ class Rack::App
   require 'rack/app/endpoint'
   require 'rack/app/extension'
   require 'rack/app/serializer'
+  require 'rack/app/middlewares'
   require 'rack/app/file_server'
   require 'rack/app/error_handler'
   require 'rack/app/endpoint/not_found'

data/lib/rack/app/endpoint.rb

@@ -10,7 +10,6 @@ class Rack::App::Endpoint
     @app_class = properties[:app_class]
     @error_handler = properties[:error_handler] || Rack::App::ErrorHandler.new
     @serializer = properties[:serializer] || Rack::App::Serializer.new
-    @headers = properties[:default_headers] || {}
 
     @middleware = (properties[:middleware] || Rack::Builder.new).dup
     @middleware.run(lambda { |env| self.execute(env) })
@@ -38,9 +37,9 @@ class Rack::App::Endpoint
   def get_response_body(rack_request, rack_response)
 
     request_handler = @app_class.new
-    set_default_headers(rack_response)
     request_handler.request = rack_request
     request_handler.response = rack_response
+
     rack_request.env[::Rack::App::Constants::PATH_PARAMS_MATCHER]= @path_params_matcher.dup
     return @error_handler.execute_with_error_handling_for(request_handler, @endpoint_method_name)
 
@@ -59,12 +58,6 @@ class Rack::App::Endpoint
     response.write(String(@serializer.serialize(result)))
   end
 
-  def set_default_headers(response)
-    @headers.each do |header, value|
-      response.header[header]=value
-    end
-  end
-
   def register_method_to_app_class(proc)
     method_name = ::Rack::App::Utils.uuid
     @app_class.__send__(:define_method, method_name, &proc)

data/lib/rack/app/middlewares.rb

@@ -0,0 +1,3 @@
+module Rack::App::Middlewares
+  require 'rack/app/middlewares/header_setter'
+end

data/lib/rack/app/middlewares/header_setter.rb

@@ -0,0 +1,24 @@
+class Rack::App::Middlewares::HeaderSetter
+
+  def initialize(app, headers)
+    @app = app
+    @headers = headers.freeze
+  end
+
+  def call(env)
+    response = rack_response(@app.call(env))
+
+    @headers.each do |header, value|
+      response.headers[header] ||= value
+    end
+
+    response.finish
+  end
+
+  protected
+
+  def rack_response(raw_response)
+    Rack::Response.new(raw_response[2], raw_response[0], raw_response[1])
+  end
+
+end

data/lib/rack/app/singleton_methods/inheritance.rb

@@ -11,7 +11,6 @@ module Rack::App::SingletonMethods::Inheritance
   def inherited(child)
 
     child.serializer(&serializer.logic)
-    child.headers.merge!(headers)
     child.middlewares.push(*middlewares)
 
     on_inheritance.each do |block|

data/lib/rack/app/singleton_methods/route_handling.rb

@@ -30,7 +30,6 @@ module Rack::App::SingletonMethods::RouteHandling
         :request_method => request_method,
         :request_path => request_path,
 
-        :default_headers => headers,
         :error_handler => error,
         :description => @last_description,
         :serializer => serializer,

data/lib/rack/app/singleton_methods/settings.rb

@@ -19,9 +19,11 @@ module Rack::App::SingletonMethods::Settings
   end
 
   def headers(new_headers=nil)
-    @headers ||= {}
-    @headers.merge!(new_headers) if new_headers.is_a?(Hash)
-    @headers
+    middleware do |b|
+      b.use(Rack::App::Middlewares::HeaderSetter,new_headers)
+    end if new_headers.is_a?(Hash)
+
+    new_headers
   end
 
   def error(*exception_classes, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -106,6 +106,8 @@ files:
 - lib/rack/app/instance_methods/http_control.rb
 - lib/rack/app/instance_methods/payload.rb
 - lib/rack/app/instance_methods/upload.rb
+- lib/rack/app/middlewares.rb
+- lib/rack/app/middlewares/header_setter.rb
 - lib/rack/app/params.rb
 - lib/rack/app/request_configurator.rb
 - lib/rack/app/router.rb