heel 3.2.1 → 4.0.1

data/data/lineicons/presentation.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="lni_lni-presentation" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<path d="M57,5.5H7c-2.9,0-5.3,2.4-5.3,5.3v6.4c0,1.2,1,2.3,2.3,2.3h0.2v20.3c0,2.9,2.4,5.3,5.3,5.3h20.3v5.5L25,54.5
+	c-1,0.8-1.1,2.2-0.3,3.2c0.4,0.5,1.1,0.8,1.7,0.8c0.5,0,1-0.2,1.4-0.5l4.1-3.4l4.1,3.4c1,0.8,2.4,0.7,3.2-0.3c0.8-1,0.7-2.4-0.3-3.2
+	l-4.7-3.9V45h20.3c2.9,0,5.3-2.4,5.3-5.3V19.5H60c1.2,0,2.3-1,2.3-2.3v-6.4C62.3,7.9,59.9,5.5,57,5.5z M6.3,10.8
+	C6.3,10.4,6.6,10,7,10h50c0.4,0,0.8,0.3,0.8,0.8V15h-0.1c0,0-0.1,0-0.1,0H6.4c0,0-0.1,0-0.1,0H6.3V10.8z M55.3,39.8
+	c0,0.4-0.3,0.8-0.8,0.8H9.4c-0.4,0-0.8-0.3-0.8-0.8V19.5h46.6V39.8z"/>
+</svg>

data/data/lineicons/word.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 65 64" style="enable-background:new 0 0 65 64;" xml:space="preserve">
+<g>
+	<path d="M10.6,29.8c1.2,0,2.3-1,2.3-2.3V8c0-1,0.8-1.8,1.8-1.8h22.6V19c0,1.2,1,2.3,2.3,2.3h12.7V27c0,1.2,1,2.3,2.3,2.3
+		s2.3-1,2.3-2.3v-7.4c0-1.1-0.5-2.2-1.3-3L41.6,3c-0.8-0.8-1.9-1.2-3-1.2h-24c-3.4,0-6.3,2.8-6.3,6.3v19.5
+		C8.4,28.7,9.4,29.8,10.6,29.8z M41.7,9.4l7.5,7.4h-7.5V9.4z"/>
+	<path d="M54.4,51.8c-1.2,0-2.3,1-2.3,2.3v2c0,1-0.8,1.8-1.8,1.8H14.6c-1,0-1.8-0.8-1.8-1.8v-1.4c0-1.2-1-2.3-2.3-2.3
+		s-2.3,1-2.3,2.3V56c0,3.4,2.8,6.3,6.3,6.3h35.7c3.4,0,6.3-2.8,6.3-6.3v-2C56.6,52.8,55.6,51.8,54.4,51.8z"/>
+	<path d="M56.7,30.3h-4.6c-1.2,0-2.3,1-2.3,2.3v15.1c0,1.2,1,2.3,2.3,2.3h4.6c3.5,0,6.4-2.9,6.4-6.5v-6.6
+		C63.1,33.2,60.2,30.3,56.7,30.3z M58.6,43.4c0,1.1-0.9,2-1.9,2h-2.3V34.8h2.3c1,0,1.9,0.9,1.9,2V43.4z"/>
+	<path d="M47.1,39.4v-6.6c0-1.2-1-2.3-2.3-2.3h-7.1c-1.2,0-2.3,1-2.3,2.3v14.9c0,1.2,1,2.3,2.3,2.3s2.3-1,2.3-2.3v-5.3l4,6.5
+		c0.4,0.7,1.2,1.1,1.9,1.1c0.4,0,0.8-0.1,1.2-0.3c1.1-0.7,1.4-2,0.7-3.1l-3-4.8h0C46.1,41.7,47.1,40.7,47.1,39.4z M40,35h2.6v2.1H40
+		V35z"/>
+	<path d="M20.5,36.8v6.9c0,3.5,2.8,6.3,6.3,6.3s6.3-2.8,6.3-6.3v-6.9c0-3.5-2.8-6.3-6.3-6.3S20.5,33.4,20.5,36.8z M28.6,36.8v6.9
+		c0,1-0.8,1.8-1.8,1.8S25,44.7,25,43.7v-6.9c0-1,0.8-1.8,1.8-1.8S28.6,35.8,28.6,36.8z"/>
+	<path d="M10.5,48.2l0.3-1.4l0.3,1.4c0.2,1,1.1,1.7,2.1,1.8c1,0,2-0.6,2.2-1.6l4-14.1c0.3-1.2-0.4-2.4-1.6-2.8
+		c-1.2-0.3-2.4,0.4-2.8,1.6l-1.5,5.4l-0.7-3.1c-0.2-1-1.1-1.8-2.2-1.8c0,0,0,0,0,0c-1.1,0-2,0.8-2.2,1.8l-0.6,3.1L6.3,33
+		c-0.3-1.2-1.6-1.9-2.8-1.5C2.4,31.8,1.7,33,2,34.2l4.1,14.1c0.3,1,1.2,1.6,2.2,1.6c0,0,0.1,0,0.1,0C9.4,49.9,10.3,49.2,10.5,48.2z"
+		/>
+</g>
+</svg>

data/data/lineicons/zip.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="lni_lni-zip" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<path d="M56.3,11.6h-3.4V9.4c0-4.2-3.4-7.6-7.6-7.6H10.8c-4.2,0-7.6,3.4-7.6,7.6v30.7c0,1.4,0.6,2.7,1.6,3.6L23,60.9
+	c0.9,0.9,2.1,1.3,3.4,1.3h18.8c4.2,0,7.6-3.4,7.6-7.6V34.5h3.4c1.4,0,2.5-1.1,2.5-2.5V14.2C58.8,12.8,57.7,11.6,56.3,11.6z
+	 M10.3,42.8H23c0.2,0,0.4,0.2,0.4,0.4v11.9L10.3,42.8z M48.4,54.6c0,1.7-1.4,3.1-3.1,3.1H28V43.2c0-2.7-2.2-4.9-4.9-4.9H7.6V9.4
+	c0-1.7,1.4-3.1,3.1-3.1h34.5c1.7,0,3.1,1.4,3.1,3.1v2.3H18.1c-1.4,0-2.5,1.1-2.5,2.5V32c0,1.4,1.1,2.5,2.5,2.5h30.3V54.6z
+	 M38.4,19.3v7.6c0,1.4-1.1,2.5-2.5,2.5s-2.5-1.1-2.5-2.5v-7.6c0-1.4,1.1-2.5,2.5-2.5S38.4,17.9,38.4,19.3z M30.8,26.9
+	c0,1.4-1.1,2.5-2.5,2.5H24c-0.9,0-1.8-0.5-2.2-1.3c-0.4-0.8-0.4-1.8,0.1-2.6l2.3-3.8h-0.9c-1.4,0-2.5-1.1-2.5-2.5
+	c0-1.4,1.1-2.5,2.5-2.5h5.5c0.9,0,1.8,0.5,2.2,1.3c0.4,0.8,0.4,1.8-0.1,2.6l-2.3,3.8C29.8,24.5,30.8,25.6,30.8,26.9z M48.6,26.9
+	h-2.5c0,1.4-1.1,2.5-2.5,2.5S41,28.3,41,26.9v-2.5v-5.1c0-1.4,1.1-2.5,2.5-2.5h5.1c2.8,0,5.1,2.3,5.1,5.1
+	C53.7,24.6,51.4,26.9,48.6,26.9z"/>
+</svg>

data/data/listing.rhtml

@@ -1,20 +1,18 @@
 <!DOCTYPE html>
-<html lang='en'>
+<html lang='en' data-theme="light">
   <head>
     <title>Index of <%= base_uri %></title>
+
     <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]-->
+    <meta name="viewport" content="width=device-width, initial-scale=1" >
+
+    <link href='/heel_css/pico.min.css' rel='stylesheet' type='text/css'>
   </head>
   <body>
-    <div role='wrapper'>
-      <header>
-        <h1>Index of <%= base_uri %></h1>
-      </header>
-      <div role='content'>
+    <main class="container">
+      <h1>Index of: <%= base_uri %></h1>
+
+      <figure>
         <table>
           <thead>
             <tr>
@@ -24,33 +22,45 @@
               <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 %>" />
+              <tr>
+                <td>
+                  <a href="<%= "#{base_uri.chomp('/')}/#{entry.link}" %>">
+                    <% if entry.icon_url then %>
+                      <img src="<%= entry.icon_url %>" width="32" height="32" alt="icon for type <%= entry.content_type %>">
+                    <% end %>
+                    <%= entry.name %>
+                  </a>
+                  <% if highlighting? && (entry.content_type != 'Directory') then %>
+                    (<a download="<%= entry.name %>" href="<%= "#{base_uri.chomp('/')}/#{entry.link}?highlighting=false" %>">download</a>)
                   <% 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>
+                </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>
+
+          <tfoot>
+            <tr>
+              <th>Name</th>
+              <th>Last Modified</th>
+              <th>Size</th>
+              <th>Type</th>
+            </tr>
+          </tfoot>
         </table>
-      </div>
-      <footer>
+      </figure>
+
+      <footer class="container">
+        <hr>
         <p>
-        <a href="<%= homepage %>">heel</a> v<%= Heel::VERSION %>
+          <small><a href="<%= homepage %>" target="_blank">heel</a> v<%= Heel::VERSION %></small>
         </p>
       </footer>
-    </div>
+    </main>
   </body>
 </html>

data/lib/heel/directory_indexer.rb

@@ -87,7 +87,7 @@ module Heel
         entries << entry_data
       end
 
-      template_vars          = TemplateVars.new( :base_uri => req.path_info )
+      template_vars          = TemplateVars.new( :base_uri => req.path_info, :highlighting => highlighting? )
       template_vars.entries  = entries.sort_by { |e| e.link }
       template_vars.homepage = Heel::Configuration::HOMEPAGE
 

data/lib/heel/mime_map.rb

@@ -15,22 +15,19 @@ module Heel
     class << self
       def icons_by_mime_type
         @icons_by_mime_type ||= {
-            "text/plain"                => "page_white_text.png",
-            "image"                     => "picture.png",
-            "pdf"                       => "page_white_acrobat.png",
-            "xml"                       => "page_white_code.png",
-            "compress"                  => "compress.png",
-            "gzip"                      => "compress.png",
-            "zip"                       => "compress.png",
-            "application/xhtml+xml"     => "xhtml.png",
-            "application/word"          => "page_word.png",
-            "application/excel"         => "page_excel.png",
-            "application/powerpoint"    => "page_white_powerpoint.png",
-            "text/html"                 => "html.png",
-            "application"               => "application.png",
-            "text"                      => "page_white_text.png",
-            :directory                  => "folder.png",
-            :default                    => "page_white.png",
+            "text/plain"                => "file.svg",
+            "image"                     => "image.svg",
+            "pdf"                       => "pdf.svg",
+            "x-zip-compressed"          => "zip.svg",
+            "x-gtar"                    => "zip.svg",
+            "x-gzip"                    => "zip.svg",
+            "application/x-word"        => "word.svg",
+            "application/powerpoint"    => "presentation.svg",
+            "text/html"                 => "html5.svg",
+            "application"               => "file.svg",
+            "text"                      => "file.svg",
+            :directory                  => "folder-alt.svg",
+            :default                    => "file.svg",
         }
       end
 

data/lib/heel/rackapp.rb

@@ -5,8 +5,7 @@
 
 require 'rack'
 require 'rack/utils'
-require 'coderay'
-require 'coderay/helpers/file_type'
+require 'rouge'
 require 'time'
 
 module Heel
@@ -63,7 +62,7 @@ module Heel
     def directory_index_response(req)
       response = ::Rack::Response.new
       dir_index = File.join(req.request_path, directory_index_html) 
-      if File.file?(dir_index) and File.readable?(dir_index) then
+      if File.file?(dir_index) && File.readable?(dir_index) then
         response['Content-Type']   = mime_map.mime_type_of(dir_index).to_s
         response.write( File.read( dir_index ) )
       elsif directory_listing_allowed? then
@@ -76,44 +75,64 @@ module Heel
       return response.finish
     end
 
+    def slurp_path(path)
+      source = nil
+      File.open(path, 'rt:bom|utf-8') do |f|
+        source = f.read
+      end
+      return source
+    end
+
+    def highlight_contents(req, file_type)
+      source = slurp_path(req.request_path)
+      # only do a rouge type check if we are going to use rouge in the
+      # response
+      lexer = ::Rouge::Lexer.guess(
+        filename: req.request_path,
+        source: source,
+        mime_type: file_type
+      )
+
+      formatter = ::Rouge::Formatters::HTMLPygments.new(::Rouge::Formatters::HTML.new)
+      content = formatter.format(lexer.lex(source))
+
+      body = <<-EOM
+      <html>
+        <head>
+          <title>#{req.path_info}</title>
+          <link href='/heel_css/syntax-highlighting.css' rel='stylesheet' type='text/css'>
+        </head>
+        <body>
+          #{content}
+        </body>
+      </html>
+      EOM
+
+      return body
+    end
 
-    # formulate a file content response. Possibly a coderay highlighted file if
-    # it is a type that code ray can deal with and the file is not already an
+
+    # formulate a file content response. Possibly a rouge highlighted file if
+    # it is a type that rouge can deal with and the file is not already an
     # html file.
     #
     def file_response(req)
       response = ::Rack::Response.new
-
       response['Last-Modified'] = req.stat.mtime.rfc822
+      file_type = mime_map.mime_type_of(req.request_path)
 
-      if highlighting? and req.highlighting? then 
-        # only do a coderay type check if we are going to use coderay in the
-        # response
-        code_ray_type = CodeRay::FileType[req.request_path, true] 
-        if code_ray_type and (code_ray_type != :html) then
-          body = <<-EOM
-          <html>
-            <head>
-            <title>#{req.path_info}</title>
-            <!-- CodeRay syntax highlighting CSS -->
-            <link rel="stylesheet" href="/heel_css/coderay-alpha.css" type="text/css" />
-            </head>
-            <body>
-  #{CodeRay.scan_file(req.request_path,:auto).html({ :wrap => :div, :line_numbers => :inline })}
-            </body>
-          </html>
-          EOM
-          response['Content-Type']    = 'text/html'
-          response['Content-Length']  = body.length.to_s
+      if highlighting? and req.highlighting? then
+        if file_type && (file_type != 'text/html') then
+          body                       =  highlight_contents(req, file_type)
+          response['Content-Type']   = 'text/html'
+          response['Content-Length'] = body.length.to_s
           response.write( body )
           return response.finish
         end
       end
 
       # fall through to a default file return
-
-      file_type                   = mime_map.mime_type_of(req.request_path)
-      response['Content-Type']    = file_type.to_s
+      response['Content-Type'] = file_type.to_s
       File.open( req.request_path ) do |f|
         while p = f.read( 8192 ) do
           response.write( p )

data/lib/heel/server.rb

@@ -7,6 +7,7 @@ require 'ostruct'
 require 'launchy'
 require 'fileutils'
 require 'heel/rackapp'
+require 'rackup'
 require 'puma'
 
 module Heel
@@ -56,7 +57,7 @@ module Heel
       defaults.port            = 4331
       defaults.document_root   = Dir.pwd
       defaults.daemonize       = false
-      defaults.highlighting    = false
+      defaults.highlighting    = true
       defaults.kill            = false
       defaults.launch_browser  = true
       return defaults
@@ -228,17 +229,17 @@ module Heel
           run app
         end
         map "/heel_css" do 
-          run Rack::File.new(Heel::Configuration.data_path( "css" )) 
+          run Rack::Files.new(Heel::Configuration.data_path( "css" )) 
         end
         map "/heel_icons" do
-          run Rack::File.new(Heel::Configuration.data_path("famfamfam", "icons")) 
+          run Rack::Files.new(Heel::Configuration.data_path("lineicons"))
         end
       }
       return stack.to_app
     end
 
     # If we are daemonizing the fork and wait for the child to launch the server
-    # If we are not daemonizing, throw the Rack::Server in a background thread
+    # If we are not daemonizing, throw the ::Rackup::Server in a background thread
     def start_server
       if options.daemonize then
         start_background_server
@@ -252,14 +253,14 @@ module Heel
       if cpid = fork then
         Process.waitpid( cpid )
       else
-        server = Rack::Server.new( server_options )
+        server = ::Rackup::Server.new( server_options )
         server.start
       end
     end
 
     def start_foreground_server
       Thread.new {
-        server = Rack::Server.new( server_options )
+        server = ::Rackup::Server.new( server_options )
         server.start
       }
     end

data/lib/heel/template_vars.rb

@@ -4,5 +4,9 @@ module Heel
     def binding_for_template()
       return binding()
     end
+
+    def highlighting?
+      self.highlighting
+    end
   end
 end

data/lib/heel.rb

@@ -4,7 +4,7 @@
 #++
 
 module Heel
-  VERSION = '3.2.1'
+  VERSION = '4.0.1'
 end
 
 require 'heel/configuration'

data/spec/configuration_spec.rb

@@ -6,19 +6,23 @@ describe Heel::Configuration do
     @proj_root = Pathname.new( __FILE__ ).parent.parent
   end
   it "finds files relative to root of gem" do
-    Heel::Configuration.root_dir.must_equal @proj_root.expand_path.to_s + File::SEPARATOR
+    root_dir = Heel::Configuration.root_dir
+    _(root_dir).must_equal @proj_root.expand_path.to_s + File::SEPARATOR
   end
 
   it "finds files in the config dir of the project" do
-    Heel::Configuration.config_path('config.rb').must_equal @proj_root.join("config", "config.rb").to_s
+    config_rb = Heel::Configuration.config_path('config.rb')
+    _(config_rb).must_equal @proj_root.join("config", "config.rb").to_s
   end
-  
+
   it "finds files in the data dir of the project" do
-    Heel::Configuration.data_path('famfamfam', 'icons').must_equal @proj_root.join( "data", "famfamfam", "icons" ).to_s
+    icons = Heel::Configuration.data_path('lineicons', 'icons')
+    _(icons).must_equal @proj_root.join( "data", "lineicons", "icons" ).to_s
   end
-  
+
   it "finds files in the lib dir of the project" do
-    Heel::Configuration.lib_path('heel.rb').must_equal @proj_root.join("lib", "heel.rb").to_s
+    heel_rb = Heel::Configuration.lib_path('heel.rb')
+    _(heel_rb).must_equal @proj_root.join("lib", "heel.rb").to_s
   end
 
 end

data/spec/directory_indexer_spec.rb

@@ -7,41 +7,44 @@ describe Heel::DirectoryIndexer do
 
   it "should ignore .htaccess files" do
     @indexer.options[:ignore_globs] = %w( *~ .htaccess . )
-    @indexer.should_ignore?(".htaccess").must_equal true
+    _(@indexer.should_ignore?(".htaccess")).must_equal true
   end
 
   it "should not ignore .html files " do
     @indexer.options[:ignore_globs] = %w( *~ .htaccess . )
-    @indexer.should_ignore?("something.html").must_equal false
+    _(@indexer.should_ignore?("something.html")).must_equal false
   end
 
   it "can tell if highlighting is to be performed" do
-    @indexer.must_be :highlighting?
+    _(@indexer).must_be :highlighting?
   end
   
   it "knows if the template should be reloaded on changes" do
-    @indexer.reload_on_template_change?.must_equal false
+    _(@indexer.reload_on_template_change?).must_equal false
   end
   
   it "uses icons" do
-    @indexer.using_icons?.must_equal false
+    _(@indexer.using_icons?).must_equal false
   end
 
   it "uses a mime map" do
-    @indexer.mime_map.must_be_instance_of(Heel::MimeMap)
+    _(@indexer.mime_map).must_be_instance_of(Heel::MimeMap)
   end
 
-  [ { :ext => 'svg', :type => 'image/svg+xml' },
+  [
+    { :ext => 'svg', :type => 'image/svg+xml' },
     { :ext => 'flv', :type => 'video/x-flv' },
-    { :ext => 'swf', :type => 'application/x-shockwave-flash' } ].each do |m|
+    { :ext => 'rb', :type => 'text/plain' },
+    { :ext => 'rhtml', :type => 'text/plain' }
+  ].each do |m|
       it "finds #{m[:ext]} extension in the map as #{m[:type]}" do
-        @indexer.mime_map.mime_type_of( "test.#{m[:ext]}" ).must_equal m[:type]
+        _(@indexer.mime_map.mime_type_of( "test.#{m[:ext]}" )).must_equal m[:type]
       end
     end
 
-  %w[ md markdown rdoc rb rhtml ].each do |ext|
+  %w[ md markdown rdoc ].each do |ext|
     it "finds #{ext} in the map as text/plain" do
-      @indexer.mime_map.mime_type_of( "test.#{ext}" ).must_equal "text/plain"
+      _(@indexer.mime_map.mime_type_of( "test.#{ext}" )).must_equal "text/plain"
     end
   end
 end

data/spec/rackapp_spec.rb

@@ -10,34 +10,34 @@ describe Heel::RackApp do
 
   it "should return the a listing for the currrent directory" do
     res = @request.get("/")
-    res.must_be :ok?
-    res['Content-Type'].must_equal "text/html"
-    res.body.must_match( /Rakefile/ )
+    _(res).must_be :ok?
+    _(res['Content-Type']).must_equal "text/html"
+    _(res.body).must_match( /Rakefile/ )
   end
 
   it 'should highlight a ruby file' do
     res = @request.get("/lib/heel.rb")
-    res.must_be :ok?
-    res['Content-Type'].must_equal "text/html"
-    res.body.must_match( /class="CodeRay"/ )
+    _(res).must_be :ok?
+    _(res['Content-Type']).must_equal "text/html"
+    _(res.body).must_match( /class="highlight"/ )
   end
 
   it "should not highlight a ruby file if told not to" do
     res = @request.get("/lib/heel.rb?highlighting=off")
-    res.must_be :ok?
-    res.body.size.must_equal File.size("lib/heel.rb")
-    res['Content-Type'].must_equal "text/plain"
+    _(res).must_be :ok?
+    _(res.body.size).must_equal File.size("lib/heel.rb")
+    _(res['Content-Type']).must_equal "text/plain"
   end
 
   it "should return a 405 if given a non-GET request" do
     res = @request.post("/")
-    res.wont_be :ok?
-    res.status.must_equal 405
+    _(res).wont_be :ok?
+    _(res.status).must_equal 405
   end
 
   it "should return a 403 if accessing an invalid location" do
     res = @request.get("/../../../../etc/passwd")
-    res.wont_be :ok?
-    res.status.must_equal 403
+    _(res).wont_be :ok?
+    _(res.status).must_equal 403
   end
 end

data/spec/server_spec.rb

@@ -19,8 +19,8 @@ describe Heel::Server do
     begin
       server.run
     rescue SystemExit => se
-      se.status.must_equal 0
-      @stdout.string.must_match( /version #{Heel::VERSION}/ )
+      _(se.status).must_equal 0
+      _(@stdout.string).must_match( /version #{Heel::VERSION}/ )
     end
   end
 
@@ -30,8 +30,8 @@ describe Heel::Server do
     begin
       server.run
     rescue SystemExit => se
-      se.status.must_equal 0
-      @stdout.string.must_match( /Usage/m )
+      _(se.status).must_equal 0
+      _(@stdout.string).must_match( /Usage/m )
     end
   end
 
@@ -41,8 +41,8 @@ describe Heel::Server do
     begin
       server.run
     rescue SystemExit => se
-      se.status.must_equal 1
-      @stdout.string.must_match( /Try .*--help/m )
+      _(se.status).must_equal 1
+      _(@stdout.string).must_match( /Try .*--help/m )
     end
   end
 
@@ -52,34 +52,34 @@ describe Heel::Server do
     begin
       server.run
     rescue SystemExit => se
-      se.status.must_equal 1
-      @stdout.string.must_match( /Try .*--help/m )
+      _(se.status).must_equal 1
+      _(@stdout.string).must_match( /Try .*--help/m )
     end
   end
 
   it "should allow port and address to be set" do
     server = Heel::Server.new(%w[--port 4242 --address 192.168.1.1])
     server.merge_options
-    server.options.address.must_equal "192.168.1.1"
-    server.options.port.must_equal 4242
+    _(server.options.address).must_equal "192.168.1.1"
+    _(server.options.port).must_equal 4242
   end
 
   it "should allow the highlighting option to be set" do
-    server = Heel::Server.new(%w[--highlighting])
+    server = Heel::Server.new(%w[--no-highlighting])
     server.merge_options
-    server.options.highlighting.must_equal true
+    _(server.options.highlighting).must_equal false
   end
 
-  it "should have highlighting off as a default" do
+  it "should have highlighting on as a default" do
     server = Heel::Server.new
     server.merge_options
-    server.options.highlighting.must_equal false
+    _(server.options.highlighting).must_equal true
   end
 
   it "should set no-launch-browser option" do
     server = Heel::Server.new(%w[--no-launch-browser])
     server.merge_options
-    server.options.launch_browser.must_equal false
+    _(server.options.launch_browser).must_equal false
   end
 
   it "should attempt to kill the process" do
@@ -90,18 +90,18 @@ describe Heel::Server do
       server.run
       violated("Should have thrown SystemExit")
     rescue SystemExit => se
-      se.status.must_equal 0
-      @stdout.string.must_match( /Done/m )
+      _(se.status).must_equal 0
+      _(@stdout.string).must_match( /Done/m )
     end
   end
 
   it "should setup a heel directory" do
     server = Heel::Server.new(%w[--daemonize])
     server.set_io(@stdin,@stdout)
-    File.directory?(server.default_directory).must_equal false
+    _(File.directory?(server.default_directory)).must_equal false
     server.setup_heel_dir
-    File.directory?(server.default_directory).must_equal true
-    @stdout.string.must_match( /Created/m )
+    _(File.directory?(server.default_directory)).must_equal true
+    _(@stdout.string).must_match( /Created/m )
   end
 
   it "should send a signal to a pid" do
@@ -114,20 +114,20 @@ describe Heel::Server do
       server.run
       violated("Should have exited")
     rescue SystemExit => se
-      se.status.must_equal 0
-      @stdout.string.must_match( /Sending TERM to process -42/m )
+      _(se.status).must_equal 0
+      _(@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" )
+    _(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" )
+    _(File.basename( server.log_file )).must_equal( "heel.4222.log" )
   end
 end