Skip to content

Commit

Permalink
rails-compat.el (try-complete-abbrev): fixed
Browse files Browse the repository at this point in the history
rails-core.el (rails-core:configuration-file, :rails-core:configuration-files): created functions
rails-speedbar-feature.el (rails-speedbar:roots): added migrations and configuration files to speedbar


git-svn-id: svn+ssh://rubyforge.org/var/svn/emacs-rails/trunk@206 cc5033d0-740f-0410-afc7-949910e492f2
  • Loading branch information
dimaexe committed Aug 14, 2007
1 parent 1abc3fe commit 154f696
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 9 deletions.
12 changes: 12 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
2007-08-11 Dmitry Galinsky <[email protected]>

* rails-compat.el (try-complete-abbrev): fixed

* rails-core.el (rails-core:configuration-file, :rails-core:configuration-files): created functions

* rails-speedbar-feature.el (rails-speedbar:roots): added
migrations and configuration files to speedbar

2007-08-05 Dmitry Galinsky <[email protected]>

* rails-test.el, rails-ui.el: apply patch #11998, created additional key
shortcuts (thanks Tom Ten Thij)

* rails-compat.el: apply patch #12743, replace
`indent-or-complete` to `indent-and-complete` (thanks Peter Williams)

Expand Down
14 changes: 9 additions & 5 deletions History
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
SVN
* Added migrations and configuration files to speedbar.
* More shortcuts for tests.

0.5.99.5
* Improved `align` support in `ruby-mode`
* Fixed bug [#10613]: Wrong comparison of emacs-major-version
* Apply patch [#10532]: allows '-' to occur in the errror filepath (thanks Peter Williams)
* Improved `align` support in `ruby-mode`.
* Fixed bug [#10613]: Wrong comparison of emacs-major-version.
* Apply patch [#10532]: allows '-' to occur in the errror filepath (thanks Peter Williams).
* Fixed bug [#10417]: ruby-flymake had applying only if flymake is
available.
* Raise a error if emacs-rails run on old version of Emacs (less 22)
* Updated view mode of "views"
* Raise a error if emacs-rails run on old version of Emacs (less 22).
* Updated view mode of "views".
* Fixed bug [#10357]: code expansion shouldn't occur in comment lines.

0.5.99.4
Expand Down
5 changes: 2 additions & 3 deletions rails-compat.el
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@

(defun try-complete-abbrev (old)
(if (abbrev-expansion-point-p)
(progn
(expand-abbrev)
t)
(if (expand-abbrev)
t nil)
nil))

(defun abbrev-expansion-point-p ()
Expand Down
9 changes: 9 additions & 0 deletions rails-core.el
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@ it does not exist, ask to create it using QUESTION as a prompt."
(rails-core:model-exist-p model-name))
model-name))))

(defun rails-core:configuration-file (file)
"Return the path to the configuration FILE."
(when file
(concat "config/" file)))

(defun rails-core:plugin-file (plugin file)
"Return the path to the FILE in Rails PLUGIN."
(concat "vendor/plugins/" plugin "/" file))
Expand Down Expand Up @@ -410,6 +415,10 @@ of migration."
(replace-regexp-in-string "\\.[^.]+$" "" l))
(find-recursive-files "\\.yml$" (rails-core:file "test/fixtures/"))))

(defun rails-core:configuration-files ()
"Return a files of files from config folder."
(find-recursive-files nil (rails-core:file "config/")))

(defun rails-core:regex-for-match-view ()
"Return a regex to match Rails view templates.
The file extensions used for views are defined in `rails-templates-list'."
Expand Down
4 changes: 3 additions & 1 deletion rails-speedbar-feature.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
("Models" rails-core:models rails-core:model-file)
("Observers" rails-core:observers rails-core:observer-file)
("Mailers" rails-core:mailers rails-core:mailer-file)
("Migrations" rails-core:migrations rails-core:migration-file)
("Functional Tests" rails-core:functional-tests rails-core:functional-test-file)
("Unit Tests" rails-core:unit-tests rails-core:unit-test-file)
("Fixtures" rails-core:fixtures rails-core:fixture-file)))
("Fixtures" rails-core:fixtures rails-core:fixture-file)
("Configuration" rails-core:configuration-files rails-core:configuration-file)))

(defvar rails-speedbar:menu-items nil)
(defvar rails-speedbar:key-map
Expand Down

0 comments on commit 154f696

Please sign in to comment.