showoff 0.16.2 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcb7404f722269ce7b4c571c0a7d34c72f76d684
-  data.tar.gz: 7a2b4b825af14a88c58fccd9a851f51587894d9f
+  metadata.gz: 210a91a071a71b8ec4de4b9c128917eb19eb1f2c
+  data.tar.gz: f0cc7f2e1efc78af6bc92dfea9726d45db035425
 SHA512:
-  metadata.gz: 180720b95f90f0948642258fca4c84327da441b85d7b23bb00203272ee05c7ed07c85af8665a5938c5c1b8ca683e98887aa1b98514ae4b59d32c9e8dde41af2e
-  data.tar.gz: 38036fa41718cf12953dd2db5a32cdc2b05840c11fea9652dfe8a525b0a095238a97bffbf643ddd5d4ea1ac57b0b2ce5af89929c7710761467e6323169dd3167
+  metadata.gz: e62e8471ed1070766e8cf84d5387403d7a97ab245dabd5125595b5d986d73ab0b79ceb20ff0abfba06919b4ba9cfa45e45fcdea3b651a6a0fb4937ba17e6d239
+  data.tar.gz: 7c11b48e407c3fe975924e14a00a18ada6d74781029186f84e87d731ac5d0cd119272ff78a6ea0094c83e5fbb924bb017584ddb5271b76fce72caa2ee91050e5

data/lib/showoff.rb

@@ -236,17 +236,6 @@ class ShowOff < Sinatra::Application
   end
 
   helpers do
-    def load_section_files(section)
-      section = File.join(settings.pres_dir, section)
-      files = if File.directory? section
-        Dir.glob("#{section}/**/*").sort
-      else
-        Array(section)
-      end
-      @logger.debug files
-      files
-    end
-
     def css_files
       Dir.glob("#{settings.pres_dir}/*.css").map { |path| File.basename(path) }
     end
@@ -297,7 +286,7 @@ class ShowOff < Sinatra::Application
       end
     end
 
-    def process_markdown(name, content, opts={:static=>false, :pdf=>false, :print=>false, :toc=>false, :supplemental=>nil, :section=>nil})
+    def process_markdown(name, section, 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
@@ -393,7 +382,7 @@ class ShowOff < Sinatra::Application
 
         # create html for the slide
         classes = content_classes.join(' ')
-        content = "<div"
+        content = "<div data-section=\"#{section}\" data-title=\"#{File.basename(name)}\""
         content += " id=\"#{id}\"" if id
         content += " style=\"background-image: url('file/#{slide.bg}');\"" if slide.bg
         content += " class=\"slide #{classes}\" data-transition=\"#{transition}\">"
@@ -625,7 +614,7 @@ class ShowOff < Sinatra::Application
         end
 
         # swap out the tag, if found, with the table of contents
-        doc.at('p:contains("~~~TOC~~~")').replace(toc)
+        doc.at('p:contains("~~~TOC~~~")').replace(toc) rescue nil
       end
 
       doc.css('.slide.glossary .content').each do |glossary|
@@ -1017,28 +1006,26 @@ class ShowOff < Sinatra::Application
     def get_slides_html(opts={:static=>false, :pdf=>false, :toc=>false, :supplemental=>nil, :section=>nil})
 
       sections = ShowOffUtils.showoff_sections(settings.pres_dir, @logger)
-      files = []
       if sections
         data = ''
-        sections.each do |section|
-          if section =~ /^#/
-            name = section.each_line.first.gsub(/^#*/,'').strip
-            data << process_markdown(name, "<!SLIDE subsection>\n" + section, opts)
-          else
-            files = []
-            files << load_section_files(section)
-            files = files.flatten
-            files = files.select { |f| f =~ /.md$/ }
-            files.each do |f|
-              fname = f.gsub(settings.pres_dir + '/', '').gsub('.md', '')
-              begin
-                data << process_markdown(fname, File.read(f), opts)
-              rescue Errno::ENOENT => e
-                @logger.error e.message
-                data << process_markdown(fname, "!SLIDE\n# Missing File!\n## #{fname}", opts)
-              end
+        sections.each do |section, slides|
+          slides.each do |filename|
+            next unless filename.end_with? '.md'
+            path = filename.chomp('.md') # TODO: I don't know why we do this silly thing
+            begin
+              data << process_markdown(path, section, File.read(filename), opts)
+            rescue Errno::ENOENT => e
+              @logger.error e.message
+              data << process_markdown(path, section, "!SLIDE\n# Missing File!\n## #{fname}", opts)
             end
           end
+
+# I don't know what this part was supposed to do
+#           if section =~ /^#/
+#             name = section.each_line.first.gsub(/^#*/,'').strip
+#             data << process_markdown(name, "<!SLIDE subsection>\n" + section, opts)
+#           else
+
         end
       end
       process_content_for_all_slides(data, @slide_count, opts)
@@ -1104,11 +1091,15 @@ class ShowOff < Sinatra::Application
       @edit     = settings.showoff_config['edit'] if @review
 
       # store a cookie to tell clients apart. More reliable than using IP due to proxies, etc.
-      unless request.cookies['client_id']
+      if request.nil?   # when running showoff static
         @client_id = guid()
-        response.set_cookie('client_id', @client_id)
       else
-        @client_id = request.cookies['client_id']
+        if request.cookies['client_id']
+          @client_id = request.cookies['client_id']
+        else
+          @client_id = guid()
+          response.set_cookie('client_id', @client_id)
+        end
       end
 
       erb :index
@@ -1428,7 +1419,7 @@ class ShowOff < Sinatra::Application
       content = content.split(/^\<?!SLIDE/m).reject { |sl| sl.empty? }[num-1]
     end
 
-    html = process_markdown(slide, content, {})
+    html = process_markdown(slide, '', content, {})
     doc  = Nokogiri::HTML::DocumentFragment.parse(html)
 
     if index == 'all'

data/lib/showoff/version.rb

@@ -1,3 +1,3 @@
 # No namespace here since ShowOff is a class and I'd have to inherit from
 # Sinatra::Application (which we don't want to load here)
-SHOWOFF_VERSION = '0.16.2'
+SHOWOFF_VERSION = '0.17.0'

data/lib/showoff_utils.rb

@@ -76,7 +76,7 @@ class ShowOffUtils
     FileUtils.mkdir_p('_files/share')
     FileUtils.mkdir_p('_images')
 
-    self.showoff_sections('.').each do |filename|
+    self.showoff_slide_files('.').each do |filename|
       next if File.exist? filename
 
       puts "Creating: #{filename}"
@@ -104,15 +104,7 @@ class ShowOffUtils
     errors     = []
 
     # get a list of actual filenames
-    self.showoff_sections('.').each do |section|
-      if File.directory?(section)
-        files << showoff.load_section_files(section)
-      else
-        files << section
-      end
-    end
-
-    files.flatten!
+    files = self.showoff_slide_files('.')
     files.each do |filename|
       unless File.exist? filename
         errors << "Missing path: #{filename}"
@@ -405,57 +397,95 @@ class ShowOffUtils
       logger.level = Logger::WARN
     end
 
-    index    = File.join(dir, ShowOffUtils.presentation_config_file)
-    sections = ["."] # default boring showoff.json
+    index = File.join(dir, ShowOffUtils.presentation_config_file)
+    begin
+      data = JSON.parse(File.read(index)) rescue ["."] # default boring showoff.json
+      logger.debug data
+      if data.is_a?(Hash)
+        sections = data['sections'] if data.include? 'sections'
+      else
+        sections = data
+      end
 
-    if File.exist?(index)
-      begin
-        data = JSON.parse(File.read(index))
-        logger.debug data
-        if data.is_a?(Hash)
-          sections = data['sections'] if data.include? 'sections'
-        else
-          sections = data
+      if sections.is_a? Array
+        sections = showoff_legacy_sections(sections)
+      elsif sections.is_a? Hash
+        raise "Named sections are unsupported on Ruby versions less than 1.9." if RUBY_VERSION.start_with? '1.8'
+        sections.each do |key, value|
+          next if value.is_a? Array
+          cwd  = File.expand_path(dir)
+          path = File.dirname(value)
+          data = JSON.parse(File.read(value))
+          raise "The section file #{value} must contain an array of filenames." unless data.is_a? Array
+
+          # get relative paths to each slide in the array
+          sections[key] = data.map do |filename|
+            File.expand_path("#{path}/#{filename}").sub(/^#{cwd}\//, '')
+          end
         end
+      else
+        raise "The `sections` key must be an Array or Hash, not a #{sections.class}."
+      end
 
-        # each entry in sections can be:
-        # - "filename.md"
-        # - { "section": "filename.md" }
-        # - { "section": [ "array.md, "of.md, "files.md"] }
-        # - { "include": "sections.json" }
-        sections = sections.map do |entry|
-          next entry if entry.is_a? String
-          next nil unless entry.is_a? Hash
-
-          next entry['section'] if entry.include? 'section'
-
-          section = nil
-          if entry.include? 'include'
-            file = entry['include']
-            path = File.dirname(file)
-            data = JSON.parse(File.read(file))
-            if data.is_a? Array
-              if path == '.'
-                section = data
-              else
-                section = data.map do |source|
-                  "#{path}/#{source}"
-                end
-              end
+    rescue => e
+      logger.error "There was a problem with the presentation file #{index}"
+      logger.error e.message
+      logger.debug e.backtrace
+      sections = {}
+    end
+
+    sections
+  end
+
+  def self.showoff_legacy_sections(data)
+    # each entry in sections can be:
+    # - "filename.md"
+    # - { "section": "filename.md" }
+    # - { "section": [ "array.md, "of.md, "files.md"] }
+    # - { "include": "sections.json" }
+    sections = {}
+    data.map do |entry|
+      if entry.is_a? String
+        if File.directory? entry
+          next Dir.glob("#{entry}/**/*.md").sort
+        else
+          next entry
+        end
+      end
+      next nil unless entry.is_a? Hash
+      next entry['section'] if entry.include? 'section'
+
+      section = nil
+      if entry.include? 'include'
+        file = entry['include']
+        path = File.dirname(file)
+        data = JSON.parse(File.read(file))
+        if data.is_a? Array
+          if path == '.'
+            section = data
+          else
+            section = data.map do |source|
+              "#{path}/#{source}"
             end
           end
-
-          section
         end
-      rescue => e
-        logger.error "There was a problem with the presentation file #{index}"
-        logger.error e.message
-        logger.debug e.backtrace
-        sections = []
       end
+
+      section
+    end.flatten.compact.each do |filename|
+      # We do this in two passes simply because most of it was already done
+      # and I don't want to waste time on legacy functionality.
+      path = File.dirname(filename)
+
+      sections[path] ||= []
+      sections[path]  << filename
     end
+    sections
+  end
 
-    sections.flatten.compact
+  def self.showoff_slide_files(dir, logger = nil)
+    data = showoff_sections(dir, logger)
+    data.map { |key, value| value }.flatten
   end
 
   def self.showoff_title(dir = '.')

data/public/css/presenter.css

@@ -13,54 +13,58 @@
 #timerSection,
 #statusbar,
 #questions,
-#notes {
+#notes,
+#topbar,
+#presenterPopup {
   font-size: .8em;
 }
 
+#topbar,
+#topbar a,
+#topbar .ui-widget,
+#presenterPopup,
+#notes-wrapper {
+  color: #ffffff;
+  background-color: #546E7A;
+}
+
 #topbar {
   display: flex;
   flex-flow: row;
-  line-height: 24px;
-  height: 24px;
-  background: #222222;
-  font-size: .55em;
-  color: #fff;
+  line-height: 3em;
+  height: 3em;
+  box-shadow:0 0 1em rgba(0,0,0,0.35);
+  z-index: 3;
 }
 
   #topbar a,
-  #topbar select {
+  #topbar .ui-widget {
     text-decoration: none;
-    color: #fff;
-    background: #222222;
   }
 
-  #topbar a:hover,
-  #topbar select:hover {
-    background-color: #555;
+  #topbar a i {
+    padding-left: .25em;
   }
 
-  #topbar .fa {
-    color: #8affeb;
+  #topbar a:hover,
+  #topbar .ui-widget:hover {
+    background-color: #263238;
   }
-  #topbar #close-sidebar {
-    font-size: 16px;
-    padding: 3px 6px;
+
+  #close-sidebar {
+    padding: .25em;
     transition: all 200ms;
   }
-    #topbar #close-sidebar.disabled {
+    #close-sidebar.disabled {
       color: grey;
     }
-    #topbar #close-sidebar.disabled:hover {
+    #close-sidebar.disabled:hover {
       background-color: transparent;
       cursor: default;
     }
 
   #slideSource {
-    display: flex;
-    flex-shrink: 1;
-    white-space: nowrap;
-    overflow: hidden;
-    margin: 0 0.5em;
+    float: right;
   }
 
   #links {
@@ -69,14 +73,22 @@
     margin: 0 0 0 auto;
   }
 
-  #links a {
-    border: 1px solid #ccc;
-    border-radius: 0.5em;
-    padding: .35em;
+  #links a,
+  #topbar .ui-widget {
+    display: inline-block;
+    padding: 0 1em;
+  }
+
+  #topbar .ui-button {
+    border: none;
+    border-radius: 0;
+    line-height: 3em;
+    margin-top: -1px; /* hell if I know why, but probably somewhere in jquery-ui */
   }
 
-  #links a.enabled {
-    background-color: #003d96;
+  #links a.enabled,
+  #topbar .ui-state-active {
+    background-color: #263238;
   }
   #links a.warning {
     background-color: #8e030a;
@@ -90,25 +102,20 @@
     margin: 0 0.5em;
   }
 
-#presenterPopup,
-#nextWindowConfirmation {
+#presenterPopup {
   display: none;
   position: absolute;
   z-index: 2147483647;
-  top: 24px;
+  top: 3em;
   left: 25%;
   max-height: 80%;
   width: 50%;
+  padding-bottom: 1em;
   border-radius: 0 0 .5em .5em;
-  border-bottom: 8px solid #222222;
-  background-color: #222222;
-  color: #ffffff;
-  font-size: .8em;
   overflow: auto;
 }
 
-  #presenterPopup a,
-  #nextWindowConfirmation a {
+  #presenterPopup a {
     color: #ffffff;
   }
 
@@ -116,20 +123,6 @@
     color: #000;
   }
 
-#nextWindowConfirmation {
-  right: 0.25em;
-  left: auto;
-  width: 14em;
-}
-  #nextWindowConfirmation p {
-    margin: 0.25em;
-  }
-  #nextWindowConfirmation input {
-    float: right;
-    margin: 0.25em;
-  }
-
-
 #main {
   display: -webkit-flex;
   display:         flex;
@@ -153,7 +146,8 @@
     padding: 0;
     margin: 0;
     background-color: #fff;
-    border-right: 1px solid #ccc;
+    box-shadow:0 0 1em rgba(0,0,0,0.35);
+    z-index: 3;
   }
     #timerSection {
       margin-bottom: 0.25em;
@@ -254,9 +248,7 @@
       min-width: 210px;
       min-height: 210px;
       height: 210px;
-      background: #F5ED9B;
       border-top: 1px solid #ccc;
-      border-right: 1px solid #ccc;
       overflow: auto;
     }
 
@@ -294,6 +286,7 @@
             order: 1;
     min-width: 0px;
     justify-content: space-between;
+    background-color: #ECEFF1;
   }
     #frame {
       display: -webkit-flex;
@@ -311,7 +304,6 @@
       -webkit-flex: 10;
               flex: 10;
       overflow: hidden;
-      background: #eee;
       padding: 1em;
     }
 
@@ -323,9 +315,8 @@
         display: none;
         position: absolute;
         top: 0;
+        padding: 1em;
       }
-        #preview .thumb .label {
-        }
         #nextSlide.thumb .label {
           text-align: right;
         }
@@ -335,26 +326,22 @@
         height: 150px;
         width: 200px;
         top: 0;
-        background-color: white;
-        border-bottom: 2px solid #ccc;
+        background-color: #ffffff;
+        box-shadow:0 0 1em rgba(0,0,0,0.35);
       }
         #preview .thumb .content {
           transform: scale(.5);
           transform-origin: 0 0;
           width: 200%;
         }
+
         #prevSlide.thumb {
           left: 0;
         }
-          #prevSlide.thumb .container {
-            border-right: 2px solid #ccc;
-          }
+
         #nextSlide.thumb {
           right: 0;
         }
-          #nextSlide.thumb .container {
-            border-left: 2px solid #ccc;
-          }
 
         #preview.thumbs #preso {
           position: absolute;
@@ -375,10 +362,9 @@
     /* beside layout */
       #preview.beside .thumb {
         display: none;
-        position: absolute;
         overflow: hidden;
         width: 34%;
-        top: 1em;
+        padding: 1em;
       }
         #preview.beside .thumb .container {
           width: auto;
@@ -439,69 +425,30 @@
 
 
     #preso {
-      -webkit-box-shadow:0 0 25px rgba(0,0,0,0.35);
-      -moz-box-shadow:0 0 25px rgba(0,0,0,0.35);
-      box-shadow:0 0 25px rgba(0,0,0,0.35);
+      box-shadow:0 0 1em rgba(0,0,0,0.35);
       position: absolute;
     }
 
     #statusbar {
-      -webkit-flex: 0.5;
-              flex: 0.5;
-      height: 22px;
-      max-height: 22px;
-      line-height: 22px;
-      text-transform: uppercase;
-      vertical-align: middle;
-      background: #fff;
+      padding: 0 1em;
     }
-      #progress {
-        float: left;
-        width: 25%;
-        height: 20px;
-        background: #ededed;
-      }
-        #progress .label {
-          position: absolute;
-          padding: 0 0.25em;
-          font-size: 10px;
-        }
-        #progress .ui-progressbar-value {
-          border: 1px solid #ffa215;
-          background: #ffb105;
-        }
-      #debugInfo {
-        display: inline;
+    #progress {
+      width: 100%;
+      height: 8px;
+      background-color: transparent;
+    }
+      #progress.ui-widget.ui-widget-content{
+        border: none;
+        border-radius: 0;
       }
-      .controls {
-        float: right;
-        margin-right: 5px;
-      }
-        .controls > .fa {
-          font-size: 18px;
-          text-decoration: none;
-        }
-        .controls > a {
-          color: #222;
-        }
-        .controls > .notes-grippy {
-          top: auto;
-          position: relative;
-          display: inline;
-        }
-        .controls > span {
-          font-size: 10px;
-        }
-        .controls > span > label {
-          margin-bottom: 4px;
-          padding-bottom: 2px;
-        }
-      #enableRemote:checked {
-        background-color: #fff8bf;
-        -webkit-box-shadow: 0px 0px 15px 5px rgba(255, 255, 190, .75);
-        -moz-box-shadow: 0px 0px 15px 5px rgba(255, 255, 190, .75);
-        box-shadow: 0px 0px 15px 5px rgba(255, 255, 190, .75);
+      #progress .ui-progressbar-value {
+        border: none;
+        background: #f44336;
+        border-radius: 0;
       }
+    #debugInfo {
+      display: inline;
+    }
 
   #annotationToolbar {
     display: -webkit-flex;
@@ -548,48 +495,76 @@
     #annotationToolbar i.shapes.color4 { color: green  }
 
 
+#notes-wrapper {
+  box-shadow:0 0 1em rgba(0,0,0,0.35);
+}
+
 #notes {
   overflow: auto;
   height: 210px;
   padding: 0 1em;
   display: block;
   position: relative;
-  background: #F5ED9B;
-  border-top: 1px solid #ccc;
   top: auto !important; /* jquery-ui-resizable mucks with this */
+  background-color: #ffffff;
+  color: #222;
 }
   #notes.hidden {
     display: none;
   }
 
-  #notes ul.section-selector {
+  .section-selector {
+    display: inline-block;
     padding: 0;
-    margin: 0 0 0 -1.25em;         /* compensate for the border on #notes. 1/0.8 em */
+    margin: 0;
     text-align: center;
-    border-bottom: 1px solid #ccc;
     font-size: 0.8em;
-    position: absolute;
-    background-color: #F5ED9B;
   }
-  #notes ul.section-selector li {
-    display: none;
-    padding: 0 1em;
+  .section-selector li {
+    display: inline;
+    padding: .1em 1em;
   }
-  #notes ul.section-selector li:hover {
-    background-color: #b9b9b9;
-    transition-duration: 0.5s;
+
+  .section-selector li a {
+    color: #ffffff;
+    text-decoration: none;
   }
-  #notes ul.section-selector li.selected {
-    display: inline;
-    background-color: #ccc;
+
+  .section-selector li.selected {
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    background-color: #ffffff;
   }
-  #notes ul.section-selector:hover li {
-    display: inline;
+
+  .section-selector li.selected a {
+    color: #222;
   }
 
-  #notes ul.section-selector li a {
-    text-decoration: none;
+  .controls {
+    float: right;
+    margin-right: .5em;
   }
+    .controls .spacer {
+      display: inline-block;
+      width: 1em;
+    }
+    .controls .fa {
+      font-size: 1em;
+      text-decoration: none;
+    }
+    .controls a,
+    .controls i {
+      color: #fff;
+    }
+    .controls .small {
+      font-size: 0.75em;
+      vertical-align: 15%;
+    }
+    .controls .notes-grippy {
+      top: auto;
+      position: relative;
+      display: inline;
+    }
 
   #notes ol { list-style-type: decimal; }
   #notes ul { list-style-type: disc; }
@@ -642,13 +617,6 @@ a.controls {
 }
 
 /* hide some elements when the screen is too small */
-@media screen and (max-width: 1000px)
-{
-  #slideSource label {
-    display: none;
-  }
-}
-
 @media screen and (max-width: 900px)
 {
   #topbar .fa {
@@ -683,7 +651,6 @@ a.controls {
             flex: 4;
   }
     #questions {
-      border-bottom: 1px solid #ccc;
       -webkit-flex: 1;
               flex: 1;
     }
@@ -696,12 +663,7 @@ a.controls {
     margin: 0;
     padding: 0;
   }
-  #slideSource {
-    max-width: 256px;
-    overflow: hidden;
-    height: 16px;
-    padding-left: 16px;
-  }
+
   #slideFile {
     display: inline-block;
     width: 205px;