erubis 1.0.0 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- data/ChangeLog +13 -4
- data/README +1 -1
- data/bin/erubis +5 -5
- data/doc/users-guide.html +13 -6
- data/lib/erubis.rb +5 -7
- data/test/test-bin.rb +2 -2
- data/test/test-erubis.rb +1 -1
- metadata +2 -2
data/ChangeLog
CHANGED
@@ -1,8 +1,17 @@
|
|
1
1
|
# $Rev$
|
2
|
-
# $Release: 1.0.
|
2
|
+
# $Release: 1.0.1 $
|
3
3
|
# copyright(c) 2006 kuwata-lab all rights reserved.
|
4
4
|
|
5
|
-
- release:
|
6
|
-
date:
|
7
|
-
desc:
|
5
|
+
- release: 1.0.1
|
6
|
+
date: 2005-02-01
|
7
|
+
desc:
|
8
|
+
- tag: bugfix
|
9
|
+
text: bin/erubis is available with RubyGems
|
10
|
+
|
11
|
+
- release: 1.0.0
|
12
|
+
date: 2005-02-01
|
13
|
+
desc:
|
14
|
+
- tag: note
|
15
|
+
text: first release
|
16
|
+
|
8
17
|
|
data/README
CHANGED
data/bin/erubis
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
#!/usr/bin/ruby
|
2
2
|
|
3
3
|
###
|
4
|
-
### $Rev:
|
5
|
-
### $Release: 1.0.
|
4
|
+
### $Rev: 4 $
|
5
|
+
### $Release: 1.0.1 $
|
6
6
|
### copyright(c) 2006 kuwata-lab all rights reserved.
|
7
7
|
###
|
8
8
|
|
@@ -113,7 +113,7 @@ END
|
|
113
113
|
end
|
114
114
|
|
115
115
|
def version
|
116
|
-
release = ('$Release: 1.0.
|
116
|
+
release = ('$Release: 1.0.1 $' =~ /([.\d]+)/) && $1
|
117
117
|
return release
|
118
118
|
end
|
119
119
|
|
@@ -175,7 +175,7 @@ END
|
|
175
175
|
end
|
176
176
|
|
177
177
|
|
178
|
-
if __FILE__ == $0
|
178
|
+
#if __FILE__ == $0
|
179
179
|
status = 0
|
180
180
|
begin
|
181
181
|
Main.new.execute(ARGV)
|
@@ -184,4 +184,4 @@ if __FILE__ == $0
|
|
184
184
|
status = 1
|
185
185
|
end
|
186
186
|
exit(status)
|
187
|
-
end
|
187
|
+
#end
|
data/doc/users-guide.html
CHANGED
@@ -14,7 +14,7 @@
|
|
14
14
|
|
15
15
|
<div align="left"><h1>Erubis Users' Guide</h1></div>
|
16
16
|
<div align="left">
|
17
|
-
last update: $Date: 2006-01
|
17
|
+
last update: $Date: 2006-02-01 19:54:24 +0900 (Wed, 01 Feb 2006) $<br>
|
18
18
|
</div>
|
19
19
|
|
20
20
|
<a name="preface"></a>
|
@@ -91,22 +91,29 @@ It has the following features.
|
|
91
91
|
<ul type="disc">
|
92
92
|
<li>Or if you can be root user, download erubis-X.X.X.tar.bz2 and install by setup.rb.
|
93
93
|
<pre class="terminal">$ tar xjf erubis-X.X.X.tar.bz2
|
94
|
-
$ cd
|
95
|
-
$ ruby setup.rb
|
96
|
-
$ ruby setup.rb setup
|
97
|
-
$ sudo ruby setup.rb install
|
94
|
+
$ cd erubis_X.X.X/
|
95
|
+
$ ruby setup.rb
|
98
96
|
</pre>
|
99
97
|
</li>
|
100
98
|
</ul>
|
101
99
|
<ul type="disc">
|
102
100
|
<li>Else you should copy 'lib/erubis.rb' and 'bin/erubis' into proper directory manually.
|
103
101
|
<pre class="terminal">$ tar xjf erubis-X.X.X.tar.bz2
|
104
|
-
$ cd
|
102
|
+
$ cd erubis_X.X.X/
|
105
103
|
$ cp lib/erubis.rb /usr/local/lib/ruby/site_ruby/1.8
|
106
104
|
$ cp bin/erubis /usr/local/bin
|
107
105
|
</pre>
|
108
106
|
</li>
|
109
107
|
</ul>
|
108
|
+
<ul type="disc">
|
109
|
+
<li>(Optional) 'contrib/inline-require' enables you to merge 'lib/erubis.rb' into 'bin/erubis'.
|
110
|
+
<pre class="terminal">$ tar xjf erubis-X.X.X.tar.bz2
|
111
|
+
$ cd erubis_X.X.X/
|
112
|
+
$ unset RUBYLIB
|
113
|
+
$ contrib/inline-require -I lib bin/erubis > contrib/erubis
|
114
|
+
</pre>
|
115
|
+
</li>
|
116
|
+
</ul>
|
110
117
|
<br>
|
111
118
|
|
112
119
|
|
data/lib/erubis.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
##
|
2
|
-
## $Rev:
|
3
|
-
## $Release: 1.0.
|
2
|
+
## $Rev: 4 $
|
3
|
+
## $Release: 1.0.1 $
|
4
4
|
## copyright(c) 2006 kuwata-lab all rights reserved.
|
5
5
|
##
|
6
6
|
|
@@ -82,7 +82,7 @@ module Erubis
|
|
82
82
|
return result(binding())
|
83
83
|
end
|
84
84
|
|
85
|
-
private
|
85
|
+
#private
|
86
86
|
|
87
87
|
def compile(input)
|
88
88
|
src = ""
|
@@ -90,10 +90,8 @@ module Erubis
|
|
90
90
|
prefix, postfix = @pattern.split()
|
91
91
|
regexp = /(.*?)(^[ \t]*)?#{prefix}(=*)(.*?)#{postfix}([ \t]*\r?\n)?/m
|
92
92
|
input.scan(regexp) do |text, head_space, indicator, code, tail_space|
|
93
|
-
## * when <%=
|
94
|
-
## * when <%
|
95
|
-
## - if before/after string is spaces then delete those spaces
|
96
|
-
## - else do nothing
|
93
|
+
## * when '<%= %>', do nothing
|
94
|
+
## * when '<% %>', delete spaces iff only spaces are around '<% %>'
|
97
95
|
flag_trim = @trim && indicator.empty? && head_space && tail_space
|
98
96
|
add_src_text(src, text)
|
99
97
|
add_src_text(src, head_space) if !flag_trim && head_space
|
data/test/test-bin.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
##
|
2
2
|
## $Rev: 3 $
|
3
|
-
## $Release: 1.0.
|
3
|
+
## $Release: 1.0.1 $
|
4
4
|
## $Date: 2006-01-31 12:54:23 +0900 (Tue, 31 Jan 2006) $
|
5
5
|
##
|
6
6
|
|
@@ -75,7 +75,7 @@ END
|
|
75
75
|
|
76
76
|
def test_version
|
77
77
|
@options = '-v'
|
78
|
-
@expected = (("$Release: 1.0.
|
78
|
+
@expected = (("$Release: 1.0.1 $" =~ /[.\d]+/) && $&) + "\n"
|
79
79
|
@filename = false
|
80
80
|
_test()
|
81
81
|
end
|
data/test/test-erubis.rb
CHANGED