slideshow 0.9.3 → 0.9.4

data/lib/slideshow.rb

@@ -51,7 +51,7 @@ require 'slideshow/filters/slide_filter'
 
 module Slideshow
 
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 
   # version string for generator meta tag (includes ruby version)
   def Slideshow.generator

data/lib/slideshow/config.rb

@@ -28,8 +28,34 @@ class Config
     
     # for now builtin has no erb processing; add builtin hash to main hash 
     @hash[ 'builtin' ] = YAML.load_file( config_builtin_file )
+    
+    # todo/fix: merge config files
+    #   check more locations
+
+    # check for user settings in working folder (check for slideshow.yml)
+    
+    config_user_file = "./slideshow.yml"
+    if File.exists?( config_user_file )
+      puts "Loading settings from '#{config_user_file}'..."
+      @hash[ 'user' ] = YAML.load_file( config_user_file )   
+    end    
+     
   end
 
+  def markdown_to_html_method( lib )    
+    method = @hash.fetch( 'user', {} ).fetch( lib, {} ).fetch( 'converter', nil )
+    
+    # use default name
+    if method.nil?
+      method = "#{lib.downcase}_to_html"
+    end
+    
+    method.tr('-','_').to_sym
+  end
+  
+  def markdown_post_processing?( lib )
+    @hash.fetch( 'user', {} ).fetch( lib, {} ).fetch( 'post-processing', true )
+  end
   
   def known_textile_extnames
     # returns an array of known file extensions e.g.
@@ -39,18 +65,21 @@ class Config
     # textile:
     #   extnames:  [ .textile, .t ]
     
-    (@hash[ 'textile' ][ 'extnames' ] || []) + @hash[ 'builtin' ][ 'textile' ][ 'extnames' ] 
+    @hash[ 'textile' ][ 'extnames' ] + @hash[ 'builtin' ][ 'textile' ][ 'extnames' ] 
   end
 
   def known_markdown_extnames
-    (@hash[ 'markdown' ][ 'extnames' ] || []) + @hash[ 'builtin' ][ 'markdown' ][ 'extnames' ]   
+    @hash[ 'markdown' ][ 'extnames' ] + @hash[ 'builtin' ][ 'markdown' ][ 'extnames' ]   
   end
   
   def known_markdown_libs
     # returns an array of known markdown engines e.g.
     # [ pandoc-ruby, rdiscount, rpeg-markdown, maruku, bluecloth, kramdown ]
     
-    (@hash[ 'markdown' ][ 'libs' ] || []) + @hash[ 'builtin' ][ 'markdown' ][ 'libs' ]
+    libs      = @hash[ 'markdown' ][ 'libs' ] + @hash[ 'builtin' ][ 'markdown' ][ 'libs' ]
+    user_libs = @hash.fetch( 'user', {} ).fetch( 'markdown', {} ).fetch( 'libs', [] )
+    
+    user_libs + libs
   end
 
   def known_extnames
@@ -61,11 +90,11 @@ class Config
   end
   
   def text_filters
-    @hash[ 'builtin' ][ 'filters' ] + ( @hash[ 'filters' ] || [] ) 
+    @hash[ 'builtin' ][ 'filters' ] + @hash[ 'filters' ]
   end
   
   def helper_renames
-     @hash[ 'builtin' ][ 'helper' ][ 'renames' ] + ( @hash[ 'helper' ][ 'renames' ] || [] )
+     @hash[ 'builtin' ][ 'helper' ][ 'renames' ] + @hash[ 'helper' ][ 'renames' ]
   end
 
   def helper_unparsed
@@ -76,7 +105,7 @@ class Config
   def helper_exprs
     # allow expression as directives (no need for %end block)
     # by default directives are assumed statements (e.g. %mydir  %end)
-    @hash[ 'builtin' ][ 'helper' ][ 'exprs' ] + ( @hash[ 'helper' ][ 'exprs' ] || [] )
+    @hash[ 'builtin' ][ 'helper' ][ 'exprs' ] + @hash[ 'helper' ][ 'exprs' ]
   end
 
   def google_analytics_code

data/lib/slideshow/filters/slide_filter.rb

@@ -1,6 +1,7 @@
 module Slideshow
   module SlideFilter
 
+
 # add slide directive before h1 (tells slideshow gem where to break slides)
 #
 # e.g. changes:

data/lib/slideshow/filters/text_filter.rb

@@ -17,7 +17,7 @@ def directives_bang_style_to_percent_style( content )
   
   content.gsub!(/^!(#{unparsed})(.*)$/) do |match|
     bang_count += 1
-    "<%= #{$1.downcase} '#{$2}' %>"
+    "<%= #{$1.downcase} '#{$2 ? $2 : ''}' %>"
   end
 
   puts "  Patching !-directives (#{bang_count} #{config.helper_unparsed.join('/')}-directives)..."

data/lib/slideshow/gen.rb

@@ -40,11 +40,12 @@ class Gen
   def markdown_to_html( content )
     # call markdown filter; turn markdown lib name into method_name (mn)
     # eg. rpeg-markdown =>  rpeg_markdown_to_html
+
+    # lets you use differnt options/converters for a single markdown lib
+    mn = config.markdown_to_html_method( @markdown_libs.first )    
+    
+    puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library '#{@markdown_libs.first}' calling '#{mn}'..."
     
-    puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library '#{@markdown_libs.first}'..."
-        
-    mn = @markdown_libs.first.downcase.tr( '-', '_' )
-    mn = "#{mn}_to_html".to_sym
     send mn, content   # call 1st configured markdown engine e.g. kramdown_to_html( content )
   end
 
@@ -424,6 +425,93 @@ class Gen
     end
   end
 
+  # move into a filter??
+  def post_processing_slides( content )
+    
+    # 1) add slide break  
+  
+    if @markup_type == :markdown && @markdown_libs.first == 'pandoc-ruby'
+      content = add_slide_directive_before_div_h1( content )
+    else
+      content = add_slide_directive_before_h1( content )
+    end
+
+    dump_content_to_file_debug_html( content )
+
+    # 2) use generic slide break processing instruction to
+    #   split content into slides
+
+    slide_counter = 0
+
+    slides       = []
+    slide_source = ""
+     
+    content.each_line do |line|
+       if line.include?( '<!-- _S9SLIDE_' )  then
+          if slide_counter > 0 then   # found start of new slide (and, thus, end of last slide)
+            slides   << slide_source  # add slide to slide stack
+            slide_source = ""         # reset slide source buffer
+          end
+          slide_counter += 1
+       end
+       slide_source  << line
+    end
+  
+    if slide_counter > 0 then
+      slides   << slide_source     # add slide to slide stack
+      slide_source = ""            # reset slide source buffer 
+    end
+
+    ## split slide source into header (optional) and content/body
+    ## plus check for (css style) classes
+
+    slides2 = []
+    slides.each do |slide_source|
+      slide = Slide.new
+
+      ## 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
+       
+       # try to cut off header using non-greedy .+? pattern; tip test regex online at rubular.com
+       #  note/fix: needs to get improved to also handle case for h1 wrapped into div
+       #    (e.g. extract h1 - do not assume it starts slide source)
+      if slide_source =~ /^\s*(<h1.*?>.*?<\/h\d>)\s*(.*)/m 
+        slide.header  = $1
+        slide.content = ($2 ? $2 : "")
+        logger.debug "  adding slide with header:\n#{slide.header}"
+      else
+        slide.content = slide_source
+        logger.debug "  adding slide with *no* header:\n#{slide.content}"
+      end
+      slides2 << slide
+    end
+
+     # for convenience create a string w/ all in-one-html
+     #  no need to wrap slides in divs etc.
+   
+     content2 = ""
+     slides2.each do |slide|         
+        content2 << slide.to_classic_html
+     end
+   
+    # make content2 and slide2 available to erb template
+    # -- todo: cleanup variable names and use attr_readers for content and slide
+  
+    @slides   = slides2     # strutured content 
+    @content  = content2   # content all-in-one    
+  end
+
 
   def create_slideshow( fn )
 
@@ -524,89 +612,17 @@ class Gen
 
   # post-processing
 
-  # 1) add slide break  
+  # make content2 and slide2 available to erb template
+    # -- todo: cleanup variable names and use attr_readers for content and slide
   
-  if @markup_type == :markdown && @markdown_libs.first == 'pandoc-ruby'
-    content = add_slide_directive_before_div_h1( content )
+  if @markup_type == :markdown && config.markdown_post_processing?( @markdown_libs.first ) == false
+    puts "  Skipping post-processing (passing content through as is)..."
+    @content = content  # content all-in-one - make it available in erb templates
   else
-    content = add_slide_directive_before_h1( content )
+    # sets @content (all-in-one string) and @slides (structured content; split into slides)
+    post_processing_slides( content )
   end
 
-  dump_content_to_file_debug_html( content )
-
-  # 2) use generic slide break processing instruction to
-  #   split content into slides
-
-    slide_counter = 0
-
-    slides       = []
-    slide_source = ""
-     
-    content.each_line do |line|
-       if line.include?( '<!-- _S9SLIDE_' )  then
-          if slide_counter > 0 then   # found start of new slide (and, thus, end of last slide)
-            slides   << slide_source  # add slide to slide stack
-            slide_source = ""         # reset slide source buffer
-          end
-          slide_counter += 1
-       end
-       slide_source  << line
-    end
-  
-    if slide_counter > 0 then
-      slides   << slide_source     # add slide to slide stack
-      slide_source = ""            # reset slide source buffer 
-    end
-
-    ## split slide source into header (optional) and content/body
-    ## plus check for (css style) classes
-
-    slides2 = []
-    slides.each do |slide_source|
-      slide = Slide.new
-
-      ## 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
-       
-       # try to cut off header using non-greedy .+? pattern; tip test regex online at rubular.com
-       #  note/fix: needs to get improved to also handle case for h1 wrapped into div
-       #    (e.g. extract h1 - do not assume it starts slide source)
-      if slide_source =~ /^\s*(<h1.*?>.*?<\/h\d>)\s*(.*)/m 
-        slide.header  = $1
-        slide.content = ($2 ? $2 : "")
-        logger.debug "  adding slide with header:\n#{slide.header}"
-      else
-        slide.content = slide_source
-        logger.debug "  adding slide with *no* header:\n#{slide.content}"
-      end
-      slides2 << slide
-    end
-
-     # for convenience create a string w/ all in-one-html
-     #  no need to wrap slides in divs etc.
-   
-     content2 = ""
-     slides2.each do |slide|         
-        content2 << slide.to_classic_html
-     end
-   
-    # make content2 and slide2 available to erb template
-    # -- todo: cleanup variable names and use attr_readers for content and slide
-  
-    @slides   = slides2     # strutured content 
-    @content  = content2   # content all-in-one
-
 
   manifest.each do |entry|
     outname = entry[0]

data/lib/slideshow/markdown.rb

@@ -3,7 +3,31 @@ module Slideshow
 
   def pandoc_ruby_to_html( content )
     content = PandocRuby.new( content, :from => :markdown, :to => :html ).convert
-    content.gsub( /class="incremental"/, 'class="step"' )
+  end
+  
+  def pandoc_ruby_to_html_incremental( content )
+    content = PandocRuby.new( content, :from => :markdown, :to => :html ).convert
+    content = content.gsub(/<(ul|ol)/) do |match|
+      "#{Regexp.last_match(0)} class='step'"
+    end
+    content
+  end
+  
+  # sample how to use your own converter
+  # configure in slideshow.yml
+  # pandoc-ruby:
+  #  converter: pandoc-ruby-to-s5
+  
+  def pandoc_ruby_to_s5( content )
+    content = PandocRuby.new( content, {:from => :markdown, :to => :s5}, :smart ).convert
+    content = content.gsub(/class="incremental"/,'class="step"')
+    # content = content.to_a[13..-1].join # remove the layout div
+  end
+
+  def pandoc_ruby_to_s5_incremental( content )
+    content = PandocRuby.new( content, {:from => :markdown, :to => :s5 }, :incremental, :smart ).convert
+    content = content.gsub(/class="incremental"/,'class="step"')
+    # content = content.to_a[13..-1].join # remove the layout div
   end
 
   def rdiscount_to_html( content )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +02:00
+date: 2010-07-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency