showoff 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf3f11c2a36f484d567097e7312545152e758920
-  data.tar.gz: 447d937852f07103ef295e73bd154c450c17c3b3
+  metadata.gz: 172a00f574e54f000a40fad51bfeb2136ca176d0
+  data.tar.gz: f0702e207b967d9a6328de5a4b47a627553b45db
 SHA512:
-  metadata.gz: aa297eaa454207bfcf81ccf32034a4843a5c49c5c056a18efad46277e9a99eac105f0c545dea0089d28e1d2c9c0a33e6fbdba348ee2698f0c69e84d6eabf6880
-  data.tar.gz: dbeadddd37207e0cd5433e3726ee2e82aa0ca37398e03c828231c139ced71900fd6fb3533f1125b8597f9b55969dfa5ca3b15142bd8e0b0bf2a3005c5471faaa
+  metadata.gz: 6fab38a39045cd59cf80ee4acc9d29980d7d2f7693eb471207fdae0a5547ee82481152bd9522e658b33a23018f4e4382efb67b054878b2b89bcf075dec87d554
+  data.tar.gz: 14f92c4fc37add9e2f8eedacbc2c04b474acf71ddc3acc4526b11f53be1e469e94c1d3eee936e6cf2f23b85ab825935dae5c9d14efb8794057d5d82d299aa6f3

data/bin/showoff

@@ -248,6 +248,15 @@ command [:static] do |c|
   end
 end
 
+desc 'Generate PDF version of presentation'
+arg_name 'name'
+long_desc 'Creates a PDF version of the presentation as {name}.pdf'
+command [:pdf] do |c|
+  c.action do |global_options,options,args|
+    ShowOff.do_static(['pdf'].concat args)
+  end
+end
+
 pre do |global,command,options,args|
   # Pre logic here
   # Return true to proceed; false to abourt and not call the

data/lib/showoff.rb

@@ -72,7 +72,7 @@ class ShowOff < Sinatra::Application
     @root_path = "."
 
     # Load up the default keymap, then merge in any customizations
-    keymapfile   = File.expand_path(File.join('~', '.showoff', 'keymap.json'))
+    keymapfile   = File.expand_path(File.join('~', '.showoff', 'keymap.json')) rescue nil
     @keymap      = Keymap.default
     @keymap.merge! JSON.parse(File.read(keymapfile)) rescue {}
 
@@ -402,7 +402,7 @@ class ShowOff < Sinatra::Application
       end
 
       # scan for pagebreak tags. Should really only be used for handout notes or supplemental materials
-      result.gsub!("~~~PAGEBREAK~~~", '<div class="break">continued...</div>')
+      result.gsub!("~~~PAGEBREAK~~~", '<div class="pagebreak">continued...</div>')
 
       # replace with form rendering placeholder
       result.gsub!(/~~~FORM:([^~]*)~~~/, '<div class="form wrapper" title="\1"></div>')
@@ -502,9 +502,19 @@ class ShowOff < Sinatra::Application
       content
     end
 
-    # find any lines that start with a <p>.(something) and turn them into <p class="something">
-    def update_p_classes(markdown)
-      markdown.gsub(/<p>\.(.*?) /, '<p class="\1">')
+    # Find any lines that start with a <p>.(something), remove the ones tagged with
+    # .break and .comment, then turn the remainder into <p class="something">
+    # The perlism line noise is splitting multiple classes (.class1.class2) on the period.
+    #
+    # TODO: We really need to update this to use the DOM instead of text parsing :/
+    #
+    def update_p_classes(content)
+      # comment & break
+      content.gsub!(/<p>\.(?:break|comment)( .*)?<\/p>/, '')
+      # paragraph classes
+      content.gsub!(/<p>\.(.*?) /) { "<p class=\"#{$1.gsub('.', ' ')}\">" }
+      # image classes
+      content.gsub(/<img src="(.*)" alt="(\.\S*)\s*(.*)">/) { "<img src=\"#{$1}\" class=\"#{$2.gsub('.', ' ')}\" alt=\"#{$3}\">" }
     end
 
     # replace custom markup with html forms
@@ -966,13 +976,6 @@ class ShowOff < Sinatra::Application
       content
     end
 
-    def onepage(static=false)
-      @slides = get_slides_html(:static=>static, :toc=>true)
-      @favicon = settings.showoff_config['favicon']
-
-      erb :onepage
-    end
-
     def print(static=false)
       @slides = get_slides_html(:static=>static, :toc=>true, :print=>true)
       @favicon = settings.showoff_config['favicon']
@@ -1021,12 +1024,11 @@ class ShowOff < Sinatra::Application
       erb :stats
     end
 
-    def pdf(static=true)
-      @slides = get_slides_html(:static=>static, :pdf=>true)
+    def pdf(name)
+      @slides = get_slides_html(:static=>true, :toc=>true, :print=>true)
       @inline = true
 
       html = erb :onepage
-      # TODO make a random filename
 
       # Process inline css and js for included images
       # The css uses relative paths for images and we prepend the file url
@@ -1034,14 +1036,17 @@ class ShowOff < Sinatra::Application
         "url(file://#{settings.pres_dir}/#{$1})"
       end
 
-      # Todo fix javascript path
+      # remove the weird /files component, since that doesn't exist on the filesystem
+      html.gsub!(/<img src=".\/file\/([^"]*)/) do |s|
+        "<img src=\".\/#{$1}"
+      end
 
       # 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))
 
       # Save the PDF to a file
-      file = kit.to_file('/tmp/preso.pdf')
+      kit.to_file(name)
     end
 
   end
@@ -1060,14 +1065,18 @@ class ShowOff < Sinatra::Application
       path = showoff.instance_variable_get(:@root_path)
       logger = showoff.instance_variable_get(:@logger)
 
-      if what == 'supplemental'
+      case what
+      when 'supplemental'
         data = showoff.send(what, opt, true)
+      when 'pdf'
+        opt ||= "#{name}.pdf"
+        data = showoff.send(what, opt)
       else
         data = showoff.send(what, true)
       end
 
       if data.is_a?(File)
-        FileUtils.cp(data.path, "#{name}.pdf")
+        logger.warn "Generated PDF as #{opt}"
       else
         out = File.expand_path("#{path}/static")
         # First make a directory

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.11.2'
+SHOWOFF_VERSION = '0.12.0'

data/public/css/highlight/agate.css

@@ -19,33 +19,29 @@
 .hljs {
   display: block;
   overflow-x: auto;
-  padding: .5em;
+  padding: 0.5em;
   background: #333;
   color: white;
-  -webkit-text-size-adjust: none;
 }
 
-.asciidoc .hljs-title,
-.hljs-label,
-.hljs-tag .hljs-title,
-.hljs-prompt,
-.http .hljs-request {
+.hljs-name,
+.hljs-strong {
   font-weight: bold;
 }
 
-.hljs-change,
-.hljs-code {
+.hljs-code,
+.hljs-emphasis {
   font-style: italic;
 }
 
-.hljs-tag,
-.ini .hljs-title {
+.hljs-tag {
   color: #62c8f3;
 }
 
-.hljs-id,
-.hljs-cbracket,
-.hljs-tag .hljs-value {
+.hljs-variable,
+.hljs-template-variable,
+.hljs-selector-id,
+.hljs-selector-class {
   color: #ade5fc;
 }
 
@@ -55,63 +51,39 @@
 }
 
 .hljs-type,
-.hljs-variable,
-.hljs-name,
-.actionscript .hljs-title,
-.aspectj .hljs-annotation,
-.aspectj .hljs-title,
+.hljs-title,
+.hljs-section,
 .hljs-attribute,
-.hljs-change,
-.hljs-blockquote,
-.hljs-built_in {
+.hljs-quote,
+.hljs-built_in,
+.hljs-builtin-name {
   color: #ffa;
 }
 
 .hljs-number,
-.hljs-hexcolor,
-.hljs-link_label,
-.hljs-link_reference {
+.hljs-symbol,
+.hljs-bullet {
   color: #d36363;
 }
 
 .hljs-keyword,
-.hljs-literal,
-.hljs-constant,
-.css .hljs-tag,
-.hljs-typename,
-.hljs-winutils {
+.hljs-selector-tag,
+.hljs-literal {
   color: #fcc28c;
 }
 
 .hljs-comment,
-.hljs-cdata,
-.hljs-preprocessor,
-.hljs-annotation,
-.hljs-decorator,
-.hljs-doctype,
 .hljs-deletion,
-.hljs-shebang,
-.apache .hljs-sqbracket,
-.tex .hljs-formula,
-.hljs-header,
-.hljs-horizontal_rule,
 .hljs-code {
   color: #888;
 }
 
 .hljs-regexp,
-.hljs-attr_selector {
+.hljs-link {
   color: #c6b4f0;
 }
 
-.hljs-important,
-.hljs-doctype,
-.hljs-pi,
-.hljs-chunk,
-.actionscript .hljs-type,
-.hljs-shebang,
-.hljs-pragma,
-.http .hljs-attribute {
+.hljs-meta {
   color: #fc9b9b;
 }
 
@@ -125,8 +97,7 @@
   color: #333;
 }
 
-.hljs a,
-.hljs-tag .hljs-attribute {
+.hljs a {
   color: inherit;
 }
 

data/public/css/highlight/androidstudio.css

@@ -9,45 +9,58 @@ Author: Pedro Oliveira <kanytu@gmail . com>
   display: block;
   overflow-x: auto;
   padding: 0.5em;
-  -webkit-text-size-adjust: none;
 }
 
-.hljs-number {
+.hljs-number,
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet {
   color: #6897BB;
 }
 
 .hljs-keyword,
+.hljs-selector-tag,
 .hljs-deletion {
   color: #cc7832;
 }
 
-.hljs-comment {
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link {
+  color: #629755;
+}
+
+.hljs-comment,
+.hljs-quote {
   color: #808080;
 }
 
-.hljs-annotation {
+.hljs-meta {
   color: #bbb529;
 }
 
 .hljs-string,
+.hljs-attribute,
 .hljs-addition {
   color: #6A8759;
 }
 
-.hljs-function .hljs-title,
-.hljs-change {
+.hljs-section,
+.hljs-title,
+.hljs-type {
   color: #ffc66d;
 }
 
-.hljs-tag .hljs-title,
-.hljs-doctype {
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
   color: #e8bf6a;
 }
 
-.hljs-tag .hljs-attribute {
-  color: #bababa;
+.hljs-emphasis {
+  font-style: italic;
 }
 
-.hljs-tag .hljs-value {
-  color: #a5c261;
+.hljs-strong {
+  font-weight: bold;
 }

data/public/css/highlight/arduino-light.css

@@ -0,0 +1,88 @@
+/*
+
+Arduino® Light Theme - Stefania Mellai <s.mellai@arduino.cc>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #FFFFFF;
+}
+
+.hljs,
+.hljs-subst {
+  color: #434f54;
+}
+
+.hljs-keyword,
+.hljs-attribute,
+.hljs-selector-tag,
+.hljs-doctag,
+.hljs-name {
+  color: #00979D;
+}
+
+.hljs-built_in,
+.hljs-literal,
+.hljs-bullet,
+.hljs-code,
+.hljs-addition {
+  color: #D35400;
+}
+
+.hljs-regexp,
+.hljs-symbol,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #00979D;
+}
+
+.hljs-type,
+.hljs-string,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-quote,
+.hljs-template-tag,
+.hljs-deletion {
+  color: #005C5F;
+}
+
+.hljs-title,
+.hljs-section {
+  color: #880000;
+  font-weight: bold;
+}
+
+.hljs-comment {
+  color: rgba(149,165,166,.8);
+}
+
+.hljs-meta-keyword {
+  color: #728E00;
+}
+
+.hljs-meta {
+  color: #728E00;
+  color: #434f54;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-function {
+  color: #728E00;
+}
+
+.hljs-number {
+  color: #8A7B52;  
+}

data/public/css/highlight/arta.css

@@ -8,40 +8,27 @@ Author: pumbur <pumbur@pumbur.net>
   overflow-x: auto;
   padding: 0.5em;
   background: #222;
-  -webkit-text-size-adjust: none;
 }
 
-.profile .hljs-header *,
-.ini .hljs-title,
-.nginx .hljs-title {
+.hljs,
+.hljs-subst {
+  color: #aaa;
+}
+
+.hljs-section {
   color: #fff;
 }
 
 .hljs-comment,
-.hljs-preprocessor,
-.hljs-preprocessor .hljs-title,
-.hljs-pragma,
-.hljs-shebang,
-.profile .hljs-summary,
-.diff,
-.hljs-pi,
-.hljs-doctype,
-.hljs-tag,
-.css .hljs-rule,
-.tex .hljs-special {
+.hljs-quote,
+.hljs-meta {
   color: #444;
 }
 
 .hljs-string,
 .hljs-symbol,
-.diff .hljs-change,
-.hljs-regexp,
-.xml .hljs-attribute,
-.smalltalk .hljs-char,
-.xml .hljs-value,
-.ini .hljs-value,
-.clojure .hljs-attribute,
-.coffeescript .hljs-attribute {
+.hljs-bullet,
+.hljs-regexp {
   color: #ffcc33;
 }
 
@@ -51,88 +38,36 @@ Author: pumbur <pumbur@pumbur.net>
 }
 
 .hljs-built_in,
+.hljs-builtin-name,
 .hljs-literal,
 .hljs-type,
-.hljs-typename,
-.go .hljs-constant,
-.ini .hljs-keyword,
-.lua .hljs-title,
-.perl .hljs-variable,
-.php .hljs-variable,
-.mel .hljs-variable,
-.django .hljs-variable,
-.css .funtion,
-.smalltalk .method,
-.hljs-hexcolor,
-.hljs-important,
-.hljs-flow,
-.hljs-inheritance,
-.hljs-name,
-.parser3 .hljs-variable {
+.hljs-template-variable,
+.hljs-attribute,
+.hljs-link {
   color: #32aaee;
 }
 
 .hljs-keyword,
-.hljs-tag .hljs-title,
-.css .hljs-tag,
-.css .hljs-class,
-.css .hljs-id,
-.css .hljs-pseudo,
-.css .hljs-attr_selector,
-.hljs-winutils,
-.tex .hljs-command,
-.hljs-request,
-.hljs-status {
+.hljs-selector-tag,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
   color: #6644aa;
 }
 
 .hljs-title,
-.ruby .hljs-constant,
-.vala .hljs-constant,
-.hljs-parent,
+.hljs-variable,
 .hljs-deletion,
-.hljs-template_tag,
-.css .hljs-keyword,
-.objectivec .hljs-class .hljs-id,
-.smalltalk .hljs-class,
-.lisp .hljs-keyword,
-.apache .hljs-tag,
-.nginx .hljs-variable,
-.hljs-envvar,
-.bash .hljs-variable,
-.go .hljs-built_in,
-.vbscript .hljs-built_in,
-.lua .hljs-built_in,
-.rsl .hljs-built_in,
-.tail,
-.avrasm .hljs-label,
-.tex .hljs-formula,
-.tex .hljs-formula * {
+.hljs-template-tag {
   color: #bb1166;
 }
 
+.hljs-section,
 .hljs-doctag,
-.profile .hljs-header,
-.ini .hljs-title,
-.apache .hljs-tag,
-.parser3 .hljs-title {
+.hljs-strong {
   font-weight: bold;
 }
 
-.coffeescript .javascript,
-.javascript .xml,
-.tex .hljs-formula,
-.xml .javascript,
-.xml .vbscript,
-.xml .css,
-.xml .hljs-cdata {
-  opacity: 0.6;
-}
-
-.hljs,
-.hljs-subst,
-.diff .hljs-chunk,
-.css .hljs-value,
-.css .hljs-attribute {
-  color: #aaa;
+.hljs-emphasis {
+  font-style: italic;
 }