kwartz 3.1.1 → 3.1.2
Sign up to get free protection for your applications and to get access to all the features.
- data/ChangeLog +13 -2
- data/README.txt +1 -1
- data/bin/kwartz +1 -1
- data/doc-api/classes/ActionView.html +111 -0
- data/doc-api/classes/Kwartz.html +2 -2
- data/doc-api/classes/Kwartz/ElementExpander.html +1 -1
- data/doc-api/classes/Kwartz/Helper/ActionViewHelper.html +2 -2
- data/doc-api/classes/Kwartz/Helper/RailsTemplate.html +1 -1
- data/doc-api/created.rid +1 -1
- data/doc-api/files/__/README_txt.html +1 -1
- data/doc-api/files/kwartz/assert_rb.html +1 -1
- data/doc-api/files/kwartz/binding/eperl_rb.html +1 -1
- data/doc-api/files/kwartz/binding/erubis_rb.html +1 -1
- data/doc-api/files/kwartz/binding/eruby_rb.html +1 -1
- data/doc-api/files/kwartz/binding/jstl_rb.html +1 -1
- data/doc-api/files/kwartz/binding/php_rb.html +1 -1
- data/doc-api/files/kwartz/binding/pierubis_rb.html +1 -1
- data/doc-api/files/kwartz/binding/rails_rb.html +1 -1
- data/doc-api/files/kwartz/binding/ruby_rb.html +1 -1
- data/doc-api/files/kwartz/binding/struts_rb.html +1 -1
- data/doc-api/files/kwartz/config_rb.html +1 -1
- data/doc-api/files/kwartz/converter_rb.html +2 -2
- data/doc-api/files/kwartz/defun_rb.html +1 -1
- data/doc-api/files/kwartz/error_rb.html +1 -1
- data/doc-api/files/kwartz/helper/rails_rb.html +2 -2
- data/doc-api/files/kwartz/main_rb.html +1 -1
- data/doc-api/files/kwartz/node_rb.html +1 -1
- data/doc-api/files/kwartz/parser_rb.html +1 -1
- data/doc-api/files/kwartz/translator_rb.html +1 -1
- data/doc-api/files/kwartz/util/assert-text-equal_rb.html +1 -1
- data/doc-api/files/kwartz/util/testcase-helper_rb.html +1 -1
- data/doc-api/files/kwartz/util_rb.html +1 -1
- data/doc-api/files/kwartz_rb.html +1 -1
- data/doc-api/fr_class_index.html +1 -0
- data/doc/pattern-catalog.html +1 -1
- data/doc/reference.html +1 -1
- data/doc/users-guide.html +1 -1
- data/kwartz.gemspec +2 -2
- data/lib/kwartz.rb +2 -2
- data/lib/kwartz/assert.rb +1 -1
- data/lib/kwartz/binding/eperl.rb +1 -1
- data/lib/kwartz/binding/erubis.rb +1 -1
- data/lib/kwartz/binding/eruby.rb +1 -1
- data/lib/kwartz/binding/jstl.rb +1 -1
- data/lib/kwartz/binding/php.rb +1 -1
- data/lib/kwartz/binding/pierubis.rb +1 -1
- data/lib/kwartz/binding/rails.rb +1 -1
- data/lib/kwartz/binding/ruby.rb +1 -1
- data/lib/kwartz/binding/struts.rb +1 -1
- data/lib/kwartz/config.rb +1 -1
- data/lib/kwartz/converter.rb +4 -4
- data/lib/kwartz/defun.rb +1 -1
- data/lib/kwartz/error.rb +1 -1
- data/lib/kwartz/helper/rails.rb +35 -6
- data/lib/kwartz/main.rb +1 -1
- data/lib/kwartz/node.rb +1 -1
- data/lib/kwartz/parser.rb +1 -1
- data/lib/kwartz/translator.rb +1 -1
- data/lib/kwartz/util.rb +1 -1
- data/lib/kwartz/util/assert-text-equal.rb +1 -1
- data/lib/kwartz/util/testcase-helper.rb +1 -1
- data/test/test-compile.rb +1 -1
- data/test/test-converter.rb +1 -1
- data/test/test-directives.rb +1 -1
- data/test/test-main.rb +1 -1
- data/test/test-parser.rb +1 -1
- data/test/test-parser.yaml +1 -1
- data/test/test-rails.rb +1 -1
- data/test/test-ruleset.rb +1 -1
- data/test/test.rb +1 -1
- metadata +3 -2
data/ChangeLog
CHANGED
|
@@ -1,6 +1,17 @@
|
|
|
1
1
|
.+document: ChangeLog
|
|
2
|
-
.?release: $Release: 3.1.
|
|
3
|
-
.?updated: $Date: 2006-
|
|
2
|
+
.?release: $Release: 3.1.2 $
|
|
3
|
+
.?updated: $Date: 2006-10-22 12:04:52 +0900 (Sun, 22 Oct 2006) $
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
* Release 3.1.2 (2006-10-22)
|
|
7
|
+
|
|
8
|
+
[enhancements from 3.1.1]
|
|
9
|
+
|
|
10
|
+
- Error reporting improved when using with Ruby on Rails.
|
|
11
|
+
'kwartz/helper/rails.rb' now show template filename and
|
|
12
|
+
linenumber on where exception raised.
|
|
13
|
+
Notice that you have to read *.cache file instead of *.html
|
|
14
|
+
or *.plogic.
|
|
4
15
|
|
|
5
16
|
|
|
6
17
|
* Release 3.1.1 (2006-09-29)
|
data/README.txt
CHANGED
data/bin/kwartz
CHANGED
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="iso-8859-1"?>
|
|
2
|
+
<!DOCTYPE html
|
|
3
|
+
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
|
4
|
+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
|
5
|
+
|
|
6
|
+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
|
7
|
+
<head>
|
|
8
|
+
<title>Module: ActionView</title>
|
|
9
|
+
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
|
10
|
+
<meta http-equiv="Content-Script-Type" content="text/javascript" />
|
|
11
|
+
<link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
|
|
12
|
+
<script type="text/javascript">
|
|
13
|
+
// <![CDATA[
|
|
14
|
+
|
|
15
|
+
function popupCode( url ) {
|
|
16
|
+
window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
function toggleCode( id ) {
|
|
20
|
+
if ( document.getElementById )
|
|
21
|
+
elem = document.getElementById( id );
|
|
22
|
+
else if ( document.all )
|
|
23
|
+
elem = eval( "document.all." + id );
|
|
24
|
+
else
|
|
25
|
+
return false;
|
|
26
|
+
|
|
27
|
+
elemStyle = elem.style;
|
|
28
|
+
|
|
29
|
+
if ( elemStyle.display != "block" ) {
|
|
30
|
+
elemStyle.display = "block"
|
|
31
|
+
} else {
|
|
32
|
+
elemStyle.display = "none"
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
return true;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
// Make codeblocks hidden by default
|
|
39
|
+
document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
|
|
40
|
+
|
|
41
|
+
// ]]>
|
|
42
|
+
</script>
|
|
43
|
+
|
|
44
|
+
</head>
|
|
45
|
+
<body>
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
<div id="classHeader">
|
|
50
|
+
<table class="header-table">
|
|
51
|
+
<tr class="top-aligned-row">
|
|
52
|
+
<td><strong>Module</strong></td>
|
|
53
|
+
<td class="class-name-in-header">ActionView</td>
|
|
54
|
+
</tr>
|
|
55
|
+
<tr class="top-aligned-row">
|
|
56
|
+
<td><strong>In:</strong></td>
|
|
57
|
+
<td>
|
|
58
|
+
<a href="../files/kwartz/helper/rails_rb.html">
|
|
59
|
+
kwartz/helper/rails.rb
|
|
60
|
+
</a>
|
|
61
|
+
<br />
|
|
62
|
+
</td>
|
|
63
|
+
</tr>
|
|
64
|
+
|
|
65
|
+
</table>
|
|
66
|
+
</div>
|
|
67
|
+
<!-- banner header -->
|
|
68
|
+
|
|
69
|
+
<div id="bodyContent">
|
|
70
|
+
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
<div id="contextContent">
|
|
74
|
+
|
|
75
|
+
<div id="description">
|
|
76
|
+
<p>
|
|
77
|
+
override ActionView#initialize to show error message correctly
|
|
78
|
+
</p>
|
|
79
|
+
|
|
80
|
+
</div>
|
|
81
|
+
|
|
82
|
+
|
|
83
|
+
</div>
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
</div>
|
|
87
|
+
|
|
88
|
+
|
|
89
|
+
<!-- if includes -->
|
|
90
|
+
|
|
91
|
+
<div id="section">
|
|
92
|
+
|
|
93
|
+
|
|
94
|
+
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
<!-- if method_list -->
|
|
101
|
+
|
|
102
|
+
|
|
103
|
+
</div>
|
|
104
|
+
|
|
105
|
+
|
|
106
|
+
<div id="validator-badges">
|
|
107
|
+
<p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
|
|
108
|
+
</div>
|
|
109
|
+
|
|
110
|
+
</body>
|
|
111
|
+
</html>
|
data/doc-api/classes/Kwartz.html
CHANGED
|
@@ -154,7 +154,7 @@
|
|
|
154
154
|
|
|
155
155
|
<div id="description">
|
|
156
156
|
<p>
|
|
157
|
-
$Rev: 136 $ $Release: 3.1.
|
|
157
|
+
$Rev: 136 $ $Release: 3.1.2 $ copyright(c) 2004-2006 kuwata-lab.com all rights reserved
|
|
158
158
|
</p>
|
|
159
159
|
|
|
160
160
|
</div>
|
|
@@ -239,7 +239,7 @@ Class <a href="Kwartz/Translator.html" class="link">Kwartz::Translator</a><br />
|
|
|
239
239
|
<tr class="top-aligned-row context-row">
|
|
240
240
|
<td class="context-item-name">RELEASE</td>
|
|
241
241
|
<td>=</td>
|
|
242
|
-
<td class="context-item-value">('$Release: 3.1.
|
|
242
|
+
<td class="context-item-value">('$Release: 3.1.2 $' =~ /\$Release: (\S+)\s*\$/) && $1</td>
|
|
243
243
|
</tr>
|
|
244
244
|
</table>
|
|
245
245
|
</div>
|
|
@@ -154,7 +154,7 @@ expand <a href="ElementInfo.html">ElementInfo</a>
|
|
|
154
154
|
<span class="ruby-comment cmt"># stmt = ExpandStatement.new(:cont, elem_info.name)</span>
|
|
155
155
|
<span class="ruby-comment cmt"># expand_statement(stmt, stmt_list, elem_info)</span>
|
|
156
156
|
<span class="ruby-comment cmt">#else</span>
|
|
157
|
-
<span class="ruby-comment cmt">#
|
|
157
|
+
<span class="ruby-comment cmt"># elem_info.logic.each do |stmt|</span>
|
|
158
158
|
<span class="ruby-comment cmt"># expand_statement(stmt, stmt_list, elem_info)</span>
|
|
159
159
|
<span class="ruby-comment cmt"># end</span>
|
|
160
160
|
<span class="ruby-comment cmt">#end</span>
|
|
@@ -166,7 +166,7 @@ ex.
|
|
|
166
166
|
onclick="toggleCode('M000026-source');return false;">[Source]</a></p>
|
|
167
167
|
<div class="method-source-code" id="M000026-source">
|
|
168
168
|
<pre>
|
|
169
|
-
<span class="ruby-comment cmt"># File kwartz/helper/rails.rb, line
|
|
169
|
+
<span class="ruby-comment cmt"># File kwartz/helper/rails.rb, line 385</span>
|
|
170
170
|
<span class="ruby-keyword kw">def</span> <span class="ruby-identifier">start_link_tag</span>(<span class="ruby-identifier">options</span>={}, <span class="ruby-identifier">html_options</span>=<span class="ruby-keyword kw">nil</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">parameters</span>)
|
|
171
171
|
<span class="ruby-identifier">s</span> = <span class="ruby-identifier">link_to</span>(<span class="ruby-value str">''</span>, <span class="ruby-identifier">options</span>, <span class="ruby-identifier">html_options</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">parameters</span>)
|
|
172
172
|
<span class="ruby-identifier">s</span>.<span class="ruby-identifier">sub!</span>(<span class="ruby-regexp re">/<\/a>\z/</span>, <span class="ruby-value str">''</span>)
|
|
@@ -195,7 +195,7 @@ href="ActionViewHelper.html#M000026">start_link_tag</a>()
|
|
|
195
195
|
onclick="toggleCode('M000027-source');return false;">[Source]</a></p>
|
|
196
196
|
<div class="method-source-code" id="M000027-source">
|
|
197
197
|
<pre>
|
|
198
|
-
<span class="ruby-comment cmt"># File kwartz/helper/rails.rb, line
|
|
198
|
+
<span class="ruby-comment cmt"># File kwartz/helper/rails.rb, line 394</span>
|
|
199
199
|
<span class="ruby-keyword kw">def</span> <span class="ruby-identifier">start_remote_link_tag</span>(<span class="ruby-identifier">options</span>={}, <span class="ruby-identifier">html_options</span>={})
|
|
200
200
|
<span class="ruby-identifier">s</span> = <span class="ruby-identifier">link_to_remote</span>(<span class="ruby-identifier">options</span>, <span class="ruby-identifier">html_options</span>)
|
|
201
201
|
<span class="ruby-identifier">s</span>.<span class="ruby-identifier">sub!</span>(<span class="ruby-regexp re">/<\/a>\z/</span>, <span class="ruby-value str">''</span>)
|
|
@@ -575,7 +575,7 @@ How to use <a href="../../Kwartz.html">Kwartz</a> in Rails:
|
|
|
575
575
|
]
|
|
576
576
|
<span class="ruby-identifier">mtime</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">mtime</span>(<span class="ruby-identifier">cache_filename</span>)
|
|
577
577
|
<span class="ruby-identifier">convert_flag</span> = <span class="ruby-identifier">filenames</span>.<span class="ruby-identifier">any?</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">filename</span><span class="ruby-operator">|</span>
|
|
578
|
-
<span class="ruby-identifier">test</span>(<span class="ruby-value">?f</span>, <span class="ruby-identifier">filename</span>) <span class="ruby-operator">&&</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">mtime</span>(<span class="ruby-identifier">filename</span>) <span class="ruby-operator">></span> <span class="ruby-identifier">mtime</span>
|
|
578
|
+
<span class="ruby-identifier">result</span> = <span class="ruby-identifier">test</span>(<span class="ruby-value">?f</span>, <span class="ruby-identifier">filename</span>) <span class="ruby-operator">&&</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">mtime</span>(<span class="ruby-identifier">filename</span>) <span class="ruby-operator">></span> <span class="ruby-identifier">mtime</span>
|
|
579
579
|
}
|
|
580
580
|
<span class="ruby-keyword kw">end</span>
|
|
581
581
|
|
data/doc-api/created.rid
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
Sun Oct 22 12:09:54 JST 2006
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
<div id="description">
|
|
72
72
|
<h1>README</h1>
|
|
73
73
|
<table>
|
|
74
|
-
<tr><td valign="top">release:</td><td>$Release: 3.1.
|
|
74
|
+
<tr><td valign="top">release:</td><td>$Release: 3.1.2 $
|
|
75
75
|
|
|
76
76
|
</td></tr>
|
|
77
77
|
<tr><td valign="top">copyright:</td><td>copyright(c) 2004-2006 kuwata-lab.com all rights reserved
|
|
@@ -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 Oct 22 02:31:56 JST 2006</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
|
-
$Rev:
|
|
73
|
+
$Rev: 148 $ $Release: 3.1.2 $ copyright(c) 2004-2006 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>
|
|
59
|
+
<td>Sun Oct 22 02:31:56 JST 2006</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
|
-
$Rev:
|
|
73
|
+
$Rev: 148 $ $Release: 3.1.2 $ copyright(c) 2004-2006 kuwata-lab.com all rights reserved
|
|
74
74
|
</p>
|
|
75
75
|
|
|
76
76
|
</div>
|
data/doc-api/fr_class_index.html
CHANGED
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
<div id="index">
|
|
21
21
|
<h1 class="section-bar">Classes</h1>
|
|
22
22
|
<div id="index-entries">
|
|
23
|
+
<a href="classes/ActionView.html">ActionView</a><br />
|
|
23
24
|
<a href="classes/Kwartz.html">Kwartz</a><br />
|
|
24
25
|
<a href="classes/Kwartz/Assertion.html">Kwartz::Assertion</a><br />
|
|
25
26
|
<a href="classes/Kwartz/AssertionError.html">Kwartz::AssertionError</a><br />
|
data/doc/pattern-catalog.html
CHANGED
data/doc/reference.html
CHANGED
data/doc/users-guide.html
CHANGED
data/kwartz.gemspec
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
### RubyGems Specification file for Kwartz-ruby
|
|
5
5
|
###
|
|
6
6
|
### $Rev: 142 $
|
|
7
|
-
### $Release: 3.1.
|
|
7
|
+
### $Release: 3.1.2 $
|
|
8
8
|
### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
|
|
9
9
|
###
|
|
10
10
|
|
|
@@ -14,7 +14,7 @@ spec = Gem::Specification.new do |s|
|
|
|
14
14
|
## package information
|
|
15
15
|
s.name = 'kwartz'
|
|
16
16
|
s.author = 'Makoto Kuwata'
|
|
17
|
-
s.version = ("$Release: 3.1.
|
|
17
|
+
s.version = ("$Release: 3.1.2 $" =~ /[\.\d]+/) && $&
|
|
18
18
|
s.platform = Gem::Platform::RUBY
|
|
19
19
|
s.homepage = 'http://www.kuwata-lab.com/kwartz'
|
|
20
20
|
s.summary = "a template system for Ruby, PHP, and Java"
|
data/lib/kwartz.rb
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
###
|
|
2
2
|
### $Rev: 136 $
|
|
3
|
-
### $Release: 3.1.
|
|
3
|
+
### $Release: 3.1.2 $
|
|
4
4
|
### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
|
|
5
5
|
###
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
module Kwartz
|
|
9
9
|
|
|
10
|
-
RELEASE = ('$Release: 3.1.
|
|
10
|
+
RELEASE = ('$Release: 3.1.2 $' =~ /\$Release: (\S+)\s*\$/) && $1
|
|
11
11
|
|
|
12
12
|
end
|
|
13
13
|
|
data/lib/kwartz/assert.rb
CHANGED
data/lib/kwartz/binding/eperl.rb
CHANGED
data/lib/kwartz/binding/eruby.rb
CHANGED
data/lib/kwartz/binding/jstl.rb
CHANGED
data/lib/kwartz/binding/php.rb
CHANGED
data/lib/kwartz/binding/rails.rb
CHANGED
data/lib/kwartz/binding/ruby.rb
CHANGED
data/lib/kwartz/config.rb
CHANGED
data/lib/kwartz/converter.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
###
|
|
2
|
-
### $Rev:
|
|
3
|
-
### $Release: 3.1.
|
|
2
|
+
### $Rev: 148 $
|
|
3
|
+
### $Release: 3.1.2 $
|
|
4
4
|
### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
|
|
5
5
|
###
|
|
6
6
|
|
|
@@ -457,7 +457,7 @@ module Kwartz
|
|
|
457
457
|
# stmt = ExpandStatement.new(:cont, elem_info.name)
|
|
458
458
|
# expand_statement(stmt, stmt_list, elem_info)
|
|
459
459
|
#else
|
|
460
|
-
#
|
|
460
|
+
# elem_info.logic.each do |stmt|
|
|
461
461
|
# expand_statement(stmt, stmt_list, elem_info)
|
|
462
462
|
# end
|
|
463
463
|
#end
|
|
@@ -913,7 +913,7 @@ module Kwartz
|
|
|
913
913
|
end
|
|
914
914
|
|
|
915
915
|
|
|
916
|
-
def _convert(stmt_list, start_tag_info=nil
|
|
916
|
+
def _convert(stmt_list, start_tag_info=nil)
|
|
917
917
|
start_tagname = start_tag_info ? start_tag_info.tagname : nil
|
|
918
918
|
start_linenum = @linenum
|
|
919
919
|
|
data/lib/kwartz/defun.rb
CHANGED
data/lib/kwartz/error.rb
CHANGED
data/lib/kwartz/helper/rails.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
###
|
|
2
|
-
### $Rev:
|
|
3
|
-
### $Release: 3.1.
|
|
2
|
+
### $Rev: 148 $
|
|
3
|
+
### $Release: 3.1.2 $
|
|
4
4
|
### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
|
|
5
5
|
###
|
|
6
6
|
|
|
@@ -88,7 +88,7 @@ module Kwartz
|
|
|
88
88
|
end
|
|
89
89
|
|
|
90
90
|
|
|
91
|
-
@@use_cache = nil
|
|
91
|
+
@@use_cache = nil # true: use cache, false: don't use cache, nil: use cache only when ENV['RAILS_ENV'] == 'production'
|
|
92
92
|
|
|
93
93
|
def self.use_cache
|
|
94
94
|
return @@use_cache
|
|
@@ -179,7 +179,7 @@ module Kwartz
|
|
|
179
179
|
]
|
|
180
180
|
mtime = File.mtime(cache_filename)
|
|
181
181
|
convert_flag = filenames.any? { |filename|
|
|
182
|
-
test(?f, filename) && File.mtime(filename) > mtime
|
|
182
|
+
result = test(?f, filename) && File.mtime(filename) > mtime
|
|
183
183
|
}
|
|
184
184
|
end
|
|
185
185
|
|
|
@@ -301,13 +301,16 @@ module Kwartz
|
|
|
301
301
|
|
|
302
302
|
## presentation data files
|
|
303
303
|
pdata = template
|
|
304
|
+
tmp_handler = Kwartz::Handler.get_class(@@lang).new(rulesets, properties)
|
|
304
305
|
config[:import_pdata].each do |hash|
|
|
305
306
|
filename = hash[:filename]
|
|
306
307
|
patterns = hash[:patterns]
|
|
307
|
-
tmp_handler = Kwartz::Handler.get_class(@@lang).new(rulesets, properties)
|
|
308
308
|
tmp_converter = Kwartz::TextConverter.new(tmp_handler, properties)
|
|
309
309
|
tmp_converter.convert(File.read(filename), filename)
|
|
310
310
|
handler._import_element_info_from_handler(tmp_handler, patterns)
|
|
311
|
+
tmp_handler2 = Kwartz::Handler.get_class(@@lang).new(rulesets, properties)
|
|
312
|
+
tmp_handler2._import_element_info_from_handler(tmp_handler, patterns)
|
|
313
|
+
tmp_handler = tmp_handler2
|
|
311
314
|
end if config[:import_pdata]
|
|
312
315
|
if test(?f, layout_pdata_filename)
|
|
313
316
|
converter.convert(pdata, template_pdata_filename)
|
|
@@ -406,7 +409,7 @@ end #module Kwartz
|
|
|
406
409
|
|
|
407
410
|
|
|
408
411
|
|
|
409
|
-
|
|
412
|
+
## override ActionController::Base::render
|
|
410
413
|
|
|
411
414
|
module ActionController #:nodoc:
|
|
412
415
|
|
|
@@ -435,3 +438,29 @@ module ActionController #:nodoc:
|
|
|
435
438
|
end
|
|
436
439
|
|
|
437
440
|
end
|
|
441
|
+
|
|
442
|
+
|
|
443
|
+
|
|
444
|
+
## override ActionView#initialize to show error message correctly
|
|
445
|
+
|
|
446
|
+
module ActionView
|
|
447
|
+
# The TemplateError exception is raised when the compilation of the template fails. This exception then gathers a
|
|
448
|
+
# bunch of intimate details and uses it to report a very precise exception message.
|
|
449
|
+
class TemplateError < ActionViewError #:nodoc:
|
|
450
|
+
|
|
451
|
+
alias _initialize_orig initialize
|
|
452
|
+
|
|
453
|
+
def initialize(base_path, file_name, assigns, source, original_exception)
|
|
454
|
+
suffix = Kwartz::Helper::RailsTemplate.pdata_suffix
|
|
455
|
+
len = suffix.length
|
|
456
|
+
if file_name[-len..-1] == suffix
|
|
457
|
+
file_name = file_name[0, file_name.length - len] + '.cache'
|
|
458
|
+
else
|
|
459
|
+
$stderr.puts "*** debug: kwartz/helper/rails.rb: cannot detect cache file name (template=#{file_name.inspect})"
|
|
460
|
+
end
|
|
461
|
+
_initialize_orig(base_path, file_name, assigns, source, original_exception)
|
|
462
|
+
end
|
|
463
|
+
|
|
464
|
+
end
|
|
465
|
+
|
|
466
|
+
end
|
data/lib/kwartz/main.rb
CHANGED
data/lib/kwartz/node.rb
CHANGED
data/lib/kwartz/parser.rb
CHANGED
data/lib/kwartz/translator.rb
CHANGED
data/lib/kwartz/util.rb
CHANGED
data/test/test-compile.rb
CHANGED
data/test/test-converter.rb
CHANGED
data/test/test-directives.rb
CHANGED
data/test/test-main.rb
CHANGED
data/test/test-parser.rb
CHANGED
data/test/test-parser.yaml
CHANGED
data/test/test-rails.rb
CHANGED
data/test/test-ruleset.rb
CHANGED
data/test/test.rb
CHANGED
metadata
CHANGED
|
@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
|
|
|
3
3
|
specification_version: 1
|
|
4
4
|
name: kwartz
|
|
5
5
|
version: !ruby/object:Gem::Version
|
|
6
|
-
version: 3.1.
|
|
7
|
-
date: 2006-
|
|
6
|
+
version: 3.1.2
|
|
7
|
+
date: 2006-10-22 00:00:00 +09:00
|
|
8
8
|
summary: a template system for Ruby, PHP, and Java
|
|
9
9
|
require_paths:
|
|
10
10
|
- lib
|
|
@@ -200,6 +200,7 @@ files:
|
|
|
200
200
|
- doc-api/fr_method_index.html
|
|
201
201
|
- doc-api/index.html
|
|
202
202
|
- doc-api/rdoc-style.css
|
|
203
|
+
- doc-api/classes/ActionView.html
|
|
203
204
|
- doc-api/classes/Kwartz
|
|
204
205
|
- doc-api/classes/Kwartz.html
|
|
205
206
|
- doc-api/classes/Test
|