vim/doc/ack.txt vim/ftdetect/cucumber.vim vim/ftplugin/cucumber.vim vim/indent/cucumber.vim vim/plugin/ack.vim vim/syntax/cucumber.vim @@ -1,9 +1,11 @@ colorscheme ir_black -set columns=149 -set guifont=DejaVuSansMono:h13 +" set columns=149 +" set guifont=DejaVuSansMono:h13 +set columns=150 +set guifont=Inconsolata:h16 set guioptions-=T set lbr -set lines=50 +set lines=44 set number set path+=** -set transparency=10 +set transparency=5 gvimrc @@ -1,8 +1,7 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =6 -let g:netrw_dirhist_1='/Users/stephen/Dropbox/Configuration/dotfiles/zsh/functions' -let g:netrw_dirhist_2='/Users/stephen/.zsh' -let g:netrw_dirhist_3='/Users/stephen/.zsh/functions' -let g:netrw_dirhist_4='/Users/stephen/.zsh' -let g:netrw_dirhist_5='/Users/stephen/.zsh/functions' -let g:netrw_dirhist_6='/Users/stephen/.zsh' +let g:netrw_dirhist_cnt =5 +let g:netrw_dirhist_1='/Users/stephen/Sites/viewpoints/site' +let g:netrw_dirhist_2='/Users/stephen/Sites/viewpoints/site/vendor' +let g:netrw_dirhist_3='/Users/stephen/Sites/viewpoints/site' +let g:netrw_dirhist_4='/Users/stephen/Sites/viewpoints/site/config' +let g:netrw_dirhist_5='/Users/stephen/Sites/viewpoints/site' vim/.netrwhist @@ -13,13 +13,25 @@ if &cp || exists("g:autoloaded_rails") finish endif -let g:autoloaded_rails = '2.1' +let g:autoloaded_rails = '3.4' let s:cpo_save = &cpo set cpo&vim " Utility Functions {{{1 +let s:app_prototype = {} + +function! s:add_methods(namespace, method_names) + for name in a:method_names + let s:{a:namespace}_prototype[name] = s:function('s:'.a:namespace.'_'.name) + endfor +endfunction + +function! s:function(name) + return function(substitute(a:name,'^s:',matchstr(expand('<sfile>'), '<SNR>\d\+_'),'')) +endfunction + function! s:sub(str,pat,rep) return substitute(a:str,'\v\C'.a:pat,a:rep,'') endfunction @@ -28,12 +40,8 @@ function! s:gsub(str,pat,rep) return substitute(a:str,'\v\C'.a:pat,a:rep,'g') endfunction -function! s:string(str) - if exists("*string") - return string(a:str) - else - return "'" . s:gsub(a:str,"'","'.\"'\".'") . "'" - endif +function! s:startswith(string,prefix) + return strpart(a:string, 0, strlen(a:prefix)) ==# a:prefix endfunction function! s:compact(ary) @@ -48,7 +56,7 @@ function! s:scrub(collection,item) while idx != -1 && cnt < 100 let col = strpart(col,0,idx).strpart(col,idx+strlen(a:item)+1) let idx = stridx(col,"\n".a:item."\n") - let cnt = cnt + 1 + let cnt += 1 endwhile return strpart(col,1) endfunction @@ -61,28 +69,6 @@ function! s:esccmd(p) return s:gsub(a:p,'[!%#]','\\&') endfunction -function! s:ra() - " Rails root, escaped for use as single argument - return s:escarg(RailsRoot()) -endfunction - -function! s:rc() - " Rails root, escaped for use with a command (spaces not escaped) - return s:esccmd(RailsRoot()) -endfunction - -function! s:escvar(r) - let r = fnamemodify(a:r,':~') - let r = s:gsub(r,'\W','\="_".char2nr(submatch(0))."_"') - let r = s:gsub(r,'^\d','_&') - return r -endfunction - -function! s:rv() - " Rails root, escaped to be a variable name - return s:escvar(RailsRoot()) -endfunction - function! s:rquote(str) " Imperfect but adequate for Ruby arguments if a:str =~ '^[A-Za-z0-9_/.:-]\+$' @@ -98,82 +84,98 @@ function! s:sname() return fnamemodify(s:file,':t:r') endfunction -function! s:hasfile(file) - return filereadable(RailsRoot().'/'.a:file) +function! s:pop_command() + if exists("s:command_stack") && len(s:command_stack) > 0 + exe remove(s:command_stack,-1) + endif endfunction -function! s:rubyexestr(cmd) - if RailsRoot() =~ '://' - return "ruby ".a:cmd +function! s:push_chdir(...) + if !exists("s:command_stack") | let s:command_stack = [] | endif + if exists("b:rails_root") && a:0 ? getcwd() !=# rails#app().path() : !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 - return "ruby -C ".s:rquote(RailsRoot())." ".a:cmd + call add(s:command_stack,"") endif endfunction -function! s:rubyexebg(cmd) - let cmd = s:esccmd(s:rubyexestr(a:cmd)) - if has("gui_win32") - if &shellcmdflag == "-c" && ($PATH . &shell) =~? 'cygwin' - silent exe "!cygstart -d ".s:rquote(RailsRoot())." ruby ".a:cmd - else - exe "!start ".cmd - endif - elseif exists("$STY") && !has("gui_running") && s:getopt("gnu_screen","abg") && executable("screen") - silent exe "!screen -ln -fn -t ".s:sub(s:sub(a:cmd,'\s.*',''),'^%(script|-rcommand)/','rails-').' '.cmd - else - exe "!".cmd - endif - return v:shell_error +function! s:app_path(...) dict + return join([self.root]+a:000,'/') +endfunction + +function! s:app_has_file(file) dict + return filereadable(self.path(a:file)) endfunction -function! s:rubyexe(cmd,...) +function! s:app_find_file(name, ...) dict abort + let trim = strlen(self.path())+1 if a:0 - call s:rubyexebg(a:cmd) + let path = s:pathjoin(map(s:pathsplit(a:1),'self.path(v:val)')) else - exe "!".s:esccmd(s:rubyexestr(a:cmd)) - endif - return v:shell_error + let path = s:pathjoin([self.path()]) + endif + let suffixesadd = s:pathjoin(get(a:000,1,&suffixesadd)) + let default = get(a:000,2,'') + let oldsuffixesadd = &l:suffixesadd + try + let &suffixesadd = suffixesadd + " Versions before 7.1.256 returned directories from findfile + if type(default) == type(0) && (v:version < 702 || default == -1) + let all = findfile(a:name,path,-1) + if v:version < 702 + call filter(all,'!isdirectory(v:val)') + endif + call map(all,'s:gsub(strpart(fnamemodify(v:val,":p"),trim),"\\\\","/")') + return default < 0 ? all : get(all,default-1,'') + elseif type(default) == type(0) + let found = findfile(a:name,path,default) + else + let i = 1 + let found = findfile(a:name,path) + while v:version < 702 && found != "" && isdirectory(found) + let i += 1 + let found = findfile(a:name,path,i) + endwhile + endif + return found == "" ? found : s:gsub(strpart(fnamemodify(found,':p'),trim),'\\','/') + finally + let &l:suffixesadd = oldsuffixesadd + endtry endfunction -function! s:rubyeval(ruby,...) - if a:0 > 0 - let def = a:1 - else - let def = "" - endif - if !executable("ruby") - return def - endif - let cmd = s:rubyexestr('-e '.s:rquote('begin; require %{rubygems}; rescue LoadError; end; begin; require %{active_support}; rescue LoadError; end; '.a:ruby)) - "let g:rails_last_ruby_command = cmd - " If the shell is messed up, this command could cause an error message - silent! let results = system(cmd) - "let g:rails_last_ruby_result = results - if v:shell_error != 0 " results =~ '-e:\d' || results =~ 'ruby:.*(fatal)' - return def - else - return results - endif +call s:add_methods('app',['path','has_file','find_file']) + +" Split a path into a list. From pathogen.vim +function! s:pathsplit(path) abort + if type(a:path) == type([]) | return copy(a:path) | endif + let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,') + return map(split,'substitute(v:val,''\\\([\\, ]\)'',''\1'',"g")') endfunction -function! s:railseval(ruby,...) - if a:0 > 0 - let def = a:1 - else - let def = "" - endif - if !executable("ruby") - return def - endif - let args = "-r./config/boot -r ".s:rquote(RailsRoot()."/config/environment")." -e ".s:rquote(a:ruby) - let cmd = s:rubyexestr(args) - " If the shell is messed up, this command could cause an error message - silent! let results = system(cmd) - if v:shell_error != 0 " results =~ '-e:\d' || results =~ 'ruby:.*(fatal)' - return def - else - return results - endif +" Convert a list to a path. From pathogen.vim +function! s:pathjoin(...) abort + let i = 0 + let path = "" + while i < a:0 + if type(a:000[i]) == type([]) + let list = a:000[i] + let j = 0 + while j < len(list) + let escaped = substitute(list[j],'[\\, ]','\\&','g') + if exists("+shellslash") && !&shellslash + let escaped = substitute(escaped,'^\(\w:\\\)\\','\1','') + endif + let path .= ',' . escaped + let j += 1 + endwhile + else + let path .= "," . a:000[i] + endif + let i += 1 + endwhile + return substitute(path,'^,','','') endfunction function! s:endof(lnum) @@ -191,14 +193,14 @@ function! s:endof(lnum) endif let endl = a:lnum while endl <= line('$') - let endl = endl + 1 + let endl += 1 if getline(endl) =~ '^'.spc.endpat return endl elseif getline(endl) =~ '^=begin\>' while getline(endl) !~ '^=end\>' && endl <= line('$') - let endl = endl + 1 + let endl += 1 endwhile - let endl = endl + 1 + let endl += 1 elseif getline(endl) !~ '^'.spc && getline(endl) !~ '^\s*\%(#.*\)\=$' return 0 endif @@ -209,10 +211,10 @@ endfunction function! s:lastopeningline(pattern,limit,...) let line = a:0 ? a:1 : line(".") while line > a:limit && getline(line) !~ a:pattern - let line = line - 1 + let line -= 1 endwhile let lend = s:endof(line) - if line > a:limit && lend >= (a:0 ? a:1 : line(".")) + if line > a:limit && (lend < 0 || lend >= (a:0 ? a:1 : line("."))) return line else return -1 @@ -246,7 +248,7 @@ function! s:lastformat() if match != '' return match endif - let line = line - 1 + let line -= 1 endwhile endif return "" @@ -259,15 +261,7 @@ function! s:format(...) let format = s:lastformat() endif if format == '' - if fnamemodify(RailsFilePath(),':e') == 'rhtml' - let format = 'html' - elseif fnamemodify(RailsFilePath(),':e') == 'rxml' - let format = 'xml' - elseif fnamemodify(RailsFilePath(),':e') == 'rjs' - let format = 'js' - elseif a:0 - return a:1 - endif + return get({'rhtml': 'html', 'rxml': 'xml', 'rjs': 'js'},fnamemodify(RailsFilePath(),':e'),a:0 ? a:1 : '') endif return format endfunction @@ -311,7 +305,7 @@ function! s:controller(...) elseif f =~ '\<public/stylesheets/.*\.css$' return s:sub(f,'.*<public/stylesheets/(.{-})\.css$','\1') elseif a:0 && a:1 - return s:pluralize(s:model()) + return rails#pluralize(s:model()) endif return "" endfunction @@ -332,64 +326,31 @@ function! s:model(...) elseif f =~ '\<spec/models/.*_spec\.rb$' return s:sub(f,'.*<spec/models/(.*)_spec\.rb$','\1') elseif f =~ '\<\%(test\|spec\)/fixtures/.*\.\w*\~\=$' - return s:singularize(s:sub(f,'.*<%(test|spec)/fixtures/(.*)\.\w*\~=$','\1')) + return rails#singularize(s:sub(f,'.*<%(test|spec)/fixtures/(.*)\.\w*\~=$','\1')) elseif f =~ '\<\%(test\|spec\)/exemplars/.*_exemplar\.rb$' return s:sub(f,'.*<%(test|spec)/exemplars/(.*)_exemplar\.rb$','\1') + elseif f =~ '\<\%(test\|spec\)/factories/.*\.rb$' + return s:sub(f,'.*<%(test|spec)/factories/(.{-})%(_factory)=\.rb$','\1') elseif a:0 && a:1 - return s:singularize(s:controller()) + return rails#singularize(s:controller()) endif return "" endfunction -function! s:underscore(str) - let str = s:gsub(a:str,'::','/') - let str = s:gsub(str,'(\u+)(\u\l)','\1_\2') - let str = s:gsub(str,'(\l|\d)(\u)','\1_\2') - let str = s:gsub(str,'-','_') - let str = tolower(str) - return str -endfunction - -function! s:camelize(str) - let str = s:gsub(a:str,'/(.)','::\u\1') - let str = s:gsub(str,'%([_-]|<)(.)','\u\1') - return str -endfunction - -function! s:singularize(word) - " Probably not worth it to be as comprehensive as Rails but we can - " still hit the common cases. - let word = a:word - if word =~? '\.js$' || word == '' - return word - endif - let word = s:sub(word,'eople$','ersons') - let word = s:sub(word,'[aeio]@<!ies$','ys') - let word = s:sub(word,'xe[ns]$','xs') - let word = s:sub(word,'ves$','fs') - let word = s:sub(word,'ss%(es)=$','sss') - let word = s:sub(word,'s$','') - return word -endfunction - -function! s:pluralize(word) - let word = a:word - if word == '' - return word +function! s:readfile(path,...) + let nr = bufnr('^'.a:path.'$') + if nr < 0 && exists('+shellslash') && ! &shellslash + let nr = bufnr('^'.s:gsub(a:path,'/','\\').'$') endif - let word = s:sub(word,'[aeio]@<!y$','ie') - let word = s:sub(word,'%([osxz]|[cs]h)$','&e') - let word = s:sub(word,'f@<!f$','ve') - let word = word."s" - let word = s:sub(word,'ersons$','eople') - return word -endfunction - -function! s:usesubversion() - if !exists("b:rails_use_subversion") - let b:rails_use_subversion = s:getopt("subversion","abg") && (RailsRoot()!="") && isdirectory(RailsRoot()."/.svn") + if bufloaded(nr) + return getbufline(nr,1,a:0 ? a:1 : '$') + elseif !filereadable(a:path) + return [] + elseif a:0 + return readfile(a:path,'',a:1) + else + return readfile(a:path) endif - return b:rails_use_subversion endfunction function! s:environment() @@ -400,13 +361,8 @@ function! s:environment() endif endfunction -function! s:environments(...) - let e = s:getopt("environment","abg") - if e == '' - return "development\ntest\nproduction" - else - return s:gsub(e,'[:;,- ]',"\n") - endif +function! s:Complete_environments(...) + return s:completion_filter(rails#app().environments(),a:0 ? a:1 : "") endfunction function! s:warn(str) @@ -426,7 +382,7 @@ function! s:error(str) endfunction function! s:debug(str) - if g:rails_debug + if exists("g:rails_debug") && g:rails_debug echohl Debug echomsg a:str echohl None @@ -438,6 +394,59 @@ endfunction " RailsRoot() is the only official public function +function! rails#underscore(str) + let str = s:gsub(a:str,'::','/') + let str = s:gsub(str,'(\u+)(\u\l)','\1_\2') + let str = s:gsub(str,'(\l|\d)(\u)','\1_\2') + let str = tolower(str) + return str +endfunction + +function! rails#camelize(str) + let str = s:gsub(a:str,'/(.=)','::\u\1') + let str = s:gsub(str,'%([_-]|<)(.)','\u\1') + return str +endfunction + +function! rails#singularize(word) + " Probably not worth it to be as comprehensive as Rails but we can + " still hit the common cases. + let word = a:word + if word =~? '\.js$' || word == '' + return word + endif + let word = s:sub(word,'eople$','ersons') + let word = s:sub(word,'[aeio]@<!ies$','ys') + let word = s:sub(word,'xe[ns]$','xs') + 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,'%([nrt]ch|tatus|lias)\zse$','') + let word = s:sub(word,'%(nd|rt)\zsice$','ex') + return word +endfunction + +function! rails#pluralize(word) + let word = a:word + if 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:sub(word,'ersons$','eople') + return word +endfunction + +function! rails#app(...) + let root = a:0 ? a:1 : RailsRoot() + " TODO: populate dynamically + " TODO: normalize path + return get(s:apps,root,0) +endfunction + function! RailsRevision() return 1000*matchstr(g:autoloaded_rails,'^\d\+')+matchstr(g:autoloaded_rails,'[1-9]\d*$') endfunction @@ -458,9 +467,17 @@ function! RailsFilePath() endif let f = s:gsub(expand('%:p'),'\\ @!','/') let f = s:sub(f,'/$','') - if s:gsub(b:rails_root,'\\ @!','/') == strpart(f,0,strlen(b:rails_root)) + let sep = matchstr(f,'^[^\\/]\{3,\}\zs[\\/]') + if sep != "" + let f = getcwd().sep.f + endif + if s:startswith(f,s:gsub(b:rails_root,'\\ @!','/')) || f == "" return strpart(f,strlen(b:rails_root)+1) else + if !exists("s:path_warn") + let s:path_warn = 1 + call s:warn("File ".f." does not appear to be under the Rails root ".b:rails_root.". Please report to the rails.vim author!") + endif return f endif endfunction @@ -472,19 +489,28 @@ endfunction function! RailsFileType() if !exists("b:rails_root") return "" - elseif exists("b:rails_file_type") - return b:rails_file_type elseif exists("b:rails_cached_file_type") return b:rails_cached_file_type + else + return rails#app().calculate_file_type(RailsFilePath()) endif - let f = RailsFilePath() - let e = fnamemodify(RailsFilePath(),':e') +endfunction + +function! s:app_calculate_file_type(path) dict + let f = a:path + let e = fnamemodify(f,':e') let r = "" - let top = getline(1)." ".getline(2)." ".getline(3)." ".getline(4)." ".getline(5).getline(6)." ".getline(7)." ".getline(8)." ".getline(9)." ".getline(10) + let full_path = self.path(f) + let nr = bufnr('^'.full_path.'$') + if nr < 0 && exists('+shellslash') && ! &shellslash + let nr = bufnr('^'.s:gsub(full_path,'/','\\').'$') + endif if f == "" let r = f + elseif nr > 0 && getbufvar(nr,'rails_file_type') != '' + return getbufvar(nr,'rails_file_type') elseif f =~ '_controller\.rb$' || f =~ '\<app/controllers/.*\.rb$' - if top =~ '\<wsdl_service_name\>' + if join(s:readfile(full_path,50),"\n") =~ '\<wsdl_service_name\>' let r = "controller-api" else let r = "controller" @@ -497,13 +523,15 @@ function! RailsFileType() let r = "spec" elseif f =~ '_helper\.rb$' let r = "helper" + elseif f =~ '\<app/metal/.*\.rb$' + let r = "metal" elseif f =~ '\<app/models\>' + let top = join(s:readfile(full_path,50),"\n") let class = matchstr(top,'\<Acti\w\w\u\w\+\%(::\h\w*\)\+\>') if class == "ActiveResource::Base" let class = "ares" let r = "model-ares" elseif class != '' - "let class = s:sub(class,'::Base$','') let class = tolower(s:gsub(class,'[^A-Z]','')) let r = "model-".s:sub(class,'^amb>','mailer') elseif f =~ '_mailer\.rb$' @@ -531,6 +559,12 @@ function! RailsFileType() let r = 'lib' elseif f =~ '\<spec/\w*s/.*_spec\.rb$' let r = s:sub(f,'.*<spec/(\w*)s/.*','spec-\1') + elseif f =~ '\<features/.*\.feature$' + let r = 'cucumber-feature' + elseif f =~ '\<features/step_definitions/.*_steps\.rb$' + let r = 'cucumber-steps' + elseif f =~ '\<features/.*\.rb$' + let r = 'cucumber' elseif f =~ '\<\%(test\|spec\)/fixtures\>' if e == "yml" let r = "fixtures-yaml" @@ -557,39 +591,107 @@ function! RailsFileType() return r endfunction -function! RailsType() - return RailsFileType() +function! s:app_environments() dict + if self.cache.needs('environments') + call self.cache.set('environments',self.relglob('config/environments/','**/*','.rb')) + endif + return copy(self.cache.get('environments')) endfunction -function! RailsEval(ruby,...) - if !exists("b:rails_root") - return a:0 ? a:1 : "" - elseif a:0 - return s:railseval(a:ruby,a:1) - else - return s:railseval(a:ruby) +function! s:app_has(feature) dict + let map = { + \'test': 'test/', + \'spec': 'spec/', + \'cucumber': 'features/', + \'sass': 'public/stylesheets/sass/'} + if self.cache.needs('features') + call self.cache.set('features',{}) + endif + let features = self.cache.get('features') + if !has_key(features,a:feature) + let path = get(map,a:feature,a:feature.'/') + let features[a:feature] = isdirectory(rails#app().path(path)) endif + return features[a:feature] +endfunction + +" Returns the subset of ['test', 'spec', 'cucumber'] present on the app. +function! s:app_test_suites() dict + return filter(['test','spec','cucumber'],'self.has(v:val)') endfunction +call s:add_methods('app',['calculate_file_type','environments','has','test_suites']) + " }}}1 -" Autocommand Functions {{{1 +" Ruby Execution {{{1 -function! s:QuickFixCmdPre() - if exists("b:rails_root") - if strpart(getcwd(),0,strlen(RailsRoot())) != RailsRoot() - let s:last_dir = getcwd() - echo "lchdir ".s:ra() - "exe "lchdir ".s:ra() - lchdir `=RailsRoot()` +function! s:app_ruby_shell_command(cmd) dict abort + if self.path() =~ '://' + return "ruby ".a:cmd + else + return "ruby -C ".s:rquote(self.path())." ".a:cmd + endif +endfunction + +function! s:app_background_ruby_command(cmd) dict abort + let cmd = s:esccmd(self.ruby_shell_command(a:cmd)) + if has_key(self,'options') && has_key(self.options,'gnu_screen') + let screen = self.options.gnu_screen + else + let screen = g:rails_gnu_screen + endif + if has("gui_win32") + if &shellcmdflag == "-c" && ($PATH . &shell) =~? 'cygwin' + silent exe "!cygstart -d ".s:rquote(self.path())." ruby ".a:cmd + else + exe "!start ".cmd endif + elseif exists("$STY") && !has("gui_running") && screen && executable("screen") + silent exe "!screen -ln -fn -t ".s:sub(s:sub(a:cmd,'\s.*',''),'^%(script|-rcommand)/','rails-').' '.cmd + else + exe "!".cmd + endif + return v:shell_error +endfunction + +function! s:app_execute_ruby_command(cmd) dict abort + exe "!".s:esccmd(self.ruby_shell_command(a:cmd)) + return v:shell_error +endfunction + +function! s:app_lightweight_ruby_eval(ruby,...) dict abort + let def = a:0 ? a:1 : "" + if !executable("ruby") + return def + endif + let args = '-e '.s:rquote('begin; require %{rubygems}; rescue LoadError; end; begin; require %{active_support}; rescue LoadError; end; '.a:ruby) + let cmd = self.ruby_shell_command(args) + " If the shell is messed up, this command could cause an error message + silent! let results = system(cmd) + return v:shell_error == 0 ? results : def +endfunction + +function! s:app_eval(ruby,...) dict abort + let def = a:0 ? a:1 : "" + if !executable("ruby") + return def endif + let args = "-r./config/boot -r ".s:rquote(self.path("config/environment"))." -e ".s:rquote(a:ruby) + let cmd = self.ruby_shell_command(args) + " If the shell is messed up, this command could cause an error message + silent! let results = system(cmd) + return v:shell_error == 0 ? results : def endfunction -function! s:QuickFixCmdPost() - if exists("s:last_dir") - "exe "lchdir ".s:escarg(s:last_dir) - lchdir `=s:last_dir` - unlet s:last_dir +call s:add_methods('app', ['ruby_shell_command','execute_ruby_command','background_ruby_command','lightweight_ruby_eval','eval']) + +function! RailsEval(ruby,...) abort + if !exists("b:rails_root") + return a:0 ? a:1 : "" + elseif a:0 + return rails#app().eval(a:ruby,a:1) + else + return rails#app().eval(a:ruby) endif endfunction @@ -620,14 +722,14 @@ function! RailsHelpCommand(...) endfunction function! s:BufCommands() - call s:BufFinderCommands() " Provides Rcommand! + call s:BufFinderCommands() call s:BufNavCommands() call s:BufScriptWrappers() - Rcommand! -buffer -bar -nargs=? -bang -complete=custom,s:RakeComplete Rake :call s:Rake(<bang>0,<q-args>) - Rcommand! -buffer -bar -nargs=? -bang -complete=custom,s:PreviewComplete Rpreview :call s:Preview(<bang>0,<q-args>) - Rcommand! -buffer -bar -nargs=? -bang -complete=custom,s:environments Rlog :call s:Log(<bang>0,<q-args>) - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:SetComplete Rset :call s:Set(<bang>0,<f-args>) - command! -buffer -bar -nargs=0 Rtags :call s:Tags(<bang>0) + command! -buffer -bar -nargs=? -bang -count -complete=customlist,s:Complete_rake Rake :call s:Rake(<bang>0,!<count> && <line1> ? -1 : <count>,<q-args>) + command! -buffer -bar -nargs=? -bang -range -complete=customlist,s:Complete_preview Rpreview :call s:Preview(<bang>0,<line1>,<q-args>) + command! -buffer -bar -nargs=? -bang -complete=customlist,s:Complete_environments Rlog :call s:Log(<bang>0,<q-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_set Rset :call s:Set(<bang>0,<f-args>) + command! -buffer -bar -nargs=0 Rtags :call rails#app().tags_command() " Embedding all this logic directly into the command makes the error " messages more concise. command! -buffer -bar -nargs=? -bang Rdoc : @@ -636,15 +738,17 @@ function! s:BufCommands() \ else | call s:Doc(<bang>0,<q-args>) | endif command! -buffer -bar -nargs=0 -bang Rrefresh :if <bang>0|unlet! g:autoloaded_rails|source `=s:file`|endif|call s:Refresh(<bang>0) if exists(":Project") - command! -buffer -bar -nargs=? -bang Rproject :call s:Project(<bang>0,<q-args>) + command! -buffer -bar -nargs=? Rproject :call s:Project(<bang>0,<q-args>) + elseif exists(":NERDTree") + command! -buffer -bar -nargs=? Rproject :NERDTree `=rails#app().path()` endif if exists("g:loaded_dbext") - Rcommand! -buffer -bar -nargs=? -bang -complete=custom,s: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() " TODO: complete controller names with trailing slashes here - Rcommand! -buffer -bar -nargs=? -range -complete=custom,s:controllerList Rextract :<line1>,<line2>call s:Extract(<bang>0,<f-args>) + command! -buffer -bar -nargs=? -range -complete=customlist,s:controllerList Rextract :<line1>,<line2>call s:Extract(<bang>0,<f-args>) command! -buffer -bar -nargs=? -range Rpartial :call s:warn("Warning: :Rpartial has been deprecated in favor of :Rextract") | <line1>,<line2>Rextract<bang> <args> endif if RailsFilePath() =~ '\<db/migrate/.*\.rb$' @@ -660,8 +764,8 @@ function! s:Doc(bang, string) else return s:error("specify a g:rails_search_url with %s for a query placeholder") endif - elseif isdirectory(RailsRoot()."/doc/api/classes") - let url = RailsRoot()."/doc/api/index.html" + elseif isdirectory(rails#app().path("doc/api/classes")) + let url = rails#app().path("/doc/api/index.html") elseif s:getpidfor("0.0.0.0","8808") > 0 let url = "http://localhost:8808" else @@ -681,7 +785,7 @@ function! s:Log(bang,arg) else let lf = "log/".a:arg.".log" endif - let size = getfsize(RailsRoot()."/".lf) + let size = getfsize(rails#app().path(lf)) if size >= 1048576 call s:warn("Log file is ".((size+512)/1024)."KB. Consider :Rake log:clear") endif @@ -690,16 +794,14 @@ function! s:Log(bang,arg) clast else if exists(":Tail") - " TODO: check if :Tail works with `=` - exe "Tail ".s:ra().'/'.lf + Tail `=rails#app().path(lf)` else - "exe "pedit ".s:ra().'/'.lf - pedit `=RailsRoot().'/'.lf` + pedit `=rails#app().path(lf)` endif endif endfunction -function! RailsNewApp(bang,...) +function! rails#new_app_command(bang,...) if a:0 == 0 if a:bang echo "rails.vim version ".g:autoloaded_rails @@ -719,30 +821,24 @@ function! RailsNewApp(bang,...) let str = "" let c = 1 while c <= a:0 - let str = str . " " . s:rquote(expand(a:{c})) - let c = c + 1 + let str .= " " . s:rquote(expand(a:{c})) + let c += 1 endwhile - "let str = s:sub(str,'^ ','') let dir = expand(dir) - if isdirectory(fnamemodify(dir,':h')."/.svn") && g:rails_subversion - let append = " -c" - else - let append = "" - endif + let append = "" if g:rails_default_database != "" && str !~ '-d \|--database=' - let append = append." -d ".g:rails_default_database + let append .= " -d ".g:rails_default_database endif if a:bang - let append = append." --force" + let append .= " --force" endif exe "!rails".append.str if filereadable(dir."/".g:rails_default_file) - "exe "edit ".s:escarg(dir)."/".g:rails_default_file edit `=dir.'/'.g:rails_default_file` endif endfunction -function! s:Tags(bang) +function! s:app_tags_command() dict if exists("g:Tlist_Ctags_Cmd") let cmd = g:Tlist_Ctags_Cmd elseif executable("exuberant-ctags") @@ -756,36 +852,37 @@ function! s:Tags(bang) else return s:error("ctags not found") endif - exe "!".cmd." -R ".s:ra() + exe '!'.cmd.' -f '.s:escarg(self.path("tmp/tags")).' -R --langmap="ruby:+.rake.builder.rjs" '.g:rails_ctags_arguments.' '.s:escarg(self.path()) endfunction +call s:add_methods('app',['tags_command']) + function! s:Refresh(bang) - " What else? - if a:bang - unlet! s:rails_helper_methods - endif if exists("g:rubycomplete_rails") && g:rubycomplete_rails && has("ruby") silent! ruby ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) - silent! ruby Dependencies.clear if defined?(Dependencies) + silent! ruby if defined?(ActiveSupport::Dependencies); ActiveSupport::Dependencies.clear; elsif defined?(Dependencies); Dependencies.clear; end if a:bang silent! ruby ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord) endif endif - call s:cacheclear() + call rails#app().cache.clear() silent doautocmd User BufLeaveRails - if a:bang && s:cacheworks() - let s:cache = {} + if a:bang + for key in keys(s:apps) + if type(s:apps[key]) == type({}) + call s:apps[key].cache.clear() + endif + call extend(s:apps[key],filter(copy(s:app_prototype),'type(v:val) == type(function("tr"))'),'force') + endfor endif let i = 1 let max = bufnr('$') while i <= max let rr = getbufvar(i,"rails_root") if rr != "" - unlet! s:user_classes_{s:escvar(rr)} - unlet! s:dbext_type_{s:escvar(rr)} call setbufvar(i,"rails_refresh",1) endif - let i = i + 1 + let i += 1 endwhile silent doautocmd User BufEnterRails endfunction @@ -793,7 +890,7 @@ endfunction function! s:RefreshBuffer() if exists("b:rails_refresh") && b:rails_refresh let oldroot = b:rails_root - unlet! b:rails_root b:rails_use_subversion + unlet! b:rails_root let b:rails_refresh = 0 call RailsBufInit(oldroot) unlet! b:rails_refresh @@ -803,7 +900,25 @@ endfunction " }}}1 " Rake {{{1 -" Depends: s:rubyexestr, s:sub, s:lastmethodline, s:getopt, s;rquote, s:QuickFixCmdPre, ... +function! s:app_rake_tasks() dict + if self.cache.needs('rake_tasks') + 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 + call map(lines,'matchstr(v:val,"^rake\\s\\+\\zs\\S*")') + call filter(lines,'v:val != ""') + call self.cache.set('rake_tasks',lines) + endif + return self.cache.get('rake_tasks') +endfunction + +call s:add_methods('app', ['rake_tasks']) " Current directory let s:efm='%D(in\ %f),' @@ -860,144 +975,196 @@ let s:efm=s:efm let s:efm_backtrace='%D(in\ %f),' \.'%\\s%#from\ %f:%l:%m,' + \.'%\\s%#from\ %f:%l:,' \.'%\\s#{RAILS_ROOT}/%f:%l:\ %#%m,' \.'%\\s%#[%f:%l:\ %#%m,' - \.'%\\s%#%f:%l:\ %#%m' + \.'%\\s%#%f:%l:\ %#%m,' + \.'%\\s%#%f:%l:' -function! s:makewithruby(arg,...) +function! s:makewithruby(arg,bang,...) if &efm == s:efm - if a:0 ? a:1 : 1 + if (a:0 ? a:1 : 1) && !a:bang setlocal efm=\%-E-e:%.%#,\%+E%f:%l:\ parse\ error,%W%f:%l:\ warning:\ %m,%E%f:%l:in\ %*[^:]:\ %m,%E%f:%l:\ %m,%-C%\tfrom\ %f:%l:in\ %.%#,%-Z%\tfrom\ %f:%l,%-Z%p^,%-G%.%# endif endif let old_make = &makeprg - let &l:makeprg = s:rubyexestr(a:arg) - make - let &l:makeprg = old_make -endfunction - -function! s:Rake(bang,arg) - let oldefm = &efm - if a:bang - let &l:errorformat = s:efm_backtrace - endif - let t = RailsFileType() - let arg = a:arg - if &filetype == "ruby" && arg == '' && g:rails_modelines - let lnum = s:lastmethodline() - let str = getline(lnum)."\n".getline(lnum+1)."\n".getline(lnum+2)."\n" - let pat = '\s\+\zs.\{-\}\ze\%(\n\|\s\s\|#{\@!\|$\)' - let mat = matchstr(str,'#\s*rake'.pat) - let mat = s:sub(mat,'\s+$','') - if mat != "" - let arg = mat + try + let &l:makeprg = rails#app().ruby_shell_command(a:arg) + exe 'make'.(a:bang ? '!' : '') + finally + let &l:makeprg = old_make + endtry +endfunction + +function! s:Rake(bang,lnum,arg) + let self = rails#app() + let lnum = a:lnum < 0 ? 0 : a:lnum + let old_makeprg = &l:makeprg + let old_errorformat = &l:errorformat + try + if &l:makeprg !~# 'rake' + let &l:makeprg = 'rake' endif - endif - if arg == '' - let opt = s:getopt('task','bl') - if opt != '' - let arg = opt + let &l:errorformat = a:bang ? s:efm_backtrace : s:efm + let t = RailsFileType() + let arg = a:arg + if &filetype == "ruby" && arg == '' && g:rails_modelines + let mnum = s:lastmethodline(lnum) + let str = getline(mnum)."\n".getline(mnum+1)."\n".getline(mnum+2)."\n" + let pat = '\s\+\zs.\{-\}\ze\%(\n\|\s\s\|#{\@!\|$\)' + let mat = matchstr(str,'#\s*rake'.pat) + let mat = s:sub(mat,'\s+$','') + if mat != "" + let arg = mat + endif endif - endif - let withrubyargs = '-r ./config/boot -r '.s:rquote(RailsRoot().'/config/environment').' -e "puts \%((in \#{Dir.getwd}))" ' - if arg =~# '^\%(stats\|routes\|notes\|db:\%(charset\|collation\|version\)\)\%(:\|$\)' - " So you can see the output even with an inadequate redirect - call s:QuickFixCmdPre() - exe "!".&makeprg." ".arg - call s:QuickFixCmdPost() - elseif arg =~ '^preview\>' - exe 'R'.s:gsub(arg,':','/') - elseif arg =~ '^runner:' - let arg = s:sub(arg,'^runner:','') - let root = matchstr(arg,'%\%(:\w\)*') - let file = expand(root).matchstr(arg,'%\%(:\w\)*\zs.*') - if file =~ '[@#].*$' - let extra = " -- -n ".matchstr(file,'[@#]\zs.*') - let file = s:sub(file,'[@#].*','') - else - let extra = '' + if arg == '' + let opt = s:getopt('task','bl') + if opt != '' + let arg = opt + else + let arg = s:default_rake_task(lnum) + endif endif - if s:hasfile(file) || s:hasfile(file.'.rb') - call s:makewithruby(withrubyargs.'-r"'.file.'"'.extra,file !~# '_\%(spec\|test\)\%(\.rb\)\=$') + let withrubyargs = '-r ./config/boot -r '.s:rquote(self.path('config/environment')).' -e "puts \%((in \#{Dir.getwd}))" ' + if arg =~# '^notes\>' + let &l:errorformat = '%-P%f:,\ \ *\ [%*[\ ]%l]\ [%t%*[^]]] %m,\ \ *\ [%*[\ ]%l] %m,%-Q' + " %D to chdir is apparently incompatible with %P multiline messages + call s:push_chdir(1) + exe 'make '.arg + call s:pop_command() + if a:bang + copen + endif + elseif arg =~# '^\%(stats\|routes\|secret\|time:zones\|db:\%(charset\|collation\|fixtures:identify\>.*\|version\)\)\%(:\|$\)' + let &l:errorformat = '%D(in\ %f),%+G%.%#' + exe 'make '.arg + if a:bang + copen + endif + elseif arg =~ '^preview\>' + exe (lnum == 0 ? '' : lnum).'R'.s:gsub(arg,':','/') + elseif arg =~ '^runner:' + let arg = s:sub(arg,'^runner:','') + let root = matchstr(arg,'%\%(:\w\)*') + let file = expand(root).matchstr(arg,'%\%(:\w\)*\zs.*') + if file =~ '#.*$' + let extra = " -- -n ".matchstr(file,'#\zs.*') + let file = s:sub(file,'#.*','') + else + let extra = '' + endif + if self.has_file(file) || self.has_file(file.'.rb') + call s:makewithruby(withrubyargs.'-r"'.file.'"'.extra,a:bang,file !~# '_\%(spec\|test\)\%(\.rb\)\=$') + else + call s:makewithruby(withrubyargs.'-e '.s:esccmd(s:rquote(arg)),a:bang) + endif + elseif arg == 'run' || arg == 'runner' + call s:makewithruby(withrubyargs.'-r"'.RailsFilePath().'"',a:bang,RailsFilePath() !~# '_\%(spec\|test\)\%(\.rb\)\=$') + elseif arg =~ '^run:' + let arg = s:sub(arg,'^run:','') + let arg = s:sub(arg,'^\%:h',expand('%:h')) + let arg = s:sub(arg,'^%(\%|$|#@=)',expand('%')) + let arg = s:sub(arg,'#(\w+[?!=]=)$',' -- -n\1') + call s:makewithruby(withrubyargs.'-r'.arg,a:bang,arg !~# '_\%(spec\|test\)\.rb$') else - call s:makewithruby(withrubyargs.'-e '.s:esccmd(s:rquote(arg))) + exe 'make'.(a:bang ? '!' : '').' '.arg endif - elseif arg == 'run' || arg == 'runner' - call s:makewithruby(withrubyargs.'-r"'.RailsFilePath().'"',RailsFilePath() !~# '_\%(spec\|test\)\%(\.rb\)\=$') - elseif arg =~ '^run:' - let arg = s:sub(arg,'^run:','') - let arg = s:sub(arg,'^%:h',expand('%:h')) - let arg = s:sub(arg,'^%(\%|$|[@#]@=)',expand('%')) - let arg = s:sub(arg,'[@#](\w+)$',' -- -n\1') - call s:makewithruby(withrubyargs.'-r'.arg,arg !~# '_\%(spec\|test\)\.rb$') - elseif arg != '' - exe 'make '.arg + finally + let &l:errorformat = old_errorformat + let &l:makeprg = old_makeprg + endtry +endfunction + +function! s:default_rake_task(lnum) + let self = rails#app() + let t = RailsFileType() + let lnum = a:lnum < 0 ? 0 : a:lnum + if t =~ '^config-routes\>' + return 'routes' + elseif t =~ '^fixtures-yaml\>' && lnum + return "db:fixtures:identify LABEL=".s:lastmethod(lnum) + elseif t =~ '^fixtures\>' && lnum == 0 + return "db:fixtures:load FIXTURES=".s:sub(fnamemodify(RailsFilePath(),':r'),'^.{-}/fixtures/','') elseif t =~ '^task\>' - let lnum = s:lastmethodline() - let line = getline(lnum) + let mnum = s:lastmethodline(lnum) + let line = getline(mnum) " We can't grab the namespace so only run tasks at the start of the line - if line =~ '^\%(task\|file\)\>' - exe 'make '.s:lastmethod() + if line =~# '^\%(task\|file\)\>' + return s:lastmethod(a:lnum) else - make + return '' endif elseif t =~ '^spec\>' if RailsFilePath() =~# '\<spec/spec_helper\.rb$' - make spec SPEC_OPTS= - elseif search('\C^\s*\(describe\|context\)\>','bWnc') > search('\C^end\>','bWn') - exe 'make spec SPEC="%:p" SPEC_OPTS=--line='.line('.') + return 'spec SPEC_OPTS=' + elseif lnum > 0 + return 'spec SPEC="%:p" SPEC_OPTS=--line='.lnum else - make spec SPEC="%:p" SPEC_OPTS= + return 'spec SPEC="%:p" SPEC_OPTS=' endif elseif t =~ '^test\>' - let meth = s:lastmethod() + let meth = s:lastmethod(lnum) if meth =~ '^test_' let call = " -n".meth."" else let call = "" endif if t =~ '^test-\%(unit\|functional\|integration\)$' - exe "make ".s:sub(s:gsub(t,'-',':'),'unit$|functional$','&s')." TEST=\"%:p\"".s:sub(call,'^ ',' TESTOPTS=') + return s:sub(s:gsub(t,'-',':'),'unit$|functional$','&s')." TEST=\"%:p\"".s:sub(call,'^ ',' TESTOPTS=') elseif RailsFilePath() =~# '\<test/test_helper\.rb$' - make test + return 'test' else - call s:makewithruby('-e "puts \%((in \#{Dir.getwd}))" -r"%:p" -- '.call,0) + return "test:recent TEST=\"%:p\"".s:sub(call,'^ ',' TESTOPTS=') endif elseif t=~ '^\%(db-\)\=migration\>' && RailsFilePath() !~# '\<db/schema\.rb$' let ver = matchstr(RailsFilePath(),'\<db/migrate/0*\zs\d*\ze_') if ver != "" - exe "make db:migrate VERSION=".ver + let method = s:lastmethod(lnum) + if method == "down" + return "db:migrate:down VERSION=".ver + elseif method == "up" + return "db:migrate:up VERSION=".ver + elseif lnum > 0 + return "db:migrate:down db:migrate:up VERSION=".ver + else + return "db:migrate VERSION=".ver + endif else - make db:migrate + return 'db:migrate' endif + elseif self.has('spec') && RailsFilePath() =~# '^app/.*\.rb' && self.has_file(s:sub(RailsFilePath(),'^app/(.*)\.rb$','spec/\1_spec.rb')) + return 'spec SPEC="%:p:r:s?[\/]app[\/]?/spec/?_spec.rb" SPEC_OPTS=' elseif t=~ '^model\>' - make test:units TEST="%:p:r:s?[\/]app[\/]models[\/]?/test/unit/?_test.rb" + return 'test:units TEST="%:p:r:s?[\/]app[\/]models[\/]?/test/unit/?_test.rb"' elseif t=~ '^api\>' - make test:units TEST="%:p:r:s?[\/]app[\/]apis[\/]?/test/functional/?_test.rb" + return 'test:units TEST="%:p:r:s?[\/]app[\/]apis[\/]?/test/functional/?_test.rb"' elseif t=~ '^\<\%(controller\|helper\|view\)\>' if RailsFilePath() =~ '\<app/' && s:controller() !~# '^\%(application\)\=$' - exe 'make test:functionals TEST="'.s:ra().'/test/functional/'.s:controller().'_controller_test.rb"' + return 'test:functionals TEST="'.s:escarg(self.path('test/functional/'.s:controller().'_controller_test.rb')).'"' + else + return 'test:functionals' + endif + elseif t =~ '^cucumber-feature\>' + if lnum > 0 + return 'features FEATURE="%:p":'.lnum else - make test:functionals + return 'features FEATURE="%:p"' endif + elseif t =~ '^cucumber\>' + return 'features' else - make - endif - if oldefm != '' - let &l:errorformat = oldefm + return '' endif endfunction -function! s:RakeComplete(A,L,P) - return g:rails_rake_tasks +function! s:Complete_rake(A,L,P) + return s:completion_filter(rails#app().rake_tasks(),a:A) endfunction " }}}1 " Preview {{{1 -" Depends: s:getopt, s:sub, s:controller, s:lastmethod -" Provides: s:initOpenURL - function! s:initOpenURL() if !exists(":OpenURL") if has("gui_mac") || has("gui_macvim") || exists("$SECURITYSESSIONID") @@ -1018,12 +1185,7 @@ function! s:scanlineforuri(lnum) let method = matchstr(url,'^\u\+') let url = matchstr(url,'\s\+\zs.*') if method !=? "GET" - if url =~ '?' - let url = url.'&' - else - let url = url.'?' - endif - let url = url.'_method='.tolower(method) + let url .= (url =~ '?' ? '&' : '?') . '_method='.tolower(method) endif endif if url != "" @@ -1033,26 +1195,26 @@ function! s:scanlineforuri(lnum) endif endfunction -function! s:defaultpreview() +function! s:defaultpreview(lnum) let ret = '' - if s:getopt('preview','l') != '' - let uri = s:getopt('preview','l') + if s:getopt('preview','l',a:lnum) != '' + let uri = s:getopt('preview','l',a:lnum) elseif s:controller() != '' && s:controller() != 'application' && RailsFilePath() !~ '^public/' if RailsFileType() =~ '^controller\>' - let start = s:lastmethodline() - 1 + let start = s:lastmethodline(a:lnum) - 1 if start + 1 while getline(start) =~ '^\s*\%(#.*\)\=$' let ret = s:scanlineforuri(start).ret - let start = start - 1 + let start -= 1 endwhile - let ret = ret.s:controller().'/'.s:lastmethod().'/' + let ret .= s:controller().'/'.s:lastmethod(a:lnum).'/' else - let ret = ret.s:controller().'/' + let ret .= s:controller().'/' endif elseif s:getopt('preview','b') != '' let ret = s:getopt('preview','b') elseif RailsFileType() =~ '^view\%(-partial\|-layout\)\@!' - let ret = ret.s:controller().'/'.expand('%:t:r:r').'/' + let ret .= s:controller().'/'.expand('%:t:r:r').'/' endif elseif s:getopt('preview','b') != '' let uri = s:getopt('preview','b') @@ -1064,7 +1226,7 @@ function! s:defaultpreview() return ret endfunction -function! s:Preview(bang,arg) +function! s:Preview(bang,lnum,arg) let root = s:getopt("root_url") if root == '' let root = s:getopt("url") @@ -1075,7 +1237,7 @@ function! s:Preview(bang,arg) elseif a:arg != '' let uri = root.'/'.s:sub(a:arg,'^/','') else - let uri = matchstr(s:defaultpreview(),'.\{-\}\%(\n\@=\|$\)') + let uri = matchstr(s:defaultpreview(a:lnum),'.\{-\}\%(\n\@=\|$\)') let uri = root.'/'.s:sub(s:sub(uri,'^/',''),'/$','') endif call s:initOpenURL() @@ -1095,7 +1257,7 @@ function! s:Preview(bang,arg) setlocal filetype=xhtml endif endif - call RailsBufInit(RailsRoot()) + call RailsBufInit(rails#app().path()) map <buffer> <silent> q :bwipe<CR> wincmd p if !a:bang @@ -1104,47 +1266,61 @@ function! s:Preview(bang,arg) endif endfunction -function! s:PreviewComplete(A,L,P) - return s:defaultpreview() +function! s:Complete_preview(A,L,P) + return split(s:defaultpreview(a:L =~ '^\d' ? matchstr(a:L,'^\d\+') : line('.')),"\n") endfunction " }}}1 " Script Wrappers {{{1 -" Depends: s:rquote, s:rubyexebg, s:rubyexe, s:rubyexestr, s:sub, s:getopt, s:usesubversion, s:user_classes_..., ..., s:pluginList, ... - function! s:BufScriptWrappers() - Rcommand! -buffer -bar -nargs=+ -complete=custom,s:ScriptComplete Rscript :call s:Script(<bang>0,<f-args>) - Rcommand! -buffer -bar -nargs=* -complete=custom,s:ConsoleComplete Rconsole :call s:Console(<bang>0,'console',<f-args>) - "Rcommand! -buffer -bar -nargs=* Rbreakpointer :call s:Console(<bang>0,'breakpointer',<f-args>) - Rcommand! -buffer -bar -nargs=* -complete=custom,s:GenerateComplete Rgenerate :call s:Generate(<bang>0,<f-args>) - Rcommand! -buffer -bar -nargs=* -complete=custom,s:DestroyComplete Rdestroy :call s:Destroy(<bang>0,<f-args>) - Rcommand! -buffer -bar -nargs=? -bang -complete=custom,s:ServerComplete Rserver :call s:Server(<bang>0,<q-args>) - Rcommand! -buffer -bang -nargs=1 -range=0 -complete=custom,s:RubyComplete Rrunner :call s:Runner(<bang>0 ? -2 : (<count>==<line2>?<count>:-1),<f-args>) - Rcommand! -buffer -nargs=1 -range=0 -complete=custom,s:RubyComplete Rp :call s:Runner(<count>==<line2>?<count>:-1,'p begin '.<f-args>.' end') - Rcommand! -buffer -nargs=1 -range=0 -complete=custom,s:RubyComplete Rpp :call s:Runner(<count>==<line2>?<count>:-1,'require %{pp}; pp begin '.<f-args>.' end') - Rcommand! -buffer -nargs=1 -range=0 -complete=custom,s:RubyComplete Ry :call s:Runner(<count>==<line2>?<count>:-1,'y begin '.<f-args>.' end') -endfunction - -function! s:Script(bang,cmd,...) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_script Rscript :call rails#app().script_command(<bang>0,<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_console Rconsole :call s:warn("Warning: :Rconsole has been deprecated in favor of :Rscript")|call rails#app().script_command(<bang>0,'console',<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_generate Rgenerate :call rails#app().generate_command(<bang>0,<f-args>) + 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') +endfunction + +function! s:app_generators() dict + if self.cache.needs('generators') + let generators = self.relglob("vendor/plugins/","*/generators/*") + let generators += self.relglob("","lib/generators/*") + call filter(generators,'v:val =~ "/$"') + let generators += split(glob(expand("~/.rails/generators")."/*"),"\n") + call map(generators,'s:sub(v:val,"^.*[\\\\/]generators[\\\\/]\\ze.","")') + call map(generators,'s:sub(v:val,"[\\\\/]$","")') + call self.cache.set('generators',generators) + endif + return sort(split(g:rails_generators,"\n") + self.cache.get('generators')) +endfunction + +function! s:app_script_command(bang,...) dict let str = "" - let c = 1 + let cmd = a:0 ? a:1 : "console" + let c = 2 while c <= a:0 - let str = str . " " . s:rquote(a:{c}) - let c = c + 1 + let str .= " " . s:rquote(a:{c}) + let c += 1 endwhile - if a:bang - call s:rubyexebg(s:rquote("script/".a:cmd).str) + if cmd ==# "plugin" + call self.cache.clear('generators') + endif + if a:bang || cmd =~# 'console' + return self.background_ruby_command(s:rquote("script/".cmd).str) else - call s:rubyexe(s:rquote("script/".a:cmd).str) + return self.execute_ruby_command(s:rquote("script/".cmd).str) endif endfunction -function! s:Runner(count,args) +function! s:app_runner_command(count,args) dict if a:count == -2 - call s:Script(a:bang,"runner",a:args) + return self.script_command(a:bang,"runner",a:args) else - let str = s:rubyexestr('-r./config/boot -e "require '."'commands/runner'".'" '.s:rquote(a:args)) + let str = self.ruby_shell_command('-r./config/boot -e "require '."'commands/runner'".'" '.s:rquote(a:args)) let res = s:sub(system(str),'\n$','') if a:count < 0 echo res @@ -1154,16 +1330,6 @@ function! s:Runner(count,args) endif endfunction -function! s:Console(bang,cmd,...) - let str = "" - let c = 1 - while c <= a:0 - let str = str . " " . s:rquote(a:{c}) - let c = c + 1 - endwhile - call s:rubyexebg(s:rquote("script/".a:cmd).str) -endfunction - function! s:getpidfor(bind,port) if has("win32") || has("win64") let netstat = system("netstat -anop tcp") @@ -1177,7 +1343,7 @@ function! s:getpidfor(bind,port) return pid endfunction -function! s:Server(bang,arg) +function! s:app_server_command(bang,arg) dict let port = matchstr(a:arg,'\%(-p\|--port=\=\)\s*\zs\d\+') if port == '' let port = "3000" @@ -1199,187 +1365,190 @@ function! s:Server(bang,arg) return endif endif - if has("win32") || has("win64") || (exists("$STY") && !has("gui_running") && s:getopt("gnu_screen","abg") && executable("screen")) - call s:rubyexebg(s:rquote("script/server")." ".a:arg) + if has_key(self,'options') && has_key(self.options,'gnu_screen') + let screen = self.options.gnu_screen + else + let screen = g:rails_gnu_screen + endif + if has("win32") || has("win64") || (exists("$STY") && !has("gui_running") && screen && executable("screen")) + call self.background_ruby_command(s:rquote("script/server")." ".a:arg) else "--daemon would be more descriptive but lighttpd does not support it - call s:rubyexe(s:rquote("script/server")." ".a:arg." -d") + call self.execute_ruby_command(s:rquote("script/server")." ".a:arg." -d") endif call s:setopt('a:root_url','http://'.(bind=='0.0.0.0'?'localhost': bind).':'.port.'/') endfunction -function! s:Destroy(bang,...) +function! s:app_destroy_command(bang,...) dict if a:0 == 0 - call s:rubyexe("script/destroy") - return + return self.execute_ruby_command("script/destroy") elseif a:0 == 1 - call s:rubyexe("script/destroy ".s:rquote(a:1)) - return + return self.execute_ruby_command("script/destroy ".s:rquote(a:1)) endif let str = "" let c = 1 while c <= a:0 - let str = str . " " . s:rquote(a:{c}) - let c = c + 1 + let str .= " " . s:rquote(a:{c}) + let c += 1 endwhile - call s:rubyexe(s:rquote("script/destroy").str.(s:usesubversion()?' -c':'')) - unlet! s:user_classes_{s:rv()} + call self.execute_ruby_command(s:rquote("script/destroy").str) + call self.cache.clear('user_classes') endfunction -function! s:Generate(bang,...) +function! s:app_generate_command(bang,...) dict if a:0 == 0 - call s:rubyexe("script/generate") - return + return self.execute_ruby_command("script/generate") elseif a:0 == 1 - call s:rubyexe("script/generate ".s:rquote(a:1)) - return + return self.execute_ruby_command("script/generate ".s:rquote(a:1)) endif let target = s:rquote(a:1) let str = "" let c = 2 while c <= a:0 - let str = str . " " . s:rquote(a:{c}) - let c = c + 1 + let str .= " " . s:rquote(a:{c}) + let c += 1 endwhile if str !~ '-p\>' && str !~ '--pretend\>' - let execstr = s:rubyexestr('-r./config/boot -e "require '."'commands/generate'".'" -- '.target." -p -f".str) + let execstr = self.ruby_shell_command('-r./config/boot -e "require '."'commands/generate'".'" -- '.target." -p -f".str) let res = system(execstr) let file = matchstr(res,'\s\+\%(create\|force\)\s\+\zs\f\+\.rb\ze\n') if file == "" let file = matchstr(res,'\s\+\%(exists\)\s\+\zs\f\+\.rb\ze\n') endif - "echo file else let file = "" endif - if !s:rubyexe("script/generate ".target.(s:usesubversion()?' -c':'').str) && file != "" - unlet! s:user_classes_{s:rv()} - "exe "edit ".s:ra()."/".file - edit `=RailsRoot().'/'.file` + if !self.execute_ruby_command("script/generate ".target.str) && file != "" + call self.cache.clear('user_classes') + call self.cache.clear('features') + if file =~ '^db/migrate/\d\d\d\d' + let file = get(self.relglob('',s:sub(file,'\d+','[0-9]*[0-9]')),-1,file) + endif + edit `=self.path(file)` endif endfunction -function! s:ScriptComplete(ArgLead,CmdLine,P) +call s:add_methods('app', ['generators','script_command','runner_command','server_command','destroy_command','generate_command']) + +function! s:Complete_script(ArgLead,CmdLine,P) let cmd = s:sub(a:CmdLine,'^\u\w*\s+','') - let P = a:P - strlen(a:CmdLine)+strlen(cmd) - if cmd !~ '^[ A-Za-z0-9_=-]*$' - " You're on your own, bud - return "" - elseif cmd =~ '^\w*$' - return "about\nconsole\ndestroy\ngenerate\nperformance/benchmarker\nperformance/profiler\nplugin\nproccess/reaper\nprocess/spawner\nrunner\nserver" - elseif cmd =~ '^\%(plugin\)\s\+'.a:ArgLead.'$' - return "discover\nlist\ninstall\nupdate\nremove\nsource\nunsource\nsources" - elseif cmd =~ '\%(plugin\)\s\+\%(install\|remove\)\s\+'.a:ArgLead.'$' || cmd =~ '\%(generate\|destroy\)\s\+plugin\s\+'.a:ArgLead.'$' + "let P = a:P - strlen(a:CmdLine)+strlen(cmd) + if cmd !~ '^[ A-Za-z0-9_=:-]*$' + return [] + elseif cmd =~# '^\w*$' + return s:completion_filter(rails#app().relglob("script/","**/*"),a:ArgLead) + elseif cmd =~# '^\%(plugin\)\s\+'.a:ArgLead.'$' + return s:completion_filter(["discover","list","install","update","remove","source","unsource","sources"],a:ArgLead) + elseif cmd =~# '\%(plugin\)\s\+\%(install\|remove\)\s\+'.a:ArgLead.'$' || cmd =~ '\%(generate\|destroy\)\s\+plugin\s\+'.a:ArgLead.'$' return s:pluginList(a:ArgLead,a:CmdLine,a:P) - elseif cmd =~ '^\%(generate\|destroy\)\s\+'.a:ArgLead.'$' - return g:rails_generators - elseif cmd =~ '^\%(generate\|destroy\)\s\+\w\+\s\+'.a:ArgLead.'$' + elseif cmd =~# '^\%(generate\|destroy\)\s\+'.a:ArgLead.'$' + return s:completion_filter(rails#app().generators(),a:ArgLead) + elseif cmd =~# '^\%(generate\|destroy\)\s\+\w\+\s\+'.a:ArgLead.'$' let target = matchstr(cmd,'^\w\+\s\+\zs\w\+\ze\s\+') - let pattern = "" " TODO if target =~# '^\%(\w*_\)\=controller$' - return s:sub(s:controllerList(pattern,"",""),'^application\n=','') - elseif target =~# '^\%(\w*_\)\=model$' || target =~# '^scaffold\%(_resource\)\=$' || target == 'mailer' - return s:modelList(pattern,"","") - elseif target == 'migration' || target == 'session_migration' - return s:migrationList(pattern,"","") - elseif target == 'integration_test' - return s:integrationtestList(pattern,"","") - elseif target == 'observer' - " script/generate observer is in Edge Rails - let observers = s:observerList(pattern,"","") - let models = s:modelList(pattern,"","") - if cmd =~ '^destroy\>' - let models = "" + return filter(s:controllerList(a:ArgLead,"",""),'v:val !=# "application"') + elseif target =~# '^\%(\w*_\)\=model$' || target =~# '^scaffold\%(_resource\)\=$' || target ==# 'mailer' + return s:modelList(a:ArgLead,"","") + elseif target ==# 'migration' || target ==# 'session_migration' + return s:migrationList(a:ArgLead,"","") + elseif target ==# 'integration_test' || target ==# 'feature' + return s:integrationtestList(a:ArgLead,"","") + elseif target ==# 'observer' + let observers = s:observerList("","","") + let models = s:modelList("","","") + if cmd =~# '^destroy\>' + let models = [] endif - while strlen(models) > 0 - let tmp = matchstr(models."\n",'.\{-\}\ze\n') - let models = s:sub(models,'.{-}%(\n|$)','') - if stridx("\n".observers."\n","\n".tmp."\n") == -1 && tmp !~'_observer$' - let observers = observers."\n".tmp - endif - endwhile - return s:sub(observers,'^\n','') - elseif target == 'web_service' - return s:apiList(pattern,"","") + call filter(models,'index(observers,v:val) < 0') + return s:completion_filter(observers + models,a:ArgLead) + elseif target ==# 'web_service' + return s:apiList(a:ArgLead,"","") + else + return [] + endif + elseif cmd =~# '^\%(generate\|destroy\)\s\+scaffold\s\+\w\+\s\+'.a:ArgLead.'$' + return filter(s:controllerList(a:ArgLead,"",""),'v:val !=# "application"') + return s:completion_filter(rails#app().environments()) + elseif cmd =~# '^\%(console\)\s\+\(--\=\w\+\s\+\)\='.a:ArgLead."$" + return s:completion_filter(rails#app().environments()+["-s","--sandbox"],a:ArgLead) + elseif cmd =~# '^\%(server\)\s\+.*-e\s\+'.a:ArgLead."$" + return s:completion_filter(rails#app().environments(),a:ArgLead) + elseif cmd =~# '^\%(server\)\s\+' + if a:ArgLead =~# '^--environment=' + return s:completion_filter(map(copy(rails#app().environments()),'"--environment=".v:val'),a:ArgLead) else - return "" + return filter(["-p","-b","-e","-m","-d","-u","-c","-h","--port=","--binding=","--environment=","--mime-types=","--daemon","--debugger","--charset=","--help"],'s:startswith(v:val,a:ArgLead)') endif - elseif cmd =~ '^\%(generate\|destroy\)\s\+scaffold\s\+\w\+\s\+'.a:ArgLead.'$' - return s:sub(s:controllerList("","",""),'^application\n=','') - elseif cmd =~ '^\%(console\)\s\+\(--\=\w\+\s\+\)\='.a:ArgLead."$" - return s:environments()."\n-s\n--sandbox" - elseif cmd =~ '^\%(server\)\s\+.*-e\s\+'.a:ArgLead."$" - return s:environments() - elseif cmd =~ '^\%(server\)\s\+' - return "-p\n-b\n-e\n-m\n-d\n-u\n-c\n-h\n--port=\n--binding=\n--environment=\n--mime-types=\n--daemon\n--debugger\n--charset=\n--help\n" endif return "" -" return s:relglob(RailsRoot()."/script/",a:ArgLead."*") endfunction function! s:CustomComplete(A,L,P,cmd) let L = "Rscript ".a:cmd." ".s:sub(a:L,'^\h\w*\s+','') let P = a:P - strlen(a:L) + strlen(L) - return s:ScriptComplete(a:A,L,P) + return s:Complete_script(a:A,L,P) endfunction -function! s:ServerComplete(A,L,P) +function! s:Complete_server(A,L,P) return s:CustomComplete(a:A,a:L,a:P,"server") endfunction -function! s:ConsoleComplete(A,L,P) +function! s:Complete_console(A,L,P) return s:CustomComplete(a:A,a:L,a:P,"console") endfunction -function! s:GenerateComplete(A,L,P) +function! s:Complete_generate(A,L,P) return s:CustomComplete(a:A,a:L,a:P,"generate") endfunction -function! s:DestroyComplete(A,L,P) +function! s:Complete_destroy(A,L,P) return s:CustomComplete(a:A,a:L,a:P,"destroy") endfunction -function! s:RubyComplete(A,L,R) - return s:gsub(RailsUserClasses(),' ','\n')."\nActiveRecord::Base" +function! s:Complete_ruby(A,L,P) + return s:completion_filter(rails#app().user_classes()+["ActiveRecord::Base"],a:A) endfunction " }}}1 " Navigation {{{1 function! s:BufNavCommands() - " Vim 6.2 chokes on script local completion functions (e.g., s:FindList). - " :Rcommand! is a thin wrapper arround :command! which works around this - Rcommand! -buffer -bar -nargs=? -complete=custom,s:DirList Rcd :cd `=RailsRoot().'/'.<q-args>` - Rcommand! -buffer -bar -nargs=? -complete=custom,s:DirList Rlcd :lcd `=RailsRoot().'/'.<q-args>` - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList Rfind :call s:Find(<bang>0,<count>,'' ,<f-args>) - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList REfind :call s:Find(<bang>0,<count>,'E',<f-args>) - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList RSfind :call s:Find(<bang>0,<count>,'S',<f-args>) - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList RVfind :call s:Find(<bang>0,<count>,'V',<f-args>) - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList RTfind :call s:Find(<bang>0,<count>,'T',<f-args>) - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList Rsfind :<count>RSfind<bang> <args> - Rcommand! -buffer -bar -nargs=* -count=1 -complete=custom,s:FindList Rtabfind :<count>RTfind<bang> <args> - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:EditList Redit :call s:Edit(<bang>0,<count>,'' ,<f-args>) - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:EditList REedit :call s:Edit(<bang>0,<count>,'E',<f-args>) - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:EditList RSedit :call s:Edit(<bang>0,<count>,'S',<f-args>) - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:EditList RVedit :call s:Edit(<bang>0,<count>,'V',<f-args>) - Rcommand! -buffer -bar -nargs=* -bang -complete=custom,s:EditList RTedit :call s:Edit(<bang>0,<count>,'T',<f-args>) - command! -buffer -bar -nargs=0 A :call s:Alternate(<bang>0,"") - command! -buffer -bar -nargs=0 AE :call s:Alternate(<bang>0,"E") - command! -buffer -bar -nargs=0 AS :call s:Alternate(<bang>0,"S") - command! -buffer -bar -nargs=0 AV :call s:Alternate(<bang>0,"V") - command! -buffer -bar -nargs=0 AT :call s:Alternate(<bang>0,"T") - command! -buffer -bar -nargs=0 AN :call s:Related(<bang>0,"") - command! -buffer -bar -nargs=0 R :call s:Related(<bang>0,"") - command! -buffer -bar -nargs=0 RE :call s:Related(<bang>0,"E") - command! -buffer -bar -nargs=0 RS :call s:Related(<bang>0,"S") - command! -buffer -bar -nargs=0 RV :call s:Related(<bang>0,"V") - command! -buffer -bar -nargs=0 RT :call s:Related(<bang>0,"T") - "command! -buffer -bar -nargs=0 RN :call s:Alternate(<bang>0,"") + command! -buffer -bar -nargs=? -complete=customlist,s:Complete_cd Rcd :cd `=rails#app().path(<q-args>)` + command! -buffer -bar -nargs=? -complete=customlist,s:Complete_cd Rlcd :lcd `=rails#app().path(<q-args>)` + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find Rfind :call s:Find(<bang>0,<count>,'' ,<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find REfind :call s:Find(<bang>0,<count>,'E',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find RSfind :call s:Find(<bang>0,<count>,'S',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find RVfind :call s:Find(<bang>0,<count>,'V',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find RTfind :call s:Find(<bang>0,<count>,'T',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find Rsfind :<count>RSfind<bang> <args> + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find Rtabfind :<count>RTfind<bang> <args> + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit Redit :call s:Edit(<bang>0,<count>,'' ,<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit REedit :call s:Edit(<bang>0,<count>,'E',<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit RSedit :call s:Edit(<bang>0,<count>,'S',<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit RVedit :call s:Edit(<bang>0,<count>,'V',<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit RTedit :call s:Edit(<bang>0,<count>,'T',<f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_find A :call s:Alternate(<bang>0,"", <f-args>) + command! -buffer -bar -nargs=* -complete=customlist,s:Complete_find AE :call s:Alternate(<bang>0,"E",<f-args>) + 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_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) - let def = s:sub(a:def,'^[@#]','') - if def != '' + let def = s:sub(a:def,'^[#:]','') + if def =~ '^\d\+$' + exe def + elseif def =~ '^!' + if expand('%') !~ '://' && !isdirectory(expand('%:p:h')) + call mkdir(expand('%:p:h'),'p') + endif + elseif def != '' let ext = matchstr(def,'\.\zs.*') let def = matchstr(def,'[^.]*') let v:errmsg = '' @@ -1389,7 +1558,6 @@ function! s:djump(def) let end = s:endof(line('.')) let rline = search(rpat,'',end) if rline > 0 - "call cursor(rline,1) let variable = matchstr(getline(rline),rpat) let success = search('\C^\s*'.variable.'\s*\.\s*\zs'.ext.'\>','',end) if !success @@ -1406,13 +1574,13 @@ function! s:Find(bang,count,arg,...) if a:0 let i = 1 while i < a:0 - let str = str . s:escarg(a:{i}) . " " - let i = i + 1 + let str .= s:escarg(a:{i}) . " " + let i += 1 endwhile let file = a:{i} - let tail = matchstr(file,'[@#].*$') + let tail = matchstr(file,'[#!].*$\|:\d*\%(:in\>.*\)\=$') if tail != "" - let file = s:sub(file,'[@#].*$','') + let file = s:sub(file,'[#!].*$|:\d*%(:in>.*)=$','') endif if file != "" let file = s:RailsIncludefind(file) @@ -1421,17 +1589,7 @@ function! s:Find(bang,count,arg,...) let file = s:RailsFind() let tail = "" endif - if file =~ '^\%(app\|config\|db\|public\|spec\|test\|vendor\)/.*\.' || !a:0 || 1 - call s:findedit((a:count==1?'' : a:count).cmd,file.tail,str) - else - " Old way - let fcmd = (a:count==1?'' : a:count).s:findcmdfor(cmd) - let fcmd = s:sub(fcmd,'(\d+)vert ','vert \1') - if file != "" - exe fcmd.' '.str.s:escarg(file) - endif - call s:djump(tail) - endif + call s:findedit((a:count==1?'' : a:count).cmd,file.tail,str) endfunction function! s:Edit(bang,count,arg,...) @@ -1440,9 +1598,8 @@ function! s:Edit(bang,count,arg,...) let str = "" let i = 1 while i < a:0 - "let str = str . s:escarg(a:{i}) . " " - let str = str . "`=a:".i."` " - let i = i + 1 + let str .= "`=a:".i."` " + let i += 1 endwhile let file = a:{i} call s:findedit(s:editcmdfor(cmd),file,str) @@ -1451,22 +1608,33 @@ function! s:Edit(bang,count,arg,...) endif endfunction -function! s:FindList(ArgLead, CmdLine, CursorPos) - if exists("*UserFileComplete") " genutils.vim - return UserFileComplete(s:RailsIncludefind(a:ArgLead), a:CmdLine, a:CursorPos, 1, &path) - else - return "" - endif +function! s:fuzzyglob(arg) + return '*'.s:gsub(s:gsub(a:arg,'[^/]','[&]*'),'/','/*') endfunction -function! s:EditList(ArgLead, CmdLine, CursorPos) - return s:relglob("",a:ArgLead."*[^~]") +function! s:Complete_find(ArgLead, CmdLine, CursorPos) + let paths = s:pathsplit(&l:path) + let seen = {} + for path in paths + if s:startswith(path,rails#app().path()) && path !~ '[][*]' + let path = path[strlen(rails#app().path()) + 1 : ] + for file in rails#app().relglob(path == '' ? '' : path.'/',s:fuzzyglob(rails#underscore(a:ArgLead)), a:ArgLead =~# '\u' ? '.rb' : '') + let seen[file] = 1 + endfor + endif + endfor + let results = sort(map(keys(seen),'s:sub(v:val,"[.]rb$","")')) + return s:autocamelize(results,a:ArgLead) +endfunction + +function! s:Complete_edit(ArgLead, CmdLine, CursorPos) + return s:completion_filter(rails#app().relglob("",s:fuzzyglob(a:ArgLead)),a:ArgLead) endfunction -function! s:DirList(ArgLead, CmdLine, CursorPos) - let all = "\n".s:relglob("",a:ArgLead."*")."\n" - let dirs = s:gsub(all,"[^\n]*[^/]\n",'') - return s:compact(dirs) +function! s:Complete_cd(ArgLead, CmdLine, CursorPos) + let all = rails#app().relglob("",a:ArgLead."*") + call filter(all,'v:val =~ "/$"') + return filter(all,'s:startswith(v:val,a:ArgLead)') endfunction function! RailsIncludeexpr() @@ -1530,17 +1698,17 @@ function! s:RailsFind() if res != ""|return res.(fnamemodify(res,':e') == '' ? '.rb' : '')|endif let res = s:findit('\v<File.dirname\(__FILE__\)\s*\+\s*[:'."'".'"](\f+)>['."'".'"]=',expand('%:h').'\1') if res != ""|return res|endif - let res = s:underscore(s:findit('\v\s*<%(include|extend)\(=\s*<(\f+)>','\1')) + let res = rails#underscore(s:findit('\v\s*<%(include|extend)\(=\s*<(\f+)>','\1')) if res != ""|return res.".rb"|endif let res = s:findamethod('require','\1') if res != ""|return res.(fnamemodify(res,':e') == '' ? '.rb' : '')|endif let res = s:findamethod('belongs_to\|has_one\|composed_of\|validates_associated\|scaffold','app/models/\1.rb') if res != ""|return res|endif - let res = s:singularize(s:findamethod('has_many\|has_and_belongs_to_many','app/models/\1')) + let res = rails#singularize(s:findamethod('has_many\|has_and_belongs_to_many','app/models/\1')) if res != ""|return res.".rb"|endif - let res = s:singularize(s:findamethod('create_table\|change_table\|drop_table\|add_column\|rename_column\|remove_column\|add_index','app/models/\1')) + let res = rails#singularize(s:findamethod('create_table\|change_table\|drop_table\|add_column\|rename_column\|remove_column\|add_index','app/models/\1')) if res != ""|return res.".rb"|endif - let res = s:singularize(s:findasymbol('through','app/models/\1')) + let res = rails#singularize(s:findasymbol('through','app/models/\1')) if res != ""|return res.".rb"|endif let res = s:findamethod('fixtures','fixtures/\1') if res != "" @@ -1548,6 +1716,8 @@ function! s:RailsFind() endif let res = s:findamethod('map\.resources','app/controllers/\1_controller.rb') if res != ""|return res|endif + let res = s:findamethod('map\.resource','app/controllers/\1') + if res != ""|return rails#pluralize(res)."_controller.rb"|endif let res = s:findamethod('layout','\=s:findlayout(submatch(1))') if res != ""|return res|endif let res = s:findasymbol('layout','\=s:findlayout(submatch(1))') @@ -1566,6 +1736,9 @@ function! s:RailsFind() if res != ""|return res."\n".s:findview(res)|endif let res = s:findamethod('render\s*:\%(template\|action\)\s\+=>\s*','\1.'.format.'\n\1') if res != ""|return res|endif + let res = s:sub(s:findamethod('render','\1'),'^/','') + if RailsFileType() =~ '^view\>' | let res = s:sub(res,'[^/]+$','_&') | endif + if res != ""|return res."\n".s:findview(res)|endif let res = s:findamethod('redirect_to\s*(\=\s*:action\s\+=>\s*','\1') if res != ""|return res|endif let res = s:findfromview('stylesheet_link_tag','public/stylesheets/\1.css') @@ -1578,70 +1751,53 @@ function! s:RailsFind() let res = s:findview(contr.'/'.view) if res != ""|return res|endif endif - let isf_keep = &isfname - set isfname=@,48-57,/,-,_,: ",\",' - " TODO: grab visual selection in visual mode - let cfile = expand("<cfile>") + let old_isfname = &isfname + try + set isfname=@,48-57,/,-,_,: ",\",' + " TODO: grab visual selection in visual mode + let cfile = expand("<cfile>") + finally + let &isfname = old_isfname + endtry let res = s:RailsIncludefind(cfile,1) - let &isfname = isf_keep return res endfunction -function! s:initnamedroutes() - if s:cacheneeds("named_routes") +function! s:app_named_route_file(route) dict + call self.route_names() + if self.cache.has("named_routes") && has_key(self.cache.get("named_routes"),a:route) + return self.cache.get("named_routes")[a:route] + endif + return "" +endfunction + +function! s:app_route_names() dict + if self.cache.needs("named_routes") let exec = "ActionController::Routing::Routes.named_routes.each {|n,r| puts %{#{n} app/controllers/#{r.requirements[:controller]}_controller.rb##{r.requirements[:action]}}}" - let string = s:railseval(exec) + let string = self.eval(exec) let routes = {} - let list = split(string,"\n") - let i = 0 - " If we use for, Vim 6.2 dumbly treats endfor like endfunction - while i < len(list) - let route = split(list[i]," ") + for line in split(string,"\n") + let route = split(line," ") let name = route[0] let routes[name] = route[1] - let i = i + 1 - endwhile - call s:cacheset("named_routes",routes) + endfor + call self.cache.set("named_routes",routes) endif -endfunction -function! s:namedroutefile(route) - call s:initnamedroutes() - if s:cachehas("named_routes") && has_key(s:cache("named_routes"),a:route) - return s:cache("named_routes")[a:route] - endif - return "" + return keys(self.cache.get("named_routes")) endfunction +call s:add_methods('app', ['route_names','named_route_file']) + function! RailsNamedRoutes() - call s:initnamedroutes() - if s:cachehas("named_routes") - return keys(s:cache("named_routes")) - else - " Dead code - if s:cacheneeds("route_names") - let lines = readfile(RailsRoot()."/config/routes.rb") - let plurals = map(filter(copy(lines),'v:val =~# "^ map\\.resources\\s\\+:\\w"'),'matchstr(v:val,"^ map\\.resources\\=\\s\\+:\\zs\\w\\+")') - let singulars = map(copy(plurals),'s:singularize(v:val)') - let extras = map(copy(singulars),'"new_".v:val')+map(copy(singulars),'"edit_".v:val') - let all = plurals + singulars + extras - let named = map(filter(copy(lines),'v:val =~# "^ map\\.\\%(connect\\>\\|resources\\=\\>\\)\\@!\\w\\+"'),'matchstr(v:val,"^ map\\.\\zs\\w\\+")') - call s:cacheset("route_names",named+all+map(copy(all),'"formatted_".v:val')) - endif - if s:cachehas("route_names") - return s:cache("route_names") - endif - endif + return rails#app().route_names() endfunction function! s:RailsIncludefind(str,...) - if a:str == "ApplicationController" - return "app/controllers/application.rb" - elseif a:str == "Test::Unit::TestCase" + if a:str ==# "ApplicationController" + return "application_controller.rb\napp/controllers/application.rb" + elseif a:str ==# "Test::Unit::TestCase" return "test/unit/testcase.rb" - elseif a:str == "<%=" - " Probably a silly idea - return "action_view.rb" endif let str = a:str if a:0 == 1 @@ -1654,73 +1810,70 @@ 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,"\\([\"']\\)\\(.*\\)\\1",'\2') + 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 = s:underscore(str) + 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 = str . '.rb' - elseif line =~ ':partial\s*=>\s*' + let str .= '.rb' + 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*' - let str = 'app/models/'.s:singularize(str).'.rb' - elseif line =~ '\<def\s\+' && expand("%:t") =~ '_controller\.rb' + 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' let str = s:sub(s:sub(RailsFilePath(),'/controllers/','/views/'),'_controller\.rb$','/'.str) - "let str = s:sub(expand("%:p"),'.*[\/]app[\/]controllers[\/](.{-})_controller.rb','views/\1').'/'.str " FIXME: support nested extensions let vt = s:view_types."," while vt != "" let t = matchstr(vt,'[^,]*') let vt = s:sub(vt,'[^,]*,','') if filereadable(str.".".t) - let str = str.".".t + let str .= '.'.t break endif endwhile - elseif str =~ '_\%(path\|url\)$' - " REST helpers + elseif str =~# '_\%(path\|url\)$' let str = s:sub(str,'_%(path|url)$','') let str = s:sub(str,'^hash_for_','') - let file = s:namedroutefile(str) + let file = rails#app().named_route_file(str) if file == "" let str = s:sub(str,'^formatted_','') - if str =~ '^\%(new\|edit\)_' - let str = 'app/controllers/'.s:sub(s:pluralize(str),'^(new|edit)_(.*)','\2_controller.rb#\1') - elseif str == s:singularize(str) + if str =~# '^\%(new\|edit\)_' + let str = 'app/controllers/'.s:sub(rails#pluralize(str),'^(new|edit)_(.*)','\2_controller.rb#\1') + 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. - let str = 'app/controllers/'.s:pluralize(str).'_controller.rb#show' + let str = 'app/controllers/'.rails#pluralize(str).'_controller.rb#show' else let str = 'app/controllers/'.str.'_controller.rb#index' endif @@ -1729,13 +1882,13 @@ function! s:RailsIncludefind(str,...) endif elseif str !~ '/' " If we made it this far, we'll risk making it singular. - let str = s:singularize(str) + let str = rails#singularize(str) let str = s:sub(str,'_id$','') endif 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 @@ -1749,7 +1902,7 @@ function! s:addfilecmds(type) let cmds = 'ESVT ' let cmd = '' while cmds != '' - let cplt = " -complete=custom,".s:sid.l."List" + let cplt = " -complete=customlist,".s:sid.l."List" exe "command! -buffer -bar -nargs=*".cplt." R".cmd.l." :call s:".l.'Edit(<bang>0,"'.cmd.'",<f-args>)' let cmd = strpart(cmds,0,1) let cmds = strpart(cmds,1) @@ -1757,7 +1910,9 @@ function! s:addfilecmds(type) endfunction function! s:BufFinderCommands() - command! -buffer -bar -bang -nargs=+ Rcommand :call s:Command(<bang>0,<f-args>) + command! -buffer -bar -nargs=+ Rnavcommand :call s:Navcommand(<bang>0,<f-args>) + command! -buffer -bar -nargs=+ Rcommand :call s:warn("Warning: :Rcommand has been deprecated in favor of :Rnavcommand")|call s:Navcommand(<bang>0,<f-args>) + call s:addfilecmds("metal") call s:addfilecmds("model") call s:addfilecmds("view") call s:addfilecmds("controller") @@ -1767,212 +1922,215 @@ function! s:BufFinderCommands() call s:addfilecmds("api") call s:addfilecmds("layout") call s:addfilecmds("fixtures") - call s:addfilecmds("unittest") - call s:addfilecmds("functionaltest") - call s:addfilecmds("integrationtest") + if rails#app().has('test') || rails#app().has('spec') + call s:addfilecmds("unittest") + call s:addfilecmds("functionaltest") + endif + if rails#app().has('test') || rails#app().has('cucumber') + call s:addfilecmds("integrationtest") + endif + if rails#app().has('spec') + call s:addfilecmds("spec") + endif call s:addfilecmds("stylesheet") call s:addfilecmds("javascript") + call s:addfilecmds("plugin") call s:addfilecmds("task") call s:addfilecmds("lib") - call s:addfilecmds("plugin") + call s:addfilecmds("environment") + call s:addfilecmds("initializer") +endfunction + +function! s:completion_filter(results,A) + let results = sort(type(a:results) == type("") ? split(a:results,"\n") : copy(a:results)) + 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 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 function! s:autocamelize(files,test) if a:test =~# '^\u' - return s:camelize(a:files) + return s:completion_filter(map(copy(a:files),'rails#camelize(v:val)'),a:test) else - return a:files - endif -endfunction - -function! RailsUserClasses() - if !exists("b:rails_root") - return "" - elseif s:getopt('classes','ab') != '' - return s:getopt('classes','ab') - endif - let var = "user_classes_".s:rv() - if !exists("s:".var) - let s:{var} = s:sub(s:sub(s:gsub(s:camelize( - \ s:relglob("app/models/","**/*",".rb") . "\n" . - \ s:sub(s:relglob("app/controllers/","**/*",".rb"),'<application>','&_controller') . "\n" . - \ s:relglob("app/helpers/","**/*",".rb") . "\n" . - \ s:relglob("lib/","**/*",".rb") . "\n" . - \ ""),'\n+',' '),'^\s+',''),'\s+$','') + return s:completion_filter(a:files,a:test) endif - return s:{var} endfunction -function! s:relglob(path,glob,...) - " How could such a simple operation be so complicated? +function! s:app_relglob(path,glob,...) dict if exists("+shellslash") && ! &shellslash let old_ss = &shellslash let &shellslash = 1 endif - if a:path =~ '[\/]$' - let path = a:path - else - let path = a:path . '' - endif - if path !~ '^/' && path !~ '^\w:' && RailsRoot() != '' - let path = RailsRoot() . '/' . path + let path = a:path + if path !~ '^/' && path !~ '^\w:' + let path = self.path(path) endif let suffix = a:0 ? a:1 : '' - let badres = glob(path.a:glob.suffix)."\n" - if v:version <= 602 - " Nasty Vim bug in version 6.2 - let badres = glob(path.a:glob.suffix)."\n" - endif - let goodres = "" - let striplen = strlen(path) - let stripend = strlen(suffix) - while strlen(badres) > 0 - let idx = stridx(badres,"\n") - "if idx == -1 - "let idx = strlen(badres) - "endif - let tmp = strpart(badres,0,idx) - let badres = strpart(badres,idx+1) - let goodres = goodres.strpart(tmp,striplen,strlen(tmp)-striplen-stripend) - if suffix == '' && isdirectory(tmp) && goodres !~ '/$' - let goodres = goodres."/" + let full_paths = split(glob(path.a:glob.suffix),"\n") + let relative_paths = [] + for entry in full_paths + if suffix == '' && isdirectory(entry) && entry !~ '/$' + let entry .= '/' endif - let goodres = goodres."\n" - endwhile - "let goodres = s:gsub("\n".goodres,'\n.{-}\~\n','\n') + let relative_paths += [entry[strlen(path) : -strlen(suffix)-1]] + endfor if exists("old_ss") let &shellslash = old_ss endif - return s:compact(goodres) + return relative_paths endfunction -if v:version <= 602 - " Yet another Vim 6.2 limitation - let s:recurse = "*" -else - let s:recurse = "**/*" -endif +call s:add_methods('app', ['relglob']) + +function! s:relglob(...) + return join(call(rails#app().relglob,a:000,rails#app()),"\n") +endfunction function! s:helperList(A,L,P) - return s:autocamelize(s:relglob("app/helpers/",s:recurse,"_helper.rb"),a:A) + return s:autocamelize(rails#app().relglob("app/helpers/","**/*","_helper.rb"),a:A) endfunction function! s:controllerList(A,L,P) - let con = s:gsub(s:relglob("app/controllers/",s:recurse,".rb"),'_controller>','') + let con = rails#app().relglob("app/controllers/","**/*",".rb") + call map(con,'s:sub(v:val,"_controller$","")') return s:autocamelize(con,a:A) endfunction function! s:viewList(A,L,P) let c = s:controller(1) - let top = s:relglob("app/views/",a:A."*[^~]") - if c != '' - let local = s:relglob("app/views/".c."/",a:A.(a:A =~ '\.' ? '' : '*.')."*[^~]") - if local != '' - return local."\n".top - endif + 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 - return top + return s:completion_filter(top,a:A) endfunction function! s:layoutList(A,L,P) - return s:relglob("app/views/layouts/","*") + return s:completion_filter(rails#app().relglob("app/views/layouts/","*"),a:A) endfunction function! s:stylesheetList(A,L,P) - return s:relglob("public/stylesheets/",s:recurse,".css") + return s:completion_filter(rails#app().relglob("public/stylesheets/","**/*",".css"),a:A) endfunction function! s:javascriptList(A,L,P) - return s:relglob("public/javascripts/",s:recurse,".js") + return s:completion_filter(rails#app().relglob("public/javascripts/","**/*",".js"),a:A) +endfunction + +function! s:metalList(A,L,P) + return s:autocamelize(rails#app().relglob("app/metal/","**/*",".rb"),a:A) endfunction function! s:modelList(A,L,P) - let models = s:relglob("app/models/",s:recurse,".rb")."\n" - " . matches everything, and no good way to exclude newline. Lame. - let models = s:gsub(models,'[ -~]*_observer\n',"") - let models = s:compact(models) + let models = rails#app().relglob("app/models/","**/*",".rb") + call filter(models,'v:val !~# "_observer$"') return s:autocamelize(models,a:A) endfunction function! s:observerList(A,L,P) - return s:autocamelize(s:relglob("app/models/",s:recurse,"_observer.rb"),a:A) + return s:autocamelize(rails#app().relglob("app/models/","**/*","_observer.rb"),a:A) endfunction function! s:fixturesList(A,L,P) - return s:compact(s:relglob("test/fixtures/",s:recurse)."\n".s:relglob("spec/fixtures/",s:recurse)) + return s:completion_filter(rails#app().relglob("test/fixtures/","**/*")+rails#app().relglob("spec/fixtures/","**/*"),a:A) endfunction function! s:migrationList(A,L,P) if a:A =~ '^\d' - let migrations = s:relglob("db/migrate/",a:A."[0-9_]*",".rb") - let migrations = s:gsub(migrations,'_.{-}($|\n)','\1') - return migrations + let migrations = rails#app().relglob("db/migrate/",a:A."[0-9_]*",".rb") + return map(migrations,'matchstr(v:val,"^[0-9]*")') else - let migrations = s:relglob("db/migrate/","[0-9]*[0-9]_".a:A."*",".rb") - let migrations = s:gsub(migrations,'(^|\n)\d+_','\1') + let migrations = rails#app().relglob("db/migrate/","[0-9]*[0-9]_*",".rb") + call map(migrations,'s:sub(v:val,"^[0-9]*_","")') return s:autocamelize(migrations,a:A) endif endfunction function! s:apiList(A,L,P) - return s:autocamelize(s:relglob("app/apis/",s:recurse,"_api.rb"),a:A) + return s:autocamelize(rails#app().relglob("app/apis/","**/*","_api.rb"),a:A) endfunction function! s:unittestList(A,L,P) - return s:autocamelize(s:relglob("test/unit/",s:recurse,"_test.rb"),a:A) + let found = [] + if rails#app().has('test') + let found += rails#app().relglob("test/unit/","**/*","_test.rb") + endif + if rails#app().has('spec') + let found += rails#app().relglob("spec/models/","**/*","_spec.rb") + endif + return s:autocamelize(found,a:A) endfunction function! s:functionaltestList(A,L,P) - return s:autocamelize(s:relglob("test/functional/",s:recurse,"_test.rb"),a:A) + let found = [] + if rails#app().has('test') + let found += rails#app().relglob("test/functional/","**/*","_test.rb") + endif + if rails#app().has('spec') + let found += rails#app().relglob("spec/controllers/","**/*","_spec.rb") + endif + return s:autocamelize(found,a:A) endfunction function! s:integrationtestList(A,L,P) - return s:autocamelize(s:relglob("test/integration/",s:recurse,"_test.rb"),a:A) + let found = [] + if rails#app().has('test') + let found += s:autocamelize(rails#app().relglob("test/integration/","**/*","_test.rb"),a:A) + endif + if rails#app().has('cucumber') + let found += s:completion_filter(rails#app().relglob("features/","**/*",".feature"),a:A) + endif + return found +endfunction + +function! s:specList(A,L,P) + return s:completion_filter(rails#app().relglob("spec/","**/*","_spec.rb"),a:A) endfunction function! s:pluginList(A,L,P) if a:A =~ '/' - return s:relglob('vendor/plugins/',matchstr(a:A,'.\{-\}/').'**/*') + return s:completion_filter(rails#app().relglob('vendor/plugins/',matchstr(a:A,'.\{-\}/').'**/*'),a:A) else - return s:relglob('vendor/plugins/',"*","/init.rb") + return s:completion_filter(rails#app().relglob('vendor/plugins/',"*","/init.rb"),a:A) endif endfunction " Task files, not actual rake tasks function! s:taskList(A,L,P) - let top = s:relglob("lib/tasks/",s:recurse,".rake") + let all = rails#app().relglob("lib/tasks/","**/*",".rake") if RailsFilePath() =~ '\<vendor/plugins/.' - let path = s:sub(RailsFilePath(),'<vendor/plugins/[^/]*/\zs.*','tasks/') - return s:relglob(path,s:recurse,".rake") . "\n" . top - else - return top + let path = s:sub(RailsFilePath(),'<vendor/plugins/[^/]*/\zs.*','') + let all = rails#app().relglob(path."tasks/","**/*",".rake")+rails#app().relglob(path."lib/tasks/","**/*",".rake")+all endif + return s:autocamelize(all,a:A) endfunction function! s:libList(A,L,P) - let all = s:relglob('lib/',s:recurse,".rb") + let all = rails#app().relglob('lib/',"**/*",".rb") if RailsFilePath() =~ '\<vendor/plugins/.' let path = s:sub(RailsFilePath(),'<vendor/plugins/[^/]*/\zs.*','lib/') - let all = s:relglob(path,s:recurse,".rb") . "\n" . all + let all = rails#app().relglob(path,"**/*",".rb") + all endif return s:autocamelize(all,a:A) endfunction -function! s:Command(bang,...) - if a:bang - let str = "" - let i = 0 - while i < a:0 - let i = i + 1 - if a:{i} =~# '^-complete=custom,s:' && v:version <= 602 - let str = str . " " . s:sub(a:{i},',s:',','.s:sid) - else - let str = str . " " . a:{i} - endif - endwhile - exe "command!".str - return - endif +function! s:environmentList(A,L,P) + return s:completion_filter(rails#app().relglob("config/environments/","**/*",".rb"),a:A) +endfunction + +function! s:initializerList(A,L,P) + return s:completion_filter(rails#app().relglob("config/initializers/","**/*",".rb"),a:A) +endfunction + +function! s:Navcommand(bang,...) let suffix = ".rb" let filter = "**/*" let prefix = "" @@ -1980,7 +2138,7 @@ function! s:Command(bang,...) let name = "" let i = 0 while i < a:0 - let i = i + 1 + let i += 1 let arg = a:{i} if arg =~# '^-suffix=' let suffix = matchstr(arg,'-suffix=\zs.*') @@ -1993,7 +2151,7 @@ function! s:Command(bang,...) if name == "" let name = arg else - let prefix = prefix."\\n".s:sub(arg,'/=$','/') + let prefix .= "\\n".s:sub(arg,'/=$','/') endif endif endwhile @@ -2004,7 +2162,7 @@ function! s:Command(bang,...) let cmds = 'ESVT ' let cmd = '' while cmds != '' - exe 'command! -buffer -bar -bang -nargs=* -complete=custom,'.s:sid.'CommandList R'.cmd.name." :call s:CommandEdit(<bang>0,'".cmd."','".name."',\"".prefix."\",".s:string(suffix).",".s:string(filter).",".s:string(default).",<f-args>)" + exe 'command! -buffer -bar -bang -nargs=* -complete=customlist,'.s:sid.'CommandList R'.cmd.name." :call s:CommandEdit(<bang>0,'".cmd."','".name."',\"".prefix."\",".string(suffix).",".string(filter).",".string(default).",<f-args>)" let cmd = strpart(cmds,0,1) let cmds = strpart(cmds,1) endwhile @@ -2014,17 +2172,16 @@ function! s:CommandList(A,L,P) let cmd = matchstr(a:L,'\CR[A-Z]\=\w\+') exe cmd." &" let lp = s:last_prefix . "\n" - let res = "" + let res = [] while lp != "" let p = matchstr(lp,'.\{-\}\ze\n') let lp = s:sub(lp,'.{-}\n','') - let res = res . s:relglob(p,s:last_filter,s:last_suffix)."\n" + let res += rails#app().relglob(p,s:last_filter,s:last_suffix) endwhile - let res = s:compact(res) if s:last_camelize return s:autocamelize(res,a:A) else - return res + return s:completion_filter(res,a:A) endif endfunction @@ -2052,62 +2209,61 @@ function! s:CommandEdit(bang,cmd,name,prefix,suffix,filter,default,...) endif endfunction -function! s:EditSimpleRb(bang,cmd,name,target,prefix,suffix) +function! s:EditSimpleRb(bang,cmd,name,target,prefix,suffix,...) let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) if a:target == "" " Good idea to emulate error numbers like this? - return s:error("E471: Argument required") " : R',a:name) - "else - "let g:target = a:target + return s:error("E471: Argument required") + endif + let f = a:0 ? a:target : rails#underscore(a:target) + let jump = matchstr(f,'[#!].*\|:\d*\%(:in\)\=$') + let f = s:sub(f,'[#!].*|:\d*%(:in)=$','') + if jump =~ '^!' + let cmd = s:editcmdfor(cmd) endif - let f = s:underscore(a:target) - let jump = matchstr(f,'[@#].*') - let f = s:sub(f,'[@#].*','') if f == '.' let f = s:sub(f,'\.$','') else - let f = f.a:suffix.jump - if a:suffix !~ '\.' - "let f = f.".rb" - endif + let f .= a:suffix.jump endif let f = s:gsub(a:prefix,'\n',f.'\n').f return s:findedit(cmd,f) endfunction -function! s:migrationfor(file) - let tryagain = 0 +function! s:app_migration(file) dict let arg = a:file - if arg =~ '^\d$' + if arg =~ '^0\+$' + if self.has_file('db/schema.rb') + return 'db/schema.rb' + elseif self.has_file('db/'.s:environment().'_structure.sql') + return 'db/'.s:environment().'_structure.sql' + else + return 'db/schema.rb' + endif + elseif arg =~ '^\d$' let glob = '00'.arg.'_*.rb' elseif arg =~ '^\d\d$' let glob = '0'.arg.'_*.rb' elseif arg =~ '^\d\d\d$' let glob = ''.arg.'_*.rb' elseif arg == '' - if s:model(1) != '' - let glob = '*_'.s:pluralize(s:model(1)).'.rb' - let tryagain = 1 - else - let glob = '*.rb' - endif + let glob = '*.rb' else - let glob = '*'.arg.'*rb' - endif - let migr = s:sub(glob(RailsRoot().'/db/migrate/'.glob),'.*\n','') - if migr == '' && tryagain - let migr = s:sub(glob(RailsRoot().'/db/migrate/*.rb'),'.*\n','') + let glob = '*'.rails#underscore(arg).'*rb' endif - if strpart(migr,0,strlen(RailsRoot())) == RailsRoot() - let migr = strpart(migr,1+strlen(RailsRoot())) + let migr = s:sub(glob(self.path('db/migrate/').glob),'.*\n','') + if s:startswith(migr,self.path()) + let migr = strpart(migr,1+strlen(self.path())) endif return migr endfunction +call s:add_methods('app', ['migration']) + function! s:migrationEdit(bang,cmd,...) let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) let arg = a:0 ? a:1 : '' - let migr = arg == "." ? "db/migrate" : s:migrationfor(arg) + let migr = arg == "." ? "db/migrate" : rails#app().migration(arg) if migr != '' call s:findedit(cmd,migr) else @@ -2117,9 +2273,9 @@ endfunction function! s:fixturesEdit(bang,cmd,...) if a:0 - let c = s:underscore(a:1) + let c = rails#underscore(a:1) else - let c = s:pluralize(s:model(1)) + let c = rails#pluralize(s:model(1)) endif if c == "" return s:error("E471: Argument required") @@ -2128,10 +2284,18 @@ function! s:fixturesEdit(bang,cmd,...) let e = e == '' ? e : '.'.e let c = fnamemodify(c,':r') let file = 'test/fixtures/'.c.e - if file =~ '\.\w\+$' && !s:hasfile("spec/fixtures/".c.e) + if file =~ '\.\w\+$' && !rails#app().has_file("spec/fixtures/".c.e) call s:edit(a:cmd.(a:bang?'!':''),file) else - call s:findedit(a:cmd.(a:bang?'!':''),file."\nspec/fixtures/".c.e) + call s:findedit(a:cmd.(a:bang?'!':''),rails#app().find_file(c.e,["test/fixtures","spec/fixtures"],[".yml",".csv"],file)) + endif +endfunction + +function! s:metalEdit(bang,cmd,...) + if a:0 + call s:EditSimpleRb(a:bang,a:cmd,"metal",a:1,"app/metal/",".rb") + else + call s:EditSimpleRb(a:bang,a:cmd,"metal",'config/boot',"",".rb") endif endfunction @@ -2144,8 +2308,8 @@ function! s:observerEdit(bang,cmd,...) endfunction function! s:viewEdit(bang,cmd,...) - if a:0 - let view = a:1 + if a:0 && a:1 =~ '^[^!#:]' + let view = matchstr(a:1,'[^!#:]*') elseif RailsFileType() == 'controller' let view = s:lastmethod() else @@ -2164,15 +2328,21 @@ function! s:viewEdit(bang,cmd,...) let file = "app/views/".view let found = s:findview(view) if found != '' + let dir = fnamemodify(rails#app().path(found),':h') + if !isdirectory(dir) + if a:0 && a:1 =~ '!' + call mkdir(dir) + else + return s:error('No such directory') + endif + endif call s:edit(a:cmd.(a:bang?'!':''),found) - elseif file =~ '\.\w\+\.\w\+$' || file =~ '\.'.s:viewspattern().'$' - call s:edit(a:cmd.(a:bang?'!':''),file) elseif file =~ '\.\w\+$' call s:findedit(a:cmd.(a:bang?'!':''),file) else let format = s:format('html') - if glob(RailsRoot().'/'.file.'.'.format.'.*[^~]') != '' - let file = file . '.' . format + if glob(rails#app().path(file.'.'.format).'.*[^~]') != '' + let file .= '.' . format endif call s:findedit(a:cmd.(a:bang?'!':''),file) endif @@ -2191,9 +2361,9 @@ function! s:findview(name) endif if c =~ '\.\w\+\.\w\+$' || c =~ '\.'.s:viewspattern().'$' return pre.c - elseif s:hasfile(pre.c.".rhtml") + elseif rails#app().has_file(pre.c.".rhtml") let file = pre.c.".rhtml" - elseif s:hasfile(pre.c.".rxml") + elseif rails#app().has_file(pre.c.".rxml") let file = pre.c.".rxml" else let format = "." . s:format('html') @@ -2202,7 +2372,7 @@ function! s:findview(name) while vt != "" let t = matchstr(vt,'[^,]*') let vt = s:sub(vt,'[^,]*,','') - if s:hasfile(pre.c.format.".".t) + if rails#app().has_file(pre.c.format.".".t) let file = pre.c.format.".".t break endif @@ -2223,14 +2393,9 @@ endfunction function! s:layoutEdit(bang,cmd,...) if a:0 - let c = s:underscore(a:1) - else - let c = s:controller(1) - endif - if c == "" - let c = "application" + return s:viewEdit(a:bang,a:cmd,"layouts/".a:1) endif - let file = s:findlayout(c) + let file = s:findlayout(s:controller(1)) if file == "" let file = s:findlayout("application") endif @@ -2245,12 +2410,12 @@ function! s:controllerEdit(bang,cmd,...) if a:0 == 0 let controller = s:controller(1) if RailsFileType() =~ '^view\%(-layout\|-partial\)\@!' - let suffix = suffix.'#'.expand('%:t:r') + let suffix .= '#'.expand('%:t:r') endif else let controller = a:1 endif - if s:hasfile("app/controllers/".controller."_controller.rb") || !s:hasfile("app/controllers/".controller.".rb") + if rails#app().has_file("app/controllers/".controller."_controller.rb") || !rails#app().has_file("app/controllers/".controller.".rb") let suffix = "_controller".suffix endif return s:EditSimpleRb(a:bang,a:cmd,"controller",controller,"app/controllers/",suffix) @@ -2265,48 +2430,107 @@ function! s:apiEdit(bang,cmd,...) endfunction function! s:stylesheetEdit(bang,cmd,...) - return s:EditSimpleRb(a:bang,a:cmd,"stylesheet",a:0? a:1 : s:controller(1),"public/stylesheets/",".css") + let name = a:0 ? a:1 : s:controller(1) + if rails#app().has('sass') && rails#app().has_file('public/stylesheets/sass/'.name.'.sass') + return s:EditSimpleRb(a:bang,a:cmd,"stylesheet",name,"public/stylesheets/sass/",".sass",1) + else + return s:EditSimpleRb(a:bang,a:cmd,"stylesheet",name,"public/stylesheets/",".css",1) + endif endfunction function! s:javascriptEdit(bang,cmd,...) - return s:EditSimpleRb(a:bang,a:cmd,"javascript",a:0? a:1 : "application","public/javascripts/",".js") + return s:EditSimpleRb(a:bang,a:cmd,"javascript",a:0? a:1 : "application","public/javascripts/",".js",1) endfunction function! s:unittestEdit(bang,cmd,...) - let f = a:0 ? a:1 : s:model(1) - if !a:0 && RailsFileType() =~ '^model-aro\>' && f != '' && f !~ '_observer$' - if s:hasfile("test/unit/".f."_observer.rb") || !s:hasfile("test/unit/".f.".rb") - let f = f . "_observer" - endif + let f = rails#underscore(a:0 ? matchstr(a:1,'[^!#:]*') : s:model(1)) + let jump = a:0 ? matchstr(a:1,'[!#:].*') : '' + if jump =~ '!' + let cmd = s:editcmdfor(a:cmd.(a:bang?'!':'')) + else + let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) endif - return s:EditSimpleRb(a:bang,a:cmd,"unittest",f,"test/unit/","_test.rb") + let mapping = {'test': ['test/unit/','_test.rb'], 'spec': ['spec/models/','_spec.rb']} + let tests = map(filter(rails#app().test_suites(),'has_key(mapping,v:val)'),'get(mapping,v:val)') + if empty(tests) + let tests = [mapping['test']] + endif + for [prefix, suffix] in tests + if !a:0 && RailsFileType() =~# '^model-aro\>' && f != '' && f !~# '_observer$' + if rails#app().has_file(prefix.f.'_observer'.suffix) + return s:findedit(cmd,prefix.f.'_observer'.suffix.jump) + endif + endif + endfor + for [prefix, suffix] in tests + if rails#app().has_file(prefix.f.suffix) + return s:findedit(cmd,prefix.f.suffix.jump) + endif + endfor + return s:EditSimpleRb(a:bang,a:cmd,"unittest",f.jump,tests[0][0],tests[0][1],1) endfunction function! s:functionaltestEdit(bang,cmd,...) - if a:0 - let f = a:1 + let f = rails#underscore(a:0 ? matchstr(a:1,'[^!#:]*') : s:controller(1)) + let jump = a:0 ? matchstr(a:1,'[!#:].*') : '' + if jump =~ '!' + let cmd = s:editcmdfor(a:cmd.(a:bang?'!':'')) else - let f = s:controller() - endif - if f != '' && !s:hasfile("test/functional/".f."_test.rb") - if s:hasfile("test/functional/".f."_controller_test.rb") - let f = f . "_controller" - elseif s:hasfile("test/functional/".f."_api_test.rb") - let f = f . "_api" + let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) + endif + let mapping = {'test': ['test/functional/','_test.rb'], 'spec': ['spec/controllers/','_spec.rb']} + let tests = map(filter(rails#app().test_suites(),'has_key(mapping,v:val)'),'get(mapping,v:val)') + if empty(tests) + let tests = [mapping[tests]] + endif + for [prefix, suffix] in tests + if rails#app().has_file(prefix.f.suffix) + return s:findedit(cmd,prefix.f.suffix.jump) + elseif rails#app().has_file(prefix.f.'_controller'.suffix) + return s:findedit(cmd,prefix.f.'_controller'.suffix.jump) + elseif rails#app().has_file(prefix.f.'_api'.suffix) + return s:findedit(cmd,prefix.f.'_api'.suffix.jump) endif - endif - return s:EditSimpleRb(a:bang,a:cmd,"functionaltest",f,"test/functional/","_test.rb") + endfor + return s:EditSimpleRb(a:bang,a:cmd,"functionaltest",f.jump,tests[0][0],tests[0][1],1) endfunction function! s:integrationtestEdit(bang,cmd,...) + if !a:0 + if rails#app().has('cucumber') + return s:EditSimpleRb(a:bang,a:cmd,"integrationtest","support/env","features/",".rb") + else + return s:EditSimpleRb(a:bang,a:cmd,"integrationtest","test_helper","test/",".rb") + endif + endif + let f = rails#underscore(matchstr(a:1,'[^!#:]*')) + let jump = matchstr(a:1,'[!#:].*') + if jump =~ '!' + let cmd = s:editcmdfor(a:cmd.(a:bang?'!':'')) + else + let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) + endif + let mapping = {'test': ['test/integration/','_test.rb'], 'cucumber': ['features/','.feature']} + let tests = map(filter(rails#app().test_suites(),'has_key(mapping,v:val)'),'get(mapping,v:val)') + if empty(tests) + let tests = [mapping['test']] + endif + for [prefix, suffix] in tests + if rails#app().has_file(prefix.f.suffix) + return s:findedit(cmd,prefix.f.suffix.jump) + elseif rails#app().has_file(prefix.rails#underscore(f).suffix) + return s:findedit(cmd,prefix.rails#underscore(f).suffix.jump) + endif + endfor + return s:EditSimpleRb(a:bang,a:cmd,"integrationtest",f.jump,tests[0][0],tests[0][1],1) +endfunction + +function! s:specEdit(bang,cmd,...) if a:0 - let f = a:1 - elseif s:model() != '' - let f = s:model() + return s:EditSimpleRb(a:bang,a:cmd,"spec",a:1,"spec/","_spec.rb") else - let f = s:controller() + call s:EditSimpleRb(a:bang,a:cmd,"spec","spec_helper","spec/",".rb") endif - return s:EditSimpleRb(a:bang,a:cmd,"integrationtest",f,"test/integration/","_test.rb") endfunction function! s:pluginEdit(bang,cmd,...) @@ -2318,13 +2542,13 @@ function! s:pluginEdit(bang,cmd,...) let extra = "vendor/plugins/" . plugin . "/\n" endif if a:0 - if a:1 =~ '^[^/.]*/\=$' && s:hasfile("vendor/plugins/".a:1."/init.rb") + if a:1 =~ '^[^/.]*/\=$' && rails#app().has_file("vendor/plugins/".a:1."/init.rb") return s:EditSimpleRb(a:bang,a:cmd,"plugin",s:sub(a:1,'/$',''),"vendor/plugins/","/init.rb") elseif plugin == "" call s:edit(cmd,"vendor/plugins/".s:sub(a:1,'\.$','')) elseif a:1 == "." call s:findedit(cmd,"vendor/plugins/".plugin) - elseif isdirectory(RailsRoot()."/vendor/plugins/".matchstr(a:1,'^[^/]*')) + elseif isdirectory(rails#app().path("vendor/plugins/".matchstr(a:1,'^[^/]*'))) call s:edit(cmd,"vendor/plugins/".a:1) else call s:findedit(cmd,"vendor/plugins/".a:1."\nvendor/plugins/".plugin."/".a:1) @@ -2339,7 +2563,7 @@ function! s:taskEdit(bang,cmd,...) let extra = "" if RailsFilePath() =~ '\<vendor/plugins/.' let plugin = matchstr(RailsFilePath(),'\<vendor/plugins/[^/]*') - let extra = plugin."/tasks/\n" + let extra = plugin."/tasks/\n".plugin."/lib/tasks/\n" endif if a:0 call s:EditSimpleRb(a:bang,a:cmd,"task",a:1,extra."lib/tasks/",".rake") @@ -2354,13 +2578,20 @@ function! s:libEdit(bang,cmd,...) let extra = s:sub(RailsFilePath(),'<vendor/plugins/[^/]*/\zs.*','lib/')."\n" endif if a:0 - call s:EditSimpleRb(a:bang,a:cmd,"task",a:0? a:1 : "",extra."lib/",".rb") + call s:EditSimpleRb(a:bang,a:cmd,"lib",a:0? a:1 : "",extra."lib/",".rb") else - " Easter egg - call s:EditSimpleRb(a:bang,a:cmd,"task","environment","config/",".rb") + call s:EditSimpleRb(a:bang,a:cmd,"lib","routes","config/",".rb") endif endfunction +function! s:environmentEdit(bang,cmd,...) + return s:EditSimpleRb(a:bang,a:cmd,"environment",a:0? a:1 : "../environment","config/environments/",".rb") +endfunction + +function! s:initializerEdit(bang,cmd,...) + return s:EditSimpleRb(a:bang,a:cmd,"initializer",a:0? a:1 : "../routes","config/initializers/",".rb") +endfunction + " }}}1 " Alternate/Related {{{1 @@ -2413,74 +2644,62 @@ function! s:try(cmd) abort return 1 endfunction -function! s:findedit(cmd,file,...) abort +function! s:findedit(cmd,files,...) abort let cmd = s:findcmdfor(a:cmd) - if a:file =~ '\n' - let filelist = a:file . "\n" - let file = '' - while file == '' && filelist != '' - let maybe = matchstr(filelist,'^.\{-\}\ze\n') - let filelist = s:sub(filelist,'^.{-}\n','') - if s:hasfile(s:sub(maybe,'[@#].*','')) - let file = maybe - endif - endwhile - if file == '' - let file = matchstr(a:file."\n",'^.\{-\}\ze\n') - endif + let files = type(a:files) == type([]) ? copy(a:files) : split(a:files,"\n") + if len(files) == 1 + let file = files[0] else - let file = a:file + let file = get(filter(copy(files),'rails#app().has_file(s:sub(v:val,"#.*|:\\d*$",""))'),0,get(files,0,'')) endif - if file =~ '[@#]' - let djump = matchstr(file,'[@#]\zs.*') - let file = matchstr(file,'.\{-\}\ze[@#]') + if file =~ '[#!]\|:\d*\%(:in\)\=$' + let djump = matchstr(file,'!.*\|#\zs.*\|:\zs\d*\ze\%(:in\)\=$') + let file = s:sub(file,'[#!].*|:\d*%(:in)=$','') else let djump = '' endif if file == '' let testcmd = "edit" - elseif RailsRoot() =~ '://' || cmd =~ 'edit' || cmd =~ 'split' + elseif isdirectory(rails#app().path(file)) + let arg = file == "." ? rails#app().path() : rails#app().path(file) + let testcmd = s:editcmdfor(cmd).' '.(a:0 ? a:1 . ' ' : '').s:escarg(arg) + exe testcmd + return + elseif rails#app().path() =~ '://' || cmd =~ 'edit' || cmd =~ 'split' if file !~ '^/' && file !~ '^\w:' && file !~ '://' - let file = s:ra().'/'.file + let file = s:escarg(rails#app().path(file)) endif let testcmd = s:editcmdfor(cmd).' '.(a:0 ? a:1 . ' ' : '').file - elseif isdirectory(RailsRoot().'/'.file) - let testcmd = s:editcmdfor(cmd).' '.(a:0 ? a:1 . ' ' : '').s:ra().'/'.file - exe testcmd - return else let testcmd = cmd.' '.(a:0 ? a:1 . ' ' : '').file endif if s:try(testcmd) - " Shorten the file name (I don't fully understand how Vim decides when to - " use a relative/absolute path for the file name, so lets blindly force it - " to be as short as possible) - "silent! file %:~:. - "silent! lcd . call s:djump(djump) endif endfunction function! s:edit(cmd,file,...) let cmd = s:editcmdfor(a:cmd) - let cmd = cmd.' '.(a:0 ? a:1 . ' ' : '') + let cmd .= ' '.(a:0 ? a:1 . ' ' : '') let file = a:file if file !~ '^/' && file !~ '^\w:' && file !~ '://' - "let file = s:ra().'/'.file - exe cmd."`=RailsRoot().'/'.file`" + exe cmd."`=fnamemodify(rails#app().path(file),':.')`" else exe cmd.file endif - "exe cmd.file endfunction -function! s:Alternate(bang,cmd) - let cmd = a:cmd.(a:bang?"!":"") - let file = s:AlternateFile() - if file != "" - call s:findedit(cmd,file) +function! s:Alternate(bang,cmd,...) + if a:0 + return call('s:Find',[a:bang,1,a:cmd]+a:000) else - call s:warn("No alternate file is defined") + let cmd = a:cmd.(a:bang?"!":"") + let file = s:AlternateFile() + if file != "" + call s:findedit(cmd,file) + else + call s:warn("No alternate file is defined") + endif endif endfunction @@ -2499,13 +2718,13 @@ function! s:AlternateFile() elseif f =~ '\<config/environment\.rb$' | return "config/database.yml" elseif f =~ '\<db/migrate/\d\d\d_' let num = matchstr(f,'\<db/migrate/0*\zs\d\+\ze_')-1 - return num ? s:migrationfor(num) : "db/schema.rb" + return rails#app().migration(num) elseif f =~ '\<application\.js$' return "app/helpers/application_helper.rb" elseif t =~ '^js\>' return "public/javascripts/application.js" elseif f =~ '\<db/schema\.rb$' - return s:migrationfor("") + return rails#app().migration('') elseif t =~ '^view\>' if t =~ '\<layout\>' let dest = fnamemodify(f,':r:s?/layouts\>??').'/layout.'.fnamemodify(f,':e') @@ -2513,18 +2732,24 @@ function! s:AlternateFile() let dest = f endif " Go to the (r)spec, helper, controller, or (mailer) model - let spec = fnamemodify(dest,':r:s?\<app/?spec/?')."_spec.rb" + let spec1 = fnamemodify(dest,':s?\<app/?spec/?')."_spec.rb" + let spec2 = fnamemodify(dest,':r:s?\<app/?spec/?')."_spec.rb" + let spec3 = fnamemodify(dest,':r:r:s?\<app/?spec/?')."_spec.rb" let helper = fnamemodify(dest,':h:s?/views/?/helpers/?')."_helper.rb" let controller = fnamemodify(dest,':h:s?/views/?/controllers/?')."_controller.rb" let model = fnamemodify(dest,':h:s?/views/?/models/?').".rb" - if s:hasfile(spec) - return spec - elseif s:hasfile(helper) + if rails#app().has_file(spec1) + return spec1 + elseif rails#app().has_file(spec2) + return spec2 + elseif rails#app().has_file(spec3) + return spec3 + elseif rails#app().has_file(helper) return helper - elseif s:hasfile(controller) + elseif rails#app().has_file(controller) let jumpto = expand("%:t:r") return controller.'#'.jumpto - elseif s:hasfile(model) + elseif rails#app().has_file(model) return model else return helper @@ -2536,16 +2761,16 @@ function! s:AlternateFile() let controller = s:sub(s:sub(f,'/helpers/','/controllers/'),'_helper\.rb$','_controller.rb') let controller = s:sub(controller,'application_controller','application') let spec = s:sub(s:sub(f,'<app/','spec/'),'\.rb$','_spec.rb') - if s:hasfile(spec) + if rails#app().has_file(spec) return spec else return controller endif elseif t =~ '\<fixtures\>' && f =~ '\<spec/' - let file = s:singularize(expand("%:t:r")).'_spec.rb' + let file = rails#singularize(expand("%:t:r")).'_spec.rb' return file elseif t =~ '\<fixtures\>' - let file = s:singularize(expand("%:t:r")).'_test.rb' " .expand('%:e') + let file = rails#singularize(expand("%:t:r")).'_test.rb' " .expand('%:e') return file elseif f == '' call s:warn("No filename present") @@ -2558,12 +2783,11 @@ function! s:AlternateFile() if file =~ '_\%(test\|spec\)$' let file = s:sub(file,'_%(test|spec)$','.rb') else - let file = file.'_test.rb' + let file .= '_test.rb' endif if t =~ '^model\>' return s:sub(file,'app/models/','test/unit/')."\n".s:sub(s:sub(file,'_test\.rb$','_spec.rb'),'app/models/','spec/models/') elseif t =~ '^controller\>' - "return s:sub(file,'app/controllers/','test/functional/') return s:sub(file,'<app/controllers/','test/functional/')."\n".s:sub(s:sub(file,'_test\.rb$','_spec.rb'),'app/controllers/','spec/controllers/') elseif t =~ '^test-unit\>' return s:sub(file,'test/unit/','app/models/')."\n".s:sub(file,'test/unit/','lib/') @@ -2593,13 +2817,17 @@ function! s:AlternateFile() endif endfunction -function! s:Related(bang,cmd) - let cmd = a:cmd.(a:bang?"!":"") - let file = s:RelatedFile() - if file != "" - call s:findedit(cmd,file) +function! s:Related(bang,cmd,...) + if a:0 + return call('s:Edit',[a:bang,1,a:cmd]+a:000) else - call s:warn("No related file is defined") + let cmd = a:cmd.(a:bang?"!":"") + let file = s:RelatedFile() + if file != "" + call s:findedit(cmd,file) + else + call s:warn("No related file is defined") + endif endif endfunction @@ -2612,7 +2840,7 @@ function! s:RelatedFile() elseif t =~ '^\%(controller\|model-mailer\)\>' && lastmethod != "" let root = s:sub(s:sub(s:sub(f,'/application\.rb$','/shared_controller.rb'),'/%(controllers|models)/','/views/'),'%(_controller)=\.rb$','/'.lastmethod) let format = s:format('html') - if glob(RailsRoot().'/'.root.'.'.format.'.*[^~]') != '' + if glob(rails#app().path().'/'.root.'.'.format.'.*[^~]') != '' return root . '.' . format else return root @@ -2634,7 +2862,7 @@ function! s:RelatedFile() elseif f =~ '\<config/environment\.rb$' | return "config/routes.rb" elseif f =~ '\<db/migrate/\d\d\d_' let num = matchstr(f,'\<db/migrate/0*\zs\d\+\ze_')+1 - let migr = s:migrationfor(num) + let migr = rails#app().migration(num) return migr == '' ? "db/schema.rb" : migr elseif t =~ '^test\>' && f =~ '\<test/\w\+/' let target = s:sub(f,'.*<test/\w+/','test/mocks/test/') @@ -2646,8 +2874,6 @@ function! s:RelatedFile() return "public/javascripts/application.js" elseif t =~ '^view-layout\>' return s:sub(s:sub(s:sub(f,'/views/','/controllers/'),'/layouts/(\k+)\..*$','/\1_controller.rb'),'<application_controller\.rb$','application.rb') - "elseif t=~ '^view-partial\>' - "call s:warn("No related file is defined") elseif t =~ '^view\>' let controller = s:sub(s:sub(f,'/views/','/controllers/'),'/(\k+%(\.\k+)=)\..*$','_controller.rb#\1') let controller2 = s:sub(s:sub(f,'/views/','/controllers/'),'/(\k+%(\.\k+)=)\..*$','.rb#\1') @@ -2668,16 +2894,14 @@ function! s:RelatedFile() elseif t=~ '^helper\>' return s:findlayout(s:controller()) elseif t =~ '^model-arb\>' - "call s:migrationEdit(0,cmd,'create_'.s:pluralize(expand('%:t:r'))) - return s:migrationfor('create_'.s:pluralize(expand('%:t:r'))) + return rails#app().migration('create_'.rails#pluralize(s:gsub(s:model(),'/','_'))) elseif t =~ '^model-aro\>' return s:sub(f,'_observer\.rb$','.rb') elseif t =~ '^api\>' return s:sub(s:sub(f,'/apis/','/controllers/'),'_api\.rb$','_controller.rb') elseif f =~ '\<db/schema\.rb$' - return s:migrationfor(1) + return rails#app().migration(1) else - "call s:warn("No related file is defined") return "" endif endfunction @@ -2685,8 +2909,6 @@ endfunction " }}}1 " Partial Extraction {{{1 -" Depends: s:error, s:sub, s:viewspattern, s:warn - function! s:Extract(bang,...) range abort if a:0 == 0 || a:0 > 1 return s:error("Incorrect number of arguments") @@ -2694,9 +2916,9 @@ function! s:Extract(bang,...) range abort if a:1 =~ '[^a-z0-9_/.]' return s:error("Invalid partial name") endif - let rails_root = RailsRoot() + let rails_root = rails#app().path() let ext = expand("%:e") - let file = a:1 + let file = s:sub(a:1,'%(/|^)\zs_\ze[^/]*$','') let first = a:firstline let last = a:lastline let range = first.",".last @@ -2717,10 +2939,10 @@ function! s:Extract(bang,...) range abort let fname = fnamemodify(file,":t") if fnamemodify(fname,":e") == "" let name = fname - let fname = fname.".".matchstr(expand("%:t"),'\.\zs.*') + let fname .= ".".matchstr(expand("%:t"),'\.\zs.*') elseif fnamemodify(fname,":e") !~ '^'.s:viewspattern().'$' let name = fnamemodify(fname,":r") - let fname = fname.".".ext + let fname .= ".".ext else let name = fnamemodify(fname,":r:r") endif @@ -2728,7 +2950,7 @@ function! s:Extract(bang,...) range abort let collection = "" if dir =~ '^/' let out = (rails_root).dir."/_".fname - elseif dir == "" + elseif dir == "" || dir == "." let out = (curdir)."/_".fname elseif isdirectory(curdir."/".dir) let out = (curdir)."/".dir."/_".fname @@ -2737,8 +2959,6 @@ function! s:Extract(bang,...) range abort endif if filereadable(out) let partial_warn = 1 - "echoerr "Partial exists" - "return endif if bufnr(out) > 0 if bufloaded(out) @@ -2766,18 +2986,17 @@ function! s:Extract(bang,...) range abort if collection != '' let var = matchstr(collection,'^\k\+') let collection = s:sub(collection,'^\k+\>','') - let first = first - 1 - let last = last + 1 + let first -= 1 + let last += 1 endif else let fspaces = spaces endif - "silent exe range."write ".out let renderstr = "render :partial => '".fnamemodify(file,":r:r")."'" if collection != "" - let renderstr = renderstr.", :collection => ".collection + let renderstr .= ", :collection => ".collection elseif "@".name != var - let renderstr = renderstr.", :object => ".var + let renderstr .= ", :object => ".var endif if ext =~? '^\%(rhtml\|erb\|dryml\)$' let renderstr = "<%= ".renderstr." %>" @@ -2794,10 +3013,13 @@ function! s:Extract(bang,...) range abort silent exe range."yank" let partial = @@ let @@ = buf - let ai = &ai - let &ai = 0 - silent exe "norm! :".first.",".last."change\<CR>".fspaces.renderstr."\<CR>.\<CR>" - let &ai = ai + let old_ai = &ai + try + let &ai = 0 + silent exe "norm! :".first.",".last."change\<CR>".fspaces.renderstr."\<CR>.\<CR>" + finally + let &ai = old_ai + endtry if renderstr =~ '<%' norm ^6w else @@ -2809,8 +3031,7 @@ function! s:Extract(bang,...) range abort else new endif - let shortout = fnamemodify(out,':~:.') - "exe "silent file ".s:escarg(shortout) + let shortout = fnamemodify(out,':.') silent file `=shortout` let &ft = ft let @@ = partial @@ -2831,8 +3052,6 @@ endfunction " }}}1 " Migration Inversion {{{1 -" Depends: s:sub, s:endof, s:gsub, s:error - function! s:mkeep(str) " Things to keep (like comments) from a migration statement return matchstr(a:str,' #[^{].*') @@ -2880,7 +3099,7 @@ function! s:invertrange(beg,end) let add = s:sub(add,'\)=$',', :column => '.mat.'&') endif endif - let add = add.s:mkeep(line) + let add .= s:mkeep(line) elseif line =~ '\<remove_index\>' let add = s:sub(s:sub(line,'<remove_index','add_index'),':column\s*=>\s*','') elseif line =~ '\<rename_\%(table\|column\)\>' @@ -2903,14 +3122,14 @@ function! s:invertrange(beg,end) return -1 endif if add == "" - let add = s:sub(line,'^\s*\zs.*','raise ActiveRecord::IrreversableMigration') + let add = s:sub(line,'^\s*\zs.*','raise ActiveRecord::IrreversibleMigration') elseif add == " " let add = "" endif let str = add."\n".str - let lnum = lnum + 1 + let lnum += 1 endwhile - let str = s:gsub(str,'(\s*raise ActiveRecord::IrreversableMigration\n)+','\1') + let str = s:gsub(str,'(\s*raise ActiveRecord::IrreversibleMigration\n)+','\1') return str endfunction @@ -2938,88 +3157,64 @@ function! s:Invert(bang) if !beg || !end return s:error(err) endif + if foldclosed(beg) > 0 + exe beg."foldopen!" + endif if beg + 1 < end exe (beg+1).",".(end-1)."delete _" endif - if str != "" - let reg_keep = @" - let @" = str - exe beg."put" + if str != '' + exe beg.'put =str' exe 1+beg - let @" = reg_keep endif endfunction " }}}1 " Cache {{{1 -function! s:cacheworks() - if v:version < 700 || RailsRoot() == "" - return 0 - endif - if !exists("s:cache") - let s:cache = {} - endif - if !has_key(s:cache,RailsRoot()) - let s:cache[RailsRoot()] = {} +let s:cache_prototype = {'dict': {}} + +function! s:cache_clear(...) dict + if a:0 == 0 + let self.dict = {} + elseif has_key(self,'dict') && has_key(self.dict,a:1) + unlet! self.dict[a:1] endif - return 1 endfunction -function! s:cacheclear(...) - if RailsRoot() == "" | return "" | endif - if !s:cacheworks() | return "" | endif - if a:0 == 1 - if s:cachehas(a:1) - unlet! s:cache[RailsRoot()][a:1] - endif - else - let s:cache[RailsRoot()] = {} +function! rails#cache_clear(...) + if exists('b:rails_root') + return call(rails#app().cache.clear,a:000,rails#app().cache) endif endfunction -function! s:cache(...) - if !s:cacheworks() | return "" | endif +function! s:cache_get(...) dict if a:0 == 1 - return s:cache[RailsRoot()][a:1] + return self.dict[a:1] else - return s:cache[RailsRoot()] + return self.dict endif endfunction -"function! RailsCache(...) - "if !s:cacheworks() | return "" | endif - "if a:0 == 1 - "if s:cachehas(a:1) - "return s:cache(a:1) - "else - "return "" - "endif - "else - "return s:cache() - "endif -"endfunction - -function! s:cachehas(key) - if !s:cacheworks() | return "" | endif - return has_key(s:cache(),a:key) +function! s:cache_has(key) dict + return has_key(self.dict,a:key) endfunction -function! s:cacheneeds(key) - if !s:cacheworks() | return "" | endif - return !has_key(s:cache(),a:key) +function! s:cache_needs(key) dict + return !has_key(self.dict,a:key) endfunction -function! s:cacheset(key,value) - if !s:cacheworks() | return "" | endif - let s:cache[RailsRoot()][a:key] = a:value +function! s:cache_set(key,value) dict + let self.dict[a:key] = a:value endfunction +call s:add_methods('cache', ['clear','needs','has','get','set']) + +let s:app_prototype.cache = s:cache_prototype + " }}}1 " Syntax {{{1 -" Depends: s:rubyeval, s:gsub, cache functions - function! s:resetomnicomplete() if exists("+completefunc") && &completefunc == 'syntaxcomplete#Complete' if exists("g:loaded_syntax_completion") @@ -3031,54 +3226,59 @@ function! s:resetomnicomplete() endfunction function! s:helpermethods() - let s:rails_helper_methods = "" + return "" \."atom_feed auto_discovery_link_tag auto_link " - \."benchmark button_to button_to_function " - \."cache capture cdata_section check_box check_box_tag collection_select concat content_for content_tag content_tag_for country_options_for_select country_select cycle " - \."date_select datetime_select debug define_javascript_functions distance_of_time_in_words distance_of_time_in_words_to_now div_for dom_class dom_id draggable_element draggable_element_js drop_receiving_element drop_receiving_element_js " + \."benchmark button_to button_to_function button_to_remote " + \."cache capture cdata_section check_box check_box_tag collection_select concat content_for content_tag content_tag_for current_cycle cycle " + \."date_select datetime_select debug distance_of_time_in_words distance_of_time_in_words_to_now div_for dom_class dom_id draggable_element draggable_element_js drop_receiving_element drop_receiving_element_js " \."error_message_on error_messages_for escape_javascript escape_once evaluate_remote_response excerpt " \."field_set_tag fields_for file_field file_field_tag form form_for form_remote_for form_remote_tag form_tag " + \."grouped_options_for_select " \."hidden_field hidden_field_tag highlight " \."image_path image_submit_tag image_tag input " \."javascript_cdata_section javascript_include_tag javascript_path javascript_tag " - \."label label_tag link_to link_to_function link_to_if link_to_remote link_to_unless link_to_unless_current " + \."l label label_tag link_to link_to_function link_to_if link_to_remote link_to_unless link_to_unless_current localize " \."mail_to markdown " \."number_to_currency number_to_human_size number_to_percentage number_to_phone number_with_delimiter number_with_precision " \."observe_field observe_form option_groups_from_collection_for_select options_for_select options_from_collection_for_select " \."partial_path password_field password_field_tag path_to_image path_to_javascript path_to_stylesheet periodically_call_remote pluralize " \."radio_button radio_button_tag remote_form_for remote_function reset_cycle " \."sanitize sanitize_css select select_date select_datetime select_day select_hour select_minute select_month select_second select_tag select_time select_year simple_format sortable_element sortable_element_js strip_links strip_tags stylesheet_link_tag stylesheet_path submit_tag submit_to_remote " - \."tag text_area text_area_tag text_field text_field_tag textilize textilize_without_paragraph time_ago_in_words time_select time_zone_options_for_select time_zone_select truncate " + \."t tag text_area text_area_tag text_field text_field_tag textilize textilize_without_paragraph time_ago_in_words time_select time_zone_options_for_select time_zone_select translate truncate " \."update_page update_page_tag url_for " \."visual_effect " \."word_wrap" +endfunction - " The list of helper methods used to be derived automatically. Let's keep - " this code around in case it's needed again. - if !exists("s:rails_helper_methods") - if g:rails_expensive - let s:rails_helper_methods = "" - if has("ruby") - " && (has("win32") || has("win32unix")) - ruby begin; require 'rubygems'; rescue LoadError; end - if exists("g:rubycomplete_rails") && g:rubycomplete_rails - ruby begin; require VIM::evaluate('RailsRoot()')+'/config/environment'; rescue Exception; end - else - ruby begin; require 'active_support'; require 'action_controller'; require 'action_view'; rescue LoadError; end - end - ruby begin; h = ActionView::Helpers.constants.grep(/Helper$/).collect {|c|ActionView::Helpers.const_get c}.collect {|c| c.public_instance_methods(false)}.collect {|es| es.reject {|e| e =~ /_with(out)?_deprecation$/ || es.include?("#{e}_without_deprecation")}}.flatten.sort.uniq.reject {|m| m =~ /[=?!]$/}; VIM::command('let s:rails_helper_methods = "%s"' % h.join(" ")); rescue Exception; end - endif - if s:rails_helper_methods == "" - let s:rails_helper_methods = s:rubyeval('require %{action_controller}; require %{action_view}; h = ActionView::Helpers.constants.grep(/Helper$/).collect {|c|ActionView::Helpers.const_get c}.collect {|c| c.public_instance_methods(false)}.collect {|es| es.reject {|e| e =~ /_with(out)?_deprecation$/ || es.include?(%{#{e}_without_deprecation})}}.flatten.sort.uniq.reject {|m| m =~ /[=?!]$/}; puts h.join(%{ })',"link_to") - endif +function! s:app_user_classes() dict + if self.cache.needs("user_classes") + let controllers = self.relglob("app/controllers/","**/*",".rb") + call map(controllers,'v:val == "application" ? v:val."_controller" : v:val') + let classes = + \ self.relglob("app/models/","**/*",".rb") + + \ controllers + + \ self.relglob("app/helpers/","**/*",".rb") + + \ self.relglob("lib/","**/*",".rb") + call map(classes,'rails#camelize(v:val)') + call self.cache.set("user_classes",classes) + endif + return self.cache.get('user_classes') +endfunction + +function! s:app_user_assertions() dict + if self.cache.needs("user_assertions") + if self.has_file("test/test_helper.rb") + let assertions = map(filter(s:readfile(self.path("test/test_helper.rb")),'v:val =~ "^ def assert_"'),'matchstr(v:val,"^ def \\zsassert_\\w\\+")') else - let s:rails_helper_methods = "link_to" + let assertions = [] endif + call self.cache.set("user_assertions",assertions) endif - "let g:rails_helper_methods = s:rails_helper_methods - return s:rails_helper_methods + return self.cache.get('user_assertions') endfunction +call s:add_methods('app', ['user_classes','user_assertions']) + function! s:BufSyntax() if (!exists("g:rails_syntax") || g:rails_syntax) let t = RailsFileType() @@ -3087,7 +3287,7 @@ function! s:BufSyntax() let s:prototype_classes = "Prototype Class Abstract Try PeriodicalExecuter Enumerable Hash ObjectRange Element Ajax Responders Base Request Updater PeriodicalUpdater Toggle Insertion Before Top Bottom After ClassNames Form Serializers TimedObserver Observer EventObserver Event Position Effect Effect2 Transitions ScopedQueue Queues DefaultOptions Parallel Opacity Move MoveBy Scale Highlight ScrollTo Fade Appear Puff BlindUp BlindDown SwitchOff DropOut Shake SlideDown SlideUp Squish Grow Shrink Pulsate Fold" let rails_helper_methods = '+\.\@<!\<\('.s:gsub(s:helpermethods(),'\s+','\\|').'\)\>+' - let classes = s:gsub(RailsUserClasses(),'::',' ') + let classes = s:gsub(join(rails#app().user_classes(),' '),'::',' ') if &syntax == 'ruby' if classes != '' exe "syn keyword rubyRailsUserClass ".classes." containedin=rubyClassDeclaration,rubyModuleDeclaration,rubyClass,rubyModule" @@ -3099,8 +3299,8 @@ function! s:BufSyntax() syn keyword rubyRailsAPIMethod api_method inflect_names endif if t =~ '^model$' || t =~ '^model-arb\>' - syn keyword rubyRailsARMethod named_scope serialize - syn keyword rubyRailsARAssociationMethod belongs_to has_one has_many has_and_belongs_to_many composed_of + syn keyword rubyRailsARMethod default_scope named_scope serialize + syn keyword rubyRailsARAssociationMethod belongs_to has_one has_many has_and_belongs_to_many composed_of accepts_nested_attributes_for syn keyword rubyRailsARCallbackMethod before_create before_destroy before_save before_update before_validation before_validation_on_create before_validation_on_update syn keyword rubyRailsARCallbackMethod after_create after_destroy after_save after_update after_validation after_validation_on_create after_validation_on_update syn keyword rubyRailsARClassMethod attr_accessible attr_protected establish_connection set_inheritance_column set_locking_column set_primary_key set_sequence_name set_table_name @@ -3112,7 +3312,6 @@ function! s:BufSyntax() endif if t =~ '^model-mailer\>' syn keyword rubyRailsMethod logger - " Misnomer but who cares syn keyword rubyRailsControllerMethod helper helper_attr helper_method endif if t =~ '^controller\>' || t =~ '^view\>' || t=~ '^helper\>' @@ -3123,16 +3322,14 @@ function! s:BufSyntax() syn keyword rubyRailsMethod logger endif if t =~ '^helper\>' || t=~ '^view\>' - "exe "syn match rubyRailsHelperMethod ".rails_helper_methods exe "syn keyword rubyRailsHelperMethod ".s:sub(s:helpermethods(),'<select\s+','') syn match rubyRailsHelperMethod '\<select\>\%(\s*{\|\s*do\>\|\s*(\=\s*&\)\@!' syn match rubyRailsViewMethod '\.\@<!\<\(h\|html_escape\|u\|url_encode\|controller\)\>' if t =~ '\<partial\>' syn keyword rubyRailsMethod local_assigns endif - "syn keyword rubyRailsDeprecatedMethod start_form_tag end_form_tag link_to_image human_size update_element_function elseif t =~ '^controller\>' - syn keyword rubyRailsControllerMethod helper helper_attr helper_method filter layout url_for serialize exempt_from_layout filter_parameter_logging hide_action cache_sweeper + syn keyword rubyRailsControllerMethod helper helper_attr helper_method filter layout url_for serialize exempt_from_layout filter_parameter_logging hide_action cache_sweeper protect_from_forgery syn match rubyRailsDeprecatedMethod '\<render_\%(action\|text\|file\|template\|nothing\|without_layout\)\>' syn keyword rubyRailsRenderMethod render_to_string redirect_to head syn match rubyRailsRenderMethod '\<respond_to\>?\@!' @@ -3143,20 +3340,19 @@ function! s:BufSyntax() syn keyword rubyRailsMigrationMethod create_table change_table drop_table rename_table add_column rename_column change_column change_column_default remove_column add_index remove_index endif if t =~ '^test\>' - if s:cacheneeds("user_asserts") && filereadable(RailsRoot()."/test/test_helper.rb") - call s:cacheset("user_asserts",map(filter(readfile(RailsRoot()."/test/test_helper.rb"),'v:val =~ "^ def assert_"'),'matchstr(v:val,"^ def \\zsassert_\\w\\+")')) - endif - if s:cachehas("user_asserts") && !empty(s:cache("user_asserts")) - exe "syn keyword rubyRailsUserMethod ".join(s:cache("user_asserts")) + if !empty(rails#app().user_assertions()) + exe "syn keyword rubyRailsUserMethod ".join(rails#app().user_assertions()) endif syn keyword rubyRailsTestMethod add_assertion assert assert_block assert_equal assert_in_delta assert_instance_of assert_kind_of assert_match assert_nil assert_no_match assert_not_equal assert_not_nil assert_not_same assert_nothing_raised assert_nothing_thrown assert_operator assert_raise assert_respond_to assert_same assert_send assert_throws assert_recognizes assert_generates assert_routing flunk fixtures fixture_path use_transactional_fixtures use_instantiated_fixtures assert_difference assert_no_difference assert_valid + syn keyword rubyRailsTestMethod test setup teardown if t !~ '^test-unit\>' syn match rubyRailsTestControllerMethod '\.\@<!\<\%(get\|post\|put\|delete\|head\|process\|assigns\)\>' syn keyword rubyRailsTestControllerMethod assert_response assert_redirected_to assert_template assert_recognizes assert_generates assert_routing assert_dom_equal assert_dom_not_equal assert_select assert_select_rjs assert_select_encoded assert_select_email assert_tag assert_no_tag endif elseif t=~ '^spec\>' - syn keyword rubyRailsTestMethod describe context it specify it_should_behave_like before after fixtures controller_name helper_name - syn keyword rubyRailsTestMethod violated pending + syn keyword rubyRailsTestMethod describe context it specify it_should_behave_like before after subject fixtures controller_name helper_name + syn keyword rubyRailsTestMethod violated pending mock mock_model stub_model + syn match rubyRailsTestMethod '\.\@<!\<stub\>!\@!' if t !~ '^spec-model\>' syn match rubyRailsTestControllerMethod '\.\@<!\<\%(get\|post\|put\|delete\|head\|process\|assigns\)\>' syn keyword rubyRailsTestControllerMethod integrate_views @@ -3202,7 +3398,6 @@ function! s:BufSyntax() exe "syn sync minlines=" . g:ruby_minlines syn case match syn region rubyString matchgroup=rubyStringDelimiter start=+%Q\=<+ end=+>+ contains=@htmlTop,@rubyStringSpecial - "syn region rubyString matchgroup=rubyStringDelimiter start=+%q<+ end=+>+ contains=@htmlTop syn cluster htmlArgCluster add=@rubyStringSpecial syn cluster htmlPreProc add=@rubyStringSpecial @@ -3312,7 +3507,7 @@ function! s:HiDefaults() hi def link railsStringSpecial Identifier endfunction -function! RailslogSyntax() +function! rails#log_syntax() syn match railslogRender '^\s*\<\%(Processing\|Rendering\|Rendered\|Redirected\|Completed\)\>' syn match railslogComment '^\s*# .*' syn match railslogModel '^\s*\u\%(\w\|:\)* \%(Load\%( Including Associations\| IDs For Limited Eager Loading\)\=\|Columns\|Count\|Update\|Destroy\|Delete all\)\>' skipwhite nextgroup=railslogModelNum @@ -3352,9 +3547,6 @@ endfunction " }}}1 " Statusline {{{1 -" Depends: nothing! -" Provides: s:BufInitStatusline - function! s:addtostatus(letter,status) let status = a:status if status !~ 'Rails' && g:rails_statusline @@ -3374,7 +3566,7 @@ function! s:BufInitStatusline() if &l:statusline == '' let &l:statusline='%<%f %h%m%r%=' if &ruler - let &l:statusline = &l:statusline . '%-16( %l,%c-%v %)%P' + let &l:statusline .= '%-16( %l,%c-%v %)%P' endif endif let &l:statusline = s:InjectIntoStatusline(&l:statusline) @@ -3386,7 +3578,7 @@ function! s:InitStatusline() if &g:statusline == '' let &g:statusline='%<%f %h%m%r%=' if &ruler - let &g:statusline = &g:statusline . '%-16( %l,%c-%v %)%P' + let &g:statusline .= '%-16( %l,%c-%v %)%P' endif endif let &g:statusline = s:InjectIntoStatusline(&g:statusline) @@ -3405,7 +3597,7 @@ function! s:InjectIntoStatusline(status) let status=substitute(status,'%=','%{RailsStatusline()}%=','') endif if status !~ 'Rails' && status != '' - let status=status.'%{RailsStatusline()}' + let status .= '%{RailsStatusline()}' endif endif return status @@ -3440,16 +3632,13 @@ endfunction " }}}1 " Mappings {{{1 -" Depends: nothing! -" Exports: s:BufMappings - function! s:BufMappings() - map <buffer> <silent> <Plug>RailsAlternate :A<CR> - map <buffer> <silent> <Plug>RailsRelated :R<CR> - map <buffer> <silent> <Plug>RailsFind :REfind<CR> - map <buffer> <silent> <Plug>RailsSplitFind :RSfind<CR> - map <buffer> <silent> <Plug>RailsVSplitFind :RVfind<CR> - map <buffer> <silent> <Plug>RailsTabFind :RTfind<CR> + nnoremap <buffer> <silent> <Plug>RailsAlternate :<C-U>A<CR> + nnoremap <buffer> <silent> <Plug>RailsRelated :<C-U>R<CR> + nnoremap <buffer> <silent> <Plug>RailsFind :<C-U>REfind<CR> + nnoremap <buffer> <silent> <Plug>RailsSplitFind :<C-U>RSfind<CR> + nnoremap <buffer> <silent> <Plug>RailsVSplitFind :<C-U>RVfind<CR> + nnoremap <buffer> <silent> <Plug>RailsTabFind :<C-U>RTfind<CR> if g:rails_mappings if !hasmapto("<Plug>RailsFind") nmap <buffer> gf <Plug>RailsFind @@ -3468,7 +3657,6 @@ function! s:BufMappings() endif if exists("$CREAM") imap <buffer> <C-CR> <C-O><Plug>RailsFind - " Are these a good idea? imap <buffer> <M-[> <C-O><Plug>RailsAlternate imap <buffer> <M-]> <C-O><Plug>RailsRelated endif @@ -3480,10 +3668,8 @@ endfunction " }}}1 " Project {{{ -" Depends: s:gsub, s:escarg, s:warn, s:sub, s:relglob - function! s:Project(bang,arg) - let rr = RailsRoot() + let rr = rails#app().path() exe "Project ".a:arg let line = search('^[^ =]*="'.s:gsub(rr,'[\/]','[\\/]').'"') let projname = s:gsub(fnamemodify(rr,':t'),'\=','-') " .'_on_rails' @@ -3509,7 +3695,7 @@ function! s:Project(bang,arg) . endif let line = line('.')+1 - call s:NewProject(projname,rr,a:bang) + call s:NewProject(projname,rr) endif normal! zMzo if search("^ app=app {","W",line+10) @@ -3519,9 +3705,9 @@ function! s:Project(bang,arg) normal! 0zt endfunction -function! s:NewProject(proj,rr,fancy) +function! s:NewProject(proj,rr) let line = line('.')+1 - let template = s:NewProjectTemplate(a:proj,a:rr,a:fancy) + let template = s:NewProjectTemplate(a:proj,a:rr) silent put =template exe line " Ugh. how else can I force detecting folds? @@ -3545,164 +3731,131 @@ function! s:NewProject(proj,rr,fancy) endif endfunction -function! s:NewProjectTemplate(proj,rr,fancy) +function! s:NewProjectTemplate(proj,rr) let str = a:proj.'="'.a:rr."\" CD=. filter=\"*\" {\n" - let str = str." app=app {\n" - if isdirectory(a:rr.'/app/apis') - let str = str." apis=apis {\n }\n" - endif - let str = str." controllers=controllers filter=\"**\" {\n }\n" - let str = str." helpers=helpers filter=\"**\" {\n }\n" - let str = str." models=models filter=\"**\" {\n }\n" - if a:fancy - let str = str." views=views {\n" - let views = s:relglob(a:rr.'/app/views/','*')."\n" - while views != '' - let dir = matchstr(views,'^.\{-\}\ze\n') - let views = s:sub(views,'^.{-}\n','') - let str = str." ".dir."=".dir.' filter="**" {'."\n }\n" - endwhile - let str = str." }\n" - else - let str = str." views=views filter=\"**\" {\n }\n" - endif - let str = str . " }\n" - let str = str . " config=config {\n environments=environments {\n }\n }\n" - let str = str . " db=db {\n" - if isdirectory(a:rr.'/db/migrate') - let str = str . " migrate=migrate {\n }\n" - endif - let str = str . " }\n" - let str = str . " lib=lib filter=\"* */**/*.rb \" {\n tasks=tasks filter=\"**/*.rake\" {\n }\n }\n" - let str = str . " public=public {\n images=images {\n }\n javascripts=javascripts {\n }\n stylesheets=stylesheets {\n }\n }\n" + let str .= " app=app {\n" + for dir in ['apis','controllers','helpers','models','views'] + let str .= s:addprojectdir(a:rr,'app',dir) + endfor + let str .= " }\n" + let str .= " config=config {\n environments=environments {\n }\n }\n" + let str .= " db=db {\n" + let str .= s:addprojectdir(a:rr,'db','migrate') + let str .= " }\n" + let str .= " lib=lib filter=\"* */**/*.rb \" {\n tasks=tasks filter=\"**/*.rake\" {\n }\n }\n" + let str .= " public=public {\n images=images {\n }\n javascripts=javascripts {\n }\n stylesheets=stylesheets {\n }\n }\n" if isdirectory(a:rr.'/spec') - let str = str . " spec=spec {\n" - let str = str . " controllers=controllers filter=\"**\" {\n }\n" - let str = str . " fixtures=fixtures filter=\"**\" {\n }\n" - let str = str . " helpers=helpers filter=\"**\" {\n }\n" - let str = str . " models=models filter=\"**\" {\n }\n" - let str = str . " views=views filter=\"**\" {\n }\n }\n" - endif - let str = str . " test=test {\n" - if isdirectory(a:rr.'/test/fixtures') - let str = str . " fixtures=fixtures filter=\"**\" {\n }\n" - endif - if isdirectory(a:rr.'/test/functional') - let str = str . " functional=functional filter=\"**\" {\n }\n" - endif - if isdirectory(a:rr.'/test/integration') - let str = str . " integration=integration filter=\"**\" {\n }\n" - endif - if isdirectory(a:rr.'/test/mocks') - let str = str . " mocks=mocks filter=\"**\" {\n }\n" - endif - if isdirectory(a:rr.'/test/unit') - let str = str . " unit=unit filter=\"**\" {\n }\n" - endif - let str = str . " }\n}\n" + let str .= " spec=spec {\n" + for dir in ['controllers','fixtures','helpers','models','views'] + let str .= s:addprojectdir(a:rr,'spec',dir) + endfor + let str .= " }\n" + endif + if isdirectory(a:rr.'/test') + let str .= " test=test {\n" + for dir in ['fixtures','functional','integration','mocks','unit'] + let str .= s:addprojectdir(a:rr,'test',dir) + endfor + let str .= " }\n" + end + let str .= "}\n" return str endfunction +function! s:addprojectdir(rr,parentdir,dir) + if isdirectory(a:rr.'/'.a:parentdir.'/'.a:dir) + return ' '.a:dir.'='.a:dir." filter=\"**\" {\n }\n" + else + return '' + endif +endfunction + " }}}1 " Database {{{1 -" Depends: s:environment, s:rubyeval, s:rv, reloadability - function! s:extractdbvar(str,arg) return matchstr("\n".a:str."\n",'\n'.a:arg.'=\zs.\{-\}\ze\n') endfunction -function! s:BufDatabase(...) - if exists("s:lock_database") - return - endif - let s:lock_database = 1 - let rv = s:rv() - if (a:0 && a:1 > 1) - unlet! s:dbext_type_{rv} +function! s:app_dbext_settings(environment) dict + if self.cache.needs('dbext_settings') + call self.cache.set('dbext_settings',{}) endif - if (a:0 > 1 && a:2 != '') - let env = a:2 - else - let env = s:environment() - endif - " Crude caching mechanism - if !exists("s:dbext_type_".rv) - if exists("g:loaded_dbext") && (g:rails_dbext + (a:0 ? a:1 : 0)) > 0 && filereadable(RailsRoot()."/config/database.yml") - " Ideally we would filter this through ERB but that could be insecure. - " It might be possible to make use of taint checking. + let cache = self.cache.get('dbext_settings') + if !has_key(cache,a:environment) + let dict = {} + if self.has_file("config/database.yml") let out = "" if has("ruby") - ruby require 'yaml'; VIM::command('let out = %s' % File.open(VIM::evaluate("RailsRoot()")+"/config/database.yml") {|f| y = YAML::load(f); e = y[VIM::evaluate("env")]; i=0; e=y[e] while e.respond_to?(:to_str) && (i+=1)<16; e.map {|k,v| "#{k}=#{v}\n" if v}.compact.join }.inspect) rescue nil + ruby require 'yaml'; VIM::command('let out = %s' % File.open(VIM::evaluate("self.path()")+"/config/database.yml") {|f| y = YAML::load(f); e = y[VIM::evaluate("a:environment")]; i=0; e=y[e] while e.respond_to?(:to_str) && (i+=1)<16; e.map {|k,v| "#{k}=#{v}\n" if v}.compact.join }.inspect) rescue nil endif if out == "" - let cmdb = 'require %{yaml}; File.open(%q{'.RailsRoot().'/config/database.yml}) {|f| y = YAML::load(f); e = y[%{' + let cmdb = 'require %{yaml}; File.open(%q{'.self.path().'/config/database.yml}) {|f| y = YAML::load(f); e = y[%{' let cmde = '}]; i=0; e=y[e] while e.respond_to?(:to_str) && (i+=1)<16; e.each{|k,v|puts k.to_s+%{=}+v.to_s}}' - if a:0 ? a:1 : g:rails_expensive - let out = s:rubyeval(cmdb.env.cmde,'') - else - unlet! s:lock_database - return - endif + let out = self.lightweight_ruby_eval(cmdb.a:environment.cmde) endif let adapter = s:extractdbvar(out,'adapter') - let s:dbext_bin_{rv} = '' - let s:dbext_integratedlogin_{rv} = '' - if adapter == 'postgresql' - let adapter = 'pgsql' - elseif adapter == 'sqlite3' - let adapter = 'sqlite' - " Does not appear to work - let s:dbext_bin = 'sqlite3' - elseif adapter == 'sqlserver' - let adapter = 'sqlsrv' - elseif adapter == 'sybase' - let adapter = 'asa' - elseif adapter == 'oci' - let adapter = 'ora' - endif - let s:dbext_type_{rv} = toupper(adapter) - let s:dbext_user_{rv} = s:extractdbvar(out,'username') - let s:dbext_passwd_{rv} = s:extractdbvar(out,'password') - if s:dbext_passwd_{rv} == '' && adapter == 'mysql' + let adapter = get({'postgresql': 'pgsql', 'sqlite3': 'sqlite', 'sqlserver': 'sqlsrv', 'sybase': 'asa', 'oci': 'ora'},adapter,adapter) + let dict['type'] = toupper(adapter) + let dict['user'] = s:extractdbvar(out,'username') + let dict['passwd'] = s:extractdbvar(out,'password') + if dict['passwd'] == '' && adapter == 'mysql' " Hack to override password from .my.cnf - let s:dbext_extra_{rv} = ' --password=' + let dict['extra'] = ' --password=' else - let s:dbext_extra_{rv} = '' + let dict['extra'] = '' + endif + let dict['dbname'] = s:extractdbvar(out,'database') + if dict['dbname'] == '' + let dict['dbname'] = s:extractdbvar(out,'dbfile') endif - let s:dbext_dbname_{rv} = s:extractdbvar(out,'database') - if s:dbext_dbname_{rv} != '' && s:dbext_dbname_{rv} !~ '^:' && adapter =~? '^sqlite' - let s:dbext_dbname_{rv} = RailsRoot().'/'.s:dbext_dbname_{rv} + if dict['dbname'] != '' && dict['dbname'] !~ '^:' && adapter =~? '^sqlite' + let dict['dbname'] = self.path(dict['dbname']) endif - let s:dbext_profile_{rv} = '' - let s:dbext_host_{rv} = s:extractdbvar(out,'host') - let s:dbext_port_{rv} = s:extractdbvar(out,'port') - let s:dbext_dsnname_{rv} = s:extractdbvar(out,'dsn') - if s:dbext_host_{rv} =~? '^\cDBI:' - if s:dbext_host_{rv} =~? '\c\<Trusted[_ ]Connection\s*=\s*yes\>' - let s:dbext_integratedlogin_{rv} = 1 + let dict['profile'] = '' + let dict['srvname'] = s:extractdbvar(out,'host') + let dict['host'] = s:extractdbvar(out,'host') + let dict['port'] = s:extractdbvar(out,'port') + let dict['dsnname'] = s:extractdbvar(out,'dsn') + if dict['host'] =~? '^\cDBI:' + if dict['host'] =~? '\c\<Trusted[_ ]Connection\s*=\s*yes\>' + let dict['integratedlogin'] = 1 endif - let s:dbext_host_{rv} = matchstr(s:dbext_host_{rv},'\c\<\%(Server\|Data Source\)\s*=\s*\zs[^;]*') + let dict['host'] = matchstr(dict['host'],'\c\<\%(Server\|Data Source\)\s*=\s*\zs[^;]*') endif + call filter(dict,'v:val != ""') endif + let cache[a:environment] = dict endif - if exists("s:dbext_type_".rv) - silent! let b:dbext_type = s:dbext_type_{rv} - silent! let b:dbext_profile = s:dbext_profile_{rv} - silent! let b:dbext_bin = s:dbext_bin_{rv} - silent! let b:dbext_user = s:dbext_user_{rv} - silent! let b:dbext_passwd = s:dbext_passwd_{rv} - silent! let b:dbext_dbname = s:dbext_dbname_{rv} - silent! let b:dbext_host = s:dbext_host_{rv} - silent! let b:dbext_port = s:dbext_port_{rv} - silent! let b:dbext_dsnname = s:dbext_dsnname_{rv} - silent! let b:dbext_extra = s:dbext_extra_{rv} - silent! let b:dbext_integratedlogin = s:dbext_integratedlogin_{rv} - if b:dbext_type == 'PGSQL' - let $PGPASSWORD = b:dbext_passwd - elseif exists('$PGPASSWORD') - let $PGPASSWORD = '' - endif + return cache[a:environment] +endfunction + +function! s:BufDatabase(...) + 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') + endif + if (a:0 > 1 && a:2 != '') + let env = a:2 + else + let env = s:environment() + endif + if (!self.cache.has('dbext_settings') || !has_key(self.cache.get('dbext_settings'),env)) && (g:rails_dbext + (a:0 ? a:1 : 0)) <= 0 + unlet! s:lock_database + return + endif + let dict = self.dbext_settings(env) + for key in ['type', 'profile', 'bin', 'user', 'passwd', 'dbname', 'srvname', 'host', 'port', 'dsnname', 'extra', 'integratedlogin'] + let b:dbext_{key} = get(dict,key,'') + endfor + if b:dbext_type == 'PGSQL' + let $PGPASSWORD = b:dbext_passwd + elseif exists('$PGPASSWORD') + let $PGPASSWORD = '' endif if a:0 >= 3 && a:3 && exists(":Create") if exists("b:dbext_dbname") && exists("b:dbext_type") && b:dbext_type !~? 'sqlite' @@ -3722,11 +3875,11 @@ function! s:BufDatabase(...) unlet! s:lock_database endfunction +call s:add_methods('app', ['dbext_settings']) + " }}}1 " Abbreviations {{{1 -" Depends: s:sub, s:gsub, s:string, s:linepeak, s:error - function! s:selectiveexpand(pat,good,default,...) if a:0 > 0 let nd = a:1 @@ -3746,16 +3899,16 @@ function! s:selectiveexpand(pat,good,default,...) endif endfunction -function! s:TheMagicC() +function! s:TheCWord() let l = s:linepeak() - if l =~ '\<find\s*\((\|:first,\|:all,\)' || l =~ '\<paginate\>' + if l =~ '\<\%(find\|first\|last\|all\|paginate\)\>' return s:selectiveexpand('..',':conditions => ',':c') - elseif l =~ '\<render\s*(\=\s*:partial\s\*=>\s*' + elseif l =~ '\<render\s*(\=\s*:partial\s*=>\s*' return s:selectiveexpand('..',':collection => ',':c') - elseif RailsFileType() =~ '^model\>' - return s:selectiveexpand('..',':conditions => ',':c') - else + elseif l =~ '\<\%(url_for\|link_to\|form_tag\)\>' || l =~ ':url\s*=>\s*{\s*' return s:selectiveexpand('..',':controller => ',':c') + else + return s:selectiveexpand('..',':conditions => ',':c') endif endfunction @@ -3763,9 +3916,9 @@ function! s:AddSelectiveExpand(abbr,pat,expn,...) let expn = s:gsub(s:gsub(a:expn ,'[\"|]','\\&'),'\<','\\<Lt>') let expn2 = s:gsub(s:gsub(a:0 ? a:1 : '','[\"|]','\\&'),'\<','\\<Lt>') if a:0 - exe "inoreabbrev <buffer> <silent> ".a:abbr." <C-R>=<SID>selectiveexpand(".s:string(a:pat).",\"".expn."\",".s:string(a:abbr).",\"".expn2."\")<CR>" + exe "inoreabbrev <buffer> <silent> ".a:abbr." <C-R>=<SID>selectiveexpand(".string(a:pat).",\"".expn."\",".string(a:abbr).",\"".expn2."\")<CR>" else - exe "inoreabbrev <buffer> <silent> ".a:abbr." <C-R>=<SID>selectiveexpand(".s:string(a:pat).",\"".expn."\",".s:string(a:abbr).")<CR>" + exe "inoreabbrev <buffer> <silent> ".a:abbr." <C-R>=<SID>selectiveexpand(".string(a:pat).",\"".expn."\",".string(a:abbr).")<CR>" endif endfunction @@ -3778,7 +3931,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,...) @@ -3819,8 +3972,6 @@ function! s:BufAbbreviations() Rabbrev taiw time_ago_in_words endif if t =~ '^controller\>' - "call s:AddSelectiveExpand('rn','[,\r]','render :nothing => true') - "let b:rails_abbreviations = b:rails_abbreviations . "rn\trender :nothing => true\n" Rabbrev re( redirect_to Rabbrev rea( redirect_to :action\ =>\ Rabbrev rec( redirect_to :controller\ =>\ @@ -3854,28 +4005,17 @@ function! s:BufAbbreviations() Rabbrev mcc( t.column endif if t =~ '^test\>' - "Rabbrev ae( assert_equal Rabbrev ase( assert_equal - "Rabbrev ako( assert_kind_of Rabbrev asko( assert_kind_of - "Rabbrev ann( assert_not_nil Rabbrev asnn( assert_not_nil - "Rabbrev ar( assert_raise Rabbrev asr( assert_raise - "Rabbrev are( assert_response Rabbrev asre( assert_response Rabbrev art( assert_redirected_to endif Rabbrev :a :action\ =>\ - inoreabbrev <buffer> <silent> :c <C-R>=<SID>TheMagicC()<CR> - " Lie a little - if t =~ '^view\>' - let b:rails_abbreviations = b:rails_abbreviations . ":c\t:collection => \n" - elseif s:controller() != '' - let b:rails_abbreviations = b:rails_abbreviations . ":c\t:controller => \n" - else - let b:rails_abbreviations = b:rails_abbreviations . ":c\t:conditions => \n" - endif + " hax + Rabbrev :c :co________\ =>\ + inoreabbrev <buffer> <silent> :c <C-R>=<SID>TheCWord()<CR> Rabbrev :i :id\ =>\ Rabbrev :o :object\ =>\ Rabbrev :p :partial\ =>\ @@ -3897,31 +4037,39 @@ endfunction function! s:Abbrev(bang,...) abort if !exists("b:rails_abbreviations") - let b:rails_abbreviations = "\n" + let b:rails_abbreviations = {} endif if a:0 > 3 || (a:bang && (a:0 != 1)) return s:error("Rabbrev: invalid arguments") endif - if a:bang - return s:unabbrev(a:1) - endif if a:0 == 0 - echo s:sub(b:rails_abbreviations,'^\n','') + for key in sort(keys(b:rails_abbreviations)) + echo key . join(b:rails_abbreviations[key],"\t") + endfor return endif let lhs = a:1 + let root = s:sub(lhs,'%(::|\(|\[)$','') + if a:bang + if has_key(b:rails_abbreviations,root) + call remove(b:rails_abbreviations,root) + endif + exe "iunabbrev <buffer> ".root + return + endif if a:0 > 3 || a:0 < 2 return s:error("Rabbrev: invalid arguments") endif let rhs = a:2 - call s:unabbrev(lhs,1) + if has_key(b:rails_abbreviations,root) + call remove(b:rails_abbreviations,root) + endif if lhs =~ '($' - let b:rails_abbreviations = b:rails_abbreviations . lhs . "\t" . rhs . "" . (a:0 > 2 ? "\t".a:3 : ""). "\n" - let llhs = s:sub(lhs,'\($','') + let b:rails_abbreviations[root] = ["(", rhs . (a:0 > 2 ? "\t".a:3 : "")] if a:0 > 2 - call s:AddParenExpand(llhs,rhs,a:3) + call s:AddParenExpand(root,rhs,a:3) else - call s:AddParenExpand(llhs,rhs) + call s:AddParenExpand(root,rhs) endif return endif @@ -3929,42 +4077,24 @@ function! s:Abbrev(bang,...) abort return s:error("Rabbrev: invalid arguments") endif if lhs =~ ':$' - let llhs = s:sub(lhs,':=:$','') - call s:AddColonExpand(llhs,rhs) + call s:AddColonExpand(root,rhs) elseif lhs =~ '\[$' - let llhs = s:sub(lhs,'\[$','') - call s:AddBracketExpand(llhs,rhs) + call s:AddBracketExpand(root,rhs) elseif lhs =~ '\w$' call s:AddTabExpand(lhs,rhs) else return s:error("Rabbrev: unimplemented") endif - let b:rails_abbreviations = b:rails_abbreviations . lhs . "\t" . rhs . "\n" -endfunction - -function! s:unabbrev(abbr,...) - let abbr = s:sub(a:abbr,'%(::|\(|\[)$','') - let pat = s:sub(abbr,'\\','\\\\') - if !exists("b:rails_abbreviations") - let b:rails_abbreviations = "\n" - endif - let b:rails_abbreviations = substitute(b:rails_abbreviations,'\V\C\n'.pat.'\(\t\|::\t\|(\t\|[\t\)\.\{-\}\n','\n','') - if a:0 == 0 || a:1 == 0 - exe "iunabbrev <buffer> ".abbr - endif + let b:rails_abbreviations[root] = [matchstr(lhs,'\W*$'),rhs] endfunction " }}}1 " Settings {{{1 -" Depends: s:error, s:sub, s:sname, s:escvar, s:lastmethod, s:environment, s:gsub, s:lastmethodlib, s:gsub - function! s:Set(bang,...) let c = 1 let defscope = '' - while c <= a:0 - let arg = a:{c} - let c = c + 1 + for arg in a:000 if arg =~? '^<[abgl]\=>$' let defscope = (matchstr(arg,'<\zs.*\ze>')) elseif arg !~ '=' @@ -3972,7 +4102,7 @@ function! s:Set(bang,...) let arg = defscope.':'.opt endif let val = s:getopt(arg) - if val == '' && s:opts() !~ '\<'.arg.'\n' + if val == '' && !has_key(s:opts(),arg) call s:error("No such rails.vim option: ".arg) else echo arg."=".val @@ -3985,10 +4115,11 @@ function! s:Set(bang,...) endif call s:setopt(opt,val) endif - endwhile + endfor endfunction function! s:getopt(opt,...) + let app = rails#app() let opt = a:opt if a:0 let scope = a:1 @@ -4005,22 +4136,25 @@ function! s:getopt(opt,...) if scope =~ 'l' call s:LocalModelines(lnum) endif - let opt = s:sub(opt,'<%(rake|rake_task|rake_target)$','task') + let var = s:sname().'_'.opt + let lastmethod = s:lastmethod(lnum) + if lastmethod == '' | let lastmethod = ' ' | endif " Get buffer option - if scope =~ 'l' && exists("b:_".s:sname()."_".s:escvar(s:lastmethod())."_".opt) - return b:_{s:sname()}_{s:escvar(s:lastmethod(lnum))}_{opt} - elseif exists("b:".s:sname()."_".opt) && (scope =~ 'b' || (scope =~ 'l' && s:lastmethod(lnum) == '')) - return b:{s:sname()}_{opt} - elseif scope =~ 'a' && exists("s:_".s:rv()."_".s:environment()."_".opt) - return s:_{s:rv()}_{s:environment()}_{opt} + if scope =~ 'l' && exists('b:_'.var) && has_key(b:_{var},lastmethod) + return b:_{var}[lastmethod] + elseif exists('b:'.var) && (scope =~ 'b' || (scope =~ 'l' && lastmethod == ' ')) + return b:{var} + elseif scope =~ 'a' && has_key(app,'options') && has_key(app.options,opt) + return app.options[opt] elseif scope =~ 'g' && exists("g:".s:sname()."_".opt) - return g:{s:sname()}_{opt} + return g:{var} else return "" endif endfunction function! s:setopt(opt,val) + let app = rails#app() if a:opt =~? '[abgl]:' let scope = matchstr(a:opt,'^\w') let opt = s:sub(a:opt,'^\w:','') @@ -4028,48 +4162,48 @@ function! s:setopt(opt,val) let scope = '' let opt = a:opt endif - let opt = s:sub(opt,'<%(rake|rake_task|rake_target)$','task') - let defscope = matchstr(s:opts(),'\n\zs\w\ze:'.opt,'\n') - if defscope == '' - let defscope = 'a' - endif + let defscope = get(s:opts(),opt,'a') if scope == '' let scope = defscope endif - if &filetype == 'ruby' && (scope == 'B' || scope == 'l') + if &filetype != 'ruby' && (scope ==# 'B' || scope ==# 'l') let scope = 'b' endif + let var = s:sname().'_'.opt if opt =~ '\W' return s:error("Invalid option ".a:opt) - elseif scope =~? 'a' - let s:_{s:rv()}_{s:environment()}_{opt} = a:val - elseif scope == 'B' && defscope == 'l' - let b:_{s:sname()}_{s:escvar('')}_{opt} = a:val + elseif scope ==# 'B' && defscope == 'l' + if !exists('b:_'.var) | let b:_{var} = {} | endif + let b:_{var}[' '] = a:val elseif scope =~? 'b' - let b:{s:sname()}_{opt} = a:val + let b:{var} = a:val + elseif scope =~? 'a' + if !has_key(app,'options') | let app.options = {} | endif + let app.options[opt] = a:val elseif scope =~? 'g' - let g:{s:sname()}_{opt} = a:val + let g:{var} = a:val elseif scope =~? 'l' - let b:_{s:sname()}_{s:escvar(s:lastmethod())}_{opt} = a:val + if !exists('b:_'.var) | let b:_{var} = {} | endif + let lastmethod = s:lastmethod(lnum) + let b:_{var}[lastmethod == '' ? ' ' : lastmethod] = a:val else return s:error("Invalid scope for ".a:opt) endif endfunction function! s:opts() - return "\nb:alternate\nb:controller\na:gnu_screen\nb:model\nl:preview\nb:task\nl:related\na:root_url\n" + return {'alternate': 'b', 'controller': 'b', 'gnu_screen': 'a', 'model': 'b', 'preview': 'l', 'task': 'b', 'related': 'l', 'root_url': 'a'} endfunction -function! s:SetComplete(A,L,P) +function! s:Complete_set(A,L,P) if a:A =~ '=' let opt = matchstr(a:A,'[^=]*') - return opt."=".s:getopt(opt) + return [opt."=".s:getopt(opt)] else let extra = matchstr(a:A,'^[abgl]:') - let opts = s:gsub(s:sub(s:gsub(s:opts(),'\n\w:','\n'.extra),'^\n',''),'\n','=\n') - return opts + return filter(sort(map(keys(s:opts()),'extra.v:val')),'s:startswith(v:val,a:A)') endif - return "" + return [] endfunction function! s:BufModelines() @@ -4089,7 +4223,7 @@ function! s:BufModelines() endif let mat = matchstr(lines,'\C\<Rset'.pat,matend) let matend = matchend(lines,'\C\<Rset'.pat,matend) - let cnt = cnt + 1 + let cnt += 1 endwhile endfunction @@ -4105,8 +4239,8 @@ function! s:LocalModelines(lnum) let lines = "\n" let lnum = lbeg while lnum < lend && lnum < lbeg + 5 - let lines = lines . getline(lnum) . "\n" - let lnum = lnum + 1 + let lines .= getline(lnum) . "\n" + let lnum += 1 endwhile let pat = '\s\+\zs.\{-\}\ze\%(\n\|\s\s\|#{\@!\|%>\|-->\|$\)' let cnt = 1 @@ -4120,40 +4254,41 @@ function! s:LocalModelines(lnum) endif let mat = matchstr(lines,'\C\<rset'.pat,matend) let matend = matchend(lines,'\C\<rset'.pat,matend) - let cnt = cnt + 1 + let cnt += 1 endwhile endfunction " }}}1 " Detection {{{1 -function! s:callback(file) - if RailsRoot() != "" - let var = "callback_".s:rv()."_".s:escvar(a:file) - if !exists("s:".var) || exists("b:rails_refresh") - let s:{var} = s:hasfile(a:file) - endif - if s:{var} - if exists(":sandbox") - sandbox source `=RailsRoot().'/'.a:file` - elseif g:rails_modelines - source `=RailsRoot().'/'.a:file` - endif - endif +function! s:app_source_callback(file) dict + if self.cache.needs('existence') + call self.cache.set('existence',{}) + endif + let cache = self.cache.get('existence') + if !has_key(cache,a:file) + let cache[a:file] = self.has_file(a:file) + endif + if cache[a:file] + sandbox source `=self.path(a:file)` endif endfunction +call s:add_methods('app',['source_callback']) + function! RailsBufInit(path) - let cpo_save = &cpo - set cpo&vim let firsttime = !(exists("b:rails_root") && b:rails_root == a:path) let b:rails_root = a:path + if !has_key(s:apps,a:path) + let s:apps[a:path] = deepcopy(s:app_prototype) + let s:apps[a:path].root = a:path + endif + let app = s:apps[a:path] " Apparently RailsFileType() can be slow if the underlying file system is " slow (even though it doesn't really do anything IO related). This caching " is a temporary hack; if it doesn't cause problems it should probably be " refactored. - unlet! b:rails_cached_file_type - let b:rails_cached_file_type = RailsFileType() + let b:rails_cached_file_type = app.calculate_file_type(RailsFilePath()) if g:rails_history_size > 0 if !exists("g:RAILS_HISTORY") let g:RAILS_HISTORY = "" @@ -4171,7 +4306,7 @@ function! RailsBufInit(path) let g:RAILS_HISTORY = path."\n".g:RAILS_HISTORY let g:RAILS_HISTORY = s:sub(g:RAILS_HISTORY,'%(.{-}\n){,'.g:rails_history_size.'}\zs.*','') endif - call s:callback("config/syntax.vim") + call app.source_callback("config/syntax.vim") if &ft == "mason" setlocal filetype=eruby elseif &ft =~ '^\%(conf\|ruby\)\=$' && expand("%:e") =~ '^\%(rjs\|rxml\|builder\|rake\|mab\)$' @@ -4209,7 +4344,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 @@ -4230,32 +4367,33 @@ function! RailsBufInit(path) if f != '' exe "silent doautocmd User Rails".f endif - call s:callback("config/rails.vim") + call app.source_callback("config/rails.vim") call s:BufModelines() call s:BufMappings() - "unlet! b:rails_cached_file_type - let &cpo = cpo_save return b:rails_root endfunction function! s:SetBasePath() - let rp = s:gsub(RailsRoot(),'[ ,]','\\&') - let t = RailsFileType() - let oldpath = s:sub(&l:path,'^\.,','') - if stridx(oldpath,rp) == 2 - let oldpath = '' + if rails#app().path() =~ '://' + return endif - let &l:path = '.,'.rp.",".rp."/app/controllers,".rp."/app,".rp."/app/models,".rp."/app/helpers,".rp."/config,".rp."/lib,".rp."/vendor,".rp."/vendor/plugins/*/lib,".rp."/test/unit,".rp."/test/functional,".rp."/test/integration,".rp."/app/apis,".rp."/app/services,".rp."/test,"."/vendor/plugins/*/test,".rp."/vendor/rails/*/lib,".rp."/vendor/rails/*/test,".rp."/spec,".rp."/spec/*," + let transformed_path = s:pathsplit(s:pathjoin([rails#app().path()]))[0] + let old_path = s:pathsplit(s:sub(&l:path,'^\.,=','')) + call filter(old_path,'!s:startswith(v:val,transformed_path)') + + let path = ['app', 'app/models', 'app/controllers', 'app/helpers', 'config', 'lib', 'app/views'] if s:controller() != '' - let &l:path = &l:path . rp . '/app/views/' . s:controller() . ',' . rp . '/app/views,' . rp . '/public,' + let path += ['app/views/'.s:controller(), 'public'] endif - if t =~ '^log\>' - let &l:path = &l:path . rp . '/app/views,' + if rails#app().has('test') + let path += ['test', 'test/unit', 'test/functional', 'test/integration'] endif - if &l:path =~ '://' - let &l:path = ".," + if rails#app().has('spec') + let path += ['spec', 'spec/models', 'spec/controllers', 'spec/helpers', 'spec/views', 'spec/lib'] endif - let &l:path = &l:path . oldpath + let path += ['app/*', 'vendor', 'vendor/plugins/*/lib', 'vendor/plugins/*/test', 'vendor/rails/*/lib', 'vendor/rails/*/test'] + call map(path,'rails#app().path(v:val)') + let &l:path = s:pathjoin('.',[rails#app().path()],path,old_path) endfunction function! s:BufSettings() @@ -4263,11 +4401,11 @@ function! s:BufSettings() return '' endif call s:SetBasePath() - let rp = s:gsub(RailsRoot(),'[ ,]','\\&') + let rp = s:gsub(rails#app().path(),'[ ,]','\\&') let &l:errorformat = s:efm setlocal makeprg=rake if stridx(&tags,rp) == -1 - let &l:tags = &tags . "," . rp . "/tags," . rp . "/.tags" + let &l:tags = rp . "/tmp/tags," . &tags . "," . rp . "/tags" endif if has("gui_win32") || has("gui_running") let code = '*.rb;*.rake;Rakefile' @@ -4286,7 +4424,6 @@ function! s:BufSettings() let &l:suffixesadd=".rb,.".s:gsub(s:view_types,',',',.').",.css,.js,.yml,.csv,.rake,.sql,.html,.xml" if &ft =~ '^\%(e\=ruby\|[yh]aml\|javascript\|css\|sass\)$' setlocal sw=2 sts=2 et - "set include=\\<\\zsAct\\f*::Base\\ze\\>\\\|^\\s*\\(require\\\|load\\)\\s\\+['\"]\\zs\\f\\+\\ze if exists('+completefunc') if &completefunc == '' set completefunc=syntaxcomplete#Complete @@ -4353,13 +4490,17 @@ augroup railsPluginAuto autocmd User BufEnterRails call s:RefreshBuffer() autocmd User BufEnterRails call s:resetomnicomplete() autocmd User BufEnterRails call s:BufDatabase(-1) - autocmd BufWritePost */config/database.yml unlet! s:dbext_type_{s:rv()} " Force reload - autocmd BufWritePost */test/test_helper.rb call s:cacheclear("user_asserts") - autocmd BufWritePost */config/routes.rb call s:cacheclear("named_routes") + 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") + autocmd BufWritePost */config/environments/*.rb call rails#cache_clear("environments") + autocmd BufWritePost */tasks/**.rake call rails#cache_clear("rake_tasks") + 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 @@ -4370,6 +4511,10 @@ let s:sid = s:sub(maparg("<SID>xx"),'xx$','') unmap <SID>xx let s:file = expand('<sfile>:p') +if !exists('s:apps') + let s:apps = {} +endif + " }}}1 let &cpo = s:cpo_save vim/autoload/rails.vim @@ -63,9 +63,9 @@ Rails application development. and several other commands are provided. |rails-navigation| 5. Enhanced syntax highlighting. From has_and_belongs_to_many to - distance_of_time_in_words, it's here. For Vim 7 users, 'completefunc' is - set to enable syntax based completion on |i_CTRL-X_CTRL-U|, making it easy - to complete such long method names. |rails-syntax| + distance_of_time_in_words, it's here. For easy completion of these long + method names, 'completefunc' is set to enable syntax based completion on + |i_CTRL-X_CTRL-U|. |rails-syntax| 6. Interface to script/*. Generally, use ":Rscript about" to call "script/about". Most commands have wrappers with additional features: @@ -80,9 +80,9 @@ Rails application development. |rails-refactoring| 8. Integration with other plugins. |:Rproject| creates a new project.vim - project. |:Rdbext| loads database settings from database.yml for dbext.vim - (and this happens by default under most circumstances). Cream users get - some additional mappings, and all GUI users get a menu. |rails-integration| + project or spawns NERDTree. If dbext.vim is installed, it will be + transparently configured to reflect database.yml. Cream users get some + additional mappings, and all GUI users get a menu. |rails-integration| ============================================================================== INSTALLATION AND USAGE *rails-installation* @@ -92,13 +92,9 @@ directly to |rails-install-plugin| below. Installing and Configuring Vim ~ *rails-install-vim* -Because it is common for users to utilize an older version of Vim that came -installed on a system, rails.vim has a design goal of remaining compatible -with versions of Vim 6.2 and newer. However, if you have a choice in the -matter, you are strongly encouraged to install the latest version available. -Older versions of Vim should work, but increasingly, new plugin features will -require Vim 7 or newer. If possible, install a version of Vim with the |Ruby| -interface compiled in, as a few features will make use of it when available. +Vim 7 or newer is required. If possible, install a version of Vim with the +|Ruby| interface compiled in, as a few features will make use of it when +available. If you are new to Vim, you need to create a vimrc. For Windows, this file goes in ~\_vimrc (try :e ~\_vimrc if you don't know where this is). On other @@ -139,15 +135,23 @@ actually edit a file from a Rails application. application in {directory}, and loads the README. *rails-:Rake* -:Rake {targets} Like calling |:make| {targets} (with 'makeprg' being +:[range]Rake {targets} Like calling |:make| {targets} (with 'makeprg' being rake). However, in some contexts, if {targets} are omitted, :Rake defaults to something sensible (like db:migrate in a migration, or your current test). + In tests (and specs), giving a line argument runs only + the test method (or example) at that line. Use :.Rake + to run the test method at the cursor position. Use + :.Rake inside a self.up or self.down method in a + migration to run the db:migrate:up or db:migrate:down + task for that particular migration. *rails-:Rake!* -:Rake! {targets} Called with a bang, :Rake will use an alternate +:[range]Rake! {targets} Called with a bang, :Rake will use an alternate 'errorformat' which attempts to parse the full stack - backtrace. + backtrace. For purely informative rake tasks (stats, + routes, notes, etc), the preview pane is opened with + the full output of the command. *rails-:Rcd* :Rcd [{directory}] |:cd| to /path/to/railsapp/{directory}. @@ -166,7 +170,10 @@ actually edit a file from a Rails application. |:help| rails. *rails-:Redit* -:Redit {file} Edit {file}, relative to the application root. +:Redit {file} Edit {file}, relative to the application root. Append + :line or #method to jump within the file, as in + :Redit app/controllers/users_controller.rb:12 or + :Redit app/models/user.rb#activate . *rails-:Rlog* :Rlog [{logfile}] Split window and open {logfile} ($RAILS_ENV or @@ -195,8 +202,10 @@ actually edit a file from a Rails application. :Rpreview! [{path}] As with :Rpreview, except :OpenURL is never used. *rails-:Rtags* -:Rtags Calls ctags -R on the current application root. - Exuberant ctags must be installed. +:Rtags Calls ctags -R on the current application root and + writes the result to tmp/tags. Exuberant ctags must + be installed. Additional arguments can be passed to + ctags with |g:rails_ctags_arguments|. *rails-:Rrefresh* :Rrefresh Refreshes certain cached settings. Most noticeably, @@ -237,8 +246,7 @@ The 'path' has been modified to include all the best places to be. < *rails-:Rfind* :Rfind [{file}] Find {file}. Very similar to :find, but things like - BlogController are properly handled, and if - genutils.vim is installed (1.x not 2.x), tab complete + BlogController are properly handled, and tab complete works. The default filename is taken from under the cursor in a manner quite similar to gf, described below. @@ -262,7 +270,7 @@ Example uses of |gf|, and where they might lead. < app/controllers/blog_controller.rb ~ > <%= render :partial => 'sh*ared/sidebar' %> -< app/views/shared/_sidebar.rhtml ~ +< app/views/shared/_sidebar.html.erb ~ > <%= stylesheet_link_tag :scaf*fold %> < public/stylesheets/scaffold.css ~ @@ -277,7 +285,7 @@ Example uses of |gf|, and where they might lead. < test/fixtures/posts.yml ~ > layout :pri*nt -< app/views/layouts/print.rhtml ~ +< app/views/layouts/print.html.erb ~ > <%= link_to "New", new_comme*nt_path %> < app/controllers/comments_controller.rb (jumps to def new) ~ @@ -330,15 +338,17 @@ For the less common cases, a more deliberate set of commands are provided. Each of the following takes an optional argument (with tab completion) but defaults to a reasonable guess that follows Rails conventions. For example, when editing app/models/employee.rb, :Rcontroller will default to -app/controllers/employees_controller.rb. The controller and model options, -ideally set from |rails-modelines|, can override the mapping from model -related files to controller related files (Rset controller=hiring) and vice -versa (Rset model=employee). See |rails-:Rset|. +app/controllers/employees_controller.rb. The controller and model options +can override the mapping from model related files to controller related files +(Rset controller=hiring) and vice versa (Rset model=employee). See +|rails-:Rset|. Each of the following commands has variants for splitting, vertical splitting and opening in a new tab. For :Rmodel, those variants would be :RSmodel, :RVmodel, and :RTmodel. There is also :REmodel which is a synonym for :Rmodel -(future versions might allow customization of the behavior of :Rmodel). +(future versions might allow customization of the behavior of :Rmodel). They +also allow for jumping to methods or line numbers using the same syntax as +|:Redit|. Model Navigation Commands ~ @@ -346,8 +356,7 @@ Model Navigation Commands ~ The default for model navigation commands is the current model, if it can be determined. For example, test/unit/post_test.rb would have a current model of post. Otherwise, if a controller name can be determined, said controller -name will be singularized and used. To override this, use a command or -modeline like: > +name will be singularized and used. To override this, use a command like: > Rset model=comment :Rmodel |rails-:Rmodel| @@ -363,10 +372,9 @@ modeline like: > :Rmigration [{pattern}] If {pattern} is a number, find the migration for that particular set of digits, zero-padding if necessary. Otherwise, find the newest migration containing the - given pattern. The pattern defaults to the current - model name, pluralized. So when editing the Post - model, :Rmigration with no arguments might find - create_posts.rb, or add_date_to_posts.rb. + given pattern. Omitting the pattern selects the + latest migration. Give a numeric argument of 0 to edit + db/schema.rb. *rails-:Robserver* :Robserver [{name}] Find the observer with a name like @@ -386,7 +394,8 @@ modeline like: > between YAML and CSV fixtures. *rails-:Runittest* -:Runittest [{name}] Edit the unit test for the specified model. +:Runittest [{name}] Edit the unit test or model spec for the specified + model. Controller Navigation Commands ~ *rails-controller-navigation* @@ -394,7 +403,7 @@ The default for controller navigation commands is the current controller, if it can be determined. For example, test/functional/blog_test.rb would have a current controller of blog. Otherwise, if a model name can be determined, said model name will be pluralized and used. To override this, use a command -or modeline like: > +like: > Rset controller=blog :Rcontroller |rails-:Rcontroller| @@ -426,11 +435,12 @@ or modeline like: > *rails-:Rapi* :Rapi [{name}] Edit the API for the specified controller. This command is deprecated; add it yourself with - |:Rcommand| if you still desire it. + |:Rnavcommand| if you still desire it. *rails-:Rfunctionaltest* :Rfunctionaltest [{name}] - Edit the functional test for the specified controller. + Edit the functional test or controller spec for the + specified controller. Miscellaneous Navigation Commands ~ *rails-misc-navigation* @@ -442,7 +452,11 @@ The following commands are not clearly associated with models or controllers. :Rplugin |rails-:Rplugin| :Rlib |rails-:Rlib| :Rtask |rails-:Rtask| +:Rmetal |rails-:Rmetal| +:Renvironment |rails-:Renvironment| +:Rinitializer |rails-:Rinitializer| :Rintegrationtest |rails-:Rintegrationtest| +:Rspec |rails-:Rspec| *rails-:Rstylesheet* :Rstylesheet [{name}] Edit the stylesheet for the specified name, defaulting @@ -458,10 +472,11 @@ The following commands are not clearly associated with models or controllers. is omitted, it defaults to init.rb. *rails-:Rlib* -:Rlib {name} Edit the library from the lib directory for the +:Rlib [{name}] Edit the library from the lib directory for the specified name. If the current file is part of a plugin, the libraries from that plugin can be - specified as well. + specified as well. With no argument, defaults to + editing config/routes.rb. *rails-:Rtask* :Rtask [{name}] Edit the .rake file from lib/tasks for the specified @@ -470,11 +485,30 @@ The following commands are not clearly associated with models or controllers. argument is given, either the current plugin's Rakefile or the application Rakefile will be edited. + *rails-:Rmetal* +:Rmetal [{name}] Edit the app/metal file specified. With no argument, + defaults to editing config/boot.rb. + + *rails-:Renvironment* +:Renvironment [{name}] Edit the config/environments file specified. With no + argument, defaults to editing config/environment.rb. + + *rails-:Rinitializer* +:Rinitializer [{name}] Edit the config/initializers file specified. With no + argument, defaults to editing config/routes.rb. + *rails-:Rintegrationtest* :Rintegrationtest [{name}] - Edit the integration test specified. The default - is based on the current controller or model, with no - singularization or pluralization done. + Edit the integration test or cucumber feature + specified. With no argument, defaults to editing + test/test_helper.rb. + + *rails-:Rspec* +:Rspec [{name}] Edit the given spec. With no argument, defaults to + editing spec/spec_helper.rb (If you want to jump to + the spec for the given file, use |:A| instead). This + command is only defined if there is a spec folder in + the root of the application. Custom Navigation Commands ~ *rails-custom-navigation* @@ -483,8 +517,8 @@ It is also possible to create custom navigation commands. This is best done in an initialization routine of some sort (e.g., an autocommand); see |rails-configuration| for details. - *rails-:Rcommand* -:Rcommand [options] {name} [{path} ...] + *rails-:Rnavcommand* +:Rnavcommand [options] {name} [{path} ...] Create a navigation command with the supplied name, looking in the supplied paths, using the supplied options. The -suffix option specifies what @@ -498,13 +532,15 @@ in an initialization routine of some sort (e.g., an autocommand); see model, controller, or both (as with :Rintegrationtest) is used as a default. -:Rcommand is still under development and far from fully documented, but the -following examples should illustrate the basics: -> - Rcommand api app/apis -glob=**/* -suffix=_api.rb - Rcommand config config -glob=*.* -suffix= -default=routes.rb - Rcommand environment config/environments -default=../environment - Rcommand concern app/concerns -glob=**/* + *rails-:Rcommand* +:Rcommand Deprecated alias for |:Rnavcommand| + +Examples: > + Rnavcommand api app/apis -glob=**/* -suffix=_api.rb + Rnavcommand config config -glob=*.* -suffix= -default=routes.rb + Rnavcommand concern app/concerns -glob=**/* + Rnavcommand exemplar test/exemplars spec/exemplars -glob=**/* + \ -default=model() -suffix=_exemplar.rb Finally, one Vim feature that proves helpful in conjunction with all of the above is |CTRL-^|. This keystroke edits the previous file, and is helpful to @@ -519,13 +555,18 @@ A limited amount of completion with <Tab> is supported. *rails-:Rscript* :Rscript {script} {options} - Call ruby script/{script} {options}. + Call ruby script/{script} {options}. Defaults to + calling script/console. *rails-:Rconsole* -:Rconsole {options} Start script/console. On Windows it will be launched - in the background with |!start|. In the terminal - version GNU Screen is used if it is running and - |g:rails_gnu_screen| is set. +:Rconsole {options} Start script/console. This command has been + deprecated for the pragmatic reason of making + |:Rcontroller| easier to tab complete. To compensate + for the eventual disappearance of this command, + |:Rscript| now defaults to calling script/console if + no other arguments are given. (If in spite of this + you still feel you would miss this command, speak up + now!) *rails-:Rrunner* :[range]Rrunner {code} Executes {code} with script/runner. Differs from @@ -546,11 +587,10 @@ A limited amount of completion with <Tab> is supported. *rails-:Rgenerate* :Rgenerate {options} Calls script/generate {options}, and then edits the - first file generated. Respects |g:rails_subversion|. + first file generated. *rails-:Rdestroy* -:Rdestroy {options} Calls script/destroy {options}. Respects - |g:rails_subversion|. +:Rdestroy {options} Calls script/destroy {options}. *rails-:Rserver* :Rserver {options} Launches script/server {options} in the background. @@ -581,7 +621,7 @@ The :Rextract command can be used to extract a partial to a new file. :[range]Rpartial [{controller}/]{name} Deprecated alias for :Rextract. -If this is your file, in app/views/blog/show.rhtml: > +If this is your file, in app/views/blog/show.html.erb: > 1 <div> 2 <h2><%= @post.title %></h2> @@ -598,7 +638,7 @@ Your file will change to this: > 2 <%= render :partial => 'post' %> 3 </div> -And app/views/blog/_post.rhtml will now contain: > +And app/views/blog/_post.html.erb will now contain: > 1 <h2><%= post.title %></h2> 2 <p><%= post.body %></p> @@ -648,34 +688,24 @@ place) are also covered in this section. a new project, with appropriate directories (app, etc., but not vendor). - *rails-:Rproject!* -:Rproject! [{file}] Same as :Rproject, only delete existing project if it - exists and recreate it. The logic to delete the old - project is convoluted and possibly erroneous; report - any problems to the |rails-plugin-author|. A handy - mapping might look something like: > - autocmd User Rails map <buffer> <F6> :Rproject!|silent w<CR> -< As a bonus, this command organizes views into separate - directories for easier navigation. The downside of - this is that you will have to regenerate your project - each time you add another view directory (which is why - this command recreates your project each time!). - *rails-:Rdbext* *rails-dbext* :Rdbext [{environment}] This command is only provided when the |dbext| plugin 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 @@ -722,36 +752,38 @@ core. Supporting plugins and other add-ons to Rails has the potential to rapidly get out of hand. However, a few pragmatic exceptions have been made. *rails-template-types* -Commands like :Rview use a hardwired list of extensions (rhtml, rjs, etc.) +Commands like :Rview use a hardwired list of extensions (erb, rjs, etc.) when searching for files. In order to facilitate working with non-standard template types, several popular extensions are featured in this list, including haml, liquid, and mab (markaby). These extensions will disappear once a related configuration option is added to rails.vim. *rails-rspec* -Support for RSpec is currently experimental and incomplete, with only a -handful of features being implemented. :A knows about specs and will jump to -them, but only if no test file is found. The associated controller or model -of a spec is detected, so all navigation commands should work as expected -inside a spec file. :Rfixtures will find spec fixtures, but the extension is -mandatory and tab completion will not work. :Rake will run the currently -edited spec. - -While there are currently no built-in dedicated RSpec navigation commands, you -can approximate your own with |:Rcommand|. +The presence of a spec directory causes several additional behaviors to +activate. :A knows about specs and will jump to them (but Test::Unit files +still get priority). The associated controller or model of a spec is +detected, so all navigation commands should work as expected inside a spec +file. :Rake in a spec runs just that spec, and in a model, controller, or +helper, runs the associated spec. + +|:Runittest| and |:Rfunctionaltest| lead double lives, handling model and +controller specs respectively. For helper and view specs, you can use +|:Rspec| or define your own navigation commands: > - Rcommand specmodel spec/models -glob=**/* - \ -suffix=_spec.rb -default=model() - Rcommand spechelper spec/helpers -glob=**/* + Rnavcommand spechelper spec/helpers -glob=**/* \ -suffix=_helper_spec.rb -default=controller() - Rcommand speccontroller spec/controllers -glob=**/* - \ -suffix=_controller_spec.rb -default=controller() - Rcommand specview spec/views -glob=**/* -suffix=_view_spec.rb + Rnavcommand specview spec/views -glob=**/* -suffix=_spec.rb < + *rails-merb* +Merb support is a long term possibility. For now, if you touch +config/environment.rb in your Merb application, rails.vim will activate. +Send feedback on what's missing to the |rails-plugin-author| and perhaps one +day Merb can be officially supported. + ============================================================================== ABBREVIATIONS *rails-abbreviations* *rails-snippets* -Abbreviations are still experimental. They may later be extracted into a +Abbreviations are "snippets lite". They may later be extracted into a separate plugin, or removed entirely. *rails-:Rabbrev* @@ -781,7 +813,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. @@ -790,11 +822,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* @@ -815,7 +847,7 @@ they all link by default to railsMethod. If you feel a method has been wrongfully omitted, submit it to the |rails-plugin-author|. - *rails-@params* *rails-syntax-deprecated* + *rails-@params* *rails-syntax-deprecated* Certain deprecated syntax (like @params and render_text) is highlighted as an error. If you trigger this highlighting, generally it means you need to update your code. @@ -843,11 +875,11 @@ syntax group is used. The list of assertions can be refreshed with *rails-syntax-strings* In the following line of code, the "?" in the conditions clause and the "ASC" in the order clause will be highlighted: > - Post.find(:all, :conditions => ["body like ?","%e%"] :order => "title ASC") + Post.find(:all, :conditions => ["body like ?","%e%"], :order => "title ASC") < -A string literal using %Q<> delimiters will have its contents highlighted as -HTML. This is sometimes useful when writing helpers. > - link = %Q<<a href="http://www.vim.org">Vim</a>> +A string literal using %Q<> or %<> delimiters will have its contents +highlighted as HTML. This is sometimes useful when writing helpers. > + link = %<<a href="http://www.vim.org">Vim</a>> < *rails-syntax-yaml* YAML syntax highlighting has been extended to highlight eRuby, which can be @@ -871,7 +903,7 @@ This makes it easy to access a buried file: > :find blog_controller.rb < *rails-'suffixesadd'* *rails-'sua'* -This is filetype dependent, but typically includes .rb, .rhtml, and several +This is filetype dependent, but typically includes .rb, .rake, and several others. This allows shortening the above example: > :find blog_controller < @@ -913,7 +945,7 @@ These are based off the information shown in the 'statusline' (see |rails-'statusline'|), with hyphens changed to periods. A few examples: > autocmd User Rails.controller* iabbr <buffer> wsn wsdl_service_name autocmd User Rails.model.arb* iabbr <buffer> vfo validates_format_of - autocmd User Rails.view.rhtml* imap <buffer> <C-Z> <%= %><C-O>3h + autocmd User Rails.view.erb* imap <buffer> <C-Z> <%= %><C-O>3h End all such Rails autocommands with asterisks, even if you have an exact specification. There is also a filename matching syntax: > autocmd User Rails/db/schema.rb Rset task=db:schema:dump @@ -930,8 +962,7 @@ Rails file is loaded. *config/rails.vim* If you have settings particular to a specific project, they can be put in a config/rails.vim file in the root directory of the application. The file is -sourced in the |sandbox| for security reasons. This only works in Vim 7 or -newer. +sourced in the |sandbox| for security reasons. *rails-:Rset* :Rset {option}[={value}] @@ -939,9 +970,9 @@ newer. called directly, from an autocommand, or from config/rails.vim. -Options may be set set in one of four scopes, which my be indicated by an +Options may be set in one of four scopes, which may be indicated by an optional prefix. These scopes determine how broadly an option will apply. -Generally, the default scope is sufficient +Generally, the default scope is sufficient. Scope Description ~ a: All files in one Rails application @@ -962,11 +993,10 @@ l:preview URL stub for :Rpreview (e.g., blog/show/1) b:task Default task used with :Rake l:related Custom related file for :R, relative to the Rails root a:root_url Root URL for commands like :Rpreview -a:ruby_fork_port Experimental: use ruby_fork on given port to speed things up Examples: > :Rset root_url=http://localhost:12345 - :Rset related=app/views/blog/edit.rhtml preview=blog/edit/1 + :Rset related=app/views/blog/edit.html.erb preview=blog/edit/1 :Rset alternate=app/models/ :Rset l:task=preview " Special pseudo-task for :Rake @@ -977,7 +1007,7 @@ If |g:rails_modelines| is enabled, these options can also be set from modelines near the beginning or end of the file. These modelines will always set buffer-local options; scope should never be specified. Examples: > # Rset task=db:schema:load - <%# Rset alternate=app/views/layouts/application.rhtml %> + <%# Rset alternate=app/views/layouts/application.html.erb %> Modelines can also be local to a method. Example: > def test_comment # rset alternate=app/models/comment.rb @@ -993,8 +1023,9 @@ can be enabled by setting them to 1 in your vimrc, and disabled by setting them to 0. > let g:rails_some_option=1 let g:rails_some_option=0 -Most of these should never need to be used. The few that might be interesting -are |g:rails_expensive|, |g:rails_subversion|, and |g:rails_default_database|. +Most of these seldom need to be used. So seldom, in fact, that you should +notify the |rails-plugin-author| if you find any of them useful, as nearly all +are being considered for removal. *g:loaded_rails* > let g:loaded_rails=1 @@ -1012,8 +1043,13 @@ like table name completion and commands like > :Create database brablog_development :Select * from posts where title like '%Denmark%' Note that dbext is a complicated plugin, and may require additional -configuration. See |dbext| (if installed) and |sql-completion-dynamic| (in -Vim 7). +configuration. See |dbext| (if installed) and |sql-completion-dynamic|. + + *g:rails_ctags_arguments* > + let g:rails_ctags_arguments='--exclude="*.js"' +Additional arguments to pass to ctags from |:Rtags|. Defaults to +'--exclude=facebox.js --exclude="*.*.js"', which attempts to ignore jQuery +plugins that can choke up ctags. *g:rails_default_file* > let g:rails_default_file='config/database.yml' @@ -1071,14 +1107,8 @@ b:rails_url. *g:rails_statusline* > let g:rails_statusline=1 Give a clue in the statusline when this plugin is enabled. Enabled by -default. - - *g:rails_subversion* > - let g:rails_subversion=1 -Automatically add/remove files to the subversion repository for commands like -|:Rgenerate| and |:Rdestroy| (but not |:Rscript|). Ignored when the -application is not part of a subversion repository. Deprecated and disabled -by default. +default. (Does anybody care about this? Years after writing it the author is +beginning to think it is mostly a waste of space.) *g:rails_syntax* > let g:rails_syntax=1 @@ -1106,7 +1136,7 @@ The official homepage is http://rails.vim.tpope.net The latest stable version can be found at http://www.vim.org/scripts/script.php?script_id=1567 -In Vim 7, you can keep up to date with |GetLatestVimScripts|. +You can keep up to date with |GetLatestVimScripts|. The very latest development versions can be retrieved from Git: http://github.com/tpope/vim-rails vim/doc/rails.txt @@ -37,7 +37,7 @@ function! s:error(str) endfunction function! s:autoload(...) - if !exists("g:autoloaded_rails") + if !exists("g:autoloaded_rails") && v:version >= 700 runtime! autoload/rails.vim endif if exists("g:autoloaded_rails") @@ -48,7 +48,11 @@ function! s:autoload(...) endif if !exists("g:rails_no_autoload_warning") let g:rails_no_autoload_warning = 1 - call s:error("Disabling rails.vim: autoload/rails.vim is missing") + if v:version >= 700 + call s:error("Disabling rails.vim: autoload/rails.vim is missing") + else + call s:error("Disabling rails.vim: Vim version 7 or higher required") + endif endif return "" endfunction @@ -62,14 +66,13 @@ function! s:SetOptDefault(opt,val) endif endfunction -call s:SetOptDefault("rails_level",3) call s:SetOptDefault("rails_statusline",1) call s:SetOptDefault("rails_syntax",1) call s:SetOptDefault("rails_mappings",1) call s:SetOptDefault("rails_abbreviations",1) -call s:SetOptDefault("rails_expensive",1+0*(has("win32")||has("win32unix"))) +call s:SetOptDefault("rails_ctags_arguments","--exclude=facebox.js --exclude=\"*.*.js\"") +call s:SetOptDefault("rails_expensive",1) call s:SetOptDefault("rails_dbext",g:rails_expensive) -call s:SetOptDefault("rails_subversion",0) call s:SetOptDefault("rails_default_file","README") call s:SetOptDefault("rails_default_database","") call s:SetOptDefault("rails_root_url",'http://localhost:3000/') @@ -77,9 +80,7 @@ call s:SetOptDefault("rails_modelines",0) call s:SetOptDefault("rails_menu",1) call s:SetOptDefault("rails_gnu_screen",1) call s:SetOptDefault("rails_history_size",5) -call s:SetOptDefault("rails_debug",0) call s:SetOptDefault("rails_generators","controller\nintegration_test\nmailer\nmigration\nmodel\nobserver\nplugin\nresource\nscaffold\nsession_migration") -call s:SetOptDefault("rails_rake_tasks","db:charset\ndb:collation\ndb:create\ndb:create:all\ndb:drop\ndb:drop:all\ndb:fixtures:identify\ndb:fixtures:load\ndb:migrate\ndb:reset\ndb:rollback\ndb:schema:dump\ndb:schema:load\ndb:sessions:clear\ndb:sessions:create\ndb:structure:dump\ndb:test:clone\ndb:test:clone_structure\ndb:test:prepare\ndb:test:purge\ndb:version\ndoc:app\ndoc:clobber_app\ndoc:clobber_plugins\ndoc:clobber_rails\ndoc:plugins\ndoc:rails\ndoc:reapp\ndoc:rerails\nlog:clear\nnotes\nnotes:fixme\nnotes:optimize\nnotes:todo\nrails:freeze:edge\nrails:freeze:gems\nrails:unfreeze\nrails:update\nrails:update:configs\nrails:update:javascripts\nrails:update:scripts\nroutes\nstats\ntest\ntest:functionals\ntest:integration\ntest:plugins\ntest:recent\ntest:uncommitted\ntest:units\ntmp:cache:clear\ntmp:clear\ntmp:create\ntmp:pids:clear\ntmp:sessions:clear\ntmp:sockets:clear") if g:rails_dbext if exists("g:loaded_dbext") && executable("sqlite3") && ! executable("sqlite") " Since dbext can't find it by itself @@ -99,11 +100,15 @@ endfunction function! s:Detect(filename) let fn = substitute(fnamemodify(a:filename,":p"),'\c^file://','','') + let sep = matchstr(fn,'^[^\\/]\{3,\}\zs[\\/]') + if sep != "" + let fn = getcwd().sep.fn + endif if fn =~ '[\/]config[\/]environment\.rb$' 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 @@ -122,7 +127,7 @@ function! s:Detect(filename) return s:BufInit(fn) endif let ofn = fn - let fn = fnamemodify(ofn,':s?\(.*\)[\/]\(app\|config\|db\|doc\|lib\|log\|public\|script\|spec\|test\|tmp\|vendor\)\($\|[\/].*$\)?\1?') + let fn = fnamemodify(ofn,':s?\(.*\)[\/]\(app\|config\|db\|doc\|features\|lib\|log\|public\|script\|spec\|stories\|test\|tmp\|vendor\)\($\|[\/].*$\)?\1?') endwhile return 0 endfunction @@ -144,10 +149,10 @@ augroup railsPluginDetect autocmd FileType netrw if !exists("b:rails_root") | call s:Detect(expand("<afile>:p")) | endif | if exists("b:rails_root") | silent doau User BufEnterRails | endif autocmd BufEnter * if exists("b:rails_root")|silent doau User BufEnterRails|endif autocmd BufLeave * if exists("b:rails_root")|silent doau User BufLeaveRails|endif - autocmd FileType railslog if s:autoload()|call RailslogSyntax()|endif + autocmd Syntax railslog if s:autoload()|call rails#log_syntax()|endif augroup END -command! -bar -bang -nargs=* -complete=dir Rails :if s:autoload()|call RailsNewApp(<bang>0,<f-args>)|endif +command! -bar -bang -nargs=* -complete=dir Rails :if s:autoload()|call rails#new_app_command(<bang>0,<f-args>)|endif " }}}1 " Menus {{{1 @@ -164,6 +169,10 @@ function! s:gsub(str,pat,rep) return substitute(a:str,'\v\C'.a:pat,a:rep,'g') endfunction +function! s:menucmd(priority) + return 'anoremenu <script> '.(exists("$CREAM") ? 87 : '').s:gsub(g:rails_installed_menu,'[^.]','').'.'.a:priority.' ' +endfunction + function! s:CreateMenus() abort if exists("g:rails_installed_menu") && g:rails_installed_menu != "" exe "aunmenu ".s:gsub(g:rails_installed_menu,'\&','') @@ -175,14 +184,14 @@ function! s:CreateMenus() abort else let g:rails_installed_menu = '&Plugin.&Rails' endif + let dots = s:gsub(g:rails_installed_menu,'[^.]','') + let menucmd = s:menucmd(200) if exists("$CREAM") - let menucmd = '87anoremenu <script> ' exe menucmd.g:rails_installed_menu.'.-PSep- :' exe menucmd.g:rails_installed_menu.'.&Related\ file\ :R\ /\ Alt+] :R<CR>' exe menucmd.g:rails_installed_menu.'.&Alternate\ file\ :A\ /\ Alt+[ :A<CR>' exe menucmd.g:rails_installed_menu.'.&File\ under\ cursor\ Ctrl+Enter :Rfind<CR>' else - let menucmd = 'anoremenu <script> ' exe menucmd.g:rails_installed_menu.'.-PSep- :' exe menucmd.g:rails_installed_menu.'.&Related\ file\ :R\ /\ ]f :R<CR>' exe menucmd.g:rails_installed_menu.'.&Alternate\ file\ :A\ /\ [f :A<CR>' @@ -195,36 +204,24 @@ function! s:CreateMenus() abort exe menucmd.g:rails_installed_menu.'.&Other\ files.Application\ &README :find doc/README_FOR_APP<CR>' exe menucmd.g:rails_installed_menu.'.&Other\ files.&Environment :find config/environment.rb<CR>' exe menucmd.g:rails_installed_menu.'.&Other\ files.&Database\ Configuration :find config/database.yml<CR>' - exe menucmd.g:rails_installed_menu.'.&Other\ files.Database\ &Schema :call <SID>findschema()<CR>' + exe menucmd.g:rails_installed_menu.'.&Other\ files.Database\ &Schema :Rmigration 0<CR>' exe menucmd.g:rails_installed_menu.'.&Other\ files.R&outes :find config/routes.rb<CR>' exe menucmd.g:rails_installed_menu.'.&Other\ files.&Test\ Helper :find test/test_helper.rb<CR>' exe menucmd.g:rails_installed_menu.'.-FSep- :' exe menucmd.g:rails_installed_menu.'.Ra&ke\ :Rake :Rake<CR>' - let tasks = g:rails_rake_tasks - while tasks != '' - let task = matchstr(tasks,'.\{-\}\ze\%(\n\|$\)') - let tasks = s:sub(tasks,'.{-}%(\n|$)','') - exe menucmd.g:rails_installed_menu.'.Rake\ &tasks\ :Rake.'.s:sub(s:sub(task,'^[^:]*$','&:all'),':','.').' :Rake '.task.'<CR>' - endwhile - let tasks = g:rails_generators - while tasks != '' - let task = matchstr(tasks,'.\{-\}\ze\%(\n\|$\)') - let tasks = s:sub(tasks,'.{-}%(\n|$)','') - exe menucmd.'<silent> '.g:rails_installed_menu.'.&Generate\ :Rgen.'.s:gsub(task,'_','\\ ').' :call <SID>menuprompt("Rgenerate '.task.'","Arguments for script/generate '.task.': ")<CR>' - exe menucmd.'<silent> '.g:rails_installed_menu.'.&Destroy\ :Rdestroy.'.s:gsub(task,'_','\\ ').' :call <SID>menuprompt("Rdestroy '.task.'","Arguments for script/destroy '.task.': ")<CR>' - endwhile + let menucmd = substitute(menucmd,'200 $','500 ','') exe menucmd.g:rails_installed_menu.'.&Server\ :Rserver.&Start\ :Rserver :Rserver<CR>' exe menucmd.g:rails_installed_menu.'.&Server\ :Rserver.&Force\ start\ :Rserver! :Rserver!<CR>' exe menucmd.g:rails_installed_menu.'.&Server\ :Rserver.&Kill\ :Rserver!\ - :Rserver! -<CR>' - exe menucmd.'<silent> '.g:rails_installed_menu.'.&Evaluate\ Ruby\.\.\.\ :Rp :call <SID>menuprompt("Rp","Code to execute and output: ")<CR>' - exe menucmd.g:rails_installed_menu.'.&Console\ :Rconsole :Rconsole<CR>' + exe substitute(menucmd,'<script>','<script> <silent>','').g:rails_installed_menu.'.&Evaluate\ Ruby\.\.\.\ :Rp :call <SID>menuprompt("Rp","Code to execute and output: ")<CR>' + exe menucmd.g:rails_installed_menu.'.&Console\ :Rscript :Rscript console<CR>' exe menucmd.g:rails_installed_menu.'.&Preview\ :Rpreview :Rpreview<CR>' exe menucmd.g:rails_installed_menu.'.&Log\ file\ :Rlog :Rlog<CR>' - exe s:sub(menucmd,'anoremenu','vnoremenu').' <silent> '.g:rails_installed_menu.'.E&xtract\ as\ partial\ :Rextract :call <SID>menuprompt("'."'".'<,'."'".'>Rextract","Partial name (e.g., template or /controller/template): ")<CR>' + exe substitute(s:sub(menucmd,'anoremenu','vnoremenu'),'<script>','<script> <silent>','').g:rails_installed_menu.'.E&xtract\ as\ partial\ :Rextract :call <SID>menuprompt("'."'".'<,'."'".'>Rextract","Partial name (e.g., template or /controller/template): ")<CR>' exe menucmd.g:rails_installed_menu.'.&Migration\ writer\ :Rinvert :Rinvert<CR>' exe menucmd.' '.g:rails_installed_menu.'.-HSep- :' - exe menucmd.'<silent> '.g:rails_installed_menu.'.&Help\ :help\ rails :if <SID>autoload()<Bar>exe RailsHelpCommand("")<Bar>endif<CR>' - exe menucmd.'<silent> '.g:rails_installed_menu.'.Abo&ut\ :if <SID>autoload()<Bar>exe RailsHelpCommand("about")<Bar>endif<CR>' + exe substitute(menucmd,'<script>','<script> <silent>','').g:rails_installed_menu.'.&Help\ :help\ rails :if <SID>autoload()<Bar>exe RailsHelpCommand("")<Bar>endif<CR>' + exe substitute(menucmd,'<script>','<script> <silent>','').g:rails_installed_menu.'.Abo&ut\ :if <SID>autoload()<Bar>exe RailsHelpCommand("about")<Bar>endif<CR>' let g:rails_did_menus = 1 call s:ProjectMenu() call s:menuBufLeave() @@ -264,6 +261,27 @@ function! s:menuBufEnter() exe 'amenu disable '.menu.'.Migration\ writer' endif call s:ProjectMenu() + silent! exe 'aunmenu '.menu.'.Rake\ tasks' + silent! exe 'aunmenu '.menu.'.Generate' + silent! exe 'aunmenu '.menu.'.Destroy' + if rails#app().cache.needs('rake_tasks') || empty(rails#app().rake_tasks()) + exe substitute(s:menucmd(300),'<script>','<script> <silent>','').g:rails_installed_menu.'.Rake\ &tasks\ :Rake.Fill\ this\ menu :call rails#app().rake_tasks()<Bar>call <SID>menuBufLeave()<Bar>call <SID>menuBufEnter()<CR>' + else + let i = 0 + while i < len(rails#app().rake_tasks()) + let task = rails#app().rake_tasks()[i] + exe s:menucmd(300).g:rails_installed_menu.'.Rake\ &tasks\ :Rake.'.s:sub(task,':',':.').' :Rake '.task.'<CR>' + let i += 1 + endwhile + endif + let i = 0 + let menucmd = substitute(s:menucmd(400),'<script>','<script> <silent>','').g:rails_installed_menu + while i < len(rails#app().generators()) + let generator = rails#app().generators()[i] + exe menucmd.'.&Generate\ :Rgen.'.s:gsub(generator,'_','\\ ').' :call <SID>menuprompt("Rgenerate '.generator.'","Arguments for script/generate '.generator.': ")<CR>' + exe menucmd.'.&Destroy\ :Rdestroy.'.s:gsub(generator,'_','\\ ').' :call <SID>menuprompt("Rdestroy '.generator.'","Arguments for script/destroy '.generator.': ")<CR>' + let i += 1 + endwhile endif endfunction @@ -274,6 +292,12 @@ function! s:menuBufLeave() exe 'amenu enable '.menu.'.Help\ ' exe 'amenu enable '.menu.'.About\ ' exe 'amenu enable '.menu.'.Projects' + silent! exe 'aunmenu '.menu.'.Rake\ tasks' + silent! exe 'aunmenu '.menu.'.Generate' + silent! exe 'aunmenu '.menu.'.Destroy' + exe s:menucmd(300).g:rails_installed_menu.'.Rake\ tasks\ :Rake.-TSep- :' + exe s:menucmd(400).g:rails_installed_menu.'.&Generate\ :Rgen.-GSep- :' + exe s:menucmd(400).g:rails_installed_menu.'.&Destroy\ :Rdestroy.-DSep- :' endif endfunction @@ -285,17 +309,6 @@ function! s:menuprompt(vimcmd,prompt) exe a:vimcmd." ".res endfunction -function! s:findschema() - let env = exists('$RAILS_ENV') ? $RAILS_ENV : "development" - if filereadable(b:rails_root."/db/schema.rb") - edit `=b:rails_root.'/db/schema.rb'` - elseif filereadable(b:rails_root.'/db/'.env.'_structure.sql') - edit `=b:rails_root.'/db/'.env.'_structure.sql'` - else - return s:error("Schema not found: try :Rake db:schema:dump") - endif -endfunction - call s:CreateMenus() augroup railsPluginMenu vim/plugin/rails.vim @@ -64,8 +64,7 @@ command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis " Custom -set noexpandtab shiftwidth=4 tabstop=4 -autocmd FileType ruby,eruby,yaml set et sw=2 sts=2 +set et sw=2 sts=2 " set list " set smartindent set nocp @@ -98,7 +97,14 @@ set directory=/var/tmp nnoremap <C-e> 3<C-e> nnoremap <C-y> 3<C-y> set list -set listchars=tab:→.,trail:·,eol:$ +set listchars=tab:··,trail:·,eol:$ nmap <silent> <leader>s :set nolist!<CR> set shortmess=atI set visualbell + +" Customize here: http://vim.wikia.com/wiki/VimTip24 +let w:m1=matchadd('Search', '\%<81v.\%>77v', -1) +let w:m2=matchadd('ErrorMsg', '\%>80v.\+', -1) +au BufWinEnter * let w:m1=matchadd('Search', '\%<81v.\%>80v', -1) +au BufWinEnter * let w:m2=matchadd('ErrorMsg', '\%>80v.\+', -1) + vimrc @@ -13,6 +13,9 @@ export MANPATH=/usr/local/man:$MANPATH export CODEPATH=~/Documents/Code export GEMPATH=`gem env gemdir` +# export VISUAL="mate -w" +# export EDITOR="vim" + fpath=(~/.zsh/functions $fpath) autoload -U ~/.zsh/functions/*(:t) @@ -37,5 +40,7 @@ setopt RM_STAR_WAIT unsetopt NO_HUP +bindkey '^A' beginning-of-line +bindkey '^E' end-of-line bindkey '^[[5D' backward-word bindkey '^[[5C' forward-word zsh/config e90db8528b3631b0ca8a4c1902f18884b703c5d7 Stephen Celis stephen@stephencelis.com http://github.com/stephencelis/dotfiles/commit/5e314a7d4d4d2bad78187afad3f32f831bb0dbb4 5e314a7d4d4d2bad78187afad3f32f831bb0dbb4 2009-05-14T05:19:51-07:00 2009-05-14T05:19:51-07:00 Assorted updates. fa39b9976c540c32652f94b42a8de39931bd974a Stephen Celis stephen@stephencelis.com