raindeer 1.0.2 → 1.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/raindeer/cli.rb +1 -0
- data/lib/raindeer/integrations.rb +4 -0
- data/lib/router/events/receive_event.rb +45 -0
- data/lib/router/events/route_event.rb +8 -6
- data/lib/router/events/wildcard_event.rb +7 -5
- data/lib/router/router.rb +6 -15
- data/lib/router/trie.rb +5 -2
- data/lib/system/formatters/observers_formatter.rbx +1 -1
- data/lib/version.rb +1 -1
- metadata +26 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bc7a714d3e6d3f9f5d3f76f852a3b92ba93fdcffdfc94ada98bfd826a42fc58a
|
|
4
|
+
data.tar.gz: 11474e0489d85e2e97e191a1f1f212c75a22156dd995c90964bb8d4d38180d12
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8bf3a48633689b1553ca2b79c06a2105006f6e6e73c38b7a884ec71623157f0341e729854782e07c8c80767091a5fa8f1037f459d72a05d5dffa140b2a7b9d0c
|
|
7
|
+
data.tar.gz: 5619373c223553a33963fcccba25fc6151f7cd9f079cd286e025b81baaca3877bad7522138ebf642126f813f551519ae62f6e437bd18c721e1714803b0b3b332
|
data/lib/raindeer/cli.rb
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
require_relative '../router/http'
|
|
4
|
+
require_relative '../router/events/receive_event'
|
|
5
|
+
require_relative '../router/events/route_event'
|
|
6
|
+
require_relative '../router/events/wildcard_event'
|
|
4
7
|
|
|
5
8
|
class LowNode
|
|
6
9
|
include Rain::HTTP
|
|
10
|
+
include Rain::Events
|
|
7
11
|
end
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
require 'json'
|
|
4
|
+
require 'uri'
|
|
5
|
+
require_relative 'route_event'
|
|
6
|
+
|
|
7
|
+
module Rain
|
|
8
|
+
module Events
|
|
9
|
+
# A RouteEvent for a request with a body, which calls the "receive" action.
|
|
10
|
+
class ReceiveEvent < RouteEvent
|
|
11
|
+
attr_reader :request
|
|
12
|
+
|
|
13
|
+
def initialize(route:, request:, actions: [], params: Hash | nil)
|
|
14
|
+
super(route:, actions:, params:)
|
|
15
|
+
|
|
16
|
+
@request = request
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
# The body is a stream that can only be read once, so it's buffered on the request for every event of the request to read.
|
|
20
|
+
def raw_body
|
|
21
|
+
return @raw_body if @raw_body
|
|
22
|
+
return @raw_body = '' unless @request.body
|
|
23
|
+
|
|
24
|
+
@request.body = @request.body.finish
|
|
25
|
+
@request.body.rewind
|
|
26
|
+
@raw_body = @request.body.join || ''
|
|
27
|
+
end
|
|
28
|
+
|
|
29
|
+
# Form and JSON bodies become a hash with symbol keys, other bodies are the raw string.
|
|
30
|
+
def body
|
|
31
|
+
return @body if defined?(@body) # Also keeps a falsy body like JSON "null".
|
|
32
|
+
|
|
33
|
+
@body = case media_type
|
|
34
|
+
when 'application/x-www-form-urlencoded' then URI.decode_www_form(raw_body).to_h.transform_keys(&:to_sym)
|
|
35
|
+
when 'application/json' then JSON.parse(raw_body, symbolize_names: true)
|
|
36
|
+
else raw_body
|
|
37
|
+
end
|
|
38
|
+
end
|
|
39
|
+
|
|
40
|
+
private
|
|
41
|
+
|
|
42
|
+
def media_type = @request.headers['content-type']&.split(';')&.first&.strip
|
|
43
|
+
end
|
|
44
|
+
end
|
|
45
|
+
end
|
|
@@ -3,14 +3,16 @@
|
|
|
3
3
|
require 'lowevent'
|
|
4
4
|
|
|
5
5
|
module Rain
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
module Events
|
|
7
|
+
class RouteEvent < ::LowEvent
|
|
8
|
+
attr_reader :route, :params
|
|
8
9
|
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
def initialize(route:, actions: [], params: Hash | nil)
|
|
11
|
+
super(key: route.path, actions:)
|
|
11
12
|
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
@route = route
|
|
14
|
+
@params = params
|
|
15
|
+
end
|
|
14
16
|
end
|
|
15
17
|
end
|
|
16
18
|
end
|
|
@@ -3,13 +3,15 @@
|
|
|
3
3
|
require 'lowevent'
|
|
4
4
|
|
|
5
5
|
module Rain
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
module Events
|
|
7
|
+
class WildcardEvent < ::LowEvent
|
|
8
|
+
attr_reader :route, :params
|
|
8
9
|
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
def initialize(key:, route:, action: :render)
|
|
11
|
+
super(key:, action:)
|
|
11
12
|
|
|
12
|
-
|
|
13
|
+
@route = route
|
|
14
|
+
end
|
|
13
15
|
end
|
|
14
16
|
end
|
|
15
17
|
end
|
data/lib/router/router.rb
CHANGED
|
@@ -41,20 +41,11 @@ module Rain
|
|
|
41
41
|
@current_level.pop
|
|
42
42
|
end
|
|
43
43
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
route(POST => path, &block)
|
|
50
|
-
end
|
|
51
|
-
|
|
52
|
-
def update(path, &block)
|
|
53
|
-
route(UPDATE => path, &block)
|
|
54
|
-
end
|
|
55
|
-
|
|
56
|
-
def delete(path, &block)
|
|
57
|
-
route(DELETE => path, &block)
|
|
44
|
+
# A route for each HTTP verb, like "put '/path'".
|
|
45
|
+
VERBS.each do |verb|
|
|
46
|
+
define_method(verb) do |path, &block|
|
|
47
|
+
route(verb => path, &block)
|
|
48
|
+
end
|
|
58
49
|
end
|
|
59
50
|
|
|
60
51
|
def request(event: RequestEvent)
|
|
@@ -91,7 +82,7 @@ module Rain
|
|
|
91
82
|
|
|
92
83
|
if @routes['/*']
|
|
93
84
|
route = Route.new(path: request.path, verbs: @routes['/*'].verbs)
|
|
94
|
-
wildcard_event = WildcardEvent.take(key: '/*', action: :render, route:)
|
|
85
|
+
wildcard_event = Events::WildcardEvent.take(key: '/*', action: :render, route:)
|
|
95
86
|
return wildcard_event if wildcard_event
|
|
96
87
|
end
|
|
97
88
|
|
data/lib/router/trie.rb
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
require_relative 'events/receive_event'
|
|
3
4
|
require_relative 'events/route_event'
|
|
4
5
|
require_relative 'route'
|
|
5
6
|
require_relative 'trie_node'
|
|
@@ -71,12 +72,14 @@ module Rain
|
|
|
71
72
|
# Mid nodes side_effect, end nodes render.
|
|
72
73
|
def route_event(next_index:, params:, request:, route:)
|
|
73
74
|
action = request.path[next_index].nil? ? :render : :side_effect
|
|
74
|
-
action = receive if action == :render && request.body
|
|
75
|
+
action = :receive if action == :render && request.body
|
|
75
76
|
|
|
76
77
|
actions = [action]
|
|
77
78
|
actions << request.method.downcase.to_sym unless action == :side_effect
|
|
78
79
|
|
|
79
|
-
|
|
80
|
+
return Events::ReceiveEvent.new(actions:, route:, params:, request:) if action == :receive
|
|
81
|
+
|
|
82
|
+
Events::RouteEvent.new(actions:, route:, params:)
|
|
80
83
|
end
|
|
81
84
|
|
|
82
85
|
def capture_param(current_index:, path:)
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
class ObserversFormatter < LowNode
|
|
4
4
|
def initialize(event:, observer_key:)
|
|
5
5
|
# TODO: What's the best way to do this? An "if:" at the template layer? A decorator at the node layer?
|
|
6
|
-
if observer_key.to_s == 'Rain::RouteEvent'
|
|
6
|
+
if observer_key.to_s == 'Rain::Events::RouteEvent'
|
|
7
7
|
routes_count = Providers['rain.router'].routes.count
|
|
8
8
|
@observers = ["#{routes_count} routes"]
|
|
9
9
|
else
|
data/lib/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: raindeer
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- maedi
|
|
@@ -72,6 +72,9 @@ dependencies:
|
|
|
72
72
|
- - "~>"
|
|
73
73
|
- !ruby/object:Gem::Version
|
|
74
74
|
version: '0.7'
|
|
75
|
+
- - ">="
|
|
76
|
+
- !ruby/object:Gem::Version
|
|
77
|
+
version: 0.7.1
|
|
75
78
|
type: :runtime
|
|
76
79
|
prerelease: false
|
|
77
80
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -79,6 +82,9 @@ dependencies:
|
|
|
79
82
|
- - "~>"
|
|
80
83
|
- !ruby/object:Gem::Version
|
|
81
84
|
version: '0.7'
|
|
85
|
+
- - ">="
|
|
86
|
+
- !ruby/object:Gem::Version
|
|
87
|
+
version: 0.7.1
|
|
82
88
|
- !ruby/object:Gem::Dependency
|
|
83
89
|
name: lowdata
|
|
84
90
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -114,6 +120,9 @@ dependencies:
|
|
|
114
120
|
- - "~>"
|
|
115
121
|
- !ruby/object:Gem::Version
|
|
116
122
|
version: '0.8'
|
|
123
|
+
- - ">="
|
|
124
|
+
- !ruby/object:Gem::Version
|
|
125
|
+
version: 0.8.4
|
|
117
126
|
type: :runtime
|
|
118
127
|
prerelease: false
|
|
119
128
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -121,6 +130,9 @@ dependencies:
|
|
|
121
130
|
- - "~>"
|
|
122
131
|
- !ruby/object:Gem::Version
|
|
123
132
|
version: '0.8'
|
|
133
|
+
- - ">="
|
|
134
|
+
- !ruby/object:Gem::Version
|
|
135
|
+
version: 0.8.4
|
|
124
136
|
- !ruby/object:Gem::Dependency
|
|
125
137
|
name: lownode
|
|
126
138
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -128,6 +140,9 @@ dependencies:
|
|
|
128
140
|
- - "~>"
|
|
129
141
|
- !ruby/object:Gem::Version
|
|
130
142
|
version: '0.5'
|
|
143
|
+
- - ">="
|
|
144
|
+
- !ruby/object:Gem::Version
|
|
145
|
+
version: 0.5.6
|
|
131
146
|
type: :runtime
|
|
132
147
|
prerelease: false
|
|
133
148
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -135,6 +150,9 @@ dependencies:
|
|
|
135
150
|
- - "~>"
|
|
136
151
|
- !ruby/object:Gem::Version
|
|
137
152
|
version: '0.5'
|
|
153
|
+
- - ">="
|
|
154
|
+
- !ruby/object:Gem::Version
|
|
155
|
+
version: 0.5.6
|
|
138
156
|
- !ruby/object:Gem::Dependency
|
|
139
157
|
name: lowtype
|
|
140
158
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -184,6 +202,9 @@ dependencies:
|
|
|
184
202
|
- - "~>"
|
|
185
203
|
- !ruby/object:Gem::Version
|
|
186
204
|
version: '1.0'
|
|
205
|
+
- - ">="
|
|
206
|
+
- !ruby/object:Gem::Version
|
|
207
|
+
version: 1.1.0
|
|
187
208
|
type: :runtime
|
|
188
209
|
prerelease: false
|
|
189
210
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -191,6 +212,9 @@ dependencies:
|
|
|
191
212
|
- - "~>"
|
|
192
213
|
- !ruby/object:Gem::Version
|
|
193
214
|
version: '1.0'
|
|
215
|
+
- - ">="
|
|
216
|
+
- !ruby/object:Gem::Version
|
|
217
|
+
version: 1.1.0
|
|
194
218
|
- !ruby/object:Gem::Dependency
|
|
195
219
|
name: plugs
|
|
196
220
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -273,6 +297,7 @@ files:
|
|
|
273
297
|
- lib/raindeer/cli.rb
|
|
274
298
|
- lib/raindeer/integrations.rb
|
|
275
299
|
- lib/raindeer/raindeer.rb
|
|
300
|
+
- lib/router/events/receive_event.rb
|
|
276
301
|
- lib/router/events/route_event.rb
|
|
277
302
|
- lib/router/events/wildcard_event.rb
|
|
278
303
|
- lib/router/http.rb
|