0
@@ -1,3 +1,13 @@
0
+2008-02-11  Dmitry Galinsky  <dima.exe@gmail.com>
0
+
0
+	* rails-snippets-feature.el (rails-snippets-feature:fixture)
0
+	(rails-snippets-feature:model-name, rails-snippets-feature:rest):
0
+	replaced `downcase' to `decamelize'.
0
+
0
+	* rails-core.el (rails-core:file-by-class): replaced `downcase' to `decamelize'.
0
+
0
+	* rails-lib.el (decamelize): created function.
0
+
0
 2008-02-07  Dmitry Galinsky  <dima.exe@gmail.com>
0
 
0
   * rails-test.el (rails-test:line-regexp): apply patch [#16714]

0
@@ -61,12 +61,8 @@
0
   "Return the filename associated with CLASSNAME.
0
 If the optional parameter DO-NOT-APPEND-EXT is set this function
0
 will not append \".rb\" to result."
0
-  (let* ((case-fold-search nil)
0
-         (path (replace-regexp-in-string "::" "/" classname))
0
-         (path (replace-regexp-in-string "\\([A-Z]+\\)\\([A-Z][a-z]\\)" "\\1_\\2" path))
0
-         (path (replace-regexp-in-string "\\([a-z\\d]\\)\\([A-Z]\\)" "\\1_\\2" path)))
0
-    (concat (downcase path)
0
-            (unless do-not-append-ext ".rb"))))
0
+  (concat (decamelize (replace-regexp-in-string "::" "/" classname))
0
+          (unless do-not-append-ext ".rb")))
0
 
0
 ;;;;;;;;;; Files ;;;;;;;;;;
0
 
0
@@ -149,8 +145,8 @@ it does not exist, ask to create it using QUESTION as a prompt."
0
 
0
 (defun rails-core:controller-file-by-model (model)
0
   (when model
0
-    (let* ((controller (pluralize-string model))
0
-           (controller (when controller (capitalize controller))))
0
+    (let* ((controller (pluralize-string model)))
0
+           ;(controller (when controller (capitalize controller))))
0
       (setq controller
0
             (cond
0
              ((rails-core:controller-exist-p controller) controller) ;; pluralized

0
@@ -102,6 +102,16 @@ If EXPR is not nil exeutes BODY.
0
                                ($a (substring ,str (match-end 0) (length ,str))))
0
                ,@body)))))))
0
 
0
+(defun decamelize (string)
0
+  "Convert from CamelCaseString to camel_case_string."
0
+  (let ((case-fold-search nil))
0
+    (downcase
0
+     (replace-regexp-in-string
0
+      "\\([A-Z]+\\)\\([A-Z][a-z]\\)" "\\1_\\2"
0
+      (replace-regexp-in-string
0
+       "\\([a-z\\d]\\)\\([A-Z]\\)" "\\1_\\2"
0
+       string)))))
0
+
0
 (defun string-not-empty (str) ;(+)
0
   "Return t if string STR is not empty."
0
   (and (stringp str) (not (or (string-equal "" str)

0
@@ -386,21 +386,21 @@
0
   (let ((controller (rails-core:current-controller))
0
         (model (rails-core:current-model)))
0
     (cond
0
-     (controller (downcase controller))
0
-     (model (pluralize-string (downcase model)))
0
+     (controller (decamelize controller))
0
+     (model (pluralize-string (decamelize model)))
0
      (t "fixture"))))
0
 
0
 (defun rails-snippets-feature:model-name ()
0
   (let ((controller (rails-core:current-controller)))
0
     (if controller
0
-        (singularize-string (downcase controller))
0
+        (singularize-string (decamelize controller))
0
       "model")))
0
 
0
 (defun rails-snippets-feature:rest (action)
0
   (when-bind
0
    (controller (rails-core:current-controller))
0
-   (let* ((plural (downcase (pluralize-string controller)))
0
-          (singular (downcase (singularize-string controller)))
0
+   (let* ((plural (decamelize (pluralize-string controller)))
0
+          (singular (decamelize (singularize-string controller)))
0
           (model (concat "@" singular)))
0
      (case action
0
        (:index