wire-framework 0.1.4.17 → 0.1.4.18
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/app/render/document.rb +1 -1
- data/lib/app/render/page.rb +2 -2
- data/lib/app/render/partial.rb +4 -1
- data/lib/closet/context.rb +2 -1
- data/lib/wire.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a3ae35b7f9ef6da5e08ef6975751d23702f4c799
|
4
|
+
data.tar.gz: 2e1c07b4af561c7efbfd223c71a0d5ebddd65131
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0892a82e2c7404f48dafce67868c7b81e70f9cb2869dd6b6cfdc67f9bc2074562cb9710b143cacdc81ae85ecb21fa3b47a188d89277961cd7ef705db1368a010
|
7
|
+
data.tar.gz: f6499d70ab3a5d6bcf466d82a1f70d4eaca1f19746cb95a183bf6a622c135c6d657381c959f9abc52d1a1db9c22afe6b1fd8e435dd74eec48bed540754c69cc1
|
data/lib/app/render/document.rb
CHANGED
@@ -13,7 +13,7 @@ module Render
|
|
13
13
|
# @return [Response] a Rack Response triplet, or status code
|
14
14
|
def self.do_read(actions, context, specific)
|
15
15
|
response = forward(specific, context)
|
16
|
-
mime = response[1][
|
16
|
+
mime = response[1]['Content-Type']
|
17
17
|
renderer = $renderers[mime]
|
18
18
|
if renderer
|
19
19
|
template = $templates[renderer]
|
data/lib/app/render/page.rb
CHANGED
@@ -27,9 +27,9 @@ module Render
|
|
27
27
|
go_ahead = (context.uri[2] and !context.uri[2].empty?)
|
28
28
|
uri += "/#{context.uri[2]}"
|
29
29
|
end
|
30
|
-
temp =
|
30
|
+
temp = []
|
31
31
|
if go_ahead
|
32
|
-
temp = RL.request(:get, uri)
|
32
|
+
temp = RL.request(:get, uri, {remote_user: context.user})
|
33
33
|
end
|
34
34
|
hash[k] = (temp[0] == 200) ? temp[2] : nil
|
35
35
|
end
|
data/lib/app/render/partial.rb
CHANGED
@@ -42,7 +42,10 @@ module Render
|
|
42
42
|
hash = { actions: actions, resource: resource, mime: mime, response: body }
|
43
43
|
if context.resource[:sources]
|
44
44
|
context.resource[:sources].each do |k, v|
|
45
|
-
hash[k] = RL.request(:get,
|
45
|
+
hash[k] = RL.request(:get,
|
46
|
+
"http://#{context.app[:remote_host]}/#{v}",
|
47
|
+
{remote_user: context.user}
|
48
|
+
)[2]
|
46
49
|
end
|
47
50
|
end
|
48
51
|
mime = 'text/html'
|
data/lib/closet/context.rb
CHANGED
@@ -58,9 +58,10 @@ module Wire
|
|
58
58
|
# @return [Hash] the updated environment
|
59
59
|
def update_session(env)
|
60
60
|
user = env['HTTP_REMOTE_USER']
|
61
|
-
unless user.nil? or user.eql? 'nobody' or user.eql? '(null)'
|
61
|
+
unless user.nil? or user.empty? or user.eql? 'nobody' or user.eql? '(null)'
|
62
62
|
env['rack.session']['user'] = user
|
63
63
|
end
|
64
|
+
env['REMOTE_USER'] = env['rack.session']['user'] ? env['rack.session']['user'] : nil
|
64
65
|
env
|
65
66
|
end
|
66
67
|
|
data/lib/wire.rb
CHANGED