hushed 0.0.7 → 0.0.8

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.
Files changed (5) hide show
  1. data/lib/hushed/version.rb +1 -1
  2. data/lib/hushed/web.rb +8 -1
  3. data/web/views/blackboards.erb +1 -1
  4. data/web/views/layout.erb +16 -16
  5. metadata +3 -3
data/lib/hushed/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Hushed
2
- VERSION = "0.0.7"
2
+ VERSION = "0.0.8"
3
3
  end
data/lib/hushed/web.rb CHANGED
@@ -17,7 +17,10 @@ module Hushed
17
17
 
18
18
  helpers do
19
19
  def client
20
- Hushed::Client.new (request.params['QUIET_CREDS'] || YAML::load(File.read(ENV['QUIET'])))
20
+ credentials = request.params['QUIET_CREDS']
21
+ credentials ||= request.env['params'] && request.env['params']['QUIET_CREDS']
22
+ credentials ||= YAML::load(File.read(ENV['QUIET']))
23
+ Hushed::Client.new credentials
21
24
  end
22
25
 
23
26
  def humanize_duration(seconds)
@@ -31,6 +34,10 @@ module Hushed
31
34
  "%g seconds" % seconds
32
35
  end
33
36
  end
37
+
38
+ def root_path
39
+ "#{env['SCRIPT_NAME']}/"
40
+ end
34
41
  end
35
42
 
36
43
  get "/" do
data/web/views/blackboards.erb CHANGED
@@ -7,7 +7,7 @@
7
7
  </thead>
8
8
  <% @blackboards.each do |blackboard| %>
9
9
  <tr>
10
- <td><a href="/blackboards/<%= blackboard.name %>"><%= blackboard.name %></a></td>
10
+ <td><a href="<%= root_path %>blackboards/<%= blackboard.name %>"><%= blackboard.name %></a></td>
11
11
  <td><%= blackboard.objects.count %></td>
12
12
  </tr>
13
13
  <% end %>
data/web/views/layout.erb CHANGED
@@ -6,12 +6,12 @@
6
6
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
7
 
8
8
  <!-- Loading Bootstrap -->
9
- <link href="/bootstrap/css/bootstrap.css" rel="stylesheet">
9
+ <link href="<%= root_path %>bootstrap/css/bootstrap.css" rel="stylesheet">
10
10
 
11
11
  <!-- Loading Flat UI -->
12
- <link href="/stylesheets/flat-ui.css" rel="stylesheet">
12
+ <link href="<%= root_path %>stylesheets/flat-ui.css" rel="stylesheet">
13
13
 
14
- <link rel="shortcut icon" href="images/favicon.ico">
14
+ <link rel="shortcut icon" href="<%= root_path %>images/favicon.ico">
15
15
 
16
16
  <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
17
17
  <!--[if lt IE 9]>
@@ -22,7 +22,7 @@
22
22
  <div class="container">
23
23
  <div class="navbar navbar-fixed-top">
24
24
  <div class="navbar-inner">
25
- <a href="/" class="brand">Hushed Web</a></li>
25
+ <a href="<%= root_path %>" class="brand">Hushed Web</a></li>
26
26
  </div>
27
27
  </div>
28
28
  <div style="margin-top: 100px;">
@@ -31,18 +31,18 @@
31
31
  </div>
32
32
 
33
33
  <!-- Load JS here for greater good =============================-->
34
- <script src="/javascripts/jquery-1.8.3.min.js"></script>
35
- <script src="/javascripts/jquery-ui-1.10.3.custom.min.js"></script>
36
- <script src="/javascripts/jquery.ui.touch-punch.min.js"></script>
37
- <script src="/javascripts/bootstrap.min.js"></script>
38
- <script src="/javascripts/bootstrap-select.js"></script>
39
- <script src="/javascripts/bootstrap-switch.js"></script>
40
- <script src="/javascripts/flatui-checkbox.js"></script>
41
- <script src="/javascripts/flatui-radio.js"></script>
42
- <script src="/javascripts/jquery.tagsinput.js"></script>
43
- <script src="/javascripts/jquery.placeholder.js"></script>
44
- <script src="/javascripts/jquery.stacktable.js"></script>
34
+ <script src="<%= root_path %>javascripts/jquery-1.8.3.min.js"></script>
35
+ <script src="<%= root_path %>javascripts/jquery-ui-1.10.3.custom.min.js"></script>
36
+ <script src="<%= root_path %>javascripts/jquery.ui.touch-punch.min.js"></script>
37
+ <script src="<%= root_path %>javascripts/bootstrap.min.js"></script>
38
+ <script src="<%= root_path %>javascripts/bootstrap-select.js"></script>
39
+ <script src="<%= root_path %>javascripts/bootstrap-switch.js"></script>
40
+ <script src="<%= root_path %>javascripts/flatui-checkbox.js"></script>
41
+ <script src="<%= root_path %>javascripts/flatui-radio.js"></script>
42
+ <script src="<%= root_path %>javascripts/jquery.tagsinput.js"></script>
43
+ <script src="<%= root_path %>javascripts/jquery.placeholder.js"></script>
44
+ <script src="<%= root_path %>javascripts/jquery.stacktable.js"></script>
45
45
  <script src="http://vjs.zencdn.net/c/video.js"></script>
46
- <script src="/javascripts/application.js"></script>
46
+ <script src="<%= root_path %>javascripts/application.js"></script>
47
47
  </body>
48
48
  </html>
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: hushed
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.0.7
5
+ version: 0.0.8
6
6
  platform: ruby
7
7
  authors:
8
8
  - Chris Saunders
@@ -272,7 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
272
272
  - !ruby/object:Gem::Version
273
273
  segments:
274
274
  - 0
275
- hash: 4146006481198685440
275
+ hash: 2857053908953534475
276
276
  version: '0'
277
277
  none: false
278
278
  required_rubygems_version: !ruby/object:Gem::Requirement
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
281
281
  - !ruby/object:Gem::Version
282
282
  segments:
283
283
  - 0
284
- hash: 4146006481198685440
284
+ hash: 2857053908953534475
285
285
  version: '0'
286
286
  none: false
287
287
  requirements: []