showoff 0.2.2 → 0.2.3

data/lib/showoff.rb

@@ -13,13 +13,12 @@ rescue LoadError
 end
 
 begin
-  require 'prawn'
   require 'princely'
 rescue LoadError
-  puts 'pdf generation disabled - install prawn'
+  puts 'pdf generation disabled - install princely'
 end
 
-begin 
+begin
   require 'rdiscount'
 rescue LoadError
   require 'bluecloth'
@@ -34,7 +33,7 @@ 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__), '..'))
@@ -77,7 +76,7 @@ class ShowOff < Sinatra::Application
         md = ''
         # extract content classes
         lines = slide.split("\n")
-        content_classes = lines.shift.split
+        content_classes = lines.shift.split rescue []
         slide = lines.join("\n")
         # add content class too
         content_classes.unshift "content"
@@ -94,7 +93,7 @@ class ShowOff < Sinatra::Application
         else
           md += "<div class=\"#{content_classes.join(' ')}\" ref=\"#{name}\">\n"
         end
-        sl = Markdown.new(slide).to_html 
+        sl = Markdown.new(slide).to_html
         sl = update_image_paths(name, sl, static)
         md += sl
         md += "</div>\n"
@@ -143,7 +142,7 @@ class ShowOff < Sinatra::Application
 
     def update_commandline_code(slide)
       html = Nokogiri::XML.parse(slide)
-      
+
       html.css('pre').each do |pre|
         pre.css('code').each do |code|
           out = code.text
@@ -176,14 +175,12 @@ class ShowOff < Sinatra::Application
       end
       html.root.to_s
     end
-    
+
     def get_slides_html(static=false)
-      index = File.join(options.pres_dir, ShowOffUtils::SHOWOFF_JSON_FILE )
+      sections = ShowOffUtils.showoff_sections(options.pres_dir)
       files = []
-      if File.exists?(index)
-        order = JSON.parse(File.read(index))
-        order = order.map { |s| s['section'] }
-        order.each do |section|
+      if sections
+        sections.each do |section|
           files << load_section_files(section)
         end
         files = files.flatten
@@ -201,9 +198,9 @@ class ShowOff < Sinatra::Application
       css_content = '<style type="text/css">'
       csses.each do |css_file|
         if pre
-          css_file = File.join(File.dirname(__FILE__), '..', pre, css_file) 
+          css_file = File.join(File.dirname(__FILE__), '..', pre, css_file)
         else
-          css_file = File.join(options.pres_dir, css_file) 
+          css_file = File.join(options.pres_dir, css_file)
         end
         css_content += File.read(css_file)
       end
@@ -215,16 +212,16 @@ class ShowOff < Sinatra::Application
       js_content = '<script type="text/javascript">'
       jses.each do |js_file|
         if pre
-          js_file = File.join(File.dirname(__FILE__), '..', pre, js_file) 
+          js_file = File.join(File.dirname(__FILE__), '..', pre, js_file)
         else
-          js_file = File.join(options.pres_dir, js_file) 
+          js_file = File.join(options.pres_dir, js_file)
         end
         js_content += File.read(js_file)
       end
       js_content += '</script>'
       js_content
     end
-    
+
     def index(static=false)
       if static
         @slides = get_slides_html(static)
@@ -233,6 +230,37 @@ class ShowOff < Sinatra::Application
       erb :index
     end
 
+    def clean_link(href)
+      if href && href[0, 1] == '/'
+        href = href[1, href.size]
+      end
+      href
+    end
+
+    def assets_needed
+      assets = ["index", "slides"]
+
+      index = erb :index
+      html = Nokogiri::XML.parse(index)
+      html.css('head link').each do |link|
+        href = clean_link(link['href'])
+        assets << href if href
+      end
+      html.css('head script').each do |link|
+        href = clean_link(link['src'])
+        assets << href if href
+      end
+
+      slides = get_slides_html
+      html = Nokogiri::XML.parse("<slides>" + slides + "</slides>")
+      html.css('img').each do |link|
+        href = clean_link(link['src'])
+        assets << href if href
+      end
+
+      assets.join("\n")
+    end
+
     def slides(static=false)
       get_slides_html(static)
     end
@@ -253,11 +281,11 @@ class ShowOff < Sinatra::Application
     end
 
   end
-  
-  
+
+
    def self.do_static(what)
       what = "index" if !what
-      
+
       # Nasty hack to get the actual ShowOff module
       showoff = ShowOff.new
       while !showoff.is_a?(ShowOff)
@@ -282,7 +310,7 @@ class ShowOff < Sinatra::Application
           FileUtils.copy_entry("#{my_path}/#{dir}", "#{out}/#{dir}")
         }
         # And copy the directory
-        Dir.glob("#{my_path}/#{name}/*").each { |subpath| 
+        Dir.glob("#{my_path}/#{name}/*").each { |subpath|
           base = File.basename(subpath)
           next if "static" == base
           next unless File.directory?(subpath) || base.match(/\.(css|js)$/)
@@ -290,7 +318,7 @@ class ShowOff < Sinatra::Application
         }
       end
     end
-  
+
 
 
   get %r{(?:image|file)/(.*)} do
@@ -300,8 +328,9 @@ class ShowOff < Sinatra::Application
   end
 
   get %r{/(.*)} do
+    @title = 'testing'
     what = params[:captures].first
-    what = 'index' if "" == what 
+    what = 'index' if "" == what
     if (what != "favicon.ico")
       data = send(what)
       if data.is_a?(File)
@@ -312,6 +341,6 @@ class ShowOff < Sinatra::Application
     end
   end
 
- 
+
 
 end

data/lib/showoff_utils.rb

@@ -17,7 +17,7 @@ class ShowOffUtils
 
       # create showoff.json
       File.open(SHOWOFF_JSON_FILE, 'w+') do |f|
-        f.puts "[ {\"section\":\"#{dir}\"} ]"
+        f.puts "{ \"name\": \"My Preso\", \"sections\": [ {\"section\":\"#{dir}\"} ]}"
       end
 
       if create_samples
@@ -87,7 +87,7 @@ class ShowOffUtils
 
 
   # Adds a new slide to a given dir, giving it a number such that it falls after all slides
-  # in that dir.  
+  # in that dir.
   # Options are:
   # [:dir] - dir where we put the slide (if omitted, slide is output to $stdout)
   # [:name] - name of the file, without the number prefix. (if omitted, a default is used)
@@ -125,7 +125,7 @@ class ShowOffUtils
   # the end of showoff.json as well
   def self.add_new_dir(dir)
     puts "Creating #{dir}..."
-    Dir.mkdir dir 
+    Dir.mkdir dir
 
     showoff_json = JSON.parse(File.read(SHOWOFF_JSON_FILE))
     showoff_json << { "section" => dir }
@@ -135,7 +135,7 @@ class ShowOffUtils
     puts "#{SHOWOFF_JSON_FILE} updated"
   end
 
-  def self.blank?(string) 
+  def self.blank?(string)
     string.nil? || string.strip.length == 0
   end
 
@@ -182,7 +182,7 @@ class ShowOffUtils
 
   def self.determine_title(title,slide_name,code)
     if blank?(title)
-      title = slide_name 
+      title = slide_name
       title = File.basename(code) if code
     end
     title = "Title here" if blank?(title)
@@ -198,12 +198,12 @@ class ShowOffUtils
     size = "small" if lines > 15
     size = "smaller" if width > 57
     size = "smaller" if lines > 19
-    puts "warning, some lines are too long and the code may be cut off" if width > 65 
+    puts "warning, some lines are too long and the code may be cut off" if width > 65
     puts "warning, your code is too long and the code may be cut off" if lines > 23
     size
   end
 
-  # Reads the code from the source file, returning 
+  # Reads the code from the source file, returning
   # the code, indented for markdown, as well as the number of lines
   # and the width of the largest line
   def self.read_code(source_file)
@@ -211,7 +211,7 @@ class ShowOffUtils
     lines = 0
     width = 0
     File.open(source_file) do |code_file|
-      code_file.readlines.each do |line| 
+      code_file.readlines.each do |line|
         code += "    #{line}"
         lines += 1
         width = line.length if line.length > width
@@ -220,7 +220,23 @@ class ShowOffUtils
     [code,lines,width]
   end
 
-  EXTENSIONS =  { 
+  def self.showoff_sections(dir = '.')
+    index = File.join(dir, ShowOffUtils::SHOWOFF_JSON_FILE )
+    order = nil
+    if File.exists?(index)
+      data = JSON.parse(File.read(index))
+      pp data
+      if data.is_a?(Hash)
+        order = data['sections']
+      else
+        order = data
+      end
+      order = order.map { |s| s['section'] }
+    end
+    order
+  end
+
+  EXTENSIONS =  {
     'pl' => 'perl',
     'rb' => 'ruby',
     'erl' => 'erlang',

data/views/index.erb

@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <title>Presentation</title>
+  <title><%= @title %></title>
 
   <link rel="stylesheet" href="<%= @asset_path %>/css/reset.css" type="text/css"/>
   <link rel="stylesheet" href="<%= @asset_path %>/css/showoff.css" type="text/css"/>

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: showoff
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Scott Chacon
@@ -14,54 +19,66 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bluecloth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: gli
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 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: 
@@ -165,7 +182,6 @@ files:
 - public/js/sh_lang/sh_xml.min.js
 - public/js/sh_lang/sh_xorg.min.js
 - public/js/sh_main.min.js
-- public/js/showoff.client.js
 - public/js/showoff.js
 has_rdoc: true
 homepage: http://github.com/schacon/showoff
@@ -180,18 +196,20 @@ 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.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The best damn presentation software a developer could ever love.

data/public/js/showoff.client.js

@@ -1,80 +0,0 @@
-//alert($.uuid('c-'))
-//alert($.uuid('p-'))
-//$.ws.conn({
-//  url : 'ws://localhost:3840/connect?to=master&id=client',
-//  onopen : function () {
-//    console.log('connected');
-//  },
-//  onmessage : function (data) {
-//    console.log("received: " + data)
-//    if(data == 'next') {
-//      nextStep()
-//    } else if(data == 'prev') {
-//      prevStep()
-//    } else if(data.match(/^\d+$/)) {
-//      gotoSlide(data)
-//    }
-//  },
-//  onclose : function (event) {
-//    console.log('disconnected');
-//  }
-//})
-
-(function($) {
-  var client = ShowOff.Client = function() {
-    this.id = $.cookie('showoff-client-id')
-    if(!this.id) {
-      this.id = $.uuid('c-')
-      $.cookie('showoff-client-id', this.id)
-    }
-    this.master    = false;
-  }
-
-  // a no-op until the client is connected
-  client.send = client.sendToClients = function() {}
-
-  client.create = function() {
-    ShowOff.Client = new ShowOff.Client();
-    return ShowOff.Client;
-  }
-
-  client.prototype.watchPresentation = function(host, port, presentationId) {
-    var url = 'ws://' + host + ':' + port + '/connect?to=' + presentationId + '&id=' + this.id;
-    var cli = this;
-    this.socket = $.ws.conn({
-      url : url,
-      onmessage : this.onMessage,
-      onopen : function () {
-        console.log('connected to ' + url);
-      },
-      onclose : function () {
-        console.log('disconnected');
-      }
-    })
-  }
-
-  client.prototype.onMessage = function(data) {
-    var cli = ShowOff.Client;
-    console.log("recd: " + data)
-    switch(data) {
-      case 'master':
-        cli.master = true;
-        break;
-      case 'next':
-        nextStep();
-        break;
-      default:
-        if(data.match(/^\d+$/))
-          gotoSlide(data);
-    }
-  }
-
-  client.prototype.sendToClients = function(data) {
-    if(!this.master) return
-    this.send(data)
-  }
-
-  client.prototype.send = function(data) {
-    this.socket.send(data);
-  }
-})(jQuery)