bookingit 0.0.1 → 0.1.0

data/lib/bookingit/shell_command.rb

@@ -0,0 +1,30 @@
+require 'fileutils'
+require 'open3'
+
+module Bookingit
+  class ShellCommand
+    include FileUtils
+
+    attr_reader :stdout, :stderr, :exit_code, :command, :expected_exit_status
+
+    def initialize(command: nil,path: '.',expected_exit_status: 0, &block)
+      @command = command
+      @path = path
+      @exit_status_checker = if block.nil?
+                               ->(exit_code) { exit_code == expected_exit_status }
+                             else
+                               block
+                             end
+    end
+
+    def run!
+      chdir @path do
+        @stdout, @stderr, status = Open3.capture3(@command)
+        @exit_code = status.exitstatus
+      end
+      unless @exit_status_checker.(@exit_code)
+        raise UnexpectedShellCommandExit.new(@command,@stdout,@stderr)
+      end
+    end
+  end
+end

data/lib/bookingit/version.rb

@@ -1,3 +1,3 @@
 module Bookingit
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/lib/bookingit/views.rb

@@ -0,0 +1,8 @@
+require 'mustache'
+require 'ostruct'
+
+require 'bookingit/views/base_view'
+require 'bookingit/views/index_view'
+require 'bookingit/views/header_view'
+require 'bookingit/views/footer_view'
+require 'bookingit/views/code_view'

data/lib/bookingit/views/base_view.rb

@@ -0,0 +1,12 @@
+module Bookingit
+  module Views
+    class BaseView < Mustache
+      attr_reader :config
+      self.template_path = File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','templates'))
+
+      def initialize(config)
+        @config = config.options
+      end
+    end
+  end
+end

data/lib/bookingit/views/code_view.rb

@@ -0,0 +1,16 @@
+module Bookingit
+  module Views
+    class CodeView < BaseView
+      self.template_name = 'block_code.html'
+
+      attr_reader :code, :filename, :css_class
+
+      def initialize(code, filename, language, config)
+        @code = CGI.escapeHTML(code)
+        @filename = String(filename).strip == '' ? nil : filename.strip
+        @css_class = language ? "language-#{language}" : ""
+        super(config)
+      end
+    end
+  end
+end

data/lib/bookingit/views/footer_view.rb

@@ -0,0 +1,14 @@
+module Bookingit
+  module Views
+    class FooterView < BaseView
+      self.template_name = 'footer.html'
+
+      attr_reader :chapter
+
+      def initialize(chapter,config)
+        @chapter = chapter
+        super(config)
+      end
+    end
+  end
+end

data/lib/bookingit/views/header_view.rb

@@ -0,0 +1,17 @@
+module Bookingit
+  module Views
+    class HeaderView < BaseView
+      self.template_name = 'header.html'
+
+      attr_reader :stylesheets, :theme
+
+      def initialize(stylesheets, theme, config)
+        @stylesheets = stylesheets.map { |stylesheet|
+          OpenStruct.new(path: stylesheet, media: "all")
+        }
+        @theme = theme
+        super(config)
+      end
+    end
+  end
+end

data/lib/bookingit/views/index_view.rb

@@ -0,0 +1,20 @@
+require 'forwardable'
+module Bookingit
+  module Views
+    class IndexView < BaseView
+      extend Forwardable
+      self.template_name = 'index.html'
+
+      attr_reader :front_matter, :main_matter, :back_matter, :config
+      def_delegators :@header_view, :stylesheets, :theme
+
+      def initialize(stylesheets,theme,front_matter,main_matter,back_matter,config)
+        @header_view = HeaderView.new(stylesheets,theme,config)
+        @front_matter = front_matter
+        @main_matter = main_matter
+        @back_matter = back_matter
+        super(config)
+      end
+    end
+  end
+end

data/templates/block_code.html.mustache

@@ -0,0 +1 @@
+<article class='code-listing'><pre><code class="{{css_class}}">{{{code}}}</code></pre>{{#filename}}<footer><h1>{{filename}}</h1></footer>{{/filename}}</article>

data/templates/footer.html.mustache

@@ -0,0 +1,37 @@
+<footer>
+{{#chapter}}
+  <ol>
+    {{#previous_chapter}}
+    <li class="previous"><a href="{{relative_url}}">&larr; 
+        {{#title}}
+        {{{title}}}
+        {{/title}}
+        {{^title}}
+        Previous
+        {{/title}}
+    </a></li>
+    {{/previous_chapter}}
+    {{#next_chapter}}
+    <li class="next"><a href="{{relative_url}}">
+        {{#title}}
+        {{{title}}}
+        {{/title}}
+        {{^title}}
+        Next
+        {{/title}}
+        &rarr;</a></li>
+    {{/next_chapter}}
+  </ol>
+  <div class="clearfix"></div>
+{{/chapter}}
+{{#config}}
+{{#license}}
+  <p class="copyright">
+    <a rel="license" href="http://creativecommons.org/licenses/{{type}}/4.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/{{type}}/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">{{title}}</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="{{url}}" property="cc:attributionName" rel="cc:attributionURL">{{author}}</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/{{type}}/4.0/">{{typeDescription}}
+    </a>.
+  </p>
+{{/license}}
+{{/config}}
+</footer>
+</body>
+</html>

data/templates/header.html.mustache

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  {{> stylesheets.html }}
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
+  <meta charset="utf-8">
+  <title>{{config.title}}: {{config.subtitle}}</title>
+  {{> syntax_highlighting.html }}
+</head>
+<body>
+  <h1><a href="index.html">{{config.title}}</a></h1>
+  {{#config}}
+    {{#author}}
+      <p class="byline">by {{config.author}}</p>
+    {{/author}}
+  {{/config}}

data/templates/index.html.mustache

@@ -0,0 +1,27 @@
+{{> header.html}}
+{{#config}}
+<h2 class="subtitle">{{subtitle}}</h2>
+{{/config}}
+<ol class="front-matter">
+  {{#front_matter}}
+    <li class='chapter'><a href="{{relative_url}}">{{{title}}}</a></li>
+  {{/front_matter}}
+</ol>
+<ol class="main-matter">
+  {{#main_matter}}
+    <li class='chapter'>
+      <a href="{{relative_url}}">{{{title}}}</a>
+      <ol>
+      {{#sections}}
+      <li class='section'><a href="{{relative_url}}">{{{title}}}</a></li>
+      {{/sections}}
+      </ol>
+    </li class='chapter'>
+  {{/main_matter}}
+</ol>
+<ol class="back-matter">
+  {{#back_matter}}
+    <li class='chapter'><a href="{{relative_url}}">{{{title}}}</a></li>
+  {{/back_matter}}
+</ol>
+{{> footer.html}}

data/templates/stylesheets.html.mustache

@@ -0,0 +1,3 @@
+{{#stylesheets}}
+<link href='{{path}}' rel='stylesheet' type='text/css' media='{{media}}'>
+{{/stylesheets}}

data/templates/syntax_highlighting.html.mustache

@@ -0,0 +1,3 @@
+<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.0/styles/{{theme}}.min.css">
+<script src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.0/highlight.min.js"></script>
+<script>hljs.initHighlightingOnLoad();</script>

data/test/book_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+require 'fileutils'
+
+include FileUtils
+
+class Bookingit::BookTest < Test::Unit::TestCase
+
+  def setup
+    @tempdir = Dir.mktmpdir
+  end
+
+  def teardown
+    remove_entry @tempdir
+  end
+
+  test_that "we blow up if our markdown doesn't have any H1's" do
+  end
+
+
+end

data/test/config_test.rb

@@ -17,6 +17,13 @@ class Bookingit::ConfigTest < Test::Unit::TestCase
     Given :some_markdown_files
     And {
       @config = {
+        title: "blah town",
+        subtitle: "the town of blah",
+        whatever: "foobar",
+        authors: [
+          "Shane Vendrel",
+          "Ronnie Gardocki",
+        ],
         front_matter: "foo.md",
         main_matter: "bar.md",
         back_matter: "baz.md",
@@ -26,13 +33,16 @@ class Bookingit::ConfigTest < Test::Unit::TestCase
       @normalized_config = Bookingit::Config.new(@config.to_json,@tempdir)
     }
     Then {
+      assert_equal @config[:title], @normalized_config.options['title']
+      assert_equal @config[:subtitle], @normalized_config.options['subtitle']
+      assert_equal @config[:whatever], @normalized_config.options['whatever']
+      assert_equal @config[:authors], @normalized_config.options['authors']
       assert_equal 1,@normalized_config.front_matter.chapters.size
-      assert_equal File.join(@tempdir,'foo.md'),@normalized_config.front_matter.chapters[0].path
+      assert_equal File.join(@tempdir,'foo.md'),@normalized_config.front_matter.chapters[0].markdown_path
       assert_equal 1,@normalized_config.main_matter.chapters.size
-      assert_equal File.join(@tempdir,'bar.md'),@normalized_config.main_matter.chapters[0].path
-      assert_equal 0,@normalized_config.main_matter.chapters[0].sections.size
+      assert_equal File.join(@tempdir,'bar.md'),@normalized_config.main_matter.chapters[0].markdown_path
       assert_equal 1,@normalized_config.back_matter.chapters.size
-      assert_equal File.join(@tempdir,'baz.md'),@normalized_config.back_matter.chapters[0].path
+      assert_equal File.join(@tempdir,'baz.md'),@normalized_config.back_matter.chapters[0].markdown_path
     }
   end
 
@@ -50,57 +60,55 @@ class Bookingit::ConfigTest < Test::Unit::TestCase
     }
     Then {
       assert_equal 1,@normalized_config.front_matter.chapters.size
-      assert_equal File.join(@tempdir,'foo.md'),@normalized_config.front_matter.chapters[0].path
+      assert_equal File.join(@tempdir,'foo.md'),@normalized_config.front_matter.chapters[0].markdown_path
       assert_equal 1,@normalized_config.main_matter.chapters.size
-      assert_equal File.join(@tempdir,'bar.md'),@normalized_config.main_matter.chapters[0].path
-      assert_equal 0,@normalized_config.main_matter.chapters[0].sections.size
+      assert_equal File.join(@tempdir,'bar.md'),@normalized_config.main_matter.chapters[0].markdown_path
       assert_equal 1,@normalized_config.back_matter.chapters.size
-      assert_equal File.join(@tempdir,'baz.md'),@normalized_config.back_matter.chapters[0].path
+      assert_equal File.join(@tempdir,'baz.md'),@normalized_config.back_matter.chapters[0].markdown_path
     }
   end
 
-  test_that "parses sections" do
-    Given :some_markdown_files
-    And {
+  test_that "converts rendering config" do
+    Given {
       @config = {
-        front_matter: ["foo.md"],
-        main_matter: [
-          "bar.md",
-          ["blah1.md","blah2.md"],
-        ],
-        back_matter: ["baz.md"],
+        rendering: {
+          stylesheets: 'blah.css',
+          languages: {
+            ".coffee" => "coffeescript",
+            "/^Bowerfile$/" => "ruby",
+          },
+          git_repos_basedir: "/tmp",
+          syntax_theme: "solarized",
+        }
       }
     }
     When {
       @normalized_config = Bookingit::Config.new(@config.to_json,@tempdir)
     }
-    Then {
-      assert_equal 2,@normalized_config.main_matter.chapters.size,"chapters"
-      assert_equal 2,@normalized_config.main_matter.chapters[1].sections.size,"sections"
+    Then  {
+      assert_equal "/tmp",@normalized_config.rendering_config[:basedir]
+      assert_equal({ ".coffee" => "coffeescript", /^Bowerfile$/ => "ruby" },@normalized_config.rendering_config[:languages])
+      assert_equal ['blah.css'],@normalized_config.rendering_config[:stylesheets]
+      assert_equal 'solarized',@normalized_config.rendering_config[:theme]
+      refute @normalized_config.cache
     }
   end
 
-  test_that "globs" do
-    Given :some_markdown_files
-    And {
+  test_that "we can mutate the config" do
+    Given {
       @config = {
-        front_matter: ["foo.md"],
-        main_matter: [
-          "bar.md",
-          "blah*.md",
-        ],
-        back_matter: ["baz.md"],
+        rendering: {
+          stylesheets: 'blah.css',
+          syntax_theme: "solarized",
+        }
       }
     }
     When {
       @normalized_config = Bookingit::Config.new(@config.to_json,@tempdir)
+      @normalized_config.cache = true
     }
-    Then {
-      assert_equal 2,@normalized_config.main_matter.chapters.size
-      assert_equal 3,@normalized_config.main_matter.chapters[1].sections.size
-      assert_equal File.join(@tempdir,'blah1.md'),@normalized_config.main_matter.chapters[1].sections[0].path
-      assert_equal File.join(@tempdir,'blah2.md'),@normalized_config.main_matter.chapters[1].sections[1].path
-      assert_equal File.join(@tempdir,'blah3.md'),@normalized_config.main_matter.chapters[1].sections[2].path
+    Then  {
+      assert @normalized_config.cache
     }
   end
 

data/test/renderer_test.rb

@@ -14,11 +14,40 @@ class RendererTest < Test::Unit::TestCase
     remove_entry @tempdir
   end
 
+  def renderer(options={})
+    options = OpenStruct.new(:rendering_config => { basedir: @tempdir }.merge(options))
+    Bookingit::Renderer.new(options)
+  end
+
   test_that "block_code can read a file URL and guess ruby" do
     Given a_file_with_extension(".rb") 
     When render_file_url_code_block
     Then {
-      assert_equal %{<pre><code class="language-ruby">#{@code}</code></pre>},@html
+      assert_equal %{<article class='code-listing'><pre><code class="language-ruby">#{@code}</code></pre><footer><h1>#{@relative_path}</h1></footer></article>},@html
+    }
+  end
+
+  test_that "block_code can read a file URL and guess ruby from Gemfile" do
+    Given a_file_named("Gemfile") 
+    When render_file_url_code_block
+    Then {
+      assert_equal %{<article class='code-listing'><pre><code class="language-ruby">#{@code}</code></pre><footer><h1>Gemfile</h1></footer></article>},@html
+    }
+  end
+
+  test_that "block_code can read a file URL and be OK if it cannot guess" do
+    Given a_file_with_extension(".blah") 
+    When render_file_url_code_block
+    Then {
+      assert_equal %{<article class='code-listing'><pre><code class="">#{@code}</code></pre><footer><h1>#{@relative_path}</h1></footer></article>},@html
+    }
+  end
+
+  test_that "we can tell the renderer about other languages and extensions" do
+    Given a_file_with_extension(".blah") 
+    When render_file_url_code_block(languages: { '.blah' => 'blahscript' })
+    Then {
+      assert_equal %{<article class='code-listing'><pre><code class="language-blahscript">#{@code}</code></pre><footer><h1>#{@relative_path}</h1></footer></article>},@html
     }
   end
 
@@ -26,7 +55,7 @@ class RendererTest < Test::Unit::TestCase
     Given a_file_with_extension(".scala") 
     When render_file_url_code_block
     Then {
-      assert_equal %{<pre><code class="language-scala">#{@code}</code></pre>},@html
+      assert_equal %{<article class='code-listing'><pre><code class="language-scala">#{@code}</code></pre><footer><h1>#{@relative_path}</h1></footer></article>},@html
     }
   end
 
@@ -41,14 +70,14 @@ class RendererTest < Test::Unit::TestCase
 })
     When render_file_url_code_block
     Then {
-      assert_equal %{<pre><code class="language-html">&lt;!DOCTYPE html&gt;
+      assert_equal %{<article class='code-listing'><pre><code class="language-html">&lt;!DOCTYPE html&gt;
 &lt;html&gt;
   &lt;body&gt;
     &lt;h1&gt;HELLO!&lt;/h1&gt;
     &lt;h2&gt;&amp;amp; Goodbye&lt;/h2&gt;
   &lt;/body&gt;
 &lt;/html&gt;
-</code></pre>},@html
+</code></pre><footer><h1>#{@relative_path}</h1></footer></article>},@html
     }
   end
 
@@ -56,7 +85,7 @@ class RendererTest < Test::Unit::TestCase
     Given a_git_repo_with_file("foo.rb")
     When {
       @code = -> {
-        Bookingit::Renderer.new.block_code(@file_git_url,nil)
+        renderer.block_code(@file_git_url,nil)
       }
     }
     Then {
@@ -68,12 +97,12 @@ class RendererTest < Test::Unit::TestCase
     Given a_git_repo_with_two_verions_of_file("foo.rb")
     When {
       @parsed_versions = Hash[@versions.map { |sha1,_|
-        [sha1, Bookingit::Renderer.new.block_code(@file_git_url + "##{sha1}",nil)]
+        [sha1, renderer.block_code(@file_git_url + "##{sha1}",nil)]
       }]
     }
     Then {
       @parsed_versions.each do |sha1,code|
-        assert_equal %{<pre><code class="language-ruby">#{@versions[sha1]}\n</code></pre>},code,"For SHA: #{sha1}"
+        assert_equal %{<article class='code-listing'><pre><code class="language-ruby">#{@versions[sha1]}\n</code></pre><footer><h1>foo.rb</h1></footer></article>},code,"For SHA: #{sha1}"
       end
     }
   end
@@ -82,12 +111,12 @@ class RendererTest < Test::Unit::TestCase
     Given a_git_repo_with_two_tagged_verions_of_file("foo.rb")
     When {
       @parsed_versions = Hash[@versions.map { |tagname,_|
-        [tagname, Bookingit::Renderer.new.block_code(@file_git_url + "##{tagname}",nil)]
+        [tagname, renderer.block_code(@file_git_url + "##{tagname}",nil)]
       }]
     }
     Then {
       @parsed_versions.each do |tagname,code|
-        assert_equal %{<pre><code class="language-ruby">#{@versions[tagname]}\n</code></pre>},code,"For Tag: #{tagname}"
+        assert_equal %{<article class='code-listing'><pre><code class="language-ruby">#{@versions[tagname]}\n</code></pre><footer><h1>foo.rb</h1></footer></article>},code,"For Tag: #{tagname}"
       end
     }
   end
@@ -96,10 +125,25 @@ class RendererTest < Test::Unit::TestCase
     Given a_git_repo_with_two_tagged_verions_of_file("foo.rb")
     When {
       url = @file_git_url + "#" + @versions.keys[0] + ".." + @versions.keys[1]
-      @html = Bookingit::Renderer.new.block_code(url,nil)
+      @html = renderer.block_code(url,nil)
+    }
+    Then {
+      assert_match /<article class=\'code-listing\'><pre><code class=\"language-diff\">diff --git/,@html
+      assert_match /a\/foo.rb b\/foo.rb/,@html
+      assert_match /index [a-z0-9]+..[a-z0-9]+ 100644/,@html
+      assert_match /\-\-\- a\/foo.rb/,@html
+      assert_match /\+\+\+ b\/foo.rb/,@html
+    }
+  end
+
+  test_that "a git url with a compact diff spec shows the diff, too" do
+    Given a_git_repo_with_two_tagged_verions_of_file("foo.rb")
+    When {
+      url = @file_git_url + "#.." + @versions.keys[1]
+      @html = renderer.block_code(url,nil)
     }
     Then {
-      assert_match /<pre><code class=\"language-diff\">diff --git/,@html
+      assert_match /<article class=\'code-listing\'><pre><code class=\"language-diff\">diff --git/,@html
       assert_match /a\/foo.rb b\/foo.rb/,@html
       assert_match /index [a-z0-9]+..[a-z0-9]+ 100644/,@html
       assert_match /\-\-\- a\/foo.rb/,@html
@@ -107,6 +151,44 @@ class RendererTest < Test::Unit::TestCase
     }
   end
 
+  test_that "a git url with a shell command runs that command on that version of the repo" do
+    Given a_git_repo_with_two_tagged_verions_of_file("foo.rb")
+    When {
+      @version = @versions.keys[0]
+      git_url = @file_git_url.gsub(/\/foo.rb/,'/')
+      @html = renderer.block_code("#{git_url}##{@version}!cat foo.rb",nil)
+    }
+    Then {
+      assert_equal %{<article class='code-listing'><pre><code class="language-shell">&gt; cat foo.rb\n#{@versions[@version]}\n</code></pre></article>},@html
+    }
+  end
+
+  test_that "a git url with a shell command that exits nonzero raises an error" do
+    Given a_git_repo_with_two_tagged_verions_of_file("foo.rb")
+    When {
+      @version = @versions.keys[0]
+      git_url = @file_git_url.gsub(/\/foo.rb/,'/')
+      @executable = -> {
+        renderer.block_code("#{git_url}##{@version}!cat blah.rb",nil)
+      }
+    }
+    Then {
+      assert_raise Bookingit::UnexpectedShellCommandExit,&@executable
+    }
+  end
+
+  test_that "a git url with a shell command that exits nonzero doesn't raise an error if we indicate as such" do
+    Given a_git_repo_with_two_tagged_verions_of_file("foo.rb")
+    When {
+      @version = @versions.keys[0]
+      git_url = @file_git_url.gsub(/\/foo.rb/,'/')
+      @html = renderer.block_code("#{git_url}##{@version}!cat blah.rb!nonzero",nil)
+    }
+    Then {
+      refute_nil @html
+    }
+  end
+
   test_that "an sh url will run the given command and put the contents into the output" do
     Given {
       chdir @tempdir do
@@ -119,32 +201,88 @@ class RendererTest < Test::Unit::TestCase
       end
     }
     When {
-      @html = Bookingit::Renderer.new.block_code("sh://#{@tempdir}/play#ls -1",nil)
+      @html = renderer.block_code("sh://play#ls -1",nil)
     }
     Then {
-      assert_equal %{<pre><code class="language-shell">&gt; ls -1
+      assert_equal %{<article class='code-listing'><pre><code class="language-shell">&gt; ls -1
 bar
 blah
 quux
-</code></pre>},@html
+</code></pre></article>},@html
+    }
+  end
+
+  test_that "an sh url that exits nonzero will raise" do
+    Given {
+      chdir @tempdir do
+        mkdir "play"
+        chdir "play" do
+          system "touch blah"
+          system "touch bar"
+          system "touch quux"
+        end
+      end
+    }
+    When {
+      @executable = -> { renderer.block_code("sh://play#cat bleorgh",nil) }
+    }
+    Then {
+      assert_raise Bookingit::UnexpectedShellCommandExit, &@executable
+    }
+  end
+
+  test_that "an sh url that exits nonzero but we expect it to will not raise" do
+    Given {
+      chdir @tempdir do
+        mkdir "play"
+        chdir "play" do
+          system "touch blah"
+          system "touch bar"
+          system "touch quux"
+        end
+      end
+    }
+    When {
+      @html = renderer.block_code("sh://play#cat bleorgh!nonzero",nil)
+    }
+    Then {
+      refute_nil @html
     }
   end
 
   test_that "we pass through inline code blocks" do
     When {
-      @html = Bookingit::Renderer.new.block_code("class Foo", 'coffeescript')
+      @html = renderer.block_code("class Foo", 'coffeescript')
     }
     Then {
-      assert_equal %{<pre><code class="language-coffeescript">class Foo</code></pre>},@html
+      assert_equal %{<article class='code-listing'><pre><code class="language-coffeescript">class Foo</code></pre></article>},@html
     }
   end
 
   test_that "we omit the language class if it's not provided in inline code" do
     When {
-      @html = Bookingit::Renderer.new.block_code("class Foo", nil)
+      @html = renderer.block_code("class Foo", nil)
+    }
+    Then {
+      assert_equal %{<article class='code-listing'><pre><code class="">class Foo</code></pre></article>},@html
+    }
+  end
+
+  test_that "we can cache results between calls" do
+    Given a_git_repo_with_two_tagged_verions_of_file("foo.rb")
+    And {
+      @cachedir = File.join(@tempdir,'cache')
+      @renderer = renderer(cache: @cachedir)
+      @version  = @versions.keys[0]
+      @url      = "#{@file_git_url.gsub(/\/foo.rb/,'/')}##{@version}!cat foo.rb"
+      @html     = @renderer.block_code(@url,nil)
+    }
+    When {
+      @html2 = @renderer.block_code(@url,nil)
     }
     Then {
-      assert_equal %{<pre><code>class Foo</code></pre>},@html
+      assert_equal %{<article class='code-listing'><pre><code class="language-shell">&gt; cat foo.rb\n#{@versions[@version]}\n</code></pre></article>},@html
+      assert_equal @html,@html2
     }
   end
 
@@ -179,7 +317,7 @@ end}
         create_and_commit_file(file,code)
         # make sure test doesn't get the HEAD version
       end
-      @file_git_url = "git://#{File.join(@tempdir,'git_repo.git')}/#{file}"
+      @file_git_url = "git://git_repo.git/#{file}"
     }
   end
 
@@ -207,7 +345,7 @@ end}
         create_and_commit_file(file,code)
         # make sure test doesn't get the HEAD version
       end
-      @file_git_url = "git://#{File.join(@tempdir,'git_repo.git')}/#{file}"
+      @file_git_url = "git://git_repo.git/#{file}"
     }
   end
 
@@ -232,13 +370,24 @@ end}
 end}
         create_and_commit_file(file,@code)
       end
-      @file_git_url = "git://#{File.join(@tempdir,'git_repo.git')}/#{file}"
+      @file_git_url = "git://git_repo.git/#{file}"
+    }
+  end
+
+  def render_file_url_code_block(options={})
+    -> {
+      @html = renderer(options).block_code("file://#{@path.gsub(/#{Regexp.escape(@tempdir)}\/?/,'')}",nil)
     }
   end
 
-  def render_file_url_code_block
+  def a_file_named(filename)
     -> {
-      @html = Bookingit::Renderer.new.block_code("file://#{@path}",nil)
+      @code = %{#{any_string}
+}
+      @path = File.join(@tempdir,filename)
+      File.open(@path,'w') do |file|
+        file.puts @code
+      end
     }
   end
 
@@ -246,6 +395,7 @@ end}
     -> {
       file = Tempfile.new(['foo',extension])
       @path = file.path
+      @relative_path = @path.gsub(Regexp.escape(@tempdir),'')
       @code = contents
       File.open(@path,'w') do |file|
         file.puts @code