From b33172c14b7a39a064a31fccadd2a57d87159aa0 Mon Sep 17 00:00:00 2001
From: dima <dima.exe@gmail.com>
Date: Thu, 5 Mar 2009 16:50:37 +0300
Subject: [PATCH] Update menus.

---
 bundles/rails-basic-bundle.el     |  4 +---
 bundles/rails-generator-bundle.el | 18 ++++++++++++++----
 bundles/rails-rake-bundle.el      | 10 +++-------
 bundles/rails-webserver-bundle.el |  2 +-
 rails-anything.el                 |  3 +++
 rails-reloaded.el                 |  3 ++-
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/bundles/rails-basic-bundle.el b/bundles/rails-basic-bundle.el
index 6dfb8a6..541abe5 100644
--- a/bundles/rails-basic-bundle.el
+++ b/bundles/rails-basic-bundle.el
@@ -51,9 +51,7 @@
     t))
 
 (rails/defbundle "Basic"
-  (:menu
-   (([new] (cons "Create a new view for current file" 'identity))
-    ([new2] (cons "Create a new view for current file" 'identity))))
+  ()
 
   (rails/defresource 'controller "Controller"
                      :dir "app/controllers"
diff --git a/bundles/rails-generator-bundle.el b/bundles/rails-generator-bundle.el
index 9589f86..9148639 100644
--- a/bundles/rails-generator-bundle.el
+++ b/bundles/rails-generator-bundle.el
@@ -129,6 +129,16 @@
   (when-bind (root (rails/root))
     (rails/generator-bundle/create-cache root)))
 
+(defun rails/generator-bundle/gen ()
+  (interactive)
+  (when-bind (root (rails/root))
+    (rails/anything/run-with-pattern "gen ")))
+
+(defun rails/generator-bundle/des ()
+  (interactive)
+  (when-bind (root (rails/root))
+    (rails/anything/run-with-pattern "des ")))
+
 ;;; ---------------------------------------------------------
 ;;; - Bundle
 ;;;
@@ -136,11 +146,11 @@
 (rails/defbundle "Generator"
   (:menu
    (([reset]   (cons "Reset Cache" 'rails/generator-bundle/reset-cache))
-    ([destroy] (cons "Destroy" 'rails/generator-bundle/destroy))
-    ([create]  (cons "Generate" 'rails/generator-bundle/generate)))
+    ([destroy] (cons "Destroy" 'rails/generator-bundle/des))
+    ([create]  (cons "Generate" 'rails/generator-bundle/gen)))
    :keys
-   (("e" 'rails/generator-bundle/generate)
-    ("E" 'rails/generator-bundle/destroy))
+   (("e" 'rails/generator-bundle/gen)
+    ("E" 'rails/generator-bundle/des))
    :triggers
    (("gen" "Generate"
      (candidates
diff --git a/bundles/rails-rake-bundle.el b/bundles/rails-rake-bundle.el
index 034d897..bdb04e4 100644
--- a/bundles/rails-rake-bundle.el
+++ b/bundles/rails-rake-bundle.el
@@ -179,7 +179,7 @@
   "List of availabled Rake tasks."
   (interactive)
   (when-bind (root (rails/root))
-    (anything (rails/anything/load-triggers) "rake")))
+    (rails/anything/run-with-pattern "rake ")))
 
 ;;; ---------------------------------------------------------
 ;;; - Bundle
@@ -188,13 +188,9 @@
 (rails/defbundle "Rake"
   (:menu
    (([reset]     (cons "Reset Tasks Cache" 'rails/rake-bundle/reset-cache))
-    ([list]      (cons "List Tasks" 'rails/rake-bundle/list-tasks))
-    ([task-args] (cons "Run Rake Task with Arguments" 'rails/rake-bundle/run-with-args))
-    ([task]      (cons "Run Rake Task" 'rails/rake-bundle/run)))
+    ([task]      (cons "Run Rake Task" 'rails/rake-bundle/list-tasks)))
    :keys
-   (("r"    'rails/rake-bundle/run)
-    ("R"    'rails/rake-bundle/run-with-args)
-    ("\C-r" 'rails/rake-bundle/list-tasks))
+   (("r"    'rails/rake-bundle/anything))
    :triggers
    (("rake" "Rake Task"
      (candidates
diff --git a/bundles/rails-webserver-bundle.el b/bundles/rails-webserver-bundle.el
index 5528df2..bb3f6ec 100644
--- a/bundles/rails-webserver-bundle.el
+++ b/bundles/rails-webserver-bundle.el
@@ -135,7 +135,7 @@
       (unless port
         (setq port (rails/completing-read "and port"
                                           nil
-                                          t
+                                          nil
                                           (format "%s" rails/webserver-bundle/port)))
         (when (zerop (string-to-number port))
           (setq port rails/webserver-bundle/port)))
diff --git a/rails-anything.el b/rails-anything.el
index eb771b2..757d505 100644
--- a/rails-anything.el
+++ b/rails-anything.el
@@ -170,6 +170,9 @@
                          t))
       (anything result))))
 
+(defun rails/anything/run-with-pattern (pattern)
+  (anything (rails/anything/load-triggers) pattern))
+
 ;;; ---------------------------------------------------------
 ;;; - advice anything sources
 ;;;
diff --git a/rails-reloaded.el b/rails-reloaded.el
index 263ff40..a39dfe5 100644
--- a/rails-reloaded.el
+++ b/rails-reloaded.el
@@ -191,7 +191,8 @@
       ([rails toggle toggle-test]    (cons "Toggle Test/Implementation" 'rails/resources/toggle-test))
       ([rails toggle toggle]         (cons "Toggle" 'rails/resources/toggle))
       ([rails toggle goto]           (cons "Go to..." 'rails/goto-associated))
-      ([rails goto]                (cons "Go To" (make-sparse-keymap))))
+      ([rails goto]                (cons "Go To" (make-sparse-keymap)))
+      ([rails find]                (cons "Find file" 'rails/goto)))
   map))
 
 (defun rails-minor-mode-environments-menu (&optional args)