slideshow 0.8.5 → 0.9

data/lib/slideshow/helpers/analytics_helper.rb

@@ -0,0 +1,39 @@
+module AnalyticsHelper
+  
+  
+def google_analytics( opts = {} )
+
+  # if no user account code (e.g. UA-397343-10) passed along use
+  #   code from *.yml settings
+  code = opts.fetch( :code, config.google_analytics_code ) 
+
+  puts "  Adding JavaScript for Google Analytics tracker (#{code})..."
+
+  text = <<EOS
+<!-- begin google-analytics #{opts.inspect} -->
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', '#{code}']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+<!-- end google-analytics -->
+EOS
+
+  guard_text( text )             
+end
+  
+  
+end # module AnalyticsHelper
+
+class Slideshow::Gen
+  include AnalyticsHelper
+end
+

data/lib/slideshow/helpers/step_helper.rb

@@ -0,0 +1,31 @@
+module StepHelper
+
+  
+def step( opts={}, &blk )
+     
+  puts "  Adding HTML div block for step (incremental display)..."
+    
+  text = capture_erb(&blk)
+      
+  before  = "<!-- begin step #{opts.inspect} -->\n"
+  before << "<div class='step' markdown='block'>\n"
+  
+  after   = "</div>\n"  
+  after  << "<!-- end step -->\n"
+
+  html  = ""
+  html << guard_text( before )
+  html << text
+  html << guard_text( after )
+
+  concat_erb( html, blk.binding )
+  return
+end
+  
+  
+end # module StepHelper
+
+class Slideshow::Gen
+  include StepHelper
+end
+

data/lib/slideshow/helpers/table_helper.rb

@@ -0,0 +1,61 @@
+module TableHelper
+
+# todo: add center, plus generic col helper
+
+  
+def left( opts={}, &blk )
+   
+  width = opts.fetch( :width, "50%" )
+  clazz = opts.fetch( :class, nil )
+   
+  puts "  Adding HTML for left column (using table layout)..."
+    
+  text = capture_erb(&blk)
+      
+  before  = "<!-- begin left #{opts.inspect} -->\n"
+  before << "<div class='#{clazz}'>\n"  if clazz  
+  before << "<table width='100%'><tr><td width='#{width}' markdown='block' style='vertical-align: top;'>\n"
+    
+  after   = "</td>\n"  
+  after  << "<!-- end left -->\n"
+
+  html  = ""
+  html << guard_text( before )
+  html << text
+  html << guard_text( after )
+
+  concat_erb( html, blk.binding )
+  return
+end
+  
+def right( opts={}, &blk )
+
+  width = opts.fetch( :width, "50%" )
+  clazz = opts.fetch( :class, nil )
+   
+  puts "  Adding HTML for right column (using table layout)..."
+    
+  text = capture_erb(&blk)
+    
+  before  = "<!-- begin right #{opts.inspect} -->\n" 
+  before << "<td width='#{width}' markdown='block' style='vertical-align: top;'>\n"  
+    
+  after   = "</td></tr></table>\n"
+  after  << "</div>\n"  if clazz    
+  after  << "<!-- end right -->\n"
+
+  html  = ""
+  html << guard_text( before )
+  html << text
+  html << guard_text( after )
+      
+  concat_erb( html, blk.binding )
+  return
+end
+  
+  
+end # module TableHelper
+
+class Slideshow::Gen
+  include TableHelper
+end

data/lib/slideshow/helpers/text_helper.rb

@@ -6,7 +6,8 @@ def __include__( name, opts = {} )
 end
 
 def help()
-
+  puts "  Adding HTML for Slide Show help instructions..."
+    
   text = <<EOS
 *Slide Show Keyboard Controls (Help)*
 
@@ -17,7 +18,13 @@ def help()
 | Show/hide slide controls (&#216; &laquo; &raquo;) | C, Move mouse to bottom right corner |
 EOS
 
- wrap_markup( textile_to_html( text ) )  
+ html = <<EOS
+<!-- begin help -->
+#{textile_to_html( text )}
+<!-- end help -->
+EOS
+
+ guard_text( html )  
 end
 
 

data/lib/slideshow/markdown.rb

@@ -0,0 +1,27 @@
+module MarkdownEngines
+
+  def rdiscount_to_html( content )
+    RDiscount.new( content ).to_html
+  end
+  
+  def rpeg_markdown_to_html( content )
+    PEGMarkdown.new( content ).to_html
+  end
+  
+  def maruku_to_html( content )
+    Maruku.new( content, {:on_error => :raise} ).to_html
+  end
+  
+  def bluecloth_to_html( content )
+    BlueCloth.new( content ).to_html
+  end
+  
+  def kramdown_to_html( content )
+    Kramdown::Document.new( content ).to_html
+  end
+
+end   # module MarkdownEngines
+
+class Slideshow::Gen
+  include MarkdownEngines
+end

data/lib/slideshow/opts.rb

@@ -70,15 +70,7 @@ class Opts
     # fix: use os-agnostic delimiter (use : for Mac/Unix?)
     has_includes? ? @hash[ :include ].split( ';' ) : []
   end
-  
-  def s5?  
-    get_boolean( 's5', false )
-  end
-  
-  def fullerscreen?
-    get_boolean( 'fuller', false ) || get_boolean( 'fullerscreen', false )
-  end
-  
+    
   def manifest  
     get( 'manifest', 's6.txt' )
   end

data/lib/slideshow/slide.rb

@@ -0,0 +1,40 @@
+module Slideshow
+
+  class Slide < Struct.new(:header, :content, :classes)
+  
+    def to_classic_html
+       
+      buf  = ""
+      buf << "<div class='slide "
+      buf << classes    if classes
+      buf << "'>\n"      
+      
+      buf << header     if header
+      buf << content    if content
+      
+      buf << "</div>\n"
+      buf       
+    end
+    
+    def to_google_html5
+      
+      buf  = ""
+      buf << "<div class='slide'>\n"      
+
+      if header
+        buf << "<header>#{header}</header>\n"
+      end
+      
+      buf << "<section class='"
+      buf << classes      if classes      
+      buf << "'>\n"
+      
+      buf << content      if content
+      buf << "</section>\n"
+      buf << "</div>\n"
+      buf
+    end
+  
+  end # class slide
+
+end # module Slideshow

data/lib/slideshow/textile.rb

@@ -0,0 +1,50 @@
+module TextileEngines
+
+  def redcloth_java_fix_escape_nonascii( txt )
+    txt.chars.map{ |x| x.size > 1 ? "&##{x.unpack("U*")};" : x }.join
+  end
+
+  def redcloth_java_fix_escape_nonascii_exclude_pre( txt )
+
+    buf  = ""
+    from = 0
+ 
+    while (pos = txt.index( /<pre.*?>.*?<\/pre>/m, from ))
+      # add text before pre block escaped
+      buf << redcloth_java_fix_escape_nonascii( txt[ from, pos-from] )
+     
+      # add pre block unescaped (otherwise html entities get escaped twice)
+      from = Regexp.last_match.end(0)
+      buf << txt[pos, from-pos]
+    end
+    buf << redcloth_java_fix_escape_nonascii( txt[from, txt.length-from] )
+   
+    buf
+  end 
+
+
+  def textile_to_html( content )    
+    puts "  Converting Textile-text (#{content.length} bytes) to HTML..."
+    
+    # JRuby workaround for RedCloth 4 multi-byte character bug
+    #  see http://jgarber.lighthouseapp.com/projects/13054/tickets/149-redcloth-4-doesnt-support-multi-bytes-content
+    # basically convert non-ascii chars (>127) to html entities
+    
+    if RedCloth::EXTENSION_LANGUAGE == "Java"
+      puts "  Patching RedCloth for Java; converting non-Ascii/multi-byte chars to HTML-entities..." 
+      content = redcloth_java_fix_escape_nonascii_exclude_pre( content )
+    end
+    
+    # turn off hard line breaks
+    # turn off span caps (see http://rubybook.ca/2008/08/16/redcloth)
+    red = RedCloth.new( content, [:no_span_caps] )
+    red.hard_breaks = false
+    content = red.to_html
+  end
+
+end # module TextileEngines
+
+
+class Slideshow::Gen
+  include TextileEngines
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 5
-  version: 0.8.5
+  - 9
+  version: "0.9"
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 +02:00
+date: 2010-07-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 59
         segments: 
         - 0
-        - 8
+        - 9
         - 0
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -93,43 +92,33 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
 - Manifest.txt
-- README.txt
-- templates/fullerscreen.txt
-- templates/s5.txt
 - templates/s6.txt
 files: 
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - bin/slideshow
+- config/slideshow.builtin.yml
+- config/slideshow.yml
 - lib/slideshow.rb
+- lib/slideshow/config.rb
+- lib/slideshow/filters/headers_filter.rb
+- lib/slideshow/filters/text_filter.rb
 - lib/slideshow/gen.rb
+- lib/slideshow/helpers/analytics_helper.rb
 - lib/slideshow/helpers/capture_helper.rb
 - lib/slideshow/helpers/coderay_helper.rb
+- lib/slideshow/helpers/step_helper.rb
+- lib/slideshow/helpers/table_helper.rb
 - lib/slideshow/helpers/text_helper.rb
 - lib/slideshow/helpers/uv_helper.rb
+- lib/slideshow/markdown.rb
 - lib/slideshow/opts.rb
-- templates/fullerscreen.txt
-- templates/fullerscreen.txt.gen
-- templates/fullerscreen.txt.sample
-- templates/fullerscreen/footer.html.erb
-- templates/fullerscreen/header.html.erb
-- templates/fullerscreen/style.css.erb
+- lib/slideshow/slide.rb
+- lib/slideshow/textile.rb
 - templates/gradient.svg.erb
-- templates/s5.txt
-- templates/s5.txt.gen
-- templates/s5.txt.sample
-- templates/s5/footer.html.erb
-- templates/s5/header.html.erb
-- templates/s5/opera.css
-- templates/s5/outline.css
-- templates/s5/print.css
-- templates/s5/s5-core.css
-- templates/s5/slides.js
-- templates/s5/style.css.erb
 - templates/s6.txt
 - templates/s6.txt.gen
 - templates/s6.txt.sample
@@ -151,7 +140,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/templates/fullerscreen.txt

@@ -1,5 +0,0 @@
-# builtin FullerScreen template package manifest
-
-__file__.html  fullerscreen/header.html.erb + fullerscreen/footer.html.erb
-__file__.css   fullerscreen/style.css.erb
-__file__.svg   gradient.svg.erb

data/templates/fullerscreen.txt.gen

@@ -1,7 +0,0 @@
-# FullerScreen manifest to generate sample template package from builtin templates
-
-fullerscreen.txt fullerscreen.txt.sample
-gradient.svg.erb
-header.html.erb   fullerscreen/header.html.erb
-footer.html.erb   fullerscreen/footer.html.erb
-style.css.erb     fullerscreen/style.css.erb

data/templates/fullerscreen.txt.sample

@@ -1,11 +0,0 @@
-# FullerScreen template package manifest sample
-# Change as desired/needed
-#
-# Questions? Comments?
-# Send them along to the Free Web Slide Show Alternatives (S5, S6, S9 And Friends) Forum/Mailing List. 
-# http://groups.google.com/group/webslideshow
-
-__file__.html  header.html.erb + footer.html.erb
-__file__.svg   gradient.svg.erb
-__file__.css   style.css.erb
-

data/templates/fullerscreen/footer.html.erb

@@ -1,3 +0,0 @@
-
-</body>
-</html>

data/templates/fullerscreen/header.html.erb

@@ -1,27 +0,0 @@
-<html>
-  <head>
-
-  <meta name="slideselector" content=".slide">
-  <meta name="titleselector" content="h1">
-  <meta name="stepselector" content=".step">
-
-    <title><%= @headers['title'] %></title>
-
-    <link title="Style" href="<%= "#{@name}.css" %>" type="text/css" rel="STYLESHEET">
-
-  </head>
-  <body>
-
-<div class="layout"> 
-  <div class="background">  
-    <object data="<%= "#{@name}.svg" %>" width="100%" height="100%"></object>
-  </div>    
-</div> 
-
-<div class="banner">
-   Turn this document into a (PowerPoint/KeyNote-style) slide show pressing F11.
-         (Free <a href="https://addons.mozilla.org/en-US/firefox/addon/4650">FullerScreen</a> Firefox addon required).
-         Learn more at the <a href="http://slideshow.rubyforge.org">Slide Show (S9)</a>
-         RubyForge project site.
-</div>
-