slidedown 0.1.0 → 0.1.1

data/README.md

@@ -74,6 +74,11 @@ Or for JavaScript
 * Generate PDFs (maybe via cucumber)
 * Stop making Nokogiri sad when parsing out snippets
 
+## Contributors
+
+* Pat Nakajima
+* Dan Croak
+
 (c) Copyright 2009 Pat Nakajima
 
 Permission is hereby granted, free of charge, to any person

data/bin/slidedown

@@ -2,4 +2,4 @@
 
 require File.join(File.dirname(__FILE__), *%w[.. lib slidedown])
 
-puts SlideDown.render(ARGV.dup)
+SlideDown.run!

data/lib/slide.rb

@@ -1,12 +1,24 @@
 class Slide
-  attr_accessor :text, :classes
-  
+  attr_accessor :text, :classes, :notes
+
   def initialize(text, *classes)
-    @text = text
+    @text    = text
     @classes = classes
+    @notes   = nil
+    
+    extract_notes!
   end
-  
+
   def html
     MakersMark::Generator.new(@text).to_html
   end
-end
+  
+  private
+  
+  def extract_notes!
+    @text.gsub!(/^!NOTES\s*(.*\n)$/m) do |note|
+      @notes = note.to_s.chomp.gsub('!NOTES', '')
+      ''
+    end
+  end
+end

data/lib/slidedown.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
+require 'optparse'
 require 'nokogiri'
-require 'rdiscount'
 require 'makers-mark'
 require 'erb'
 require File.join(File.dirname(__FILE__), 'slide')
@@ -8,16 +8,50 @@ require File.join(File.dirname(__FILE__), 'slide')
 $SILENT = true
 
 class SlideDown
+  USAGE = "The SlideDown command line interface takes a .md (Markdown) file as its only required argument. It will convert the file to HTML in standard out. Options:
+  -t, --template [TEMPLATE] the .erb files in /templates directory. Default is -t default, which prints stylesheets and javascripts inline. The import template uses link and script tags."
+
+  attr_accessor :stylesheets, :title
   attr_reader :classes
 
-  def self.render(args)
-    new(File.read(File.join(Dir.pwd, *args))).render
+  def self.run!(argv = ARGV)
+    args = argv.dup
+
+    if args.empty?
+      puts USAGE
+    else
+      source = args[0]
+      if args.length == 1
+        render(source)
+      else
+        option_parser(source).parse!(args)
+      end
+    end
+  end
+
+  def self.option_parser(source)
+    OptionParser.new do |opts|
+      opts.on('-h', '--help') { puts USAGE }
+      opts.on('-t', '--template TEMPLATE') do |template|
+        render(source, template)
+      end
+    end
+  end
+
+  def self.render(source_path, template = "default")
+    if source_path
+      slideshow = new(File.read(source_path))
+      puts slideshow.render(template)
+    end
   end
 
   # Ensures that the first slide has proper !SLIDE declaration
-  def initialize(raw)
+  def initialize(raw, opts = {})
     @raw = raw =~ /\A!SLIDE/ ? raw : "!SLIDE\n#{raw}"
     extract_classes!
+
+    self.stylesheets = opts[:stylesheets] || local_stylesheets
+    self.title =       opts[:title]       || "Slides"
   end
 
   def slides
@@ -25,33 +59,28 @@ class SlideDown
   end
 
   def read(path)
-    File.read(File.dirname(__FILE__) + '/../templates/%s' % path)
+    File.read(File.join(File.dirname(__FILE__), '..', "templates", path))
   end
 
-  def render
-    template = File.read(File.dirname(__FILE__) + '/../templates/template.erb')
+  def render(name)
+    directory = File.join(File.dirname(__FILE__), "..", "templates")
+    path      = File.join(directory, "#{name}.erb")
+    template  = File.read(path)
     ERB.new(template).result(binding)
   end
 
   private
 
   def lines
-    @lines ||= @raw.split(/^!SLIDE/) \
-      .reject { |line| line.empty? }
-  end
-
-  def parse_snippets(slide)
-    slide.gsub!(/@@@\s([\w\s]+)\s*$/, %(<pre class="#{$1}"><code>))
-    slide.gsub!(/@@@\s*$/, %(</code></pre>))
+    @lines ||= @raw.split(/^!SLIDE\s*([a-z\s]*)$/).reject { |line| line.empty? }
   end
 
-  # These get added to the dom.
-  def stylesheets
-    Dir[Dir.pwd + '/*.css'].map { |path| File.read(path) }
+  def local_stylesheets
+    Dir[Dir.pwd + '/*.stylesheets']
   end
 
   def jabascripts
-    Dir[Dir.pwd + '/*.js'].map { |path| File.read(path) }
+    Dir[Dir.pwd + '/*.javascripts'].map { |path| File.read(path) }
   end
 
   def extract_classes!
@@ -59,6 +88,16 @@ class SlideDown
     @raw.gsub!(/^!SLIDE\s*([a-z\s]*)$/) do |klass|
       @classes << klass.to_s.chomp.gsub('!SLIDE', '')
       "!SLIDE"
-    end ; @classes
+    end
+    @classes
+  end
+
+  def extract_notes!
+    @raw.gsub!(/^!NOTES\s*(.*)!SLIDE$/m) do |note|
+      '!SLIDE'
+    end
+    @raw.gsub!(/^!NOTES\s*(.*\n)$/m) do |note|
+      ''
+    end
   end
 end

data/templates/{template.erb → default.erb}

@@ -1,25 +1,23 @@
 <html>
   <head>
-    <title>Slides</title>
+    <title><%= title %></title>
     <style type="text/css" media="screen">
-      <%= read('css/slides.css') %>
+      <%= read('stylesheets/slides.css') %>
     </style>
     <% stylesheets.each do |style| %>
-      <style type="text/css" media="screen">
-        <%= style %>
-      </style>
+      <link rel="stylesheet" href="<%= style %>" type="text/css" media="screen" charset="utf-8" />
     <% end %>
     <script type="text/javascript">
-      <%= read('js/jquery-1.3.2.js') %>
+      <%= read('javascripts/jquery-1.3.2.js') %>
     </script>
     <script type="text/javascript" charset="utf-8">
-      <%= read('js/jquery.easing.js') %>
+      <%= read('javascripts/jquery.easing.js') %>
     </script>
     <script type="text/javascript" charset="utf-8">
-      <%= read('js/jquery.hash-changed.js') %>
+      <%= read('javascripts/jquery.hash-changed.js') %>
     </script>
     <script type="text/javascript" charset="utf-8">
-      <%= read('js/slides.js') %>
+      <%= read('javascripts/slides.js') %>
     </script>
     <% jabascripts.each do |jaba| %>
       <script type="text/javascript" charset="utf-8">
@@ -40,4 +38,4 @@
       </div>
     </div>
   </body>
-</html>
+</html>

data/templates/import.erb

@@ -0,0 +1,23 @@
+<html>
+  <head>
+    <title>Slides</title>
+    <link href="/stylesheets/slides.css" media="screen" rel="stylesheet" charset="utf-8" type="text/css" />
+    <script src="/javascripts/jquery.js" type="text/javascript"></script>
+    <script src="/javascripts/jquery.easing.js" type="text/javascript"></script>
+    <script src="/javascripts/jquery.hash-changed.js" type="text/javascript"></script>
+    <script src="/javascripts/slides.js" type="text/javascript"></script>
+  </head>
+  <body>
+    <div id="slides">
+      <div id="track">
+        <% slides.each_with_index do |slide, idx| %>
+          <div class="<%= slide.classes.join(' ') %>">
+            <div id="slide-<%= idx %>" class="content">
+              <%= slide.html %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </body>
+</html>

data/vendor/albino.rb

@@ -41,7 +41,7 @@
 # Chris Wanstrath // chris@ozmm.org 
 #         GitHub // http://github.com
 #
-require 'open4'
+require 'open3'
 
 class Albino
   @@bin = '/usr/local/bin/pygmentize'
@@ -60,7 +60,7 @@ class Albino
   end
 
   def execute(command)
-    pid, stdin, stdout, stderr = Open4.popen4(command)
+    stdin, stdout, stderr = Open3.popen3(command)
     stdin.puts @target
     stdin.close
     stdout.read.strip

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: slidedown
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Pat Nakajima
+- Dan Croak
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -13,7 +14,7 @@ date: 2009-03-10 00:00:00 -04:00
 default_executable: slidedown
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: makers-mark
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -32,16 +33,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: nakajima-makers-mark
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: 
 email: 
 executables: 
@@ -51,17 +42,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- README.md
 - bin/slidedown
 - lib/slide.rb
 - lib/slidedown.rb
-- README.md
-- templates/css/screen.css
-- templates/css/slides.css
-- templates/js/jquery-1.3.2.js
-- templates/js/jquery.easing.js
-- templates/js/jquery.hash-changed.js
-- templates/js/slides.js
-- templates/template.erb
+- templates/default.erb
+- templates/import.erb
+- templates/javascripts/jquery-1.3.2.js
+- templates/javascripts/jquery.easing.js
+- templates/javascripts/jquery.hash-changed.js
+- templates/javascripts/slides.js
+- templates/stylesheets/screen.css
+- templates/stylesheets/slides.css
 - vendor/albino.rb
 has_rdoc: true
 homepage: