showoff 0.9.10.2 → 0.9.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8278ed3a8a49ffcc69242c6222609050aa7f80ba
-  data.tar.gz: 147263ae3d5b911b2740f9a5b6f925536aea961d
+  metadata.gz: e762a266993707880dc1eae62fa79e31123e462e
+  data.tar.gz: 7f94df77801f964db8a43212bc666c0cce17fdc3
 SHA512:
-  metadata.gz: 50c3cb9cb6c37c7c3c773bce7e296e41e86f4af88bc7810c17af8e768a61c36563314c369cbe8bf8276b8dd55d26109b5bb6040b77adcdf9d4323f9c8f26b685
-  data.tar.gz: 882e602571a0c1de74e3b75eb359951571bf9990cd363fdbbcf0260d40b41a28897dfb7f13e7f89e301a071b3e01b1239391d2e97ce904634802fa8872c0f800
+  metadata.gz: 4d8532752720e21fc485f3f1e108122ae07d3a494bfc01e3189cff9de3bc5d7341b79316375d8451a63e3bcba725d26795370e98d67208dca6915aa918a4410f
+  data.tar.gz: fdbb66639a9e39d159b59f4c070ab118edb3f28638f0e5d0ba9dba812defc3672e0bcd9ebeec9a8ecf949a9bd0c9b2f87f96619b9405fa688de7c2afc2579053

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.9.10.2'
+SHOWOFF_VERSION = '0.9.10.3'

data/lib/showoff.rb

@@ -253,7 +253,8 @@ class ShowOff < Sinatra::Application
         # extract id, defaulting to none
         id = nil
         content_classes.delete_if { |x| x =~ /^#([\w-]+)/ && id = $1 }
-        id = name unless id
+        id = name.dup unless id
+        id.gsub!(/[^-A-Za-z0-9_]/, '_') # valid HTML id characters
         @logger.debug "id: #{id}" if id
         @logger.debug "classes: #{content_classes.inspect}"
         @logger.debug "transition: #{transition}"
@@ -292,7 +293,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)
+        sl = process_content_for_section_tags(sl, name)
         sl = update_special_content(sl, @slide_count, name) # TODO: deprecated
         sl = update_image_paths(name, sl, opts)
 
@@ -346,7 +347,7 @@ class ShowOff < Sinatra::Application
     end
 
     # replace section tags with classed div tags
-    def process_content_for_section_tags(content)
+    def process_content_for_section_tags(content, name = nil)
       return unless content
 
       # because this is post markdown rendering, we may need to shift a <p> tag around
@@ -358,6 +359,26 @@ class ShowOff < Sinatra::Application
       result.gsub!(/(<p>)?~~~SECTION:([^~]*)~~~/, '<div class="\2">\1')
       result.gsub!(/~~~ENDSECTION~~~(<\/p>)?/, '\1</div>')
 
+      filename = File.join(settings.pres_dir, '_notes', "#{name}.md")
+      @logger.debug "personal notes filename: #{filename}"
+      if File.file? filename
+        # TODO: shouldn't have to reparse config all the time
+        engine_options = ShowOffUtils.showoff_renderer_options(settings.pres_dir)
+
+        doc = Nokogiri::HTML::DocumentFragment.parse(result)
+        doc.css('div.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)
+
+          if section.children.size > 0
+            section.children.before(note)
+          else
+            section.add_child(note)
+          end
+        end
+        result = doc.to_html
+      end
       result
     end
 

data/public/css/presenter.css

@@ -315,6 +315,24 @@ div.zoomed {
     list-style-type: disc;
   }
 
+  #bottom #notes div.personal {
+    float: right;
+    border-left: 4px solid #999;
+    border-bottom: 4px solid #999;
+    border-radius: 0 0 0 0.5em;
+    padding: 0.1em 0 0.25em 0.25em;
+    margin: 0 0 1em 1em;
+    background: #eee;
+    max-width: 25%;
+  }
+
+  #bottom #notes div.personal h1 {
+    font-size: 1em;
+    font-weight: bold;
+    margin-top: 0;
+    border-bottom: 1px solid #ccc;
+  }
+
 #topbar {
   background: #4c4c4c; /* Old browsers */
   /* IE9 SVG, needs conditional override of 'filter' to 'none' */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.9.10.2
+  version: 0.9.10.3
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra