rack-app 5.0.0.rc2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b130d9458099d27fab690cf3db1597ada7cac19
-  data.tar.gz: b05e1b11630efd3ced90361372634d121db73c25
+  metadata.gz: 85eef183f233ed422353b4658cc710fcddd6f3fa
+  data.tar.gz: c64e1dea7180304029ce7515fdf96fdfa2339d60
 SHA512:
-  metadata.gz: d431d736219cce600153c1357dccb58742ac39babdaafadb3a0377954b55a56d5cca796e7c0dcc26dcfa105c4c21003c54b853a71bb3f78ef37e9983600fee3c
-  data.tar.gz: a8da83f4a90063bb491be7803615d05f795ccea24676700ba9b47073199730e4c6658a3868c59eb3b77508627a2db04e55ab25b45352a8b6280e62067acb2a70
+  metadata.gz: c63f77fa26cf15b1a5312afdb6b199fd51d3d5fc79cc5f3bdd85728ce45002a5c8eee7de6ebe110506cf3941c0f7c6573485ef22e10a3d8b550cd31a193391ae
+  data.tar.gz: 282c092d984e8202bf4ce0d3cc81202033fa732822032ff804d8ef6241bc01acbfba817ecdb4358ff4210fbc101a8a478b7838fe30eff9e39de00ace2f7340a6

data/VERSION

@@ -1 +1 @@
-5.0.0.rc2
+5.0.0

data/lib/rack/app/constants.rb

@@ -21,6 +21,7 @@ module Rack::App::Constants
   end
 
   module ENV
+    REQUEST_HANDLER = 'rack-app.handler'
     PARSED_PARAMS = 'rack-app.parsed_params'
     VALIDATED_PARAMS = 'rack-app.validated_params'
     ORIGINAL_PATH_INFO = 'rack-app.original_path_info'.freeze

data/lib/rack/app/endpoint.rb

@@ -1,26 +1,25 @@
 require "rack/builder"
 class Rack::App::Endpoint
   require "rack/app/endpoint/properties"
+  require "rack/app/endpoint/executor"
 
   def properties
     @properties.to_hash
   end
 
-  LAST_MODIFIED_HEADER = "Last-Modified".freeze
-
   def initialize(properties)
     @properties = Rack::App::Endpoint::Properties.new(properties)
-    @endpoint_method_name = register_method_to_app_class(properties[:user_defined_logic])
   end
 
   def call(env)
     to_app.call(env)
-  end 
+  end
 
   def to_app
     builder = Rack::Builder.new
     apply_middleware_build_blocks(builder)
-    builder.run(lambda { |env| self.call_without_middlewares(env) })
+    @properties.endpoint_method_name
+    builder.run(Rack::App::Endpoint::Executor.new(@properties))
     builder.to_app
   end
 
@@ -30,47 +29,21 @@ class Rack::App::Endpoint
     builder_blocks.each do |builder_block|
       builder_block.call(builder)
     end
+    builder.use(Rack::App::Middlewares::Configuration, @properties.app_class)
+    apply_hook_middlewares(builder)
   end
 
-  def builder_blocks
-    @properties.app_class.middlewares + @properties.middleware_builders_blocks
-  end
-
-  def call_without_middlewares(env)
-    request = Rack::Request.new(env)
-    response = Rack::Response.new
-    return catch(:rack_response){ execute(request, response) }.finish
-  end
-
-  def execute(request,response)
-    request_handler = @properties.app_class.new
-    request_handler.request = request
-    request_handler.response = response
-    set_response_body(response, get_response_body(request_handler))
-    return response
-  end
-
-  def get_response_body(request_handler)
-    catch :response_body do
-      evaluated_value = evaluate_value(request_handler)
-
-      evaluated_value
+  def apply_hook_middlewares(builder)
+    @properties.app_class.before.each do |before_block|
+      builder.use(Rack::App::Middlewares::Hooks::Before, before_block)
     end
-  end
-
-  def set_response_body(response, response_body)
-    response.write(String(@properties.serializer.serialize(response_body)))
-  end
-
-  def evaluate_value(request_handler)
-    @properties.error_handler.execute_with_error_handling_for(request_handler) do
-      request_handler.__send__(@endpoint_method_name)
+    @properties.app_class.after.each do |after_block|
+      builder.use(Rack::App::Middlewares::Hooks::After, after_block)
     end
   end
 
-  def register_method_to_app_class(proc)
-    method_name = '__' + ::Rack::App::Utils.uuid
-    @properties.app_class.__send__(:define_method, method_name, &proc)
-    return method_name
+  def builder_blocks
+    @properties.app_class.middlewares + @properties.middleware_builders_blocks
   end
+
 end

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

@@ -0,0 +1,38 @@
+class Rack::App::Endpoint::Executor
+
+  def initialize(endpoint_properties)
+    @endpoint_properties = endpoint_properties
+  end
+
+  def call(env)
+    return catch(:rack_response){ execute(env) }.finish
+  end
+
+  protected
+
+  def execute(env)
+    request_handler = env[Rack::App::Constants::ENV::REQUEST_HANDLER]
+    set_response_body(request_handler.response, get_response_body(request_handler))
+    return request_handler.response
+  end
+
+  def get_response_body(request_handler)
+    catch :response_body do
+      evaluated_value = evaluate_value(request_handler)
+
+      evaluated_value
+    end
+  end
+
+  def set_response_body(response, response_body)
+    response.write(String(@endpoint_properties.serializer.serialize(response_body)))
+  end
+
+  def evaluate_value(request_handler)
+    @endpoint_properties.error_handler.execute_with_error_handling_for(request_handler) do
+      request_handler.__send__(@endpoint_properties.endpoint_method_name)
+    end
+  end
+
+
+end

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

@@ -1,6 +1,6 @@
 class Rack::App::Endpoint::Properties
 
-  def to_hash 
+  def to_hash
     @raw
   end
 
@@ -20,10 +20,24 @@ class Rack::App::Endpoint::Properties
     @raw[:middleware_builders_blocks] ||= []
   end
 
+  def endpoint_method_name
+    @raw[:method_name] ||= register_method_to_app_class
+  end
+
   protected
 
   def initialize(raw)
     @raw = raw
   end
 
+  def register_method_to_app_class
+    method_name = '__' + ::Rack::App::Utils.uuid
+    app_class.__send__(:define_method, method_name, &logic_block)
+    return method_name
+  end
+
+  def logic_block
+    @raw[:user_defined_logic]
+  end
+
 end

data/lib/rack/app/middlewares.rb

@@ -1,5 +1,6 @@
 module Rack::App::Middlewares
+  require 'rack/app/middlewares/configuration'
   require 'rack/app/middlewares/header_setter'
-  require 'rack/app/middlewares/method_override'
   require 'rack/app/middlewares/params'
+  require 'rack/app/middlewares/hooks'
 end

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

@@ -0,0 +1,24 @@
+require "rack/request"
+require "rack/response"
+class Rack::App::Middlewares::Configuration
+
+  def initialize(app, handler_class)
+    @handler_class = handler_class
+    @app = app
+  end
+
+  def call(env)
+    env[Rack::App::Constants::ENV::REQUEST_HANDLER]= handler(env)
+    @app.call(env)
+  end
+
+  protected
+
+  def handler(env)
+    new_handler = @handler_class.new
+    new_handler.request = ::Rack::Request.new(env)
+    new_handler.response = ::Rack::Response.new
+    new_handler
+  end
+
+end

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

@@ -0,0 +1,4 @@
+module Rack::App::Middlewares::Hooks
+  require "rack/app/middlewares/hooks/before"
+  require "rack/app/middlewares/hooks/after"
+end

data/lib/rack/app/middlewares/hooks/after.rb

@@ -0,0 +1,14 @@
+class Rack::App::Middlewares::Hooks::After
+
+  def initialize(app, hook_block)
+    @app = app
+    @hook_block = hook_block
+  end
+
+  def call(env)
+    response = @app.call(env)
+    env[Rack::App::Constants::ENV::REQUEST_HANDLER].instance_exec(&@hook_block)
+    return response
+  end
+
+end

data/lib/rack/app/middlewares/hooks/before.rb

@@ -0,0 +1,13 @@
+class Rack::App::Middlewares::Hooks::Before
+
+  def initialize(app, hook_block)
+    @app = app
+    @hook_block = hook_block
+  end
+
+  def call(env)
+    env[Rack::App::Constants::ENV::REQUEST_HANDLER].instance_exec(&@hook_block)
+    @app.call(env)
+  end
+
+end

data/lib/rack/app/singleton_methods.rb

@@ -9,6 +9,7 @@ module Rack::App::SingletonMethods
   require 'rack/app/singleton_methods/route_handling'
   require 'rack/app/singleton_methods/settings'
   require 'rack/app/singleton_methods/extensions'
+  require 'rack/app/singleton_methods/hooks'
 
   include Rack::App::SingletonMethods::HttpMethods
   include Rack::App::SingletonMethods::Inheritance
@@ -19,5 +20,6 @@ module Rack::App::SingletonMethods
   include Rack::App::SingletonMethods::RouteHandling
   include Rack::App::SingletonMethods::Settings
   include Rack::App::SingletonMethods::Extensions
+  include Rack::App::SingletonMethods::Hooks
 
 end

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

@@ -0,0 +1,15 @@
+module Rack::App::SingletonMethods::Hooks
+
+  def before(&block)
+    @before_hooks ||= []
+    @before_hooks << block unless block.nil?
+    @before_hooks
+  end
+
+  def after(&block)
+    @after_hooks ||= []
+    @after_hooks << block unless block.nil?
+    @after_hooks
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc2
+  version: 5.0.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -106,6 +106,7 @@ files:
 - lib/rack/app/cli/runner.rb
 - lib/rack/app/constants.rb
 - lib/rack/app/endpoint.rb
+- lib/rack/app/endpoint/executor.rb
 - lib/rack/app/endpoint/properties.rb
 - lib/rack/app/error_handler.rb
 - lib/rack/app/extension.rb
@@ -116,8 +117,11 @@ files:
 - lib/rack/app/instance_methods/payload.rb
 - lib/rack/app/instance_methods/serve_file.rb
 - lib/rack/app/middlewares.rb
+- lib/rack/app/middlewares/configuration.rb
 - lib/rack/app/middlewares/header_setter.rb
-- lib/rack/app/middlewares/method_override.rb
+- lib/rack/app/middlewares/hooks.rb
+- lib/rack/app/middlewares/hooks/after.rb
+- lib/rack/app/middlewares/hooks/before.rb
 - lib/rack/app/middlewares/params.rb
 - lib/rack/app/middlewares/params/definition.rb
 - lib/rack/app/middlewares/params/definition/options.rb
@@ -135,6 +139,7 @@ files:
 - lib/rack/app/serializer.rb
 - lib/rack/app/singleton_methods.rb
 - lib/rack/app/singleton_methods/extensions.rb
+- lib/rack/app/singleton_methods/hooks.rb
 - lib/rack/app/singleton_methods/http_methods.rb
 - lib/rack/app/singleton_methods/inheritance.rb
 - lib/rack/app/singleton_methods/middleware.rb
@@ -178,9 +183,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

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

@@ -1,55 +0,0 @@
-class Rack::App::Middlewares::MethodOverride
-
-  ALLOWED_METHODS = %w[GET POST].freeze
-  METHOD_OVERRIDE_PARAM_KEY = "_method".freeze
-  HTTP_METHOD_OVERRIDE_HEADER = "HTTP_X_HTTP_METHOD_OVERRIDE".freeze
-
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    if affected_request?(env)
-      try_override(env)
-    end
-
-    @app.call(env)
-  end
-
-  protected
-
-  def try_override(env)
-    method = method_override(env)
-    if valid_https_method?(method)
-      set_request_method(method, env)
-    end
-  end
-
-  def set_request_method(method, env)
-    env[Rack::App::Constants::ENV::METHODOVERRIDE_ORIGINAL_METHOD] = env[Rack::REQUEST_METHOD]
-    env[Rack::REQUEST_METHOD] = method
-  end
-
-  def valid_https_method?(method)
-    Rack::App::Constants::HTTP::METHODS.include?(method)
-  end
-
-  def affected_request?(env)
-    ALLOWED_METHODS.include?(env[Rack::REQUEST_METHOD])
-  end
-
-  def method_override(env)
-    req = Rack::Request.new(env)
-    method = env[HTTP_METHOD_OVERRIDE_HEADER] ||
-              method_override_param(req,:POST) ||
-                method_override_param(req,:GET)
-
-    method.to_s.upcase
-  end
-
-  def method_override_param(req, http_method)
-    req.__send__(http_method)[METHOD_OVERRIDE_PARAM_KEY]
-  rescue Rack::Utils::InvalidParameterError, Rack::Utils::ParameterTypeError
-  end
-
-end