Add a dev mode feature flag and some starter classes

.rspec

@@ -0,0 +1 @@
+--require spec_helper

.travis.yml

@@ -1,6 +1,26 @@
 language: ruby
-
+sudo: false
+bundler_args: --jobs 4 --retry 2 --without packaging documentation
 before_install:
   - git config --global user.name "TravisCI"
   - git config --global user.email "[email protected]"
   - sudo apt-get install wkhtmltopdf
+script:
+  - "bundle exec rake $CHECK"
+notifications:
+  email: false
+
+matrix:
+  include:
+    - rvm: 2.0
+      env: "CHECK=spec"
+      gemfile: Gemfile.ruby-2.0.x
+
+    - rvm: 2.3
+      env: "CHECK=spec"
+
+    - rvm: 2.5
+      env: "CHECK=spec"
+
+    - rvm: 2.6
+      env: "CHECK=spec"

Gemfile

@@ -16,6 +16,8 @@ end
 
 group :test do
   gem 'rake'
+  gem 'rspec'
+  gem 'pry'
 end
 
 gem 'rack-contrib'

Gemfile.ruby-2.0.x

@@ -0,0 +1,25 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'public_suffix', '2.0.5'
+gem 'i18n', '1.2.0'
+gem 'nokogiri', '1.6.8.1'
+
+group :development do
+  gem "turn"
+  gem "rack-test"
+  gem "pdf-inspector"
+end
+
+group :optional do
+  gem "pdfkit"
+end
+
+group :test do
+  gem 'rake'
+  gem 'rspec'
+  gem 'pry'
+end
+
+gem 'rack-contrib'

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'

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'
@@ -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.'
@@ -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
 

lib/showoff.rb

@@ -1518,6 +1518,8 @@ def self.do_static(args, opts = {})
         ["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)
@@ -1533,7 +1535,12 @@ def self.do_static(args, opts = {})
 
         # ..., copy all user-defined styles and javascript files
         showoff.css_files.each { |path|
-          dest = File.join(file_dir, 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)
         }

lib/showoff/compiler.rb

@@ -0,0 +1,106 @@
+require 'tilt'
+require 'tilt/erb'
+require 'nokogiri'
+
+class Showoff::Compiler
+  require 'showoff/compiler/form'
+  require 'showoff/compiler/variables'
+  require 'showoff/compiler/fixups'
+  require 'showoff/compiler/i18n'
+  require 'showoff/compiler/notes'
+  require 'showoff/compiler/glossary'
+  require 'showoff/compiler/downloads'
+  require 'showoff/compiler/table_of_contents'
+
+  def initialize(options)
+    @options = options
+    @profile = profile
+  end
+
+  # Configures Tilt with the selected engine and options.
+  #
+  # Returns render options profile hash
+  #
+  # Source:
+  #  https://github.com/puppetlabs/showoff/blob/3f43754c84f97be4284bb34f9bc7c42175d45226/lib/showoff_utils.rb#L671-L720
+  # TODO: per slide profiles of render options
+  def profile
+    renderer = Showoff::Config.get('markdown')
+    profile  = Showoff::Config.get(renderer)
+
+    begin
+      # Load markdown configuration
+      case renderer
+      when 'rdiscount'
+        Tilt.prefer Tilt::RDiscountTemplate, "markdown"
+
+      when 'maruku'
+        Tilt.prefer Tilt::MarukuTemplate, "markdown"
+        # Now check if we can go for latex mode
+        require 'maruku'
+        require 'maruku/ext/math'
+
+        if profile[:use_tex]
+          MaRuKu::Globals[:html_math_output_mathml] = false
+          MaRuKu::Globals[:html_math_output_png]    = true
+          MaRuKu::Globals[:html_math_engine]        = 'none'
+          MaRuKu::Globals[:html_png_engine]         = 'blahtex'
+          MaRuKu::Globals[:html_png_dir]            = profile[:png_dir]
+          MaRuKu::Globals[:html_png_url]            = profile[:html_png_url]
+        end
+
+      when 'bluecloth'
+        Tilt.prefer Tilt::BlueClothTemplate, "markdown"
+
+      when 'kramdown'
+        Tilt.prefer Tilt::KramdownTemplate, "markdown"
+
+      when 'commonmarker', 'commonmark'
+        Tilt.prefer Tilt::CommonMarkerTemplate, "markdown"
+
+      when 'redcarpet', :default
+        Tilt.prefer Tilt::RedcarpetTemplate, "markdown"
+
+      else
+        raise 'Unsupported markdown renderer'
+
+      end
+    rescue LoadError
+      puts "ERROR: The #{renderer} markdown rendering engine does not appear to be installed correctly."
+      exit! 1
+    end
+
+    profile
+  end
+
+  # Compiles markdown and all Showoff extensions into the final HTML output and notes.
+  #
+  # @param content [String] markdown content.
+  # @return [[String, Array<String>]] A tuple of (html content, array of notes contents)
+  #
+  # @todo I think the update_image_paths() malarky is redundant. Verify that.
+  def render(content)
+    Variables::interpolate!(content)
+    I18n.selectLanguage!(content)
+
+    html = Tilt[:markdown].new(nil, nil, @profile) { content }.render
+    doc  = Nokogiri::HTML::DocumentFragment.parse(html)
+
+    Form.render!(doc, @options)
+    Fixups.updateClasses!(doc)
+    Fixups.updateLinks!(doc)
+    Fixups.updateSyntaxHighlighting!(doc)
+    Fixups.updateCommandlineBlocks!(doc)
+    Fixups.updateImagePaths!(doc, @options)
+    Glossary.render!(doc)
+    Downloads.scanForFiles!(doc, @options)
+
+    # This call must be last in the chain because it separates notes from the
+    # content and returns them separately. If it's not last, then the notes
+    # won't have all the compilation steps applied to them.
+    #
+    # must pass in extra context because this will render markdown itself
+    Notes.render!(doc, @profile, @options)
+  end
+
+end

lib/showoff/compiler/downloads.rb

@@ -0,0 +1,91 @@
+# adds file download link processing
+class Showoff::Compiler::Downloads
+
+  # Scan for file download links and move them to the state storage.
+  #
+  # @param doc [Nokogiri::HTML::DocumentFragment]
+  #     The slide document
+  #
+  # @return [Nokogiri::HTML::DocumentFragment]
+  #     The slide DOM with download links removed.
+  #
+  # @todo Should .download change meaning to 'make available on this slide'?
+  #
+  # @see
+  #     https://github.com/puppetlabs/showoff/blob/3f43754c84f97be4284bb34f9bc7c42175d45226/lib/showoff.rb#L1056-L1073
+  def self.scanForFiles!(doc, options)
+    current = Showoff::State.get(:slide_count)
+    doc.search('p.download').each do |container|
+      links = container.text.gsub(/^\.download ?/, '')
+      links.split("\n").each do |line|
+        file, modifier = line.split
+        modifier ||= 'next' # @todo Is this still the proper default?
+
+        case modifier
+        when 'a', 'all', 'always', 'now'
+          self.pushFile(0, current, options[:name], file)
+        when 'p', 'prev', 'previous'
+          self.pushFile(current-1, current, options[:name], file)
+        when 'c', 'curr', 'current'
+          self.pushFile(current, current, options[:name], file)
+        when 'n', 'next'
+          self.pushFile(current+1, current, options[:name], file)
+        end
+      end
+
+      container.remove
+    end
+
+    doc
+  end
+
+
+# Convention that index 0 represents files that are always available and every
+# other index represents files whose visibility will be triggered on that slide.
+#
+#   [
+#     {
+#       :enabled => false,
+#       :slides  => [
+#                     {:slidenum => num, :source => name, :file => file},
+#                     {:slidenum => num, :source => name, :file => file},
+#                   ],
+#     },
+#     {
+#       :enabled => false,
+#       :slides  => [
+#                     {:slidenum => num, :source => name, :file => file},
+#                     {:slidenum => num, :source => name, :file => file},
+#                   ],
+#     },
+#   ]
+
+
+  def self.pushFile(index, current, source, file)
+    record = Showoff::State.getAtIndex(:downloads, index) || {}
+    record[:enabled] ||= false
+    record[:slides]  ||= []
+    record[:slides] << {:slidenum => current, :source => source, :file => file}
+
+    Showoff::State.setAtIndex(:downloads, index, record)
+  end
+
+  def self.enableFiles(index)
+    record = Showoff::State.getAtIndex(:downloads, index)
+    return unless record
+
+    record[:enabled] = true
+    Showoff::State.setAtIndex(:downloads, index, record)
+  end
+
+  def self.getFiles(index)
+    record = Showoff::State.getAtIndex(:downloads, index)
+
+    if (record and record[:enabled])
+      record[:slides]
+    else
+      []
+    end
+  end
+
+end