merge my emacs on rails.

Author: crazycode

vendor/80emacsonrails/emacs-rails/ChangeLog

@@ -1,3 +1,16 @@
+2008-12-09 "Joost Diepenmaat" <[email protected]>
+	* rails-ui.el: modeline code cleanup
+
+2008-12-08 "Joost Diepenmaat" <[email protected]>
+	* rails-ui.el: fixed keymap for modeline and use toggle-output-window
+
+2008-12-06 "Joost Diepenmaat" <[email protected]>
+	* rails-ui.el:  Added mode-line status reporting
+	* rails-test.el: Made rails-test:quiet the default
+
+2008-12-04 "Joost Diepenmaat" <[email protected]>
+	* rails-script.el: Added "Kill script" command to abort current script / rake task
+
 2008-04-29  Tom ten Thij  <[email protected]>
 
 	* rails.el: [#12451] Optional disablement ruby-electric-mode <pezra>, upping

vendor/80emacsonrails/emacs-rails/README

@@ -3,16 +3,21 @@ It is minor mode for editing "Ruby On Rails":ror code with
 friendly
 
 
-== Instalation
+== Installation
 
 You need download last release from RubyForge page
 "http://rubyforge.org/projects/emacs-rails" and and unpack
 it to directory containing libraries of Emacs, by default it's
 $HOME/.emacs.d/
 
-You can also use SVN
+Using Git:
 
-  cd  $HOME/.emacs.d/
+  cd $HOME/.emacs.d/
+  git clone git://github.com/tomtt/emacs-rails.git  
+
+Using SVN:
+
+  cd $HOME/.emacs.d/
   svn co svn://rubyforge/var/svn/emacs-rails/trunk emacs-rails
 
 Download and install required libraries
@@ -25,7 +30,7 @@ Download and install required libraries
 
 After that you must add this code in $HOME/.emacs
 
-  (setq load-path (cons "~/.emacs.d/rails" load-path))
+  (setq load-path (cons "~/.emacs.d/emacs-rails" load-path))
   (require 'rails)
 
 For Windows users: you can use your help in CHM format (the default
@@ -139,4 +144,4 @@ If you find error, place it description in "BugTrack":bugtrack.
 [emacs]http://www.gnu.org/software/emacs/
 [ror]http://rubyonrails.org
 [emacs-rails]http://rubyforge.org/projects/emacs-rails
-[inf-ruby]http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/misc/inf-ruby.el?view=co
+[inf-ruby]http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/misc/inf-ruby.el?view=co

vendor/80emacsonrails/emacs-rails/inflections.el

@@ -33,13 +33,14 @@
 (defvar inflection-uncountables nil)
 
 (defmacro define-inflectors (&rest specs)
-  (loop for (type . rest) in specs do
-        (case type
-          (:singular (push rest inflection-singulars))
-          (:plural (push rest inflection-plurals))
-          (:irregular (push rest inflection-irregulars))
-          (:uncountable (setf inflection-uncountables
-                              (append rest inflection-uncountables))))))
+  `(progn
+     ,@(loop for (type . rest) in specs collect
+	   (case type
+	     (:singular `(push ',rest inflection-singulars))
+	     (:plural `(push ',rest inflection-plurals))
+	     (:irregular `(push ',rest inflection-irregulars))
+	     (:uncountable `(setf inflection-uncountables
+				  (append ',rest inflection-uncountables)))))))
 
 (define-inflectors
   (:plural "$" "s")

vendor/80emacsonrails/emacs-rails/rails-bytecompile.el

@@ -1,3 +1,5 @@
+(add-to-list 'load-path default-directory)
+
 (require 'rails)
 
 (mapcar

vendor/80emacsonrails/emacs-rails/rails-cmd-proxy.el

@@ -101,6 +101,13 @@ otherwise if set REVERSE convert from remote to local."
                                                    command
                                                    command-args))
        (setq command rails-cmd-proxy:remote-cmd))
+     (save-excursion
+       (set-buffer (get-buffer-create buffer))
+       (set (make-local-variable 'comint-scroll-to-bottom-on-output) t)
+       (set (make-local-variable 'compilation-error-regexp-alist)
+	    rails-error-regexp-alist)
+       (compilation-shell-minor-mode t)
+       (rails-minor-mode t))
      (start-process-shell-command name
                                   buffer
                                   command

vendor/80emacsonrails/emacs-rails/rails-controller-layout.el

@@ -100,11 +100,7 @@ If the action is nil, return all views for the controller."
   "Make menu of view for CONTROLLER-NAME."
   (let (menu)
     (setq menu
-          (mapcar (lambda(i)
-                    (list (concat (if (string-match "^_" (file-name-nondirectory i)) "Partial" "View")
-                                  ": "
-                                  (file-name-nondirectory i))
-                          i))
+          (mapcar (lambda(i) (cons (file-name-nondirectory i) i))
                   (rails-controller-layout:view-files controller-name nil)))
     (when (zerop (length menu))
       (setq menu (list)))
@@ -174,7 +170,7 @@ If the action is nil, return all views for the controller."
               (progn
                 (find-file file)
                 (message (format "%s: %s" (substring (symbol-name type) 1) item)))
-            (message "File %s not exists" file)))
+            (message "File %s does not exist" file)))
       (message "%s not found" name))))
 
 (defun rails-controller-layout:switch-to-helper () (interactive) (rails-controller-layout:switch-to :helper))

vendor/80emacsonrails/emacs-rails/rails-core.el

@@ -28,20 +28,21 @@
 (eval-when-compile
   (require 'rails-lib))
 
-(defvar rails-core:class-dirs
+(defcustom rails-core:class-dirs
   '("app/controllers"
     "app/views"
     "app/models"
     "app/helpers"
     "test/unit"
     "test/functional"
-    "test/fixtures"
     "spec/controllers"
     "spec/fixtures"
     "spec/lib"
     "spec/models"
     "lib")
-  "Directories with Rails classes")
+  "Directories with Rails classes"
+  :group 'rails
+  :type '(repeat string))
 
 (defun rails-core:class-by-file (filename)
   "Return the class associated with FILENAME.
@@ -135,11 +136,11 @@ it does not exist, ask to create it using QUESTION as a prompt."
 (defun rails-core:controller-file (controller-name)
   "Return the path to the controller CONTROLLER-NAME."
   (when controller-name
-    (concat "app/controllers/"
-            (rails-core:file-by-class
-             (rails-core:short-controller-name controller-name) t)
-            (unless (string-equal controller-name "Application") "_controller")
-            ".rb")))
+    (let* ((basename (rails-core:file-by-class (rails-core:short-controller-name controller-name) t))
+	   (exact (concat "app/controllers/" basename ".rb")))
+      (if (file-exists-p (rails-core:file exact))
+	exact
+	(concat "app/controllers/" basename "_controller.rb")))))
 
 (defun rails-core:controller-exist-p (controller-name)
   "Return t if controller CONTROLLER-NAME exist."
@@ -624,6 +625,12 @@ If the action is nil, return all views for the controller."
     (when (search-backward-regexp "^[ ]*def \\([a-z0-9_]+\\)" nil t)
       (match-string-no-properties 1))))
 
+(defun rails-core:current-migration-version ()
+  "Return the current migration version"
+  (let ((name (buffer-file-name)))
+    (when (string-match "db\\/migrate\\/\\([0-9]+\\)[a-z0-9_]+\.[a-z]+$" name)
+      (match-string 1 name))))
+
 ;;;;;;;;;; Determination of buffer type ;;;;;;;;;;
 
 (defun rails-core:buffer-file-match (regexp)
@@ -688,13 +695,35 @@ the Rails minor mode log."
   (defun rails-core:menu-position ()
     (list '(300 50) (get-buffer-window (current-buffer)))))
 
+;; fixup emacs-rails menu specs to work with tmm-prompt
+(defun rails-core:tmm-menu (menu)
+  (symbol-name (tmm-prompt (cons (car menu)
+				 (mapcar (lambda (pane)
+					   (cons (car pane)
+						 (mapcar (lambda (item)
+							   (if (symbolp (cdr item))
+							       item
+							     (cons (car item)
+								   (intern (cdr item)))))
+							 (cdr pane))))
+					 (cdr menu))))))
+
+(defun rails-core:ido-menu (menu)
+  (let* ((prompt (car menu))
+         (mappings (cdr (car (cdr menu))))
+         (choices (delete-if #'not (mapcar (lambda (item) (car item)) mappings)))
+         (result (ido-completing-read prompt choices)))
+    (or (cdr (assoc result mappings)) result)))
+
 (defun rails-core:menu (menu)
   "Show a menu."
   (let ((result
          (if (rails-use-text-menu)
-             (tmm-prompt menu)
+           (funcall (or rails-text-menu-function
+                        (and (boundp 'ido-mode) ido-mode #'rails-core:ido-menu)
+                        #'rails-core:tmm-menu) menu)
            (x-popup-menu (rails-core:menu-position)
-                         (rails-core:prepare-menu  menu)))))
+                         (rails-core:prepare-menu menu)))))
     (if (listp result)
         (first result)
       result)))
@@ -752,7 +781,7 @@ the Rails minor mode log."
 
 (defun rails-core:rhtml-buffer-p ()
   "Return non nil if the current buffer is rhtml file."
-  (string-match "\\.html.erb$" (buffer-file-name)))
+  (string-match "\\.rhtml\\|\\.html\\.erb$" (buffer-file-name)))
 
 (defun rails-core:spec-exist-p ()
   "Return non nil if spec directory is exist."

vendor/80emacsonrails/emacs-rails/rails-lib.el

@@ -208,7 +208,7 @@ ABBREV-TABLE."
 not exist."
   `(progn
      (unless (boundp ',key-map)
-       (setf ,key-map (make-keymap)))
+       (setf ,key-map (make-sparse-keymap)))
      ,@(mapcar
   #'(lambda (key-func)
       `(define-key ,key-map ,(first key-func) ,(second key-func)))
@@ -392,7 +392,7 @@ as the value of the symbol, and the hook as the function definition."
 ;;       (setq mmm-indent-sandbox-finish-position nil)
 ;;       (save-excursion
 ;;         (set-buffer fragment-name)
-;;         (beginning-of-buffer)
+;;         (goto-char (point-min))
 ;;         (insert content)
 ;;         (goto-char fragment-pos)
 ;;         (funcall indent-func t)

vendor/80emacsonrails/emacs-rails/rails-model-layout.el

@@ -97,7 +97,7 @@
               (progn
                 (find-file file)
                 (message (format "%s: %s" (substring (symbol-name type) 1) item)))
-            (message "File %s not exists" file)))
+            (message "File %s does not exist" file)))
       (message "%s not found" name))))
 
 (defun rails-model-layout:switch-to-mailer () (interactive) (rails-model-layout:switch-to :mailer))
@@ -147,4 +147,4 @@
         (symbol (rails-model-layout:switch-to item))
         (string (rails-core:find-file-if-exist item))))))
 
-(provide 'rails-model-layout)
+(provide 'rails-model-layout)

vendor/80emacsonrails/emacs-rails/rails-navigation.el

@@ -68,7 +68,7 @@
   (interactive)
   (rails-nav:goto-file-with-menu-from-list
    (rails-core:controllers t)
-   "Go to controller"
+   "Go to controller.."
    'rails-core:controller-file))
 
 (defun rails-nav:goto-models ()
@@ -84,15 +84,15 @@
   (interactive)
   (rails-nav:goto-file-with-menu-from-list
    (rails-core:functional-tests)
-   "Go to functional test."
+   "Go to functional test.."
    'rails-core:functional-test-file))
 
 (defun rails-nav:goto-unit-tests ()
   "Go to functional tests."
   (interactive)
   (rails-nav:goto-file-with-menu-from-list
    (rails-core:unit-tests)
-   "Go to unit test."
+   "Go to unit test.."
    'rails-core:unit-test-file))
 
 (defun rails-nav:goto-observers ()
@@ -141,39 +141,39 @@
   (interactive)
   (rails-nav:goto-file-with-menu-from-list
    (rails-core:rspec-controllers)
-   "Go to controller spec."
+   "Go to controller spec.."
    'rails-core:rspec-controller-file))
 
 (defun rails-nav:goto-rspec-lib ()
   "Go to lib specs."
   (interactive)
   (rails-nav:goto-file-with-menu-from-list
    (rails-core:rspec-lib)
-   "Go to lib spec."
+   "Go to lib spec.."
    'rails-core:rspec-lib-file))
 
 (defun rails-nav:goto-rspec-models ()
   "Go to model specs."
   (interactive)
   (rails-nav:goto-file-with-menu-from-list
    (rails-core:rspec-models)
-   "Go to model spec."
+   "Go to model spec.."
    'rails-core:rspec-model-file))
 
 (defun rails-nav:goto-rspec-views ()
   "Go to view specs."
   (interactive)
   (rails-nav:goto-file-with-menu-from-list
    (rails-core:rspec-views)
-   "Go to view spec."
+   "Go to view spec.."
    'rails-core:rspec-view-file))
 
 (defun rails-nav:goto-rspec-fixtures ()
   "Go to rspec fuxtures."
   (interactive)
   (rails-nav:goto-file-with-menu-from-list
    (rails-core:rspec-fixtures)
-   "Go to rspec fixtures."
+   "Go to rspec fixtures.."
    'rails-core:rspec-fixture-file))
 
 (defun rails-nav:create-new-layout (&optional name)
@@ -268,8 +268,11 @@ Rules for actions/controllers:
     rails-line-->controller+action
     rails-line-->layout
     rails-line-->stylesheet
-    rails-line-->js)
-  "Functions that will ne called to analyze the line when
+    rails-line-->js
+    rails-line-->association-model
+    rails-line-->single-association-model
+    rails-line-->multi-association-model)
+  "Functions that will be called to analyze the line when
 rails-goto-file-on-current-line is run.")
 
 (def-goto-line rails-line-->stylesheet (("[ ]*stylesheet_link_tag[ ][\"']\\([^\"']*\\)[\"']"
@@ -302,6 +305,17 @@ rails-goto-file-on-current-line is run.")
    (format "JavaScript file \"%s\" does not exist do you whant to create it? " name)
    (rails-core:js-file name)))
 
+(def-goto-line rails-line-->association-model (("^[ \t]*\\(has_one\\|belongs_to\\|has_many\\|has_and_belongs_to_many\\)[ \t].*:class_name[ \t]*=>[ \t]*[\"']\\([^\"']*\\)[\"']"
+                                                (name 2)))
+  (rails-core:find-file (rails-core:model-file name)))
+
+(def-goto-line rails-line-->single-association-model (("^[ \t]*\\(has_one\\|belongs_to\\)[ \t]*:\\([a-z0-9_]*\\)" (name 2)))
+  (rails-core:find-file (rails-core:model-file name)))
+
+(def-goto-line rails-line-->multi-association-model (("^[ \t]*\\(has_many\\|has_and_belongs_to_many\\)[ \t]*:\\([a-z0-9_]*\\)" (name 2)))
+  (message (singularize-string name))
+  (rails-core:find-file (rails-core:model-file (singularize-string name))))
+
 (defvar rails-line-to-controller/action-keywords
   '("render" "redirect_to" "link_to" "form_tag" "start_form_tag" "render_component"
     "form_remote_tag" "link_to_remote"))