raindeer 1.0.10 → 1.0.12
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/raindeer.rb +0 -11
- data/lib/router/events/cookies.rb +5 -6
- data/lib/router/events/query.rb +33 -0
- data/lib/router/events/route_event.rb +2 -0
- data/lib/router/events/wildcard_event.rb +2 -0
- data/lib/router/router.rb +1 -4
- data/lib/router/trie.rb +2 -2
- data/lib/version.rb +1 -1
- metadata +14 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 77e92b2be47edb924c90e7f739604137c136dbf5e49cd4ac4c7429b7d816ec45
|
|
4
|
+
data.tar.gz: cf2a15661f4a4a4ae49e54e2e402a3aa9980ae31b5b0b9e1315be3e60149bfcd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 43368b2577dd4730f1a844e96c7b28fdd530a337dadba4117385e46206ceac18514c8c212308c708c57d122bccbc879b62dbccb49277e8355c7ba51d00389ae1
|
|
7
|
+
data.tar.gz: f762f71c3d8fad84ba62abfde4cbc0785ff38bec518911eaf9f4b16d1797176671e08e1d0c1ae5812c4e81862b2305ab8a1006fa53745632b5c30a47602ccd2b
|
data/lib/raindeer/raindeer.rb
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require_relative '../router/events/cookies'
|
|
4
|
-
|
|
5
3
|
module Raindeer
|
|
6
4
|
class << self
|
|
7
5
|
def router(&block)
|
|
@@ -11,14 +9,5 @@ module Raindeer
|
|
|
11
9
|
def pages
|
|
12
10
|
Providers['rain.pages']
|
|
13
11
|
end
|
|
14
|
-
|
|
15
|
-
# The request being responded to, for nodes that aren't given its event, like a layout.
|
|
16
|
-
def request
|
|
17
|
-
Fiber[:raindeer_request]
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
def cookies
|
|
21
|
-
Rain::Events::Cookies.parse(request)
|
|
22
|
-
end
|
|
23
12
|
end
|
|
24
13
|
end
|
|
@@ -1,21 +1,20 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
require 'lowevent'
|
|
3
4
|
require 'uri'
|
|
4
5
|
|
|
5
6
|
module Rain
|
|
6
7
|
module Events
|
|
7
|
-
# The cookies a request sent, by name, for the events made from it.
|
|
8
|
+
# The cookies a request sent, by name, for the events made from it, like a RouteEvent or a child node's RenderEvent.
|
|
8
9
|
module Cookies
|
|
9
|
-
def
|
|
10
|
+
def cookies
|
|
10
11
|
Array(request&.headers&.[]('cookie')).flat_map { |header| header.split(';') }.to_h do |cookie|
|
|
11
12
|
name, value = cookie.strip.split('=', 2)
|
|
12
13
|
[name, URI.decode_www_form_component(value.to_s)]
|
|
13
14
|
end
|
|
14
15
|
end
|
|
15
|
-
|
|
16
|
-
def cookies
|
|
17
|
-
@cookies ||= Cookies.parse(request)
|
|
18
|
-
end
|
|
19
16
|
end
|
|
17
|
+
|
|
18
|
+
Low::Events::RenderEvent.include(Cookies)
|
|
20
19
|
end
|
|
21
20
|
end
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
require 'lowevent'
|
|
4
|
+
require 'uri'
|
|
5
|
+
|
|
6
|
+
module Rain
|
|
7
|
+
module Events
|
|
8
|
+
# A request's query string, like "q=rye" in "/search?q=rye", as a hash with symbol keys, for the events made from it.
|
|
9
|
+
module Query
|
|
10
|
+
class << self
|
|
11
|
+
# A request's path without its query string, which routes match on.
|
|
12
|
+
def path(request)
|
|
13
|
+
request.path.split('?', 2).first
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
def parse(request)
|
|
17
|
+
string = request&.path.to_s.split('?', 2)[1]
|
|
18
|
+
return {} unless string
|
|
19
|
+
|
|
20
|
+
URI.decode_www_form(string).to_h.transform_keys(&:to_sym)
|
|
21
|
+
rescue ArgumentError
|
|
22
|
+
{}
|
|
23
|
+
end
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
def query
|
|
27
|
+
Query.parse(request)
|
|
28
|
+
end
|
|
29
|
+
end
|
|
30
|
+
|
|
31
|
+
Low::Events::RenderEvent.include(Query)
|
|
32
|
+
end
|
|
33
|
+
end
|
data/lib/router/router.rb
CHANGED
|
@@ -53,10 +53,7 @@ module Rain
|
|
|
53
53
|
locale = Rain::Translations.negotiate(accept_language:)
|
|
54
54
|
|
|
55
55
|
response_event = Antlers::Translations.with_locale(locale) do
|
|
56
|
-
Fiber[:raindeer_request] = event.request
|
|
57
56
|
respond(request: event.request)
|
|
58
|
-
ensure
|
|
59
|
-
Fiber[:raindeer_request] = nil
|
|
60
57
|
end
|
|
61
58
|
language_headers(response: response_event.response, locale:) if response_event.is_a?(ResponseEvent)
|
|
62
59
|
|
|
@@ -84,7 +81,7 @@ module Rain
|
|
|
84
81
|
return response_event if response_event
|
|
85
82
|
|
|
86
83
|
if @routes['/*']
|
|
87
|
-
route = Route.new(path:
|
|
84
|
+
route = Route.new(path: Events::Query.path(request), verbs: @routes['/*'].verbs)
|
|
88
85
|
wildcard_event = Events::WildcardEvent.take(key: '/*', action: :render, route:, request:)
|
|
89
86
|
return wildcard_event if wildcard_event
|
|
90
87
|
end
|
data/lib/router/trie.rb
CHANGED
|
@@ -41,7 +41,7 @@ module Rain
|
|
|
41
41
|
end
|
|
42
42
|
|
|
43
43
|
def match(request:, current_node: @root_node, current_index: 0, params: {})
|
|
44
|
-
path =
|
|
44
|
+
path = Events::Query.path(request)
|
|
45
45
|
|
|
46
46
|
return [] if (key = path[current_index]).nil?
|
|
47
47
|
|
|
@@ -71,7 +71,7 @@ module Rain
|
|
|
71
71
|
|
|
72
72
|
# Mid nodes side_effect, end nodes render.
|
|
73
73
|
def route_event(next_index:, params:, request:, route:)
|
|
74
|
-
action =
|
|
74
|
+
action = Events::Query.path(request)[next_index].nil? ? :render : :side_effect
|
|
75
75
|
action = :receive if action == :render && request.body
|
|
76
76
|
|
|
77
77
|
actions = [action]
|
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.12
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- maedi
|
|
@@ -112,6 +112,9 @@ dependencies:
|
|
|
112
112
|
- - "~>"
|
|
113
113
|
- !ruby/object:Gem::Version
|
|
114
114
|
version: '0.8'
|
|
115
|
+
- - ">="
|
|
116
|
+
- !ruby/object:Gem::Version
|
|
117
|
+
version: 0.8.3
|
|
115
118
|
type: :runtime
|
|
116
119
|
prerelease: false
|
|
117
120
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -119,6 +122,9 @@ dependencies:
|
|
|
119
122
|
- - "~>"
|
|
120
123
|
- !ruby/object:Gem::Version
|
|
121
124
|
version: '0.8'
|
|
125
|
+
- - ">="
|
|
126
|
+
- !ruby/object:Gem::Version
|
|
127
|
+
version: 0.8.3
|
|
122
128
|
- !ruby/object:Gem::Dependency
|
|
123
129
|
name: lowloop
|
|
124
130
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -180,6 +186,9 @@ dependencies:
|
|
|
180
186
|
- - "~>"
|
|
181
187
|
- !ruby/object:Gem::Version
|
|
182
188
|
version: '1.5'
|
|
189
|
+
- - ">="
|
|
190
|
+
- !ruby/object:Gem::Version
|
|
191
|
+
version: 1.5.2
|
|
183
192
|
type: :runtime
|
|
184
193
|
prerelease: false
|
|
185
194
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -187,6 +196,9 @@ dependencies:
|
|
|
187
196
|
- - "~>"
|
|
188
197
|
- !ruby/object:Gem::Version
|
|
189
198
|
version: '1.5'
|
|
199
|
+
- - ">="
|
|
200
|
+
- !ruby/object:Gem::Version
|
|
201
|
+
version: 1.5.2
|
|
190
202
|
- !ruby/object:Gem::Dependency
|
|
191
203
|
name: expressions
|
|
192
204
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -305,6 +317,7 @@ files:
|
|
|
305
317
|
- lib/raindeer/integrations.rb
|
|
306
318
|
- lib/raindeer/raindeer.rb
|
|
307
319
|
- lib/router/events/cookies.rb
|
|
320
|
+
- lib/router/events/query.rb
|
|
308
321
|
- lib/router/events/receive_event.rb
|
|
309
322
|
- lib/router/events/route_event.rb
|
|
310
323
|
- lib/router/events/wildcard_event.rb
|