slideshow-models 2.5.0 → 3.0.0

data/lib/slideshow/commands/list.rb

@@ -8,14 +8,12 @@ class List
 
   include ManifestHelper
 
-### fix: remove opts, use config (wrapped!!)
   
-  def initialize( opts, config )
-    @opts    = opts
+  def initialize( config )
     @config  = config
   end
 
-  attr_reader :opts, :config
+  attr_reader :config
 
   def run
     home = Env.home

data/lib/slideshow/commands/plugins.rb

@@ -8,14 +8,12 @@ class Plugins
 
   include PluginHelper
 
-### fix: remove opts, use config (wrapped!!)
   
-  def initialize( opts, config )
-    @opts    = opts
+  def initialize( config )
     @config  = config
   end
 
-  attr_reader :opts, :config
+  attr_reader :config
 
   def run
     home = Env.home

data/lib/slideshow/commands/quick.rb

@@ -8,17 +8,14 @@ class Quick
 
   include ManifestHelper
 
-### fix: remove opts, use config (wrapped!!)
-
-  def initialize( opts, config )
-    @opts    = opts
+  def initialize( config )
     @config  = config
   end
 
-  attr_reader :opts, :config
+  attr_reader :config
 
   def run
-    manifest_name = opts.quick_manifest.gsub('.txt','').gsub('.quick','')  # make sure we get name w/o .quick and .txt extension
+    manifest_name = config.quick_manifest.gsub('.txt','').gsub('.quick','')  # make sure we get name w/o .quick and .txt extension
     
     ### todo:fix: always download quickstart templates (except welcome?)
     # how to make sure the won't go stale in the cache after the download?
@@ -39,7 +36,7 @@ class Quick
     end
     
     manifestsrc = matches[0][1]
-    pakpath     = opts.output_path
+    pakpath     = config.output_path
  
     logger.debug( "manifestsrc=>#{manifestsrc}<, pakpath=>#{pakpath}<" )
     
@@ -85,4 +82,4 @@ class Quick
   end # method fetch_pak
 
 end # class GenTemplates
-end # module Slideshow
+end # module Slideshow

data/lib/slideshow/config.rb

@@ -10,19 +10,17 @@ class Config
     @opts   = opts
   end
 
-  attr_reader :opts
+  ## -- todo: allow (direct) access to opts - why? why not? 
+  ## attr_reader :opts
 
-  def header_level
-    @opts.header_level
-  end
-  
-  def slide?
-    @opts.slide?
-  end
-  
-  def takahashi?
-    @opts.takahashi?
-  end
+  def manifest()        @opts.manifest;       end
+  def quick_manifest()  @opts.quick_manifest; end
+  def header_level()    @opts.header_level;   end
+  def slide?()          @opts.slide?;         end
+  def takahashi?()      @opts.takahashi?;     end
+  def test?()           @opts.test?;          end    ## in test mode (yes/no) - will (auto-)include test templates
+  def verbose?()        @opts.verbose?;       end
+  def output_path()     @opts.output_path;    end
 
 
   # todo/fix: fix references after this move to here, that is, Config class
@@ -34,7 +32,7 @@ class Config
 
   def config_dir
     unless @config_dir  # first time? calculate config_dir value to "cache"
-      @config_dir = opts.config_path
+      @config_dir = @opts.config_path
     
       # make sure path exists
       FileUtils.makedirs( @config_dir ) unless File.directory? @config_dir
@@ -163,43 +161,6 @@ class Config
     @props.fetch_from_section( 'headers', normalize_key( key ), nil )
   end
 
-
-  def markdown_post_processing?( lib )
-    ## todo: normalize key/lib???
-    @props.fetch_from_section( lib, 'post-processing', true )
-  end
-  
-  def known_rest_extnames
-    @props.fetch_from_section( 'rest', 'extnames', [] )
-  end
-  
-  def known_textile_extnames
-    @props.fetch_from_section( 'textile', 'extnames', [] )
-  end
-
-  def known_mediawiki_extnames
-    @props.fetch_from_section( 'mediawiki', 'extnames', [] )
-  end
-
-  def known_markdown_extnames
-    ## delegate config to Markdown gem for now
-    ## todo/fix: how to pass on setting to Markdown gem??
-    Markdown.extnames
-  end
-  
-  def known_extnames
-    # returns an array of known file extensions e.g.
-    # [ '.textile', '.t' ]
-    #
-    # using nested key
-    # textile:
-    #   extnames:  [ .textile, .t ]
-    #
-    # ruby check: is it better self. ?? or more confusing
-    #  possible conflict only with write access (e.g. prop=) 
-    
-    known_textile_extnames + known_markdown_extnames + known_mediawiki_extnames + known_rest_extnames
-  end
   
   def text_filters
     @props.fetch( 'filters', [] )

data/lib/slideshow/drops.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+module Slideshow
+
+class HeadersDrop < Liquid::Drop
+
+  def initialize( headers )
+    @headers = headers
+  end
+
+  def before_method( method )
+    ## note: assume returned value is always a string or nil (if key not found)
+    puts "  call HeadersDrop#before_method >#{method}< : #{method.class}"
+    value = @headers[ method ]
+    value
+  end
+
+end # class HeadersDrop
+
+
+class SlideDrop < Liquid::Drop
+
+  def initialize( slide )
+    @slide = slide
+  end
+
+  def content()                 puts "  call SlideDrop#content";             @slide.content; end
+  def content_without_header()  puts "  call SlideDrop#content_w/o_header";  @slide.content_without_header;  end
+  def header()                  puts "  call SlideDrop#header";              @slide.header; end
+  def classes()                 puts "  call SlideDrop#classes";             @slide.classes; end
+  def data_attributes()         puts "  call SlideDrop#data_attributes";     @slide.data_attributes; end
+end ## class SlideDrop
+
+
+end # module Slideshow

data/lib/slideshow/filters/debug_filter.rb

@@ -11,7 +11,7 @@ def dump_content_to_file_debug_text_erb( content )
   #   - opts
   #   - outdir
 
-  return content   unless opts.verbose?
+  return content   unless config.verbose?
 
   outname = "#{outdir}/#{@name}.debug.text.erb"
 
@@ -32,7 +32,7 @@ def dump_content_to_file_debug_html( content )
   #   - opts
   #   - outdir
 
-  return content   unless opts.verbose?
+  return content   unless config.verbose?
 
   outname = "#{outdir}/#{@name}.debug.html"
 
@@ -53,7 +53,7 @@ def dump_content_to_file_debug_text( content )
   #   - opts
   #   - outdir
 
-  return content   unless opts.verbose?
+  return content   unless config.verbose?
 
   outname = "#{outdir}/#{@name}.debug.text"
 

data/lib/slideshow/filters/slide_filter.rb

@@ -38,73 +38,6 @@ module Slideshow
     content
   end
 
-
-# add slide directive before h1 (tells slideshow gem where to break slides)
-#
-# e.g. changes:
-# <h1 id='optional' class='optional'>
-#  to
-#  html comment -> _S9SLIDE_ (note: rdoc can't handle html comments?) 
-# <h1 id='optional' class='optional'>
-
-def add_slide_directive_before_h1( content )
-
-  # mark h1 for getting wrapped into slide divs
-  # note: use just <h1 since some processors add ids e.g. <h1 id='x'>
-
-  slide_count = 0
-
-  content.gsub!( /<h1/ ) do |match|
-    slide_count += 1
-    "\n<!-- _S9SLIDE_ -->\n#{Regexp.last_match(0)}"
-  end
-  
-  puts "  Adding #{slide_count} slide breaks (using h1 rule)..."
-  
-  content
-end
-
-def add_slide_directive_before_h2( content )
-
-  slide_count = 0
-
-  content.gsub!( /<h2/ ) do |match|
-    slide_count += 1
-    "\n<!-- _S9SLIDE_ -->\n#{Regexp.last_match(0)}"
-  end
-  
-  puts "  Adding #{slide_count} slide breaks (using h2 rule)..."
-  
-  content
-end
-
-
-
-# add slide directive before div h1 (for pandoc-generated html)
-#
-# e.g. changes:
-# <div id='header'>
-# <h1 id='optional' class='optional'>
-#  to
-#  html comment -> _S9SLIDE_ 
-# <div id='header'>
-# <h1 id='optional' class='optional'>
-
-
-def add_slide_directive_before_div_h1( content )
-
-  slide_count = 0
-
-  content.gsub!( /<div[^>]*>\s*<h1/ ) do |match|
-    slide_count += 1
-    "\n<!-- _S9SLIDE_ -->\n#{Regexp.last_match(0)}" 
-  end
-
-  puts "  Adding #{slide_count} slide breaks (using div_h1 rule)..."
-
-  content
-end
-
   
 end  # module SlideFilter
 end # module Slideshow
@@ -112,3 +45,4 @@ end # module Slideshow
 class Slideshow::Gen
   include Slideshow::SlideFilter
 end
+

data/lib/slideshow/filters/text_filter.rb

@@ -10,16 +10,6 @@ module Slideshow
 
   include TextUtils::Filter    # include comments_percent_style, skip_end_directive, etc. filters 
 
-  alias_method :old_comments_percent_style, :comments_percent_style
-
-  def comments_percent_style( content )
-
-    # skip filter for pandoc
-    # - pandoc uses % for its own markdown extension
-    return content  if @markup_type == :markdown && Markdown.lib == 'pandoc-ruby'
-    
-    old_comments_percent_style( content )
-  end
 
 def directives_bang_style_to_percent_style( content )
 
@@ -41,14 +31,7 @@ def directives_bang_style_to_percent_style( content )
 end
 
 def directives_percent_style( content )
-
-  # skip filter for pandoc
-  # - pandoc uses % for its own markdown extension
-  # - don't process % pass it along/through to pandoc
-
-  return content  if @markup_type == :markdown && Markdown.lib == 'pandoc-ruby'
-    
-    
+        
   directive_unparsed  = 0
   directive_expr      = 0
   directive_block_beg = 0

data/lib/slideshow/helpers/background_helper.rb

@@ -113,6 +113,7 @@ def background( *args  )
   "<!-- _S9STYLE_ #{clazz} -->\n"
 end 
 
+
 def color( *args  )
   
  # make everyting optional; use it like: 

data/lib/slideshow/helpers/step_helper.rb

@@ -11,7 +11,7 @@ def step( opts={}, &blk )
   text = capture_erb(&blk)
       
   before  = "<!-- begin step #{opts.inspect} -->\n"
-  before << "<div class='step' markdown='block'>\n"
+  before << "<div class='step' markdown='1'>\n"
   
   after   = "</div>\n"  
   after  << "<!-- end step -->\n"

data/lib/slideshow/manifest_helpers.rb

@@ -39,6 +39,9 @@ module ManifestHelper
     builtin_patterns = []
     builtin_patterns << "#{SlideshowTemplates.root}/templates/*.txt"  if defined?( SlideshowTemplates )
 
+    test_patterns = []
+    test_patterns << "#{Slideshow.root}/test/templates/*/*.txt"
+
     config_patterns  = [
       "#{config.config_dir}/templates/*.txt",
       "#{config.config_dir}/templates/*/*.txt"
@@ -51,6 +54,7 @@ module ManifestHelper
 
     patterns = []
     patterns += current_patterns
+    patterns += test_patterns      if config.test?    ## (auto-)add test templates in test mode
     patterns += config_patterns
     patterns += builtin_patterns
   end

data/lib/slideshow/markdown.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+module Slideshow
+  module MarkdownEngines
+
+  ## note: for now keep it simple use just kramdown
+  
+  def markdown_to_html( content )    
+    ## note: set to gfm (github-flavored markdown) by default
+    ##   see http://kramdown.gettalong.org/parser/gfm.html
+    kramdown_config = {
+      'input'     => 'GFM',
+      'hard_wrap' => false
+    }
+
+    puts "  Converting markdown-text (#{content.length} bytes) to HTML using kramdown library with #{kramdown_config.inspect}..."
+    
+    Kramdown::Document.new( content, kramdown_config ).to_html
+  end
+
+end   # module MarkdownEngines
+end # module Slideshow
+
+class Slideshow::Gen
+  include Slideshow::MarkdownEngines
+end
+

data/lib/slideshow/models.rb

@@ -19,12 +19,9 @@ require 'fileutils'
 require 'active_support/all'
 
 require 'props'             # manage settings/env
-require 'logutils'       # logger utils library
-
-require 'markdown'          # default markdown library
+require 'logutils'          # logger utils library
 require 'fetcher'           # fetch docs and blogs via http, https, etc.
 
-
 class Env
   def self.slideshowopt
     ENV[ 'SLIDESHOWOPT' ]
@@ -34,14 +31,20 @@ end # class Env
 require 'textutils'     # text filters and helpers
 require 'pakman'        # template pack manager
 
+require 'kramdown'          # default markdown library
+
 
 # our own code
 require 'slideshow/version'   # note: let version always go first
-require 'slideshow/headers'
+require 'slideshow/opts'
 require 'slideshow/config'
+require 'slideshow/headers'
 require 'slideshow/manifest_helpers'
 require 'slideshow/plugin_helpers'
-require 'slideshow/slide'
+require 'slideshow/models/slide'
+require 'slideshow/models/deck'
+require 'slideshow/markdown'
+require 'slideshow/drops'
 
 require 'slideshow/commands/fetch'
 require 'slideshow/commands/gen'
@@ -50,11 +53,6 @@ require 'slideshow/commands/plugins'
 require 'slideshow/commands/quick'
 
 
-require 'slideshow/markup/markdown'
-require 'slideshow/markup/mediawiki'
-require 'slideshow/markup/textile'
-
-
 # load built-in (required) helpers/plugins
 require 'slideshow/helpers/text_helper'
 require 'slideshow/helpers/capture_helper'
@@ -62,7 +60,6 @@ require 'slideshow/helpers/step_helper'
 require 'slideshow/helpers/background_helper'
 require 'slideshow/helpers/source_helper'
 require 'slideshow/helpers/directive_helper'
-require 'slideshow/helpers/markdown_helper'
 
 require 'slideshow/helpers/syntax/sh_helper'
 
@@ -82,7 +79,6 @@ require 'slideshow/filters/slide_filter'
 BUILTIN_OPT_HELPERS = [
   'slideshow/helpers/syntax/uv_helper.rb',
   'slideshow/helpers/syntax/coderay_helper.rb',
-  'slideshow/markup/rest.rb',
 ]
 
 BUILTIN_OPT_HELPERS.each do |helper|