slideshow 0.9.1 → 0.9.2

data/lib/slideshow/gen.rb

@@ -60,11 +60,29 @@ class Gen
   end
  
   def guard_text( text )
+    # todo/fix 2: note for Textile we need to differentiate between blocks and inline
+    #   thus, to avoid runs - use guard_block (add a leading newline to avoid getting include in block that goes before)
+    
     # todo/fix: remove wrap_markup; replace w/ guard_text
     #   why: text might be css, js, not just html      
     wrap_markup( text )
   end
    
+  def guard_block( text )
+    if markup_type == :textile
+      # saveguard with notextile wrapper etc./no further processing needed
+      # note: add leading newlines to avoid block-runons
+      "\n\n<notextile>\n#{text}\n</notextile>\n"
+    else
+      text
+    end    
+  end
+  
+  def guard_inline( text )
+    wrap_markup( text )
+  end
+  
+   
   def wrap_markup( text )    
     if markup_type == :textile
       # saveguard with notextile wrapper etc./no further processing needed
@@ -479,7 +497,10 @@ class Gen
   
   # shared variables for templates (binding)
   @content_for = {}  # reset content_for hash
+
   @name        = basename
+  @extname     = extname
+
   @headers     = @opts  # deprecate/remove: use headers method in template
 
   @session     = {}  # reset session hash for plugins/helpers
@@ -490,11 +511,6 @@ class Gen
     
   content = File.read( inname )
 
-  # fix: add to comment text filter as first rule!!
-  # check for !SLIDE alias %slide (needs to get coverted to ! otherwise
-  #   it gets removed as a comment)
-  content.gsub!(/^%slide/, '!SLIDE' )
-
   # run text filters
   
   config.text_filters.each do |filter|
@@ -502,20 +518,6 @@ class Gen
     content = send( mn, content )   # call filter e.g.  include_helper_hack( content )  
   end
 
-  # check for !SLIDE markers; change to HTML comments
-  
-  # -- slide marker stats
-  slide_markers = 0
-  
-  ## todo: use html processing instruction <?s9 slide ?>
-  content.gsub!(/^!SLIDE(.*)/ ) do |match|
-    slide_markers += 1
-    "<!-- _S9SLIDE_ #{$1} -->"
-  end
-  
-  puts "  Processing directives (#{slide_markers} !SLIDE-directives)..."
-
-
   # convert light-weight markup to hypertext
  
   content = text_to_html( content )
@@ -545,16 +547,24 @@ class Gen
   end
 
   ## split slide source into header (optional) and content/body
-  ## plus check for classes
+  ## plus check for (css style) classes
 
   slides2 = []
   slides.each do |slide_source|
     slide = Slide.new
-    
-    ## check for css style class
-    if slide_source =~ /<!-- _S9SLIDE_(.*?)-->/
-      slide.classes = $1.strip
-      logger.debug "  adding css classes: #{slide.classes}"
+
+    ## check for css style classes    
+    from = 0
+    while (pos = slide_source.index( /<!-- _S9(SLIDE|STYLE)_(.*?)-->/m, from ))
+      logger.debug "  adding css classes from pi #{$1.downcase}: #{$2.strip}"
+
+      if slide.classes.nil?
+        slide.classes = $2.strip
+      else
+        slide.classes << " #{$2.strip}"
+      end
+      
+      from = Regexp.last_match.end(0)
     end
        
     if slide_source =~ /^\s*(<h1.*?>.*?<\/h\d>)\s*(.*)/m  # try to cut off header using non-greedy .+? pattern; tip test regex online at rubular.com

data/lib/slideshow/helpers/analytics_helper.rb

@@ -1,4 +1,5 @@
-module AnalyticsHelper
+module Slideshow
+  module AnalyticsHelper
   
   
 def google_analytics( opts = {} )
@@ -27,13 +28,15 @@ def google_analytics( opts = {} )
 <!-- end google-analytics -->
 EOS
 
-  guard_text( text )             
+  guard_block( text )             
 end
   
   
-end # module AnalyticsHelper
+end #   module AnalyticsHelper
+end # module Slideshow
+
 
 class Slideshow::Gen
-  include AnalyticsHelper
+  include Slideshow::AnalyticsHelper
 end
 

data/lib/slideshow/helpers/background_helper.rb

@@ -0,0 +1,91 @@
+module Slideshow
+  module BackgroundHelper
+
+
+def gradient( *args )
+
+  # check for optional hash for options
+  opts = args.last.kind_of?(Hash) ? args.pop : {}
+
+  colors = args
+
+  clazz = opts[:class] || ( 's9_gradient_linear_'+colors.join('_').gsub( /[(), ]/, '_' ).gsub( /_{2,}/, '_').gsub( /[^-\w]/, '' ) )
+
+  ## generate code for webkit
+
+  webkit  = ""
+  webkit << "-webkit-gradient(linear, 0% 0%, 0% 100%, "
+  webkit << "from(#{colors.first}), to(#{colors.last})"
+  
+  # check for additional stop colors
+  more_colors = colors[ 1..-2 ] 
+  more_colors.each_with_index do |color, i|
+    webkit << ", color-stop(#{(1.0/(more_colors.size+1))*(i+1)},#{color})"     
+  end 
+  webkit  << ")"
+
+  ## generate code for mozilla
+
+  mozilla  = ""
+  mozilla << "-moz-linear-gradient(top, "
+  mozilla << "#{colors.first}, "  
+
+  # check for additional stop colors
+  more_colors = colors[ 1..-2 ] 
+  more_colors.each do |color|
+    mozilla << "#{color}, "     
+  end 
+
+  mozilla << "#{colors.last})"
+ 
+
+  puts "  Adding CSS for background style rule..."  
+  content_for( :css, <<-EOS )
+    .#{clazz} { background: #{webkit};
+                background: #{mozilla};
+              }
+  EOS
+
+  # add processing instruction to get style class added to slide 
+
+  puts "  Adding HTML PI for background style class '#{clazz}'..."    
+  "<!-- _S9STYLE_ #{clazz} -->\n"
+end
+
+def background( *args  )
+  
+ # make everyting optional; use it like: 
+ #   background( code, opts={} )
+  
+  # check for optional hash for options
+  opts = args.last.kind_of?(Hash) ? args.pop : {}
+
+  # check for optional style rule code
+  code = args.last.kind_of?(String) ? args.pop : '' 
+    
+  clazz = opts[:class] || ( 's9'+code.strip.gsub( /[(), ]/, '_' ).gsub( /_{2,}/, '_').gsub( /[^-\w]/, '' ) )
+  
+  # 1) add background rule to css 
+  # e.g. .simple { background: -moz-linear-gradient(top, blue, white); }
+  
+  unless code.empty?
+    puts "  Adding CSS for background style rule..."  
+    content_for( :css, <<-EOS )
+      .#{clazz} { background: #{code}; }
+    EOS
+  end
+  
+  # 2) add processing instruction to get style class added to slide 
+
+  puts "  Adding HTML PI for background style class '#{clazz}'..."    
+  "<!-- _S9STYLE_ #{clazz} -->\n"
+end 
+
+    
+  
+end # module BackgroundHelper
+end # module Slideshow
+
+class Slideshow::Gen
+  include Slideshow::BackgroundHelper
+end

data/lib/slideshow/helpers/capture_helper.rb

@@ -1,6 +1,7 @@
 # Originally based on code from Rails and Merb; adapted from Webby.
 
-module CaptureHelper
+module Slideshow
+  module CaptureHelper
  
   # Called in pages and partials to store up content for later use. Takes a
   # string and/or a block. First, the string is evaluated, and then the
@@ -130,5 +131,6 @@ module CaptureHelper
   end
  
 end  # module CaptureHelper
+end # module Slideshow 
  
-Slideshow::Gen.__send__( :include, CaptureHelper )
+Slideshow::Gen.__send__( :include, Slideshow::CaptureHelper )

data/lib/slideshow/helpers/directive_helper.rb

@@ -0,0 +1,42 @@
+module Slideshow
+  module DirectiveHelper
+
+# css directive:
+#
+# lets you use:
+#   %css
+#     -- inline css code here
+#   %end
+#
+# shortcut for:
+#   %content_for :css
+#     -- inline css code here
+#   %end
+#  or
+#  <% content_for :css do %>
+#    -- inline css code here
+#  <% end %>
+
+def css( &block )
+  content_for( :css, nil, &block )
+end
+    
+def slide( params )
+  "<!-- _S9SLIDE_ #{params ? params : ''} -->"         
+end
+
+def style( params )
+  "<!-- _S9STYLE_ #{params ? params : ''} -->"         
+end
+    
+    
+  
+end # module DirectiveHelper
+end # module Slideshow
+
+class Slideshow::Gen
+  include Slideshow::DirectiveHelper
+end
+
+
+

data/lib/slideshow/helpers/markdown_helper.rb

@@ -0,0 +1,18 @@
+module Slideshow
+  module MarkdownHelper
+
+def s9_class( clazz )
+  "{: .#{clazz.strip}}"
+end
+
+def clear
+  "{: .clear}"
+end
+
+
+end # module MarkdownHelper
+end # module Slideshow
+
+class Slideshow::Gen
+  include Slideshow::MarkdownHelper
+end

data/lib/slideshow/helpers/source_helper.rb

@@ -0,0 +1,39 @@
+module Slideshow
+  module SourceHelper
+
+
+def source( *args )
+
+ # make everyting optional; use it like: 
+ #   source( name_or_path, opts={} )
+
+ # check for optional hash for options
+ opts = args.last.kind_of?(Hash) ? args.pop : {}
+
+ # check for optional name or path
+ name_or_path = args.last.kind_of?(String) ? args.pop : "#{@name}#{@extname}" 
+
+ link_text   = opts[:text] || '(Source)' 
+ 
+ # add extra path (e.g. 3rd) if present
+ name_or_path = "#{opts[:path]}/#{name_or_path}"   if opts[:path]
+ 
+ # add file extension if missing (for convenience)
+ name_or_path << @extname   if File.extname( name_or_path ).empty?
+
+  base = 'http://github.com/geraldb/slideshow/raw/master/samples'
+
+  buf = "<a href='#{base}/#{name_or_path}'>#{link_text}</a>"
+  
+  puts "  Adding HTML for source link to '#{name_or_path}'..."      
+  
+  guard_inline( buf )      
+end
+    
+  
+end # module SourceHelper
+end # module Slideshow
+
+class Slideshow::Gen
+  include Slideshow::SourceHelper
+end

data/lib/slideshow/helpers/step_helper.rb

@@ -1,4 +1,5 @@
-module StepHelper
+module Slideshow
+  module StepHelper
 
   
 def step( opts={}, &blk )
@@ -14,9 +15,9 @@ def step( opts={}, &blk )
   after  << "<!-- end step -->\n"
 
   html  = ""
-  html << guard_text( before )
+  html << guard_block( before )
   html << text
-  html << guard_text( after )
+  html << guard_block( after )
 
   concat_erb( html, blk.binding )
   return
@@ -24,8 +25,9 @@ end
   
   
 end # module StepHelper
+end # module Slideshow
 
 class Slideshow::Gen
-  include StepHelper
+  include Slideshow::StepHelper
 end
 

data/lib/slideshow/helpers/{coderay_helper.rb → syntax/coderay_helper.rb}

@@ -1,6 +1,8 @@
 require 'coderay'
 
-module CodeRayHelper
+module Slideshow
+ module Syntax 
+  module CodeRayHelper
 
   # coderay option defaults
   CR_LANG         = 'ruby'
@@ -73,6 +75,10 @@ def coderay( *args, &blk )
   return
 end
 
-end # module CodeRayHelper
+end # module   CodeRayHelper
+end # module  Syntax
+end # module Slideshow
 
-Slideshow::Gen.__send__( :include, CodeRayHelper )
+class Slideshow::Gen
+  include Slideshow::Syntax::CodeRayHelper
+end

data/lib/slideshow/helpers/syntax/sh_helper.rb

@@ -0,0 +1,48 @@
+module Slideshow
+ module Syntax
+  module ShHelper
+
+  # sh option defaults
+  SH_LANG         = 'ruby'
+  SH_LINE_NUMBERS = 'true'
+
+def sh_worker( code, opts )
+  
+  lang         = opts.fetch( :lang, SH_LANG )  
+  line_numbers_value = opts.fetch( :line_numbers, headers.get( 'code-line-numbers', SH_LINE_NUMBERS ))
+  line_numbers = (line_numbers_value =~ /true|yes|on/i) ? true : false
+     
+  # note: code gets highlighted at runtime in client (using JavaScript)  
+  code_highlighted = CGI::escapeHTML( code )
+  
+  css_class = 'code'
+  css_class_opt = opts.fetch( :class, nil ) #  large, small, tiny, etc.
+  css_class << " #{css_class_opt}" if css_class_opt   # e.g. use/allow multiple classes -> code small, code large, etc.
+   
+  out =  %{<pre class='#{css_class} brush: #{lang} gutter: #{line_numbers ? 'true' : 'false'}'>}
+  out << code_highlighted
+  out << %{</pre>\n}
+    
+  return out 
+end  
+
+def sv( *args, &blk )   
+  # check for optional hash for options
+  opts = args.last.kind_of?(Hash) ? args.pop : {}
+   
+  code = capture_erb(&blk)
+  return if code.empty?
+    
+  code_highlighted = sv_worker( code, opts )
+    
+  concat_erb( guard_block( code_highlighted ), blk.binding )
+  return
+end  
+    
+end   # module ShHelper
+end  # module Syntax
+end # module Slideshow
+
+class Slideshow::Gen
+  include Slideshow::Syntax::ShHelper
+end

data/lib/slideshow/helpers/{uv_helper.rb → syntax/uv_helper.rb}

@@ -1,6 +1,8 @@
 require 'uv'
 
-module UvHelper
+module Slideshow
+ module Syntax
+  module UvHelper
 
   # uv option defaults
   UV_LANG         = 'ruby'
@@ -79,7 +81,10 @@ def uv( *args, &blk )
   return
 end  
     
-end # module UvHelper
-
-Slideshow::Gen.__send__( :include, UvHelper )
+end   # module UvHelper
+end  # module Syntax
+end # module Slideshow
 
+class Slideshow::Gen
+  include Slideshow::Syntax::UvHelper
+end