n3bulous-infuse 0.9.1 → 0.9.2

data/bin/infuse

@@ -31,6 +31,15 @@ def background(text)
   InfuseDSL.instance.background = text
 end
 
+def format(text)
+  InfuseDSL.instance.format = text
+end
+
+def transition(text)
+  InfuseDSL.instance.transition = text
+end
+
+
 def slide(title, *content)
   s = Slide.new(title, content)
   InfuseDSL.instance.add_slide(s)

data/lib/infuse/infuse_dsl.rb

@@ -3,15 +3,26 @@ require 'singleton'
 class InfuseDSL
   include Singleton
 
-  attr_accessor :slides, :title, :author, :company, :copyright, :subtitle, :background
+  # Specified
+  attr_accessor :slides, :title, :author, :company, :copyright, :subtitle, :background, :format, :transition
+  # Derived
   attr_accessor :source_file, :output_dir
 
   def initialize
     @slides = []
 
-    @header_template =  File.dirname(__FILE__) + "/themes/plain/header.html.erb"
-    @footer_template =  File.dirname(__FILE__) + "/themes/plain/footer.html.erb"
-    @slide_template =   File.dirname(__FILE__) + "/themes/plain/slide.html.erb"
+    @template_dir = File.dirname(__FILE__) + "/themes/plain/"
+    @operashow_templates = {
+        :header => "operashow-header.html.erb",
+        :footer => "operashow-footer.html.erb",
+        :slide => "slide.html.erb"
+    }
+
+    @html_templates = {
+        :header => "header.html.erb",
+        :footer => "footer.html.erb",
+        :slide => "slide.html.erb"
+    }
   end
 
   def add_slide(slide)
@@ -19,35 +30,56 @@ class InfuseDSL
   end
 
   def run
-    header_tpl = IO.read(@header_template)
-    footer_tpl = IO.read(@footer_template)
-    slide_tpl = IO.read(@slide_template)
+    html_output = generate_html_slideshow
+    operashow_output = generate_operashow_slideshow
 
+    prepare_target_dir
+
+    begin
+      File.new(output_file, "w").puts(html_output)
+      File.new(output_file('operashow-'), "w").puts(operashow_output)
+    rescue
+      puts $!
+      exit
+    end
+
+  end
+
+private
+
+  def generate_slide_output(header_tpl, footer_tpl, slide_tpl)
     header_with_data = ERB.new(header_tpl, 0, ">").result(self.send(:binding))
     footer_with_data = ERB.new(footer_tpl, 0, ">").result(self.send(:binding))
 
     slides_with_data = ""
     @slides.each do |s|
-      slides_with_data << s.convert(slide_tpl)
+      slides_with_data << s.convert(slide_tpl) + "\n\n"
     end
 
     output = header_with_data + "\n" + slides_with_data + "\n" + footer_with_data
+  end
 
-    prepare_target_dir
+  def generate_html_slideshow
+    header_tpl = IO.read(@template_dir + @html_templates[:header])
+    footer_tpl = IO.read(@template_dir + @html_templates[:footer])
+    slide_tpl = IO.read(@template_dir + @html_templates[:slide])
 
-    begin
-      File.new(output_file, "w").puts(output)
-    rescue
-      puts ""
-    end
+    generate_slide_output(header_tpl, footer_tpl, slide_tpl)
+  end
 
+  def generate_operashow_slideshow
+    header_tpl = IO.read(@template_dir + @operashow_templates[:header])
+    footer_tpl = IO.read(@template_dir + @operashow_templates[:footer])
+    slide_tpl = IO.read(@template_dir + @operashow_templates[:slide])
+
+    generate_slide_output(header_tpl, footer_tpl, slide_tpl)
   end
 
-private
-  def output_file
-    @output_dir + "/" + File.basename(@source_file, ".#{INFUSE_EXTENSION}") + ".html"
+  def output_file(name_prefix="")
+    @output_dir + "/" + name_prefix + File.basename(@source_file, ".#{INFUSE_EXTENSION}") + ".html"
   end
 
+  # TODO: Update files based on differences, at least missing files.
   def prepare_target_dir
     begin
       FileUtils.mkdir(@output_dir)
@@ -59,8 +91,10 @@ private
   end
 
   def copy_default_files
-    FileUtils.cp_r(File.dirname(__FILE__) + "/../s6/shared/", @output_dir)
-    FileUtils.cp_r(File.dirname(__FILE__) + "/themes/plain/css/custom.css", @output_dir)
+    FileUtils.cp_r(File.dirname(__FILE__) + "/../s6/shared", @output_dir)
+    FileUtils.cp_r(File.dirname(__FILE__) + "/themes/plain/custom.css", @output_dir)
+    FileUtils.cp_r(File.dirname(__FILE__) + "/themes/plain/operashow.css", @output_dir + "/shared")
+    FileUtils.cp_r(File.dirname(__FILE__) + "/themes/plain/operashow-custom.css", @output_dir)
   end
 
 end

data/lib/infuse/themes/plain/operashow-custom.css

@@ -0,0 +1,12 @@
+@import url(shared/operashow.css);
+
+html, body {
+  color: black;
+  background-color: white;
+  font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+div#header, div#footer {
+  color: #ffe8b2;
+  background-color: #ce8b45;
+}

data/lib/infuse/themes/plain/operashow-footer.html.erb

@@ -0,0 +1,6 @@
+    <div id="footer">
+      <h1><%= title %></h1>
+      <h2>&copy; <%= copyright %></h2>
+    </div>
+  </body>
+</html>

data/lib/infuse/themes/plain/operashow-header.html.erb

@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+  <head>
+    <title><%= @title %></title>
+    <meta http-equiv=expires content="-1">
+    <meta http-equiv=Cache-Control CONTENT=no-cache>
+    <meta http-equiv=Pragma CONTENT=no-cache>
+
+    <link rel="stylesheet" href="operashow-custom.css" type="text/css">
+  </head>
+
+  <body>
+<% if background.length > 0 %>
+    <div class="layout">
+      <div class="background">
+        <object data="<%= @background %>" width="100%" height="100%">
+        </object>
+      </div>
+    </div>
+<% end %>
+

data/lib/infuse/themes/plain/operashow.css

@@ -0,0 +1,78 @@
+@media screen {
+  .layout { display: none; }
+
+  .banner {
+     display: block;
+     border: green solid thick;
+     padding: 1em;
+     font-family: sans-serif;
+     font-weight: bold;
+     margin-bottom: 2em;
+   }
+
+   a:link, a:visited { color: black; }
+   a:hover { background-color: yellow; }
+
+   body { color: black; }
+
+  pre.code {
+     background-color: black;
+     color: white;
+     padding: 5px;
+	}
+}
+
+@media projection {
+	body
+	{
+	    height: 100%; margin: 0px; padding: 0px;
+	    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	    color: white;
+	    opacity: .99;
+	}
+
+	.slide
+	{
+	  page-break-after: always;
+	  padding-left: 2em;
+	  padding-top: 2em;
+	}
+
+	.banner
+	{
+	  display: none;
+	}
+
+	.layout
+	{
+	  display: block;
+	}
+
+	div.background {
+	        position: fixed;
+	        left: 0px;
+	        right: 0px;
+	        top: 0px;
+	        bottom: 0px;
+	        z-index: -1;
+	 }
+
+	a:link, a:visited {
+	    color: white;
+	}
+	a:hover { background-color: yellow; }
+
+	h1, h2 { font-size: 36pt;  }
+	h3 { font-size: 25pt;  }
+	p, li, td, th { font-size: 18pt; }
+
+	pre { font-size: 16pt;  }
+
+	pre.code { font-size: 16pt;
+	  background-color: black;
+	  color: white;
+	  padding: 5px;
+	   border: silver thick groove;
+	    -moz-border-radius: 11px;
+	}
+}

data/lib/infuse/themes/plain/slide.html.erb

@@ -9,3 +9,4 @@
 -->
 <% end %>
 </div>
+

data/lib/infuse/version.rb

@@ -3,7 +3,7 @@ module Infuse
 
     MAJOR = 0
     MINOR = 9
-    TINY  = 1
+    TINY  = 2
 
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: n3bulous-infuse
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Kevin McFadden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-03 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: infuse
 dependencies: []
 
@@ -29,11 +29,13 @@ files:
 - lib/infuse/slide.rb
 - lib/infuse/themes
 - lib/infuse/themes/plain
-- lib/infuse/themes/plain/css
-- lib/infuse/themes/plain/css/custom.css
+- lib/infuse/themes/plain/custom.css
 - lib/infuse/themes/plain/footer.html.erb
 - lib/infuse/themes/plain/header.html.erb
-- lib/infuse/themes/plain/js
+- lib/infuse/themes/plain/operashow-custom.css
+- lib/infuse/themes/plain/operashow-footer.html.erb
+- lib/infuse/themes/plain/operashow-header.html.erb
+- lib/infuse/themes/plain/operashow.css
 - lib/infuse/themes/plain/slide.html.erb
 - lib/infuse/themes/plain/title-page.html.erb
 - lib/infuse/version.rb