@@ -13,7 +13,7 @@ if &cp || exists("g:autoloaded_rails") finish endif -let g:autoloaded_rails = '3.1' +let g:autoloaded_rails = '3.2' let s:cpo_save = &cpo set cpo&vim @@ -84,6 +84,23 @@ function! s:sname() return fnamemodify(s:file,':t:r') endfunction +function! s:pop_command() + if exists("s:command_stack") && len(s:command_stack) > 0 + exe remove(s:command_stack,-1) + endif +endfunction + +function! s:push_chdir() + if !exists("s:command_stack") | let s:command_stack = [] | endif + if exists("b:rails_root") && !s:startswith(getcwd(), rails#app().path()) + let chdir = exists("*haslocaldir") && haslocaldir() ? "lchdir " : "chdir " + call add(s:command_stack,chdir.s:escarg(getcwd())) + exe chdir.s:escarg(rails#app().path()) + else + call add(s:command_stack,"") + endif +endfunction + function! s:app_path(...) dict return join([self.root]+a:000,'/') endfunction @@ -402,6 +419,8 @@ function! rails#singularize(word) let word = s:sub(word,'ves$','fs') let word = s:sub(word,'ss%(es)=$','sss') let word = s:sub(word,'s$','') + let word = s:sub(word,'%(tatus|lias)\zse$','') + let word = s:sub(word,'%(nd|rt)\zsice$','ex') return word endfunction @@ -411,9 +430,10 @@ function! rails#pluralize(word) return word endif let word = s:sub(word,'[aeio]@<!y$','ie') + let word = s:sub(word,'%(nd|rt)@<=ex$','ice') let word = s:sub(word,'%([osxz]|[cs]h)$','&e') let word = s:sub(word,'f@<!f$','ve') - let word .= "s" + let word .= 's' let word = s:sub(word,'ersons$','eople') return word endfunction @@ -658,26 +678,6 @@ function! RailsEval(ruby,...) abort endfunction " }}}1 -" Autocommand Functions {{{1 - -function! s:QuickFixCmdPre() - if exists("b:rails_root") - if !s:startswith(getcwd(), rails#app().path()) - let s:last_dir = getcwd() - echo "lchdir ".s:escarg(rails#app().path()) - lchdir `=rails#app().path()` - endif - endif -endfunction - -function! s:QuickFixCmdPost() - if exists("s:last_dir") - lchdir `=s:last_dir` - unlet s:last_dir - endif -endfunction - -" }}}1 " Commands {{{1 function! s:prephelp() @@ -723,7 +723,7 @@ function! s:BufCommands() command! -buffer -bar -nargs=? -bang Rproject :call s:Project(<bang>0,<q-args>) endif if exists("g:loaded_dbext") - command! -buffer -bar -nargs=? -bang -complete=customlist,s:Complete_environments Rdbext :call s:BufDatabase(2,<q-args>,<bang>0) + command! -buffer -bar -nargs=? -bang -complete=customlist,s:Complete_environments Rdbext :call s:BufDatabase(2,<q-args>,<bang>0)|let b:dbext_buffer_defaulted = 1 endif let ext = expand("%:e") if ext =~ s:viewspattern() @@ -882,8 +882,12 @@ endfunction function! s:app_rake_tasks() dict if self.cache.needs('rake_tasks') - let rakefile = s:rquote(self.path("Rakefile")) - let lines = split(system("rake -T -f ".rakefile),"\n") + call s:push_chdir() + try + let lines = split(system("rake -T"),"\n") + finally + call s:pop_command() + endtry if v:shell_error != 0 return [] endif @@ -995,9 +999,9 @@ function! s:Rake(bang,lnum,arg) let withrubyargs = '-r ./config/boot -r '.s:rquote(self.path('config/environment')).' -e "puts \%((in \#{Dir.getwd}))" ' if arg =~# '^\%(stats\|routes\|secret\|notes\|db:\%(charset\|collation\|fixtures:identify\|version\)\)\%(:\|$\)' " So you can see the output even with an inadequate redirect - call s:QuickFixCmdPre() + call s:push_chdir() exe "!".&makeprg." ".arg - call s:QuickFixCmdPost() + call s:pop_command() elseif arg =~ '^preview\>' exe (lnum == 0 ? '' : lnum).'R'.s:gsub(arg,':','/') elseif arg =~ '^runner:' @@ -1026,13 +1030,13 @@ function! s:Rake(bang,lnum,arg) elseif arg != '' exe 'make '.arg elseif t =~ '^config-routes\>' - call s:QuickFixCmdPre() + call s:push_chdir() exe "!".&makeprg." routes" - call s:QuickFixCmdPost() + call s:pop_command() elseif t =~ '^fixtures-yaml\>' && lnum - call s:QuickFixCmdPre() + call s:push_chdir() exe "!".&makeprg." db:fixtures:identify LABEL=".s:lastmethod(lnum) - call s:QuickFixCmdPost() + call s:pop_command() elseif t =~ '^fixtures\>' && lnum == 0 exe "make db:fixtures:load FIXTURES=".s:sub(fnamemodify(RailsFilePath(),':r'),'^.{-}/fixtures/','') elseif t =~ '^task\>' @@ -1085,6 +1089,14 @@ function! s:Rake(bang,lnum,arg) else make test:functionals endif + elseif RailsFilePath() =~# '\<features/.*\.feature$' + if lnum > 0 + exe 'make features CUCUMBER_COLORS_DISABLED=1 FEATURE="%:p" CUCUMBER_OPTS=--line='.lnum + else + make features CUCUMBER_COLORS_DISABLED=1 FEATURE="%:p" + endif + elseif RailsFilePath() =~# '\<features/' + make features CUCUMBER_COLORS_DISABLED=1 else make endif @@ -1215,9 +1227,9 @@ function! s:BufScriptWrappers() command! -buffer -bar -nargs=* -complete=customlist,s:Complete_destroy Rdestroy :call rails#app().destroy_command(<bang>0,<f-args>) command! -buffer -bar -nargs=? -bang -complete=customlist,s:Complete_server Rserver :call rails#app().server_command(<bang>0,<q-args>) command! -buffer -bang -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Rrunner :call rails#app().runner_command(<bang>0 ? -2 : (<count>==<line2>?<count>:-1),<f-args>) - command! -buffer -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Rp :call rails#app().runner_command((<count>==<line2>?<count>:-1,'p begin '.<f-args>.' end') - command! -buffer -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Rpp :call rails#app().runner_command((<count>==<line2>?<count>:-1,'require %{pp}; pp begin '.<f-args>.' end') - command! -buffer -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Ry :call rails#app().runner_command((<count>==<line2>?<count>:-1,'y begin '.<f-args>.' end') + command! -buffer -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Rp :call rails#app().runner_command(<count>==<line2>?<count>:-1,'p begin '.<f-args>.' end') + command! -buffer -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Rpp :call rails#app().runner_command(<count>==<line2>?<count>:-1,'require %{pp}; pp begin '.<f-args>.' end') + command! -buffer -nargs=1 -range=0 -complete=customlist,s:Complete_ruby Ry :call rails#app().runner_command(<count>==<line2>?<count>:-1,'y begin '.<f-args>.' end') endfunction function! s:app_generators() dict @@ -1467,12 +1479,12 @@ function! s:BufNavCommands() command! -buffer -bar -nargs=* -complete=customlist,s:Complete_find AS :call s:Alternate(<bang>0,"S",<f-args>) command! -buffer -bar -nargs=* -complete=customlist,s:Complete_find AV :call s:Alternate(<bang>0,"V",<f-args>) command! -buffer -bar -nargs=* -complete=customlist,s:Complete_find AT :call s:Alternate(<bang>0,"T",<f-args>) - command! -buffer -bar -nargs=* -complete=customlist,s:Complete_related AN :call s:Related(<bang>0,"" ,<f-args>) - command! -buffer -bar -nargs=* -complete=customlist,s:Complete_related R :call s:Related(<bang>0,"" ,<f-args>) - command! -buffer -bar -nargs=* -complete=customlist,s:Complete_related RE :call s:Related(<bang>0,"E",<f-args>) - command! -buffer -bar -nargs=* -complete=customlist,s:Complete_related RS :call s:Related(<bang>0,"S",<f-args>) - command! -buffer -bar -nargs=* -complete=customlist,s:Complete_related RV :call s:Related(<bang>0,"V",<f-args>) - command! -buffer -bar -nargs=* -complete=customlist,s:Complete_related RT :call s:Related(<bang>0,"T",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit AN :call s:Related(<bang>0,"" ,<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit R :call s:Related(<bang>0,"" ,<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit RE :call s:Related(<bang>0,"E",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit RS :call s:Related(<bang>0,"S",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit RV :call s:Related(<bang>0,"V",<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_edit RT :call s:Related(<bang>0,"T",<f-args>) endfunction function! s:djump(def) @@ -1538,7 +1550,7 @@ function! s:Edit(bang,count,arg,...) endfunction function! s:fuzzyglob(arg) - return a:arg == '' ? '*' : s:gsub(a:arg,'[^/]|/$','&*') + return '*'.s:gsub(s:gsub(a:arg,'[^/]','[&]*'),'/','/*') endfunction function! s:Complete_find(ArgLead, CmdLine, CursorPos) @@ -1560,14 +1572,6 @@ function! s:Complete_edit(ArgLead, CmdLine, CursorPos) return s:completion_filter(rails#app().relglob("",s:fuzzyglob(a:ArgLead)),a:ArgLead) endfunction -function! s:Complete_related(ArgLead, CmdLine, CursorPos) - if a:ArgLead =~# '^\u' - return s:Complete_find(a:ArgLead, a:CmdLine, a:CursorPos) - else - return filter(s:Complete_edit(a:ArgLead, a:CmdLine, a:CursorPos),'v:val !~# "^\\u"') - endif -endfunction - function! s:Complete_cd(ArgLead, CmdLine, CursorPos) let all = rails#app().relglob("",a:ArgLead."*") call filter(all,'v:val =~ "/$"') @@ -1725,9 +1729,9 @@ function! RailsNamedRoutes() endfunction function! s:RailsIncludefind(str,...) - if a:str == "ApplicationController" + if a:str ==# "ApplicationController" return "app/controllers/application.rb" - elseif a:str == "Test::Unit::TestCase" + elseif a:str ==# "Test::Unit::TestCase" return "test/unit/testcase.rb" elseif a:str == "<%=" " Probably a silly idea @@ -1744,46 +1748,46 @@ function! s:RailsIncludefind(str,...) endif let str = s:sub(str,'^\s*','') let str = s:sub(str,'\s*$','') - let str = s:sub(str,'^[:@]','') + let str = s:sub(str,'^:=[:@]','') let str = s:sub(str,':0x\x+$','') " For #<Object:0x...> style output let str = s:gsub(str,"[\"']",'') - if line =~ '\<\(require\|load\)\s*(\s*$' + if line =~# '\<\(require\|load\)\s*(\s*$' return str endif let str = rails#underscore(str) let fpat = '\(\s*\%("\f*"\|:\f*\|'."'\\f*'".'\)\s*,\s*\)*' - if a:str =~ '\u' + if a:str =~# '\u' " Classes should always be in .rb files let str .= '.rb' - elseif line =~ ':partial\s*=>\s*' + elseif line =~# ':partial\s*=>\s*' let str = s:sub(str,'([^/]+)$','_\1') let str = s:findview(str) - elseif line =~ '\<layout\s*(\=\s*' || line =~ ':layout\s*=>\s*' + elseif line =~# '\<layout\s*(\=\s*' || line =~# ':layout\s*=>\s*' let str = s:findview(s:sub(str,'^/=','layouts/')) - elseif line =~ ':controller\s*=>\s*' + elseif line =~# ':controller\s*=>\s*' let str = 'app/controllers/'.str.'_controller.rb' - elseif line =~ '\<helper\s*(\=\s*' + elseif line =~# '\<helper\s*(\=\s*' let str = 'app/helpers/'.str.'_helper.rb' - elseif line =~ '\<fixtures\s*(\='.fpat + elseif line =~# '\<fixtures\s*(\='.fpat if RailsFilePath() =~# '\<spec/' let str = s:sub(str,'^/@!','spec/fixtures/') else let str = s:sub(str,'^/@!','test/fixtures/') endif - elseif line =~ '\<stylesheet_\(link_tag\|path\)\s*(\='.fpat + elseif line =~# '\<stylesheet_\(link_tag\|path\)\s*(\='.fpat let str = s:sub(str,'^/@!','/stylesheets/') let str = 'public'.s:sub(str,'^[^.]*$','&.css') - elseif line =~ '\<javascript_\(include_tag\|path\)\s*(\='.fpat - if str == "defaults" + elseif line =~# '\<javascript_\(include_tag\|path\)\s*(\='.fpat + if str ==# "defaults" let str = "application" endif let str = s:sub(str,'^/@!','/javascripts/') let str = 'public'.s:sub(str,'^[^.]*$','&.js') - elseif line =~ '\<\(has_one\|belongs_to\)\s*(\=\s*' + elseif line =~# '\<\(has_one\|belongs_to\)\s*(\=\s*' let str = 'app/models/'.str.'.rb' - elseif line =~ '\<has_\(and_belongs_to_\)\=many\s*(\=\s*' + elseif line =~# '\<has_\(and_belongs_to_\)\=many\s*(\=\s*' let str = 'app/models/'.rails#singularize(str).'.rb' - elseif line =~ '\<def\s\+' && expand("%:t") =~ '_controller\.rb' + elseif line =~# '\<def\s\+' && expand("%:t") =~# '_controller\.rb' let str = s:sub(s:sub(RailsFilePath(),'/controllers/','/views/'),'_controller\.rb$','/'.str) " FIXME: support nested extensions let vt = s:view_types."," @@ -1795,16 +1799,16 @@ function! s:RailsIncludefind(str,...) break endif endwhile - elseif str =~ '_\%(path\|url\)$' + elseif str =~# '_\%(path\|url\)$' " REST helpers let str = s:sub(str,'_%(path|url)$','') let str = s:sub(str,'^hash_for_','') let file = rails#app().named_route_file(str) if file == "" let str = s:sub(str,'^formatted_','') - if str =~ '^\%(new\|edit\)_' + if str =~# '^\%(new\|edit\)_' let str = 'app/controllers/'.s:sub(rails#pluralize(str),'^(new|edit)_(.*)','\2_controller.rb#\1') - elseif str == rails#singularize(str) + elseif str ==# rails#singularize(str) " If the word can't be singularized, it's probably a link to the show " method. We should verify by checking for an argument, but that's " difficult the way things here are currently structured. @@ -1823,7 +1827,7 @@ function! s:RailsIncludefind(str,...) if str =~ '^/' && !filereadable(str) let str = s:sub(str,'^/','') endif - if str =~ '^lib/' && !filereadable(str) + if str =~# '^lib/' && !filereadable(str) let str = s:sub(str,'^lib/','') endif return str @@ -1878,9 +1882,10 @@ function! s:completion_filter(results,A) call filter(results,'v:val !~# "\\~$"') let filtered = filter(copy(results),'s:startswith(v:val,a:A)') if !empty(filtered) | return filtered | endif - let regex = s:gsub(a:A,'.','[&].*') + let regex = s:gsub(a:A,'[^/]','[&].*') let filtered = filter(copy(results),'v:val =~# "^".regex') if !empty(filtered) | return filtered | endif + let regex = s:gsub(a:A,'.','[&].*') let filtered = filter(copy(results),'v:val =~# regex') return filtered endfunction @@ -1934,10 +1939,10 @@ function! s:controllerList(A,L,P) endfunction function! s:viewList(A,L,P) - let prefix = s:sub(a:A,'[^/]*$','') let c = s:controller(1) - let top = rails#app().relglob("app/views/",prefix."*[^~]") - if c != '' && prefix == '' + let top = rails#app().relglob("app/views/",s:fuzzyglob(a:A)) + call filter(top,'v:val !~# "\\~$"') + if c != '' && a:A !~ '/' let local = rails#app().relglob("app/views/".c."/","*.*[^~]") return s:completion_filter(local+top,a:A) endif @@ -2012,7 +2017,7 @@ function! s:integrationtestList(A,L,P) endfunction function! s:specList(A,L,P) - return s:autocamelize(rails#app().relglob("spec/","**/*","_spec.rb"),a:A) + return s:completion_filter(rails#app().relglob("spec/","**/*","_spec.rb"),a:A) endfunction function! s:pluginList(A,L,P) @@ -2546,7 +2551,7 @@ function! s:edit(cmd,file,...) let cmd .= ' '.(a:0 ? a:1 . ' ' : '') let file = a:file if file !~ '^/' && file !~ '^\w:' && file !~ '://' - exe cmd."`=fnamemodify(rails#app().path(file),':~:.')`" + exe cmd."`=fnamemodify(rails#app().path(file),':.')`" else exe cmd.file endif @@ -2682,7 +2687,7 @@ endfunction function! s:Related(bang,cmd,...) if a:0 - return call(a:1 =~# '^\u' ? 's:Find' : 's:Edit',[a:bang,1,a:cmd]+a:000) + return call('s:Edit',[a:bang,1,a:cmd]+a:000) else let cmd = a:cmd.(a:bang?"!":"") let file = s:RelatedFile() @@ -2891,7 +2896,7 @@ function! s:Extract(bang,...) range abort else new endif - let shortout = fnamemodify(out,':~:.') + let shortout = fnamemodify(out,':.') silent file `=shortout` let &ft = ft let @@ = partial @@ -3046,8 +3051,8 @@ function! s:cache_clear(...) dict endfunction function! rails#cache_clear(...) - if b:rails_root != '' - return call(rails#app().cache.clear,a:000,rails#app()) + if exists('b:rails_root') + return call(rails#app().cache.clear,a:000,rails#app().cache) endif endfunction @@ -3709,10 +3714,10 @@ function! s:app_dbext_settings(environment) dict endfunction function! s:BufDatabase(...) - let self = rails#app() - if exists("s:lock_database") || !exists('g:loaded_dbext') + if exists("s:lock_database") || !exists('g:loaded_dbext') || !exists('b:rails_root') return endif + let self = rails#app() let s:lock_database = 1 if (a:0 && a:1 > 1) call self.cache.clear('dbext_settings') @@ -3809,7 +3814,7 @@ function! s:AddBracketExpand(abbr,expn) endfunction function! s:AddColonExpand(abbr,expn) - call s:AddSelectiveExpand(a:abbr,':',a:expn) + call s:AddSelectiveExpand(a:abbr,'[:.]',a:expn) endfunction function! s:AddParenExpand(abbr,expn,...) @@ -4224,7 +4229,9 @@ function! RailsBufInit(path) call s:BufSettings() call s:BufCommands() call s:BufAbbreviations() - call s:BufDatabase() + if exists("g:loaded_dbext") && g:loaded_dbext < 800 + call s:BufDatabase() + endif " snippetsEmu.vim if exists('g:loaded_snippet') silent! runtime! ftplugin/rails_snippets.vim @@ -4369,6 +4376,7 @@ augroup railsPluginAuto autocmd User BufEnterRails call s:RefreshBuffer() autocmd User BufEnterRails call s:resetomnicomplete() autocmd User BufEnterRails call s:BufDatabase(-1) + autocmd User dbextPreConnection call s:BufDatabase(1) autocmd BufWritePost */config/database.yml call rails#cache_clear("dbext_settings") autocmd BufWritePost */test/test_helper.rb call rails#cache_clear("user_assertions") autocmd BufWritePost */config/routes.rb call rails#cache_clear("named_routes") @@ -4377,8 +4385,8 @@ augroup railsPluginAuto autocmd BufWritePost */generators/** call rails#cache_clear("generators") autocmd FileType * if exists("b:rails_root") | call s:BufSettings() | endif autocmd Syntax ruby,eruby,yaml,haml,javascript,railslog if exists("b:rails_root") | call s:BufSyntax() | endif - silent! autocmd QuickFixCmdPre make* call s:QuickFixCmdPre() - silent! autocmd QuickFixCmdPost make* call s:QuickFixCmdPost() + autocmd QuickFixCmdPre make* call s:push_chdir() + autocmd QuickFixCmdPost make* call s:pop_command() augroup END " }}}1 autoload/rails.vim @@ -681,16 +681,19 @@ place) are also covered in this section. is installed. Loads the {environment} configuration (defaults to $RAILS_ENV or development) from config/database.yml and uses it to configure dbext. - The configuration is cached until a different Rails - application is edited. This command is called for you - automatically when |g:rails_dbext| is set (default on - non-Windows systems). + The configuration is cached on a per application + basis. With dbext versions 8.00 and newer, this + command is called automatically when needed. For + older versions, it is called automatically when + rails.vim loads if |g:rails_dbext| is set (which it is + by default). *rails-:Rdbext!* :Rdbext! [{environment}] Load the database configuration as above, and then attempt a CREATE DATABASE for it. This is primarily - useful for demonstrations. + useful for demonstrations, and has been largely + superseded by |:Rake| db:create. *rails-surround* The |surround| plugin available from vim.org enables adding and removing @@ -798,7 +801,7 @@ Rabbrev pa[ params pa.inspect params.inspect Rabbrev AR:: ActionRecord AR::Base ActiveRecord::Base Rabbrev :a :action\ =>\ render :a<Tab> render :action => -In short, :: expands on :, ( expands on (, and [ expands on both . and [. +In short, ( expands on (, :: expands on . and :, and [ expands on . and [. These trailing punctuation marks are NOT part of the final abbreviation, and you cannot have two mappings that differ only by punctuation. @@ -807,11 +810,11 @@ an abbreviation ending with "(", you may define where to insert the parenthesis by splitting the expansion into two parts (divided by an unescaped space). -Many abbreviations abbreviations are provided by default: use :Rabbrev to list -them. They vary depending on the type of file (models have different -abbreviations than controllers). There is one "smart" abbreviation, :c, which -expands to ":controller => ", ":collection => ", or ":conditions => " -depending on context. +Many abbreviations are provided by default: use :Rabbrev to list them. They +vary depending on the type of file (models have different abbreviations than +controllers). There is one "smart" abbreviation, :c, which expands to +":controller => ", ":collection => ", or ":conditions => " depending on +context. ============================================================================== SYNTAX HIGHLIGHTING *rails-syntax* doc/rails.txt @@ -107,7 +107,7 @@ function! s:Detect(filename) return s:BufInit(strpart(fn,0,strlen(fn)-22)) endif if isdirectory(fn) - let fn = fnamemodify(fn,":s?[\/]$??") + let fn = fnamemodify(fn,':s?[\/]$??') else let fn = fnamemodify(fn,':s?\(.*\)[\/][^\/]*$?\1?') endif plugin/rails.vim 07d5ca1eaf8f1f26aba7534e7372410ff3202a56 Martin Grenfell martin_grenfell@msn.com http://github.com/andhapp/vimfiles/commit/093735c25ad2d95a1736c3f79baf56f0368b1bcc 093735c25ad2d95a1736c3f79baf56f0368b1bcc 2008-11-19T00:01:38-08:00 2008-11-19T00:01:38-08:00 latest rails.vim 7cd160e6a24b6d6cacaa932bc240a1398d182821 Martin Grenfell martin_grenfell@msn.com