showoff 0.2.3 → 0.2.4

data/README.rdoc

@@ -244,9 +244,17 @@ So far, ShowOff has been used in the following presentations:
   http://github.com/Sutto/roro-perth-rails-3
 * PDXRB Tech Talk - Here's Sinatra - Jesse Cooke
   http://github.com/jc00ke/pdxrb_sinatra
+* Red Dirt Ruby Conference May 2010 - Plain Old Tokyo Storage - Jeremy Hinegardner
+  http://github.com/copiousfreetime/plain-old-tokyo-storage-presentation
+  http://plain-old-tokyo-storage.heroku.com/
 
 If you use it for something, please let me know so I can add it.
 
+= Editor Support
+
+* TextMate Bundle - Showoff.tmdbundle - Dr Nic Williams
+  http://github.com/drnic/Showoff.tmbundle
+
 = Future Plans
 
 I really want this to evolve into a dynamic presentation software server,

data/lib/showoff.rb

@@ -114,7 +114,7 @@ class ShowOff < Sinatra::Application
       paths.pop
       path = paths.join('/')
       replacement_prefix = static ?
-        %(img src="file://#{options.pres_dir}/static/#{path}) :
+        %(img src="file://#{options.pres_dir}/#{path}) :
         %(img src="/image/#{path})
       slide.gsub(/img src=\"(.*?)\"/) do |s|
         img_path = File.join(path, $1)
@@ -188,7 +188,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),static)
+          data += process_markdown(fname, File.read(f), static)
         end
       end
       data
@@ -328,7 +328,7 @@ class ShowOff < Sinatra::Application
   end
 
   get %r{/(.*)} do
-    @title = 'testing'
+    @title = ShowOffUtils.showoff_title
     what = params[:captures].first
     what = 'index' if "" == what
     if (what != "favicon.ico")

data/lib/showoff_utils.rb

@@ -236,6 +236,15 @@ class ShowOffUtils
     order
   end
 
+  def self.showoff_title(dir = '.')
+    index = File.join(dir, ShowOffUtils::SHOWOFF_JSON_FILE )
+    order = nil
+    if File.exists?(index)
+      data = JSON.parse(File.read(index))
+      data.is_a?(Hash) && data['name'] || "Presentation"
+    end
+  end
+
   EXTENSIONS =  {
     'pl' => 'perl',
     'rb' => 'ruby',

data/public/css/onepage.css

@@ -1,13 +1,29 @@
-.slide {
-    margin: 10px;
-    padding: 0;
-    width: 1020px;
-    height: 740px;
-    margin-left:auto; 
-    margin-right:auto;
-    overflow:hidden;
-    border: 1px solid #333;
-    page-break-after: always
+/* Screen */
+@media screen {
+  .slide {
+      margin: 10px;
+      padding: 0;
+      width: 1020px;
+      height: 740px;
+      margin-left:auto; 
+      margin-right:auto;
+      overflow:hidden;
+      border: 1px solid #333;
+      page-break-after: always
+  }
+}
+
+/* Print */
+@media print {
+  .slide, .preso {
+      margin: 10px;
+      padding: 0;
+      width: 800px;
+      height: 600px;
+      overflow:hidden;
+      border: none;
+      page-break-after: always
+  }
 }
 
 /* iPhone */
@@ -40,5 +56,4 @@
       border: 1px solid #333;
       page-break-after: always
   }
-}
-
+}

data/public/css/showoff.css

@@ -1,23 +1,25 @@
-body {
-    font-family: "Gill Sans", Helvetica, Arial, sans-serif;
-}
+@media screen {
+  body {
+      font-family: "Gill Sans", Helvetica, Arial, sans-serif;
+  }
 
-#preso, .slide {
-    background: #fff;
-    width: 1020px;
-    height: 740px;
-    margin-left:auto;
-    margin-right:auto;
-    overflow:hidden;
-}
+  #preso, .slide {
+      background: #fff;
+      width: 1020px;
+      height: 740px;
+      margin-left:auto;
+      margin-right:auto;
+      overflow:hidden;
+  }
 
-#footer {
-    background: #eee;
-    padding: 2px;
-    width: 1010px;
-    height: 20px;
-    margin-left:auto;
-    margin-right:auto;
+  #footer {
+      background: #eee;
+      padding: 2px;
+      width: 1010px;
+      height: 20px;
+      margin-left:auto;
+      margin-right:auto;
+  }
 }
 
 /* iPhone */
@@ -256,3 +258,44 @@ a.fg-button { float:left; }
   color:#0000FF !important;
   background-color: yellow;
 }
+
+/** Print **/
+@media print {
+  body {
+    font-size: 70%;
+  }
+  
+  #preso, .slide {
+    border: 1px solid #999;
+  }
+  
+  .slide .center {
+    width: 600px;
+    height: 600px;
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+  }
+  
+  #preso, .slide {
+      background: #fff;
+      width: 600px;
+      height: 600px;
+      margin-left:auto;
+      margin-right:auto;
+      overflow:hidden;
+  }
+
+  #footer {
+      background: #eee;
+      padding: 2px;
+      width: 590px;
+      height: 20  px;
+      margin-left:auto;
+      margin-right:auto;
+  }
+  
+  pre, code {
+    font-family: Monaco, monospace;
+  }
+}

data/public/js/core.js

@@ -0,0 +1,79 @@
+// CORE module, abstracts environment-specifics
+var CORE = function(){
+
+    /*
+     * blatantly ripped off from Douglas Crockford
+     */
+    var modifyLanguage = function(){
+        Function.prototype.method = function (name, func) {
+            if (!this.prototype[name]){
+                this.prototype[name] = func;
+                return this;
+            }
+        };
+        Function.method('inherits', function(Parent){
+            this.prototype = new Parent();
+            return this;
+        });
+        Array.method('each', function(f, index){
+            for (var i=0; i<this.length; i++){
+                f(this[i], i);
+            }
+        });
+        Array.method('reduce', function(f, value){
+            this.each(function(item){
+                value = f(item, value);
+            });
+            return value;
+        });
+        Array.method('contains', function(test){
+            var contains = false;
+            this.each(function(item){
+                if (item === test){
+                    contains = true;
+                    return false;
+                }
+            });
+            return contains;
+        });
+        Object.create = function(o){
+            var F = function(){};
+            F.prototype = o;
+            return new F();
+        };
+        Object.mixin = function(obj,mixin){
+            for (name in mixin){
+                if (mixin.hasOwnProperty(name)){
+                    obj[name] = mixin[name];
+                }
+            }
+            return obj;
+        };
+    };
+
+    modifyLanguage();
+
+    return {
+
+        out : function(output){
+            //implemented by env
+        },
+
+        require : function(toImport){
+            this.out("'require' not implemented!");
+        },
+
+        debug : function(a, deep){
+            this.out( a + ', typeof ' + typeof a);
+            for (var name in a){
+                if (deep || (a.hasOwnProperty(name))){
+                    if (typeof a[name] === 'function'){
+                        this.out(name + ': [a method]');
+                    } else {
+                        this.out(name + ':' + a[name]);
+                    }
+                }
+            }
+        }
+    };
+}();

data/public/js/jquery-print.js

@@ -62,13 +62,13 @@
     var r = /["\\\x00-\x1f\x7f-\x9f]/g;
     
     var str = r.test(value)
-      ? '"' + value.replace(r, function (a) {
+      ? value.replace(r, function (a) {
           var c = character_substitutions[a];
           if (c) return c;
           c = a.charCodeAt();
           return '\\u00' + Math.floor(c / 16).toString(16) + (c % 16).toString(16);
-        }) + '"'
-      : '"' + value + '"';
+        })
+      : value ;
     if (str.length > opts.max_string)
       return str.slice(0, opts.max_string + 1) + '..."';
     else

data/public/js/showoff.js

@@ -17,6 +17,8 @@ var debugMode = false
 var gotoSlidenum = 0
 var shiftKeyActive = false
 
+var loadSlidesBool
+var loadSlidesPrefix
 
 function setupPreso(load_slides, prefix) {
   if (preso_started)
@@ -26,8 +28,9 @@ function setupPreso(load_slides, prefix) {
   }
   preso_started = true
 
- 
-  loadSlides(load_slides, prefix)
+  loadSlidesBool = load_slides
+  loadSlidesPrefix = prefix
+  loadSlides(loadSlidesBool, loadSlidesPrefix)
 
   doDebugStuff()
 
@@ -39,7 +42,7 @@ function setupPreso(load_slides, prefix) {
   /* window.onunload = unloaded; */
 }
 
-function loadSlides(load_slides, prefix) { 
+function loadSlides(load_slides, prefix) {
   //load slides offscreen, wait for images and then initialize
   if (load_slides) {
   	$("#slides").load("/slides", false, function(){
@@ -76,9 +79,10 @@ function initializePresentation(prefix) {
     showSlide()
     alert('slides loaded')
   } else {
-    showFirstSlide()
+    showFirstSlide();
     slidesLoaded = true
   }
+  setupSlideParamsCheck();
   sh_highlightDocument(prefix+'/js/sh_lang/', '.min.js')
 }
 
@@ -119,6 +123,31 @@ function setupMenu() {
   });
 }
 
+function checkSlideParameter() {
+  if (slideParam = currentSlideFromParams()) {
+    slidenum = slideParam;
+  }
+}
+
+function currentSlideFromParams() {
+  var result;
+  if (result = window.location.hash.match(/#([0-9]+)/)) {
+    return result[result.length - 1] - 1;
+  }
+}
+
+function setupSlideParamsCheck() {
+  var check = function() {
+    var currentSlide = currentSlideFromParams();
+    if (slidenum != currentSlide) {
+      slidenum = currentSlide;
+      showSlide();
+    }
+    setTimeout(check, 100);
+  }
+  setTimeout(check, 100);
+}
+
 function gotoSlide(slideNum) {
   slidenum = parseInt(slideNum)
   if (!isNaN(slidenum)) {
@@ -128,6 +157,7 @@ function gotoSlide(slideNum) {
 
 function showFirstSlide() {
   slidenum = 0
+  checkSlideParameter();
   showSlide()
 }
 
@@ -172,7 +202,7 @@ function showSlide(back_step) {
     incrCurr = 0
     incrSteps = 0
   }
-
+  location.hash = slidenum + 1;
   $('body').addSwipeEvents().
     bind('swipeleft',  swipeLeft).
     bind('swiperight', swipeRight)
@@ -186,7 +216,7 @@ function getSlideProgress()
   return (slidenum + 1) + '/' + slideTotal
 }
 
-function getCurrentNotes() 
+function getCurrentNotes()
 {
   return currentSlide.find("p.notes").text()
 }
@@ -263,19 +293,26 @@ function keyDown(event)
        return true;
 
     debug('keyDown: ' + 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);
+
+    if (key == 13){
+        if (gotoSlidenum > 0) {
+            debug('go to ' + gotoSlidenum);
+            slidenum = gotoSlidenum - 1;
+            showSlide(true);
+            gotoSlidenum = 0;
+        } else {
+            debug('executeCode');
+            executeCode.call($('.sh_javaScript code:visible'));
+        }
+
     }
-    gotoSlidenum = 0;
+
 
     if (key == 16) // shift key
     {
@@ -302,7 +339,7 @@ function keyDown(event)
     else if (key == 82) // R for reload
     {
       if (confirm('really reload slides?')) {
-        loadSlides()
+        loadSlides(loadSlidesBool, loadSlidesPrefix)
         showSlide()
       }
     }
@@ -325,7 +362,7 @@ function keyDown(event)
     return true
 }
 
-function toggleFooter() 
+function toggleFooter()
 {
   $('#footer').toggle()
 }
@@ -399,16 +436,17 @@ var removeResults = function() {
 
 var print = function(text) {
   removeResults();
-  var _results = $('<div>').addClass('results').text($.print(text));
+  var _results = $('<div>').addClass('results').html($.print(text, {max_string:500}));
   $('body').append(_results);
   _results.click(removeResults);
 };
 
-$('.sh_javaScript code').live("click", function() {
-  result = null;
-  var codeDiv = $(this);
-  codeDiv.addClass("executing");
-  eval(codeDiv.text());
-  setTimeout(function() { codeDiv.removeClass("executing");}, 250 );
-  if (result != null) print(result);
-});
+function executeCode () {
+    result = null;
+    var codeDiv = $(this);
+    codeDiv.addClass("executing");
+    eval(codeDiv.text());
+    setTimeout(function() { codeDiv.removeClass("executing");}, 250 );
+    if (result != null) print(result);
+}
+$('.sh_javaScript code').live("click", executeCode);

data/public/js/showoffcore.js

@@ -0,0 +1,13 @@
+// Make CORE.out() write to showoff 'result' global variable http://github.com/scottbale/showoff
+(function(CORE){
+
+    CORE.require = function(toImport){
+        //nothing to do
+    };
+    CORE.out = function(output){
+        result = result || '';
+        result = result + '<p>' + output + '</p>';
+    };
+
+    return CORE;
+}(CORE));

data/views/index.erb

@@ -20,6 +20,8 @@
   <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="<%= @asset_path %>/js/sh_main.min.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/core.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/showoffcore.js"></script>
 
   <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" />

data/views/onepage.erb

@@ -17,7 +17,7 @@
   <% end %>
 
   <% if !@no_js %>
-    <%= inline_js(['jquery-1.4.min.js', 'jquery.jswipe.js', 'jquery-print.js', 'showoff.js', 'onepage.js', 'sh_main.min.js'], 'public/js') %>
+    <%= inline_js(['jquery-1.4.min.js', 'jquery.jswipe.js', 'jquery-print.js', 'showoff.js', 'onepage.js', 'sh_main.min.js', 'core.js', 'showoffcore.js'], 'public/js') %>
     <script type="text/javascript">
     $(document).ready(function() {
       setupOnePage()

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: showoff
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Scott Chacon
@@ -19,66 +14,54 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: bluecloth
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: json
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: gli
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
-  type: :runtime
-  version_requirements: *id005
+    version: 
 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: 
@@ -131,6 +114,7 @@ files:
 - public/css/theme/ui.tabs.css
 - public/css/theme/ui.theme.css
 - public/favicon.ico
+- public/js/core.js
 - public/js/fg.menu.js
 - public/js/jquery-1.4.min.js
 - public/js/jquery-print.js
@@ -183,7 +167,8 @@ files:
 - public/js/sh_lang/sh_xorg.min.js
 - public/js/sh_main.min.js
 - public/js/showoff.js
-has_rdoc: true
+- public/js/showoffcore.js
+has_rdoc: false
 homepage: http://github.com/schacon/showoff
 licenses: []
 
@@ -196,20 +181,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: The best damn presentation software a developer could ever love.