restpack-web 0.2.11 → 0.2.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.
- data/lib/restpack-web/app.rb +2 -2
- data/lib/restpack-web/context.rb +5 -7
- data/lib/restpack-web/version.rb +1 -1
- metadata +1 -1
data/lib/restpack-web/app.rb
CHANGED
|
@@ -17,14 +17,14 @@ module RestPack
|
|
|
17
17
|
|
|
18
18
|
def call(env)
|
|
19
19
|
env[:restpack] ||= {}
|
|
20
|
-
|
|
20
|
+
|
|
21
21
|
begin #TODO: GJ: cache should handle errors gracefully
|
|
22
22
|
request = Rack::Request.new(env)
|
|
23
23
|
channel = @core_cache.get_channel(request.host)
|
|
24
24
|
domain = channel.get_domain_by_host(request.host)
|
|
25
25
|
|
|
26
26
|
env[:restpack][:request] = request
|
|
27
|
-
env[:restpack][:host] = request.host
|
|
27
|
+
env[:restpack][:host] = request.host
|
|
28
28
|
env[:restpack][:channel] = channel
|
|
29
29
|
env[:restpack][:application] = domain.application
|
|
30
30
|
env[:restpack][:domain] = domain
|
data/lib/restpack-web/context.rb
CHANGED
|
@@ -23,7 +23,7 @@ module RestPack
|
|
|
23
23
|
def is_authenticated?
|
|
24
24
|
!@user.nil?
|
|
25
25
|
end
|
|
26
|
-
|
|
26
|
+
|
|
27
27
|
def get_service(name)
|
|
28
28
|
@services.find { |s| s[:name] == name.to_s }
|
|
29
29
|
end
|
|
@@ -49,7 +49,7 @@ module RestPack
|
|
|
49
49
|
next_url ||= "http://#{home_domain}/"
|
|
50
50
|
"http://#{auth_domain}/auth/#{provider}?next=#{next_url}"
|
|
51
51
|
end
|
|
52
|
-
|
|
52
|
+
|
|
53
53
|
def debug_info
|
|
54
54
|
user_debug_info = ""
|
|
55
55
|
if is_authenticated?
|
|
@@ -58,10 +58,10 @@ module RestPack
|
|
|
58
58
|
* **nickname** : #{@user['nickname']}
|
|
59
59
|
* **location** : #{@user['location']}
|
|
60
60
|
* **description** : #{@user['description']}
|
|
61
|
-
* **image** : #{@user['
|
|
61
|
+
* **image** : #{@user['image']} 
|
|
62
62
|
}
|
|
63
63
|
end
|
|
64
|
-
|
|
64
|
+
|
|
65
65
|
%{
|
|
66
66
|
### RestPack Context:
|
|
67
67
|
|
|
@@ -91,7 +91,6 @@ module RestPack
|
|
|
91
91
|
|
|
92
92
|
* **keys**: #{@configurations.map { |c| c.key }.join(', ')}
|
|
93
93
|
|
|
94
|
-
|
|
95
94
|
#### Authentication:
|
|
96
95
|
|
|
97
96
|
* **logout**: #{logout_url}
|
|
@@ -101,5 +100,4 @@ module RestPack
|
|
|
101
100
|
end
|
|
102
101
|
end
|
|
103
102
|
end
|
|
104
|
-
end
|
|
105
|
-
|
|
103
|
+
end
|
data/lib/restpack-web/version.rb
CHANGED