deckrb 0.1.1 → 0.2.0

data/spec/rack_app_spec.rb

@@ -5,8 +5,20 @@ require "deck/rack_app"
 
 require "rack/test"
 
-describe Deck::RackApp do
+module Deck
+ describe RackApp do
   include Rack::Test::Methods
+  include Files
+
+  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
+  def here
+    File.expand_path File.dirname(__FILE__)
+  end
 
   describe "app with middleware" do
     def app
@@ -38,6 +50,11 @@ describe Deck::RackApp do
         File.read("#{here}/../public/#{deckjs_core_path}", :encoding => last_response.body.encoding)}
     end
 
+    it "finds coderay.css" do
+      get "/coderay.css"
+      assert_ok
+    end
+
   end
 
   describe "raw app" do
@@ -46,10 +63,8 @@ describe Deck::RackApp do
     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"]
+      foo_path = file "foo.md"
+      @app = Deck::RackApp.new [foo_path]
       get "/"
       assert_ok
       assert { last_response.body.include? "contents of foo.md" }
@@ -62,41 +77,30 @@ describe Deck::RackApp do
     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"]
+      file "foo.md"
+      file "foo.css"
+      @app = Deck::RackApp.build ["#{files.root}/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
+        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
 
-        @app = Deck::RackApp.build ["#{@dir}/foo/foo.md", "#{@dir}/bar/bar.md"]
+        @app = Deck::RackApp.build ["#{files.root}/foo/foo.md", "#{files.root}/bar/bar.md"]
       end
 
       it "stuffs all the source files into a single slide deck served off /" do
@@ -132,10 +136,8 @@ describe Deck::RackApp do
 
     describe "highlights code blocks" do
       def build_app markdown
-        @dir = Files do
-          file "foo.md", markdown
-        end
-        @app = Deck::RackApp.build ["#{@dir}/foo.md"]
+        file "foo.md", markdown
+        @app = Deck::RackApp.build ["#{files.root}/foo.md"]
       end
 
       def assert_code_is_highlighted
@@ -173,5 +175,71 @@ describe Deck::RackApp do
       end
     end
 
+    describe '#slides' do
+      it "builds a bunch of slide objects from the slide_files property" do
+        slide_file = file "foo.md", "# hello"
+        app = RackApp.new [slide_file]
+        assert { app.slides == Slide.from_file(slide_file) }
+      end
+
+      it "reads a showoff.json file" do
+        foo_file = file "foo.md", "# hello"
+        bar_file = file "bar.md", "# hello"
+        showoff_file = file "showoff.json", <<-JSON
+        {
+          "name": "Ruby For Programmers",
+          "description": "an introduction to the Ruby programming language",
+          "sections": [
+            "foo.md",
+            "bar.md"
+          ]
+        }
+        JSON
+
+        app = RackApp.new [showoff_file]
+        assert { app.slides == Slide.from_file(foo_file) + Slide.from_file(bar_file) }
+      end
+
+      it "reads a showoff.json file including literal markdown as a section" do
+
+        foo_file = file "foo.md", "# hello"
+        bar_file = file "bar.md", "# goodbye"
+        showoff_file = file "showoff.json", <<-JSON
+        {
+          "name": "Ruby For Programmers",
+          "description": "an introduction to the Ruby programming language",
+          "sections": [
+            "foo.md",
+            "# literal markdown",
+            "bar.md"
+          ]
+        }
+        JSON
+        app = RackApp.new [showoff_file]
+        assert {
+          app.slides.size == 3
+        }
+        assert {
+          app.slides[1].markdown_text == "# literal markdown\n"
+        }
+        assert { app.slides[0].slide_id == "hello" }
+        assert { app.slides[1].slide_id == "literal_markdown" }
+        assert { app.slides[2].slide_id == "goodbye" }
+        # assert {
+        #   app.slides ==
+        #   Slide.from_file(foo_file) +
+        #   [Slide.new(:markdown_text => "# literal markdown")] +
+        #   Slide.from_file(bar_file)
+        # }
+        assert {
+          app.deck.to_html.include?("<h1>literal markdown</h1>")
+        }
+      end
+
+      it "if no slides are specified, it globs all markdown files under ."
+
+    end
+
   end
+ end
 end

data/spec/slide_deck_spec.rb

@@ -6,6 +6,8 @@ require "deck/slide_deck"
 module Deck
  describe SlideDeck do
 
+  include Files
+
   def doc
     @doc ||= begin
       @html = deck_widget.to_html
@@ -27,14 +29,11 @@ module Deck
   end
 
   it "renders a markdown file with one slide" do
-    file = nil
-    dir = Files do
-      file = file("hello.md", "# hello")
-    end
-
+    file = file("hello.md", "# hello")
     deck_widget :slides => Slide.split(File.read file)
-    assert { doc.css('section.slide').size == 1 }
-    slide = doc.css('section.slide').first
+    slides = doc.css('section.slide')
+    assert { slides.size == 1 }
+    slide = slides.first
     assert { slide["id"] == "hello" }
     assert { noko_html(slide) == "<section class=\"slide\" id=\"hello\">" +
       "<h1>hello</h1>\n" +

data/spec/slide_spec.rb

@@ -284,5 +284,24 @@ foo
       assert { html == expected_html }
     end
   end
+
+  describe "==" do
+    it "a slide is equal to itself" do
+      s = slide_from("# hello")
+      assert { s == s }
+    end
+
+    it "a slide is equal to a clone of itself" do
+      s1 = slide_from("# hello")
+      s2 = slide_from("# hello")
+      assert { s1 == s2 }
+    end
+
+    it "a slide is not equal to a different slide" do
+      s1 = slide_from("# hello")
+      s2 = slide_from("# goodbye")
+      deny { s1 == s2 }
+    end
+  end
  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deckrb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-01-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erector
-  requirement: &70283473244720 !ruby/object:Gem::Requirement
+  requirement: &70245840655320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0.pre1
   type: :runtime
   prerelease: false
-  version_requirements: *70283473244720
+  version_requirements: *70245840655320
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70283473244220 !ruby/object:Gem::Requirement
+  requirement: &70245840654820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *70283473244220
+  version_requirements: *70245840654820
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70283473243820 !ruby/object:Gem::Requirement
+  requirement: &70245831700820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283473243820
+  version_requirements: *70245831700820
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70283473243360 !ruby/object:Gem::Requirement
+  requirement: &70245831700360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283473243360
+  version_requirements: *70245831700360
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70283473242860 !ruby/object:Gem::Requirement
+  requirement: &70245831699940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283473242860
+  version_requirements: *70245831699940
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70245831699520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70245831699520
 - !ruby/object:Gem::Dependency
   name: rack-codehighlighter
-  requirement: &70283473242380 !ruby/object:Gem::Requirement
+  requirement: &70245831699100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283473242380
+  version_requirements: *70245831699100
 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,
@@ -95,6 +106,74 @@ files:
 - lib/deck/slide_deck.rb
 - lib/deck/version.rb
 - lib/deck.rb
+- public/coderay.css
+- public/deck.js/core/deck.core.css
+- public/deck.js/core/deck.core.html
+- public/deck.js/core/deck.core.js
+- public/deck.js/core/deck.core.scss
+- public/deck.js/extensions/goto/deck.goto.css
+- public/deck.js/extensions/goto/deck.goto.html
+- public/deck.js/extensions/goto/deck.goto.js
+- public/deck.js/extensions/goto/deck.goto.scss
+- public/deck.js/extensions/hash/deck.hash.css
+- public/deck.js/extensions/hash/deck.hash.html
+- public/deck.js/extensions/hash/deck.hash.js
+- public/deck.js/extensions/hash/deck.hash.scss
+- public/deck.js/extensions/menu/deck.menu.css
+- public/deck.js/extensions/menu/deck.menu.js
+- public/deck.js/extensions/menu/deck.menu.scss
+- public/deck.js/extensions/navigation/deck.navigation.css
+- public/deck.js/extensions/navigation/deck.navigation.html
+- public/deck.js/extensions/navigation/deck.navigation.js
+- public/deck.js/extensions/navigation/deck.navigation.scss
+- public/deck.js/extensions/scale/deck.scale.css
+- public/deck.js/extensions/scale/deck.scale.js
+- public/deck.js/extensions/scale/deck.scale.scss
+- public/deck.js/extensions/status/deck.status.css
+- public/deck.js/extensions/status/deck.status.html
+- public/deck.js/extensions/status/deck.status.js
+- public/deck.js/extensions/status/deck.status.scss
+- public/deck.js/extensions/theme-picker/deck.theme-picker.css
+- public/deck.js/extensions/theme-picker/deck.theme-picker.js
+- public/deck.js/GPL-license.txt
+- public/deck.js/introduction/index.html
+- public/deck.js/introduction/index.rb
+- public/deck.js/jquery-1.7.min.js
+- public/deck.js/MIT-license.txt
+- public/deck.js/modernizr.custom.js
+- public/deck.js/README.md
+- public/deck.js/test/fixtures/complex.html
+- public/deck.js/test/fixtures/empty.html
+- public/deck.js/test/fixtures/iframe_simple.html
+- public/deck.js/test/fixtures/iframes.html
+- public/deck.js/test/fixtures/nesteds.html
+- public/deck.js/test/fixtures/standard.html
+- public/deck.js/test/index.html
+- public/deck.js/test/lib/jasmine-html.js
+- public/deck.js/test/lib/jasmine-jquery.js
+- public/deck.js/test/lib/jasmine.css
+- public/deck.js/test/lib/jasmine.js
+- public/deck.js/test/settings.js
+- public/deck.js/test/spec.core.js
+- public/deck.js/test/spec.goto.js
+- public/deck.js/test/spec.hash.js
+- public/deck.js/test/spec.menu.js
+- public/deck.js/test/spec.navigation.js
+- public/deck.js/test/spec.scale.js
+- public/deck.js/test/spec.status.js
+- public/deck.js/themes/style/neon.css
+- public/deck.js/themes/style/neon.scss
+- public/deck.js/themes/style/swiss.css
+- public/deck.js/themes/style/swiss.scss
+- public/deck.js/themes/style/web-2.0.css
+- public/deck.js/themes/style/web-2.0.scss
+- public/deck.js/themes/transition/fade.css
+- public/deck.js/themes/transition/fade.scss
+- public/deck.js/themes/transition/horizontal-slide.css
+- public/deck.js/themes/transition/horizontal-slide.scss
+- public/deck.js/themes/transition/vertical-slide.css
+- public/deck.js/themes/transition/vertical-slide.scss
+- public/favicon.ico
 - README.md
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
@@ -117,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1729834170497065106
+      hash: -3033484796585204259
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1729834170497065106
+      hash: -3033484796585204259
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6