slideshow 1.2.1 → 1.2.2

data/lib/slideshow/cli/commands/fetch.rb

@@ -14,9 +14,19 @@ class Fetch
 
 
   def run
-    logger.debug "fetch_uri=#{opts.fetch_uri}"
+    if opts.fetch_all?
+      config.default_fetch_shortcuts.keys.each do |shortcut|
+        fetch_pak( shortcut )
+      end
+    else
+      fetch_pak( opts.fetch_uri )
+    end
+  end
+
+private
+  def fetch_pak( src )
     
-    src = opts.fetch_uri
+    logger.debug "src=>#{src}<"
     
     ## check for builtin shortcut (assume no / or \) 
     if src.index( '/' ).nil? && src.index( '\\' ).nil?

data/lib/slideshow/cli/commands/gen.rb

@@ -50,7 +50,7 @@ class Gen
       "\n\n<notextile>\n#{text}\n</notextile>\n"
     else
       text
-    end    
+    end
   end
   
   def guard_inline( text )
@@ -81,23 +81,28 @@ class Gen
     ERB.new( content ).result( the_binding )
   end
 
-  
+
 
   # move into a filter??
   def post_processing_slides( content )
     
-    # 1) add slide break  
+    # 1) add slide breaks
   
-    if (@markup_type == :markdown && Markdown.lib == 'pandoc-ruby') || @markup_type == :rest
-      content = add_slide_directive_before_div_h1( content )
-    else
-      if config.header_level == 2
-        content = add_slide_directive_before_h2( content )
-      else # assume level 1
-        content = add_slide_directive_before_h1( content )
+    if config.slide?  # only allow !SLIDE directives fo slide breaks?
+       # do nothing (no extra automagic slide breaks wanted)
+    else  
+      if (@markup_type == :markdown && Markdown.lib == 'pandoc-ruby') || @markup_type == :rest
+        content = add_slide_directive_before_div_h1( content )
+      else
+        if config.header_level == 2
+          content = add_slide_directive_before_h2( content )
+        else # assume level 1
+          content = add_slide_directive_before_h1( content )
+        end
       end
     end
 
+
     dump_content_to_file_debug_html( content )
 
     # 2) use generic slide break processing instruction to
@@ -106,43 +111,68 @@ class Gen
     slide_counter = 0
 
     slides       = []
-    slide_source = ""
+    slide_buf = ""
      
     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
+       if line.include?( '<!-- _S9SLIDE_' )
+          if slide_counter > 0   # found start of new slide (and, thus, end of last slide)
+            slides   << slide_buf  # add slide to slide stack
+            slide_buf = ""         # reset slide source buffer
+          else  # slide_counter == 0
+            # check for first slide with missing leading SLIDE directive (possible/allowed in takahashi, for example)
+            ##  remove html comments and whitspaces (still any content?)
+            ### more than just whitespace? assume its  a slide
+            if slide_buf.gsub(/<!--.*?-->/m, '').gsub( /[\n\r\t ]/, '').length > 0
+              logger.debug "add slide with missing leading slide directive >#{slide_buf}< with slide_counter == 0"
+              slides    << slide_buf
+              slide_buf = ""
+            else
+              logger.debug "skipping slide_buf >#{slide_buf}< with slide_counter == 0"
+            end
           end
           slide_counter += 1
        end
-       slide_source  << line
+       slide_buf  << line
     end
   
-    if slide_counter > 0 then
-      slides   << slide_source     # add slide to slide stack
-      slide_source = ""            # reset slide source buffer 
+    if slide_counter > 0
+      slides   << slide_buf     # add slide to slide stack
+      slide_buf = ""            # reset slide source buffer 
     end
 
 
     slides2 = []
-    slides.each do |slide_source|
-      slides2 << Slide.new( slide_source, config )
+    slides.each do |source|
+      slides2 << Slide.new( source, config )
     end
 
-     # for convenience create a string w/ all in-one-html
-     #  no need to wrap slides in divs etc.
+
+    puts "#{slides2.size} slides found:"
+    
+    slides2.each_with_index do |slide,i|
+      print "  [#{i+1}] "
+      if slide.header.present?
+        print slide.header
+      else
+        # remove html comments
+        print "-- no header -- | #{slide.content.gsub(/<!--.*?-->/m, '').gsub(/\n/,'$')[0..40]}"
+      end
+      puts
+    end
    
-     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
+
+    ### fix: use class SlideDeck or Deck?? for slides array?
+    
+    content2 = ""
+    slides2.each do |slide|
+      content2 << slide.to_classic_html
+    end
   
+    @content  = content2
     @slides   = slides2     # strutured content
-    @content  = content2   # content all-in-one
   end
 
 
@@ -228,6 +258,12 @@ class Gen
     content = send( mn, content )   # call filter e.g.  include_helper_hack( content )  
   end
 
+
+  if config.takahashi?
+    content = takahashi_slide_breaks( content )
+  end
+
+
   # convert light-weight markup to hypertext
 
   content = text_to_html( content )

data/lib/slideshow/cli/opts.rb

@@ -12,6 +12,25 @@ class Opts
     @header_level || 1
   end
 
+  def slide=(boolean)
+    @slide = boolean
+  end
+
+  def slide?
+    return false if @slide.nil?   # default slide flag is false
+    @slide == true
+  end
+
+  def takahashi=(boolean)
+    @takahashi = boolean
+  end
+
+  def takahashi?
+    return false if @takahashi.nil?   # default takahashi flag is false
+    @takahashi == true
+  end
+
+
   def quick=(boolean)
     @quick = boolean
   end
@@ -58,6 +77,14 @@ class Opts
     @list == true
   end
 
+ def fetch_all=(boolean)
+    @fetch_all = boolean
+  end
+  
+  def fetch_all?
+    return false if @fetch_all.nil?  # default fetch all flag is false
+    @fetch_all == true
+  end
 
   def fetch_uri=(value)
     @fetch_uri = value

data/lib/slideshow/cli/runner.rb

@@ -80,6 +80,14 @@ def run( args )
     cmd.on( '--h1', 'Set Header Level to 1 (default)' ) { opts.header_level = 1 }
     cmd.on( '--h2', 'Set Header Level to 2' ) { opts.header_level = 2 }
 
+    cmd.on( '--slide', 'Use only !SLIDE for slide breaks (Showoff Compatible)' ) do
+      opts.slide = true
+    end
+
+    cmd.on( '--takahashi', 'Allow // for slide breaks' ) do
+      opts.takahashi = true
+    end
+
 
     # ?? opts.on( "-s", "--style STYLE", "Select Stylesheet" ) { |s| $options[:style]=s }
         
@@ -89,6 +97,10 @@ def run( args )
       opts.fetch_uri = uri
     end
 
+    cmd.on( '--all', "Fetch Template Packs (#{config.default_fetch_shortcuts.keys.join(', ')})" ) do
+      opts.fetch_all = true
+    end
+
     cmd.on( '-l', '--list', 'List Installed Templates' ) { opts.list = true }
 
     cmd.on( '-c', '--config PATH', "Configuration Path (default is #{opts.config_path})" ) do |path|
@@ -207,7 +219,7 @@ EOS
     GenTemplates.new( logger, opts, config ).run  ###  todo: remove opts
   elsif opts.quick?
     Quick.new( logger, opts, config ).run  ### todo: remove opts
-  elsif opts.fetch?
+  elsif opts.fetch? || opts.fetch_all?
     Fetch.new( logger, opts, config ).run  ### todo: remove opts
   else
     load_plugins  # check for optional plugins/extension in ./lib folder

data/lib/slideshow/config.rb

@@ -12,6 +12,14 @@ class Config
   def header_level
     @opts.header_level
   end
+  
+  def slide?
+    @opts.slide?
+  end
+  
+  def takahashi?
+    @opts.takahashi?
+  end
 
   # todo/fix: fix references after this move to here, that is, Config class
   # - used in syntax/uv_helper (use config.cache_dir to access?)
@@ -73,11 +81,25 @@ class Config
     ## todo: add more config settings?
   end
 
-    
+
   def header( key )
     @props.fetch_from_section( 'headers', normalize_key( key ), nil )
   end
 
+  def default_fetch_shortcuts
+    fetch_shortcuts = @props_default.fetch( 'fetch', {} )
+    
+    fetch_shortcuts = fetch_shortcuts.clone
+    fetch_shortcuts.delete( 'fullerscreen' )  # obsolete (do not promote any longer)
+    fetch_shortcuts.delete( 'slippy' )  # needs update/maintainer anyone?
+    fetch_shortcuts.delete( 'shower' )  # needs update/maintainer anyone?
+
+    fetch_shortcuts.delete( 's6syntax' )  # better wait for next update
+    fetch_shortcuts.delete( 's6blank' )  # better wait for next update
+
+    fetch_shortcuts
+  end
+
   def markdown_post_processing?( lib )
     ## todo: normalize key/lib???
     @props.fetch_from_section( lib, 'post-processing', true )

data/lib/slideshow/filters/slide_filter.rb

@@ -3,6 +3,39 @@ module Slideshow
   module SlideFilter
 
 
+  def takahashi_slide_breaks( content )
+    
+    inline_count = 0
+    line_count = 0
+
+    ###########################
+    ## allows   one // two // three
+    
+    content.gsub!( /\b[ ]+\/{2}[ ]+\b/) do |match|
+      inline_count += 1
+      "\n\n<!-- _S9SLIDE_  -->\n\n"
+    end
+    
+    ############################
+    ## allows
+    ##
+    ##  one
+    ##  //
+    ##  two
+    ##  //
+    ##  three
+    
+    content.gsub!( /^[ ]*\/{2}[ ]*$/ ) do |match|
+      line_count += 1
+      "\n\n<!-- _S9SLIDE_  -->\n\n"
+    end
+
+    puts "  Adding #{inline_count+line_count} takahashi slide breaks (#{inline_count} //-inline, #{line_count} //-line)..."
+        
+    content
+  end
+
+
 # add slide directive before h1 (tells slideshow gem where to break slides)
 #
 # e.g. changes:

data/lib/slideshow/filters/text_filter.rb

@@ -21,9 +21,6 @@ module Slideshow
     old_comments_percent_style( content )
   end
 
-
-
-
 def directives_bang_style_to_percent_style( content )
 
   # for compatibility allow !SLIDE/!STYLE as an alternative to %slide/%style-directive

data/lib/slideshow/version.rb

@@ -1,3 +1,3 @@
 module Slideshow
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-23 00:00:00 Z
+date: 2012-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: props