Make Haml::Util.caller_info work w/some weird Rubinius formatting.

brandondrew · May 15, 2010 · c901083 · c901083
1 parent b0c6cb7
commit c901083
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/lib/haml/util.rb b/lib/haml/util.rb
@@ -219,6 +219,8 @@ def lcs(x, y, &block)
     def caller_info(entry = caller[1])
       info = entry.scan(/^(.*?):(-?.*?)(?::.*`(.+)')?$/).first
       info[1] = info[1].to_i
+      # This is added by Rubinius to designate a block, but we don't care about it.
+      info[2].sub!(/ \{\}\Z/, '') if info[2]
       info
     end
 

diff --git a/test/haml/util_test.rb b/test/haml/util_test.rb
@@ -211,6 +211,7 @@ def test_caller_info
     assert_equal(["(haml)", 12, "blah"], caller_info("(haml):12: in `blah'"))
     assert_equal(["", 12, "boop"], caller_info(":12: in `boop'"))
     assert_equal(["/tmp/foo.rb", -12, "fizzle"], caller_info("/tmp/foo.rb:-12: in `fizzle'"))
+    assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle {}'"))
   end
 
   def test_def_static_method