showoff 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 172a00f574e54f000a40fad51bfeb2136ca176d0
-  data.tar.gz: f0702e207b967d9a6328de5a4b47a627553b45db
+  metadata.gz: c0547aee458c3417a677758cdf70ea8a063e2d89
+  data.tar.gz: ecb30bc4b56493533a5b70327cedec5b75d2475f
 SHA512:
-  metadata.gz: 6fab38a39045cd59cf80ee4acc9d29980d7d2f7693eb471207fdae0a5547ee82481152bd9522e658b33a23018f4e4382efb67b054878b2b89bcf075dec87d554
-  data.tar.gz: 14f92c4fc37add9e2f8eedacbc2c04b474acf71ddc3acc4526b11f53be1e469e94c1d3eee936e6cf2f23b85ab825935dae5c9d14efb8794057d5d82d299aa6f3
+  metadata.gz: 58700ccb6dd6d381acb170486ceb0723150a4b6b3e1fd4e8d9be4cb8aa20f10b63c6edc37c4e66a69da546759f5bbbf0e81aaafe949c7c5ba76abd56afea370c
+  data.tar.gz: 1100e728e8f85fdba9966c861d2ada537967cd3f985290774958a2058562b959a72c5f9f682b56fe4ce9184ef6eadf5b3294bc009e5d6076a00fbbb435250a49

data/bin/showoff

@@ -58,6 +58,20 @@ command [:create,:init] do |c|
   end
 end
 
+desc 'Build a showoff presentation from a showoff.json outling'
+arg_name 'dir_name'
+long_desc 'This command helps start a new showoff presentation by creating each slide listing in the showoff.json file.'
+command [:skeleton] do |c|
+
+  c.desc 'alternate json filename'
+  c.flag [:f,:file]
+
+  c.action do |global_options,options,args|
+    ShowOffUtils.skeleton(options[:f])
+    puts "done. run 'showoff serve' to see your slideshow"
+  end
+end
+
 desc 'Puts your showoff presentation into a gh-pages branch'
 long_desc 'Generates a static version of your presentation into your gh-pages branch for publishing to GitHub Pages'
 command :github do |c|
@@ -125,6 +139,9 @@ command :serve do |c|
   c.desc 'Enable remote code execution'
   c.switch [:x, :executecode]
 
+  c.desc 'Run in standalone mode, with no audience interaction'
+  c.switch [:S, :standalone]
+
   c.desc 'Disable content caching'
   c.switch :nocache
 
@@ -162,6 +179,7 @@ command :serve do |c|
     options[:ssl]             ||= config['ssl']
     options[:ssl_certificate] ||= config['ssl_certificate']
     options[:ssl_private_key] ||= config['ssl_private_key']
+    options[:standalone]      ||= config['standalone']
 
     protocol = options[:ssl] ? 'https' : 'http'
     host     = options[:host] == '0.0.0.0' ? 'localhost' : options[:host]
@@ -179,15 +197,16 @@ To run it from presenter view, go to: [ #{url}/presenter ]
 
 "
 
-    ShowOff.run!( :host      => options[:host],
-                  :port      => options[:port].to_i,
-                  :pres_file => options[:file],
-                  :pres_dir  => args[0],
-                  :verbose   => options[:verbose],
-                  :review    => options[:review],
-                  :execute   => options[:executecode],
-                  :nocache   => options[:nocache],
-                  :bind      => options[:host],
+    ShowOff.run!( :host       => options[:host],
+                  :port       => options[:port].to_i,
+                  :pres_file  => options[:file],
+                  :pres_dir   => args[0],
+                  :verbose    => options[:verbose],
+                  :review     => options[:review],
+                  :execute    => options[:executecode],
+                  :nocache    => options[:nocache],
+                  :bind       => options[:host],
+                  :standalone => options[:standalone],
     ) do |server|
       if options[:ssl]
         ssl_options = {

data/lib/keymap.rb

@@ -24,7 +24,151 @@ module Keymap
       'p'           => 'PAUSE',
       'P'           => 'PRESHOW',
       'x'           => 'EXECUTE',
-      'f5'           => 'EXECUTE',
+      'f5'          => 'EXECUTE',
     }
   end
+
+  def self.keycodeDictionary()
+    {
+      "0"           => "\\",
+      "8"           => "backspace",
+      "9"           => "tab",
+      "12"          => "num",
+      "13"          => "enter",
+      "16"          => "shift",
+      "17"          => "ctrl",
+      "18"          => "alt",
+      "19"          => "pause",
+      "20"          => "caps",
+      "27"          => "esc",
+      "32"          => "space",
+      "33"          => "pageup",
+      "34"          => "pagedown",
+      "35"          => "end",
+      "36"          => "home",
+      "37"          => "left",
+      "38"          => "up",
+      "39"          => "right",
+      "40"          => "down",
+      "44"          => "print",
+      "45"          => "insert",
+      "46"          => "delete",
+      "48"          => "0",
+      "49"          => "1",
+      "50"          => "2",
+      "51"          => "3",
+      "52"          => "4",
+      "53"          => "5",
+      "54"          => "6",
+      "55"          => "7",
+      "56"          => "8",
+      "57"          => "9",
+      "59"          => ";",
+      "61"          => "=",
+      "65"          => "a",
+      "66"          => "b",
+      "67"          => "c",
+      "68"          => "d",
+      "69"          => "e",
+      "70"          => "f",
+      "71"          => "g",
+      "72"          => "h",
+      "73"          => "i",
+      "74"          => "j",
+      "75"          => "k",
+      "76"          => "l",
+      "77"          => "m",
+      "78"          => "n",
+      "79"          => "o",
+      "80"          => "p",
+      "81"          => "q",
+      "82"          => "r",
+      "83"          => "s",
+      "84"          => "t",
+      "85"          => "u",
+      "86"          => "v",
+      "87"          => "w",
+      "88"          => "x",
+      "89"          => "y",
+      "90"          => "z",
+      "91"          => "cmd",
+      "92"          => "cmd",
+      "93"          => "cmd",
+      "96"          => "num_0",
+      "97"          => "num_1",
+      "98"          => "num_2",
+      "99"          => "num_3",
+      "100"         => "num_4",
+      "101"         => "num_5",
+      "102"         => "num_6",
+      "103"         => "num_7",
+      "104"         => "num_8",
+      "105"         => "num_9",
+      "106"         => "num_multiply",
+      "107"         => "num_add",
+      "108"         => "num_enter",
+      "109"         => "num_subtract",
+      "110"         => "num_decimal",
+      "111"         => "num_divide",
+      "112"         => "f1",
+      "113"         => "f2",
+      "114"         => "f3",
+      "115"         => "f4",
+      "116"         => "f5",
+      "117"         => "f6",
+      "118"         => "f7",
+      "119"         => "f8",
+      "120"         => "f9",
+      "121"         => "f10",
+      "122"         => "f11",
+      "123"         => "f12",
+      "124"         => "print",
+      "144"         => "num",
+      "145"         => "scroll",
+      "173"         => "-",
+      "186"         => ";",
+      "187"         => "=",
+      "188"         => ",",
+      "189"         => "-",
+      "190"         => ".",
+      "191"         => "/",
+      "192"         => "`",
+      "219"         => "[",
+      "220"         => "\\",
+      "221"         => "]",
+      "222"         => "'",
+      "223"         => "`",
+      "224"         => "cmd",
+      "225"         => "alt",
+      "57392"       => "ctrl",
+      "63289"       => "num",
+    }
+  end
+
+  def self.shiftedKeyDictionary()
+    {
+      "0"           => ")",
+      "1"           => "!",
+      "2"           => "@",
+      "3"           => "#",
+      "4"           => "$",
+      "5"           => "%",
+      "6"           => "^",
+      "7"           => "&",
+      "8"           => "*",
+      "9"           => "(",
+      "/"           => "?",
+      "."           => ">",
+      ","           => "<",
+      "'"           => "\"",
+      ";"           => ":",
+      "["           => "{",
+      "]"           => "}",
+      "\\"          => "|",
+      "`"           => "~",
+      "="           => "+",
+      "-"           => "_",
+    }
+  end
+
 end

data/lib/showoff.rb

@@ -3,6 +3,7 @@ require 'sinatra/base'
 require 'json'
 require 'nokogiri'
 require 'fileutils'
+require 'pathname'
 require 'logger'
 require 'htmlentities'
 require 'sinatra-websocket'
@@ -14,6 +15,15 @@ require "#{here}/keymap"
 
 begin
   require 'rmagick'
+  puts "********************************************************************************"
+  puts "                    RMagick support has been deprecated."
+  puts
+  puts "CSS auto-scaling has improved greatly, and the image manipulation should no"
+  puts "longer be required. If you have images that don't scale properly, then you"
+  puts "should write custom styles to size them appropriately."
+  puts
+  puts "        RMagic support will be removed completely in the next release."
+  puts "********************************************************************************"
 rescue LoadError
   # nop
 end
@@ -76,6 +86,10 @@ class ShowOff < Sinatra::Application
     @keymap      = Keymap.default
     @keymap.merge! JSON.parse(File.read(keymapfile)) rescue {}
 
+    # map keys to the labels we're using
+    @keycode_dictionary   = Keymap.keycodeDictionary
+    @keycode_shifted_keys = Keymap.shiftedKeyDictionary
+
     settings.pres_dir = File.expand_path(settings.pres_dir)
     if (settings.pres_file)
       ShowOffUtils.presentation_config_file = settings.pres_file
@@ -83,7 +97,7 @@ class ShowOff < Sinatra::Application
 
     # Load configuration for page size and template from the
     # configuration JSON file
-    if File.exists?(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
 
@@ -96,6 +110,24 @@ class ShowOff < Sinatra::Application
     # code execution timeout
     settings.showoff_config['timeout'] ||= 15
 
+    # If favicon in presentation root, use it by default
+    if File.exist? 'favicon.ico'
+      settings.showoff_config['favicon'] ||= 'file/favicon.ico'
+    end
+
+    # default protection levels
+    if settings.showoff_config.has_key? 'password'
+      settings.showoff_config['protected'] ||= ["presenter", "onepage", "print"]
+    else
+      settings.showoff_config['protected'] ||= Array.new
+    end
+
+    if settings.showoff_config.has_key? 'key'
+      settings.showoff_config['locked'] ||= ["slides"]
+    else
+      settings.showoff_config['locked'] ||= Array.new
+    end
+
     # highlightjs syntax style
     @highlightStyle = settings.showoff_config['highlight'] || 'default'
 
@@ -115,8 +147,11 @@ class ShowOff < Sinatra::Application
     # Default asset path
     @asset_path = "./"
 
+    # invert the logic to maintain backwards compatibility of interactivity on by default
+    @interactive = ! settings.standalone rescue false
+
     # Create stats directory
-    FileUtils.mkdir settings.statsdir unless File.directory? settings.statsdir
+    FileUtils.mkdir settings.statsdir unless File.directory? settings.statsdir if @interactive
 
     # Page view time accumulator. Tracks how often slides are viewed by the audience
     begin
@@ -142,11 +177,13 @@ class ShowOff < Sinatra::Application
     @@current   = Hash.new # The current slide that the presenter is viewing
     @@cache     = nil      # Cache slide content for subsequent hits
 
-    # flush stats to disk periodically
-    Thread.new do
-      loop do
-        sleep 30
-        ShowOff.flush
+    if @interactive
+      # flush stats to disk periodically
+      Thread.new do
+        loop do
+          sleep 30
+          ShowOff.flush
+        end
       end
     end
 
@@ -156,24 +193,27 @@ class ShowOff < Sinatra::Application
 
   # save stats to disk
   def self.flush
-    if defined?(@@counter) and not @@counter.empty?
-      File.open("#{settings.statsdir}/#{settings.viewstats}", 'w') do |f|
-        if settings.verbose then
-          f.write(JSON.pretty_generate(@@counter))
-        else
-          f.write(@@counter.to_json)
+    begin
+      if defined?(@@counter) and not @@counter.empty?
+        File.open("#{settings.statsdir}/#{settings.viewstats}", 'w') do |f|
+          if settings.verbose then
+            f.write(JSON.pretty_generate(@@counter))
+          else
+            f.write(@@counter.to_json)
+          end
         end
       end
-    end
 
-    if defined?(@@forms) and not @@forms.empty?
-      File.open("#{settings.statsdir}/#{settings.forms}", 'w') do |f|
-        if settings.verbose then
-          f.write(JSON.pretty_generate(@@forms))
-        else
-          f.write(@@forms.to_json)
+      if defined?(@@forms) and not @@forms.empty?
+        File.open("#{settings.statsdir}/#{settings.forms}", 'w') do |f|
+          if settings.verbose then
+            f.write(JSON.pretty_generate(@@forms))
+          else
+            f.write(@@forms.to_json)
+          end
         end
       end
+    rescue Errno::ENOENT => e
     end
   end
 
@@ -248,7 +288,7 @@ class ShowOff < Sinatra::Application
       end
     end
 
-    def process_markdown(name, content, opts={:static=>false, :pdf=>false, :print=>false, :toc=>false, :supplemental=>nil})
+    def process_markdown(name, content, opts={:static=>false, :pdf=>false, :print=>false, :toc=>false, :supplemental=>nil, :section=>nil})
       if settings.encoding and content.respond_to?(:force_encoding)
         content.force_encoding(settings.encoding)
       end
@@ -337,7 +377,7 @@ class ShowOff < Sinatra::Application
           # We allow specifying a new template even when default is
           # not given.
           if settings.pres_template.include?(slide.tpl) and
-              File.exists?(settings.pres_template[slide.tpl])
+              File.exist?(settings.pres_template[slide.tpl])
             template = File.open(settings.pres_template[slide.tpl], "r").read()
           end
         end
@@ -352,7 +392,7 @@ class ShowOff < Sinatra::Application
         # name the slide. If we've got multiple slides in this file, we'll have a sequence number
         # include that sequence number to index directly into that content
         if seq
-          content += "<div class=\"content #{classes}\" ref=\"#{name}/#{seq.to_s}\">\n"
+          content += "<div class=\"content #{classes}\" ref=\"#{name}:#{seq.to_s}\">\n"
         else
           content += "<div class=\"content #{classes}\" ref=\"#{name}\">\n"
         end
@@ -373,7 +413,7 @@ class ShowOff < Sinatra::Application
         sl = Tilt[:markdown].new(nil, nil, engine_options) { sl }.render
         sl = build_forms(sl, content_classes)
         sl = update_p_classes(sl)
-        sl = process_content_for_section_tags(sl, name)
+        sl = process_content_for_section_tags(sl, name, opts)
         sl = update_special_content(sl, @slide_count, name) # TODO: deprecated
         sl = update_image_paths(name, sl, opts)
 
@@ -430,30 +470,36 @@ class ShowOff < Sinatra::Application
     end
 
     # replace section tags with classed div tags
-    def process_content_for_section_tags(content, name = nil)
+    def process_content_for_section_tags(content, name = nil, opts = {})
       return unless content
 
       # because this is post markdown rendering, we may need to shift a <p> tag around
       # remove the tags if they're by themselves
-      result = content.gsub(/<p>~~~SECTION:([^~]*)~~~<\/p>/, '<div class="\1">')
+      result = content.gsub(/<p>~~~SECTION:([^~]*)~~~<\/p>/, '<div class="notes-section \1">')
       result.gsub!(/<p>~~~ENDSECTION~~~<\/p>/, '</div>')
 
       # shove it around the div if it belongs to the contained element
-      result.gsub!(/(<p>)?~~~SECTION:([^~]*)~~~/, '<div class="\2">\1')
+      result.gsub!(/(<p>)?~~~SECTION:([^~]*)~~~/, '<div class="notes-section \2">\1')
       result.gsub!(/~~~ENDSECTION~~~(<\/p>)?/, '\1</div>')
 
       # Turn this into a document for munging
       doc = Nokogiri::HTML::DocumentFragment.parse(result)
 
+      if opts[:section]
+        doc.css('div.notes-section').each do |section|
+          section.remove unless section.attr('class').split.include? opts[:section]
+        end
+      end
+
       filename = File.join(settings.pres_dir, '_notes', "#{name}.md")
       @logger.debug "personal notes filename: #{filename}"
-      if File.file? filename
+      if [nil, 'notes'].include? opts[:section] and File.file? filename
         # TODO: shouldn't have to reparse config all the time
         engine_options = ShowOffUtils.showoff_renderer_options(settings.pres_dir)
 
         # Make sure we've got a notes div to hang personal notes from
-        doc.add_child '<div class="notes"></div>' if doc.css('div.notes').empty?
-        doc.css('div.notes').each do |section|
+        doc.add_child '<div class="notes-section notes"></div>' if doc.css('div.notes-section.notes').empty?
+        doc.css('div.notes-section.notes').each do |section|
           text = Tilt[:markdown].new(nil, nil, engine_options) { File.read(filename) }.render
           frag = "<div class=\"personal\"><h1>Personal Notes</h1>#{text}</div>"
           note = Nokogiri::HTML::DocumentFragment.parse(frag)
@@ -622,7 +668,7 @@ class ShowOff < Sinatra::Application
         when /^   +\((.+)\)$/                    # (Boston)
           str << "<option value='#{$1}' selected>#{$1}</option>"
         when /^   +\[(.+)\]$/                    # [Boston]
-          str << "<option value='#{$1}' selected>#{$1}</option>"
+          str << "<option value='#{$1}' class='correct'>#{$1}</option>"
         when /^   +([^\(].+[^\),]),?$/           # Boston
           str << "<option value='#{$1}'>#{$1}</option>"
         end
@@ -746,21 +792,32 @@ class ShowOff < Sinatra::Application
     private :update_download_links
 
     def update_image_paths(path, slide, opts={:static=>false, :pdf=>false})
-      paths = path.split('/')
-      paths.pop
-      path = paths.join('/')
-      replacement_prefix = opts[:static] ?
-        ( opts[:pdf] ? %(img src="file://#{settings.pres_dir}/#{path}) : %(img src="./file/#{path}) ) :
-        %(img src="#{@asset_path}image/#{path})
-      slide.gsub(/img src=[\"\'](?!https?:\/\/)([^\/].*?)[\"\']/) do |s|
-        img_path = File.join(path, $1)
-        w, h     = get_image_size(img_path)
-        src      = %(#{replacement_prefix}/#{$1}")
+      doc       = Nokogiri::HTML::DocumentFragment.parse(slide)
+      slide_dir = File.dirname(path)
+
+      case
+      when opts[:static] && opts[:pdf]
+        replacement_prefix = "file://#{settings.pres_dir}/"
+      when opts[:static]
+        replacement_prefix = "./file/"
+      else
+        replacement_prefix = "#{@asset_path}image/"
+      end
+
+      doc.css('img').each do |img|
+        # clean up the path and remove some of the relative nonsense
+        img_path  = Pathname.new(File.join(slide_dir, img[:src])).cleanpath.to_path
+        src       = "#{replacement_prefix}/#{img_path}"
+        img[:src] = src
+
+        # TDOD: deprecated and to be removed
+        w, h      = get_image_size(img_path)
         if w && h
-          src << %( width="#{w}" height="#{h}")
+          img[:width]  = w
+          img[:height] = h
         end
-        src
       end
+      doc.to_html
     end
 
     if defined?(Magick)
@@ -832,7 +889,7 @@ class ShowOff < Sinatra::Application
       html.to_html
     end
 
-    def get_slides_html(opts={:static=>false, :pdf=>false, :toc=>false, :supplemental=>nil})
+    def get_slides_html(opts={:static=>false, :pdf=>false, :toc=>false, :supplemental=>nil, :section=>nil})
 
       sections = ShowOffUtils.showoff_sections(settings.pres_dir, @logger)
       files = []
@@ -852,7 +909,7 @@ class ShowOff < Sinatra::Application
               begin
                 data << process_markdown(fname, File.read(f), opts)
               rescue Errno::ENOENT => e
-                logger.error e.message
+                @logger.error e.message
                 data << process_markdown(fname, "!SLIDE\n# Missing File!\n## #{fname}", opts)
               end
             end
@@ -915,6 +972,9 @@ class ShowOff < Sinatra::Application
       # Check to see if the presentation has enabled feedback
       @feedback = settings.showoff_config['feedback'] unless (params && params[:feedback] == 'false')
 
+      # If we're static, we need to not show the downloads page
+      @static   = static
+
       # Provide a button in the sidebar for interactive editing if configured
       @edit     = settings.showoff_config['edit'] if @review
 
@@ -922,6 +982,7 @@ class ShowOff < Sinatra::Application
     end
 
     def presenter
+      @favicon   = settings.showoff_config['favicon']
       @issues    = settings.showoff_config['issues']
       @edit      = settings.showoff_config['edit'] if @review
       @@cookie ||= guid()
@@ -976,14 +1037,15 @@ class ShowOff < Sinatra::Application
       content
     end
 
-    def print(static=false)
-      @slides = get_slides_html(:static=>static, :toc=>true, :print=>true)
+    def print(static=false, section=nil)
+      @slides = get_slides_html(:static=>static, :toc=>true, :print=>true, :section=>section)
       @favicon = settings.showoff_config['favicon']
       erb :onepage
     end
 
     def supplemental(content, static=false)
-      @slides = get_slides_html(:static=>static, :supplemental=>content)
+      # supplemental material is by definition separate from the presentation, so it doesn't make sense to attach notes
+      @slides = get_slides_html(:static=>static, :supplemental=>content, :section=>false)
       @favicon = settings.showoff_config['favicon']
       @wrapper_classes = ['supplemental']
       erb :onepage
@@ -1037,8 +1099,9 @@ class ShowOff < Sinatra::Application
       end
 
       # remove the weird /files component, since that doesn't exist on the filesystem
+      # replace it for file://<PATH> for correct use with wkhtmltopdf (exactly with qt-webkit)
       html.gsub!(/<img src=".\/file\/([^"]*)/) do |s|
-        "<img src=\".\/#{$1}"
+        "<img src=\"file:\/\/#{settings.pres_dir}\/#{$1}"
       end
 
       # PDFKit.new takes the HTML and any options for wkhtmltopdf
@@ -1071,6 +1134,9 @@ class ShowOff < Sinatra::Application
       when 'pdf'
         opt ||= "#{name}.pdf"
         data = showoff.send(what, opt)
+      when 'print'
+        opt ||= 'handouts'
+        data = showoff.send(what, true, opt)
       else
         data = showoff.send(what, true)
       end
@@ -1109,7 +1175,7 @@ class ShowOff < Sinatra::Application
         }
 
         # ... and copy all needed image files
-        [/img src=[\"\'].\/file\/(.*?)[\"\']/, /style=[\"\']background: url\(\'file\/(.*?)'/].each do |regex|
+        [/img src=[\"\'].\/file\/(.*?)[\"\']/, /style=[\"\']background(?:-image): url\(\'file\/(.*?)'/].each do |regex|
           data.scan(regex).flatten.each do |path|
             dir = File.dirname(path)
             FileUtils.makedirs(File.join(file_dir, dir))
@@ -1143,10 +1209,22 @@ class ShowOff < Sinatra::Application
 
   # Load a slide file from disk, parse it and return the text of a code block by index
   def get_code_from_slide(path, index)
+    if path =~ /^(.*)(?::)(\d+)$/
+      path = $1
+      num  = $2.to_i
+    else
+      num = 1
+    end
+
     slide = "#{path}.md"
-    return unless File.exists? slide
+    return unless File.exist? slide
 
-    html = process_markdown(slide, File.read(slide), {})
+    content = File.read(slide)
+    if defined? num
+      content = content.split(/^\<?!SLIDE/m).reject { |sl| sl.empty? }[num-1]
+    end
+
+    html = process_markdown(slide, content, {})
     doc  = Nokogiri::HTML::DocumentFragment.parse(html)
 
     return doc.css('code.execute')[index.to_i].text rescue 'Invalid code block index'
@@ -1155,20 +1233,55 @@ class ShowOff < Sinatra::Application
   # Basic auth boilerplate
   def protected!
     unless authorized?
-      response['WWW-Authenticate'] = %(Basic realm="#{@title}: Protected Area")
-      throw(:halt, [401, "Not authorized\n"])
+      response['WWW-Authenticate'] = %(Basic realm="#{@title}: Protected Area. Please log in.")
+      throw(:halt, [401, "Not authorized."])
+    end
+  end
+
+  def locked!
+    # check auth first, because if the presenter has logged in with a password, we don't want to prompt again
+    unless authorized? or unlocked?
+      response['WWW-Authenticate'] = %(Basic realm="#{@title}: Locked Area. A presentation key is required to view.")
+      throw(:halt, [401, "Not authorized."])
     end
   end
 
   def authorized?
+    # allow localhost if we have no password
     if not settings.showoff_config.has_key? 'password'
-      # if no password is set, then default to allowing access to localhost
-      request.env['REMOTE_HOST'] == 'localhost' or request.ip == '127.0.0.1'
+      localhost?
     else
-      auth   ||= Rack::Auth::Basic::Request.new(request.env)
       user     = settings.showoff_config['user'] || ''
       password = settings.showoff_config['password']
-      auth.provided? && auth.basic? && auth.credentials && auth.credentials == [user, password]
+      authenticate([user, password])
+    end
+  end
+
+  def unlocked?
+    # allow localhost if we have no key
+    if not settings.showoff_config.has_key? 'key'
+      localhost?
+    else
+      authenticate(settings.showoff_config['key'])
+    end
+  end
+
+  def localhost?
+    request.env['REMOTE_HOST'] == 'localhost' or request.ip == '127.0.0.1'
+  end
+
+  def authenticate(credentials)
+    auth = Rack::Auth::Basic::Request.new(request.env)
+
+    return false unless auth.provided? && auth.basic? && auth.credentials
+
+    case credentials
+    when Array
+       auth.credentials == credentials
+    when String
+      auth.credentials.last == credentials
+    else
+      false
     end
   end
 
@@ -1289,12 +1402,15 @@ class ShowOff < Sinatra::Application
   end
 
   get '/control' do
+    # leave the route so we don't have 404's for the parts we've missed
+    return nil unless @interactive
+
     if !request.websocket?
       raise Sinatra::NotFound
     else
       request.websocket do |ws|
         ws.onopen do
-          ws.send( { 'current' => @@current[:number] }.to_json )
+          ws.send( { 'message' => 'current', 'current' => @@current[:number] }.to_json )
           settings.sockets << ws
 
           @logger.warn "Open sockets: #{settings.sockets.size}"
@@ -1324,7 +1440,7 @@ class ShowOff < Sinatra::Application
                 @@current = { :name => name, :number => slide }
 
                 # schedule a notification for all clients
-                EM.next_tick { settings.sockets.each{|s| s.send({ 'current' => @@current[:number] }.to_json) } }
+                EM.next_tick { settings.sockets.each{|s| s.send({ 'message' => 'current', 'current' => @@current[:number] }.to_json) } }
               end
 
             when 'register'
@@ -1356,11 +1472,14 @@ class ShowOff < Sinatra::Application
             when 'position'
               ws.send( { 'current' => @@current[:number] }.to_json ) unless @@cookie.nil?
 
-            when 'pace', 'question'
+            when 'pace', 'question', 'cancel'
               # just forward to the presenter(s) along with a debounce in case a presenter is registered twice
               control['id'] = guid()
               EM.next_tick { settings.presenters.each{|s| s.send(control.to_json) } }
 
+            when 'complete'
+              EM.next_tick { settings.sockets.each{|s| s.send(control.to_json) } }
+
             when 'feedback'
               filename = "#{settings.statsdir}/#{settings.feedback}"
               slide    = control['slide']
@@ -1408,8 +1527,10 @@ class ShowOff < Sinatra::Application
     opt  = params[:captures][1]
     what = 'index' if "" == what
 
-    if settings.showoff_config.has_key? 'protected'
-      protected! if settings.showoff_config['protected'].include? what
+    if settings.showoff_config['protected'].include? what
+      protected!
+    elsif settings.showoff_config['locked'].include? what
+      locked!
     end
 
     @asset_path = env['SCRIPT_NAME'] == '' ? nil : env['SCRIPT_NAME'].gsub(/^\/?/, '/').gsub(/\/?$/, '/')