showoff 0.1.1 → 0.1.4

data/README.txt

@@ -51,6 +51,19 @@ it has a showoff.json file and a number of sections (subdirectories) with markdo
 If you run 'showoff' in the ShowOff directory itself, it will show an example
 presentation from the 'example' subdirectory, so you can see what it's like.
 
+Alternatively you can generate a static version of your presentation by either
+
+  $ showoff static
+
+Which will generate a static directory with an index.html and all other necessary files.
+
+Or
+
+$ showoff static pdf
+
+Which will generate a file called <name>.pdf where <name> is the name of the subdirectory.
+
+
 Slide Format
 ====================
 
@@ -92,6 +105,7 @@ them.
 Some useful styles for each slide are:
 
 * center - centers images on a slide
+* full-page - allows an image to take up the whole slide
 * bullets - sizes and seperates bullets properly (fits up to 5, generally)
 * smbullets - sizes and seperates more bullets (smaller, closer together)
 * subsection - creates a different background for titles

data/bin/showoff

@@ -2,7 +2,7 @@
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'showoff'
-command = ARGV[0]
+command = ARGV.shift
 
 case command
 when 'create'
@@ -13,6 +13,8 @@ when 'heroku'
   ShowOffUtils.heroku
 when 'serve'
   ShowOff.run! :host => 'localhost', :port => 9090
+when 'static' 
+  ShowOff.do_static(ARGV)
 else
   ShowOffUtils.help
-end
+end

data/lib/showoff.rb

@@ -4,6 +4,8 @@ require 'json'
 require 'nokogiri'
 require 'showoff_utils'
 require 'princely'
+require 'ftools'
+
 
 begin 
   require 'rdiscount'
@@ -18,16 +20,19 @@ class ShowOff < Sinatra::Application
   set :views, File.dirname(__FILE__) + '/../views'
   set :public, File.dirname(__FILE__) + '/../public'
   set :pres_dir, 'example'
-
+  
   def initialize(app=nil)
     super(app)
     puts dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
     if Dir.pwd == dir
       options.pres_dir = dir + '/example'
+      @root_path = "."
     else
       options.pres_dir = Dir.pwd
+      @root_path = ".."
     end
     puts options.pres_dir
+    @pres_name = options.pres_dir.split('/').pop
   end
 
   helpers do
@@ -46,7 +51,7 @@ class ShowOff < Sinatra::Application
       Dir.glob("#{options.pres_dir}/*.js").map { |path| File.basename(path) }
     end
 
-    def process_markdown(name, content)
+    def process_markdown(name, content, static=false)
       slides = content.split(/^!SLIDE/)
       slides.delete('')
       final = ''
@@ -75,7 +80,7 @@ class ShowOff < Sinatra::Application
           md += "<div class=\"#{content_classes.join(' ')}\" ref=\"#{name}\">\n"
         end
         sl = Markdown.new(slide).to_html 
-        sl = update_image_paths(name, sl)
+        sl = update_image_paths(name, sl, static)
         md += sl
         md += "</div>\n"
         md += "</div>\n"
@@ -84,11 +89,15 @@ class ShowOff < Sinatra::Application
       final
     end
 
-    def update_image_paths(path, slide)
+    def update_image_paths(path, slide, static=false)
       paths = path.split('/')
       paths.pop
       path = paths.join('/')
-      slide.gsub(/img src=\"(.*?)\"/, 'img src="/image/' + path + '/\1"') 
+      if static
+        slide.gsub(/img src=\"(.*?)\"/, 'img src="file://'+options.pres_dir+'/static/' + path + '/\1"') 
+      else
+        slide.gsub(/img src=\"(.*?)\"/, 'img src="/image/' + path + '/\1"') 
+      end
     end
     
     def update_commandline_code(slide)
@@ -127,7 +136,7 @@ class ShowOff < Sinatra::Application
       html.root.to_s
     end
     
-    def get_slides_html
+    def get_slides_html(static=false)
       index = File.join(options.pres_dir, 'showoff.json')
       files = []
       if File.exists?(index)
@@ -141,7 +150,7 @@ class ShowOff < Sinatra::Application
         data = ''
         files.each do |f|
           fname = f.gsub(options.pres_dir + '/', '').gsub('.md', '')
-          data += process_markdown(fname, File.read(f))
+          data += process_markdown(fname, File.read(f),static)
         end
       end
       data
@@ -174,12 +183,73 @@ class ShowOff < Sinatra::Application
       js_content += '</script>'
       js_content
     end
+    
+    def index(static=false)
+      if static
+        @slides = get_slides_html(static)
+        @asset_path = "."
+      end
+      erb :index
+    end
 
-  end
+    def slides(static=false)
+      get_slides_html(static)
+    end
+
+    def onepage(static=false)
+      @slides = get_slides_html(static)
+      erb :onepage
+    end
+
+    def pdf(static=false)
+      @slides = get_slides_html(static)
+      @no_js = true
+      html = erb :onepage
+      p = Princely.new
+      # TODO make a random filename
+      p.pdf_from_string_to_file(html, '/tmp/preso.pdf')
+      File.new('/tmp/preso.pdf')
+    end
 
-  get '/' do
-    erb :index
   end
+  
+  
+   def self.do_static(args)
+      what = args.shift || "index"  
+      
+      # Nasty hack to get the actual ShowOff module
+      showoff = ShowOff.new
+      while !showoff.is_a?(ShowOff)
+        showoff = showoff.instance_variable_get(:@app)
+      end
+      name = showoff.instance_variable_get(:@pres_name)
+      path = showoff.instance_variable_get(:@root_path)
+      data = showoff.send(what, true)
+      if data.is_a?(File)
+        File.cp(data.path, "#{name}.pdf")
+      else
+        out  = "#{path}/#{name}/static"
+        # First make a directory
+        File.makedirs("#{out}")
+        # Then write the html
+        file = File.new("#{out}/index.html", "w")
+        file.puts(data)
+        file.close
+        # Now copy all the js and css
+        ["js", "css"].each { |dir|
+          FileUtils.copy_entry("#{path}/public/#{dir}", "#{out}/#{dir}")
+        }
+        # And copy the directory
+        Dir.glob("#{path}/#{name}/*").each { |subpath| 
+          base = File.basename(subpath)
+          next if "static" == base
+          next unless File.directory?(subpath) || base.match(/\.(css|js)$/)
+          FileUtils.copy_entry(subpath, "#{out}/#{base}")
+        }
+      end
+    end
+  
+
 
   get %r{(?:image|file)/(.*)} do
     path = params[:captures].first
@@ -187,22 +257,17 @@ class ShowOff < Sinatra::Application
     send_file full_path
   end
 
-  get '/slides' do
-    get_slides_html
+  get %r{/(.*)} do
+     what = params[:captures].first
+     what = 'index' if "" == what 
+     data = send(what)
+     if data.is_a?(File)
+       send_file data.path
+     else
+       data
+     end
   end
 
-  get '/onepage' do
-    @slides = get_slides_html
-    erb :onepage
-  end
-
-  get '/pdf' do
-    @slides = get_slides_html
-    @no_js = true
-    html = erb :onepage
-    p = Princely.new
-    p.pdf_from_string_to_file(html, '/tmp/preso.pdf')
-    send_file '/tmp/preso.pdf'
-  end
+ 
 
 end

data/public/css/showoff.css

@@ -191,9 +191,10 @@ a.fg-button { float:left; }
   padding:15px;
   margin:0px;
   font-family: monospace;
+  z-index: 2147483647; //max, see http://www.puidokas.com/max-z-index/
 }
 
 .executing {
   color:#0000FF !important;
   background-color: yellow;
-}
+}

data/public/js/showoff.js

@@ -12,8 +12,10 @@ var incrElem
 var incrCurr = 0
 var incrCode = false
 var debugMode = false
+var gotoSlidenum = 0
 
-function setupPreso() {
+
+function setupPreso(load_slides, prefix) {
   if (preso_started)
   {
      alert("already started")
@@ -21,7 +23,9 @@ function setupPreso() {
   }
   preso_started = true
 
-  loadSlides()
+ 
+  loadSlides(load_slides, prefix)
+
   doDebugStuff()
 
   // bind event handlers
@@ -31,16 +35,22 @@ function setupPreso() {
   /* window.onunload = unloaded; */
 }
 
-function loadSlides() {
+function loadSlides(load_slides, prefix) { 
   //load slides offscreen, wait for images and then initialize
-  $("#slides").load("/slides", false, function(){
-    $("#slides img").batchImageLoad({
-			loadingCompleteCallback: initializePresentation
+  if (load_slides) {
+  	$("#slides").load("/slides", false, function(){
+    	$("#slides img").batchImageLoad({
+			loadingCompleteCallback: initializePresentation(prefix)
 		})
-  })
+  	})
+  } else {
+	$("#slides img").batchImageLoad({
+		loadingCompleteCallback: initializePresentation(prefix)
+	})
+  }
 }
 
-function initializePresentation() {
+function initializePresentation(prefix) {
   //center slides offscreen
   centerSlides($('#slides > .slide'))
 
@@ -65,7 +75,7 @@ function initializePresentation() {
     showFirstSlide()
     slidesLoaded = true
   }
-  sh_highlightDocument('/js/sh_lang/', '.min.js')
+  sh_highlightDocument(prefix+'/js/sh_lang/', '.min.js')
 }
 
 function centerSlides(slides) {
@@ -130,12 +140,23 @@ function showSlide(back_step) {
   }
 
   currentSlide = slides.eq(slidenum)
+
   var transition = currentSlide.attr('data-transition')
-  if (back_step) {
+  var fullPage = currentSlide.find(".content").is('.full-page');
+
+  if (back_step || fullPage) {
     transition = 'none'
   }
+
   $('#preso').cycle(slidenum, transition)
 
+  if (fullPage) {
+    $('#preso').css({'width' : '100%', 'overflow' : 'visible'});
+    currentSlide.css({'width' : '100%', 'text-align' : 'center', 'overflow' : 'visible'});
+  } else {
+    $('#preso').css({'width' : '1020px', 'overflow' : 'hidden'});
+  }
+
   percent = getSlidePercent()
   $("#slideInfo").text((slidenum + 1) + '/' + slideTotal + '  - ' + percent + '%')
 
@@ -213,6 +234,19 @@ function keyDown(event)
 
     debug('key: ' + key)
 
+    if (key >= 48 && key <= 57) // 0 - 9
+    {
+      gotoSlidenum = gotoSlidenum * 10 + (key - 48);
+      return true;
+    }
+    if (key == 13 && gotoSlidenum > 0)
+    {
+      debug('go to ' + gotoSlidenum);
+      slidenum = gotoSlidenum - 1;
+      showSlide(true);
+    }
+    gotoSlidenum = 0;
+
     if (key == 32) // space bar
     {
       nextStep()
@@ -222,12 +256,12 @@ function keyDown(event)
       debugMode = !debugMode
       doDebugStuff()
     }
-    else if (key == 37) // Left arrow
+    else if (key == 37 || key == 33) // Left arrow or page up
     {
       slidenum--
       showSlide(true) // We show the slide fully loaded
     }
-    else if (key == 39) // Right arrow
+    else if (key == 39 || key == 34) // Right arrow or page down
     {
       nextStep()
     }

data/views/index.erb

@@ -7,22 +7,22 @@
 
 	<title>Presentation</title>
 
-	<link rel="stylesheet" href="css/reset.css" type="text/css"/>
-	<link rel="stylesheet" href="css/showoff.css" type="text/css"/>
+	<link rel="stylesheet" href="<%= @asset_path %>/css/reset.css" type="text/css"/>
+	<link rel="stylesheet" href="<%= @asset_path %>/css/showoff.css" type="text/css"/>
 
-	<script type="text/javascript" src="/js/jquery-1.4.min.js"></script>
-	<script type="text/javascript" src="/js/jquery.cycle.all.js"></script>
-	<script type="text/javascript" src="/js/jquery.batchImageLoad.js"></script>
-	<script type="text/javascript" src="/js/jquery-print.js"></script>	
-  <script type="text/javascript" src="/js/fg.menu.js"></script> 
-	<script type="text/javascript" src="/js/showoff.js"></script>
-  <script type="text/javascript" src="/js/jTypeWriter.js"> </script>
+	<script type="text/javascript" src="<%= @asset_path %>/js/jquery-1.4.min.js"></script>
+	<script type="text/javascript" src="<%= @asset_path %>/js/jquery.cycle.all.js"></script>
+	<script type="text/javascript" src="<%= @asset_path %>/js/jquery.batchImageLoad.js"></script>
+	<script type="text/javascript" src="<%= @asset_path %>/js/jquery-print.js"></script>	
+    <script type="text/javascript" src="<%= @asset_path %>/js/fg.menu.js"></script> 
+	<script type="text/javascript" src="<%= @asset_path %>/js/showoff.js"></script>
+    <script type="text/javascript" src="<%= @asset_path %>/js/jTypeWriter.js"> </script>
 
-  <script type="text/javascript" src="/js/sh_main.min.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/sh_main.min.js"></script>
 
-  <link type="text/css" href="/css/fg.menu.css" media="screen" rel="stylesheet" /> 
-  <link type="text/css" href="/css/theme/ui.all.css" media="screen" rel="stylesheet" /> 
-  <link type="text/css" href="/css/sh_style.css" rel="stylesheet" >
+  <link type="text/css" href="<%= @asset_path %>/css/fg.menu.css" media="screen" rel="stylesheet" /> 
+  <link type="text/css" href="<%= @asset_path %>/css/theme/ui.all.css" media="screen" rel="stylesheet" /> 
+  <link type="text/css" href="<%= @asset_path %>/css/sh_style.css" rel="stylesheet" >
 
   <% css_files.each do |css_file| %>
 	  <link rel="stylesheet" href="file/<%= css_file %>" type="text/css"/>
@@ -33,8 +33,9 @@
   <% end %>
 
   <script type="text/javascript">
+ 
   $(document).ready(function() {
-    setupPreso();
+    setupPreso(<%= @slides.nil? ? "true" : "false"%>, '<%= @asset_path %>');
   });
   </script>
 </head>
@@ -50,8 +51,10 @@
     <tr><td class="key">space, &rarr;</td><td>next slide</td></tr>
     <tr><td class="key">&larr;</td><td>previous slide</td></tr>
     <tr><td class="key">d</td><td>debug mode</td></tr>
+    <tr><td class="key">## &lt;ret&gt;</td><td>go to slide #</td></tr>
     <tr><td class="key">c</td><td>table of contents (vi)</td></tr>
     <tr><td class="key">f</td><td>toggle footer</td></tr>
+    <tr><td class="key">r</td><td>reload slides</td></tr>
     <tr><td class="key">z</td><td>toggle help (this)</td></tr>
   </table>
 </div>
@@ -62,7 +65,9 @@
   <span id="debugInfo"></span>
 </div>
 
-<div id="slides" class="offscreen"></div>
+<div id="slides" class="offscreen" <%= 'style="display:none;"' if @slides %>>
+<%= @slides %>	
+</div>
 
 </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: showoff
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors: 
 - Scott Chacon