Skip to content

Commit bd21054

Browse files
committed
Remove the base class for middleware and allow raw HTTP handlers
1 parent 469801b commit bd21054

File tree

4 files changed

+746
-19
lines changed

4 files changed

+746
-19
lines changed

src/grip/handlers/pipeline.cr

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module Grip
22
module Handlers
33
class Pipeline < Base
4-
CACHED_PIPES = {} of Array(Symbol) => Array(Middleware::Base)
4+
CACHED_PIPES = {} of Array(Symbol) => Array(::HTTP::Handler)
55

6-
property pipeline : Hash(Symbol, Array(Middleware::Base))
6+
property pipeline : Hash(Symbol, Array(::HTTP::Handler))
77
property http_handler : ::HTTP::Handler?
88
property websocket_handler : ::HTTP::Handler?
99

1010
def initialize(
1111
@http_handler = nil,
1212
@websocket_handler = nil,
1313
)
14-
@pipeline = Hash(Symbol, Array(Middleware::Base)).new
14+
@pipeline = Hash(Symbol, Array(HTTP::Handler)).new
1515
end
1616

1717
def add_route(
@@ -44,19 +44,19 @@ module Grip
4444
@http_handler = http_handler
4545
@websocket_handler = websocket_handler
4646

47-
handlers = @pipeline[valve] ||= Array(Middleware::Base).new
47+
handlers = @pipeline[valve] ||= Array(::HTTP::Handler).new
4848
handlers << pipe
4949
handlers[-2]?.try &.next = pipe
5050
end
5151

52-
def get(valve : Symbol) : Array(Middleware::Base)?
52+
def get(valve : Symbol) : Array(::HTTP::Handler)?
5353
@pipeline[valve]?
5454
end
5555

56-
def get(valves : Array(Symbol)) : Array(Middleware::Base)
56+
def get(valves : Array(Symbol)) : Array(::HTTP::Handler)
5757
return CACHED_PIPES[valves] if CACHED_PIPES.has_key?(valves)
5858

59-
pipes = Array(Middleware::Base).new
59+
pipes = Array(::HTTP::Handler).new
6060

6161
valves.each do |valve|
6262
@pipeline[valve]?.try &.each { |pipe| pipes << pipe }

src/grip/middleware/base.cr

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/grip/middleware/client_ip.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Grip
22
module Middleware
33
class ClientIP
4-
include Base
4+
include HTTP::Handler
55

66
def initialize(header : String = "X-Forwarded-For")
77
@headers = [header]

0 commit comments

Comments
 (0)