slideshow 1.1.0.beta2 → 1.1.0.beta3

data/Rakefile

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

data/lib/slideshow.rb

@@ -34,6 +34,8 @@ class Env
   end
 end # class Env
 
+require 'textutils'     # text filters and helpers
+
 
 # our own code
 require 'slideshow/opts'
@@ -68,7 +70,7 @@ require 'slideshow/filters/slide_filter'
 
 module Slideshow
 
-  VERSION = '1.1.0.beta2'
+  VERSION = '1.1.0.beta3'
   
   def self.root
     "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"

data/lib/slideshow/filters/text_filter.rb

@@ -8,6 +8,22 @@
 module Slideshow
   module TextFilter
 
+  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 )
 
   # for compatibility allow !SLIDE/!STYLE as an alternative to %slide/%style-directive
@@ -94,66 +110,11 @@ def directives_percent_style( content )
   content2
 end
 
+  ######################
+  # todo: fix move to textutils gem (including helpers and config)
+  # 
 
 
-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'
-    
-    # remove comments
-    # % comments
-    # %begin multiline comment
-    # %end multiline comment
-
-    # track statistics
-    comments_multi  = 0
-    comments_single = 0
-    comments_end    = 0
-
-    # remove multi-line comments
-    content.gsub!(/^%(begin|comment|comments).*?%end/m) do |match|
-      comments_multi += 1
-      ""
-    end
-    
-     # remove everyting starting w/ %end (note, can only be once in file) 
-    content.sub!(/^%end.*/m) do |match|
-      comments_end += 1
-      ""
-    end
-
-    # hack/note: 
-    #  note multi-line erb expressions/stmts might cause trouble
-    #  
-    #  %> gets escaped as special case (not treated as comment)
-    # <%
-    #   whatever
-    # %> <!-- trouble here; would get removed as comment!
-    #  todo: issue warning?
-    
-    # remove single-line comments    
-    content.gsub!(/(^%$)|(^%[^>].*)/ ) do |match|
-      comments_single += 1
-      ""
-    end
-    
-    puts "  Removing %-comments (#{comments_single} lines, " +
-       "#{comments_multi} begin/end-blocks, #{comments_end} end-blocks)..."
-    
-    content    
-  end
-
-  def skip_end_directive( content )
-    # codex-style __SKIP__, __END__ directive
-    # ruby note: .*? is non-greedy (shortest-possible) regex match
-    content.gsub!(/__SKIP__.*?__END__/m, '')
-    content.sub!(/__END__.*/m, '')
-    content
-  end
-  
   def erb_rename_helper_hack( content )
     # note: include is a ruby keyword; rename to s9_include so we can use it 
     
@@ -173,166 +134,6 @@ def comments_percent_style( content )
     content
   end
   
-  # allow plugins/helpers; process source (including header) using erb    
-  def erb( content )
-    puts "  Running embedded Ruby (erb) code/helpers..."
-    
-    content =  ERB.new( content ).result( binding() )
-    content
-  end
-
-  def erb_simple_params( method, params )
-    
-    # replace params to support html like attributes e.g.
-    #  plus add comma separator
-    #
-    #  class=part       -> :class => 'part'   
-    #  3rd/tutorial     -> '3rd/tutorial'
-    #  :css             -> :css
-    
-    return params   if params.nil? || params.strip.empty?
-
-    params.strip!    
-    ## todo: add check for " ??
-    if params.include?( '=>' )
-      puts "** warning: skipping patching of params for helper '#{method}'; already includes '=>':"
-      puts "  #{params}"
-      
-      return params
-    end
-    
-    before = params.clone
-    
-    # 1) string-ify values and keys (that is, wrap in '')
-    #  plus separate w/ commas
-    params.gsub!( /([:a-zA-Z0-9#][\w\/\-\.#()]*)|('[^'\n]*')/) do |match|
-      symbol = ( Regexp.last_match( 0 )[0,1] == ':' )
-      quoted = ( Regexp.last_match( 0 )[0,1] == "'" )
-      if symbol || quoted  # return symbols or quoted string as is
-        "#{Regexp.last_match( 0 )},"
-      else
-        "'#{Regexp.last_match( 0 )}',"
-      end
-    end
-        
-    # 2) symbol-ize hash keys
-    #    change = to =>
-    #    remove comma for key/value pairs
-    params.gsub!( /'(\w+)',[ \t]*=/ ) do |match|
-      ":#{$1}=>"
-    end
-    
-    # 3) remove trailing comma
-    params.sub!( /[ \t]*,[ \t]*$/, '' ) 
-     
-    puts "    Patching params for helper '#{method}' from '#{before}' to:"
-    puts "      #{params}"  
-       
-    params    
-  end
-
-
-  def erb_django_simple_params( code )
-    
-    # split into method/directive and parms plus convert params
-    code.sub!( /^[ \t]([\w.]+)(.*)/ ) do |match|
-      directive = $1
-      params    = $2
-      
-      "#{directive} #{params ? erb_simple_params(directive,params) : ''}"     
-    end
-    
-    code
-  end
-
-  def erb_django_style( content )
-
-    # replace expressions (support for single lines only)
-    #  {{ expr }}  ->  <%= expr %>
-    #  {% stmt %}  ->  <%  stmt %>   !! add in do if missing (for convenience)
-    #
-    # use use {{{ or {{{{ to escape expr back to literal value
-    # and use {%% %} to escape stmts
-
-    erb_expr = 0
-    erb_stmt_beg = 0
-    erb_stmt_end = 0
-
-    content.gsub!( /(\{{2,4})([^{}\n]+?)(\}{2,4})/ ) do |match|
-      escaped = ($1.length > 2)
-      if escaped
-        "{{#{$2}}}"
-      else
-        erb_expr += 1
-        "<%= #{erb_django_simple_params($2)} %>"        
-      end
-    end
-
-    content.gsub!( /(\{%{1,2})([ \t]*end[ \t]*)%\}/ ) do |match|
-      escaped = ($1.length > 2)
-      if escaped
-        "{%#{$2}%}"
-      else
-        erb_stmt_end += 1
-        "<% end %>"
-      end
-    end
-
-    content.gsub!( /(\{%{1,2})([^%\n]+?)%\}/ ) do |match|
-      escaped = ($1.length > 2)
-      if escaped
-        "{%#{$2}%}"
-      else
-        erb_stmt_beg += 1
-        "<% #{erb_django_simple_params($2)} do %>"
-      end
-    end
-
-    puts "  Patching embedded Ruby (erb) code Django-style (#{erb_expr} {{-expressions," +
-       " #{erb_stmt_beg}/#{erb_stmt_end} {%-statements)..."
-         
-    content        
-  end
-
-  def code_block_curly_style( content )
-    # replace {{{  w/ <pre class='code'>
-    # replace }}}  w/ </pre>
-    # use 4-6 { or } to escape back to literal value (e.g. {{{{ or {{{{{{ => {{{ )
-    # note: {{{ / }}} are anchored to beginning of line ( spaces and tabs before {{{/}}}allowed )
-    
-    # track statistics
-    code_begin     = 0
-    code_begin_esc = 0
-    code_end       = 0    
-    code_end_esc   = 0    
-        
-    content.gsub!( /^[ \t]*(\{{3,6})/ ) do |match|
-      escaped = ($1.length > 3)
-      if escaped
-        code_begin_esc += 1
-        "{{{"
-      else
-        code_begin += 1
-        "<pre class='code'>"
-      end
-    end    
-    
-    content.gsub!( /^[ \t]*(\}{3,6})/ ) do |match|
-      escaped = ($1.length > 3)
-      if escaped
-        code_end_esc += 1
-        "}}}"
-      else
-        code_end += 1
-        "</pre>"      
-      end
-    end
-        
-    puts "  Patching {{{/}}}-code blocks (#{code_begin}/#{code_end} blocks, " +
-         "#{code_begin_esc}/#{code_end_esc} escaped blocks)..."    
-    
-    content
-  end
 
 end   # module TextFilter
 end  # module Slideshow

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: -635162551
+  hash: 1059591029
   prerelease: 6
   segments: 
   - 1
   - 1
   - 0
   - beta
-  - 2
-  version: 1.1.0.beta2
+  - 3
+  version: 1.1.0.beta3
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-06-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -39,6 +39,22 @@ dependencies:
   name: markdown
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: textutils
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,11 +66,11 @@ dependencies:
         - 0
         version: 0.2.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: fetcher
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,11 +82,11 @@ dependencies:
         - 0
         version: 0.1.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: props
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -82,11 +98,11 @@ dependencies:
         - 0
         version: 0.1.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rdoc
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,11 +113,11 @@ dependencies:
         - 10
         version: "3.10"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,7 +128,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: |-
   The Slide Show (S9) Ruby gem lets you create slide shows and author slides in plain text
   using a wiki-style markup language that's easy-to-write and easy-to-read.