knu	2008-06-02 16:10:35 +0900 (Mon, 02 Jun 2008)

  New Revision: 16749

  Modified files:
    trunk/ChangeLog
    trunk/lib/erb.rb
    trunk/test/erb/test_erb.rb

  Log:
    * lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
      where tokens are not yilelded one by one.
    
    * test/erb/test_erb.rb (TestERBCore#_test_01)
      (TestERBCore#test_02_safe_04): The expected value should come
      first for assert_equal().


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16749&r2=16748&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/erb/test_erb.rb?r1=16749&r2=16748&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/erb.rb?r1=16749&r2=16748&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16748)
+++ ChangeLog	(revision 16749)
@@ -1,3 +1,12 @@
+Mon Jun  2 16:08:24 2008  Akinori MUSHA  <knu@i...>
+
+	* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
+	  where tokens are not yilelded one by one.
+
+	* test/erb/test_erb.rb (TestERBCore#_test_01)
+	  (TestERBCore#test_02_safe_04): The expected value should come
+	  first for assert_equal().
+
 Mon Jun  2 13:06:38 2008  NAKAMURA Usaku  <usa@r...>
 
 	* mkconfig.rb: hide build path from rbconfig.rb.
Index: lib/erb.rb
===================================================================
--- lib/erb.rb	(revision 16748)
+++ lib/erb.rb	(revision 16749)
@@ -329,15 +329,17 @@
       end
 
       def scan_line(line)
-	line.split(SplitRegexp).each do |token|
-	  next if token.empty?
-	  yield(token)
+	line.split(SplitRegexp).each do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            yield(token)
+          end
 	end
       end
 
       def trim_line1(line)
 	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
+          next if token.empty?
 	  if token == "%>\n"
 	    yield('%>')
 	    yield(:cr)
Index: test/erb/test_erb.rb
===================================================================
--- test/erb/test_erb.rb	(revision 16748)
+++ test/erb/test_erb.rb	(revision 16749)
@@ -54,16 +54,16 @@
 
   def _test_core(safe)
     erb = @erb.new("hello")
-    assert_equal(erb.result, "hello")
+    assert_equal("hello", erb.result)
 
     erb = @erb.new("hello", safe, 0)
-    assert_equal(erb.result, "hello")
+    assert_equal("hello", erb.result)
 
     erb = @erb.new("hello", safe, 1)
-    assert_equal(erb.result, "hello")
+    assert_equal("hello", erb.result)
 
     erb = @erb.new("hello", safe, 2)
-    assert_equal(erb.result, "hello")
+    assert_equal("hello", erb.result)
 
     src = <<EOS
 %% hi
@@ -159,7 +159,7 @@
 
   def test_safe_04
     erb = @erb.new('<%=$SAFE%>', 4)
-    assert_equal(erb.result(TOPLEVEL_BINDING.taint), '4')
+    assert_equal('4', erb.result(TOPLEVEL_BINDING.taint))
   end
 
   class Foo; end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/