asciidoctor-revealjs 3.1.0 → 4.0.0

data/Rakefile

@@ -4,6 +4,7 @@ require 'asciidoctor'
 require 'asciidoctor/doctest'
 require 'colorize'
 require 'tilt'
+require 'rake/testtask'
 
 CONVERTER_FILE = 'lib/asciidoctor-revealjs/converter.rb'
 JS_FILE = 'build/asciidoctor-reveal.js'
@@ -17,8 +18,7 @@ end
 namespace :build do
   desc 'Compile Slim templates and generate converter.rb'
   task :converter => 'clean' do
-    # NOTE: using mode :fast by default due to a bug in ruby-beautify under Ruby 2.5
-    #       https://github.com/erniebrodeur/ruby-beautify/issues/45
+    # NOTE: use :pretty if you want to debug the generated code
     build_converter :fast
   end
 
@@ -40,7 +40,8 @@ namespace :build do
     mkdir_p [File.dirname(JS_FILE), File.dirname(DIST_FILE)]
     File.open(JS_FILE, 'w') do |file|
       template = File.read('src/asciidoctor-revealjs.tmpl.js')
-      file << template.sub('//OPAL-GENERATED-CODE//', builder.to_s)
+      template['//OPAL-GENERATED-CODE//'] = builder.to_s
+      file << template
     end
     File.binwrite "#{JS_FILE}.map", builder.source_map
 
@@ -76,6 +77,7 @@ def build_converter(mode = :pretty)
         basebackend: 'html',
         outfilesuffix: '.html',
         filetype: 'html',
+        supports_templates: true
       },
       delegate_backend: 'html5',
       engine_opts: {
@@ -94,6 +96,11 @@ DocTest::RakeTasks.new do |t|
   t.converter_opts = { backend_name: 'revealjs' }
 end
 
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList['test/asciidoctor-revealjs/*_test.rb']
+  t.warning = false
+end
+
 task 'prepare-converter' do
   # Run as an external process to ensure that it will not affect tests
   # environment with extra loaded modules (especially slim).
@@ -132,7 +139,8 @@ namespace :examples do
   end
 end
 
+task 'test' => 'doctest'
 task 'doctest:test' => 'prepare-converter'
 task 'doctest:generate' => 'prepare-converter'
 # When no task specified, run test.
-task :default => :doctest
+task :default => :test

data/asciidoctor-revealjs.gemspec

@@ -36,13 +36,15 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake', '~> 13.0.0'
   s.add_development_dependency 'asciidoctor-doctest', '= 2.0.0.beta.5'
-  s.add_development_dependency 'pry', '~> 0.10.4'
+  s.add_development_dependency 'minitest', '~> 5.14'
   if RUBY_ENGINE != 'jruby'
+    s.add_development_dependency 'pry', '~> 0.12.0'
+    s.add_development_dependency 'irb'
     s.add_development_dependency 'pry-byebug'
     s.add_development_dependency 'pygments.rb'
   end
   s.add_development_dependency 'colorize'
-  s.add_development_dependency 'asciidoctor-templates-compiler', '~> 0.4.2'
+  s.add_development_dependency 'asciidoctor-templates-compiler', '~> 0.6.0'
   s.add_development_dependency 'slim', '~> 3.0.6'
   s.add_development_dependency 'slim-htag', '~> 0.1.0'
   s.add_development_dependency 'rouge'

data/examples/docinfo-footer-revealjs.html

@@ -0,0 +1,10 @@
+<script src="https://platform.twitter.com/widgets.js"></script>
+<script>
+  twttr.widgets.createTweet(
+    '1214773648776744962',
+    document.getElementById('tweet'),
+    {
+      theme: 'white'
+    }
+  );
+</script>

data/examples/docinfo-revealjs.html

@@ -0,0 +1,7 @@
+<meta name="generator" content="Asciidoctor reveal.js">
+<style>
+  #tweet {
+    display: flex;
+    justify-content: center;
+  }
+</style>

data/examples/font-awesome.adoc

@@ -4,6 +4,7 @@
 // :header_footer:
 = Font Awesome Tests
 :icons: font
+:customcss: font-awesome.css
 
 == !
 
@@ -16,7 +17,7 @@ icon:heart[size=5x]
 == !
 
 // TODO
-[red]
+[.red]
 icon:heart[size=5x]
 
 == !

data/examples/font-awesome.css

@@ -0,0 +1,3 @@
+div.red > p > span.icon {
+  color: red;
+}

data/examples/fragments.adoc

@@ -0,0 +1,32 @@
+// .revealjs-features
+// This example tests some of reveal.js' fragments features
+// :include: //body/script | //div[@class="slides"]
+// :header_footer:
+= Fragments
+:revealjs_history: true
+:revealjs_fragmentInURL: true
+:customcss: fragments.css
+
+== Fragments
+
+[%step]
+* Fragments
+* Are a reveal.js feature
+* Very familiar to Powerpoint users
+
+== Fragments in URL
+
+[%step]
+* With reveal.js 3.6
+* Fragments
+* Can now be displayed in URLs
+
+== Using data-fragment
+
+[%step]
+* You can now
+* Do
+* Fancy
+* CSS Things
+* With Fragments
+* See `fragments.css`

data/examples/fragments.css

@@ -0,0 +1,18 @@
+@import 'https://fonts.googleapis.com/css?family=Baloo+Bhai';
+
+section[data-fragment="2"] p {
+    font-family: 'Baloo Bhai', cursive;
+}
+
+section[data-fragment="3"] p {
+  color: black;
+  flex: 1;
+  font-size: 2em;
+  line-height: 1.2;
+  text-decoration: none;
+  background-image: linear-gradient(to right, yellow 0, yellow 100%);
+  background-position: 0 -0.1em;
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  transition: background .5s;
+}

data/examples/grid-layout-docinfo-revealjs.html

@@ -0,0 +1,11 @@
+<style>
+  .slide-background.is-half.left.green > .slide-background-content::before {
+    position: absolute;
+    content: "";
+    height: 100%;
+    width: 50%;
+    top: 0;
+    left: 0;
+    background: linear-gradient(61deg, #f070a8 0%, #cdb171 100%)
+  }
+</style>

data/examples/grid-layout.adoc

@@ -0,0 +1,174 @@
+// .grid-layout
+// Testing our columns roles
+// :include: //div[@class="slides"]
+// :header_footer:
+= Grid Layout
+:docinfo: private
+:source-highlighter: highlight.js
+:highlightjs-languages: clojure,scala
+:revealjs_hash: true
+
+[.columns]
+== 2 columns
+
+[.column]
+--
+* **Edgar Allen Poe**
+* Sheri S. Tepper
+* Bill Bryson
+--
+
+[.column]
+--
+Edgar Allan Poe (/poʊ/; born Edgar Poe; January 19, 1809 – October 7, 1849) was an American writer, editor, and literary critic.
+--
+
+[.columns.wrap]
+== Multi-columns with wrap
+
+[.column]
+--
+.Kotlin
+[source,kotlin]
+----
+fun main() {
+    println("Hello, World!")
+}
+----
+--
+
+[.column]
+--
+.Clojure
+[source,clojure]
+----
+(defn -main [& args]
+  (println "Hello, World!"))
+----
+--
+
+[.column]
+--
+.Scala
+[source,scala]
+----
+object HelloWorld {
+  def main(args: Array[String]): Unit = {
+    println("Hello, world!")
+  }
+}
+----
+--
+
+[.columns]
+== Columns with size
+
+[.column.is-one-third]
+--
+* **Kotlin**
+* Java
+* Scala
+--
+
+[.column]
+--
+Programming language for Android, mobile cross-platform
+and web development, server-side, native,
+and data science. Open source forever Github.
+--
+
+[.columns]
+== 3 columns
+
+[.column]
+* Java
+* **Kotlin**
+
+[.column]
+* Node
+* **Deno**
+
+[.column]
+* Ruby
+* **Crystal**
+
+
+[.columns.is-half.green.left]
+== !
+
+[.column.is-half]
+* Java
+* **Kotlin**
+
+[.column.is-half]
+* Ruby
+* **Crystal**
+
+== Languages
+
+We will go over languages
+
+[.columns]
+=== Kotlin
+
+[.column]
+[source,kotlin]
+----
+fun main() {
+    println("Hello, World!")
+}
+----
+
+[.column]
+--
+* Nice and compact
+* Works well on Android
+--
+
+[.columns]
+=== Clojure
+
+[.column]
+[source,clojure]
+----
+(defn -main [& args]
+  (println "Hello, World!"))
+----
+
+[.column]
+--
+* Lisp-like
+* Few simple concepts
+--
+
+[.columns.is-vcentered]
+== Vertically Centered Columns
+
+[.column]
+* Java
+* **Kotlin**
+
+[.column]
+* Node
+* **Deno**
+
+[.column.is-half]
+--
+.Source
+[source,asciidoc]
+....
+[.columns.is-vcentered]
+== Vertically Aligned Columns
+
+[.column]
+* Java
+* **Kotlin**
+
+[.column]
+* Node
+* **Deno**
+
+[.column.is-half]
+[...]
+....
+--

data/examples/history-hash.adoc

@@ -0,0 +1,19 @@
+// .hash
+// Enables reveal.js hash feature which is good to reload in-progress slides and doesn't push to browser history.
+// :include: //body/script | //div[@class="slides"]
+// :header_footer:
+= No History
+:backend: revealjs
+:revealjs_hash: true
+
+== First slide
+
+This Deck
+
+== Second slide
+
+You can reload anytime
+
+== Third slide
+
+Yet browser history is not spammed

data/examples/history-regression-tests.adoc

@@ -42,8 +42,3 @@
 == hello こんにちは
 
 == hello 你好
-
-[id=xss" onClick="javascript:alert('xss-ed')]
-== hello XSS
-
-security?

data/examples/history.adoc

@@ -1,5 +1,5 @@
 // .history
-// Enables Reveal.JS' browser history feature
+// Enables reveal.js' browser history feature
 // :include: //body/script | //div[@class="slides"]
 // :header_footer:
 = History
@@ -8,12 +8,12 @@
 
 == First slide
 
-Uno
+This
 
 == Second slide
 
-Dos
+Pushes
 
 == Third slide
 
-Tres
+To Browser History Stack

data/examples/images/asciidoctor-logo.svg

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="105.83333mm"
+   height="105.83333mm"
+   viewBox="0 0 105.83333 105.83333"
+   version="1.1"
+   id="svg3751"
+   inkscape:export-filename="/tmp/asciidoctor-logo-fill-color.png"
+   inkscape:export-xdpi="240"
+   inkscape:export-ydpi="240"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <title
+     id="title4527">Asciidoctor</title>
+  <defs
+     id="defs3745" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.6245048"
+     inkscape:cx="-46.777153"
+     inkscape:cy="24.966208"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="3200"
+     inkscape:window-height="1658"
+     inkscape:window-x="0"
+     inkscape:window-y="68"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3748">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Asciidoctor</dc:title>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Asciidoctor</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:description>Asciidoctor project logo.</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>AsciiDoc</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:relation>https://asciidoctor.org</dc:relation>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-0.083335,-191.08337)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path907"
+       d="m 26.240746,191.08337 c -14.436702,0 -26.157411,11.7201 -26.157411,26.15666 v 53.51951 c 0,14.43654 11.720957,26.15715 26.157411,26.15715 H 79.76025 c 14.436679,0 26.15641,-11.72061 26.15641,-26.15715 v -53.51951 c 0,-14.43656 -11.719488,-26.15666 -26.15641,-26.15666 z"
+       style="clip-rule:evenodd;fill:#e40046;fill-opacity:1;fill-rule:evenodd;stroke-width:0.24752024;stroke-linejoin:round;stroke-miterlimit:1.41420996" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.46009064px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 55.70942,210.48548 a 2.2302684,2.2302684 0 0 0 -2.015517,1.37263 l -13.327365,32.05565 a 2.2302684,2.2302684 0 1 0 4.117839,1.71171 l 11.25217,-27.06706 23.600261,57.54395 a 2.2302684,2.2302684 0 1 0 4.125976,-1.69271 L 57.814455,211.86894 a 2.2302684,2.2302684 0 0 0 -2.105035,-1.38346 z"
+       id="path909"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path911"
+       d="m 36.817184,255.95416 a 2.2302685,2.2302685 0 0 0 -2.024151,1.40272 l -7.083967,17.04249 a 2.2302685,2.2302685 0 1 0 4.118502,1.71234 l 7.083967,-17.0425 a 2.2302685,2.2302685 0 0 0 -2.094351,-3.11505 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46009111px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.46009111px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 21.548721,254.55016 a 2.2302685,2.2302685 0 1 0 0,4.45963 h 25.754124 a 2.2302685,2.2302685 0 1 0 0,-4.45964 z"
+       id="path915"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.46009111px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 26.263348,243.9626 a 2.2302685,2.2302685 0 1 0 0,4.45962 h 25.751411 a 2.2302685,2.2302685 0 1 0 0,-4.45962 z"
+       id="path919"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>