erubis 2.6.5 → 2.6.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (69) hide show
  1. data/CHANGES.txt +10 -2
  2. data/MIT-LICENSE +1 -1
  3. data/README.txt +2 -2
  4. data/benchmark/bench.rb +2 -2
  5. data/bin/erubis +2 -2
  6. data/contrib/erubis +46 -46
  7. data/contrib/inline-require +2 -2
  8. data/doc-api/classes/Erubis.html +1 -1
  9. data/doc-api/classes/Erubis/InterpolationEnhancer.html +1 -1
  10. data/doc-api/created.rid +1 -1
  11. data/doc-api/files/README_txt.html +3 -3
  12. data/doc-api/files/erubis/context_rb.html +1 -1
  13. data/doc-api/files/erubis/converter_rb.html +1 -1
  14. data/doc-api/files/erubis/engine/ec_rb.html +1 -1
  15. data/doc-api/files/erubis/engine/ejava_rb.html +1 -1
  16. data/doc-api/files/erubis/engine/ejavascript_rb.html +1 -1
  17. data/doc-api/files/erubis/engine/enhanced_rb.html +1 -1
  18. data/doc-api/files/erubis/engine/eperl_rb.html +1 -1
  19. data/doc-api/files/erubis/engine/ephp_rb.html +1 -1
  20. data/doc-api/files/erubis/engine/eruby_rb.html +1 -1
  21. data/doc-api/files/erubis/engine/escheme_rb.html +1 -1
  22. data/doc-api/files/erubis/engine/optimized_rb.html +1 -1
  23. data/doc-api/files/erubis/engine_rb.html +1 -1
  24. data/doc-api/files/erubis/enhancer_rb.html +2 -2
  25. data/doc-api/files/erubis/error_rb.html +1 -1
  26. data/doc-api/files/erubis/evaluator_rb.html +1 -1
  27. data/doc-api/files/erubis/generator_rb.html +1 -1
  28. data/doc-api/files/erubis/helper_rb.html +1 -1
  29. data/doc-api/files/erubis/helpers/rails_form_helper_rb.html +1 -1
  30. data/doc-api/files/erubis/helpers/rails_helper_rb.html +1 -1
  31. data/doc-api/files/erubis/local-setting_rb.html +1 -1
  32. data/doc-api/files/erubis/main_rb.html +1 -1
  33. data/doc-api/files/erubis/preprocessing_rb.html +1 -1
  34. data/doc-api/files/erubis/tiny_rb.html +1 -1
  35. data/doc-api/files/erubis_rb.html +1 -1
  36. data/doc/users-guide.html +6 -5
  37. data/lib/erubis.rb +3 -3
  38. data/lib/erubis/context.rb +2 -2
  39. data/lib/erubis/converter.rb +2 -2
  40. data/lib/erubis/engine.rb +2 -2
  41. data/lib/erubis/engine/ec.rb +2 -2
  42. data/lib/erubis/engine/ejava.rb +2 -2
  43. data/lib/erubis/engine/ejavascript.rb +2 -2
  44. data/lib/erubis/engine/enhanced.rb +2 -2
  45. data/lib/erubis/engine/eperl.rb +2 -2
  46. data/lib/erubis/engine/ephp.rb +2 -2
  47. data/lib/erubis/engine/eruby.rb +2 -2
  48. data/lib/erubis/engine/escheme.rb +2 -2
  49. data/lib/erubis/engine/optimized.rb +2 -2
  50. data/lib/erubis/enhancer.rb +3 -3
  51. data/lib/erubis/error.rb +2 -2
  52. data/lib/erubis/evaluator.rb +2 -2
  53. data/lib/erubis/generator.rb +2 -2
  54. data/lib/erubis/helper.rb +2 -2
  55. data/lib/erubis/helpers/rails_form_helper.rb +2 -2
  56. data/lib/erubis/helpers/rails_helper.rb +2 -2
  57. data/lib/erubis/local-setting.rb +2 -2
  58. data/lib/erubis/main.rb +2 -2
  59. data/lib/erubis/preprocessing.rb +2 -2
  60. data/lib/erubis/tiny.rb +2 -2
  61. data/test/assert-text-equal.rb +2 -2
  62. data/test/test-engines.rb +2 -2
  63. data/test/test-enhancers.rb +30 -3
  64. data/test/test-erubis.rb +2 -2
  65. data/test/test-main.rb +2 -2
  66. data/test/test-users-guide.rb +2 -2
  67. data/test/test.rb +2 -2
  68. data/test/testutil.rb +2 -2
  69. metadata +32 -32
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -56,7 +56,7 @@
56
56
  </tr>
57
57
  <tr class="top-aligned-row">
58
58
  <td><strong>Last Update:</strong></td>
59
- <td>Tue Jul 14 09:47:22 +0900 2009</td>
59
+ <td>Tue Jun 08 14:15:52 +0900 2010</td>
60
60
  </tr>
61
61
  </table>
62
62
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -70,7 +70,7 @@
70
70
 
71
71
  <div id="description">
72
72
  <p>
73
- $Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
73
+ $Release: 2.6.6 $ copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
74
74
  </p>
75
75
 
76
76
  </div>
@@ -14,10 +14,11 @@
14
14
 
15
15
  <div align="left"><h1>Erubis Users' Guide</h1></div>
16
16
  <div align="left">
17
+ release: 2.6.6<br>
17
18
  last update: $Date$<br>
18
19
  </div>
19
20
 
20
- <p>release: 2.6.5
21
+ <p>release: 2.6.6
21
22
  </p>
22
23
  <a name="preface"></a>
23
24
  <h2 class="section1">Preface</h2>
@@ -2986,8 +2987,8 @@ example of using NoCodeEnhancer with PHP file</div>
2986
2987
  <p>Thanks Andrew R Jackson, he developed 'erubis-run.rb' which enables you to use Erubis with mod_ruby.
2987
2988
  </p>
2988
2989
  <ol type="1">
2989
- <li>Copy 'erubis-2.6.5/contrib/erubis-run.rb' to the 'RUBYLIBDIR/apache' directory (for example '/usr/local/lib/ruby/1.8/apache') which contains 'ruby-run.rb', 'eruby-run.rb', and so on.
2990
- <pre class="terminal">$ cd erubis-2.6.5/
2990
+ <li>Copy 'erubis-2.6.6/contrib/erubis-run.rb' to the 'RUBYLIBDIR/apache' directory (for example '/usr/local/lib/ruby/1.8/apache') which contains 'ruby-run.rb', 'eruby-run.rb', and so on.
2991
+ <pre class="terminal">$ cd erubis-2.6.6/
2991
2992
  $ sudo copy contrib/erubis-run.rb /usr/local/lib/ruby/1.8/apache/
2992
2993
  </pre>
2993
2994
  </li>
@@ -3063,12 +3064,12 @@ p obj.render('world') #=&gt; "hello world"
3063
3064
 
3064
3065
  <a name="topics-benchmark"></a>
3065
3066
  <h3 class="section2">Benchmark</h3>
3066
- <p>A benchmark script is included in Erubis package at 'erubis-2.6.5/benchark/' directory.
3067
+ <p>A benchmark script is included in Erubis package at 'erubis-2.6.6/benchark/' directory.
3067
3068
  Here is an example result of benchmark.
3068
3069
  </p>
3069
3070
  <div class="terminal_caption">
3070
3071
  MacOS X 10.4 Tiger, Intel CoreDuo 1.83GHz, Ruby1.8.6, eruby1.0.5, gcc4.0.1</div>
3071
- <pre class="terminal">$ cd erubis-2.6.5/benchmark/
3072
+ <pre class="terminal">$ cd erubis-2.6.6/benchmark/
3072
3073
  $ ruby bench.rb -n 10000 -m execute
3073
3074
  *** ntimes=10000, testmode=execute
3074
3075
  user system total real
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  ##
@@ -47,7 +47,7 @@
47
47
 
48
48
 
49
49
  module Erubis
50
- VERSION = ('$Release: 2.6.5 $' =~ /([.\d]+)/) && $1
50
+ VERSION = ('$Release: 2.6.6 $' =~ /([.\d]+)/) && $1
51
51
  end
52
52
 
53
53
  require 'erubis/engine'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
 
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'abstract'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
 
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'erubis/engine'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'erubis/engine'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'erubis/engine'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'erubis/enhancer'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'erubis/engine'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'erubis/engine'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'erubis/engine'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'erubis/engine'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
 
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
 
@@ -662,7 +662,7 @@ module Erubis
662
662
 
663
663
  def _add_text_to_str(str, text)
664
664
  return if !text || text.empty?
665
- text.gsub!(/['\#\\]/, '\\\\\&')
665
+ text.gsub!(/[`\#\\]/, '\\\\\&')
666
666
  str << text
667
667
  end
668
668
 
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  module Erubis
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'erubis/error'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  require 'abstract'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
 
@@ -1,6 +1,6 @@
1
1
  ###
2
- ### $Release: 2.6.5 $
3
- ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ### $Release: 2.6.6 $
3
+ ### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ###
5
5
 
6
6
 
@@ -1,6 +1,6 @@
1
1
  ###
2
- ### $Release: 2.6.5 $
3
- ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ### $Release: 2.6.6 $
3
+ ### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ###
5
5
 
6
6
 
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  ##
@@ -1,6 +1,6 @@
1
1
  ###
2
- ### $Release: 2.6.5 $
3
- ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ### $Release: 2.6.6 $
3
+ ### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ###
5
5
 
6
6
  require 'yaml'
@@ -1,6 +1,6 @@
1
1
  ###
2
- ### $Release: 2.6.5 $
3
- ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ### $Release: 2.6.6 $
3
+ ### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ###
5
5
 
6
6
  require 'cgi'
@@ -1,6 +1,6 @@
1
1
  ##
2
- ## $Release: 2.6.5 $
3
- ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ## $Release: 2.6.6 $
3
+ ## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ##
5
5
 
6
6
  module Erubis
@@ -1,6 +1,6 @@
1
1
  ###
2
- ### $Release: 2.6.5 $
3
- ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
2
+ ### $Release: 2.6.6 $
3
+ ### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
4
4
  ###
5
5
 
6
6
  require 'test/unit'