0
@@ -47,4 +47,4 @@ namespace "doc" do
0
 
0
 end
0
 
0
-task :default => :test
0
+task :default => :'test:emacs'

0
@@ -62,6 +62,9 @@
0
   "TAGS"
0
   "Path to your TAGS file inside of your rails project.  See `tags-file-name'.")
0
 
0
+(defvar rinari-minor-mode-hook nil
0
+  "*Hook for customising Rinari.")
0
+
0
 (defadvice find-file-in-project (around find-file-in-rinari-project activate)
0
   "Wrap `find-file-in-project' to use `rinari-root' as the base of
0
   the project."
0
@@ -264,28 +267,31 @@ With optional prefix argument just run `rgrep'."
0
   rinari-minor-mode-keybindings)
0
 
0
 (defun rinari-launch ()
0
-  "Run `rinari-minor-mode' if inside of a rails projcect,
0
+  "Run `rinari-minor-mode' if inside of a rails projecct,
0
 otherwise turn `rinari-minor-mode' off if it is on."
0
   (interactive)
0
   (let* ((root (rinari-root)) (r-tags-path (concat root rinari-tags-file-name)))
0
-    (if root
0
-	(progn
0
-	  ;; customize toggle.el for rinari
0
-	  (add-to-list
0
-	   'toggle-mapping-styles
0
-	   '(rinari  . (("app/controllers/\\1.rb#\\2" . "test/functional/\\1_test.rb#test_\\2")
0
-			("app/controllers/\\1.rb"     . "test/functional/\\1_test.rb")
0
-			("app/models/\\1.rb#\\2"      . "test/unit/\\1_test.rb#test_\\2")
0
-			("app/models/\\1.rb"          . "test/unit/\\1_test.rb")
0
-			("lib/\\1.rb#\\2"             . "test/unit/test_\\1.rb#test_\\2")
0
-			("lib/\\1.rb"                 . "test/unit/test_\\1.rb"))))
0
-	  (setq toggle-mapping-style 'rinari)
0
-	  (setq toggle-mappings (toggle-style toggle-mapping-style))
0
-	  (setq toggle-which-function-command 'ruby-add-log-current-method)
0
-	  (setq toggle-method-format "def %s")
0
-	  (if (file-exists-p r-tags-path) (setq tags-file-name r-tags-path))
0
-	  (unless rinari-minor-mode (rinari-minor-mode t)))
0
-      (if rinari-minor-mode (rinari-minor-mode)))))
0
+    (when root
0
+      ;; customize toggle.el for rinari
0
+      (add-to-list
0
+       'toggle-mapping-styles
0
+       '(rinari  . (("app/controllers/\\1.rb#\\2" . "test/functional/\\1_test.rb#test_\\2")
0
+                    ("app/controllers/\\1.rb"     . "test/functional/\\1_test.rb")
0
+                    ("app/models/\\1.rb#\\2"      . "test/unit/\\1_test.rb#test_\\2")
0
+                    ("app/models/\\1.rb"          . "test/unit/\\1_test.rb")
0
+                    ("lib/\\1.rb#\\2"             . "test/unit/test_\\1.rb#test_\\2")
0
+                    ("lib/\\1.rb"                 . "test/unit/test_\\1.rb"))))
0
+      (set (make-local-variable 'toggle-mapping-style) 'rinari)
0
+      (set (make-local-variable 'toggle-which-function-command)
0
+           'ruby-add-log-current-method)
0
+      (set (make-local-variable 'toggle-mappings)
0
+           (toggle-style toggle-mapping-style))
0
+      (set (make-local-variable 'toggle-method-format) "def %s")
0
+      (set (make-local-variable 'tags-file-name)
0
+           (and (file-exists-p r-tags-path) r-tags-path))
0
+      (run-hooks 'rinari-minor-mode-hook)
0
+      ;; TODO: Why is there mode-toggling logic here? define-minor-mode handles that for us.
0
+      (unless rinari-minor-mode (rinari-minor-mode t)))))
0
 
0
 (defvar rinari-major-modes
0
   '('ruby-mode-hook 'yaml-mode-hook 'mumamo-after-change-major-mode-hook 'css-mode-hook

0
@@ -51,7 +51,7 @@
0
    (new-controller (concat default-directory "app/controllers/newone_controller.rb"))
0
    (new-model (concat default-directory "app/models/newone.rb")))
0
     (find-file new-controller)
0
-    (rinari-find-model) ;; answer yes to the prompt
0
+    (rinari-find-model) ;; answer yes to the prompt ;; TODO: find a way to mock out the prompt
0
     (kill-buffer (file-name-nondirectory new-model))
0
     (kill-buffer (file-name-nondirectory new-controller))
0
     (assert-that (file-exists-p new-model))
0
@@ -97,5 +97,20 @@
0
       (kill-buffer "units_controller_test.rb")
0
       (kill-buffer "units_controller.rb"))))
0
 
0
+;; TODO: for some reason this doesn't work inside the test body
0
+(add-hook 'rinari-minor-mode-hook '(lambda () (setq hooks-ran t)))
0
+
0
+(deftest rinari-hooks rinari-suite
0
+  (save-excursion
0
+    (unwind-protect ;; like ruby's ensure
0
+        (progn
0
+          (let ((default-directory (format "%s" (concat (file-name-directory
0
+                                                         (or load-file-name buffer-file-name))
0
+                                                        "rails-app/"))))
0
+            (find-file "app/controllers/units_controller.rb")
0
+            (assert-that hooks-ran)))
0
+      (kill-buffer "units_controller.rb")
0
+      (setq hooks-ran nil))))
0
+
0
 ;; (elunit-run-suite (elunit-get-suite 'rinari-movement-suite))
0
 (elunit "rinari-suite")