showoff 0.3.4 → 0.4.1

data/README.rdoc

@@ -55,7 +55,7 @@ show an example presentation, so you can see what it's like.
 You can break your slides up into sections of however many subdirectories deep
 you need.  ShowOff will recursively check all the directories mentioned in
 your showoff.json file for any markdown files (.md).  Each markdown file can
-have any number of slides in it, seperating each slide with the '!SLIDE'
+have any number of slides in it, separating each slide with the '!SLIDE'
 keyword and optional slide styles.
 
 For example, if you run 'showoff create my_new_pres' it will create a new
@@ -87,12 +87,18 @@ If you have multiple sections in your talk, you can make this json array
 include all the sections you want to show in which order you want to show
 them.
 
+If you want to keep the ability to emit an HTML document from your 
+Markdown source file -- say, for a TextMate preview or a GitHub rendering
+-- you can use angle brackets around the `!SLIDE` keyword and styles, e.g.
+
+    <!SLIDE bullets incremental transition=fade>
+
 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)
+* bullets - sizes and separates bullets properly (fits up to 5, generally)
+* smbullets - sizes and separates more bullets (smaller, closer together)
 * subsection - creates a different background for titles
 * command - monospaces h1 title slides
 * commandline - for pasted commandline sections (needs leading '$' for commands, then output on subsequent lines)
@@ -248,6 +254,17 @@ is your preference. An example of adding some styling is here.
 Note that the example above uses CSS3 styling with ::+after+ and the +content+
 -attribute to add an image to the slides.
 
+= Language highlighting
+
+Showoff uses {shjs}[http://shjs.sourceforge.net/] to highlight code blocks.
+If you begin a code block with three @-signs followed by a 
+{programming language name}[http://shjs.sourceforge.net/doc/documentation.html], 
+that line will be stripped and the rest of the block will become sparkly
+and colorful.
+
+    @@@ ruby
+    10.times { puts "Whee!" }
+
 = Editor integration
 
 The "add slide" feature can allow you to add the necessary boilerplate from your editor.  If you are using vim, you can
@@ -346,6 +363,10 @@ These options are specified *after* the command.
 
 Generate static version of presentation
 
+=== PDF
+Append a "/pdf" to the end of your presentation URL, and a PDF will be generated within the browser. For example,
+http://localhost:9090/pdf
+
 === ZSH completion
 You can complete commands and options in ZSH, by installing a script:
 

data/Rakefile

@@ -4,12 +4,4 @@ rescue LoadError
   abort "Please `gem install mg`"
 end
 
-class MG
-  # Monkey patch until http://github.com/defunkt/mg/commit/no_safe_level
-  # is merged and released upstream.
-  def spec
-    @spec ||= eval(File.read(gemspec))
-  end
-end
-
 MG.new("showoff.gemspec")

data/bin/showoff

@@ -7,13 +7,7 @@ require 'gli'
 
 include GLI
 
-desc 'Show ShowOff version'
-long_desc 'This command shows the currently installed version of ShowOff'
-command [:version] do |c|
-  c.action do |global_options,options,args|
-    puts "ShowOff Version " + ShowOff::Version
-  end
-end
+version ShowOff::Version 
 
 desc 'Create new showoff presentation'
 arg_name 'dir_name'
@@ -139,4 +133,4 @@ on_error do |exception|
   true
 end
 
-GLI.run(ARGV)
+exit GLI.run(ARGV)

data/lib/showoff.rb

@@ -2,33 +2,36 @@ require 'rubygems'
 require 'sinatra/base'
 require 'json'
 require 'nokogiri'
-require 'showoff_utils'
-require 'princely'
 require 'fileutils'
 
+here = File.expand_path(File.dirname(__FILE__))
+require "#{here}/showoff_utils"
+require "#{here}/princely"
+
 begin
   require 'RMagick'
 rescue LoadError
-  $stderr.puts 'image sizing disabled - install RMagick'
+  $stderr.puts 'image sizing disabled - install rmagick'
 end
 
 begin
   require 'pdfkit'
 rescue LoadError
-  $stderr.puts 'pdf generation disabled - install PDFKit'
+  $stderr.puts 'pdf generation disabled - install pdfkit'
 end
 
 begin
   require 'rdiscount'
 rescue LoadError
   require 'bluecloth'
+  Object.send(:remove_const,:Markdown)
   Markdown = BlueCloth
 end
 require 'pp'
 
 class ShowOff < Sinatra::Application
 
-  Version = VERSION = '0.3.4'
+  Version = VERSION = '0.4.1'
 
   attr_reader :cached_image_size
 
@@ -72,7 +75,7 @@ class ShowOff < Sinatra::Application
     end
 
     def process_markdown(name, content, static=false)
-      slides = content.split(/^!SLIDE/)
+      slides = content.split(/^<?!SLIDE/)
       slides.delete('')
       final = ''
       if slides.size > 1
@@ -82,7 +85,7 @@ class ShowOff < Sinatra::Application
         md = ''
         # extract content classes
         lines = slide.split("\n")
-        content_classes = lines.shift.split rescue []
+        content_classes = lines.shift.strip.chomp('>').split rescue []
         slide = lines.join("\n")
         # add content class too
         content_classes.unshift "content"
@@ -126,7 +129,7 @@ class ShowOff < Sinatra::Application
       paths.pop
       path = paths.join('/')
       replacement_prefix = static ?
-        %(img src="./file/#{path}) :
+        %(img src="file://#{options.pres_dir}/#{path}) :
         %(img src="/image/#{path})
       slide.gsub(/img src=\"(.*?)\"/) do |s|
         img_path = File.join(path, $1)
@@ -322,7 +325,7 @@ class ShowOff < Sinatra::Application
       path = showoff.instance_variable_get(:@root_path)
       data = showoff.send(what, true)
       if data.is_a?(File)
-        File.cp(data.path, "#{name}.pdf")
+        FileUtils.cp(data.path, "#{name}.pdf")
       else
         out  = "#{path}/#{name}/static"
         # First make a directory

data/public/css/showoff.css

@@ -1,24 +1,42 @@
 @media screen {
   body {
       font-family: "Gill Sans", Helvetica, Arial, sans-serif;
+      background:#333;
+      overflow:hidden;
+      margin:0;
+      padding:0;
   }
 
   #preso, .slide {
       background: #fff;
-      width: 1020px;
-      height: 740px;
+      width: 1024px;
+      height: 768px;
       margin-left:auto;
       margin-right:auto;
       overflow:hidden;
+      -webkit-box-shadow:0 0 25px rgba(0,0,0,0.35);
+      -moz-box-shadow:0 0 25px rgba(0,0,0,0.35);
+      box-shadow:0 0 25px rgba(0,0,0,0.35);
   }
 
   #footer {
-      background: #eee;
-      padding: 2px;
-      width: 1010px;
+      background: rgba(221,221,221,0.75);
+      color:#333;
+      padding: 2px 5px;
+      width: 1005px;
       height: 20px;
-      margin-left:auto;
-      margin-right:auto;
+      line-height:20px;
+      font-size:14px;
+      position:relative;
+      top:-24px;
+      z-index: 16;
+      margin:0 auto;
+      -webkit-border-top-left-radius: 3px;
+      -webkit-border-top-right-radius: 3px;
+      -moz-border-radius-topleft: 3px;
+      -moz-border-radius-topright: 3px;
+      border-top-left-radius: 3px;
+      border-top-right-radius: 3px;
   }
 }
 
@@ -26,51 +44,47 @@
 /* Portrait */
 @media screen and (max-width: 320px)
 {
-  #preso { 
+  #preso {
       margin: 0;
       padding: 0;
       width: 320px;
       max-height: 356px;
-      margin-left:auto; 
+      margin-left:auto;
       margin-right:auto;
 /*      overflow:hidden;*/
   }
-  #footer { 
+  #footer {
       background: #eee;
       margin: 0;
       padding: 2px;
       width: 320px;
       height: 20px;
-      margin-left:auto; 
+      margin-left:auto;
       margin-right:auto;
   }
 }
 /* Landscape */
 @media screen and (max-width: 480px)
 {
-  #preso { 
+  #preso {
       margin: 0;
       padding: 0;
 /*      min-height: 320px;*/
       width: 480px;
-      margin-left:auto; 
+      margin-left:auto;
       margin-right:auto;
   }
-  #footer { 
+  #footer {
       background: #eee;
       margin: 0;
       padding: 2px;
       width: 480px;
       height: 20px;
-      margin-left:auto; 
+      margin-left:auto;
       margin-right:auto;
   }
 }
 
-.slide {
-    border: 1px solid #fff;
-}
-
 .center img {
     display:block;
     margin-left:auto;
@@ -149,6 +163,7 @@ pre { margin-left: 40px; font-size: 2.8em; }
 
 .notes { display: none }
 .hidden { position:absolute; top:0; left:-9999px; width:1px; height:1px; overflow:hidden; }
+.buttonNav { display: none }
 .offscreen { position:absolute; top:0; left:-9999px; overflow:hidden; }
 #debugInfo { margin-left: 30px; }
 #preshow { display: none; }
@@ -179,7 +194,7 @@ a.fg-button { float:left; }
 
 .fg-button.ui-state-loading .ui-icon { background: url(spinner_bar.gif) no-repeat 0 0; }
 
-#navmenu { position: absolute; top: 10px; left: 10px; width: 50px; }
+#navmenu { position: absolute; top: 10px; left: 10px; width: 50px; z-index: 16; }
 
 .code .c { color: #999988; font-style: italic } /* Comment */
 .code .err { color: #a61717; background-color: #e3d2d2 } /* Error */
@@ -287,11 +302,11 @@ a.fg-button { float:left; }
   body {
     font-size: 70%;
   }
-  
+
   #preso, .slide {
     border: 1px solid #999;
   }
-  
+
   .slide .center {
     width: 600px;
     height: 600px;
@@ -299,7 +314,7 @@ a.fg-button { float:left; }
     text-align: center;
     vertical-align: middle;
   }
-  
+
   #preso, .slide {
       background: #fff;
       width: 600px;
@@ -317,7 +332,7 @@ a.fg-button { float:left; }
       margin-left:auto;
       margin-right:auto;
   }
-  
+
   pre, code {
     font-family: Monaco, monospace;
   }

data/public/js/showoff.js

@@ -190,8 +190,6 @@ function showSlide(back_step) {
 	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()

data/views/index.erb

@@ -61,6 +61,11 @@
   </table>
 </div>
 
+<div class="buttonNav">
+  <input type="submit" onClick="prevStep();" value="prev"/>
+  <input type="submit" onClick="nextStep();" value="next"/>
+</div>
+
 <div id="preso">loading presentation...</div>
 <div id="footer">
   <span id="slideInfo"></span>

data/views/onepage.erb

@@ -12,9 +12,7 @@
     <%= inline_css(['onepage.css'], 'public/css') %>
   <% end %>
   <%= inline_css(['reset.css', 'showoff.css', 'theme/ui.all.css', 'sh_style.css'], 'public/css') %>
-  <% css_files.each do |css_file| %>
-    <%= inline_css(css_file) %>
-  <% end %>
+  <%= inline_css(css_files) %>
 
   <% if !@no_js %>
     <%= inline_js(['jquery-1.4.2.min.js', 'jquery-print.js', 'showoff.js', 'onepage.js', 'sh_main.min.js', 'core.js', 'showoffcore.js'], 'public/js') %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: showoff
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 3
   - 4
-  version: 0.3.4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Scott Chacon
@@ -82,14 +82,28 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 21
         segments: 
         - 1
-        - 1
-        - 1
-        version: 1.1.1
+        - 2
+        - 5
+        version: 1.2.5
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: mg
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: "  ShowOff is a Sinatra web app that reads simple configuration files for a\n  presentation.  It is sort of like a Keynote web app engine.  I am using it\n  to do all my talks in 2010, because I have a deep hatred in my heart for\n  Keynote and yet it is by far the best in the field.\n\n  The idea is that you setup your slide files in section subdirectories and\n  then startup the showoff server in that directory.  It will read in your\n  showoff.json file for which sections go in which order and then will give \n  you a URL to present from.\n"
 email: schacon@gmail.com
 executables: