heel 3.0.2 → 3.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTBjMTliZGUxNDc1MDgwMWUwNjE2NzNmN2E3ODMxNjc3MmQzYTYzOQ==
+    ZDA5YmUzNmVkNjQ5YWZjMzMyMmQ1ZTNiZjMxN2YxMzRhNzZiMzM4MA==
   data.tar.gz: !binary |-
-    YjIwMjA5ZjU5MWY2YWQzZmNhNzYzOTVhZjY0YjE1ODBiOTQyMTgxMg==
+    ZTkzM2M2MTMxN2MxZGI0ZDFiNGRiZWMyOTQ1YjRiYWE4ZGI1MGM4MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmEwMDIwNWJlNDIyMGM4MDIwYjllNTI1MTMxNjc1ZWJjMjkxYjM0OGJlM2Fm
-    NjhmOTkxYzZlMTg2MWE2YzMxZWI3YmExMWFkMjI0ZjFlYjRhNjczZDM2YmVi
-    NGJjYzQzNGNkOGY1YzkwMDQ2ZDk3OGEzMmRjODM0ODFmOWRhOWI=
+    OGU2MGU3ZjczYzhkZjExODYzOWMwMTQ5MGIxYTM1Y2Y2NTdiOWUxZGM4ODlj
+    YzE0ZjcwN2FlNGQ4OGIzYWJkN2I3M2U2NGNkZTc2MzZjMDZjNzFmZmQ0YWFl
+    ZGU5ODg4NGZkZjQ5YjRjMWQ2ZWQ3NTIxMTI5NmU2MGZiMDBiNzU=
   data.tar.gz: !binary |-
-    ZGEyYmQ2NTk1YzgyZmY2MWZlN2U4OTY2OTNjYzQ5YWQ5ZWZjNGQ4MmY4ODQw
-    ZTFmMjI2OTczNDNkNjlhNWE3ZDVlZmUyYTNiYTU4NzRkNWFiMjk0NWE0ZDIx
-    MDczNTAyMjQ0YjJmY2I4ZTBkYjkxNzBjYzM4MGU4YzZjMDg3YTg=
+    ZGYyMjk4NDhjOTRkYzUzODc0Nzg0MjgxNjFiYzk3ZTJhNTFhMzMxMmExMDdk
+    Y2NlNDdlZDkyZDk5NGE4NjRiYzNmYjdiZDI2ZGYyOGRmOWNlZWZlZGUwNWY3
+    Nzg5OWI0MTNiZTk5MmE3ZjljNTdmZTFmMmJjODFlZWExMDdiMjI=

data/HISTORY.md

@@ -1,4 +1,9 @@
 # Changelog
+## Version 3.1.0 - 2013-07-07
+* Update dependencies
+* Switch to template contributed by brianflanagan [#8]
+* Add support for multiple independent heel servers [#9]
+
 ## Version 3.0.2 - 2013-03-13
 
 * Fix generated pages to say they are utf-8 [#4]

data/Manifest.txt

@@ -9,7 +9,7 @@ data/css/coderay-alpha.css
 data/css/coderay-cycnus.css
 data/css/coderay-murphy.css
 data/css/error.css
-data/css/listing.css
+data/css/index.css
 data/error.rhtml
 data/famfamfam/icons/application.png
 data/famfamfam/icons/compress.png
@@ -35,10 +35,12 @@ lib/heel/mime_map.rb
 lib/heel/rackapp.rb
 lib/heel/request.rb
 lib/heel/server.rb
+lib/heel/template_vars.rb
 spec/configuration_spec.rb
 spec/directory_indexer_spec.rb
 spec/rackapp_spec.rb
 spec/server_spec.rb
 spec/spec_helper.rb
+spec/template_vars_spec.rb
 tasks/default.rake
 tasks/this.rb

data/README.md

@@ -62,7 +62,7 @@ Or run it in the background
 ### For running: 
 
 * [coderay](http://coderay.rubychan.de/)
-* [launchy](http://copiousfreetime.rubyforge.org/launchy/) >= 0.1.1
+* [launchy](http://github.com/copiousfreetime/launchy/) >= 0.1.1
 * [mime-types](http://mime-types.rubyforge.org/)
 * [puma](http://puma.io)
 
@@ -79,7 +79,7 @@ Or run it in the background
 ## CREDITS:
 
 * [puma](http://puma.io)
-* [Rack](http://rack.rubyforge.org/)
+* [Rack](http://rack.github.io/)
 * http://www.famfamfam.com/ for amazing icons
 
 ## BSD LICENSE:

data/Rakefile

@@ -7,14 +7,14 @@ This.email    = "jeremy@copiousfreetime.org"
 This.homepage = "http://github.com/copiousfreetime/#{ This.name }"
 
 This.ruby_gemspec do |spec|
-  spec.add_runtime_dependency( 'puma'      , '~> 1.0'   )
-  spec.add_runtime_dependency( 'mime-types', '~> 1.19'  )
-  spec.add_runtime_dependency( 'launchy'   , '~> 2.2'   )
-  spec.add_runtime_dependency( 'coderay'   , '~> 1.0.7' )
+  spec.add_runtime_dependency( 'puma'      , '~> 2.0' )
+  spec.add_runtime_dependency( 'mime-types', '~> 1.23')
+  spec.add_runtime_dependency( 'launchy'   , '~> 2.3' )
+  spec.add_runtime_dependency( 'coderay'   , '~> 1.0' )
 
-  spec.add_development_dependency( 'rake'     , '~> 10.0.3')
-  spec.add_development_dependency( 'minitest' , '~> 4.5.0' )
-  spec.add_development_dependency( 'rdoc'     , '~> 3.12'  )
+  spec.add_development_dependency( 'rake'     , '~> 10.1')
+  spec.add_development_dependency( 'minitest' , '~> 5.0' )
+  spec.add_development_dependency( 'rdoc'     , '~> 4.0' )
 
   spec.license = "BSD"
 end

data/bin/heel

@@ -5,7 +5,6 @@
 # All rights reserved. Licensed under the BSD license.  See LICENSE for details
 #++
 
-require 'rubygems'
 require 'heel'
 
 Heel::Server.new(ARGV).run

data/data/css/error.css

@@ -1,38 +1,79 @@
-body { font-family: Verdana, Arial, Helvetica, sans-serif; background-color: #e0e0e0;}
-div.wrap { 
-    background: transparent;
-    text-align: left;
-    width: 400px;
-    margin-top: 100px;
-    margin-left: auto;
-    margin-right: auto;
-}
-div.box {
-    border-left: 1px solid #333;
-    border-right: 1px solid #333;
-    background: #FFF;
-    display: block;
-}
-img { padding-right: 20px;} 
-h1 { display: inline; font-weight: bold; }
-h2 { display: inline; font-weight: bold; padding-left: 25px;text-align: center;}
-div.header { font-size: x-large; }
-div.content { font-size: x-large; border: 0; padding: 10px 25px 10px 25px;}
-div.footer { text-align: right; width: 400px; }
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+  margin: 0;
+  padding: 0;
+  font-size: 100%;
+  vertical-align: baseline;
+  border: 0;
+  outline: 0;
+  background: transparent;
+  -webkit-font-smoothing: optimizeLegibility; }
 
-.curved { background: transparent;}
-.curved .c1, .curved .c2, .curved .c3, .curved .c4 {
-    display: block;
-    overflow: hidden;
-    height: 1px;
-    font-size: 1px;
-}
-.curved .c2, .curved .c3, .curved .c4 {
-    background: #fff;
-    border-left: 1px solid #000;
-    border-right: 1px solid #000;
-}
-.c1 { margin: 0 5px 0 5px; background: #000; }
-.c2 { margin: 0 3px 0 3px; border-left: 2px solid #000; border-right: 2px solid #000; }
-.c3 { margin: 0 2px 0 2px; }
-.c4 { margin: 0 1px 0 1px; }
+blockquote, q {
+  quotes: none; }
+
+:focus {
+  outline: 0; }
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0; }
+
+ul, ol {
+  list-style: none; }
+
+cite {
+  font-style: normal; }
+
+* {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+  *behavior: url(image-path("boxsizing.htc")); }
+
+body {
+  background: #e7c9ae;
+  color: #47423b;
+  font-family: "Open Sans", sans-serif;
+  font-size: 14px;
+  line-height: 19.6px;
+  padding: 14px; }
+  body a, body a:link, body a:visited {
+    color: #3b619b;
+    text-decoration: none; }
+    body a:hover, body a:link:hover, body a:visited:hover {
+      color: #4d79bc; }
+  body > [role='wrapper'] {
+    background: white;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    -webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.125);
+    -moz-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.125);
+    box-shadow: 0 1px 5px rgba(0, 0, 0, 0.125);
+    width: 100%;
+    max-width: 360px;
+    margin: 0 auto; }
+    body > [role='wrapper'] > header, body > [role='wrapper'] > footer {
+      padding: 7px; }
+    body > [role='wrapper'] > header {
+      background: #df5256;
+      color: white;
+      -webkit-border-top-left-radius: 3px;
+      -webkit-border-top-right-radius: 3px;
+      -moz-border-radius-topleft: 3px;
+      -moz-border-radius-topright: 3px;
+      border-top-left-radius: 3px;
+      border-top-right-radius: 3px; }
+    body > [role='wrapper'] > footer p {
+      font-size: 11.2px;
+      line-height: 14.56px;
+      text-align: right; }
+    body > [role='wrapper'] > [role='content'] {
+      background: #f9f9f9;
+      -webkit-box-shadow: inset 0 0 4px rgba(0, 0, 0, 0.1);
+      -moz-box-shadow: inset 0 0 4px rgba(0, 0, 0, 0.1);
+      box-shadow: inset 0 0 4px rgba(0, 0, 0, 0.1); }
+      body > [role='wrapper'] > [role='content'] > [role='message'] {
+        padding: 28px 14px;
+        text-align: center; }

data/data/css/index.css

@@ -0,0 +1,77 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+  margin: 0;
+  padding: 0;
+  font-size: 100%;
+  vertical-align: baseline;
+  border: 0;
+  outline: 0;
+  background: transparent;
+  -webkit-font-smoothing: optimizeLegibility; }
+
+blockquote, q {
+  quotes: none; }
+
+:focus {
+  outline: 0; }
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0; }
+
+ul, ol {
+  list-style: none; }
+
+cite {
+  font-style: normal; }
+
+* {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+  *behavior: url(image-path("boxsizing.htc")); }
+
+body {
+  background: #e7c9ae;
+  color: #47423b;
+  font-family: "Open Sans", sans-serif;
+  font-size: 14px;
+  line-height: 19.6px;
+  padding: 14px; }
+  body a, body a:link, body a:visited {
+    color: #3b619b;
+    text-decoration: none; }
+    body a:hover, body a:link:hover, body a:visited:hover {
+      color: #4d79bc; }
+  body > [role='wrapper'] {
+    background: white;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    -webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.125);
+    -moz-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.125);
+    box-shadow: 0 1px 5px rgba(0, 0, 0, 0.125);
+    width: 100%;
+    max-width: 960px;
+    margin: 0 auto; }
+    body > [role='wrapper'] > header, body > [role='wrapper'] > footer {
+      padding: 7px; }
+    body > [role='wrapper'] > footer p {
+      font-size: 11.2px;
+      line-height: 14.56px;
+      text-align: right; }
+    body > [role='wrapper'] > [role='content'] {
+      background: #f9f9f9;
+      -webkit-box-shadow: inset 0 0 4px rgba(0, 0, 0, 0.1);
+      -moz-box-shadow: inset 0 0 4px rgba(0, 0, 0, 0.1);
+      box-shadow: inset 0 0 4px rgba(0, 0, 0, 0.1); }
+      body > [role='wrapper'] > [role='content'] > table {
+        width: 100%; }
+        body > [role='wrapper'] > [role='content'] > table thead {
+          border-bottom: 2px solid #f3f3f3; }
+        body > [role='wrapper'] > [role='content'] > table th, body > [role='wrapper'] > [role='content'] > table td {
+          text-align: left;
+          padding: 3.5px 7px;
+          color: #71695e; }
+        body > [role='wrapper'] > [role='content'] > table tr:nth-child(even) {
+          background: whitesmoke; }

data/data/error.rhtml

@@ -1,29 +1,27 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Error <%= status %> </title>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="/heel_css/error.css" type="text/css" />
+    <title>Error <%= status %></title>
+    <meta charset='utf-8'>
+    <link href='/heel_css/error.css' rel='stylesheet' type='text/css'>
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
+    <!--[if IE]>
+      <script src='//html5shiv.googlecode.com/svn/trunk/html5.js'></script>
+    <![endif]-->
   </head>
   <body>
-    <div class="wrap">
-      <div class="header">
-        Requested URL: <%= base_uri %>
-      </div>
-      <div class="curved">
-        <b class="c1"></b><b class="c2"></b><b class="c3"></b><b class="c4"></b> 
-        <div class="box">
-          <div class="content">
-            <img src="/heel_icons/error.png" alt=""/><h1>Error <%= status %></h1>
-            <br />
-            <h2><%= message %></h2>
-          </div>
-        </div>
-        <b class="c4"></b><b class="c3"></b><b class="c2"></b><b class="c1"></b>
-      </div>
-      <div class="footer">
-        <a href="<%= homepage %>">heel</a>/v<%= ::Heel::VERSION %>
+    <div role='wrapper'>
+      <header>
+        <h1>Requested URL: <%= base_uri %></h1>
+      </header>
+      <div role='content'>
+        <article role='message'><p><%= message %></p></article>
       </div>
+      <footer>
+        <p>
+          <a href="http://github.com/copiousfreetime/heel/">heel</a> v<%= Heel::VERSION %>
+        </p>
+      </footer>
     </div>
   </body>
 </html>

data/data/listing.rhtml

@@ -1,42 +1,56 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang='en'>
   <head>
     <title>Index of <%= base_uri %></title>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="/heel_css/listing.css" type="text/css" />
+    <meta charset='utf-8'>
+    <link href='/heel_css/index.css' rel='stylesheet' type='text/css'>
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
+    <!--[if IE]>
+      <script src='//html5shiv.googlecode.com/svn/trunk/html5.js'></script>
+    <![endif]-->
   </head>
   <body>
-    <div class="header">
-      <h1>Index of <%= base_uri %></h1>
-    </div>
-    <div class="content">
-      <table>
-        <caption>Directory Listing</caption>
-        <thead>
-          <tr><th class="n">File Name</th><th class="l" >Last Modified Timestamp</th><th class="m">File Size</th><th class="t">File Type</th></tr>
-        </thead>
-        <tbody>
-          <% entries.each_with_index do |entry,i| %>
-          <tr<%= i % 2 > 0 ? ' class="odd" ' : '' %>>
-            <td>
-              <% if entry.icon_url then %>
-              <img src="<%= entry.icon_url %>" width="16" height="16" alt="icon for type <%= entry.content_type %>" />
-              <% end %>
-              <a href="<%= "#{base_uri.chomp('/')}/#{entry.link}" %>"><%= entry.name %></a>
-              <% if highlighting? and entry.content_type != 'Directory' then %>
-              (<a href="<%= "#{base_uri.chomp('/')}/#{entry.link}?highlighting=false" %>">download</a>)
-              <% end %>
-            </td>
-            <td><%= entry.last_modified %></td>
-            <td class="<%= entry.content_type == "Directory" ? 'c' : 'n' %>" ><%= entry.size %></td>
-            <td><%= entry.content_type %></td>
-          </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-    <div class="footer">
-      <a href="http://copiousfreetime.rubyforge.org/heel/">heel</a>/v<%= Heel::VERSION %>
+    <div role='wrapper'>
+      <header>
+        <h1>Index of <%= base_uri %></h1>
+      </header>
+      <div role='content'>
+        <table>
+          <thead>
+            <tr>
+              <th>Name</th>
+              <th>Last Modified</th>
+              <th>Size</th>
+              <th>Type</th>
+            </tr>
+          </thead>
+          <tbody>
+            <% entries.each do |entry| %>
+            <tr>
+              <td>
+                <a href="<%= "#{base_uri.chomp('/')}/#{entry.link}" %>">
+                  <% if entry.icon_url then %>
+                    <img src="<%= entry.icon_url %>" width="16" height="16" alt="icon for type <%= entry.content_type %>" />
+                  <% end %>
+                  <%= entry.name %>
+                </a>
+                <% if highlighting? and entry.content_type != 'Directory' then %>
+                (<a href="<%= "#{base_uri.chomp('/')}/#{entry.link}?highlighting=false" %>">download</a>)
+                <% end %>
+              </td>
+              <td><%= entry.last_modified %></td>
+              <td class="<%= entry.content_type == "Directory" ? 'c' : 'n' %>" ><%= entry.size %></td>
+              <td><%= entry.content_type %></td>
+            </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+      <footer>
+        <p>
+        <a href="<%= homepage %>">heel</a> v<%= Heel::VERSION %>
+        </p>
+      </footer>
     </div>
   </body>
 </html>

data/lib/heel.rb

@@ -4,7 +4,7 @@
 #++
 
 module Heel
-  VERSION = '3.0.2'
+  VERSION = '3.1.0'
 end
 
 require 'heel/configuration'
@@ -14,3 +14,4 @@ require 'heel/mime_map'
 require 'heel/rackapp'
 require 'heel/request'
 require 'heel/server'
+require 'heel/template_vars'

data/lib/heel/directory_indexer.rb

@@ -56,8 +56,7 @@ module Heel
     #
     def index_page_for(req)
       reload_template if reload_on_template_change?
-      dir      = req.request_path
-      base_uri = req.path_info
+      dir     = req.request_path
       entries = []
       Dir.entries(dir).each do |entry|
         next if should_ignore?(entry)
@@ -88,8 +87,11 @@ module Heel
         entries << entry_data
       end
 
-      entries = entries.sort_by { |e| e.link }
-      return template.result(binding)
+      template_vars          = TemplateVars.new( :base_uri => req.path_info )
+      template_vars.entries  = entries.sort_by { |e| e.link }
+      template_vars.homepage = Heel::Configuration::HOMEPAGE
+
+      return template.result( template_vars.binding_for_template )
     end
  
     # essentially this is strfbytes from facets

data/lib/heel/error_response.rb

@@ -33,10 +33,12 @@ module Heel
     end
 
     def finish
-      status   = @response.status                         # for the template
-      message  = ::Rack::Utils::HTTP_STATUS_CODES[status] # for the template
-      homepage = ErrorResponse.homepage                   # for the template
-      content  = ErrorResponse.template.result( binding )
+      template_vars = TemplateVars.new( :status   => @response.status,
+                                        :message  => Rack::Utils::HTTP_STATUS_CODES[@response.status],
+                                        :base_uri => base_uri,
+                                        :homepage => ErrorResponse.homepage )
+
+      content  = ErrorResponse.template.result( template_vars.binding_for_template )
       @response.write( content )
       return @response.finish
     end

data/lib/heel/server.rb

@@ -27,10 +27,6 @@ module Heel
           (ENV["HOMEPATH"] && "#{ENV["HOMEDRIVE"]}#{ENV["HOMEPATH"]}") ||
                     "/"
       end
-
-      def kill_existing_proc
-        Heel::Server.new.kill_existing_proc
-      end
     end
 
     def initialize(argv = [])
@@ -71,11 +67,11 @@ module Heel
     end
 
     def pid_file
-      File.join(default_directory,"heel.pid")
+      File.join(default_directory,"heel.#{options.port}.pid")
     end
 
     def log_file
-      File.join(default_directory,"heel.log")
+      File.join(default_directory,"heel.#{options.port}.log")
     end
 
     def win?
@@ -182,7 +178,7 @@ module Heel
           @stdout.puts "Unable to kill process with pid #{pid}.  No permissions to kill process."
         end
       else
-        @stdout.puts "No pid file exists, no process to kill"
+        @stdout.puts "No pid file exists for server running on port #{options.port}, no process to kill"
       end
       @stdout.puts "Done."
       exit 0
@@ -200,10 +196,10 @@ module Heel
 
     # make sure that if we are daemonizing the process is not running
     def ensure_not_running
-      if options.daemonize and File.exist?(pid_file) then
+      if File.exist?(pid_file) then
         @stdout.puts "ERROR: PID File #{pid_file} already exists. Heel may already be running."
         @stdout.puts "ERROR: Check the Log file #{log_file}"
-        @stdout.puts "ERROR: Heel will not start until the .pid file is cleared (`heel --kill' to clean it up)."
+        @stdout.puts "ERROR: Heel will not start until the .pid file is cleared (`heel --kill --port #{options.port}' to clean it up)."
         exit 1
       end
     end
@@ -269,8 +265,8 @@ module Heel
     # run the heel server with the current options.
     def run
 
-      error_version_help_kill
       merge_options
+      error_version_help_kill
       setup_heel_dir
       ensure_not_running
 

data/lib/heel/template_vars.rb

@@ -0,0 +1,8 @@
+require 'ostruct'
+module Heel
+  class TemplateVars < OpenStruct
+    def binding_for_template()
+      return binding()
+    end
+  end
+end

data/spec/server_spec.rb

@@ -118,4 +118,16 @@ describe Heel::Server do
       @stdout.string.must_match( /Sending TERM to process -42/m )
     end
   end
+
+  it "records the port of the server process in the pid filename" do
+    server = Heel::Server.new( %w[ --port 4222 ] )
+    server.merge_options
+    File.basename( server.pid_file ).must_equal( "heel.4222.pid" )
+  end
+
+   it "records the port of the server process in the log filename" do
+    server = Heel::Server.new( %w[ --port 4222 ] )
+    server.merge_options
+    File.basename( server.log_file ).must_equal( "heel.4222.log" )
+  end
 end

data/spec/template_vars_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'pathname'
+
+describe Heel::TemplateVars do
+  before do
+    @template = ERB.new( "<%= foo %> && <%= bar %>" )
+  end
+
+  it "exposes all its data members in a binding" do
+    t = Heel::TemplateVars.new( :foo => 'foo', :bar => 'bar' )
+    s = @template.result( t.binding_for_template )
+    s.must_equal( "foo && bar")
+  end
+
+  it "data members may be added after instantiation" do
+    t = Heel::TemplateVars.new
+    t.foo = 'foo'
+    t.bar = 'bar'
+    s = @template.result( t.binding_for_template )
+    s.must_equal( "foo && bar")
+  end
+end

data/tasks/default.rake

@@ -115,7 +115,7 @@ else
 end
 
 #------------------------------------------------------------------------------
-# Manifest - We want an explicit list of thos files that are to be packaged in
+# Manifest - We want an explicit list of those files that are to be packaged in
 #            the gem. Most of this is from Hoe.
 #------------------------------------------------------------------------------
 namespace 'manifest' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heel
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '4.0'
 description: ! 'Heel is a small static web server for use when you need a quick web
   server for a directory.  Once the server is running, heel will use (http://rubygems.org/gems/launchy/)
   to open your browser at the URL of your document root. Heel is built using (http://rack.github.com)
@@ -138,7 +138,7 @@ files:
 - data/css/coderay-cycnus.css
 - data/css/coderay-murphy.css
 - data/css/error.css
-- data/css/listing.css
+- data/css/index.css
 - data/error.rhtml
 - data/famfamfam/icons/application.png
 - data/famfamfam/icons/compress.png
@@ -164,11 +164,13 @@ files:
 - lib/heel/rackapp.rb
 - lib/heel/request.rb
 - lib/heel/server.rb
+- lib/heel/template_vars.rb
 - spec/configuration_spec.rb
 - spec/directory_indexer_spec.rb
 - spec/rackapp_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
+- spec/template_vars_spec.rb
 - tasks/default.rake
 - tasks/this.rb
 homepage: http://github.com/copiousfreetime/heel
@@ -207,3 +209,4 @@ test_files:
 - spec/rackapp_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
+- spec/template_vars_spec.rb

data/data/css/listing.css

@@ -1,29 +0,0 @@
-a, a:active { text-decoration: none; color: blue;}
-a:visited { color: purple;}
-a:hover, a:focus { text-decoration: underline; color: red;}
-body { font-family: Verdana, Arial, Helvetica, sans-serif; background-color: #eee; }
-.c { text-align: center; }
-table { border-collapse: collapse; border-spacing: 0px; width: 100%;}
-tr { background-color: #ccf;}
-tr:hover { background-color: #faa;}
-td, th { 
-    border-bottom: 1px solid #ccc; 
-    padding: 0em .3em 0em .3em ; 
-    color: #666; 
-    text-align: left;
-    vertical-align: middle;
-}
-thead th { 
-    border-top: 2px solid #666; 
-    border-bottom: 2px solid #666; 
-    font-weight: bold; 
-    background: #aaa; 
-    color: #fff;
-    text-transform: uppercase;
-}
-tr.odd { background-color: #cfc; color: #333;}
-tr.odd:hover { background-color: #faa; color: #333;}
-td.n { text-align: right; padding-right: 2em;}
-div.header { }
-div.content { background: #FFF; width: 100%;}
-div.footer { border-top: 2px solid #333; text-align: right;}