deckrb 0.4.2 → 0.5.0

data/public/deck.js/test/index.html

@@ -7,7 +7,7 @@
 	<script type="text/javascript" src="../modernizr.custom.js"></script>
 	<script type="text/javascript" src="lib/jasmine.js"></script>
 	<script type="text/javascript" src="lib/jasmine-html.js"></script>
-	<script src="../jquery-1.7.min.js"></script>
+	<script src="../jquery-1.7.2.min.js"></script>
 	<script type="text/javascript" src="lib/jasmine-jquery.js"></script>
 
 	<!-- include source files here... -->

data/public/deck.js/test/spec.core.js

@@ -231,10 +231,12 @@ describe('Deck JS', function() {
 				});
 				
 				it('should not trigger events that originate within editable elements', function() {
+					var $outside = $('<input type="text" />').appendTo('body');
 					e = jQuery.Event('keydown');
 					e.which = 87;
-					$('.alt-slide1 input').trigger(e);
+					$outside.trigger(e);
 					expect($.deck('getSlide')).toHaveClass('alt-slide1');
+					$outside.remove();
 				});
 			});
 		});

data/public/deck.js/test/spec.hash.js

@@ -41,13 +41,13 @@ describe('Deck JS Hash Extension', function() {
 	it('should update the href on slide change', function() {
 		var $hashLink = $(defaults.selectors.hashLink);
 		$.deck('go', 3);
-		expect($hashLink).toHaveAttr('href', '#slide-3');
+		expect($hashLink.attr('href')).toMatch('#slide-3');
 	});
 	
 	it('should use existing ids if they exist', function() {
 		var $hashLink = $(defaults.selectors.hashLink);
 		$.deck('go', 1);
-		expect($hashLink).toHaveAttr('href', '#custom-id');
+		expect($hashLink.attr('href')).toMatch('#custom-id');
 	});
 	
 	it('should update the URL on slide change (if supported)', function() {

data/public/deck.js/test/spec.navigation.js

@@ -42,10 +42,10 @@ describe('Deck JS Navigation Buttons', function() {
 	});
 	
 	it('should update the links hrefs with real fragment ids', function() {
-		expect($(defaults.selectors.previousLink)).toHaveAttr('href', '#');
-		expect($(defaults.selectors.nextLink)).toHaveAttr('href', '#custom-id');
+		expect($(defaults.selectors.previousLink).attr('href')).toMatch(/#$/);
+		expect($(defaults.selectors.nextLink).attr('href')).toMatch('#custom-id');
 		$.deck('go', 2);
-		expect($(defaults.selectors.previousLink)).toHaveAttr('href', '#custom-id');
-		expect($(defaults.selectors.nextLink)).toHaveAttr('href', '#slide-3');
+		expect($(defaults.selectors.previousLink).attr('href')).toMatch('#custom-id');
+		expect($(defaults.selectors.nextLink).attr('href')).toMatch('#slide-3');
 	});
 });

data/public/deck.js/themes/style/neon.css

@@ -1,6 +1,6 @@
 .deck-container {
   font-family: "Gill Sans", "Gill Sans MT", Calibri, sans-serif;
-  font-size: 1.25em;
+  font-size: 1.75em;
   color: #aaa;
   background: #000;
 }
@@ -84,6 +84,12 @@
 .deck-container > .slide .deck-before, .deck-container > .slide .deck-previous {
   opacity: 0.4;
 }
+.deck-container > .slide .deck-before:not(.deck-child-current) .deck-before, .deck-container > .slide .deck-before:not(.deck-child-current) .deck-previous, .deck-container > .slide .deck-previous:not(.deck-child-current) .deck-before, .deck-container > .slide .deck-previous:not(.deck-child-current) .deck-previous {
+  opacity: 1;
+}
+.deck-container > .slide .deck-child-current {
+  opacity: 1;
+}
 .deck-container .deck-status {
   font-size: 0.6666em;
 }

data/public/deck.js/themes/style/neon.scss

@@ -1,6 +1,6 @@
 .deck-container {
 	font-family: "Gill Sans", "Gill Sans MT", Calibri, sans-serif;
-	font-size:1.25em;
+	font-size:1.75em;
 	color:#aaa;
 	background:#000;
 
@@ -99,6 +99,16 @@
 	> .slide {
 		.deck-before, .deck-previous {
 			opacity:0.4;
+
+			&:not(.deck-child-current) {
+				.deck-before, .deck-previous {
+					opacity:1;
+				}
+			}
+		}
+
+		.deck-child-current {
+			opacity:1;
 		}
 	}
 

data/public/deck.js/themes/style/swiss.css

@@ -1,6 +1,6 @@
 .deck-container {
   font-family: "Helvetica Neue", sans-serif;
-  font-size: 1.25em;
+  font-size: 1.75em;
   background: #fff;
 }
 .deck-container .slide {
@@ -56,6 +56,12 @@
 .deck-container > .slide .deck-before, .deck-container > .slide .deck-previous {
   opacity: 0.4;
 }
+.deck-container > .slide .deck-before:not(.deck-child-current) .deck-before, .deck-container > .slide .deck-before:not(.deck-child-current) .deck-previous, .deck-container > .slide .deck-previous:not(.deck-child-current) .deck-before, .deck-container > .slide .deck-previous:not(.deck-child-current) .deck-previous {
+  opacity: 1;
+}
+.deck-container > .slide .deck-child-current {
+  opacity: 1;
+}
 .deck-container .deck-prev-link, .deck-container .deck-next-link {
   background: #ccc;
   font-family: serif;

data/public/deck.js/themes/style/swiss.scss

@@ -1,6 +1,6 @@
 .deck-container {
 	font-family: "Helvetica Neue", sans-serif;
-	font-size:1.25em;
+	font-size:1.75em;
 	background:#fff;
 
 	.slide {
@@ -64,6 +64,16 @@
 	> .slide {
 		.deck-before, .deck-previous {
 			opacity:0.4;
+
+			&:not(.deck-child-current) {
+				.deck-before, .deck-previous {
+					opacity:1;
+				}
+			}
+		}
+
+		.deck-child-current {
+			opacity:1;
 		}
 	}
 

data/public/deck.js/themes/style/web-2.0.css

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 .deck-container {
   font-family: "Gill Sans", "Gill Sans MT", Calibri, sans-serif;
-  font-size: 1.25em;
+  font-size: 1.75em;
   background: #f4fafe;
   /* Old browsers */
   background: -moz-linear-gradient(top, #f4fafe 0%, #ccf0f0 100%);
@@ -24,6 +24,12 @@
 .deck-container > .slide .deck-before, .deck-container > .slide .deck-previous {
   opacity: 0.4;
 }
+.deck-container > .slide .deck-before:not(.deck-child-current) .deck-before, .deck-container > .slide .deck-before:not(.deck-child-current) .deck-previous, .deck-container > .slide .deck-previous:not(.deck-child-current) .deck-before, .deck-container > .slide .deck-previous:not(.deck-child-current) .deck-previous {
+  opacity: 1;
+}
+.deck-container > .slide .deck-child-current {
+  opacity: 1;
+}
 .deck-container .slide h1, .deck-container .slide h2, .deck-container .slide h3, .deck-container .slide h4, .deck-container .slide h5, .deck-container .slide h6 {
   font-family: "Hoefler Text", Constantia, Palatino, "Palatino Linotype", "Book Antiqua", Georgia, serif;
 }

data/public/deck.js/themes/style/web-2.0.scss

@@ -21,7 +21,7 @@
 
 .deck-container {
 	font-family: "Gill Sans", "Gill Sans MT", Calibri, sans-serif;
-	font-size:1.25em;
+	font-size:1.75em;
 	background: rgb(244,250,254); /* Old browsers */
 	background: -moz-linear-gradient(top, rgba(244,250,254,1) 0%, rgba(204,240,240,1) 100%); /* FF3.6+ */
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(244,250,254,1)), color-stop(100%,rgba(204,240,240,1))); /* Chrome,Safari4+ */
@@ -36,6 +36,16 @@
 
 		.deck-before, .deck-previous {
 			opacity:0.4;
+
+			&:not(.deck-child-current) {
+				.deck-before, .deck-previous {
+					opacity:1;
+				}
+			}
+		}
+
+		.deck-child-current {
+			opacity:1;
 		}
 	}
 

data/public/toc.css

@@ -1,37 +1,70 @@
 .deck-container .slide_toc {
-		position:fixed;
-		bottom:4px;
-		left:4px;
-		height: 80%;
-		color:#888;
-		z-index:3;
-		margin:0;
-	}
+    position: fixed;
+    bottom: 4px;
+    left: 4px;
+    height: 80%;
+    color: #888;
+    z-index: 3;
+    margin: 0;
+}
 
 .deck-container .slide_toc .toggle {
-	position: absolute;
-	bottom: 0px;
-	cursor: pointer;
+    position: absolute;
+    bottom: 0px;
+    cursor: pointer;
+    font-size: 80%;
+}
+
+.deck-container .slide_toc .table {
+    font-size: 60%;
+    display: none;
+    position: absolute;
+    width: 20em;
+    bottom: 1em;
+
+    border: 1px solid black;
+    padding: 4px;
+    margin: 4px 0 2em;
+    background: white;
+    overflow-y: auto;
+    color: black;
+
+    height: 100%;
 }
 
-.deck-container .slide_toc ul {
-		display: none;
-		position: absolute;
-		width: 20em;
-		bottom: 1em;
+.deck-container .slide_toc .table > h2 {
+    font-weight: bold;
+}
 
-		border: 1px solid black;
-		padding: 4px;
-		margin: 4px 0 2em;
-		background: white;
-		overflow-y: auto;
-		color: black;
+.deck-container .slide_toc .table ul {
+    padding: 4px 4px 4px 8px;
+    margin: 4px 0 2em;
+    overflow-y: auto;
+}
+.deck-container .slide_toc .table ul > li {
+    margin-bottom: .25em;
+}
 
-		height: 100%;
-	}
+.deck-container .slide_toc .table {
+    margin: 4px 0 2em;
+}
+
+.deck-container a {
+    display: block; /* fill the entire containing li */
+    padding: .25em;
+}
+
+.deck-container a, .deck-container a:visited {
+    color: black;
+    text-decoration: none;
+}
+
+.deck-container a:hover {
+    background: #efe0ef;
+}
 
 @media print {
-	.slide_toc {
-		display:none;
-	}
+    .slide_toc {
+        display: none;
+    }
 }

data/spec/rack_app_spec.rb

@@ -60,6 +60,13 @@ module Deck
       assert_ok
     end
 
+    it "passes options" do
+      slide_files = []
+      options = {:style => "foo"}
+      Deck::RackApp.should_receive(:new).with(slide_files, options).and_call_original
+      Deck::RackApp.build slide_files, options
+    end
+
   end
 
   describe "raw app" do
@@ -90,6 +97,14 @@ module Deck
       assert { last_response.body.include? "contents of foo.css" }
     end
 
+    it "passes options" do
+      slide_files = []
+      options = {:style => "foo"}
+      app = Deck::RackApp.new slide_files, options
+      slide_deck = app.deck
+      assert {slide_deck.instance_variable_get(:@style) == "foo"}
+    end
+
     describe "serving multiple slide files from multiple subdirs" do
 
       before do
@@ -261,8 +276,37 @@ module Deck
         assert { app.slides == Slide.from_file(foo_file) + Slide.from_file(bar_file) }
       end
 
+      it "reads options from a showoff.json file" do
+        showoff_file = file "showoff.json", <<-JSON
+        {
+          "style": "fancy",
+          "transition": "flippy",
+          "sections": [
+          ]
+        }
+        JSON
 
-      it "if no slides are specified, it globs all markdown files under ."
+        app = RackApp.new [showoff_file]
+        options = app.instance_variable_get(:@options)
+        assert { options[:style] == "fancy" }
+        assert { options[:transition] == "flippy" }
+      end
+
+      specify "options from a showoff.json file don't override command-line options" do
+        showoff_file = file "showoff.json", <<-JSON
+        {
+          "style": "fancy",
+          "transition": "flippy",
+          "sections": [
+          ]
+        }
+        JSON
+
+        app = RackApp.new [showoff_file], style: "homey"
+        options = app.instance_variable_get(:@options)
+        assert { options[:style] == "homey" }
+        assert { options[:transition] == "flippy" }
+      end
 
     end
 

data/spec/slide_deck_spec.rb

@@ -4,56 +4,90 @@ require "#{here}/spec_helper"
 require "deck/slide_deck"
 
 module Deck
- describe SlideDeck do
+  describe SlideDeck do
 
-  include Files
+    include Files
 
-  def doc
-    @doc ||= begin
-      @html = deck_widget.to_html
-      noko_doc @html
+    def doc
+      @doc ||= begin
+        @html = deck_widget.to_html
+        noko_doc @html
+      end
     end
-  end
 
-  def deck_widget options = {}
-    @deck_widget ||= SlideDeck.new options
-  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 "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 "contains a single dummy slide" do
+      assert { doc.css('section.slide').size == 1 }
+    end
 
-  it "renders a markdown file with one slide" do
-    file = file("hello.md", "# hello")
-    deck_widget :slides => Slide.split(File.read file)
-    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" +
-      "</section>"
-    }
-  end
+    it "renders a markdown file with one slide" do
+      file = file("hello.md", "# hello")
+      deck_widget :slides => Slide.split(File.read file)
+      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" +
+          "</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\">" +
-      "<div class=\"toggle\">[toc]</div>" +
-      "<ul>" +
-      "<li><a href=\"#foo\">Foo</a></li>" +
-      "<li><a href=\"#bar\">Bar</a></li>" +
-      "</ul>" +
-      "</div>"
-    }
-  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\">" +
+          "<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>"
+      }
+    end
 
- end
+    describe "themes" do
+
+      def style_theme_node
+        doc.css("head link[rel='stylesheet'][id='style-theme-link']").first
+      end
+
+      def transition_theme_node
+        doc.css("head link[rel='stylesheet'][id='transition-theme-link']").first
+      end
+
+      it "defaults to 'swiss' style theme" do
+        deck_widget :slides => Slide.split("# Foo\n")
+        link_node = style_theme_node()
+        assert { link_node['href'] == "/deck.js/themes/style/swiss.css" }
+      end
+
+      it "defaults to 'horizontal-slide' transition theme" do
+        deck_widget :slides => Slide.split("# Foo\n")
+        link_node = transition_theme_node()
+        assert { link_node['href'] == "/deck.js/themes/transition/horizontal-slide.css" }
+      end
+
+      it "accepts theme names params" do
+        deck_widget :slides => Slide.split("# Foo\n"), :style => "foo", :transition => "bar"
+
+        assert { style_theme_node['href'] == "/deck.js/themes/style/foo.css" }
+        assert { transition_theme_node['href'] == "/deck.js/themes/transition/bar.css" }
+      end
+
+    end
+
+  end
 end