rack-app 8.1.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64e849802e4a5ab4f0ecf95fa4bf5d3e6181eb27d98bd84563e37992cc7b477d
-  data.tar.gz: 360ab75719832c97ef9e52b4db59491181fe031a2aafc86158934256b2833a98
+  metadata.gz: d6895f4a62b9e5714c7f31f100ffdd705dfb3af6d4e73f823b99fca71526602f
+  data.tar.gz: 8377e012c98cc1010ffb9af5cca8ae46d79d9bb4dd8ad80799eb2e02fef2aff9
 SHA512:
-  metadata.gz: 171bcfff77ee8eba3aaa8d3bea901394dd6117cf00d78f8c54b072d58c3ce1e7bc4a4212823866c94539128f2f6190c836c3277fddea1322d11cd0f1f9611181
-  data.tar.gz: 9830e2e3ef4809518e839efc745e7a9452359d0540603ad727b2832ce61e67d678159445bc3da19b13cfc3b1fbb858d0374a97b7883ca145f7ed3cdcfe81ee58
+  metadata.gz: 21c9910e0cea0f738cab34e536cd9c180ef29f611ceaa54cb1909feddb6e0749ad6791bec4ef2a97d17d5da2267d28371773d77e70b4c8c813d79ac776bc836b
+  data.tar.gz: 2ad9151b5b2570acab5b52631ec8298ac48182fc4869075ba30a42f706f666f5580143fb3fbae7332145431cee1d08e2df87538df46337f96ce1699c7a88be83

data/VERSION

@@ -1 +1 @@
-8.1.0
+9.0.0

data/lib/rack/app/constants.rb

@@ -11,17 +11,17 @@ module Rack::App::Constants
   module HTTP
 
     module METHOD
-      ANY     = 'ANY'.freeze
-      GET     = 'GET'.freeze
-      POST    = 'POST'.freeze
-      PUT     = 'PUT'.freeze
-      PATCH   = 'PATCH'.freeze
-      DELETE  = 'DELETE'.freeze
-      HEAD    = 'HEAD'.freeze
+      ANY = 'ANY'.freeze
+      GET = 'GET'.freeze
+      POST = 'POST'.freeze
+      PUT = 'PUT'.freeze
+      PATCH = 'PATCH'.freeze
+      DELETE = 'DELETE'.freeze
+      HEAD = 'HEAD'.freeze
       OPTIONS = 'OPTIONS'.freeze
-      LINK    = 'LINK'.freeze
-      UNLINK  = 'UNLINK'.freeze
-      TRACE   = 'TRACE'.freeze
+      LINK = 'LINK'.freeze
+      UNLINK = 'UNLINK'.freeze
+      TRACE = 'TRACE'.freeze
     end
 
     METHODS = (METHOD.constants - [:ANY]).map(&:to_s).freeze
@@ -40,6 +40,7 @@ module Rack::App::Constants
 
     ROUTER = 'rack-app.router'.freeze
     HANDLER = 'rack-app.handler'.freeze
+    HANDLERS = 'rack-app.handlers'.freeze
     EXTNAME = 'rack-app.extname'.freeze
     SERIALIZER = 'rack-app.serializer'.freeze
     CONTENT_TYPE = 'CONTENT_TYPE'.freeze
@@ -49,7 +50,7 @@ module Rack::App::Constants
 
     MERGED_PARAMS = 'rack-app.params.merged'.freeze
     VALIDATED_PARAMS = 'rack-app.params.validated'.freeze
-    QUERY_STRING_PARAMS =  'rack-app.params.query_string'.freeze
+    QUERY_STRING_PARAMS = 'rack-app.params.query_string'.freeze
     PATH_SEGMENTS_PARAMS = 'rack-app.params.path_segments'.freeze
 
     PAYLOAD_PARSER = 'rack-app.payload.parser'.freeze

data/lib/rack/app/handlers.rb

@@ -0,0 +1,17 @@
+class Rack::App::Handlers < ::Hash
+  attr_reader :env, :request, :response
+
+  def initialize(env, request, response)
+    @env = env
+    @request = request
+    @response = response
+  end
+
+  def get(klass)
+    self[klass] ||= klass.new.tap do |h|
+      h.env = @env
+      h.request = @request
+      h.response = @response
+    end
+  end
+end

data/lib/rack/app/hook.rb

@@ -0,0 +1,14 @@
+class Rack::App::Hook
+
+  attr_accessor :Class, :block
+
+  def initialize(options = {}, &block)
+    self.Class = options[:class] || raise(ArgumentError, "missing :class keyword argument")
+    self.block = block
+  end
+
+  def exec(env)
+    env[Rack::App::Constants::ENV::HANDLERS].get(self.Class).instance_exec(&self.block)
+  end
+
+end

data/lib/rack/app/instance_methods/core.rb

@@ -1,6 +1,10 @@
 module Rack::App::InstanceMethods::Core
 
-  attr_writer :request, :response
+  attr_writer :env, :request, :response
+
+  def env
+    @env || raise("env object is not set for #{self.class}")
+  end
 
   def request
     @request || raise("request object is not set for #{self.class}")

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

@@ -1,6 +1,7 @@
 require "rack/builder"
 require "rack/request"
 require "rack/response"
+
 class Rack::App::Middlewares::Configuration
 
   def initialize(app, config)
@@ -11,10 +12,10 @@ class Rack::App::Middlewares::Configuration
   end
 
   def call(env)
-    env[::Rack::App::Constants::ENV::HANDLER]= handler(env)
-    env[::Rack::App::Constants::ENV::SERIALIZER]= @serializer
-    env[::Rack::App::Constants::ENV::PAYLOAD_PARSER]= @payload_parser
-    env[::Rack::App::Constants::ENV::PAYLOAD_GETTER]= lambda do
+    setup_handler(env)
+    env[::Rack::App::Constants::ENV::SERIALIZER] = @serializer
+    env[::Rack::App::Constants::ENV::PAYLOAD_PARSER] = @payload_parser
+    env[::Rack::App::Constants::ENV::PAYLOAD_GETTER] = lambda do
       env[::Rack::App::Constants::ENV::PARSED_PAYLOAD] ||= env[::Rack::App::Constants::ENV::PAYLOAD_PARSER].parse_env(env)
     end
     @app.call(env)
@@ -22,11 +23,17 @@ class Rack::App::Middlewares::Configuration
 
   protected
 
-  def handler(env)
-    new_handler = @handler_class.new
-    new_handler.request = ::Rack::Request.new(env)
-    new_handler.response = ::Rack::Response.new
-    new_handler
+  def setup_handler(env)
+    request = ::Rack::Request.new(env)
+    response = ::Rack::Response.new
+    h = @handler_class.new
+    h.env = env
+    h.request = request
+    h.response = response
+    handlers = ::Rack::App::Handlers.new(env, request, response)
+    handlers[@handler_class] = h
+    env[::Rack::App::Constants::ENV::HANDLERS] = handlers
+    env[::Rack::App::Constants::ENV::HANDLER] = handlers[@handler_class]
   end
 
   def extname(env)

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

@@ -1,8 +1,8 @@
 class Rack::App::Middlewares::Hooks::Base
 
-  def initialize(app, hook_block)
+  def initialize(app, hook)
     @app = app
-    @hook_block = hook_block
+    @hook = hook
   end
 
   def call(env)
@@ -13,7 +13,7 @@ class Rack::App::Middlewares::Hooks::Base
 
   def execute_hook(env)
     catch :rack_response do
-      env[Rack::App::Constants::ENV::HANDLER].instance_exec(&@hook_block)
+      @hook.exec(env)
       nil
     end
   end

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

@@ -2,13 +2,17 @@ module Rack::App::SingletonMethods::Hooks
 
   def before(&block)
     @before_hooks ||= []
-    @before_hooks << block unless block.nil?
+    unless block.nil?
+      @before_hooks << ::Rack::App::Hook.new(class: self, &block)
+    end
     @before_hooks
   end
 
   def after(&block)
     @after_hooks ||= []
-    @after_hooks << block unless block.nil?
+    unless block.nil?
+      @after_hooks << ::Rack::App::Hook.new(class: self, &block)
+    end
     @after_hooks
   end
 

data/lib/rack/app.rb

@@ -10,11 +10,13 @@ class Rack::App
   require 'rack/app/utils'
   require 'rack/app/cli'
   require 'rack/app/test'
+  require 'rack/app/hook'
   require 'rack/app/block'
   require 'rack/app/logger'
   require 'rack/app/params'
-  require 'rack/app/payload'
   require 'rack/app/router'
+  require 'rack/app/payload'
+  require 'rack/app/handlers'
   require 'rack/app/endpoint'
   require 'rack/app/streamer'
   require 'rack/app/extension'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-18 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,8 @@ files:
 - lib/rack/app/error_handler.rb
 - lib/rack/app/extension.rb
 - lib/rack/app/file_server.rb
+- lib/rack/app/handlers.rb
+- lib/rack/app/hook.rb
 - lib/rack/app/instance_methods.rb
 - lib/rack/app/instance_methods/core.rb
 - lib/rack/app/instance_methods/http_status.rb