keydown 0.7.1 → 0.9.0

data/spec/lib/slidedeck_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Keydown::SlideDeck do
 
@@ -15,12 +15,11 @@ describe Keydown::SlideDeck do
     end
   end
 
-
   before :each do
     module Keydown
       class Tasks
         def self.template_dir
-          File.join(Keydown::Tasks.source_root, 'templates', 'rocks')
+          File.join(Keydown::Tasks.source_root, 'templates', 'deck.js')
         end
       end
     end
@@ -69,16 +68,20 @@ and this
       end
 
       it "should generate the correct number of slides" do
-        @doc.css('div.slide').length.should == 4
+        @doc.css('section.slide').length.should == 3
       end
 
       it "should set the CSS classnames of each slide" do
-        slides = @doc.css('div.slide section')
+        slides_content = @doc.css('section.slide div')
+
+        first_slide = slides_content[0]
+        first_slide['class'].should be_nil
+
+        second_slide = slides_content[1]
+        second_slide['class'].should == 'foo'
 
-        slides[0]['class'].should == 'middle' # config/start slide
-        slides[1]['class'].should == nil
-        slides[2]['class'].should == 'foo'
-        slides[3]['class'].should == 'foo bar'
+        third_slide = slides_content[2]
+        third_slide['class'].should == 'foo bar'
       end
     end
   end
@@ -98,6 +101,8 @@ and this
 
 # Is Brought to You By
 
+}}} images/ping.png::cprsize
+
 !NOTE
 
 and this
@@ -105,6 +110,9 @@ and this
 !SLIDE foo bar
 
 # The Letter Q
+
+}}} images/poke.png::cprsize::flickr::http://flickr.com/1234
+
       SLIDES
 
       @deck = Keydown::SlideDeck.new(@slides_text)
@@ -116,18 +124,38 @@ and this
       before(:each) do
         @html = @deck.to_html
         @doc = Nokogiri(@html)
-        @slide_with_background = @doc.css('div.slide')[1]
+        @first_slide = @doc.css('section.slide')[0]
+        @second_slide = @doc.css('section.slide')[1]
+        @third_slide = @doc.css('section.slide')[2]
       end
 
       it "should add the full-bleed background CSS classname to any slide that specifies a background" do
-        @slide_with_background['class'].split(' ').should include('full-background')
+        @first_slide['class'].split(' ').should include('full-background')
+        @second_slide['class'].split(' ').should include('full-background')
+        @third_slide['class'].split(' ').should include('full-background')
       end
 
       it "should add a custom classname to a slide that specifies a background" do
-        @slide_with_background['class'].split(' ').should include('my_background')
+        @first_slide['class'].split(' ').should include('my_background')
+        @second_slide['class'].split(' ').should include('ping')
+        @third_slide['class'].split(' ').should include('poke')
+      end
+
+      it "should add an attribution element only to slides that requested it" do
+        @first_slide.css('.attribution').length.should == 0
+        @second_slide.css('.attribution').length.should == 1
+        @third_slide.css('.attribution').length.should == 1
       end
-    end
 
+      it "should add attribution content to slides that requested it" do
+        @second_slide.css('a')[0].text.should match('cprsize')
+        @third_slide.css('a')[0].text.should match('cprsize')
+      end
 
+      it "should add an attribution link if provided" do
+        @second_slide.css('a')[0]['href'].should be_nil
+        @third_slide.css('a')[0]['href'].should match(/^http:/)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,8 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
 require 'keydown'
-require 'rspec'
-require 'pp'
-
 require 'nokogiri'
+
 require 'tmpdir'
+require 'pp'
 
 def capture_output
    output = StringIO.new

data/spec/tasks/generate_spec.rb

@@ -1,10 +1,18 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Keydown do
+
+  let :tmp_dir do
+    "#{Dir.tmpdir}/keydown"
+  end
+
+  let :project_dir do
+    "#{tmp_dir}/sample"
+  end
+
   before :each do
-    @tmp_dir = "#{Dir.tmpdir}/keydown"
-    FileUtils.rm_r @tmp_dir if File.exists?(@tmp_dir)
-    FileUtils.mkdir_p @tmp_dir
+    FileUtils.rm_r tmp_dir if File.exists?(tmp_dir)
+    FileUtils.mkdir_p tmp_dir
 
     @thor = Thor.new
   end
@@ -12,38 +20,51 @@ describe Keydown do
   describe "generate command" do
     before :each do
       capture_output do
-        Dir.chdir @tmp_dir do
+        Dir.chdir tmp_dir do
           @thor.invoke Keydown::Tasks, ["generate", "sample"]
         end
       end
     end
 
     it "should generate a directory for the presentation" do
-      Dir.chdir "#{@tmp_dir}" do
-        File.directory?('sample').should be_true
-      end
+      File.directory?(project_dir).should be_true
     end
 
     it "should generate a sample Markdown file" do
-      Dir.chdir "#{@tmp_dir}/sample" do
-        File.exist?("slides.md").should be_true
-      end
+      File.exist?("#{project_dir}/slides.md").should be_true
     end
 
     it "should create the support directories for the presentation" do
-      Dir.chdir "#{@tmp_dir}/sample" do
-        File.directory?("css").should be_true
-        File.directory?("images").should be_true
-        File.directory?("js").should be_true
-      end
+      File.directory?("#{project_dir}/css").should be_true
+      File.directory?("#{project_dir}/images").should be_true
+      File.directory?("#{project_dir}/js").should be_true
+    end
+
+    it "should copy the deck.js core files" do
+      File.exist?("#{project_dir}/deck.js/core/deck.core.css").should be_true
+      File.exist?("#{project_dir}/deck.js/core/deck.core.js").should be_true
+    end
+
+    it "should copy deck.js's support files" do
+      File.exist?("#{project_dir}/deck.js/support/jquery.1.6.4.min.js").should be_true
+      File.exist?("#{project_dir}/deck.js/support/modernizr.custom.js").should be_true
+    end
+
+    it "should copy the deck.js extensions" do
+      File.directory?("#{project_dir}/deck.js/extensions").should be_true
+
+      extensions = Dir.glob("#{project_dir}/deck.js/extensions/*")
+      extensions.length.should > 1
+      extensions.should include("#{project_dir}/deck.js/extensions/codemirror")
     end
 
-    it "should copy the HTML5 Rocks default CSS file" do
-      File.exist?("#{@tmp_dir}/sample/css/rocks.css").should be_true
+    it "should copy default theme files for deck.js" do
+      File.exist?("#{project_dir}/css/horizontal-slide.css").should be_true
+      File.exist?("#{project_dir}/css/swiss.css").should be_true
     end
 
-    it "should copy the HTML5 Rocks default JS file" do
-      File.exist?("#{@tmp_dir}/sample/js/rocks.js").should be_true
+    it "should copy default them files for codemirror.js" do
+      File.exist?("#{project_dir}/css/default.css").should be_true
     end
 
   end

data/spec/tasks/slides_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Keydown, "`slides`" do
 
@@ -13,30 +13,35 @@ describe Keydown, "`slides`" do
     end
 
     it "should generate the correct number of slides" do
-      @doc.css('div.slide').length.should == 4
+      @doc.css('section.slide').length.should == 3
     end
 
-    it "should include the HTML5 Rocks CSS only once" do
-      @doc.css('link[@href="css/rocks.css"]').length.should == 1
-    end
+  end
 
-    it "should include the HTML5 Rocks JavaScript only once" do
-      @doc.css('script[@src="js/rocks.js"]').length.should == 1
-    end
+  let :tmp_dir do
+    "#{Dir.tmpdir}/keydown_test"
+  end
 
+  let :project_dir do
+    "#{tmp_dir}/test"
   end
 
   before :each do
-    @tmp_dir = "#{Dir.tmpdir}/keydown_test"
-    FileUtils.rm_r @tmp_dir if File.exists?(@tmp_dir)
-    FileUtils.mkdir_p @tmp_dir
+    FileUtils.rm_r tmp_dir if File.exists?(tmp_dir)
+    FileUtils.mkdir_p tmp_dir
 
     @thor = Thor.new
+
+    Dir.chdir tmp_dir do
+      capture_output do
+        @thor.invoke Keydown::Tasks, ["generate", "test"]
+      end
+    end
   end
 
   describe "when file cannot be found" do
     before(:each) do
-      Dir.chdir @tmp_dir do
+      Dir.chdir project_dir do
         @std_out = capture_output do
           @thor.invoke Keydown::Tasks, ["slides", "with_title.md"]
         end
@@ -48,7 +53,7 @@ describe Keydown, "`slides`" do
     end
 
     it "should not write out a file" do
-      Dir.glob("#{@tmp_dir}/*.html").should be_empty
+      Dir.glob("#{tmp_dir}/*.html").should be_empty
     end
 
   end
@@ -56,13 +61,13 @@ describe Keydown, "`slides`" do
   describe "with defaults" do
 
     before :each do
-      system "cp -r spec/fixtures/with_title.md #{@tmp_dir}"
+      system "cp -r spec/fixtures/with_title.md #{project_dir}"
     end
 
     describe "should generate an html file that" do
       before(:each) do
         capture_output do
-          Dir.chdir @tmp_dir do
+          Dir.chdir project_dir do
             @thor.invoke Keydown::Tasks, ["slides", "with_title.md"]
             @file = File.new('with_title.html')
             @doc = Nokogiri(@file)
@@ -74,24 +79,64 @@ describe Keydown, "`slides`" do
 
       describe "should have one slide that" do
         before :each do
-          @slide = @doc.css('section')[3]
+          @third_slide = @doc.css('section')[2].css('div')[0]
         end
 
         it "should have the correct css class(es)" do
-          @slide['class'].should match /foo/
-          @slide['class'].should match /bar/
+          @third_slide['class'].should match /foo/
+          @third_slide['class'].should match /bar/
         end
 
         it "should have the correct content" do
-          @slide.css('h1').text.should match /The Letter Q/
+          @third_slide.css('h1').text.should match /The Letter Q/
+        end
+
+        it "should have the deck.js files" do
+          scripts = @doc.css('script').collect { |tag| tag['src'] }
+          scripts.should include('deck.js/support/modernizr.custom.js')
+          scripts.should include('deck.js/support/jquery.1.6.4.min.js')
+          scripts.should include('deck.js/core/deck.core.js')
         end
+
+        it "should have all of the extension js files" do
+          scripts = @doc.css('script').collect { |tag| tag['src'] }
+
+          scripts.should include('deck.js/extensions/codemirror/codemirror.js')
+          scripts.should include('deck.js/extensions/codemirror/deck.codemirror.js')
+          scripts.should include('deck.js/extensions/codemirror/mode/ruby/ruby.js') # assuming one means all, really
+          scripts.should include('deck.js/extensions/goto/deck.goto.js')
+          scripts.should include('deck.js/extensions/hash/deck.hash.js')
+          scripts.should include('deck.js/extensions/menu/deck.menu.js')
+          scripts.should include('deck.js/extensions/navigation/deck.navigation.js')
+          scripts.should include('deck.js/extensions/scale/deck.scale.js')
+          scripts.should include('deck.js/extensions/status/deck.status.js')
+        end
+        
+        it "should have all of the extension top-level css files" do
+          stylesheets = @doc.css('link').collect {|tag| tag['href']}
+          
+          stylesheets.should include('deck.js/extensions/codemirror/deck.codemirror.css')
+          stylesheets.should include('deck.js/extensions/goto/deck.goto.css')
+          stylesheets.should include('deck.js/extensions/hash/deck.hash.css')
+          stylesheets.should include('deck.js/extensions/menu/deck.menu.css')
+          stylesheets.should include('deck.js/extensions/navigation/deck.navigation.css')
+          stylesheets.should include('deck.js/extensions/scale/deck.scale.css')
+          stylesheets.should include('deck.js/extensions/status/deck.status.css')
+        end
+
+        it "should not include any of the extension sub-directory css files" do
+          stylesheets = @doc.css('link').collect {|tag| tag['href']}
+
+          stylesheets.should_not include('deck.js/extensions/codemirror/themes/cobalt.css')
+        end
+
       end
     end
 
     describe "should add an .md extention if one isn't specified" do
       before(:each) do
         capture_output do
-          Dir.chdir @tmp_dir do
+          Dir.chdir project_dir do
             @thor.invoke Keydown::Tasks, ["slides", "with_title"]
             @file = File.new('with_title.html')
             @doc = Nokogiri(@file)
@@ -108,13 +153,10 @@ describe Keydown, "`slides`" do
     before(:each) do
       capture_output do
 
-      Dir.chdir @tmp_dir do
-        @thor.invoke Keydown::Tasks, ["generate", "test"]
-
-        Dir.chdir "test" do
-          system "cp #{Keydown::Tasks.source_root}/spec/fixtures/with_title.md #{@tmp_dir}/test/with_title.md"
-          system "cp #{Keydown::Tasks.source_root}/spec/fixtures/custom.css #{@tmp_dir}/test/css/custom.css"
-          system "cp #{Keydown::Tasks.source_root}/spec/fixtures/custom.js #{@tmp_dir}/test/js/custom.js"
+        Dir.chdir project_dir do
+          system "cp #{Keydown::Tasks.source_root}/spec/fixtures/with_title.md #{project_dir}/with_title.md"
+          system "cp #{Keydown::Tasks.source_root}/spec/fixtures/custom.css #{project_dir}/css/custom.css"
+          system "cp #{Keydown::Tasks.source_root}/spec/fixtures/custom.js #{project_dir}/js/custom.js"
 
           @thor.invoke Keydown::Tasks, ["slides", "with_title.md"]
 
@@ -122,37 +164,35 @@ describe Keydown, "`slides`" do
           @doc = Nokogiri(@file)
         end
       end
-      end
     end
 
     it_should_behave_like "generating a presentation file"
 
     it "should include any custom CSS file from the css directory" do
-      @doc.css('link[@href="css/test.css"]').length.should == 1
-      @doc.css('link[@href="css/custom.css"]').length.should == 1
+      stylesheets = @doc.css('link').collect {|tag| tag['href']}
+
+      stylesheets.should include('css/test.css')
+      stylesheets.should include('css/custom.css')
     end
 
     it "should include any custom JavaScript files from the js directory" do
-      @doc.css('script[@src="js/test.js"]').length.should == 1
-      @doc.css('script[@src="js/custom.js"]').length.should == 1
+      scripts = @doc.css('script').collect { |tag| tag['src'] }
+
+      scripts.should include('js/test.js')
+      scripts.should include('js/custom.js')
     end
   end
 
   describe "for a presentation that has background images" do
     before(:each) do
       capture_output do
+        Dir.chdir project_dir do
+          system "cp #{Keydown::Tasks.source_root}/spec/fixtures/with_backgrounds.md #{tmp_dir}/test/with_backgrounds.md"
 
-        Dir.chdir @tmp_dir do
-          @thor.invoke Keydown::Tasks, ["generate", "test"]
-
-          Dir.chdir "test" do
-            system "cp #{Keydown::Tasks.source_root}/spec/fixtures/with_backgrounds.md #{@tmp_dir}/test/with_backgrounds.md"
+          @thor.invoke Keydown::Tasks, ["slides", "with_backgrounds.md"]
 
-            @thor.invoke Keydown::Tasks, ["slides", "with_backgrounds.md"]
-
-            @file = File.new('with_backgrounds.html')
-            @doc = Nokogiri(@file)
-          end
+          @file = File.new('with_backgrounds.html')
+          @doc = Nokogiri(@file)
         end
       end
     end
@@ -160,12 +200,11 @@ describe Keydown, "`slides`" do
     it_should_behave_like "generating a presentation file"
 
     it "should add the keydown.css file (which has the backgrounds) to the css directory" do
-      File.exist?("#{@tmp_dir}/test/css/keydown.css").should be_true
+      File.exist?("#{tmp_dir}/test/css/keydown.css").should be_true
     end
 
     it "should add the keydown.css file to the HTML file" do
       @doc.css('link[@href="css/keydown.css"]').length.should == 1
     end
-
   end
 end

data/templates/deck.js/code.html.haml

@@ -0,0 +1 @@
+%textarea{ :class => "code", :mode => language, :display => "none" }= code

data/templates/deck.js/index.html.haml

@@ -0,0 +1,54 @@
+!!! 5
+%html
+  %head
+    %title= title
+    %meta{ :charset => "utf-8" }
+    %meta{ :name => "viewport", :content => "width=1024, user-scalable=no" }
+
+    / deck.js's core css
+    = stylesheet "deck.js/core/deck.core.css"
+
+    / deck.js extension CSS files
+    - extensions_css_files.each do |css_file|
+      = stylesheet css_file
+
+    / all css in the css dir: Keydown CSS, your custom CSS, and themes from deck.js
+    - css_files.each do |css_file|
+      = stylesheet css_file
+
+    / Modernizr (provided for legacy browsers)
+    = script "deck.js/support/modernizr.custom.js"
+
+  %body{ :class => 'keydown' }
+    %article.deck-container
+      - slides.each do |slide|
+        = slide.to_html
+
+      / deck.js navigation extension
+      %a{ :href => '#', :class => 'deck-prev-link', :title => 'Previous' } ←
+      %a{ :href => '#', :class => 'deck-next-link', :title => 'Next' } →
+
+      / deck.js hash extension
+      %a{ :href => '.', :class => 'deck-permalink', :title => 'Permalink to this slide' } #
+
+      / deck.js status extension
+      %p.deck-status
+        %span.deck-status-current
+        \/
+        %span.deck-status-total
+
+    / jQuery & deck.js
+    = script "deck.js/support/jquery.1.6.4.min.js"
+    = script "deck.js/core/deck.core.js"
+
+    / deck.js extension JS files
+    - extensions_js_files.each do |js_file|
+      = script js_file
+
+    / your custom JS here, including call to initialize deck.js-codemirror
+    - js_files.each do |js_file|
+      = script js_file
+
+    / Initialize the deck.
+    %script{:type => "text/javascript"}
+      $(function() { $.deck('.slide'); });