deckrb 0.1.0 → 0.1.1

data/lib/deck/version.rb

@@ -1,3 +1,3 @@
 module Deck
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/rack_app_spec.rb

@@ -0,0 +1,177 @@
+here = File.expand_path File.dirname(__FILE__)
+require "#{here}/spec_helper"
+
+require "deck/rack_app"
+
+require "rack/test"
+
+describe Deck::RackApp do
+  include Rack::Test::Methods
+
+  describe "app with middleware" do
+    def app
+      @app ||= Deck::RackApp.build []
+    end
+
+    def apps
+      @apps ||= begin
+        [app].tap do |apps|
+          while (next_app = apps.last.instance_variable_get(:@app))
+            apps << next_app
+          end
+        end
+      end
+    end
+
+    def raw_app
+      apps.last
+    end
+
+    it "middleware chain resolves to the real app" do
+      assert { raw_app.is_a? Deck::RackApp }
+    end
+
+    it "serves up deck.js source files" do
+      deckjs_core_path = "deck.js/core/deck.core.js"
+      get "/#{deckjs_core_path}"
+      assert { last_response.body ==
+        File.read("#{here}/../public/#{deckjs_core_path}", :encoding => last_response.body.encoding)}
+    end
+
+  end
+
+  describe "raw app" do
+    def app
+      @app ||= Deck::RackApp.new []
+    end
+
+    it "serves a .md file as a deck.js HTML file" do
+      dir = Files do
+        file "foo.md"
+      end
+      @app = Deck::RackApp.new ["#{dir}/foo.md"]
+      get "/"
+      assert_ok
+      assert { last_response.body.include? "contents of foo.md" }
+      assert { last_response.body.include? "<script src=\"deck.js/core/deck.core.js\"" }
+    end
+
+    it "404s anything but the root path" do
+      get "/something"
+      assert { last_response.status == 404 }
+    end
+
+    it "serves up non-markdown files in the top directory" do
+      dir = Files do
+        file "foo.md"
+        file "foo.css"
+      end
+      @app = Deck::RackApp.build ["#{dir}/foo.md"]
+      get "/foo.css"
+      assert_ok
+      assert { last_response.body.include? "contents of foo.css" }
+    end
+
+    def assert_ok
+      unless last_response.ok?
+        status, errors = last_response.status, last_response.errors
+        assert(last_response.inspect) { errors.empty? && status == 200 }
+      end
+    end
+
+    describe "serving multiple slide files from multiple subdirs" do
+
+      before do
+        @dir = Files do
+          dir "foo" do
+            file "foo.md", "# foo"
+            file "foo.css"
+          end
+          dir "bar" do
+            file "bar.md", "# barista\n\n# barbie\n\n# bartles & james"
+            file "bar.css"
+            dir "img" do
+              file "bar.png"
+            end
+          end
+        end
+
+        @app = Deck::RackApp.build ["#{@dir}/foo/foo.md", "#{@dir}/bar/bar.md"]
+      end
+
+      it "stuffs all the source files into a single slide deck served off /" do
+        get "/"
+        assert_ok
+
+        doc = noko_doc(last_response.body)
+
+        slides = doc.css('section.slide')
+        assert { slides.size == 4 }
+        assert { slides[0].inner_html.include?("<h1>foo</h1>") }
+        assert { slides[1].inner_html.include?("<h1>barista</h1>") }
+        assert { slides[2].inner_html.include?("<h1>barbie</h1>") }
+        assert { slides[3].inner_html.include?("<h1>bartles &amp; james</h1>") }
+      end
+
+      it "serves sibling and child files too" do
+
+        get "/foo.css"
+        assert_ok
+        assert { last_response.body.include? "contents of foo.css" }
+
+        get "/bar.css"
+        assert_ok
+        assert { last_response.body.include? "contents of bar.css" }
+
+        get "/img/bar.png"
+        assert_ok
+        assert { last_response.body.include? "contents of bar.png" }
+
+      end
+    end
+
+    describe "highlights code blocks" do
+      def build_app markdown
+        @dir = Files do
+          file "foo.md", markdown
+        end
+        @app = Deck::RackApp.build ["#{@dir}/foo.md"]
+      end
+
+      def assert_code_is_highlighted
+        get "/"
+        assert_ok
+        doc = noko_doc(last_response.body)
+
+        slides = doc.css('section.slide')
+        assert { slides.size == 1 }
+        slide = slides.first
+        code_block = slide.css('pre').first
+        assert { code_block.inner_html == "sum = <span class=\"integer\">2</span> + <span class=\"integer\">2</span>\n"     }
+      end
+
+      it "with :::" do
+        build_app <<-MARKDOWN
+# some code
+
+    :::ruby
+    sum = 2 + 2
+        MARKDOWN
+
+        assert_code_is_highlighted
+      end
+
+      it "with @@@" do
+        build_app <<-MARKDOWN
+# some code
+
+    @@@ruby
+    sum = 2 + 2
+        MARKDOWN
+
+        assert_code_is_highlighted
+      end
+    end
+
+  end
+end

data/spec/slide_deck_spec.rb

@@ -0,0 +1,46 @@
+here = File.expand_path File.dirname(__FILE__)
+require "#{here}/spec_helper"
+
+require "deck/slide_deck"
+
+module Deck
+ describe SlideDeck do
+
+  def doc
+    @doc ||= begin
+      @html = deck_widget.to_html
+      noko_doc @html
+    end
+  end
+
+  def deck_widget options = {}
+    @deck_widget ||= SlideDeck.new options
+  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" />' }
+  end
+
+  it "contains a single dummy slide" do
+    assert { doc.css('section.slide').size == 1 }
+  end
+
+  it "renders a markdown file with one slide" do
+    file = nil
+    dir = Files do
+      file = file("hello.md", "# hello")
+    end
+
+    deck_widget :slides => Slide.split(File.read file)
+    assert { doc.css('section.slide').size == 1 }
+    slide = doc.css('section.slide').first
+    assert { slide["id"] == "hello" }
+    assert { noko_html(slide) == "<section class=\"slide\" id=\"hello\">" +
+      "<h1>hello</h1>\n" +
+      "</section>"
+    }
+  end
+
+ end
+end

data/spec/slide_spec.rb

@@ -5,21 +5,21 @@ require "deck/slide"
 
 module Deck
  describe Slide do
-  
+
   describe "classes" do
     it "by default" do
       assert {Slide.new.classes == ["slide"]}
     end
-    
+
     it "when passed a string" do
       assert {Slide.new(:classes => "foo bar").classes == ["slide", "foo", "bar"]}
     end
-    
+
     it "when passed an array" do
       assert {Slide.new(:classes => ["foo", "bar"]).classes == ["slide", "foo", "bar"]}
     end
   end
-  
+
   describe "splits Markdown into slides" do
     it "from an empty string" do
       slides = Slide.split ""
@@ -90,6 +90,10 @@ module Deck
       assert { slides.size == 2 }
     end
 
+    def inner_html slide
+      noko_doc(slide.to_html).css("section.slide").first.inner_html
+    end
+
     describe "every H1 defines a new slide" do
       it "if there are no !SLIDE markers at all" do
         slides = Slide.split <<-MARKDOWN
@@ -100,16 +104,17 @@ module Deck
 * dos
         MARKDOWN
         assert { slides.size == 2 }
+
         slide = slides.first
         assert { slide.classes == ["slide"] }
-        assert { slides.first.markdown_text == "# One\n* uno\n\n" }
+        assert { slide.markdown_text == "# One\n* uno\n\n" }
+
         slide = slides[1]
         assert { slide.classes == ["slide"] }
         assert { slide.markdown_text == "# Two\n* dos\n" }
       end
 
       it "with underline-style H1s" do
-        pending "parsing underline-style H1s"
         slides = Slide.split <<-MARKDOWN
 One
 ===
@@ -121,9 +126,9 @@ Two
         MARKDOWN
         assert { slides.size == 2 }
 
-        slide = slides.first
+        slide = slides[0]
         assert { slide.classes == ["slide"] }
-        assert { slides.first.markdown_text == "One\n===\n* uno\n\n" }
+        assert { slide.markdown_text == "One\n===\n* uno\n\n" }
 
         slide = slides[1]
         assert { slide.classes == ["slide"] }
@@ -170,28 +175,28 @@ Two
       end
     end
   end
-  
+
   def slide_from markdown_text
     Slide.split(markdown_text).first
   end
-  
+
   describe "sets the slide's id" do
     it "based on the first header" do
       assert { slide_from("# foo").slide_id == "foo" }
     end
-    
+
     it "lowercases and sanitizes" do
       assert { slide_from("# Foo's #1!").slide_id == "foos_1" }
     end
-    
+
     it "from a parameter if one is passed" do
       slide = Slide.new(:markdown_text => "# foo", :slide_id => "bar")
       assert { slide.slide_id == "bar" }
     end
   end
-  
+
   describe "renders deck.js-compatible HTML" do
-    it "with only a header, leaving a solo H1 as an H1" do
+    it "leaves a solo H1 as an H1" do
       html = slide_from(<<-MARKDOWN).to_pretty
 # foo
       MARKDOWN
@@ -203,7 +208,7 @@ Two
       assert { html == expected_html }
     end
 
-    it "with a header and bullets (converting a non-solo H1 into an H2 for deck.js style compatibility)" do
+    it "converts a non-solo H1 into an H2 for deck.js style compatibility)" do
       html = slide_from(<<-MARKDOWN).to_pretty
 # foo
 * bar
@@ -223,7 +228,6 @@ Two
     end
 
     it "with only a underline-style header, leaving a solo H1 as an H1" do
-      pending "parsing underline-style H1s"
       html = slide_from(<<-MARKDOWN).to_pretty
 foo
 ===
@@ -237,7 +241,6 @@ foo
     end
 
     it "converts a non-solo underline-style H1 into an H2 for deck.js style compatibility)" do
-      pending "parsing underline-style H1s"
       html = slide_from(<<-MARKDOWN).to_pretty
 foo
 ===
@@ -256,10 +259,10 @@ foo
       HTML
       assert { html == expected_html }
     end
-    
-    
+
+
   end
-  
+
   describe "slide classes" do
     it "are added to the section element" do
       html = slide_from(<<-MARKDOWN).to_pretty
@@ -280,6 +283,6 @@ foo
       HTML
       assert { html == expected_html }
     end
-  end 
+  end
  end
 end

data/spec/spec_helper.rb

@@ -5,3 +5,8 @@ $: << "#{top}/lib"
 require "rspec"
 require "wrong/adapters/rspec"
 require "nokogiri"
+require "wrong"
+require "files"
+
+require "deck/noko"
+include Deck::Noko

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deckrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2012-01-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erector
-  requirement: &70280051769480 !ruby/object:Gem::Requirement
+  requirement: &70283473244720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0.pre1
   type: :runtime
   prerelease: false
-  version_requirements: *70280051769480
+  version_requirements: *70283473244720
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70280051768340 !ruby/object:Gem::Requirement
+  requirement: &70283473244220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *70280051768340
+  version_requirements: *70283473244220
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70280051758200 !ruby/object:Gem::Requirement
+  requirement: &70283473243820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,40 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280051758200
+  version_requirements: *70283473243820
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70283473243360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70283473243360
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: &70283473242860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70283473242860
+- !ruby/object:Gem::Dependency
+  name: rack-codehighlighter
+  requirement: &70283473242380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70283473242380
 description: deck.js (http://imakewebthings.github.com/deck.js) is a JavaScript library
   for building slide presentations using HTML 5. deck.rb (http://github.com/alexch/deck.rb)
   builds on top of deck.js, adding some features and letting you focus on your slides,
@@ -55,82 +88,18 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- lib/deck/app.rb
-- lib/deck/deck.rb
+- lib/deck/noko.rb
+- lib/deck/rack_app.rb
 - lib/deck/rack_static_patch.rb
 - lib/deck/slide.rb
+- lib/deck/slide_deck.rb
 - lib/deck/version.rb
 - lib/deck.rb
-- deck/core/deck.core.css
-- deck/core/deck.core.html
-- deck/core/deck.core.js
-- deck/core/deck.core.scss
-- deck/extensions/goto/deck.goto.css
-- deck/extensions/goto/deck.goto.html
-- deck/extensions/goto/deck.goto.js
-- deck/extensions/goto/deck.goto.scss
-- deck/extensions/hash/deck.hash.css
-- deck/extensions/hash/deck.hash.html
-- deck/extensions/hash/deck.hash.js
-- deck/extensions/hash/deck.hash.scss
-- deck/extensions/menu/deck.menu.css
-- deck/extensions/menu/deck.menu.js
-- deck/extensions/menu/deck.menu.scss
-- deck/extensions/navigation/deck.navigation.css
-- deck/extensions/navigation/deck.navigation.html
-- deck/extensions/navigation/deck.navigation.js
-- deck/extensions/navigation/deck.navigation.scss
-- deck/extensions/scale/deck.scale.css
-- deck/extensions/scale/deck.scale.js
-- deck/extensions/scale/deck.scale.scss
-- deck/extensions/status/deck.status.css
-- deck/extensions/status/deck.status.html
-- deck/extensions/status/deck.status.js
-- deck/extensions/status/deck.status.scss
-- deck/extensions/theme-picker/deck.theme-picker.css
-- deck/extensions/theme-picker/deck.theme-picker.js
-- deck/GPL-license.txt
-- deck/introduction/index.html
-- deck/introduction/index.rb
-- deck/jquery-1.7.min.js
-- deck/MIT-license.txt
-- deck/modernizr.custom.js
-- deck/README.md
-- deck/test/fixtures/complex.html
-- deck/test/fixtures/empty.html
-- deck/test/fixtures/iframe_simple.html
-- deck/test/fixtures/iframes.html
-- deck/test/fixtures/nesteds.html
-- deck/test/fixtures/standard.html
-- deck/test/index.html
-- deck/test/lib/jasmine-html.js
-- deck/test/lib/jasmine-jquery.js
-- deck/test/lib/jasmine.css
-- deck/test/lib/jasmine.js
-- deck/test/settings.js
-- deck/test/spec.core.js
-- deck/test/spec.goto.js
-- deck/test/spec.hash.js
-- deck/test/spec.menu.js
-- deck/test/spec.navigation.js
-- deck/test/spec.scale.js
-- deck/test/spec.status.js
-- deck/themes/style/neon.css
-- deck/themes/style/neon.scss
-- deck/themes/style/swiss.css
-- deck/themes/style/swiss.scss
-- deck/themes/style/web-2.0.css
-- deck/themes/style/web-2.0.scss
-- deck/themes/transition/fade.css
-- deck/themes/transition/fade.scss
-- deck/themes/transition/horizontal-slide.css
-- deck/themes/transition/horizontal-slide.scss
-- deck/themes/transition/vertical-slide.css
-- deck/themes/transition/vertical-slide.scss
 - README.md
-- spec/deck_spec.rb
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
+- spec/rack_app_spec.rb
+- spec/slide_deck_spec.rb
 - spec/slide_spec.rb
 - spec/spec_helper.rb
 - bin/deck
@@ -148,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3963670590188889992
+      hash: -1729834170497065106
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,16 +126,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3963670590188889992
+      hash: -1729834170497065106
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Make HTML slide shows; wraps deck.js
 test_files:
-- spec/deck_spec.rb
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
+- spec/rack_app_spec.rb
+- spec/slide_deck_spec.rb
 - spec/slide_spec.rb
 - spec/spec_helper.rb