reveal.rb 0.3.0 → 0.4.0

data/lib/reveal/templates/revealjs/plugin/zoom-js/zoom.js

@@ -2,12 +2,24 @@
 (function(){
 	var isEnabled = true;
 
-	document.querySelector( '.reveal' ).addEventListener( 'mousedown', function( event ) {
+	document.querySelector( '.reveal .slides' ).addEventListener( 'mousedown', function( event ) {
 		var modifier = ( Reveal.getConfig().zoomKey ? Reveal.getConfig().zoomKey : 'alt' ) + 'Key';
 
+		var zoomPadding = 20;
+		var revealScale = Reveal.getScale();
+
 		if( event[ modifier ] && isEnabled ) {
 			event.preventDefault();
-			zoom.to({ element: event.target, pan: false });
+
+			var bounds = event.target.getBoundingClientRect();
+
+			zoom.to({
+				x: ( bounds.left * revealScale ) - zoomPadding,
+				y: ( bounds.top * revealScale ) - zoomPadding,
+				width: ( bounds.width * revealScale ) + ( zoomPadding * 2 ),
+				height: ( bounds.height * revealScale ) + ( zoomPadding * 2 ),
+				pan: false
+			});
 		}
 	} );
 
@@ -16,11 +28,11 @@
 })();
 
 /*!
- * zoom.js 0.2 (modified version for use with reveal.js)
+ * zoom.js 0.3 (modified for use with reveal.js)
  * http://lab.hakim.se/zoom-js
  * MIT licensed
  *
- * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
+ * Copyright (C) 2011-2014 Hakim El Hattab, http://hakim.se
  */
 var zoom = (function(){
 
@@ -35,8 +47,6 @@ var zoom = (function(){
 	var panEngageTimeout = -1,
 		panUpdateInterval = -1;
 
-	var currentOptions = null;
-
 	// Check for transform support so that we can fallback otherwise
 	var supportsTransforms = 	'WebkitTransform' in document.body.style ||
 								'MozTransform' in document.body.style ||
@@ -58,7 +68,7 @@ var zoom = (function(){
 		if( level !== 1 && event.keyCode === 27 ) {
 			zoom.out();
 		}
-	}, false );
+	} );
 
 	// Monitor mouse movement for panning
 	document.addEventListener( 'mousemove', function( event ) {
@@ -66,38 +76,56 @@ var zoom = (function(){
 			mouseX = event.clientX;
 			mouseY = event.clientY;
 		}
-	}, false );
+	} );
 
 	/**
-	 * Applies the CSS required to zoom in, prioritizes use of CSS3
+	 * Applies the CSS required to zoom in, prefers the use of CSS3
 	 * transforms but falls back on zoom for IE.
 	 *
-	 * @param {Number} pageOffsetX
-	 * @param {Number} pageOffsetY
-	 * @param {Number} elementOffsetX
-	 * @param {Number} elementOffsetY
+	 * @param {Object} rect
 	 * @param {Number} scale
 	 */
-	function magnify( pageOffsetX, pageOffsetY, elementOffsetX, elementOffsetY, scale ) {
+	function magnify( rect, scale ) {
+
+		var scrollOffset = getScrollOffset();
+
+		// Ensure a width/height is set
+		rect.width = rect.width || 1;
+		rect.height = rect.height || 1;
+
+		// Center the rect within the zoomed viewport
+		rect.x -= ( window.innerWidth - ( rect.width * scale ) ) / 2;
+		rect.y -= ( window.innerHeight - ( rect.height * scale ) ) / 2;
 
 		if( supportsTransforms ) {
-			var origin = pageOffsetX +'px '+ pageOffsetY +'px',
-				transform = 'translate('+ -elementOffsetX +'px,'+ -elementOffsetY +'px) scale('+ scale +')';
-
-			document.body.style.transformOrigin = origin;
-			document.body.style.OTransformOrigin = origin;
-			document.body.style.msTransformOrigin = origin;
-			document.body.style.MozTransformOrigin = origin;
-			document.body.style.WebkitTransformOrigin = origin;
-
-			document.body.style.transform = transform;
-			document.body.style.OTransform = transform;
-			document.body.style.msTransform = transform;
-			document.body.style.MozTransform = transform;
-			document.body.style.WebkitTransform = transform;
+			// Reset
+			if( scale === 1 ) {
+				document.body.style.transform = '';
+				document.body.style.OTransform = '';
+				document.body.style.msTransform = '';
+				document.body.style.MozTransform = '';
+				document.body.style.WebkitTransform = '';
+			}
+			// Scale
+			else {
+				var origin = scrollOffset.x +'px '+ scrollOffset.y +'px',
+					transform = 'translate('+ -rect.x +'px,'+ -rect.y +'px) scale('+ scale +')';
+
+				document.body.style.transformOrigin = origin;
+				document.body.style.OTransformOrigin = origin;
+				document.body.style.msTransformOrigin = origin;
+				document.body.style.MozTransformOrigin = origin;
+				document.body.style.WebkitTransformOrigin = origin;
+
+				document.body.style.transform = transform;
+				document.body.style.OTransform = transform;
+				document.body.style.msTransform = transform;
+				document.body.style.MozTransform = transform;
+				document.body.style.WebkitTransform = transform;
+			}
 		}
 		else {
-			// Reset all values
+			// Reset
 			if( scale === 1 ) {
 				document.body.style.position = '';
 				document.body.style.left = '';
@@ -106,11 +134,11 @@ var zoom = (function(){
 				document.body.style.height = '';
 				document.body.style.zoom = '';
 			}
-			// Apply scale
+			// Scale
 			else {
 				document.body.style.position = 'relative';
-				document.body.style.left = ( - ( pageOffsetX + elementOffsetX ) / scale ) + 'px';
-				document.body.style.top = ( - ( pageOffsetY + elementOffsetY ) / scale ) + 'px';
+				document.body.style.left = ( - ( scrollOffset.x + rect.x ) / scale ) + 'px';
+				document.body.style.top = ( - ( scrollOffset.y + rect.y ) / scale ) + 'px';
 				document.body.style.width = ( scale * 100 ) + '%';
 				document.body.style.height = ( scale * 100 ) + '%';
 				document.body.style.zoom = scale;
@@ -119,11 +147,13 @@ var zoom = (function(){
 
 		level = scale;
 
-		if( level !== 1 && document.documentElement.classList ) {
-			document.documentElement.classList.add( 'zoomed' );
-		}
-		else {
-			document.documentElement.classList.remove( 'zoomed' );
+		if( document.documentElement.classList ) {
+			if( level !== 1 ) {
+				document.documentElement.classList.add( 'zoomed' );
+			}
+			else {
+				document.documentElement.classList.remove( 'zoomed' );
+			}
 		}
 	}
 
@@ -159,7 +189,7 @@ var zoom = (function(){
 	function getScrollOffset() {
 		return {
 			x: window.scrollX !== undefined ? window.scrollX : window.pageXOffset,
-			y: window.scrollY !== undefined ? window.scrollY : window.pageXYffset
+			y: window.scrollY !== undefined ? window.scrollY : window.pageYOffset
 		}
 	}
 
@@ -175,6 +205,7 @@ var zoom = (function(){
 		 *   - scale: can be used instead of width/height to explicitly set scale
 		 */
 		to: function( options ) {
+
 			// Due to an implementation limitation we can't zoom in
 			// to another element without zooming out first
 			if( level !== 1 ) {
@@ -188,11 +219,12 @@ var zoom = (function(){
 				if( !!options.element ) {
 					// Space around the zoomed in element to leave on screen
 					var padding = 20;
+					var bounds = options.element.getBoundingClientRect();
 
-					options.width = options.element.getBoundingClientRect().width + ( padding * 2 );
-					options.height = options.element.getBoundingClientRect().height + ( padding * 2 );
-					options.x = options.element.getBoundingClientRect().left - padding;
-					options.y = options.element.getBoundingClientRect().top - padding;
+					options.x = bounds.left - padding;
+					options.y = bounds.top - padding;
+					options.width = bounds.width + ( padding * 2 );
+					options.height = bounds.height + ( padding * 2 );
 				}
 
 				// If width/height values are set, calculate scale from those values
@@ -204,13 +236,7 @@ var zoom = (function(){
 					options.x *= options.scale;
 					options.y *= options.scale;
 
-					var scrollOffset = getScrollOffset();
-
-					if( options.element ) {
-						scrollOffset.x -= ( window.innerWidth - ( options.width * options.scale ) ) / 2;
-					}
-
-					magnify( scrollOffset.x, scrollOffset.y, options.x, options.y, options.scale );
+					magnify( options, options.scale );
 
 					if( options.pan !== false ) {
 
@@ -222,8 +248,6 @@ var zoom = (function(){
 
 					}
 				}
-
-				currentOptions = options;
 			}
 		},
 
@@ -234,13 +258,7 @@ var zoom = (function(){
 			clearTimeout( panEngageTimeout );
 			clearInterval( panUpdateInterval );
 
-			var scrollOffset = getScrollOffset();
-
-			if( currentOptions && currentOptions.element ) {
-				scrollOffset.x -= ( window.innerWidth - ( currentOptions.width * currentOptions.scale ) ) / 2;
-			}
-
-			magnify( scrollOffset.x, scrollOffset.y, 0, 0, 1 );
+			magnify( { x: 0, y: 0 }, 1 );
 
 			level = 1;
 		},
@@ -256,3 +274,5 @@ var zoom = (function(){
 
 })();
 
+
+

data/lib/reveal/templates/template.html

@@ -12,23 +12,21 @@
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
 
-		<link rel="stylesheet" href="css/reveal.min.css">
-		<link rel="stylesheet" href="css/theme/default.css" id="theme">
+		<link rel="stylesheet" href="css/reveal.css">
+		<link rel="stylesheet" href="css/theme/black.css" id="theme">
 
-		<!-- For syntax highlighting -->
+		<!-- Code syntax highlighting -->
 		<link rel="stylesheet" href="lib/css/zenburn.css">
 
-		<!-- If the query includes 'print-pdf', include the PDF print sheet -->
+		<!-- Printing and PDF exports -->
 		<script>
-			if( window.location.search.match( /print-pdf/gi ) ) {
-				var link = document.createElement( 'link' );
-				link.rel = 'stylesheet';
-				link.type = 'text/css';
-				link.href = 'css/print/pdf.css';
-				document.getElementsByTagName( 'head' )[0].appendChild( link );
-			}
+			var link = document.createElement( 'link' );
+			link.rel = 'stylesheet';
+			link.type = 'text/css';
+			link.href = window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css';
+			document.getElementsByTagName( 'head' )[0].appendChild( link );
 		</script>
 
 		<!--[if lt IE 9]>
@@ -48,11 +46,11 @@
 		</div>
 
 		<script src="lib/js/head.min.js"></script>
-		<script src="js/reveal.min.js"></script>
+		<script src="js/reveal.js"></script>
 
 		<script>
 
-			// Full list of configuration options available here:
+			// Full list of configuration options available at:
 			// https://github.com/hakimel/reveal.js#configuration
 			Reveal.initialize({
 				controls: true,
@@ -60,21 +58,16 @@
 				history: true,
 				center: true,
 
-				theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-				transition: Reveal.getQueryHash().transition || 'default', // default/cube/page/concave/zoom/linear/fade/none
+				transition: 'slide', // none/fade/slide/convex/concave/zoom
 
-				// Parallax scrolling
-				// parallaxBackgroundImage: 'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg',
-				// parallaxBackgroundSize: '2100px 900px',
-
-				// Optional libraries used to extend on reveal.js
+				// Optional reveal.js plugins
 				dependencies: [
 					{ src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
 					{ src: 'plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
 					{ src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-					{ src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
-					{ src: 'plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
-					{ src: 'plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
+					{ src: 'plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } },
+					{ src: 'plugin/zoom-js/zoom.js', async: true },
+					{ src: 'plugin/notes/notes.js', async: true }
 				]
 			});
 

data/lib/reveal/version.rb

@@ -1,3 +1,3 @@
 module Reveal
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/reveal.rb

@@ -2,4 +2,5 @@ module Reveal
 end
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'reveal', 'version'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'reveal', 'command'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'reveal', 'cli'))

data/reveal.rb.gemspec

@@ -16,4 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency 'm'
+  gem.add_development_dependency 'byebug'
 end

data/spec/lib/reveal/cli_spec.rb

@@ -0,0 +1,26 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+
+require_relative '../../../lib/reveal'
+
+describe Reveal::Cli do
+  let :subject do
+    Reveal::Cli
+  end
+
+  let :logger do
+    Minitest::Mock.new
+  end
+
+  describe '.process' do
+    it 'delegates to Reveal::Command method call with arguments' do
+      command = Minitest::Mock.new
+      command.expect(:send, nil, ['method_name', ['arg1', 'arg2']])
+
+      Reveal::Command.stub(:new, command) do
+        subject.process(['method-name', 'arg1', 'arg2'])
+        command.verify
+      end
+    end
+  end
+end

data/spec/lib/reveal/command_spec.rb

@@ -0,0 +1,165 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+
+require 'tmpdir'
+require_relative '../../../lib/reveal'
+
+describe Reveal::Command do
+  let :subject do
+    Reveal::Command.new(logger)
+  end
+
+  let :logger do
+    Minitest::Mock.new
+  end
+
+  let :root_path do
+    Dir.mktmpdir
+  end
+
+  before do
+    FileUtils.mkdir("#{root_path}/reveal")
+    FileUtils.mkdir_p("#{root_path}/lib/reveal/templates")
+    FileUtils.cd("#{root_path}/reveal")
+  end
+
+  after do
+    FileUtils.rm_rf(root_path)
+  end
+
+  describe '#create' do
+    describe "when there's already a directory with the presentation name" do
+      before do
+        FileUtils.mkdir('my_presentation')
+      end
+
+      it 'raises an exception' do
+        -> { subject.create(['my_presentation']) }.must_raise RuntimeError
+      end
+    end
+
+    describe "when there isn't a directory with the presentation name" do
+      it 'creates source and output dir' do
+        logger.expect(:info, nil, [String])
+
+        subject.create(['my_presentation'])
+
+        Dir.exist?('my_presentation/source').must_equal true
+        Dir.exist?('my_presentation/output').must_equal true
+      end
+
+      it 'logs a success message' do
+        logger.expect(:info, nil, ["Presentation 'my_presentation' created."])
+
+        subject.create(['my_presentation'])
+
+        logger.verify
+      end
+    end
+  end
+
+  describe '#add_slide' do
+    describe 'when the presentation exists' do
+      before do
+        FileUtils.touch('template.html')
+        File.write('reveal.yml', {}.to_yaml)
+        FileUtils.mkdir('source')
+        FileUtils.mkdir('output')
+      end
+
+      it 'creates a new slide file' do
+        logger.expect(:info, nil, [String])
+        subject.add_slide(['slide1'])
+
+        File.exist?('source/slide1.md').must_equal true
+      end
+
+      it 'writes the updated configuration' do
+        logger.expect(:info, nil, [String])
+        subject.add_slide(['slide1'])
+
+        config = YAML.load(File.read('reveal.yml'))
+        config['slides'].must_equal ['slide1']
+      end
+
+      it 'logs a success message' do
+        logger.expect(:info, nil, ["Slide 'source/slide1.md' created."])
+
+        subject.add_slide(['slide1'])
+
+        logger.verify
+      end
+    end
+
+    describe "when the presentation doesn't exist" do
+      it 'raises an exception' do
+        -> { subject.add_slide(['slide1']) }.must_raise RuntimeError
+      end
+    end
+  end
+
+  describe '#generate' do
+    describe 'when the presentation exists' do
+      before do
+        FileUtils.touch('template.html')
+        File.write('reveal.yml', {}.to_yaml)
+        FileUtils.mkdir('source')
+        FileUtils.mkdir('output')
+        File.write('template.html', 'Presentation: <slides>')
+        File.write('source/slide1.md', 'slide 1 content')
+        File.write('source/slide2.md', 'slide 2 content')
+      end
+
+      describe 'and slides are automatically ordered' do
+        it 'Updates the generated presentation with automatic slide ordering' do
+          logger.expect(:info, nil, [String])
+          subject.generate
+
+          output = File.read('output/index.html')
+          output.must_match /^Presentation: .*slide 1 content.*slide 2 content/m
+        end
+      end
+
+      describe 'and slides are manually ordered' do
+        before do
+          File.write('reveal.yml', { 'order' => 'manual', 'slides' => ['slide2', 'slide1'] }.to_yaml)
+          logger.expect(:info, nil, [String])
+        end
+
+        it 'Updates the generated presentation respecting the ordering' do
+          subject.generate
+
+          output = File.read('output/index.html')
+          output.must_match /^Presentation: .*slide 2 content.*slide 1 content/m
+        end
+
+        describe 'and some slides are missing' do
+          before do
+            File.write('reveal.yml', { 'order' => 'manual', 'slides' => ['slide2', 'slide1', 'slide3'] }.to_yaml)
+          end
+
+          it 'ignores missing slides' do
+            subject.generate
+
+            output = File.read('output/index.html')
+            output.must_match /^Presentation: .*slide 2 content.*slide 1 content/m
+          end
+        end
+      end
+
+      it 'logs a success message' do
+        logger.expect(:info, nil, ["'output/index.html' presentation file generated."])
+
+        subject.generate
+
+        logger.verify
+      end
+    end
+
+    describe "when the presentation doesn't exist" do
+      it 'raises an exception' do
+        -> { subject.generate(nil) }.must_raise RuntimeError
+      end
+    end
+  end
+end