Implement Convert Post Conditional refactoring

README.md

@@ -2,12 +2,13 @@
 
 Ruby refactor is inspired by the Vim plugin vim-refactoring-ruby, currently found at https://github.com/ecomba/vim-ruby-refactoring.
 
-I've implemented 5 refactorings
+These are the refactorings available
  - Extract to Method  (C-c C-r e)
  - Extract Local Variable  (C-c C-r v)
  - Extract Constant  (C-c C-r c)
  - Add Parameter  (C-c C-r p)
  - Extract to Let  (C-c C-r l)
+ - Convert Post Conditional  (C-c C-r o)
 
 # Install
 To install manually, add ruby-refactor.el to your load path, then:
@@ -104,11 +105,28 @@ Oh, if you invoke with a prefix arg (`C-u`, etc.), it'll swap the placement
 of the let.  If you have location as top, a prefix argument will place
 it closest.  I kinda got nutty with this one.
 
+## Convert Post Conditional:
+Select a region of text and invoke `ruby-refactor-convert-post-conditional`.
+This simply moves the expression inside of an 'if' or 'unless' block.
+
+So this:
+
+```ruby
+do_some_stuff('blah') if condition
+```
+
+becomes
+
+```ruby
+if condition
+  do_some_stuff('blah')
+end
+```
+
 
 ## TODO
 From the vim plugin, these remain to be done (I don't plan to do them all.)
  - remove inline temp (sexy!)
- - convert post conditional
 
 
 # License

ruby-refactor.el

@@ -103,7 +103,6 @@
 ;; ## TODO
 ;; From the vim plugin, these remain to be done (I don't plan to do them all.)
 ;;  - remove inline temp (sexy!)
-;;  - convert post conditional
 
 ;;; Code:
 
@@ -163,6 +162,7 @@ being altered."
       (define-key prefix-map (kbd "l") 'ruby-refactor-extract-to-let)
       (define-key prefix-map (kbd "v") 'ruby-refactor-extract-local-variable)
       (define-key prefix-map (kbd "c") 'ruby-refactor-extract-constant)
+      (define-key prefix-map (kbd "o") 'ruby-refactor-convert-post-conditional)
       (define-key map ruby-refactor-keymap-prefix prefix-map))
     map)
   "Keymap to use in ruby refactor minor mode.")
@@ -428,7 +428,25 @@ If a region is not selected, the transformation uses the current line."
 (defun ruby-refactor-convert-post-conditional()
   "Convert post conditional expression to conditional expression"
   (interactive)
-  (error "Not Yet Implemented"))
+  (save-restriction
+    (save-match-data
+      (widen)
+      (let* ((text-begin (region-beginning))
+             (text-end (region-end))
+             (text (ruby-refactor-trim-newline-endings (buffer-substring-no-properties text-begin text-end)))
+             (conditional
+              (cond ((string-match-p "if" text) "if")
+                    ((string-match-p "unless" text) "unless")
+                    (t (error "You need an `if' or `unless' on the target line"))))
+             (line-components (ruby-refactor-trim-list (split-string text (format " %s " conditional)))))
+        (delete-region text-begin text-end)
+        (insert (format "%s %s" conditional (car line-components)))
+        (newline-and-indent)
+        (insert (format "%s" (cadr line-components)))
+        (newline-and-indent)
+        (insert "end")
+        (ruby-indent-line)
+        (search-backward conditional)))))
 
 ;;;###autoload
 (define-minor-mode ruby-refactor-mode