* lisp/progmodes/ruby-mode.el (ruby-toggle-block): Guess the current block,

not just expect to be at its beginning.  Adjust callees.
Succeed when do-end block has no space before the pipe character.
(ruby-brace-to-do-end): When the original block is one-liner,
convert to multiline.  Reindent the result.

* test/automated/ruby-mode-tests.el:
(ruby-toggle-block-to-multiline): New test.
(ruby-should-indent-buffer, ruby-toggle-block-to-do-end)
(ruby-toggle-block-to-brace): Use buffer-string.

1 files changed, 7 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 541937ec4e7..a7e22aa9ae1 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-08  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el:
+        (ruby-toggle-block-to-multiline): New test.
+        (ruby-should-indent-buffer, ruby-toggle-block-to-do-end)
+        (ruby-toggle-block-to-brace): Use buffer-string.
+
 2012-09-07  Dmitry Gutov  <dgutov@yandex.ru>
 
         * automated/ruby-mode-tests.el: New tests (Bug#11613).