trickster 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5308d593c057d2a323226877617ae50e6aac31ec
-  data.tar.gz: 9b5050525dfc9eeef89352a7d73807c2b89b86a9
+  metadata.gz: 2cbd32e7bfd1f9179242368244df932da57a3e0f
+  data.tar.gz: 321ce664454f8351575baeee7fd82e1f193bdbb8
 SHA512:
-  metadata.gz: ad51ce913a437a04c8ca3fb0bf4258601bb28dc8873b931a31321a064f520ed3dfd127ba5b01af62cc59b9698c86bd4c6c877ac1e809b09a2ce5d785afc26e3d
-  data.tar.gz: 574787f3ae4030971b1ccebbdfae5ad0c504504427440c3ded1aac5706c5a06116394a89ce1c3f9158b16edf10dee3ea1080874b2f7341f05c17a3e496f2f5e8
+  metadata.gz: a5901ea211e0282e9b50a0dbd3ad54097246050b6e0d9b411ed109b070326285c963c5aeaeae5f47622154f66315689d73834c3895c8fd995d1fd01eee8cfc58
+  data.tar.gz: b2de674a15470b8ac4cc5098111683cc0fddaabc1952dc1d07e512425fd5eb58931baa0f033312f22c01f33e3b746a4487541e02dc14fd7ab579594ba1e8ddb4

data/.gitignore

@@ -14,3 +14,4 @@ Gemfile.lock
 results.html
 .rbx
 .DS_Store
+test_slides.html

data/README.rdoc

@@ -59,6 +59,10 @@ The first line is the url to the image to show.  Trickster will size the image d
 
 If the first line starts with <tt>file://</tt>, the contents of this file is read in as the contents of the code block.  Otherwise, the entire contents of the slide is verbatim put into a +pre+ and then +code+ block.  Syntax highlighting is done using +highlight.js+.
 
+== FREEFORM
+
+The slide's content is passed through verbatim (keeping in mind that blank lines are slide delimiters).  This allows you to do more sophisticated layouts like tables or floats.
+
 === Language
 
 By default, no language is specified for highlighting, so +highlight.js+ will make a guess.  If you'd like to be explicit, use the +language+ option, e.g.

data/lib/trickster.rb

@@ -1,5 +1,6 @@
 require 'trickster/version'
 require 'trickster/slide_parser'
+require 'trickster/renderer/freeform_renderer'
 require 'trickster/renderer/code_renderer'
 require 'trickster/renderer/bullets_renderer'
 require 'trickster/renderer/commandline_renderer'

data/lib/trickster/renderer/freeform_renderer.rb

@@ -0,0 +1,9 @@
+module Trickster
+  module Renderer
+    class FreeformRenderer
+      def render(io,content,options)
+        content.each { |line| io.puts line }
+      end
+    end
+  end
+end

data/lib/trickster/slide_renderer.rb

@@ -21,6 +21,7 @@ module Trickster
       hash["COMMANDLINE"] = Renderer::CommandlineRenderer.new
       hash["BULLETS"] = Renderer::BulletsRenderer.new
       hash["CODE"] = Renderer::CodeRenderer.new
+      hash["FREEFORM"] = Renderer::FreeformRenderer.new
     }.freeze
 
     def write_slide(slide_type,content,slide)

data/lib/trickster/version.rb

@@ -1,3 +1,3 @@
 module Trickster
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/test/slide_renderer_test.rb

@@ -85,6 +85,25 @@ class SlideRendererTest < Clean::Test::TestCase
     }
   end
 
+  test_that "a free-form slide just passes through the HTML" do
+    Given {
+      @html = %{<h1>This is some stuff</h1>
+      <table>
+        <thead><tr><th>Name</th><th>Age</th></tr></thead>
+        <tbody>
+          <tr><td>Bob</td><td>24</td></tr>
+          <tr><td>Rudy</td><td>13</td></tr>
+        </tbody>
+      </table>}
+    }
+    When {
+      @renderer.render_slide("FREEFORM",@html.split("\n"))
+    }
+    Then {
+      assert_content("FREEFORM",@html,@renderer.content)
+    }
+  end
+
   test_that "bullets get the first line as title, remainder as bullets, removing the bullet char" do
     Given {
       @title = any_string

data/test_slides

@@ -43,3 +43,21 @@ drwxr-xr-x  3 David  staff    102 Sep 10 17:07 tmp
 drwxr-xr-x  9 David  staff    306 Sep 10 17:19 test
 > rm *
 
+!FREEFORM
+<h1>This is a freeform slide</h1>
+<table>
+  <thead><tr>
+    <th>Name</th><th>Age</th><th>Role</th>
+  </tr></thead>
+  <tbody>
+    <tr>
+      <td>Dave</td><td>40</td><td>Husband</td>
+    </tr>
+    <tr>
+      <td>Amy</td><td>One shouldn't ask</td><td>Wife</td>
+    </tr>
+    <tr>
+      <td>Rudy</td><td>13</td><td>Cat</td>
+    </tr>
+  </tbody>
+</table>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trickster
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - David Copeland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -207,6 +207,7 @@ files:
 - lib/trickster/renderer/bullets_renderer.rb
 - lib/trickster/renderer/code_renderer.rb
 - lib/trickster/renderer/commandline_renderer.rb
+- lib/trickster/renderer/freeform_renderer.rb
 - lib/trickster/renderer/image_renderer.rb
 - lib/trickster/renderer/normal_renderer.rb
 - lib/trickster/slide_parser.rb