Added support rspec to the views.

dmexe · Mar 4, 2009 · 45f33a4 · 45f33a4
1 parent 4d903b5
commit 45f33a4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/bundles/rails-basic-bundle.el b/bundles/rails-basic-bundle.el
@@ -22,7 +22,7 @@
 
   (rails/defresource 'view "View"
                      :dir "app/views"
-                     :group 'view
+                     :group 'viewa
                      :file-pattern "{name}/.*"
                      :get-action-func '(lambda() (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))
                      :options 'expand-in-menu

diff --git a/bundles/rails-rspec-bundle.el b/bundles/rails-rspec-bundle.el
@@ -89,4 +89,13 @@
                      :dir "spec/factories"
                      :file-ext  "rb"
                      :options  'pluralize
-                     :link-to 'model-spec))
+                     :link-to 'model-spec)
+
+  (rails/defresource 'view-spec "RSpec View"
+                     :group 'views
+                     :dir "spec/views"
+                     :file-suffix  "_spec"
+                     :file-pattern "{name}/.*"
+                     :file-ext  "rb"
+                     :options 'expand-in-menu
+                     :test-to 'view ))
diff --git a/rails-compile.el b/rails-compile.el
@@ -96,8 +96,7 @@
                                       t)))
         file)
     (cond
-     ((and item
-           (if file-pattern match t))
+     (item
       (setq file (rails/resource-item-file item))
       (rails/compile/run root
                          command

diff --git a/rails-resources.el b/rails-resources.el
@@ -420,10 +420,23 @@
             when test
             return test)))
     (when test-res
-      (car
-       (rails/resources/get-associated-items-by-resource root
-                                                         rails-buffer
-                                                         test-res)))))
+      (let ((items (rails/resources/get-associated-items-by-resource
+                    root
+                    rails-buffer
+                    test-res))
+            (bfile (regexp-quote (file-name-nondirectory
+                                  (rails/resource-buffer-file rails-buffer)))))
+        (or
+         ;; try find in multiple items by regexp (eq using to find view spec)
+         (loop for it in items
+               for match = (string-ext/string=~
+                            bfile
+                            (rails/resource-item-file it)
+                            it)
+               when match
+               return it)
+         ;; return first
+        (car items))))))
 
 (defun rails/resources/test-buffer-p (root rails-buffer)
   "Return resource contains :test-to link, otherwise return nil."