Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

vendor/plugins/erubis-2.6.5/bin/erubis

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-###
-### $Release: 2.6.5 $
-### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
-###
-
-require 'erubis/main'
-
-Erubis::Main.main(ARGV)

vendor/plugins/erubis-2.6.5/doc-api/created.rid

@@ -1 +0,0 @@
-Mon, 20 Jul 2009 19:09:24 +0900

vendor/plugins/erubis/CHANGES.txt

@@ -1,6 +1,14 @@
 # -*- coding: utf-8 -*-
-# $Release: 2.6.5 $
-# copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+# $Release: 2.6.6 $
+# copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+
+
+- release:   2.6.6
+  date: 2010-06-27
+  bugfixes:
+
+    - |
+	Fixed a bug around InterporationEnhancer and FastEruby to escape back-quote. (thanks to Andrew R Jackson)
 
 
 - release:   2.6.5

vendor/plugins/erubis/MIT-LICENSE

@@ -1,4 +1,4 @@
-copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

vendor/plugins/erubis/README.txt

@@ -1,7 +1,7 @@
 = README
 
-release::	2.6.5
-copyright::	copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+release::	2.6.6
+copyright::	copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 
 
 

vendor/plugins/erubis/benchmark/bench.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 ###
-### $Release: 2.6.5 $
-### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+### $Release: 2.6.6 $
+### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ###
 
 require 'erb'

vendor/plugins/erubis/bin/erubis

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+###
+### $Release: 2.6.6 $
+### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+###
+
+require 'erubis/main'
+
+Erubis::Main.main(ARGV)

vendor/plugins/erubis/contrib/erubis

@@ -1,21 +1,21 @@
 #!/usr/bin/env ruby
 
 ###
-### $Release: 2.6.5 $
-### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+### $Release: 2.6.6 $
+### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ###
 
 #--begin of require 'erubis/main'
 ###
-### $Release: 2.6.5 $
-### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+### $Release: 2.6.6 $
+### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ###
 
 require 'yaml'
 #--begin of require 'erubis'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 ##
@@ -62,20 +62,20 @@ require 'yaml'
 
 
 module Erubis
-  VERSION = ('$Release: 2.6.5 $' =~ /([.\d]+)/) && $1
+  VERSION = ('$Release: 2.6.6 $' =~ /([.\d]+)/) && $1
 end
 
 #--begin of require 'erubis/engine'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 
 #--begin of require 'erubis/generator'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--begin of require 'abstract'
@@ -237,8 +237,8 @@ end
 #--end of require 'erubis/generator'
 #--begin of require 'erubis/converter'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'abstract'
@@ -596,14 +596,14 @@ end
 #--end of require 'erubis/converter'
 #--begin of require 'erubis/evaluator'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--begin of require 'erubis/error'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 module Erubis
@@ -627,8 +627,8 @@ end
 #--end of require 'erubis/error'
 #--begin of require 'erubis/context'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -911,8 +911,8 @@ end
 #require 'erubis/context'
 #--begin of require 'erubis/helper'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -960,8 +960,8 @@ end
 #--end of require 'erubis/helper'
 #--begin of require 'erubis/enhancer'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -1623,7 +1623,7 @@ module Erubis
 
     def _add_text_to_str(str, text)
       return if !text || text.empty?
-      text.gsub!(/['\#\\]/, '\\\\\&')
+      text.gsub!(/[`\#\\]/, '\\\\\&')
       str << text
     end
 
@@ -1643,8 +1643,8 @@ end
 #require 'erubis/tiny'
 #--begin of require 'erubis/engine/eruby'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -1778,8 +1778,8 @@ end
 
 #--begin of require 'erubis/local-setting'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 ##
@@ -1790,8 +1790,8 @@ end
 #--end of require 'erubis'
 #--begin of require 'erubis/tiny'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 module Erubis
@@ -1936,8 +1936,8 @@ end
 #--end of require 'erubis/tiny'
 #--begin of require 'erubis/engine/enhanced'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/enhancer'
@@ -2059,8 +2059,8 @@ end
 #--end of require 'erubis/engine/enhanced'
 #--begin of require 'erubis/engine/optimized'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -2189,8 +2189,8 @@ end
 #--already included require 'erubis/engine/eruby'
 #--begin of require 'erubis/engine/ephp'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2290,8 +2290,8 @@ end
 #--end of require 'erubis/engine/ephp'
 #--begin of require 'erubis/engine/ec'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2409,8 +2409,8 @@ end
 #--end of require 'erubis/engine/ec'
 #--begin of require 'erubis/engine/ejava'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2521,8 +2521,8 @@ end
 #--end of require 'erubis/engine/ejava'
 #--begin of require 'erubis/engine/escheme'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2637,8 +2637,8 @@ end
 #--end of require 'erubis/engine/escheme'
 #--begin of require 'erubis/engine/eperl'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'
@@ -2734,8 +2734,8 @@ end
 #--end of require 'erubis/engine/eperl'
 #--begin of require 'erubis/engine/ejavascript'
 ##
-## $Release: 2.6.5 $
-## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+## $Release: 2.6.6 $
+## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
 ##
 
 #--already included require 'erubis/engine'

vendor/plugins/erubis/contrib/inline-require

@@ -5,8 +5,8 @@
 ###
 ### usage: inline-require [-h] [-I path[,path2,..]] script
 ###
-### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
-### 2.6.5
+### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### 2.6.6
 ### $Rev: 10 $
 ###
 

vendor/plugins/erubis/doc-api/classes/Erubis.html

@@ -328,7 +328,7 @@ Class <a href="Erubis/XmlEruby.html" class="link">Erubis::XmlEruby</a><br />
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">VERSION</td>
           <td>=</td>
-          <td class="context-item-value">('$Release: 2.6.5 $' =~ /([.\d]+)/) &amp;&amp; $1</td>
+          <td class="context-item-value">('$Release: 2.6.6 $' =~ /([.\d]+)/) &amp;&amp; $1</td>
         </tr>
         </table>
       </div>

vendor/plugins/erubis/doc-api/classes/Erubis/InterpolationEnhancer.html

@@ -133,7 +133,7 @@ this is only for <a href="Eruby.html">Eruby</a>.
 <span class="ruby-comment cmt"># File erubis/enhancer.rb, line 663</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">_add_text_to_str</span>(<span class="ruby-identifier">str</span>, <span class="ruby-identifier">text</span>)
       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">text</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">empty?</span>
-      <span class="ruby-identifier">text</span>.<span class="ruby-identifier">gsub!</span>(<span class="ruby-regexp re">/['\#\\]/</span>, <span class="ruby-value str">'\\\\\&amp;'</span>)
+      <span class="ruby-identifier">text</span>.<span class="ruby-identifier">gsub!</span>(<span class="ruby-regexp re">/[`\#\\]/</span>, <span class="ruby-value str">'\\\\\&amp;'</span>)
       <span class="ruby-identifier">str</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">text</span>
     <span class="ruby-keyword kw">end</span>
 </pre>