summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--test/erb/test_erb.rb14
-rw-r--r--test/erb/trim_hello.erb4
3 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 46da6def95..63260bde9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jan 22 05:17:06 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/erb.rb (def_erb_method): pass the trim_mode [Feature #1032]
+
+ * test/erb/trim_hello.erb: ditto
+
+ * test/erb/test_erb.rb: ditto
+
Wed Jan 21 17:25:41 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (ary_double_capa): a new function to expand array more
diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb
index 4f2f5bec19..2f4ce2fbbb 100644
--- a/test/erb/test_erb.rb
+++ b/test/erb/test_erb.rb
@@ -234,7 +234,19 @@ EOS
klass.module_eval do
def_erb_method('hello_world', erb)
end
- assert(klass.new.respond_to?('hello_world'))
+ assert(klass.new.respond_to?('hello_world'))
+
+ klass.module_eval do
+ def_erb_method('trim_hello', File.join(File.dirname(File.expand_path(__FILE__)), 'trim_hello.erb'), '-')
+ end
+ assert(klass.new.respond_to?('trim_hello'))
+ ans = <<EOS
+= hello
+* 0
+* 1
+* 2
+EOS
+ assert_equal(ans, klass.new.trim_hello)
end
def test_escape
diff --git a/test/erb/trim_hello.erb b/test/erb/trim_hello.erb
new file mode 100644
index 0000000000..cab53c2e67
--- /dev/null
+++ b/test/erb/trim_hello.erb
@@ -0,0 +1,4 @@
+= hello
+<%- 3.times do |n| -%>
+* <%= n %>
+<%- end -%>