slideshow 1.1.0.beta8 → 1.1.0

data/Rakefile

@@ -14,7 +14,7 @@ Hoe.spec 'slideshow' do
   
   self.extra_deps = [
     ['RedCloth','>= 4.2.9'],
-    ['markdown','>= 0.3.0'],
+    ['markdown','>= 0.4.0'],
     ['textutils','>= 0.2.0'],
     ['fetcher','>= 0.1.0'],
     ['props','>= 0.2.0']

data/lib/slideshow/commands/gen.rb

@@ -96,7 +96,11 @@ class Gen
     if (@markup_type == :markdown && Markdown.lib == 'pandoc-ruby') || @markup_type == :rest
       content = add_slide_directive_before_div_h1( content )
     else
-      content = add_slide_directive_before_h1( content )
+      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
 
     dump_content_to_file_debug_html( content )
@@ -126,65 +130,24 @@ class Gen
     end
 
 
-    ## split slide source into header (optional) and content/body
-    ## plus check for (css style) classes and data attributes
-
     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}"
-
-        from = Regexp.last_match.end(0)  # continue search later from here
-        
-        values = $2.strip.dup
-        
-        # remove data values (eg. x=-20 scale=4) and store in data hash
-        values.gsub!( /([-\w]+)[ \t]*=[ \t]*([-\w\.]+)/ ) do |_|
-          logger.debug "    adding data pair: key=>#{$1.downcase}< value=>#{$2}<"
-          slide.data[ $1.downcase.dup ] = $2.dup
-          " "  # replace w/ space
-        end
-        
-        values.strip!  # remove spaces  # todo: use squish or similar and check for empty string
-                
-        if slide.classes.nil?
-          slide.classes = values
-        else
-          slide.classes << " #{values}"
-        end
-      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
+      slides2 << Slide.new( slide_source, config )
     end
 
      # for convenience create a string w/ all in-one-html
      #  no need to wrap slides in divs etc.
    
      content2 = ""
-     slides2.each do |slide|         
+     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    
+    @slides   = slides2     # strutured content
+    @content  = content2   # content all-in-one
   end
 
 
@@ -207,7 +170,7 @@ class Gen
       matches = manifests.select { |m| m[0] == manifest_path_or_name } 
 
       if matches.empty?
-        puts "*** error: unknown template manifest '#{manifest_path_or_name}'"  
+        puts "*** error: unknown template manifest '#{manifest_path_or_name}'"
         # todo: list installed manifests
         exit 2
       end
@@ -215,6 +178,7 @@ class Gen
       manifest = load_manifest( matches[0][1] )
     end
   
+
     # expand output path in current dir and make sure output path exists
     outpath = File.expand_path( opts.output_path ) 
     logger.debug "outpath=#{outpath}"
@@ -235,29 +199,16 @@ class Gen
       logger.debug "oldcwd=#{oldcwd}"
       logger.debug "newcwd=#{newcwd}"
       Dir.chdir newcwd
-    end  
+    end
 
     puts "Preparing slideshow '#{basename}'..."
-                
-  if extname.empty? then
-    extname  = ".textile"   # default to .textile 
-    
-    config.known_extnames.each do |e|
-       logger.debug "File.exists? #{dirname}/#{basename}#{e}"
-       if File.exists?( "#{dirname}/#{basename}#{e}" ) then         
-          extname = e
-          logger.debug "extname=#{extname}"
-          break
-       end
-    end     
-  end
-
-  if config.known_markdown_extnames.include?( extname )
-    @markup_type = :markdown
+   
+  if config.known_textile_extnames.include?( extname )
+    @markup_type = :textile
   elsif config.known_rest_extnames.include?( extname )
     @markup_type = :rest
-  else
-    @markup_type = :textile
+  else  # default/fallback use markdown
+    @markup_type = :markdown
   end
   
   # shared variables for templates (binding)
@@ -268,7 +219,7 @@ class Gen
 
   @session     = {}  # reset session hash for plugins/helpers
 
-  inname  =  "#{dirname}/#{basename}#{extname}"
+  inname  =  "#{basename}#{extname}"
 
   logger.debug "inname=#{inname}"
     
@@ -299,6 +250,10 @@ class Gen
   end
 
 
+  #### fix/todo:
+  ##
+  ## check for .erb file extension for trigger for erb processing
+
   manifest.each do |entry|
     outname = entry[0]
     if outname.include? '__file__' # process
@@ -320,11 +275,22 @@ class Gen
     else # just copy verbatim if target/dest has no __file__ in name
       dest   = entry[0]
       source = entry[1]
-            
-      puts "Copying to #{dest} from #{source}..."     
+
+  #### fix/todo:
+  ##
+  ## check for .erb file extension for trigger for erb processing
+
+      puts "Copying to #{dest} from #{source}..."
       FileUtils.copy( source, with_output_path( dest, outpath ) )
     end
   end
+  
+  
+  ## pop/restore working folder/dir
+  unless newcwd == oldcwd
+    logger.debug "oldcwd=>#{oldcwd}<, newcwd=>#{newcwd}<"
+    Dir.chdir( oldcwd )
+  end
 
   puts "Done."
 end

data/lib/slideshow/config.rb

@@ -9,6 +9,9 @@ class Config
 
   attr_reader :logger, :opts
 
+  def header_level
+    @opts.header_level
+  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?)

data/lib/slideshow/filters/slide_filter.rb

@@ -28,6 +28,22 @@ def add_slide_directive_before_h1( content )
   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:

data/lib/slideshow/opts.rb

@@ -3,6 +3,15 @@ module Slideshow
 
 class Opts
 
+  def header_level=(value)
+    @header_level = value.to_i
+  end
+  
+  def header_level
+    ## todo: check   0 is not nil?
+    @header_level || 1
+  end
+
   def generate=(value)
     @generate = value
   end

data/lib/slideshow/runner.rb

@@ -35,44 +35,103 @@ def load_plugins
 end
 
 
+  def find_file_with_known_extension( fn )
+    dirname  = File.dirname( fn )
+    basename = File.basename( fn, '.*' )
+    extname  = File.extname( fn )
+    logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
+
+    config.known_extnames.each do |e|
+      newname = File.join( dirname, "#{basename}#{e}" )
+      logger.debug "File.exists? #{newname}"
+      return newname if File.exists?( newname )
+    end  # each extension (e)
+      
+    nil   # not found; return nil
+  end
+
+
+  def find_files( file_or_dir_or_pattern )
+
+    filtered_files = []
+ 
+    ## for now process/assume only single file
+    
+    ## (check for missing extension)
+    if File.exists?( file_or_dir_or_pattern )
+      file = file_or_dir_or_pattern
+      logger.debug "  adding file '#{file}'..."
+      filtered_files << file
+    else  # check for existing file w/ missing extension
+      file = find_file_with_known_extension( file_or_dir_or_pattern )
+      if file.nil?
+        puts "  skipping missing file '#{file_or_dir_or_pattern}{#{config.known_extnames.join(',')}}'..."
+      else
+        logger.debug "  adding file '#{file}'..."
+        filtered_files << file
+      end
+    end
+    
+    filtered_files
+    
+  end # method find_files
+
+
+
 def run( args )
 
   opt=OptionParser.new do |cmd|
     
     cmd.banner = "Usage: slideshow [options] name"
-    
+        
     cmd.on( '-o', '--output PATH', 'Output Path' ) { |path| opts.output_path = path }
-
-    cmd.on( '-g', '--generate',  'Generate Slide Show Templates (Using Built-In S6 Pack)' ) { opts.generate = true }
     
-    cmd.on( "-t", "--template MANIFEST", "Template Manifest" ) do |t|
+    cmd.on( "-t", "--template MANIFEST", "Template Manifest (default is s6.txt)" ) do |t|
       # todo: do some checks on passed in template argument
       opts.manifest = t
     end
 
+
+  #  cmd.on( '--header NUM', 'Header Level (default is 1)' ) do |n|
+  #    opts.header_level = n.to_i
+  #  end
+
+    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 }
+
+
     # ?? opts.on( "-s", "--style STYLE", "Select Stylesheet" ) { |s| $options[:style]=s }
-    # ?? opts.on( "--version", "Show version" )  {}
         
     # ?? cmd.on( '-i', '--include PATH', 'Load Path' ) { |s| opts.put( 'include', s ) }
 
-    cmd.on( '-f', '--fetch URI', 'Fetch Templates' ) do |uri|
-      opts.fetch_uri = uri
-    end
-    
     cmd.on( '-c', '--config PATH', 'Configuration Path (default is ~/.slideshow)' ) do |path|
       opts.config_path = path
     end
+
+    cmd.on( '-f', '--fetch URI', 'Fetch Templates' ) do |uri|
+      opts.fetch_uri = uri
+    end
+
+    cmd.on( '-g', '--generate',  'Generate Slide Show Templates (Using Built-In S6 Pack)' ) { opts.generate = true }
     
     cmd.on( '-l', '--list', 'List Installed Templates' ) { opts.list = true }
 
     # todo: find different letter for debug trace switch (use v for version?)
     cmd.on( "-v", "--verbose", "Show debug trace" )  do
        logger.datetime_format = "%H:%H:%S"
-       logger.level = Logger::DEBUG      
+       logger.level = Logger::DEBUG
     end
- 
-    usage =<<EOS
+    
+    ## todo: add --version
 
+    cmd.on( '--version', "Show version" ) do
+      puts Slideshow.generator
+      exit
+    end
+ 
+    cmd.on_tail( "-h", "--help", "Show this message" ) do
+         puts <<EOS
+         
 Slide Show (S9) is a free web alternative to PowerPoint or KeyNote in Ruby
 
 #{cmd.help}
@@ -95,10 +154,6 @@ Further information:
   http://slideshow.rubyforge.org
   
 EOS
- 
- 
-    cmd.on_tail( "-h", "--help", "Show this message" ) do
-         puts usage
          exit
     end
   end
@@ -118,8 +173,12 @@ EOS
   else
     load_plugins  # check for optional plugins/extension in ./lib folder
 
-    args.each do |fn|
-      Gen.new( logger, opts, config, headers ).create_slideshow( fn )
+    args.each do |arg|
+      files = find_files( arg )
+      files.each do |file| 
+       ### fix/todo: reset/clean headers
+        Gen.new( logger, opts, config, headers ).create_slideshow( file )
+      end
     end
   end
 end

data/lib/slideshow/slide.rb

@@ -1,19 +1,84 @@
 module Slideshow
 
   class Slide
-  
-    attr_accessor :header
+
+    attr_accessor :logger
+
+    # NB: unparsed html source (use content_without_header
+    #  for content without option header)
+      
     attr_accessor :content
+    attr_accessor :content_without_header
+    attr_accessor :header
     attr_accessor :classes
-    attr_accessor :data
   
-    def initialize
-      @header  = nil
-      @content = nil
-      @classes = nil
+    def initialize( content, options )
+      @logger       = options.logger
+      @header_level = options.header_level
+      
+      @content = content
+      
+      @header                 = nil
+      @content_without_header = nil
+      @classes                = nil   # NB: style classes as all in one string
       @data    = {}
+      
+      parse()
     end
 
+    def parse
+      ## pass 1) check for (css style) classes and data attributes
+      ## check for css style classes
+      from = 0
+      while( pos = @content.index( /<!-- _S9(SLIDE|STYLE)_(.*?)-->/m, from ))
+        logger.debug "  adding css classes from pi >#{$1.downcase}<: >#{$2.strip}<"
+
+        from = Regexp.last_match.end(0)  # continue search later from here
+        
+        values = $2.strip.dup
+        
+        # remove data values (eg. x=-20 scale=4) and store in data hash
+        values.gsub!( /([-\w]+)[ \t]*=[ \t]*([-\w\.]+)/ ) do |_|
+          logger.debug "    adding data pair: key=>#{$1.downcase}< value=>#{$2}<"
+          @data[ $1.downcase.dup ] = $2.dup
+          " "  # replace w/ space
+        end
+        
+        values.strip!  # remove spaces  # todo: use squish or similar and check for empty string
+                
+        if @classes.nil?
+          @classes = values
+        else
+          @classes << " #{values}"
+        end
+      end
+
+      ## pass 2) split slide source into header (optional) and content/body
+
+      ## todo: add option split on h1/h2 etc.
+
+      # try to extract first 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
+
+      if @header_level == 2
+        pattern = /^(.*?)(<h2.*?>.*?<\/h2>)(.*)/m
+      else # assume header level 1
+        pattern = /^(.*?)(<h1.*?>.*?<\/h1>)(.*)/m
+      end
+
+      if @content =~ pattern
+        @header  = $2
+        @content_without_header = ($1 ? $1 : '') + ($3 ? $3 : '')
+        logger.debug "  adding slide with header (h1):\n#{@header}"
+      else
+        @header = nil    # todo: set to '' empty string? why not?
+        @content_without_header = @content
+        logger.debug "  adding slide with *no* header:\n#{@content}"
+      end
+    end  # method parse
+
+
     def data_attributes
       buf = ""
       @data.each do | key,value |
@@ -21,40 +86,33 @@ module Slideshow
       end
       buf
     end 
+
+################################
+#### convenience helpers
   
     def to_classic_html
-       
       buf  = ""
       buf << "<div class='slide "
       buf << classes    if classes
-      buf << "'>\n"      
-      
-      buf << header     if header
-      buf << content    if content
-      
+      buf << "'>\n"
+      buf << content
       buf << "</div>\n"
-      buf       
+      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 << "<header>#{header}</header>\n"   if header
+      buf << "<section "
+      buf << "class='#{classes}'"             if classes
       buf << "'>\n"
-      
-      buf << content      if content
+      buf << content_without_header           if content_without_header
       buf << "</section>\n"
       buf << "</div>\n"
       buf
     end
   
-  end # class slide
+  end # class Slide
 
 end # module Slideshow

data/lib/slideshow/version.rb

@@ -1,3 +1,3 @@
 module Slideshow
-  VERSION = '1.1.0.beta8'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 62724110
-  prerelease: 6
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 1
   - 0
-  - beta
-  - 8
-  version: 1.1.0.beta8
+  version: 1.1.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-16 00:00:00 Z
+date: 2012-06-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -43,12 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
         - 0
-        - 3
+        - 4
         - 0
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -222,14 +220,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: slideshow