erubis 2.6.5 → 2.6.6
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGES.txt +10 -2
- data/MIT-LICENSE +1 -1
- data/README.txt +2 -2
- data/benchmark/bench.rb +2 -2
- data/bin/erubis +2 -2
- data/contrib/erubis +46 -46
- data/contrib/inline-require +2 -2
- data/doc-api/classes/Erubis.html +1 -1
- data/doc-api/classes/Erubis/InterpolationEnhancer.html +1 -1
- data/doc-api/created.rid +1 -1
- data/doc-api/files/README_txt.html +3 -3
- data/doc-api/files/erubis/context_rb.html +1 -1
- data/doc-api/files/erubis/converter_rb.html +1 -1
- data/doc-api/files/erubis/engine/ec_rb.html +1 -1
- data/doc-api/files/erubis/engine/ejava_rb.html +1 -1
- data/doc-api/files/erubis/engine/ejavascript_rb.html +1 -1
- data/doc-api/files/erubis/engine/enhanced_rb.html +1 -1
- data/doc-api/files/erubis/engine/eperl_rb.html +1 -1
- data/doc-api/files/erubis/engine/ephp_rb.html +1 -1
- data/doc-api/files/erubis/engine/eruby_rb.html +1 -1
- data/doc-api/files/erubis/engine/escheme_rb.html +1 -1
- data/doc-api/files/erubis/engine/optimized_rb.html +1 -1
- data/doc-api/files/erubis/engine_rb.html +1 -1
- data/doc-api/files/erubis/enhancer_rb.html +2 -2
- data/doc-api/files/erubis/error_rb.html +1 -1
- data/doc-api/files/erubis/evaluator_rb.html +1 -1
- data/doc-api/files/erubis/generator_rb.html +1 -1
- data/doc-api/files/erubis/helper_rb.html +1 -1
- data/doc-api/files/erubis/helpers/rails_form_helper_rb.html +1 -1
- data/doc-api/files/erubis/helpers/rails_helper_rb.html +1 -1
- data/doc-api/files/erubis/local-setting_rb.html +1 -1
- data/doc-api/files/erubis/main_rb.html +1 -1
- data/doc-api/files/erubis/preprocessing_rb.html +1 -1
- data/doc-api/files/erubis/tiny_rb.html +1 -1
- data/doc-api/files/erubis_rb.html +1 -1
- data/doc/users-guide.html +6 -5
- data/lib/erubis.rb +3 -3
- data/lib/erubis/context.rb +2 -2
- data/lib/erubis/converter.rb +2 -2
- data/lib/erubis/engine.rb +2 -2
- data/lib/erubis/engine/ec.rb +2 -2
- data/lib/erubis/engine/ejava.rb +2 -2
- data/lib/erubis/engine/ejavascript.rb +2 -2
- data/lib/erubis/engine/enhanced.rb +2 -2
- data/lib/erubis/engine/eperl.rb +2 -2
- data/lib/erubis/engine/ephp.rb +2 -2
- data/lib/erubis/engine/eruby.rb +2 -2
- data/lib/erubis/engine/escheme.rb +2 -2
- data/lib/erubis/engine/optimized.rb +2 -2
- data/lib/erubis/enhancer.rb +3 -3
- data/lib/erubis/error.rb +2 -2
- data/lib/erubis/evaluator.rb +2 -2
- data/lib/erubis/generator.rb +2 -2
- data/lib/erubis/helper.rb +2 -2
- data/lib/erubis/helpers/rails_form_helper.rb +2 -2
- data/lib/erubis/helpers/rails_helper.rb +2 -2
- data/lib/erubis/local-setting.rb +2 -2
- data/lib/erubis/main.rb +2 -2
- data/lib/erubis/preprocessing.rb +2 -2
- data/lib/erubis/tiny.rb +2 -2
- data/test/assert-text-equal.rb +2 -2
- data/test/test-engines.rb +2 -2
- data/test/test-enhancers.rb +30 -3
- data/test/test-erubis.rb +2 -2
- data/test/test-main.rb +2 -2
- data/test/test-users-guide.rb +2 -2
- data/test/test.rb +2 -2
- data/test/testutil.rb +2 -2
- metadata +32 -32
data/CHANGES.txt
CHANGED
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
# -*- coding: utf-8 -*-
|
|
2
|
-
# $Release: 2.6.
|
|
3
|
-
# copyright(c) 2006-
|
|
2
|
+
# $Release: 2.6.6 $
|
|
3
|
+
# copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
- release: 2.6.6
|
|
7
|
+
date: 2010-06-27
|
|
8
|
+
bugfixes:
|
|
9
|
+
|
|
10
|
+
- |
|
|
11
|
+
Fixed a bug around InterporationEnhancer and FastEruby to escape back-quote. (thanks to Andrew R Jackson)
|
|
4
12
|
|
|
5
13
|
|
|
6
14
|
- release: 2.6.5
|
data/MIT-LICENSE
CHANGED
data/README.txt
CHANGED
data/benchmark/bench.rb
CHANGED
data/bin/erubis
CHANGED
data/contrib/erubis
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
###
|
|
4
|
-
### $Release: 2.6.
|
|
5
|
-
### copyright(c) 2006-
|
|
4
|
+
### $Release: 2.6.6 $
|
|
5
|
+
### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
6
6
|
###
|
|
7
7
|
|
|
8
8
|
#--begin of require 'erubis/main'
|
|
9
9
|
###
|
|
10
|
-
### $Release: 2.6.
|
|
11
|
-
### copyright(c) 2006-
|
|
10
|
+
### $Release: 2.6.6 $
|
|
11
|
+
### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
12
12
|
###
|
|
13
13
|
|
|
14
14
|
require 'yaml'
|
|
15
15
|
#--begin of require 'erubis'
|
|
16
16
|
##
|
|
17
|
-
## $Release: 2.6.
|
|
18
|
-
## copyright(c) 2006-
|
|
17
|
+
## $Release: 2.6.6 $
|
|
18
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
19
19
|
##
|
|
20
20
|
|
|
21
21
|
##
|
|
@@ -62,20 +62,20 @@ require 'yaml'
|
|
|
62
62
|
|
|
63
63
|
|
|
64
64
|
module Erubis
|
|
65
|
-
VERSION = ('$Release: 2.6.
|
|
65
|
+
VERSION = ('$Release: 2.6.6 $' =~ /([.\d]+)/) && $1
|
|
66
66
|
end
|
|
67
67
|
|
|
68
68
|
#--begin of require 'erubis/engine'
|
|
69
69
|
##
|
|
70
|
-
## $Release: 2.6.
|
|
71
|
-
## copyright(c) 2006-
|
|
70
|
+
## $Release: 2.6.6 $
|
|
71
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
72
72
|
##
|
|
73
73
|
|
|
74
74
|
|
|
75
75
|
#--begin of require 'erubis/generator'
|
|
76
76
|
##
|
|
77
|
-
## $Release: 2.6.
|
|
78
|
-
## copyright(c) 2006-
|
|
77
|
+
## $Release: 2.6.6 $
|
|
78
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
79
79
|
##
|
|
80
80
|
|
|
81
81
|
#--begin of require 'abstract'
|
|
@@ -237,8 +237,8 @@ end
|
|
|
237
237
|
#--end of require 'erubis/generator'
|
|
238
238
|
#--begin of require 'erubis/converter'
|
|
239
239
|
##
|
|
240
|
-
## $Release: 2.6.
|
|
241
|
-
## copyright(c) 2006-
|
|
240
|
+
## $Release: 2.6.6 $
|
|
241
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
242
242
|
##
|
|
243
243
|
|
|
244
244
|
#--already included require 'abstract'
|
|
@@ -596,14 +596,14 @@ end
|
|
|
596
596
|
#--end of require 'erubis/converter'
|
|
597
597
|
#--begin of require 'erubis/evaluator'
|
|
598
598
|
##
|
|
599
|
-
## $Release: 2.6.
|
|
600
|
-
## copyright(c) 2006-
|
|
599
|
+
## $Release: 2.6.6 $
|
|
600
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
601
601
|
##
|
|
602
602
|
|
|
603
603
|
#--begin of require 'erubis/error'
|
|
604
604
|
##
|
|
605
|
-
## $Release: 2.6.
|
|
606
|
-
## copyright(c) 2006-
|
|
605
|
+
## $Release: 2.6.6 $
|
|
606
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
607
607
|
##
|
|
608
608
|
|
|
609
609
|
module Erubis
|
|
@@ -627,8 +627,8 @@ end
|
|
|
627
627
|
#--end of require 'erubis/error'
|
|
628
628
|
#--begin of require 'erubis/context'
|
|
629
629
|
##
|
|
630
|
-
## $Release: 2.6.
|
|
631
|
-
## copyright(c) 2006-
|
|
630
|
+
## $Release: 2.6.6 $
|
|
631
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
632
632
|
##
|
|
633
633
|
|
|
634
634
|
|
|
@@ -911,8 +911,8 @@ end
|
|
|
911
911
|
#require 'erubis/context'
|
|
912
912
|
#--begin of require 'erubis/helper'
|
|
913
913
|
##
|
|
914
|
-
## $Release: 2.6.
|
|
915
|
-
## copyright(c) 2006-
|
|
914
|
+
## $Release: 2.6.6 $
|
|
915
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
916
916
|
##
|
|
917
917
|
|
|
918
918
|
|
|
@@ -960,8 +960,8 @@ end
|
|
|
960
960
|
#--end of require 'erubis/helper'
|
|
961
961
|
#--begin of require 'erubis/enhancer'
|
|
962
962
|
##
|
|
963
|
-
## $Release: 2.6.
|
|
964
|
-
## copyright(c) 2006-
|
|
963
|
+
## $Release: 2.6.6 $
|
|
964
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
965
965
|
##
|
|
966
966
|
|
|
967
967
|
|
|
@@ -1623,7 +1623,7 @@ module Erubis
|
|
|
1623
1623
|
|
|
1624
1624
|
def _add_text_to_str(str, text)
|
|
1625
1625
|
return if !text || text.empty?
|
|
1626
|
-
text.gsub!(/[
|
|
1626
|
+
text.gsub!(/[`\#\\]/, '\\\\\&')
|
|
1627
1627
|
str << text
|
|
1628
1628
|
end
|
|
1629
1629
|
|
|
@@ -1643,8 +1643,8 @@ end
|
|
|
1643
1643
|
#require 'erubis/tiny'
|
|
1644
1644
|
#--begin of require 'erubis/engine/eruby'
|
|
1645
1645
|
##
|
|
1646
|
-
## $Release: 2.6.
|
|
1647
|
-
## copyright(c) 2006-
|
|
1646
|
+
## $Release: 2.6.6 $
|
|
1647
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
1648
1648
|
##
|
|
1649
1649
|
|
|
1650
1650
|
#--already included require 'erubis/engine'
|
|
@@ -1778,8 +1778,8 @@ end
|
|
|
1778
1778
|
|
|
1779
1779
|
#--begin of require 'erubis/local-setting'
|
|
1780
1780
|
##
|
|
1781
|
-
## $Release: 2.6.
|
|
1782
|
-
## copyright(c) 2006-
|
|
1781
|
+
## $Release: 2.6.6 $
|
|
1782
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
1783
1783
|
##
|
|
1784
1784
|
|
|
1785
1785
|
##
|
|
@@ -1790,8 +1790,8 @@ end
|
|
|
1790
1790
|
#--end of require 'erubis'
|
|
1791
1791
|
#--begin of require 'erubis/tiny'
|
|
1792
1792
|
##
|
|
1793
|
-
## $Release: 2.6.
|
|
1794
|
-
## copyright(c) 2006-
|
|
1793
|
+
## $Release: 2.6.6 $
|
|
1794
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
1795
1795
|
##
|
|
1796
1796
|
|
|
1797
1797
|
module Erubis
|
|
@@ -1936,8 +1936,8 @@ end
|
|
|
1936
1936
|
#--end of require 'erubis/tiny'
|
|
1937
1937
|
#--begin of require 'erubis/engine/enhanced'
|
|
1938
1938
|
##
|
|
1939
|
-
## $Release: 2.6.
|
|
1940
|
-
## copyright(c) 2006-
|
|
1939
|
+
## $Release: 2.6.6 $
|
|
1940
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
1941
1941
|
##
|
|
1942
1942
|
|
|
1943
1943
|
#--already included require 'erubis/enhancer'
|
|
@@ -2059,8 +2059,8 @@ end
|
|
|
2059
2059
|
#--end of require 'erubis/engine/enhanced'
|
|
2060
2060
|
#--begin of require 'erubis/engine/optimized'
|
|
2061
2061
|
##
|
|
2062
|
-
## $Release: 2.6.
|
|
2063
|
-
## copyright(c) 2006-
|
|
2062
|
+
## $Release: 2.6.6 $
|
|
2063
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
2064
2064
|
##
|
|
2065
2065
|
|
|
2066
2066
|
|
|
@@ -2189,8 +2189,8 @@ end
|
|
|
2189
2189
|
#--already included require 'erubis/engine/eruby'
|
|
2190
2190
|
#--begin of require 'erubis/engine/ephp'
|
|
2191
2191
|
##
|
|
2192
|
-
## $Release: 2.6.
|
|
2193
|
-
## copyright(c) 2006-
|
|
2192
|
+
## $Release: 2.6.6 $
|
|
2193
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
2194
2194
|
##
|
|
2195
2195
|
|
|
2196
2196
|
#--already included require 'erubis/engine'
|
|
@@ -2290,8 +2290,8 @@ end
|
|
|
2290
2290
|
#--end of require 'erubis/engine/ephp'
|
|
2291
2291
|
#--begin of require 'erubis/engine/ec'
|
|
2292
2292
|
##
|
|
2293
|
-
## $Release: 2.6.
|
|
2294
|
-
## copyright(c) 2006-
|
|
2293
|
+
## $Release: 2.6.6 $
|
|
2294
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
2295
2295
|
##
|
|
2296
2296
|
|
|
2297
2297
|
#--already included require 'erubis/engine'
|
|
@@ -2409,8 +2409,8 @@ end
|
|
|
2409
2409
|
#--end of require 'erubis/engine/ec'
|
|
2410
2410
|
#--begin of require 'erubis/engine/ejava'
|
|
2411
2411
|
##
|
|
2412
|
-
## $Release: 2.6.
|
|
2413
|
-
## copyright(c) 2006-
|
|
2412
|
+
## $Release: 2.6.6 $
|
|
2413
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
2414
2414
|
##
|
|
2415
2415
|
|
|
2416
2416
|
#--already included require 'erubis/engine'
|
|
@@ -2521,8 +2521,8 @@ end
|
|
|
2521
2521
|
#--end of require 'erubis/engine/ejava'
|
|
2522
2522
|
#--begin of require 'erubis/engine/escheme'
|
|
2523
2523
|
##
|
|
2524
|
-
## $Release: 2.6.
|
|
2525
|
-
## copyright(c) 2006-
|
|
2524
|
+
## $Release: 2.6.6 $
|
|
2525
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
2526
2526
|
##
|
|
2527
2527
|
|
|
2528
2528
|
#--already included require 'erubis/engine'
|
|
@@ -2637,8 +2637,8 @@ end
|
|
|
2637
2637
|
#--end of require 'erubis/engine/escheme'
|
|
2638
2638
|
#--begin of require 'erubis/engine/eperl'
|
|
2639
2639
|
##
|
|
2640
|
-
## $Release: 2.6.
|
|
2641
|
-
## copyright(c) 2006-
|
|
2640
|
+
## $Release: 2.6.6 $
|
|
2641
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
2642
2642
|
##
|
|
2643
2643
|
|
|
2644
2644
|
#--already included require 'erubis/engine'
|
|
@@ -2734,8 +2734,8 @@ end
|
|
|
2734
2734
|
#--end of require 'erubis/engine/eperl'
|
|
2735
2735
|
#--begin of require 'erubis/engine/ejavascript'
|
|
2736
2736
|
##
|
|
2737
|
-
## $Release: 2.6.
|
|
2738
|
-
## copyright(c) 2006-
|
|
2737
|
+
## $Release: 2.6.6 $
|
|
2738
|
+
## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
2739
2739
|
##
|
|
2740
2740
|
|
|
2741
2741
|
#--already included require 'erubis/engine'
|
data/contrib/inline-require
CHANGED
data/doc-api/classes/Erubis.html
CHANGED
|
@@ -328,7 +328,7 @@ Class <a href="Erubis/XmlEruby.html" class="link">Erubis::XmlEruby</a><br />
|
|
|
328
328
|
<tr class="top-aligned-row context-row">
|
|
329
329
|
<td class="context-item-name">VERSION</td>
|
|
330
330
|
<td>=</td>
|
|
331
|
-
<td class="context-item-value">('$Release: 2.6.
|
|
331
|
+
<td class="context-item-value">('$Release: 2.6.6 $' =~ /([.\d]+)/) && $1</td>
|
|
332
332
|
</tr>
|
|
333
333
|
</table>
|
|
334
334
|
</div>
|
|
@@ -133,7 +133,7 @@ this is only for <a href="Eruby.html">Eruby</a>.
|
|
|
133
133
|
<span class="ruby-comment cmt"># File erubis/enhancer.rb, line 663</span>
|
|
134
134
|
<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>)
|
|
135
135
|
<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>
|
|
136
|
-
<span class="ruby-identifier">text</span>.<span class="ruby-identifier">gsub!</span>(<span class="ruby-regexp re">/[
|
|
136
|
+
<span class="ruby-identifier">text</span>.<span class="ruby-identifier">gsub!</span>(<span class="ruby-regexp re">/[`\#\\]/</span>, <span class="ruby-value str">'\\\\\&'</span>)
|
|
137
137
|
<span class="ruby-identifier">str</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">text</span>
|
|
138
138
|
<span class="ruby-keyword kw">end</span>
|
|
139
139
|
</pre>
|
data/doc-api/created.rid
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
Sun, 27 Jun 2010 16:10:15 +0900
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
</tr>
|
|
57
57
|
<tr class="top-aligned-row">
|
|
58
58
|
<td><strong>Last Update:</strong></td>
|
|
59
|
-
<td>
|
|
59
|
+
<td>Sun Jun 27 16:10:14 +0900 2010</td>
|
|
60
60
|
</tr>
|
|
61
61
|
</table>
|
|
62
62
|
</div>
|
|
@@ -71,10 +71,10 @@
|
|
|
71
71
|
<div id="description">
|
|
72
72
|
<h1>README</h1>
|
|
73
73
|
<table>
|
|
74
|
-
<tr><td valign="top">release:</td><td>2.6.
|
|
74
|
+
<tr><td valign="top">release:</td><td>2.6.6
|
|
75
75
|
|
|
76
76
|
</td></tr>
|
|
77
|
-
<tr><td valign="top">copyright:</td><td>copyright(c) 2006-
|
|
77
|
+
<tr><td valign="top">copyright:</td><td>copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
|
|
78
78
|
|
|
79
79
|
</td></tr>
|
|
80
80
|
</table>
|