hushed 0.0.7 → 0.0.8

data/lib/hushed/version.rb

@@ -1,3 +1,3 @@
 module Hushed
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/hushed/web.rb

@@ -17,7 +17,10 @@ module Hushed
 
     helpers do
       def client
-        Hushed::Client.new (request.params['QUIET_CREDS'] || YAML::load(File.read(ENV['QUIET'])))
+        credentials = request.params['QUIET_CREDS']
+        credentials ||= request.env['params'] && request.env['params']['QUIET_CREDS']
+        credentials ||= YAML::load(File.read(ENV['QUIET']))
+        Hushed::Client.new credentials
       end
 
       def humanize_duration(seconds)
@@ -31,6 +34,10 @@ module Hushed
           "%g seconds" % seconds
         end
       end
+
+      def root_path
+        "#{env['SCRIPT_NAME']}/"
+      end
     end
 
     get "/" do

data/web/views/blackboards.erb

@@ -7,7 +7,7 @@
   </thead>
   <% @blackboards.each do |blackboard| %>
     <tr>
-      <td><a href="/blackboards/<%= blackboard.name %>"><%= blackboard.name %></a></td>
+      <td><a href="<%= root_path %>blackboards/<%= blackboard.name %>"><%= blackboard.name %></a></td>
       <td><%= blackboard.objects.count %></td>
     </tr>
   <% end %>

data/web/views/layout.erb

@@ -6,12 +6,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <!-- Loading Bootstrap -->
-    <link href="/bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="<%= root_path %>bootstrap/css/bootstrap.css" rel="stylesheet">
 
     <!-- Loading Flat UI -->
-    <link href="/stylesheets/flat-ui.css" rel="stylesheet">
+    <link href="<%= root_path %>stylesheets/flat-ui.css" rel="stylesheet">
 
-    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="shortcut icon" href="<%= root_path %>images/favicon.ico">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
     <!--[if lt IE 9]>
@@ -22,7 +22,7 @@
     <div class="container">
         <div class="navbar navbar-fixed-top">
             <div class="navbar-inner">
-                <a href="/" class="brand">Hushed Web</a></li>
+                <a href="<%= root_path %>" class="brand">Hushed Web</a></li>
             </div>
         </div>
         <div style="margin-top: 100px;">
@@ -31,18 +31,18 @@
     </div>
     
     <!-- Load JS here for greater good =============================-->
-    <script src="/javascripts/jquery-1.8.3.min.js"></script>
-    <script src="/javascripts/jquery-ui-1.10.3.custom.min.js"></script>
-    <script src="/javascripts/jquery.ui.touch-punch.min.js"></script>
-    <script src="/javascripts/bootstrap.min.js"></script>
-    <script src="/javascripts/bootstrap-select.js"></script>
-    <script src="/javascripts/bootstrap-switch.js"></script>
-    <script src="/javascripts/flatui-checkbox.js"></script>
-    <script src="/javascripts/flatui-radio.js"></script>
-    <script src="/javascripts/jquery.tagsinput.js"></script>
-    <script src="/javascripts/jquery.placeholder.js"></script>
-    <script src="/javascripts/jquery.stacktable.js"></script>
+    <script src="<%= root_path %>javascripts/jquery-1.8.3.min.js"></script>
+    <script src="<%= root_path %>javascripts/jquery-ui-1.10.3.custom.min.js"></script>
+    <script src="<%= root_path %>javascripts/jquery.ui.touch-punch.min.js"></script>
+    <script src="<%= root_path %>javascripts/bootstrap.min.js"></script>
+    <script src="<%= root_path %>javascripts/bootstrap-select.js"></script>
+    <script src="<%= root_path %>javascripts/bootstrap-switch.js"></script>
+    <script src="<%= root_path %>javascripts/flatui-checkbox.js"></script>
+    <script src="<%= root_path %>javascripts/flatui-radio.js"></script>
+    <script src="<%= root_path %>javascripts/jquery.tagsinput.js"></script>
+    <script src="<%= root_path %>javascripts/jquery.placeholder.js"></script>
+    <script src="<%= root_path %>javascripts/jquery.stacktable.js"></script>
     <script src="http://vjs.zencdn.net/c/video.js"></script>
-    <script src="/javascripts/application.js"></script>
+    <script src="<%= root_path %>javascripts/application.js"></script>
   </body>
 </html>

metadata

@@ -2,7 +2,7 @@
 name: hushed
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Chris Saunders
@@ -272,7 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4146006481198685440
+      hash: 2857053908953534475
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4146006481198685440
+      hash: 2857053908953534475
       version: '0'
   none: false
 requirements: []