erubis 2.3.1 → 2.7.0

data/contrib/inline-require

@@ -5,14 +5,19 @@
 ###
 ### usage: inline-require [-h] [-I path[,path2,..]] script
 ###
-### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
-### 2.3.1
-### $Rev: 2 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
+### 2.7.0
+### $Rev: 10 $
 ###
 
 
 class InlineRequire
 
+   def initialize(opts={})
+      @opts = opts.dup
+   end
+   attr_accessor :opts
+
    def expand(filename)
       sbuf = ''
       inlined = []
@@ -25,6 +30,10 @@ class InlineRequire
 
    def expand_require(filename, sbuf, inlined, level)
       raise "*** assertion error" if inlined.include?(filename)
+      remove_comment  = @opts[:remove_comment]
+      expand_indented = @opts[:expand_indented]
+      keep_filename   = @opts[:keep_filename]
+      loaded_features = @opts[:loaded_features]
       inlined << filename
       prog = File.read(filename)
       n = 0
@@ -48,7 +57,9 @@ class InlineRequire
 
          ## find 'require "foo"' and expand it to inline code
          flag_inline = false
-         if line =~ /^\s*require ['"](.*)["']\s*$/
+         pattern = expand_indented ? /^[ \t]*require ['"](.*)["']\s*$/ \
+                                   :       /^require ['"](.*)["']\s*$/
+         if line =~ pattern
             libname = $1
             libpath = find_library(libname)
             $stderr.puts "*** debug: libpath=#{libpath.inspect}" if $debug_mode
@@ -60,13 +71,19 @@ class InlineRequire
             end
          end
          if !flag_inline
-            sbuf << line
+            sbuf << line   unless remove_comment && line =~ /^[ \t]*\#/
          elsif inlined.include?(libpath)
-            sbuf << "#--already included #{line}"
+            sbuf << "#--already included #{line}"     unless remove_comment
          else
-            sbuf << "#--begin of #{line}"
+            if keep_filename
+               @n ||= 0;  @n += 1;  n = @n
+            end
+            sbuf << "#--begin of #{line}"             unless remove_comment
+            sbuf << "$LOADED_FEATURES << '#{libname}.rb'\n" if loaded_features
+            sbuf << "eval <<'END_OF_SCRIPT__#{n}', TOPLEVEL_BINDING, '#{libpath}', 1\n" if keep_filename
             expand_require(libpath, sbuf, inlined, level+1)
-            sbuf << "#--end of #{line}"
+            sbuf << "END_OF_SCRIPT__#{n}\n"               if keep_filename
+            sbuf << "#--end of #{line}"               unless remove_comment
          end
       end
       #sbuf << "\n" if sbuf[-1] != ?\n
@@ -105,38 +122,47 @@ end
 if __FILE__ == $0
 
    begin
-      rubylib_paths = []
-      flag_help = false
-      while ARGV[0] && ARGV[0][0] == ?-
-         opt = ARGV.shift
-         case opt
-         when '-h', '--help'
-            flag_help = true
-         when '-I'
-            arg = ARGV.shift
-            raise "-I: library path required." unless arg
-            rubylib_paths.concat(arg.split(/,/))
-         when '-D'
-            $debug_mode = true
-         else
-            raise "#{opt}: invalid option."
-         end
-      end
-
-      if flag_help
+      require "optparse"
+      op = OptionParser.new
+      options = {}
+      op.on("-h", "--help") {|v| options[:help] = v }
+      op.on("-I libpath")   {|v| options[:libpath] = v }
+      op.on("-i")           {|v| options[:expand_indented] = v }
+      op.on("-c")           {|v| options[:remove_comment] = v }
+      op.on("-k")           {|v| options[:keep_filename] = v }
+      op.on("-l")           {|v| options[:loaded_features] = v }
+      op.on("-D")           {|v| options[:debug] = v }
+      op.parse!()
+
+      $debug_mode = options[:debug]
+
+      if options[:help]
          command = File.basename($0)
          puts "Usage: #{command} [-h] [-I path[,path2,..]] script"
          puts "  -h                   : help"
+         puts "  -i                   : expand indented require(), too"
+         puts "  -c                   : remove comment lines start with '#'"
+         puts "  -k                   : keep filename (for debugging)"
+         puts "  -l                   : append libs to $LOADED_FEATURES"
          puts "  -I path[,path2,...]  : ruby library path"
          exit(0)
       end
 
+      if options[:libpath]
+         rubylib_paths = options[:libpath].split(/,/)
+      else
+         rubylib_paths = []
+      end
       $stderr.puts "*** debug: rubylib_paths=#{rubylib_paths.inspect}" if $debug_mode
       $LOAD_PATH.concat(rubylib_paths)
 
       filenames = ARGV
 
-      inline_require = InlineRequire.new
+      opts = { :expand_indented => options[:expand_indented],
+               :remove_comment  => options[:remove_comment],
+               :keep_filename   => options[:keep_filename],
+               :loaded_features => options[:loaded_features] }
+      inline_require = InlineRequire.new(opts)
       filenames.each do |filename|
          print inline_require.expand(filename)
       end

data/doc/docstyle.css

@@ -27,7 +27,7 @@ pre {
 	white-space:pre;
 }
 
-.program {
+pre.program {
 	border-style:solid;
 	border-width:1px;
 	border-color:#6699FF;
@@ -38,7 +38,7 @@ pre {
 	word-break:break-all;
 }
 
-.terminal {
+pre.terminal {
 	border-style:solid;
 	border-width:1;
 	border-color:#999999;
@@ -49,7 +49,7 @@ pre {
 	word-break:break-all;
 }
 
-.output {
+pre.output {
 	border-style:solid;
 	border-width:1px;
 	border-color:#CCCCCC;
@@ -61,6 +61,12 @@ pre {
 }
 
 
+pre strong {
+	color: #990000;
+	font-weight: bold;
+}
+
+
 .program_caption {
         margin-top: 20px;
 }
@@ -168,7 +174,7 @@ h3, .subsection {
 	font-size:small;
 }
 
-.note {
+div.note, div.tips {
 	background-color:#FFFFDD;
 	border-style:solid;
 	border-width:0px 1px 0px 1px;
@@ -176,9 +182,14 @@ h3, .subsection {
 	color:#333300;
 	/* font-size:small; */
 	line-height:120%;
+	margin-top: 10px;
 	padding: 5px 20px 5px 20px;
 }
 
+div.note span.caption, div.tips span.caption {
+	color: #C60;
+}
+
 .figure {
 	/*
 	border-width:1px;
@@ -186,3 +197,13 @@ h3, .subsection {
 	white-space:pre;
 	*/
 }
+
+strong {
+	color: #630;
+	font-weight; bold;
+}
+
+
+em {
+	font-style: italic;
+}