showoff 0.19.4 → 0.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2e85b3d4cb3a4ca82c5534fd4b927092f3f3644
-  data.tar.gz: 7db65a31bb8715347d29cad31126b289580c6dd0
+SHA256:
+  metadata.gz: 4f74f67db7b91942fb6a135c5f66e7624653f5946ba59d4674773b2fdb386a95
+  data.tar.gz: c063015a1a32fd35ea7b10ee2033f725c35345fe57f2f8d6c902a98d4116884c
 SHA512:
-  metadata.gz: e1eb97c5ad914d5a80335e0787a6672b031aa051d0ec0761f6d7ff345dc8fbdcd92c7504b81765b587b4caeb24926a0e61f93e33a95bf82e3a9c2408d087c39d
-  data.tar.gz: cae2c69158bb9c9fd86b9169ed6c1a802ee779ffc7171aa66f835df4025c6cba6892b447e8d1c91334b781458d43a626716343788ad9dd0a85bc2576f53200be
+  metadata.gz: 00dc6115962031eeb962d7fc46d7d5e7e443e9a2f033fc9b5994305364f143472cb651a5ba37802ee095318099e14a1ddf63357be37a51ba824c4dd2d10519cd
+  data.tar.gz: 676ddf144a82192920808f2caa8b352e630449dcbc0ee19abf147f73069e3e749d0d199225ca94b92c7ea32753328c312b9c3d274a42958019ce68d5771f41e8

data/Rakefile

@@ -67,21 +67,33 @@ task 'doc:website' => [:doc] do
   end
 end
 
-desc "Run tests"
-task :test do
-  require 'rake/testtask'
-
-  Rake::TestTask.new do |t|
-    t.libs << 'lib'
-    t.pattern = 'test/**/*_test.rb'
-    t.verbose = false
+# These tests are currently unmaintained.
+# @todo: port and delete
+#
+# desc "Run tests"
+# task :test do
+#   require 'rake/testtask'
+#
+#   Rake::TestTask.new do |t|
+#     t.libs << 'lib'
+#     t.pattern = 'test/**/*_test.rb'
+#     t.verbose = false
+#   end
+#
+#   suffix = "-n #{ENV['TEST']}" if ENV['TEST']
+#   sh "turn test/*_test.rb #{suffix}"
+# end
+
+desc "Run RSpec unit tests"
+task :spec do
+  ENV["LOG_SPEC_ORDER"] = "true"
+  if ENV['verbose'] == 'true'
+    sh %{rspec #{ENV['TEST'] || ENV['TESTS'] || 'spec'} -fd}
+  else
+    sh %{rspec #{ENV['TEST'] || ENV['TESTS'] || 'spec'}}
   end
-
-  suffix = "-n #{ENV['TEST']}" if ENV['TEST']
-  sh "turn test/*_test.rb #{suffix}"
 end
 
-
 desc 'Validate translation files'
 task 'lang:check' do
   require 'yaml'

data/bin/showoff

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'showoff'
+#require 'showoff'
 require 'showoff/version'
 require 'rubygems'
 require 'fidget'
@@ -16,7 +16,7 @@ module Wrapper
   program_desc <<-desc
   A web based presentation engine with awesome interaction features.
 
-    ShowOff uses Markdown files with a few custom extensions to generate slides
+    Showoff uses Markdown files with a few custom extensions to generate slides
     that are served locally for presentation via web browser. Your audience can
     view presentations directly as well, and interact with you in many ways.
 
@@ -28,7 +28,8 @@ module Wrapper
     The simplest use case is to run `showoff serve` from the directory containing
     the showoff.json file.
   desc
-
+  switch :dev, :desc => "Use the next-gen development version of Showoff"
+  switch :debug, :desc => "Show application backtraces on crash"
 
   desc 'Create new showoff presentation'
   long_desc 'This command helps start a new showoff presentation by setting up the proper directory structure for you.  It takes the directory name you would like showoff to create for you.'
@@ -43,9 +44,9 @@ module Wrapper
 
     c.action do |global_options,options,args|
       dir_name = args.first || '.'
-      ShowOffUtils.create(dir_name,!options[:n],options[:d])
+      ShowoffUtils.create(dir_name,!options[:n],options[:d])
       if options[:n]
-        puts "Add slides and update #{dir_name}/#{ShowOffUtils.presentation_config_file}"
+        puts "Add slides and update #{dir_name}/#{ShowoffUtils.presentation_config_file}"
       end
       if args.empty?
         puts "Run 'showoff serve' to see your new slideshow"
@@ -63,7 +64,7 @@ module Wrapper
     c.flag [:f,:file]
 
     c.action do |global_options,options,args|
-      ShowOffUtils.skeleton(options[:f])
+      ShowoffUtils.skeleton(options[:f])
       puts "done. run 'showoff serve' to see your slideshow"
     end
   end
@@ -79,7 +80,7 @@ module Wrapper
     c.switch [:j,:json]
 
     c.action do |global_options,options,args|
-      ShowOffUtils.info(options[:f], options[:j])
+      ShowoffUtils.info(options[:f], options[:j])
     end
   end
 
@@ -91,7 +92,7 @@ module Wrapper
     c.flag [:f,:file]
 
     c.action do |global_options,options,args|
-      ShowOffUtils.validate(options[:f])
+      ShowoffUtils.validate(options[:f])
     end
   end
 
@@ -100,7 +101,7 @@ module Wrapper
   command :github do |c|
     c.action do |global_options,options,args|
       puts "Generating static content"
-      ShowOffUtils.github
+      ShowoffUtils.github
       puts "I've updated your 'gh-pages' branch with the static version of your presentation."
       puts "Push it to GitHub to publish it. Probably something like:"
       puts
@@ -126,16 +127,16 @@ module Wrapper
       raise "Name must start with a letter and can only contain lowercase letters, numbers, and dashes." unless args.first =~ /^[a-z][a-z1-9-]*$/
 
       unless system('git remote get-url heroku')
-        ShowOffUtils.command("heroku create #{args[0]}", "Please ensure that the heroku gem is installed and you're logged in.")
+        ShowoffUtils.command("heroku create #{args[0]}", "Please ensure that the heroku gem is installed and you're logged in.")
       end
 
-      if ShowOffUtils.heroku(args[0],options[:f],options[:p])
-        ShowOffUtils.command('bundle install', 'Please ensure that the bundler gem is installed.')
+      if ShowoffUtils.heroku(args[0],options[:f],options[:p])
+        ShowoffUtils.command('bundle install', 'Please ensure that the bundler gem is installed.')
 
         begin
-          ShowOffUtils.command('git add Procfile Gemfile Gemfile.lock config.ru')
-          ShowOffUtils.command('git commit -m "Herokuized by Showoff"')
-          ShowOffUtils.command('git push heroku master')
+          ShowoffUtils.command('git add Procfile Gemfile Gemfile.lock config.ru')
+          ShowoffUtils.command('git commit -m "Herokuized by Showoff"')
+          ShowoffUtils.command('git push heroku master')
         rescue => e
           puts 'Git operations failed. Please correct issues, then manually commit the following files:'
           puts ' * Procfile'
@@ -212,7 +213,7 @@ module Wrapper
 
       # This is gross. A serious revamp in config file parsing is due.
       config = JSON.parse(File.read(options[:f])) rescue {}
-      if Gem::Version.new(config['version']) > Gem::Version.new(SHOWOFF_VERSION) then
+      if Gem::Version.new(config['version'].to_s) > Gem::Version.new(SHOWOFF_VERSION) then
         raise "This presentation requires Showoff version #{config['version']} or greater."
       end
 
@@ -239,7 +240,7 @@ module Wrapper
       puts "
   -------------------------
 
-  Your ShowOff presentation is now starting up.
+  Your Showoff presentation is now starting up.
 
   To view it plainly, visit [ #{url} ]
 
@@ -255,8 +256,8 @@ module Wrapper
       end
 
       if options[:url]
-        ShowOffUtils.clone(options[:git_url], options[:git_branch], options[:git_path]) do
-          ShowOff.run!(options) do |server|
+        ShowoffUtils.clone(options[:git_url], options[:git_branch], options[:git_path]) do
+          Showoff.run!(options) do |server|
             if options[:ssl]
               server.ssl         = true
               server.ssl_options = ssl_options
@@ -265,7 +266,7 @@ module Wrapper
         end
 
       else
-        ShowOff.run!(options) do |server|
+        Showoff.run!(options) do |server|
           if options[:ssl]
             server.ssl         = true
             server.ssl_options = ssl_options
@@ -302,7 +303,7 @@ module Wrapper
 
     c.action do |global_options,options,args|
       title = args.join(" ")
-      ShowOffUtils.add_slide(:dir => options[:d],
+      ShowoffUtils.add_slide(:dir => options[:d],
                              :name => options[:n],
                              :title => title,
                              :number => !options[:u],
@@ -323,7 +324,7 @@ module Wrapper
     c.flag [:l, :lang, :language, :locale]
 
     c.action do |global_options,options,args|
-      ShowOff.do_static(args, options)
+      Showoff.do_static(args, options)
     end
   end
 
@@ -331,15 +332,37 @@ module Wrapper
   arg_name 'name'
   long_desc 'Creates a PDF version of the presentation as {name}.pdf'
   command [:pdf] do |c|
+    c.desc 'JSON file used to describe presentation'
+    c.default_value "showoff.json"
+    c.flag [:f, :file, :pres_file]
+
+    c.desc 'Language code to generate.'
+    c.flag [:l, :lang, :language, :locale]
+
     c.action do |global_options,options,args|
-      ShowOff.do_static(['pdf'].concat args)
+      Showoff.do_static(['pdf'].concat(args), options)
     end
   end
 
   pre do |global,command,options,args|
     # Pre logic here
-    # Return true to proceed; false to abourt and not call the
+    # Return true to proceed; false to abort and not call the
     # chosen command
+
+    if global[:debug]
+      ENV['GLI_DEBUG'] = 'true'
+    end
+
+    if global[:dev]
+      require 'showoff_ng'
+
+      if options[:file]
+        Showoff::Config.load(options[:file])
+      end
+    else
+      require 'showoff'
+    end
+
     true
   end
 

data/lib/keymap.rb

@@ -1,14 +1,21 @@
 module Keymap
   def self.default()
     {
-      'space'       => 'NEXT',
       'd'           => 'DEBUG',
-      'up'          => 'PREV',
-      'left'        => 'PREV',
-      'pageup'      => 'PREVSEC',
+      'space'       => 'NEXT',
       'down'        => 'NEXT',
       'right'       => 'NEXT',
-      'pagedown'    => 'NEXTSEC',
+      'pagedown'    => 'NEXT',
+      'up'          => 'PREV',
+      'left'        => 'PREV',
+      'pageup'      => 'PREV',
+      'SPACE'       => 'NEXTSEC',
+      'DOWN'        => 'NEXTSEC',
+      'RIGHT'       => 'NEXTSEC',
+      'PAGEDOWN'    => 'NEXTSEC',
+      'UP'          => 'PREVSEC',
+      'LEFT'        => 'PREVSEC',
+      'PAGEUP'      => 'PREVSEC',
       'R'           => 'RELOAD',
       'r'           => 'REFRESH',
       'c'           => 'CONTENTS',
@@ -169,6 +176,13 @@ module Keymap
       "`"           => "~",
       "="           => "+",
       "-"           => "_",
+      "space"       => "SPACE",
+      "down"        => "DOWN",
+      "right"       => "RIGHT",
+      "pagedown"    => "PAGEDOWN",
+      "up"          => "UP",
+      "left"        => "LEFT",
+      "pageup"      => "PAGEUP",
     }
   end
 

data/lib/showoff.rb

@@ -28,7 +28,7 @@ end
 
 require 'tilt'
 
-class ShowOff < Sinatra::Application
+class Showoff < Sinatra::Application
 
   attr_reader :cached_image_size
 
@@ -92,13 +92,13 @@ class ShowOff < Sinatra::Application
 
     settings.pres_dir = File.expand_path(settings.pres_dir)
     if (settings.pres_file and settings.pres_file != 'showoff.json')
-      ShowOffUtils.presentation_config_file = settings.pres_file
+      ShowoffUtils.presentation_config_file = settings.pres_file
     end
 
     # Load configuration for page size and template from the
     # configuration JSON file
-    if File.exist?(ShowOffUtils.presentation_config_file)
-      showoff_json = JSON.parse(File.read(ShowOffUtils.presentation_config_file))
+    if File.exist?(ShowoffUtils.presentation_config_file)
+      showoff_json = JSON.parse(File.read(ShowoffUtils.presentation_config_file))
       settings.showoff_config = showoff_json
 
       # Set options for encoding, template and page size
@@ -164,9 +164,6 @@ class ShowOff < Sinatra::Application
     @pres_name = settings.pres_dir.split('/').pop
     require_ruby_files
 
-    # Default asset path
-    @asset_path = "./"
-
     # invert the logic to maintain backwards compatibility of interactivity on by default
     @interactive = ! settings.standalone rescue false
 
@@ -208,7 +205,7 @@ class ShowOff < Sinatra::Application
       Thread.new do
         loop do
           sleep 30
-          ShowOff.flush
+          Showoff.flush
         end
       end
     end
@@ -217,7 +214,7 @@ class ShowOff < Sinatra::Application
     MarkdownConfig::setup(settings.pres_dir)
 
     # Process renderer config options
-    @engine_options = ShowOffUtils.showoff_renderer_options(settings.pres_dir)
+    @engine_options = ShowoffUtils.showoff_renderer_options(settings.pres_dir)
 
   end
   # save stats to disk
@@ -248,7 +245,7 @@ class ShowOff < Sinatra::Application
 
   def self.pres_dir_current
     opt = {:pres_dir => Dir.pwd}
-    ShowOff.set opt
+    Showoff.set opt
   end
 
   def require_ruby_files
@@ -257,11 +254,15 @@ class ShowOff < Sinatra::Application
 
   helpers do
     def css_files
-      Dir.glob("#{settings.pres_dir}/*.css").map { |path| File.basename(path) }
+      base  = Dir.glob("#{settings.pres_dir}/*.css").map { |path| File.basename(path) }
+      extra = Array(settings.showoff_config['styles'])
+      base + extra
     end
 
     def js_files
-      Dir.glob("#{settings.pres_dir}/*.js").map { |path| File.basename(path) }
+      base  = Dir.glob("#{settings.pres_dir}/*.js").map { |path| File.basename(path) }
+      extra = Array(settings.showoff_config['scripts'])
+      base + extra
     end
 
     def preshow_files
@@ -316,10 +317,12 @@ class ShowOff < Sinatra::Application
 
     # return a hash of all language codes available and the long name description of each
     def language_names
-      Dir.glob('locales/*').inject({}) do |memo, entry|
-        next memo unless File.directory? entry
+      strings = JSON.parse(File.read('locales/strings.json')) rescue {}
+      locales = Dir.glob('locales/*')
+                   .select {|f| File.directory?(f) }
+                   .map    {|f| File.basename(f)   }
 
-        locale = File.basename(entry)
+      (strings.keys + locales).inject({}) do |memo, locale|
         memo.update(locale => get_language_name(locale))
       end
     end
@@ -366,7 +369,7 @@ class ShowOff < Sinatra::Application
 
         # Parse the context string for options and content classes
         if context and context.match(/(\[(.*?)\])?(.*)/)
-          options = ShowOffUtils.parse_options($2)
+          options = ShowoffUtils.parse_options($2)
           @tpl = options["tpl"] if options["tpl"]
           @bg = options["bg"] if options["bg"]
           @classes += $3.strip.chomp('>').split if $3
@@ -506,6 +509,7 @@ class ShowOff < Sinatra::Application
 
         # Apply the template to the slide and replace the key to generate the content of the slide
         sl = process_content_for_replacements(template.gsub(/~~~CONTENT~~~/, slide.text))
+        sl = process_content_for_language(sl, I18n.locale)
         sl = Tilt[:markdown].new(nil, nil, @engine_options) { sl }.render
         sl = build_forms(sl, content_classes)
         sl = update_p_classes(sl)
@@ -535,6 +539,21 @@ class ShowOff < Sinatra::Application
       final
     end
 
+    def process_content_for_language(content, locale)
+        lang = locale.to_s.split('-').first
+        result = content
+
+        content.scan(/^((~~~LANG:([\w-]+)~~~\n)(.+?)(\n~~~ENDLANG~~~\n))/m).each do |match|
+            if match[2] == lang or match[2] == locale.to_s
+                result.sub!(match[0], match[3])
+            else
+                result.sub!(match[0], "\n")
+            end
+        end
+
+        result
+    end
+
     # This method processes the content of the slide and replaces
     # content markers with their actual value information
     def process_content_for_replacements(content)
@@ -554,7 +573,21 @@ class ShowOff < Sinatra::Application
 
       # Now check for any kind of options
       content.scan(/(~~~CONFIG:(.*?)~~~)/).each do |match|
-        result.gsub!(match[0], settings.showoff_config[match[1]]) if settings.showoff_config.key?(match[1])
+        parts = match[1].split('.') # Use dots ('.') to separate Hash keys
+        if parts.size > 1
+          value = settings.showoff_config.dig(parts[0]).to_h.dig(*parts[1..-1])
+        else
+          value = settings.showoff_config.fetch(parts[0],nil)
+        end
+
+        unless value.is_a?(String)
+          msg = "#{match[0]} refers to a non-String data type (#{value.class})"
+          msg = "#{match[0]}: not found in settings data" if value.nil?
+          @logger.warn(msg)
+          next
+        end
+
+        result.gsub!(match[0], value)
       end
 
       # Load and replace any file tags
@@ -571,8 +604,11 @@ class ShowOff < Sinatra::Application
         result.gsub!(match[0], "<pre class=\"highlight\"><code class=\"#{css}\">#{file}</code></pre>")
       end
 
-      result.gsub!(/\[(fa-.*)\]/, '<i class="fa \1"></i>')
+      result.gsub!(/\[(fa\w?)-(\S*)\]/, '<i class="\1 fa-\2"></i>')
 
+      # For fenced code blocks, translate the space separated classes into one
+      # colon separated string so Commonmarker doesn't ignore the rest
+      result.gsub!(/^`{3} *(.+)$/) {|s| "``` #{$1.split.join(':')}"}
 
       result
     end
@@ -820,7 +856,7 @@ class ShowOff < Sinatra::Application
         tools << "<input type=\"button\" class=\"display\" value=\"#{I18n.t('forms.display')}\">"
         tools << "<input type=\"submit\" class=\"save\" value=\"#{I18n.t('forms.save')}\" disabled=\"disabled\">"
         tools << '</div>'
-        form  = "<form id='#{title}' action='/form/#{title}' method='POST'>#{content}#{tools}</form>"
+        form  = "<form id='#{title}' action='form/#{title}' method='POST'>#{content}#{tools}</form>"
         doc = Nokogiri::HTML::DocumentFragment.parse(form)
         doc.css('p').each do |p|
           if p.text =~ /^(\w*) ?(?:->)? ?(.*)? (\*?)= ?(.*)?$/
@@ -1043,11 +1079,11 @@ class ShowOff < Sinatra::Application
 
       case
       when opts[:static] && opts[:pdf]
-        replacement_prefix = "file://#{settings.pres_dir}/"
+        replacement_prefix = "file://#{settings.pres_dir}"
       when opts[:static]
-        replacement_prefix = "./file/"
+        replacement_prefix = './file'
       else
-        replacement_prefix = "#{@asset_path}image/"
+        replacement_prefix = 'image'
       end
 
       doc.css('img').each do |img|
@@ -1081,8 +1117,10 @@ class ShowOff < Sinatra::Application
           # catch fenced code blocks from commonmarker
           if (lang and lang.start_with? 'language-' )
             pre.set_attribute('class', 'highlight')
+            # turn the colon separated name back into classes
+            code.set_attribute('class', lang.gsub(':', ' '))
 
-          # or weve started a code block with a Showoff language tag
+          # or we've started a code block with a Showoff language tag
           elsif out.strip[0, 3] == '@@@'
             lines = out.split("\n")
             lang  = lines.shift.gsub('@@@', '').strip
@@ -1127,7 +1165,7 @@ class ShowOff < Sinatra::Application
     def get_slides_html(opts={:static=>false, :pdf=>false, :toc=>false, :supplemental=>nil, :section=>nil})
       sections = nil
       Dir.chdir(get_locale_dir('locales', @locale)) do
-        sections = ShowOffUtils.showoff_sections(settings.pres_dir, settings.showoff_config, @logger)
+        sections = ShowoffUtils.showoff_sections(settings.pres_dir, settings.showoff_config, @logger)
       end
 
       if sections
@@ -1195,11 +1233,9 @@ class ShowOff < Sinatra::Application
 
     def index(static=false)
       if static
-        @title = ShowOffUtils.showoff_title(settings.pres_dir)
+        @title = ShowoffUtils.showoff_title(settings.pres_dir)
         @slides = get_slides_html(:static=>static)
-        @pause_msg = ShowOffUtils.pause_msg
-
-        @asset_path = "./"
+        @pause_msg = ShowoffUtils.pause_msg
       end
 
       # Display favicon in the window if configured
@@ -1281,7 +1317,7 @@ class ShowOff < Sinatra::Application
       @logger.info "Generating locale: #{@locale}"
 
       # If we're displaying from a repository, let's update it
-      ShowOffUtils.update(settings.verbose) if settings.url
+      ShowoffUtils.update(settings.verbose) if settings.url
 
       @@slide_titles = []
       content = get_slides_html(:static=>static, :merged=>merged)
@@ -1291,9 +1327,14 @@ class ShowOff < Sinatra::Application
       content
     end
 
-    def print(section=nil)
+    def print(section=nil, munged=false)
       @slides = get_slides_html(:static=>true, :toc=>true, :print=>true, :section=>section)
       @favicon = settings.showoff_config['favicon']
+
+      unless munged
+        @baseurl = '../' * section.split('/').count
+      end
+
       erb :onepage
     end
 
@@ -1423,7 +1464,7 @@ class ShowOff < Sinatra::Application
 
       # PDFKit.new takes the HTML and any options for wkhtmltopdf
       # run `wkhtmltopdf --extended-help` for a full list of options
-      kit = PDFKit.new(html, ShowOffUtils.showoff_pdf_options(settings.pres_dir))
+      kit = PDFKit.new(html, ShowoffUtils.showoff_pdf_options(settings.pres_dir))
 
       # Save the PDF to a file
       kit.to_file(name)
@@ -1437,11 +1478,11 @@ class ShowOff < Sinatra::Application
       what   = args[0] || "index"
       opt    = args[1]
 
-      ShowOffUtils.presentation_config_file = opts[:f]
+      ShowoffUtils.presentation_config_file = opts[:f]
 
       # Sinatra now aliases new to new!
       # https://github.com/sinatra/sinatra/blob/v1.3.3/lib/sinatra/base.rb#L1369
-      showoff = ShowOff.new!
+      showoff = Showoff.new!
 
       name = showoff.instance_variable_get(:@pres_name)
       path = showoff.instance_variable_get(:@root_path)
@@ -1457,7 +1498,7 @@ class ShowOff < Sinatra::Application
         data = showoff.send(what, opt)
       when 'print'
         opt ||= 'handouts'
-        data = showoff.send(what, opt)
+        data = showoff.send(what, opt, true)
       else
         data = showoff.send(what, true)
       end
@@ -1477,6 +1518,8 @@ class ShowOff < Sinatra::Application
         ["js", "css"].each { |dir|
           FileUtils.copy_entry("#{my_path}/#{dir}", "#{out}/#{dir}", false, false, true)
         }
+
+        # @todo: uh. I don't know how this ever worked. my_path is showoff and name is presentation.
         # And copy the directory
         Dir.glob("#{my_path}/#{name}/*").each { |subpath|
           base = File.basename(subpath)
@@ -1491,8 +1534,15 @@ class ShowOff < Sinatra::Application
         pres_dir = showoff.settings.pres_dir
 
         # ..., copy all user-defined styles and javascript files
-        Dir.glob("#{pres_dir}/*.{css,js}").each { |path|
-          FileUtils.copy(path, File.join(file_dir, File.basename(path)))
+        showoff.css_files.each { |path|
+          dest = File.join(out, path)
+          FileUtils.mkdir_p(File.dirname(dest))
+          FileUtils.copy(path, dest)
+        }
+        showoff.js_files.each { |path|
+          dest = File.join(out, path)
+          FileUtils.mkdir_p(File.dirname(dest))
+          FileUtils.copy(path, dest)
         }
 
         # ... and copy all needed image files
@@ -1508,12 +1558,16 @@ class ShowOff < Sinatra::Application
           end
         end
         # copy images from css too
-        Dir.glob("#{pres_dir}/*.css").each do |css_path|
+        showoff.css_files.each do |css_path|
           File.open(css_path) do |file|
             data = file.read
             data.scan(/url\([\"\']?(?!https?:\/\/)(.*?)[\"\']?\)/).flatten.each do |path|
               path.gsub!(/(\#.*)$/, '') # get rid of the anchor
               path.gsub!(/(\?.*)$/, '') # get rid of the query
+
+              # resolve relative paths in the stylesheet
+              path = "#{File.dirname(css_path)}/#{path}" unless path.start_with? '/'
+
               logger.debug path
               dir = File.dirname(path)
               FileUtils.makedirs(File.join(file_dir, dir))
@@ -1917,8 +1971,8 @@ class ShowOff < Sinatra::Application
   # gawd, this whole routing scheme is bollocks
   get %r{/([^/]*)/?([^/]*)} do
     @locale    = locale(request.cookies['locale'])
-    @title     = ShowOffUtils.showoff_title(settings.pres_dir)
-    @pause_msg = ShowOffUtils.pause_msg
+    @title     = ShowoffUtils.showoff_title(settings.pres_dir)
+    @pause_msg = ShowoffUtils.pause_msg
     what = params[:captures].first
     opt  = params[:captures][1]
     what = 'index' if "" == what
@@ -1929,12 +1983,12 @@ class ShowOff < Sinatra::Application
       locked!
     end
 
-    @asset_path = env['SCRIPT_NAME'] == '' ? nil : env['SCRIPT_NAME'].gsub(/^\/?/, '/').gsub(/\/?$/, '/')
-
     begin
       if (what != "favicon.ico")
         if ['supplemental', 'print'].include? what
           data = send(what, opt)
+        elsif File.file? what
+          data = File.open(what)
         else
           data = send(what)
         end
@@ -1953,14 +2007,12 @@ class ShowOff < Sinatra::Application
   end
 
   not_found do
-    # Why does the asset path start from cwd??
-    @asset_path.slice!(/^./) rescue nil
     @env = request.env
     erb :'404'
   end
 
   at_exit do
-    ShowOff.flush
+    Showoff.flush
   end
 
 end