bugfix for Ruby 2.0

Author: alexch

Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

HISTORY.md

@@ -1,3 +1,6 @@
+# 0.5.1
+* bugfix for Ruby 2.0
+
 # 0.5.0
 * bring deck.js up to date (https://github.com/imakewebthings/deck.js/commit/069f63294abe8c2bfd0e3c9b34d26090802c4f46)
 * add --style and --transition options

lib/deck/slide_deck.rb

@@ -94,7 +94,7 @@ def scripts
       end
 
       # fire up deck.js
-      script "$(function(){$.deck('.slide');});"
+      script raw("$(function(){$.deck('.slide');});")
 
     end
 

lib/deck/version.rb

@@ -1,3 +1,3 @@
 module Deck
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

spec/slide_deck_spec.rb

@@ -8,20 +8,25 @@ module Deck
 
     include Files
 
-    def doc
-      @doc ||= begin
-        @html = deck_widget.to_html
-        noko_doc @html
-      end
-    end
+    let(:html) { deck_widget.to_html }
+    let(:doc) { noko_doc html }
 
     def deck_widget options = {}
       @deck_widget ||= SlideDeck.new options
     end
 
+    def assert_html_like actual, expected
+      actual = actual.strip.gsub("\n\n", "\n")
+      expected = expected.strip.gsub("\n\n", "\n")
+      assert { actual == expected }
+    end
+
     it "renders a basic deck.js HTML page" do
-      assert { doc }
-      assert { @html.include? '<link href="/deck.js/core/deck.core.css" rel="stylesheet" />' }
+      assert { html.include? '<link href="/deck.js/core/deck.core.css" rel="stylesheet" />' }
+    end
+
+    it "starts the deck script running" do
+      assert { html.include? "$.deck('.slide');" }
     end
 
     it "contains a single dummy slide" do
@@ -35,27 +40,26 @@ def deck_widget options = {}
       assert { slides.size == 1 }
       slide = slides.first
       assert { slide["id"] == "hello" }
-      assert { noko_html(slide) == "<section class=\"slide\" id=\"hello\">" +
-          "<h1>hello</h1>\n" +
-          "</section>"
-      }
+
+      slide_html = noko_html(slide)
+      slide_html.gsub!("\n", "") # WTF Nokogiri inconsistently outputs newlines between Ruby 1.9 and 2.0
+      assert { slide_html == "<section class=\"slide\" id=\"hello\">" + "<h1>hello</h1>" + "</section>" }
     end
 
     it "includes a table of contents" do
       deck_widget :slides => Slide.split("# Foo\n\n# Bar\n")
       toc = doc.css('.slide_toc')
       assert { toc.size == 1 }
-      assert { noko_html(toc.first) == "<div class=\"slide_toc\">" +
+      assert_html_like noko_html(toc.first), "<div class=\"slide_toc\">" +
           "<div class=\"toggle\">[contents]</div>" +
           "<div class=\"table\">" +
           "<h2>deck.rb presentation</h2>" +
           "<ul>" +
           "<li><a href=\"#foo\">Foo</a></li>" +
           "<li><a href=\"#bar\">Bar</a></li>" +
           "</ul>" +
+          "</div>" +
           "</div>"
-          "</div>"
-      }
     end
 
     describe "themes" do

spec/slide_spec.rb

@@ -6,6 +6,13 @@
 module Deck
  describe Slide do
 
+   def assert_html_like actual, expected
+     actual = actual.strip.gsub("\n\n", "\n")
+     expected = expected.strip.gsub("\n\n", "\n")
+     assert { actual == expected }
+   end
+
+
   describe "classes" do
     it "by default" do
       assert {Slide.new.classes == ["slide"]}
@@ -246,7 +253,7 @@ def slide_from markdown_text
 </ul>
 </section>
       HTML
-      assert { html == expected_html }
+      assert_html_like html, expected_html
     end
 
     it "with only a underline-style header, leaving a solo H1 as an H1" do
@@ -259,7 +266,7 @@ def slide_from markdown_text
 <h1>foo</h1>
 </section>
       HTML
-      assert { html == expected_html }
+      assert_html_like html, expected_html
     end
 
     it "converts a non-solo underline-style H1 into an H2 for deck.js style compatibility)" do
@@ -279,7 +286,7 @@ def slide_from markdown_text
 </ul>
 </section>
       HTML
-      assert { html == expected_html }
+      assert_html_like html, expected_html
     end
 
     it "skips notes" do
@@ -291,7 +298,7 @@ def slide_from markdown_text
 </section>
         HTML
 
-      assert { slide_from(source).to_pretty == expected }
+      assert_html_like slide_from(source).to_pretty, expected
     end
 
   end
@@ -314,7 +321,7 @@ def slide_from markdown_text
 </ul>
 </section>
       HTML
-      assert { html == expected_html }
+      assert_html_like html, expected_html
     end
   end
 
@@ -336,7 +343,7 @@ def slide_from markdown_text
 </ul>
 </section>
       HTML
-      assert { html == expected_html }
+      assert_html_like html, expected_html
     end
   end