dot.vim/.netrwhist @@ -1,10 +1,10 @@ ScriptId SourceID Filename -------------------------- -1567 10297 :AutoInstall: rails.vim +1567 11481 :AutoInstall: rails.vim 1234 11289 :AutoInstall: yankring.vim 1697 8283 :AutoInstall: surround.vim 2386 9299 :AutoInstall: endwise.vim 23 8319 :AutoInstall: enhcommentify.tar.gz -2423 10964 :AutoInstall: gist.vim +2423 11634 :AutoInstall: gist.vim 2478 9644 :: as3_omnicomplete.vim.zip 1934 7990 :: git-commit.tar dot.vim/GetLatest/GetLatestVimScripts.dat @@ -13,7 +13,7 @@ if &cp || exists("g:autoloaded_rails") finish endif -let g:autoloaded_rails = '3.4' +let g:autoloaded_rails = '4.0' let s:cpo_save = &cpo set cpo&vim @@ -21,6 +21,9 @@ set cpo&vim " Utility Functions {{{1 let s:app_prototype = {} +let s:file_prototype = {} +let s:buffer_prototype = {} +let s:readable_prototype = {} function! s:add_methods(namespace, method_names) for name in a:method_names @@ -139,7 +142,7 @@ function! s:app_find_file(name, ...) dict abort let found = findfile(a:name,path,i) endwhile endif - return found == "" ? found : s:gsub(strpart(fnamemodify(found,':p'),trim),'\\','/') + return found == "" ? default : s:gsub(strpart(fnamemodify(found,':p'),trim),'\\','/') finally let &l:suffixesadd = oldsuffixesadd endtry @@ -178,73 +181,99 @@ function! s:pathjoin(...) abort return substitute(path,'^,','','') endfunction -function! s:endof(lnum) +function! s:readable_end_of(lnum) dict abort if a:lnum == 0 return 0 endif - if &ft == "yaml" || expand("%:e") == "yml" + if self.name() =~# '\.yml$' return -1 endif - let cline = getline(a:lnum) + let cline = self.getline(a:lnum) let spc = matchstr(cline,'^\s*') let endpat = '\<end\>' - if matchstr(getline(a:lnum+1),'^'.spc) && !matchstr(getline(a:lnum+1),'^'.spc.endpat) && matchstr(cline,endpat) + if matchstr(self.getline(a:lnum+1),'^'.spc) && !matchstr(self.getline(a:lnum+1),'^'.spc.endpat) && matchstr(cline,endpat) return a:lnum endif let endl = a:lnum - while endl <= line('$') + while endl <= self.line_count() let endl += 1 - if getline(endl) =~ '^'.spc.endpat + if self.getline(endl) =~ '^'.spc.endpat return endl - elseif getline(endl) =~ '^=begin\>' - while getline(endl) !~ '^=end\>' && endl <= line('$') + elseif self.getline(endl) =~ '^=begin\>' + while self.getline(endl) !~ '^=end\>' && endl <= self.line_count() let endl += 1 endwhile let endl += 1 - elseif getline(endl) !~ '^'.spc && getline(endl) !~ '^\s*\%(#.*\)\=$' + elseif self.getline(endl) !~ '^'.spc && self.getline(endl) !~ '^\s*\%(#.*\)\=$' return 0 endif endwhile return 0 endfunction -function! s:lastopeningline(pattern,limit,...) - let line = a:0 ? a:1 : line(".") - while line > a:limit && getline(line) !~ a:pattern +function! s:endof(lnum) + return rails#buffer().end_of(a:lnum) +endfunction + +function! s:readable_last_opening_line(start,pattern,limit) dict abort + let line = a:start + while line > a:limit && self.getline(line) !~ a:pattern let line -= 1 endwhile - let lend = s:endof(line) - if line > a:limit && (lend < 0 || lend >= (a:0 ? a:1 : line("."))) + let lend = self.end_of(line) + if line > a:limit && (lend < 0 || lend >= a:start) return line else return -1 endif endfunction -function! s:lastmethodline(...) - return s:lastopeningline(&l:define,0,a:0 ? a:1 : line(".")) +function! s:lastopeningline(pattern,limit,start) + return rails#buffer().last_opening_line(a:start,a:pattern,a:limit) endfunction -function! s:lastmethod(...) - let line = s:lastmethodline(a:0 ? a:1 : line(".")) +function! s:readable_define_pattern() dict abort + if self.name() =~ '\.yml$' + return '^\%(\h\k*:\)\@=' + endif + let define = '^\s*def\s\+\(self\.\)\=' + if self.name() =~# '\.rake$' + let define .= "\\\|^\\s*\\%(task\\\|file\\)\\s\\+[:'\"]" + endif + if self.name() =~# '/schema\.rb$' + let define .= "\\\|^\\s*create_table\\s\\+[:'\"]" + endif + return define +endfunction + +function! s:readable_last_method_line(start) dict abort + return self.last_opening_line(a:start,self.define_pattern(),0) +endfunction + +function! s:lastmethodline(start) + return rails#buffer().last_method_line(a:start) +endfunction + +function! s:readable_last_method(start) dict abort + let line = self.last_method_line(a:start) if line - return s:sub(matchstr(getline(line),'\%('.&define.'\)\zs\h\%(\k\|[:.]\)*[?!=]\='),':$','') + return s:sub(matchstr(self.getline(line),'\%('.self.define_pattern().'\)\zs\h\%(\k\|[:.]\)*[?!=]\='),':$','') else return "" endif endfunction -function! s:lastrespondtoline(...) - return s:lastopeningline('\C^\s*respond_to\s*\%(\<do\)\s*|\zs\h\k*\ze|',s:lastmethodline(), a:0 ? a:1 : line(".")) +function! s:lastmethod(...) + return rails#buffer().last_method(a:0 ? a:1 : line(".")) endfunction -function! s:lastformat() - let rline = s:lastrespondtoline() +function! s:readable_last_format(start) dict abort + let rline = self.last_opening_line('\C^\s*respond_to\s*\%(\<do\)\s*|\zs\h\k*\ze|',self.last_method_line(a:start),a:start) if rline - let variable = matchstr(getline(rline),'\C^\s*respond_to\s*\%(\<do\|{\)\s*|\zs\h\k*\ze|') - let line = line('.') + let variable = matchstr(self.getline(rline),'\C^\s*respond_to\s*\%(\<do\|{\)\s*|\zs\h\k*\ze|') + let line = a:start while line > rline - let match = matchstr(getline(line),'\C^\s*'.variable.'\s*\.\s*\zs\h\k*') + let match = matchstr(self.getline(line),'\C^\s*'.variable.'\s*\.\s*\zs\h\k*') if match != '' return match endif @@ -254,11 +283,15 @@ function! s:lastformat() return "" endfunction +function! s:lastformat(start) + return rails#buffer().last_format(a:start) +endfunction + function! s:format(...) if RailsFileType() =~ '^view\>' let format = fnamemodify(RailsFilePath(),':r:e') else - let format = s:lastformat() + let format = rails#buffer().last_format(a:0 > 1 ? a:2 : line(".")) endif if format == '' return get({'rhtml': 'html', 'rxml': 'xml', 'rjs': 'js'},fnamemodify(RailsFilePath(),':e'),a:0 ? a:1 : '') @@ -266,6 +299,8 @@ function! s:format(...) return format endfunction +call s:add_methods('readable',['end_of','last_opening_line','last_method_line','last_method','last_format','define_pattern']) + let s:view_types = 'rhtml,erb,rxml,builder,rjs,mab,liquid,haml,dryml,mn' function! s:viewspattern() @@ -273,11 +308,13 @@ function! s:viewspattern() endfunction function! s:controller(...) - let t = RailsFileType() - let f = RailsFilePath() - let o = s:getopt("controller","lb") - if o != "" - return o + return rails#buffer().controller_name(a:0 ? a:1 : 0) +endfunction + +function! s:readable_controller_name(...) dict abort + let f = self.name() + if has_key(self,'getvar') && self.getvar('rails_controller') != '' + return self.getvar('rails_controller') elseif f =~ '\<app/views/layouts/' return s:sub(f,'.*<app/views/layouts/(.{-})\..*','\1') elseif f =~ '\<app/views/' @@ -300,21 +337,24 @@ function! s:controller(...) return s:sub(f,'.*<components/(.{-})_controller\.rb$','\1') elseif f =~ '\<components/.*\.'.s:viewspattern().'$' return s:sub(f,'.*<components/(.{-})/\k+\.\k+$','\1') - elseif f =~ '\<app/models/.*\.rb$' && t =~ '^model-mailer\>' + elseif f =~ '\<app/models/.*\.rb$' && self.type_name('model-mailer') return s:sub(f,'.*<app/models/(.{-})\.rb$','\1') elseif f =~ '\<public/stylesheets/.*\.css$' return s:sub(f,'.*<public/stylesheets/(.{-})\.css$','\1') elseif a:0 && a:1 - return rails#pluralize(s:model()) + return rails#pluralize(self.model_name()) endif return "" endfunction function! s:model(...) - let f = RailsFilePath() - let o = s:getopt("model","lb") - if o != "" - return o + return rails#buffer().model_name(a:0 ? a:1 : 0) +endfunction + +function! s:readable_model_name(...) dict abort + let f = self.name() + if has_key(self,'getvar') && self.getvar('rails_model') != '' + return self.getvar('rails_model') elseif f =~ '\<app/models/.*_observer.rb$' return s:sub(f,'.*<app/models/(.*)_observer\.rb$','\1') elseif f =~ '\<app/models/.*\.rb$' @@ -327,16 +367,20 @@ function! s:model(...) return s:sub(f,'.*<spec/models/(.*)_spec\.rb$','\1') elseif f =~ '\<\%(test\|spec\)/fixtures/.*\.\w*\~\=$' return rails#singularize(s:sub(f,'.*<%(test|spec)/fixtures/(.*)\.\w*\~=$','\1')) + elseif f =~ '\<\%(test\|spec\)/blueprints/.*\.rb$' + return s:sub(f,'.*<%(test|spec)/blueprints/(.{-})%(_blueprint)=\.rb$','\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 f =~ '\<\%(test/\|spec/\)\=factories/.*\.rb$' + return s:sub(f,'.*<%(test/|spec/)=factories/(.{-})%(_factory)=\.rb$','\1') elseif a:0 && a:1 - return rails#singularize(s:controller()) + return rails#singularize(self.controller_name()) endif return "" endfunction +call s:add_methods('readable',['controller_name','model_name']) + function! s:readfile(path,...) let nr = bufnr('^'.a:path.'$') if nr < 0 && exists('+shellslash') && ! &shellslash @@ -353,6 +397,39 @@ function! s:readfile(path,...) endif endfunction +function! s:file_lines() dict abort + let ftime = getftime(self.path) + if ftime > get(self,last_lines_ftime,0) + let self.last_lines = readfile(self.path()) + let self.last_lines_ftime = ftime + endif + return get(self,'last_lines',[]) +endfunction + +function! s:file_getline(lnum,...) dict abort + if a:0 + return self.lines[lnum-1 : a:1-1] + else + return self.lines[lnum-1] + endif +endfunction + +function! s:buffer_lines() dict abort + return self.getline(1,'$') +endfunction + +function! s:buffer_getline(...) dict abort + if a:0 == 1 + return get(call('getbufline',[self.number()]+a:000),0,'') + else + return call('getbufline',[self.number()]+a:000) + endif +endfunction + +function! s:readable_line_count() dict abort + return len(self.lines()) +endfunction + function! s:environment() if exists('$RAILS_ENV') return $RAILS_ENV @@ -389,6 +466,16 @@ function! s:debug(str) endif endfunction +function! s:buffer_getvar(varname) dict abort + return getbufvar(self.number(),a:varname) +endfunction + +function! s:buffer_setvar(varname, val) dict abort + return setbufvar(self.number(),a:varname,a:val) +endfunction + +call s:add_methods('buffer',['getvar','setvar']) + " }}}1 " "Public" Interface {{{1 @@ -421,7 +508,7 @@ function! rails#singularize(word) let word = s:sub(word,'ves$','fs') let word = s:sub(word,'ss%(es)=$','sss') let word = s:sub(word,'s$','') - let word = s:sub(word,'%(tatus|lias)\zse$','') + let word = s:sub(word,'%([nrt]ch|tatus|lias)\zse$','') let word = s:sub(word,'%(nd|rt)\zsice$','ex') return word endfunction @@ -447,6 +534,23 @@ function! rails#app(...) return get(s:apps,root,0) endfunction +function! rails#buffer(...) + return extend(extend({'#': bufnr(a:0 ? a:1 : '%')},s:buffer_prototype,'keep'),s:readable_prototype,'keep') + endif +endfunction + +function! s:buffer_app() dict abort + if self.getvar('rails_root') != '' + return rails#app(self.getvar('rails_root')) + else + return 0 + endif +endfunction + +function! s:readable_app() dict abort + return self._app +endfunction + function! RailsRevision() return 1000*matchstr(g:autoloaded_rails,'^\d\+')+matchstr(g:autoloaded_rails,'[1-9]\d*$') endfunction @@ -459,29 +563,53 @@ function! RailsRoot() endif endfunction -function! RailsFilePath() - if !exists("b:rails_root") - return "" - elseif exists("b:rails_file_path") - return b:rails_file_path - endif - let f = s:gsub(expand('%:p'),'\\ @!','/') +function! s:app_file(name) + return extend(extend({'_app': self, '_name': a:name}, s:file_prototype,'keep'),s:readable_prototype,'keep') +endfunction + +function! s:file_path() dict abort + return self.app().path(self._name) +endfunction + +function! s:file_name() dict abort + return self._name +endfunction + +function! s:buffer_number() dict abort + return self['#'] +endfunction + +function! s:buffer_path() dict abort + return s:gsub(fnamemodify(bufname(self.number()),':p'),'\\ @!','/') +endfunction + +function! s:buffer_name() dict abort + let app = self.app() + let f = s:gsub(fnamemodify(bufname(self.number()),':p'),'\\ @!','/') let f = s:sub(f,'/$','') 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) + if s:startswith(f,s:gsub(app.path(),'\\ @!','/')) || f == "" + return strpart(f,strlen(app.path())+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!") + call s:warn("File ".f." does not appear to be under the Rails root ".self.app().path().". Please report to the rails.vim author!") endif return f endif endfunction +function! RailsFilePath() + if !exists("b:rails_root") + return "" + else + return rails#buffer().name() + endif +endfunction + function! RailsFile() return RailsFilePath() endfunction @@ -489,18 +617,16 @@ endfunction function! RailsFileType() if !exists("b:rails_root") return "" - elseif exists("b:rails_cached_file_type") - return b:rails_cached_file_type else - return rails#app().calculate_file_type(RailsFilePath()) - endif + return rails#buffer().type_name() + end endfunction -function! s:app_calculate_file_type(path) dict - let f = a:path +function! s:readable_calculate_file_type() dict abort + let f = self.name() let e = fnamemodify(f,':e') - let r = "" - let full_path = self.path(f) + let r = "-" + let full_path = self.path() let nr = bufnr('^'.full_path.'$') if nr < 0 && exists('+shellslash') && ! &shellslash let nr = bufnr('^'.s:gsub(full_path,'/','\\').'$') @@ -581,7 +707,11 @@ function! s:app_calculate_file_type(path) dict let r = "task" elseif f =~ '\<log/.*\.log$' let r = "log" - elseif e == "css" || e == "js" || e == "html" + elseif e == "css" || e == "sass" + let r = "stylesheet-".e + elseif e == "js" + let r = "javascript" + elseif e == "html" let r = e elseif f =~ '\<config/routes\>.*\.rb$' let r = "config-routes" @@ -591,6 +721,27 @@ function! s:app_calculate_file_type(path) dict return r endfunction +function! s:buffer_type_name(...) dict abort + let type = getbufvar(self.number(),'rails_cached_file_type') + if type == '' + let type = self.calculate_file_type() + endif + return call('s:match_type',[type == '-' ? '' : type] + a:000) +endfunction + +function! s:readable_type_name() dict abort + let type = self.calculate_file_type() + return call('s:match_type',[type == '-' ? '' : type] + a:000) +endfunction + +function! s:match_type(type,...) + if a:0 + return !empty(filter(copy(a:000),'a:type =~# "^".v:val."\\>"')) + else + return a:type + endif +endfunction + function! s:app_environments() dict if self.cache.needs('environments') call self.cache.set('environments',self.relglob('config/environments/','**/*','.rb')) @@ -598,6 +749,14 @@ function! s:app_environments() dict return copy(self.cache.get('environments')) endfunction +function! s:app_default_locale() dict abort + if self.cache.needs('default_locale') + let candidates = map(filter(s:readfile(self.path('config/environment.rb')),'v:val =~ "^ *config.i18n.default_locale = :[\"'']\\=[A-Za-z-]\\+[\"'']\\= *$"'),'matchstr(v:val,"[A-Za-z-]\\+[\"'']\\= *$")') + call self.cache.set('default_locale',get(candidates,0,'en')) + endif + return self.cache.get('default_locale') +endfunction + function! s:app_has(feature) dict let map = { \'test': 'test/', @@ -620,7 +779,10 @@ 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']) +call s:add_methods('app',['default_locale','environments','file','has','test_suites']) +call s:add_methods('file',['path','name','lines','getline']) +call s:add_methods('buffer',['app','number','path','name','lines','getline','type_name']) +call s:add_methods('readable',['app','calculate_file_type','type_name','line_count']) " }}}1 " Ruby Execution {{{1 @@ -685,16 +847,6 @@ endfunction 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 - " }}}1 " Commands {{{1 @@ -737,19 +889,19 @@ function! s:BufCommands() \ exe RailsHelpCommand(<q-args>) | \ 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=? Rproject :call s:Project(<bang>0,<q-args>) - elseif exists(":NERDTree") - command! -buffer -bar -nargs=? Rproject :NERDTree `=rails#app().path()` + if exists(":NERDTree") + command! -buffer -bar -nargs=? -complete=customlist,s:Complete_cd Rtree :NERDTree `=rails#app().path(<f-args>)` + elseif exists(":Project") + command! -buffer -bar -nargs=? Rtree :call s:Project(<bang>0,<q-args>) endif + command! -buffer -bar -nargs=? Rproject :call s:warn("Warning: :Rproject has been deprecated in favor of :Rtree") | Rtree<bang> <args> if exists("g:loaded_dbext") - 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 + command! -buffer -bar -nargs=? -complete=customlist,s:Complete_environments Rdbext :call s:BufDatabase(2,<q-args>)|let b:dbext_buffer_defaulted = 1 endif let ext = expand("%:e") if ext =~ s:viewspattern() " TODO: complete controller names with trailing slashes here 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$' command! -buffer -bar Rinvert :call s:Invert(<bang>0) @@ -803,8 +955,13 @@ endfunction function! rails#new_app_command(bang,...) if a:0 == 0 - if a:bang - echo "rails.vim version ".g:autoloaded_rails + let msg = "rails.vim ".g:autoloaded_rails + if a:bang && exists('b:rails_root') && RailsFileType() == '' + echo msg." (Rails)" + elseif a:bang && exists('b:rails_root') + echo msg." (Rails-".RailsFileType().")" + elseif a:bang + echo msg else !rails endif @@ -858,7 +1015,7 @@ endfunction call s:add_methods('app',['tags_command']) function! s:Refresh(bang) - if exists("g:rubycomplete_rails") && g:rubycomplete_rails && has("ruby") + if exists("g:rubycomplete_rails") && g:rubycomplete_rails && has("ruby") && exists('g:rubycomplete_completions') silent! ruby ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) silent! ruby if defined?(ActiveSupport::Dependencies); ActiveSupport::Dependencies.clear; elsif defined?(Dependencies); Dependencies.clear; end if a:bang @@ -920,75 +1077,25 @@ endfunction call s:add_methods('app', ['rake_tasks']) -" Current directory -let s:efm='%D(in\ %f),' -" Failure and Error headers, start a multiline message -let s:efm=s:efm - \.'%A\ %\\+%\\d%\\+)\ Failure:,' - \.'%A\ %\\+%\\d%\\+)\ Error:,' - \.'%+A'."'".'%.%#'."'".'\ FAILED,' -" Exclusions -let s:efm=s:efm - \.'%C%.%#(eval)%.%#,' - \.'%C-e:%.%#,' - \.'%C%.%#/lib/gems/%\\d.%\\d/gems/%.%#,' - \.'%C%.%#/lib/ruby/%\\d.%\\d/%.%#,' - \.'%C%.%#/vendor/rails/%.%#,' -" Specific to template errors -let s:efm=s:efm - \.'%C\ %\\+On\ line\ #%l\ of\ %f,' - \.'%CActionView::TemplateError:\ compile\ error,' -" stack backtrace is in brackets. if multiple lines, it starts on a new line. -let s:efm=s:efm - \.'%Ctest_%.%#(%.%#):%#,' - \.'%C%.%#\ [%f:%l]:,' - \.'%C\ \ \ \ [%f:%l:%.%#,' - \.'%C\ \ \ \ %f:%l:%.%#,' - \.'%C\ \ \ \ \ %f:%l:%.%#]:,' - \.'%C\ \ \ \ \ %f:%l:%.%#,' -" Catch all -let s:efm=s:efm - \.'%Z%f:%l:\ %#%m,' - \.'%Z%f:%l:,' - \.'%C%m,' -" Syntax errors in the test itself -let s:efm=s:efm - \.'%.%#.rb:%\\d%\\+:in\ `load'."'".':\ %f:%l:\ syntax\ error\\\, %m,' - \.'%.%#.rb:%\\d%\\+:in\ `load'."'".':\ %f:%l:\ %m,' -" And required files -let s:efm=s:efm - \.'%.%#:in\ `require'."'".':in\ `require'."'".':\ %f:%l:\ syntax\ error\\\, %m,' - \.'%.%#:in\ `require'."'".':in\ `require'."'".':\ %f:%l:\ %m,' -" Exclusions -let s:efm=s:efm - \.'%-G%.%#/lib/gems/%\\d.%\\d/gems/%.%#,' - \.'%-G%.%#/lib/ruby/%\\d.%\\d/%.%#,' - \.'%-G%.%#/vendor/rails/%.%#,' - \.'%-G%.%#%\\d%\\d:%\\d%\\d:%\\d%\\d%.%#,' -" Final catch all for one line errors -let s:efm=s:efm - \.'%-G%\\s%#from\ %.%#,' - \.'%f:%l:\ %#%m,' -" Drop everything else -let s:efm=s:efm - \.'%-G%.%#' - 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,bang,...) - if &efm == s:efm - 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 = rails#app().ruby_shell_command(a:arg) - exe 'make'.(a:bang ? '!' : '') - let &l:makeprg = old_make + try + let &l:makeprg = rails#app().ruby_shell_command(a:arg) + exe 'make'.(a:bang ? '!' : '') + if !a:bang + cwindow + endif + finally + let &l:makeprg = old_make + endtry endfunction function! s:Rake(bang,lnum,arg) @@ -1000,7 +1107,7 @@ function! s:Rake(bang,lnum,arg) if &l:makeprg !~# 'rake' let &l:makeprg = 'rake' endif - let &l:errorformat = a:bang ? s:efm_backtrace : s:efm + let &l:errorformat = s:efm_backtrace let t = RailsFileType() let arg = a:arg if &filetype == "ruby" && arg == '' && g:rails_modelines @@ -1018,7 +1125,7 @@ function! s:Rake(bang,lnum,arg) if opt != '' let arg = opt else - let arg = s:default_rake_task(lnum) + let arg = rails#buffer().default_rake_task(lnum) endif endif let withrubyargs = '-r ./config/boot -r '.s:rquote(self.path('config/environment')).' -e "puts \%((in \#{Dir.getwd}))" ' @@ -1026,15 +1133,15 @@ function! s:Rake(bang,lnum,arg) 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 + exe 'make! '.arg call s:pop_command() - if a:bang - copen + if !a:bang + cwindow endif - elseif arg =~# '^\%(stats\|routes\|secret\|time:zones\|db:\%(charset\|collation\|fixtures:identify\>.*\|version\)\)\%(:\|$\)' + 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 + exe 'make! '.arg + if !a:bang copen endif elseif arg =~ '^preview\>' @@ -1063,7 +1170,10 @@ function! s:Rake(bang,lnum,arg) let arg = s:sub(arg,'#(\w+[?!=]=)$',' -- -n\1') call s:makewithruby(withrubyargs.'-r'.arg,a:bang,arg !~# '_\%(spec\|test\)\.rb$') else - exe 'make'.(a:bang ? '!' : '').' '.arg + exe 'make! '.arg + if !a:bang + cwindow + endif endif finally let &l:errorformat = old_errorformat @@ -1071,27 +1181,35 @@ function! s:Rake(bang,lnum,arg) endtry endfunction -function! s:default_rake_task(lnum) - let self = rails#app() - let t = RailsFileType() +function! s:readable_default_rake_task(lnum) dict abort + let app = self.app() + let t = self.type_name() let lnum = a:lnum < 0 ? 0 : a:lnum - if t =~ '^config-routes\>' + if self.getline(lnum) =~# '# rake ' + return matchstr(self.getline(lnum),'\C# rake \zs.*') + elseif self.getline(self.last_method_line(lnum)-1) =~# '# rake ' + return matchstr(self.getline(self.last_method_line(lnum)-1),'\C# rake \zs.*') + elseif self.getline(self.last_method_line(lnum)) =~# '# rake ' + return matchstr(self.getline(self.last_method_line(lnum)),'\C# rake \zs.*') + elseif self.getline(1) =~# '# rake ' && !lnum + return matchstr(self.getline(1),'\C# rake \zs.*') + elseif t =~ '^config-routes\>' return 'routes' elseif t =~ '^fixtures-yaml\>' && lnum - return "db:fixtures:identify LABEL=".s:lastmethod(lnum) + return "db:fixtures:identify LABEL=".self.last_method(lnum) elseif t =~ '^fixtures\>' && lnum == 0 - return "db:fixtures:load FIXTURES=".s:sub(fnamemodify(RailsFilePath(),':r'),'^.{-}/fixtures/','') + return "db:fixtures:load FIXTURES=".s:sub(fnamemodify(self.name(),':r'),'^.{-}/fixtures/','') elseif t =~ '^task\>' - let mnum = s:lastmethodline(lnum) + let mnum = self.last_method_line(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\)\>' - return s:lastmethod(a:lnum) + return self.last_method(a:lnum) else - return '' + return matchstr(self.getline(1),'\C# rake \zs.*') endif elseif t =~ '^spec\>' - if RailsFilePath() =~# '\<spec/spec_helper\.rb$' + if self.name() =~# '\<spec/spec_helper\.rb$' return 'spec SPEC_OPTS=' elseif lnum > 0 return 'spec SPEC="%:p" SPEC_OPTS=--line='.lnum @@ -1099,7 +1217,7 @@ function! s:default_rake_task(lnum) return 'spec SPEC="%:p" SPEC_OPTS=' endif elseif t =~ '^test\>' - let meth = s:lastmethod(lnum) + let meth = self.last_method(lnum) if meth =~ '^test_' let call = " -n".meth."" else @@ -1107,15 +1225,15 @@ function! s:default_rake_task(lnum) endif if t =~ '^test-\%(unit\|functional\|integration\)$' return s:sub(s:gsub(t,'-',':'),'unit$|functional$','&s')." TEST=\"%:p\"".s:sub(call,'^ ',' TESTOPTS=') - elseif RailsFilePath() =~# '\<test/test_helper\.rb$' + elseif self.name() =~# '\<test/test_helper\.rb$' return 'test' else 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_') + elseif t=~ '^\%(db-\)\=migration\>' && self.name() !~# '\<db/schema\.rb$' + let ver = matchstr(self.name(),'\<db/migrate/0*\zs\d*\ze_') if ver != "" - let method = s:lastmethod(lnum) + let method = self.last_method(lnum) if method == "down" return "db:migrate:down VERSION=".ver elseif method == "up" @@ -1128,26 +1246,36 @@ function! s:default_rake_task(lnum) else return 'db:migrate' endif - elseif self.has('spec') && RailsFilePath() =~# '^app/.*\.rb' && self.has_file(s:sub(RailsFilePath(),'^app/(.*)\.rb$','spec/\1_spec.rb')) + elseif self.name() =~# '\<db/seeds\.rb$' + return 'db:seed' + elseif self.type_name('controller') && lnum + let lm = self.last_method(lnum) + if lm != '' + " rake routes doesn't support ACTION... yet... + return 'routes CONTROLLER='.self.controller_name().' ACTION='.lm + else + return 'routes CONTROLLER='.self.controller_name() + endif + elseif app.has('spec') && self.name() =~# '^app/.*\.rb' && app.has_file(s:sub(self.name(),'^app/(.*)\.rb$','spec/\1_spec.rb')) return 'spec SPEC="%:p:r:s?[\/]app[\/]?/spec/?_spec.rb" SPEC_OPTS=' elseif t=~ '^model\>' return 'test:units TEST="%:p:r:s?[\/]app[\/]models[\/]?/test/unit/?_test.rb"' elseif t=~ '^api\>' return 'test:units TEST="%:p:r:s?[\/]app[\/]apis[\/]?/test/functional/?_test.rb"' elseif t=~ '^\<\%(controller\|helper\|view\)\>' - if RailsFilePath() =~ '\<app/' && s:controller() !~# '^\%(application\)\=$' - return 'test:functionals TEST="'.s:escarg(self.path('test/functional/'.s:controller().'_controller_test.rb')).'"' + if self.name() =~ '\<app/' && s:controller() !~# '^\%(application\)\=$' + return 'test:functionals TEST="'.s:escarg(app.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 + return 'cucumber FEATURE="%:p":'.lnum else - return 'features FEATURE="%:p"' + return 'cucumber FEATURE="%:p"' endif elseif t =~ '^cucumber\>' - return 'features' + return 'cucumber' else return '' endif @@ -1157,6 +1285,8 @@ function! s:Complete_rake(A,L,P) return s:completion_filter(rails#app().rake_tasks(),a:A) endfunction +call s:add_methods('readable',['default_rake_task']) + " }}}1 " Preview {{{1 @@ -1172,10 +1302,8 @@ function! s:initOpenURL() endif endfunction -" This returns the URI with a trailing newline if it is found -function! s:scanlineforuri(lnum) - let line = getline(a:lnum) - let url = matchstr(line,"\\v\\C%(%(GET|PUT|POST|DELETE)\\s+|\w+:/)/[^ \n\r\t<>\"]*[^] .,;\n\r\t<>\":]") +function! s:scanlineforuris(line) + let url = matchstr(a:line,"\\v\\C%(%(GET|PUT|POST|DELETE)\\s+|\w+:/)/[^ \n\r\t<>\"]*[^] .,;\n\r\t<>\":]") if url =~ '\C^\u\+\s\+' let method = matchstr(url,'^\u\+') let url = matchstr(url,'\s\+\zs.*') @@ -1184,43 +1312,45 @@ function! s:scanlineforuri(lnum) endif endif if url != "" - return s:sub(url,'^/','') . "\n" + return [url] else - return "" + return [] endif endfunction -function! s:defaultpreview(lnum) - let ret = '' - 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(a:lnum) - 1 - if start + 1 - while getline(start) =~ '^\s*\%(#.*\)\=$' - let ret = s:scanlineforuri(start).ret - let start -= 1 - endwhile - let ret .= s:controller().'/'.s:lastmethod(a:lnum).'/' - else - let ret .= s:controller().'/' - endif - elseif s:getopt('preview','b') != '' - let ret = s:getopt('preview','b') - elseif RailsFileType() =~ '^view\%(-partial\|-layout\)\@!' - let ret .= s:controller().'/'.expand('%:t:r:r').'/' +function! s:readable_preview_urls(lnum) dict abort + let urls = [] + let start = self.last_method_line(a:lnum) - 1 + while start > 0 && self.getline(start) =~ '^\s*\%(\%(-\=\|<%\)#.*\)\=$' + let urls = s:scanlineforuris(self.getline(start)) + urls + let start -= 1 + endwhile + let start = 1 + while start < self.line_count() && self.getline(start) =~ '^\s*\%(\%(-\=\|<%\)#.*\)\=$' + let urls += s:scanlineforuris(self.getline(start)) + let start += 1 + endwhile + if has_key(self,'getvar') && self.getvar('rails_preview') != '' + let url += [self.getvar('rails_preview')] + end + if self.name() =~ '^public/stylesheets/sass/' + let urls = urls + [s:sub(s:sub(self.name(),'^public/stylesheets/sass/','/stylesheets/'),'\.sass$','.css')] + elseif self.name() =~ '^public/' + let urls = urls + [s:sub(self.name(),'^public','')] + elseif self.controller_name() != '' && self.controller_name() != 'application' + if self.type_name('controller') && self.last_method(a:lnum) != '' + let urls += ['/'.self.controller_name().'/'.self.last_method(a:lnum).'/'] + elseif self.type_name('controller','view-layout','view-partial') + let urls += ['/'.self.controller_name().'/'] + elseif self.type_name('view') + let urls += ['/'.s:controller().'/'.fnamemodify(self.name(),':t:r:r').'/'] endif - elseif s:getopt('preview','b') != '' - let uri = s:getopt('preview','b') - elseif RailsFilePath() =~ '^public/' - let ret = s:sub(RailsFilePath(),'^public/','') - elseif s:getopt('preview','ag') != '' - let ret = s:getopt('preview','ag') endif - return ret + return urls endfunction +call s:add_methods('readable',['preview_urls']) + function! s:Preview(bang,lnum,arg) let root = s:getopt("root_url") if root == '' @@ -1232,7 +1362,7 @@ function! s:Preview(bang,lnum,arg) elseif a:arg != '' let uri = root.'/'.s:sub(a:arg,'^/','') else - let uri = matchstr(s:defaultpreview(a:lnum),'.\{-\}\%(\n\@=\|$\)') + let uri = get(rails#buffer().preview_urls(a:lnum),0,'') let uri = root.'/'.s:sub(s:sub(uri,'^/',''),'/$','') endif call s:initOpenURL() @@ -1262,7 +1392,7 @@ function! s:Preview(bang,lnum,arg) endfunction function! s:Complete_preview(A,L,P) - return split(s:defaultpreview(a:L =~ '^\d' ? matchstr(a:L,'^\d\+') : line('.')),"\n") + return rails#buffer().preview_urls(a:L =~ '^\d' ? matchstr(a:L,'^\d\+') : line('.')) endfunction " }}}1 @@ -1270,7 +1400,6 @@ endfunction function! s:BufScriptWrappers() 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>) @@ -1446,7 +1575,7 @@ function! s:Complete_script(ArgLead,CmdLine,P) return s:modelList(a:ArgLead,"","") elseif target ==# 'migration' || target ==# 'session_migration' return s:migrationList(a:ArgLead,"","") - elseif target ==# 'integration_test' || target ==# 'feature' + elseif target ==# 'integration_test' || target ==# 'integration_spec' || target ==# 'feature' return s:integrationtestList(a:ArgLead,"","") elseif target ==# 'observer' let observers = s:observerList("","","") @@ -1508,31 +1637,34 @@ endfunction " Navigation {{{1 function! s:BufNavCommands() - 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>) + 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(<count>,'<bang>' ,<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find REfind :call s:Find(<count>,'E<bang>',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find RSfind :call s:Find(<count>,'S<bang>',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find RVfind :call s:Find(<count>,'V<bang>',<f-args>) + command! -buffer -bar -nargs=* -count=1 -complete=customlist,s:Complete_find RTfind :call s:Find(<count>,'T<bang>',<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(<count>,'<bang>' ,<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit REedit :call s:Edit(<count>,'E<bang>',<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit RSedit :call s:Edit(<count>,'S<bang>',<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit RVedit :call s:Edit(<count>,'V<bang>',<f-args>) + command! -buffer -bar -nargs=* -bang -complete=customlist,s:Complete_edit RTedit :call s:Edit(<count>,'T<bang>',<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_edit RDedit :call s:Edit(<count>,'<line1>D<bang>',<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related A :call s:Alternate('<bang>', <line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related AE :call s:Alternate('E<bang>',<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related AS :call s:Alternate('S<bang>',<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related AV :call s:Alternate('V<bang>',<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related AT :call s:Alternate('T<bang>',<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related AD :call s:Alternate('D<bang>',<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related AN :call s:Related('<bang>' ,<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related R :call s:Related('<bang>' ,<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related RE :call s:Related('E<bang>',<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related RS :call s:Related('S<bang>',<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related RV :call s:Related('V<bang>',<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related RT :call s:Related('T<bang>',<line1>,<line2>,<count>,<f-args>) + command! -buffer -bar -nargs=* -range=0 -complete=customlist,s:Complete_related RD :call s:Related('D<bang>',<line1>,<line2>,<count>,<f-args>) endfunction function! s:djump(def) @@ -1563,8 +1695,7 @@ function! s:djump(def) endif endfunction -function! s:Find(bang,count,arg,...) - let cmd = a:arg . (a:bang ? '!' : '') +function! s:Find(count,cmd,...) let str = "" if a:0 let i = 1 @@ -1584,11 +1715,10 @@ function! s:Find(bang,count,arg,...) let file = s:RailsFind() let tail = "" endif - call s:findedit((a:count==1?'' : a:count).cmd,file.tail,str) + call s:findedit((a:count==1?'' : a:count).a:cmd,file.tail,str) endfunction -function! s:Edit(bang,count,arg,...) - let cmd = a:arg . (a:bang ? '!' : '') +function! s:Edit(count,cmd,...) if a:0 let str = "" let i = 1 @@ -1597,9 +1727,9 @@ function! s:Edit(bang,count,arg,...) let i += 1 endwhile let file = a:{i} - call s:findedit(s:editcmdfor(cmd),file,str) + call s:findedit(s:editcmdfor(a:cmd),file,str) else - exe s:editcmdfor(cmd) + exe s:editcmdfor(a:cmd) endif endfunction @@ -1731,7 +1861,7 @@ 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'),'^/','') + let res = s:sub(s:findfromview('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') @@ -1746,12 +1876,15 @@ 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 @@ -1891,11 +2024,11 @@ endfunction function! s:addfilecmds(type) let l = s:sub(a:type,'^.','\l&') - let cmds = 'ESVT ' + let cmds = 'ESVTD ' let cmd = '' while cmds != '' 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>)' + exe "command! -buffer -bar ".(cmd == 'D' ? '-range=0 ' : '')."-nargs=*".cplt." R".cmd.l." :call s:".l.'Edit("'.(cmd == 'D' ? '<line1>' : '').cmd.'<bang>",<f-args>)' let cmd = strpart(cmds,0,1) let cmds = strpart(cmds,1) endwhile @@ -1903,7 +2036,6 @@ endfunction function! s:BufFinderCommands() 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") @@ -1911,14 +2043,14 @@ function! s:BufFinderCommands() call s:addfilecmds("migration") call s:addfilecmds("observer") call s:addfilecmds("helper") - call s:addfilecmds("api") call s:addfilecmds("layout") call s:addfilecmds("fixtures") + call s:addfilecmds("locale") 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') + if rails#app().has('test') || rails#app().has('spec') || rails#app().has('cucumber') call s:addfilecmds("integrationtest") endif if rails#app().has('spec') @@ -2035,6 +2167,10 @@ function! s:fixturesList(A,L,P) return s:completion_filter(rails#app().relglob("test/fixtures/","**/*")+rails#app().relglob("spec/fixtures/","**/*"),a:A) endfunction +function! s:localeList(A,L,P) + return s:completion_filter(rails#app().relglob("config/locales/","**/*"),a:A) +endfunction + function! s:migrationList(A,L,P) if a:A =~ '^\d' let migrations = rails#app().relglob("db/migrate/",a:A."[0-9_]*",".rb") @@ -2046,10 +2182,6 @@ function! s:migrationList(A,L,P) endif endfunction -function! s:apiList(A,L,P) - return s:autocamelize(rails#app().relglob("app/apis/","**/*","_api.rb"),a:A) -endfunction - function! s:unittestList(A,L,P) let found = [] if rails#app().has('test') @@ -2073,14 +2205,20 @@ function! s:functionaltestList(A,L,P) endfunction function! s:integrationtestList(A,L,P) + if a:A =~# '^\u' + return s:autocamelize(rails#app().relglob("test/integration/","**/*","_test.rb"),a:A) + endif let found = [] if rails#app().has('test') - let found += s:autocamelize(rails#app().relglob("test/integration/","**/*","_test.rb"),a:A) + let found += rails#app().relglob("test/integration/","**/*","_test.rb") + endif + if rails#app().has('spec') + let found += rails#app().relglob("spec/integration/","**/*","_spec.rb") endif if rails#app().has('cucumber') - let found += s:completion_filter(rails#app().relglob("features/","**/*",".feature"),a:A) + let found += rails#app().relglob("features/","**/*",".feature") endif - return found + return s:completion_filter(found,a:A) endfunction function! s:specList(A,L,P) @@ -2154,7 +2292,7 @@ function! s:Navcommand(bang,...) let cmds = 'ESVT ' let cmd = '' while cmds != '' - 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>)" + exe 'command! -buffer -bar -bang -nargs=* -complete=customlist,'.s:sid.'CommandList R'.cmd.name." :call s:CommandEdit('".cmd."<bang>','".name."',\"".prefix."\",".string(suffix).",".string(filter).",".string(default).",<f-args>)" let cmd = strpart(cmds,0,1) let cmds = strpart(cmds,1) endwhile @@ -2177,7 +2315,7 @@ function! s:CommandList(A,L,P) endif endfunction -function! s:CommandEdit(bang,cmd,name,prefix,suffix,filter,default,...) +function! s:CommandEdit(cmd,name,prefix,suffix,filter,default,...) if a:0 && a:1 == "&" let s:last_prefix = a:prefix let s:last_suffix = a:suffix @@ -2197,12 +2335,12 @@ function! s:CommandEdit(bang,cmd,name,prefix,suffix,filter,default,...) else let default = a:default endif - call s:EditSimpleRb(a:bang,a:cmd,a:name,a:0 ? a:1 : default,a:prefix,a:suffix) + call s:EditSimpleRb(a:cmd,a:name,a:0 ? a:1 : default,a:prefix,a:suffix) endif endfunction -function! s:EditSimpleRb(bang,cmd,name,target,prefix,suffix,...) - let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) +function! s:EditSimpleRb(cmd,name,target,prefix,suffix,...) + let cmd = s:findcmdfor(a:cmd) if a:target == "" " Good idea to emulate error numbers like this? return s:error("E471: Argument required") @@ -2224,13 +2362,14 @@ endfunction function! s:app_migration(file) dict let arg = a:file - if arg =~ '^0\+$' + if arg =~ '^0$\|^0\=[#:]' + let suffix = s:sub(arg,'^0*','') if self.has_file('db/schema.rb') - return 'db/schema.rb' + return 'db/schema.rb'.suffix elseif self.has_file('db/'.s:environment().'_structure.sql') - return 'db/'.s:environment().'_structure.sql' + return 'db/'.s:environment().'_structure.sql'.suffix else - return 'db/schema.rb' + return 'db/schema.rb'.suffix endif elseif arg =~ '^\d$' let glob = '00'.arg.'_*.rb' @@ -2252,8 +2391,8 @@ endfunction call s:add_methods('app', ['migration']) -function! s:migrationEdit(bang,cmd,...) - let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) +function! s:migrationEdit(cmd,...) + let cmd = s:findcmdfor(a:cmd) let arg = a:0 ? a:1 : '' let migr = arg == "." ? "db/migrate" : rails#app().migration(arg) if migr != '' @@ -2263,7 +2402,7 @@ function! s:migrationEdit(bang,cmd,...) endif endfunction -function! s:fixturesEdit(bang,cmd,...) +function! s:fixturesEdit(cmd,...) if a:0 let c = rails#underscore(a:1) else @@ -2275,42 +2414,51 @@ function! s:fixturesEdit(bang,cmd,...) let e = fnamemodify(c,':e') let e = e == '' ? e : '.'.e let c = fnamemodify(c,':r') - let file = 'test/fixtures/'.c.e - if file =~ '\.\w\+$' && !rails#app().has_file("spec/fixtures/".c.e) - call s:edit(a:cmd.(a:bang?'!':''),file) + let file = get(rails#app().test_suites(),0,'test').'/fixtures/'.c.e + if file =~ '\.\w\+$' && rails#app().find_file(c.e,["test/fixtures","spec/fixtures"]) ==# '' + call s:edit(a:cmd,file) else - call s:findedit(a:cmd.(a:bang?'!':''),rails#app().find_file(c.e,["test/fixtures","spec/fixtures"],[".yml",".csv"],file)) + call s:findedit(a:cmd,rails#app().find_file(c.e,["test/fixtures","spec/fixtures"],[".yml",".csv"],file)) endif endfunction -function! s:metalEdit(bang,cmd,...) +function! s:localeEdit(cmd,...) + let c = a:0 ? a:1 : rails#app().default_locale() + if c =~# '\.' + call s:edit(a:cmd,rails#app().find_file(c,'config/locales',[],'config/locales/'.c)) + else + call s:findedit(a:cmd,rails#app().find_file(c,'config/locales',['.yml','.rb'],'config/locales/'.c)) + endif +endfunction + +function! s:metalEdit(cmd,...) if a:0 - call s:EditSimpleRb(a:bang,a:cmd,"metal",a:1,"app/metal/",".rb") + call s:EditSimpleRb(a:cmd,"metal",a:1,"app/metal/",".rb") else - call s:EditSimpleRb(a:bang,a:cmd,"metal",'config/boot',"",".rb") + call s:EditSimpleRb(a:cmd,"metal",'config/boot',"",".rb") endif endfunction -function! s:modelEdit(bang,cmd,...) - call s:EditSimpleRb(a:bang,a:cmd,"model",a:0? a:1 : s:model(1),"app/models/",".rb") +function! s:modelEdit(cmd,...) + call s:EditSimpleRb(a:cmd,"model",a:0? a:1 : s:model(1),"app/models/",".rb") endfunction -function! s:observerEdit(bang,cmd,...) - call s:EditSimpleRb(a:bang,a:cmd,"observer",a:0? a:1 : s:model(1),"app/models/","_observer.rb") +function! s:observerEdit(cmd,...) + call s:EditSimpleRb(a:cmd,"observer",a:0? a:1 : s:model(1),"app/models/","_observer.rb") endfunction -function! s:viewEdit(bang,cmd,...) +function! s:viewEdit(cmd,...) if a:0 && a:1 =~ '^[^!#:]' let view = matchstr(a:1,'[^!#:]*') elseif RailsFileType() == 'controller' - let view = s:lastmethod() + let view = s:lastmethod(line('.')) else let view = '' endif if view == '' return s:error("No view name given") elseif view == '.' - return s:edit(a:cmd.(a:bang?'!':''),'app/views') + return s:edit(a:cmd,'app/views') elseif view !~ '/' && s:controller(1) != '' let view = s:controller(1) . '/' . view endif @@ -2328,15 +2476,15 @@ function! s:viewEdit(bang,cmd,...) return s:error('No such directory') endif endif - call s:edit(a:cmd.(a:bang?'!':''),found) + call s:edit(a:cmd,found) elseif file =~ '\.\w\+$' - call s:findedit(a:cmd.(a:bang?'!':''),file) + call s:findedit(a:cmd,file) else let format = s:format('html') if glob(rails#app().path(file.'.'.format).'.*[^~]') != '' let file .= '.' . format endif - call s:findedit(a:cmd.(a:bang?'!':''),file) + call s:findedit(a:cmd,file) endif endfunction @@ -2383,9 +2531,9 @@ function! s:findlayout(name) return s:findview("layouts/".(a:name == '' ? 'application' : a:name)) endfunction -function! s:layoutEdit(bang,cmd,...) +function! s:layoutEdit(cmd,...) if a:0 - return s:viewEdit(a:bang,a:cmd,"layouts/".a:1) + return s:viewEdit(a:cmd,"layouts/".a:1) endif let file = s:findlayout(s:controller(1)) if file == "" @@ -2394,10 +2542,10 @@ function! s:layoutEdit(bang,cmd,...) if file == "" let file = "app/views/layouts/application.html.erb" endif - call s:edit(a:cmd.(a:bang?'!':''),s:sub(file,'^/','')) + call s:edit(a:cmd,s:sub(file,'^/','')) endfunction -function! s:controllerEdit(bang,cmd,...) +function! s:controllerEdit(cmd,...) let suffix = '.rb' if a:0 == 0 let controller = s:controller(1) @@ -2410,37 +2558,33 @@ function! s:controllerEdit(bang,cmd,...) 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) -endfunction - -function! s:helperEdit(bang,cmd,...) - return s:EditSimpleRb(a:bang,a:cmd,"helper",a:0? a:1 : s:controller(1),"app/helpers/","_helper.rb") + return s:EditSimpleRb(a:cmd,"controller",controller,"app/controllers/",suffix) endfunction -function! s:apiEdit(bang,cmd,...) - return s:EditSimpleRb(a:bang,a:cmd,"api",a:0 ? a:1 : s:controller(1),"app/apis/","_api.rb") +function! s:helperEdit(cmd,...) + return s:EditSimpleRb(a:cmd,"helper",a:0? a:1 : s:controller(1),"app/helpers/","_helper.rb") endfunction -function! s:stylesheetEdit(bang,cmd,...) +function! s:stylesheetEdit(cmd,...) 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) + return s:EditSimpleRb(a:cmd,"stylesheet",name,"public/stylesheets/sass/",".sass",1) else - return s:EditSimpleRb(a:bang,a:cmd,"stylesheet",name,"public/stylesheets/",".css",1) + return s:EditSimpleRb(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",1) +function! s:javascriptEdit(cmd,...) + return s:EditSimpleRb(a:cmd,"javascript",a:0? a:1 : "application","public/javascripts/",".js",1) endfunction -function! s:unittestEdit(bang,cmd,...) +function! s:unittestEdit(cmd,...) 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?'!':'')) + let cmd = s:editcmdfor(a:cmd) else - let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) + let cmd = s:findcmdfor(a:cmd) endif 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)') @@ -2459,16 +2603,16 @@ function! s:unittestEdit(bang,cmd,...) 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) + return s:EditSimpleRb(a:cmd,"unittest",f.jump,tests[0][0],tests[0][1],1) endfunction -function! s:functionaltestEdit(bang,cmd,...) +function! s:functionaltestEdit(cmd,...) 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?'!':'')) + let cmd = s:editcmdfor(a:cmd) else - let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) + let cmd = s:findcmdfor(a:cmd) 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)') @@ -2484,25 +2628,21 @@ function! s:functionaltestEdit(bang,cmd,...) return s:findedit(cmd,prefix.f.'_api'.suffix.jump) endif endfor - return s:EditSimpleRb(a:bang,a:cmd,"functionaltest",f.jump,tests[0][0],tests[0][1],1) + return s:EditSimpleRb(a:cmd,"functionaltest",f.jump,tests[0][0],tests[0][1],1) endfunction -function! s:integrationtestEdit(bang,cmd,...) +function! s:integrationtestEdit(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 + return s:EditSimpleRb(a:cmd,"integrationtest","test/test_helper\nfeatures/support/env\nspec/spec_helper","",".rb") endif let f = rails#underscore(matchstr(a:1,'[^!#:]*')) let jump = matchstr(a:1,'[!#:].*') if jump =~ '!' - let cmd = s:editcmdfor(a:cmd.(a:bang?'!':'')) + let cmd = s:editcmdfor(a:cmd) else - let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) + let cmd = s:findcmdfor(a:cmd) endif - let mapping = {'test': ['test/integration/','_test.rb'], 'cucumber': ['features/','.feature']} + let mapping = {'test': ['test/integration/','_test.rb'], 'spec': ['spec/integration/','_spec.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']] @@ -2514,19 +2654,19 @@ function! s:integrationtestEdit(bang,cmd,...) 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) + return s:EditSimpleRb(a:cmd,"integrationtest",f.jump,tests[0][0],tests[0][1],1) endfunction -function! s:specEdit(bang,cmd,...) +function! s:specEdit(cmd,...) if a:0 - return s:EditSimpleRb(a:bang,a:cmd,"spec",a:1,"spec/","_spec.rb") + return s:EditSimpleRb(a:cmd,"spec",a:1,"spec/","_spec.rb") else - call s:EditSimpleRb(a:bang,a:cmd,"spec","spec_helper","spec/",".rb") + call s:EditSimpleRb(a:cmd,"spec","spec_helper","spec/",".rb") endif endfunction -function! s:pluginEdit(bang,cmd,...) - let cmd = s:findcmdfor(a:cmd.(a:bang?'!':'')) +function! s:pluginEdit(cmd,...) + let cmd = s:findcmdfor(a:cmd) let plugin = "" let extra = "" if RailsFilePath() =~ '\<vendor/plugins/.' @@ -2535,7 +2675,7 @@ function! s:pluginEdit(bang,cmd,...) endif if a:0 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") + return s:EditSimpleRb(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 == "." @@ -2546,11 +2686,11 @@ function! s:pluginEdit(bang,cmd,...) call s:findedit(cmd,"vendor/plugins/".a:1."\nvendor/plugins/".plugin."/".a:1) endif else - return s:EditSimpleRb(a:bang,a:cmd,"plugin",plugin,"vendor/plugins/","/init.rb") + return s:EditSimpleRb(a:cmd,"plugin",plugin,"vendor/plugins/","/init.rb") endif endfunction -function! s:taskEdit(bang,cmd,...) +function! s:taskEdit(cmd,...) let plugin = "" let extra = "" if RailsFilePath() =~ '\<vendor/plugins/.' @@ -2558,30 +2698,31 @@ function! s:taskEdit(bang,cmd,...) 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") + call s:EditSimpleRb(a:cmd,"task",a:1,extra."lib/tasks/",".rake") else - call s:findedit((a:bang ? "!" : ""),(plugin != "" ? plugin."/Rakefile\n" : "")."Rakefile") + call s:findedit(a:cmd,(plugin != "" ? plugin."/Rakefile\n" : "")."Rakefile") endif endfunction -function! s:libEdit(bang,cmd,...) +function! s:libEdit(cmd,...) let extra = "" if RailsFilePath() =~ '\<vendor/plugins/.' let extra = s:sub(RailsFilePath(),'<vendor/plugins/[^/]*/\zs.*','lib/')."\n" endif if a:0 - call s:EditSimpleRb(a:bang,a:cmd,"lib",a:0? a:1 : "",extra."lib/",".rb") + call s:EditSimpleRb(a:cmd,"lib",a:0? a:1 : "",extra."lib/",".rb") else - call s:EditSimpleRb(a:bang,a:cmd,"lib","routes","config/",".rb") + call s:EditSimpleRb(a:cmd,"lib","routes","config/",".rb") + call s:warn('Warning: :Rlib with no argument has been deprecated in favor of :Rinitializer') endif endfunction -function! s:environmentEdit(bang,cmd,...) - return s:EditSimpleRb(a:bang,a:cmd,"environment",a:0? a:1 : "../environment","config/environments/",".rb") +function! s:environmentEdit(cmd,...) + return s:EditSimpleRb(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") +function! s:initializerEdit(cmd,...) + return s:EditSimpleRb(a:cmd,"initializer",a:0? a:1 : "../routes","config/initializers/",".rb") endfunction " }}}1 @@ -2609,6 +2750,8 @@ function! s:findcmdfor(cmd) return 'vert '.num.'sfind'.bang elseif cmd == 'T' return num.'tabfind'.bang + elseif cmd == 'D' + return num.'read'.bang else return num.cmd.bang endif @@ -2681,88 +2824,162 @@ function! s:edit(cmd,file,...) endif endfunction -function! s:Alternate(bang,cmd,...) +function! s:Alternate(cmd,line1,line2,count,...) if a:0 - return call('s:Find',[a:bang,1,a:cmd]+a:000) + if a:count && a:cmd !~# 'D' + return call('s:Find',[1,a:line1.a:cmd]+a:000) + elseif a:count + return call('s:Edit',[1,a:line1.a:cmd]+a:000) + else + return call('s:Edit',[1,a:cmd]+a:000) + endif else - let cmd = a:cmd.(a:bang?"!":"") - let file = s:AlternateFile() - if file != "" - call s:findedit(cmd,file) + let file = s:getopt(a:count ? 'related' : 'alternate', 'bl') + if file == '' + let file = rails#buffer().related(a:count) + endif + if file != '' + call s:findedit(a:cmd,file) else call s:warn("No alternate file is defined") endif endif endfunction -function! s:AlternateFile() - let f = RailsFilePath() - let t = RailsFileType() - let altopt = s:getopt("alternate","bl") - if altopt != "" - return altopt - elseif f =~ '\<config/environments/' +function! s:Related(cmd,line1,line2,count,...) + if a:count == 0 && a:0 == 0 + return s:Alternate(a:cmd,a:line1,a:line1,a:line1) + else + return call('s:Alternate',[a:cmd,a:line1,a:line2,a:count]+a:000) + endif +endfunction + +function! s:Complete_related(A,L,P) + if a:L =~# '^[[:alpha:]]' + return s:Complete_edit(a:A,a:L,a:P) + else + return s:Complete_find(a:A,a:L,a:P) + endif +endfunction + +function! s:readable_related(...) dict abort + let f = self.name() + let t = self.type_name() + if a:0 && a:1 + let lastmethod = self.last_method(a:1) + if 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 = self.last_format(a:1) + if format == '' | let format = 'html' | endif + if glob(self.app().path().'/'.root.'.'.format.'.*[^~]') != '' + return root . '.' . format + else + return root + endif + elseif f =~ '\<config/environments/' + return "config/database.yml#". fnamemodify(f,':t:r') + elseif f =~ '\<config/database\.yml$' + if lastmethod != "" + return "config/environments/".lastmethod.".rb" + else + return "config/environment.rb" + endif + elseif f =~ '\<config/routes\.rb$' | return "config/database.yml" + elseif f =~ '\<config/environment\.rb$' | return "config/routes.rb" + 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\>' + 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') + let model = s:sub(s:sub(f,'/views/','/models/'),'/(\k+)\..*$','.rb#\1') + if self.app().has_file(s:sub(controller,'#.{-}$','')) + return controller + elseif self.app().has_file(s:sub(controller2,'#.{-}$','')) + return controller2 + elseif self.app().has_file(s:sub(model,'#.{-}$','')) || model =~ '_mailer\.rb#' + return model + else + return controller + endif + elseif t =~ '^controller\>' + return s:sub(s:sub(f,'/controllers/','/helpers/'),'%(_controller)=\.rb$','_helper.rb') + " elseif t=~ '^helper\>' + " return s:findlayout(s:controller()) + elseif t =~ '^model-arb\>' + let table_name = matchstr(join(self.getline(1,50),"\n"),'\n\s*set_table_name\s*[:"'']\zs\w\+') + if table_name == '' + let table_name = rails#pluralize(s:gsub(s:sub(fnamemodify(f,':r'),'.{-}<app/models/',''),'/','_')) + endif + return self.app().migration('0#'.table_name) + elseif t =~ '^model-aro\>' + return s:sub(f,'_observer\.rb$','.rb') + elseif f =~ '\<db/schema\.rb$' + return self.app().migration(1) + endif + endif + if f =~ '\<config/environments/' return "config/environment.rb" elseif f == 'README' return "config/database.yml" elseif f =~ '\<config/database\.yml$' | return "config/routes.rb" elseif f =~ '\<config/routes\.rb$' | return "config/environment.rb" 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 rails#app().migration(num) + elseif f =~ '\<db/migrate/' + let migrations = sort(self.app().relglob('db/migrate/','*','.rb')) + let me = matchstr(f,'\<db/migrate/\zs.*\ze\.rb$') + if !exists('l:lastmethod') || lastmethod == 'down' + let candidates = reverse(filter(copy(migrations),'v:val < me')) + let migration = "db/migrate/".get(candidates,0,migrations[-1]).".rb" + else + let candidates = filter(copy(migrations),'v:val > me') + let migration = "db/migrate/".get(candidates,0,migrations[0]).".rb" + endif + return migration . (exists('l:lastmethod') && lastmethod != '' ? '#'.lastmethod : '') elseif f =~ '\<application\.js$' return "app/helpers/application_helper.rb" - elseif t =~ '^js\>' + elseif t =~ '^javascript\>' return "public/javascripts/application.js" elseif f =~ '\<db/schema\.rb$' - return rails#app().migration('') + return self.app().migration('') elseif t =~ '^view\>' - if t =~ '\<layout\>' - let dest = fnamemodify(f,':r:s?/layouts\>??').'/layout.'.fnamemodify(f,':e') - else - let dest = f - endif - " Go to the (r)spec, helper, controller, or (mailer) model - 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 rails#app().has_file(spec1) + let spec1 = fnamemodify(f,':s?\<app/?spec/?')."_spec.rb" + let spec2 = fnamemodify(f,':r:s?\<app/?spec/?')."_spec.rb" + let spec3 = fnamemodify(f,':r:r:s?\<app/?spec/?')."_spec.rb" + if self.app().has_file(spec1) return spec1 - elseif rails#app().has_file(spec2) + elseif self.app().has_file(spec2) return spec2 - elseif rails#app().has_file(spec3) + elseif self.app().has_file(spec3) return spec3 - elseif rails#app().has_file(helper) - return helper - elseif rails#app().has_file(controller) - let jumpto = expand("%:t:r") - return controller.'#'.jumpto - elseif rails#app().has_file(model) - return model + elseif self.app().has('spec') + return spec2 else - return helper + if t =~ '\<layout\>' + let dest = fnamemodify(f,':r:s?/layouts\>??').'/layout.'.fnamemodify(f,':e') + else + let dest = f + endif + return s:sub(s:sub(dest,'<app/views/','test/functional/'),'/[^/]*$','_controller_test.rb') endif elseif t =~ '^controller-api\>' let api = s:sub(s:sub(f,'/controllers/','/apis/'),'_controller\.rb$','_api.rb') return api + elseif t =~ '^api\>' + return s:sub(s:sub(f,'/apis/','/controllers/'),'_api\.rb$','_controller.rb') elseif t =~ '^helper\>' 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 rails#app().has_file(spec) + if self.app().has_file(spec) return spec else return controller endif elseif t =~ '\<fixtures\>' && f =~ '\<spec/' - let file = rails#singularize(expand("%:t:r")).'_spec.rb' + let file = rails#singularize(fnamemodify(f,":t:r")).'_spec.rb' return file elseif t =~ '\<fixtures\>' - let file = rails#singularize(expand("%:t:r")).'_test.rb' " .expand('%:e') + let file = rails#singularize(fnamemodify(f,":t:r")).'_test.rb' return file elseif f == '' call s:warn("No filename present") @@ -2794,7 +3011,7 @@ function! s:AlternateFile() elseif t == 'spec-lib' return s:sub(file,'<spec/','') elseif t == 'lib' - return s:sub(f, '<lib/(.*)\.rb$', 'test/unit/\1_test\.rb')."\n".s:sub(f, '<lib/(.*)\.rb$', 'spec/lib/\1_spec\.rb') + return s:sub(f, '<lib/(.*)\.rb$', 'test/unit/\1_test.rb')."\n".s:sub(f, '<lib/(.*)\.rb$', 'spec/lib/\1_spec.rb') elseif t =~ '^spec\>' return s:sub(file,'<spec/','app/') elseif file =~ '\<vendor/.*/lib/' @@ -2809,94 +3026,7 @@ function! s:AlternateFile() endif endfunction -function! s:Related(bang,cmd,...) - if a:0 - return call('s:Edit',[a:bang,1,a:cmd]+a:000) - else - 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 - -function! s:RelatedFile() - let f = RailsFilePath() - let t = RailsFileType() - let lastmethod = s:lastmethod() - if s:getopt("related","l") != "" - return s:getopt("related","l") - 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(rails#app().path().'/'.root.'.'.format.'.*[^~]') != '' - return root . '.' . format - else - return root - endif - elseif s:getopt("related","b") != "" - return s:getopt("related","b") - elseif f =~ '\<config/environments/' - return "config/database.yml#". expand("%:t:r") - elseif f == 'README' - return "config/database.yml" - elseif f =~ '\<config/database\.yml$' - let lm = s:lastmethod() - if lm != "" - return "config/environments/".lm.".rb\nconfig/environment.rb" - else - return "config/environment.rb" - endif - elseif f =~ '\<config/routes\.rb$' | return "config/database.yml" - 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 = 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/') - let target = s:sub(target,'_test\.rb$','.rb') - return target - elseif f =~ '\<application\.js$' - return "app/helpers/application_helper.rb" - elseif t =~ '^js\>' - 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\>' - 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') - let model = s:sub(s:sub(f,'/views/','/models/'),'/(\k+)\..*$','.rb#\1') - if filereadable(s:sub(controller,'#.{-}$','')) - return controller - elseif filereadable(s:sub(controller2,'#.{-}$','')) - return controller2 - elseif filereadable(s:sub(model,'#.{-}$','')) || model =~ '_mailer\.rb#' - return model - else - return controller - endif - elseif t =~ '^controller-api\>' - return s:sub(s:sub(f,'/controllers/','/apis/'),'_controller\.rb$','_api.rb') - elseif t =~ '^controller\>' - return s:sub(s:sub(f,'/controllers/','/helpers/'),'%(_controller)=\.rb$','_helper.rb') - elseif t=~ '^helper\>' - return s:findlayout(s:controller()) - elseif t =~ '^model-arb\>' - 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 rails#app().migration(1) - else - return "" - endif -endfunction +call s:add_methods('readable',['related']) " }}}1 " Partial Extraction {{{1 @@ -3005,10 +3135,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 @@ -3222,7 +3355,7 @@ function! s:helpermethods() \."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 " + \."grouped_collection_select 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 " @@ -3271,10 +3404,7 @@ call s:add_methods('app', ['user_classes','user_assertions']) function! s:BufSyntax() if (!exists("g:rails_syntax") || g:rails_syntax) let t = RailsFileType() - let s:prototype_functions = "$ $$ $A $F $H $R $w" - " From the Prototype bundle for TextMate - 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 s:javascript_functions = "$ $$ $A $F $H $R $w jQuery" let rails_helper_methods = '+\.\@<!\<\('.s:gsub(s:helpermethods(),'\s+','\\|').'\)\>+' let classes = s:gsub(join(rails#app().user_classes(),' '),'::',' ') if &syntax == 'ruby' @@ -3305,8 +3435,6 @@ function! s:BufSyntax() endif if t =~ '^controller\>' || t =~ '^view\>' || t=~ '^helper\>' syn keyword rubyRailsMethod params request response session headers cookies flash - syn match rubyRailsError '[@:]\@<!@\%(params\|request\|response\|session\|headers\|cookies\|flash\)\>' - syn match rubyRailsError '\<\%(render_partial\|puts\)\>' syn keyword rubyRailsRenderMethod render syn keyword rubyRailsMethod logger endif @@ -3318,8 +3446,7 @@ function! s:BufSyntax() syn keyword rubyRailsMethod local_assigns endif 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 protect_from_forgery - syn match rubyRailsDeprecatedMethod '\<render_\%(action\|text\|file\|template\|nothing\|without_layout\)\>' + 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 caches_page cache_page caches_action expire_page expire_action syn keyword rubyRailsRenderMethod render_to_string redirect_to head syn match rubyRailsRenderMethod '\<respond_to\>?\@!' syn keyword rubyRailsFilterMethod before_filter append_before_filter prepend_before_filter after_filter append_after_filter prepend_after_filter around_filter append_around_filter prepend_around_filter skip_before_filter skip_after_filter @@ -3400,7 +3527,6 @@ function! s:BufSyntax() else syn cluster erubyRailsRegions contains=erubyOneLiner,erubyBlock,erubyExpression,rubyInterpolation endif - syn match rubyRailsError '[@:]\@<!@\%(params\|request\|response\|session\|headers\|cookies\|flash\)\>' contained containedin=@erubyRailsRegions exe "syn keyword erubyRailsHelperMethod ".s:sub(s:helpermethods(),'<select\s+','')." contained containedin=@erubyRailsRegions" syn match erubyRailsHelperMethod '\<select\>\%(\s*{\|\s*do\>\|\s*(\=\s*&\)\@!' contained containedin=@erubyRailsRegions syn keyword erubyRailsMethod debugger logger contained containedin=@erubyRailsRegions @@ -3410,13 +3536,10 @@ function! s:BufSyntax() syn keyword erubyRailsMethod local_assigns contained containedin=@erubyRailsRegions endif syn keyword erubyRailsRenderMethod render contained containedin=@erubyRailsRegions - syn match rubyRailsError '[^@:]\@<!@\%(params\|request\|response\|session\|headers\|cookies\|flash\)\>' contained containedin=@erubyRailsRegions - syn match rubyRailsError '\<\%(render_partial\|puts\)\>' contained containedin=@erubyRailsRegions syn case match set isk+=$ - exe "syn keyword javascriptRailsClass contained ".s:prototype_classes - exe "syn keyword javascriptRailsFunction contained ".s:prototype_functions - syn cluster htmlJavaScript add=javascriptRailsClass,javascriptRailsFunction + exe "syn keyword javascriptRailsFunction contained ".s:javascript_functions + syn cluster htmlJavaScript add=javascriptRailsFunction elseif &syntax == "yaml" syn case match " Modeled after syntax/eruby.vim @@ -3437,15 +3560,13 @@ function! s:BufSyntax() elseif &syntax == "html" syn case match set isk+=$ - exe "syn keyword javascriptRailsClass contained ".s:prototype_classes - exe "syn keyword javascriptRailsFunction contained ".s:prototype_functions - syn cluster htmlJavaScript add=javascriptRailsClass,javascriptRailsFunction + exe "syn keyword javascriptRailsFunction contained ".s:javascript_functions + syn cluster htmlJavaScript add=javascriptRailsFunction elseif &syntax == "javascript" " The syntax file included with Vim incorrectly sets syn case ignore. syn case match set isk+=$ - exe "syn keyword javascriptRailsClass ".s:prototype_classes - exe "syn keyword javascriptRailsFunction ".s:prototype_functions + exe "syn keyword javascriptRailsFunction ".s:javascript_functions endif endif @@ -3464,13 +3585,11 @@ function! s:HiDefaults() hi def link rubyRailsViewMethod rubyRailsMethod hi def link rubyRailsMigrationMethod rubyRailsMethod hi def link rubyRailsControllerMethod rubyRailsMethod - hi def link rubyRailsDeprecatedMethod rubyRailsError hi def link rubyRailsFilterMethod rubyRailsMethod hi def link rubyRailsTestControllerMethod rubyRailsTestMethod hi def link rubyRailsTestMethod rubyRailsMethod hi def link rubyRailsRakeMethod rubyRailsMethod hi def link rubyRailsMethod railsMethod - hi def link rubyRailsError rubyError hi def link rubyRailsInclude rubyInclude hi def link rubyRailsUserClass railsUserClass hi def link rubyRailsUserMethod railsUserMethod @@ -3487,7 +3606,6 @@ function! s:HiDefaults() hi def link yamlRailsUserClass railsUserClass hi def link yamlRailsUserMethod railsUserMethod hi def link javascriptRailsFunction railsMethod - hi def link javascriptRailsClass railsClass hi def link railsUserClass railsClass hi def link railsMethod Function hi def link railsClass Type @@ -3499,7 +3617,7 @@ endfunction 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 + syn match railslogModel '^\s*\u\%(\w\|:\)* \%(Load\%( Including Associations\| IDs For Limited Eager Loading\)\=\|Columns\|Count\|Create\|Update\|Destroy\|Delete all\)\>' skipwhite nextgroup=railslogModelNum syn match railslogModel '^\s*SQL\>' skipwhite nextgroup=railslogModelNum syn region railslogModelNum start='(' end=')' contains=railslogNumber contained skipwhite nextgroup=railslogSQL syn match railslogSQL '\u.*$' contained @@ -3538,10 +3656,10 @@ endfunction function! s:addtostatus(letter,status) let status = a:status - if status !~ 'Rails' && g:rails_statusline - let status=substitute(status,'\C%'.tolower(a:letter),'%'.tolower(a:letter).'%{RailsStatusline()}','') - if status !~ 'Rails' - let status=substitute(status,'\C%'.toupper(a:letter),'%'.toupper(a:letter).'%{RailsSTATUSLINE()}','') + if status !~ 'rails' && g:rails_statusline + let status=substitute(status,'\C%'.tolower(a:letter),'%'.tolower(a:letter).'%{rails#statusline()}','') + if status !~ 'rails' + let status=substitute(status,'\C%'.toupper(a:letter),'%'.toupper(a:letter).'%{rails#STATUSLINE()}','') endif endif return status @@ -3576,26 +3694,26 @@ endfunction function! s:InjectIntoStatusline(status) let status = a:status - if status !~ 'Rails' + if status !~ 'rails' let status = s:addtostatus('y',status) let status = s:addtostatus('r',status) let status = s:addtostatus('m',status) let status = s:addtostatus('w',status) let status = s:addtostatus('h',status) - if status !~ 'Rails' - let status=substitute(status,'%=','%{RailsStatusline()}%=','') + if status !~ 'rails' + let status=substitute(status,'%=','%{rails#statusline()}%=','') endif - if status !~ 'Rails' && status != '' - let status .= '%{RailsStatusline()}' + if status !~ 'rails' && status != '' + let status .= '%{rails#statusline()}' endif endif return status endfunction -function! RailsStatusline() +function! rails#statusline(...) if exists("b:rails_root") let t = RailsFileType() - if t != "" + if t != "" && a:0 && a:1 return "[Rails-".t."]" else return "[Rails]" @@ -3605,10 +3723,10 @@ function! RailsStatusline() endif endfunction -function! RailsSTATUSLINE() +function! rails#STATUSLINE(...) if exists("b:rails_root") let t = RailsFileType() - if t != "" + if t != "" && a:0 && a:1 return ",RAILS-".toupper(t) else return ",RAILS" @@ -3774,15 +3892,9 @@ function! s:app_dbext_settings(environment) dict 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("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{'.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}}' - let out = self.lightweight_ruby_eval(cmdb.a:environment.cmde) - endif + 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}}' + let out = self.lightweight_ruby_eval(cmdb.a:environment.cmde) let adapter = s:extractdbvar(out,'adapter') let adapter = get({'postgresql': 'pgsql', 'sqlite3': 'sqlite', 'sqlserver': 'sqlsrv', 'sybase': 'asa', 'oci': 'ora'},adapter,adapter) let dict['type'] = toupper(adapter) @@ -3802,6 +3914,7 @@ function! s:app_dbext_settings(environment) dict let dict['dbname'] = self.path(dict['dbname']) endif 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') @@ -3837,7 +3950,7 @@ function! s:BufDatabase(...) return endif let dict = self.dbext_settings(env) - for key in ['type', 'profile', 'bin', 'user', 'passwd', 'dbname', 'host', 'port', 'dsnname', 'extra', 'integratedlogin'] + 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' @@ -3845,21 +3958,6 @@ function! s:BufDatabase(...) 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' - let db = b:dbext_dbname - if b:dbext_type == 'PGSQL' - " I don't always have a default database for a user so using the - " default user's database is a better choice for my setup. It - " probably won't work for everyone but nothing will. - let b:dbext_dbname = 'postgres' - else - let b:dbext_dbname = '' - endif - exe "Create database ".db - let b:dbext_dbname = db - endif - endif unlet! s:lock_database endfunction @@ -4265,8 +4363,6 @@ 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) @@ -4274,11 +4370,12 @@ function! RailsBufInit(path) let s:apps[a:path].root = a:path endif let app = s:apps[a:path] + let buffer = rails#buffer() " 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. - let b:rails_cached_file_type = app.calculate_file_type(RailsFilePath()) + let b:rails_cached_file_type = buffer.calculate_file_type() if g:rails_history_size > 0 if !exists("g:RAILS_HISTORY") let g:RAILS_HISTORY = "" @@ -4360,41 +4457,40 @@ function! RailsBufInit(path) call app.source_callback("config/rails.vim") call s:BufModelines() call s:BufMappings() - let &cpo = cpo_save return b:rails_root endfunction function! s:SetBasePath() - if rails#app().path() =~ '://' + let self = rails#buffer() + if self.app().path() =~ '://' return endif - let transformed_path = s:pathsplit(s:pathjoin([rails#app().path()]))[0] - let old_path = s:pathsplit(s:sub(&l:path,'^\.,=','')) + let transformed_path = s:pathsplit(s:pathjoin([self.app().path()]))[0] + let old_path = s:pathsplit(s:sub(self.getvar('&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 path += ['app/views/'.s:controller(), 'public'] + if self.controller_name() != '' + let path += ['app/views/'.self.controller_name(), 'public'] endif - if rails#app().has('test') + if self.app().has('test') let path += ['test', 'test/unit', 'test/functional', 'test/integration'] endif - if rails#app().has('spec') - let path += ['spec', 'spec/models', 'spec/controllers', 'spec/helpers', 'spec/views', 'spec/lib'] + if self.app().has('spec') + let path += ['spec', 'spec/models', 'spec/controllers', 'spec/helpers', 'spec/views', 'spec/lib', 'spec/integration'] endif 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) + call map(path,'self.app().path(v:val)') + call self.setvar('&path',s:pathjoin('.',[self.app().path()],path,old_path)) endfunction function! s:BufSettings() if !exists('b:rails_root') return '' endif + let self = rails#buffer() call s:SetBasePath() - let rp = s:gsub(rails#app().path(),'[ ,]','\\&') - let &l:errorformat = s:efm - setlocal makeprg=rake + let rp = s:gsub(self.app().path(),'[ ,]','\\&') if stridx(&tags,rp) == -1 let &l:tags = rp . "/tmp/tags," . &tags . "," . rp . "/tags" endif @@ -4411,42 +4507,39 @@ function! s:BufSettings() \."Static Files (*.html, *.css, *.js)\t".statics."\n" \."All Files (*.*)\t*.*\n" endif - setlocal includeexpr=RailsIncludeexpr() - 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 - if exists('+completefunc') - if &completefunc == '' - set completefunc=syntaxcomplete#Complete - endif + call self.setvar('&includeexpr','RailsIncludeexpr()') + call self.setvar('&suffixesadd', ".rb,.".s:gsub(s:view_types,',',',.').",.css,.js,.yml,.csv,.rake,.sql,.html,.xml") + let ft = self.getvar('&filetype') + if ft =~ '^\%(e\=ruby\|[yh]aml\|javascript\|css\|sass\)$' + call self.setvar('&shiftwidth',2) + call self.setvar('&softtabstop',2) + call self.setvar('&expandtab',1) + if exists('+completefunc') && self.getvar('&completefunc') == '' + call self.setvar('&completefunc','syntaxcomplete#Complete') endif endif - if &filetype == "ruby" - let &l:suffixesadd=".rb,.".s:gsub(s:view_types,',',',.').",.yml,.csv,.rake,s.rb" - if expand('%:e') == 'rake' - setlocal define=^\\s*def\\s\\+\\(self\\.\\)\\=\\\|^\\s*\\%(task\\\|file\\)\\s\\+[:'\"] - else - setlocal define=^\\s*def\\s\\+\\(self\\.\\)\\= - endif + if ft == 'ruby' + call self.setvar('&suffixesadd',".rb,.".s:gsub(s:view_types,',',',.').",.yml,.csv,.rake,s.rb") + call self.setvar('&define',self.define_pattern()) " This really belongs in after/ftplugin/ruby.vim but we'll be nice - if exists("g:loaded_surround") && !exists("b:surround_101") - let b:surround_5 = "\r\nend" - let b:surround_69 = "\1expr: \1\rend" - let b:surround_101 = "\r\nend" + if exists('g:loaded_surround') && self.getvar('surround_101') == '' + call self.setvar('surround_5', "\r\nend") + call self.setvar('surround_69', "\1expr: \1\rend") + call self.setvar('surround_101', "\r\nend") endif - elseif &filetype == 'yaml' || expand('%:e') == 'yml' - setlocal define=^\\%(\\h\\k*:\\)\\@= - let &l:suffixesadd=".yml,.csv,.rb,.".s:gsub(s:view_types,',',',.').",.rake,s.rb" - elseif &filetype == "eruby" - let &l:suffixesadd=".".s:gsub(s:view_types,',',',.').",.rb,.css,.js,.html,.yml,.csv" + elseif ft == 'yaml' || fnamemodify(self.name(),':e') == 'yml' + call self.setvar('&define',self.define_pattern()) + call self.setvar('&suffixesadd',".yml,.csv,.rb,.".s:gsub(s:view_types,',',',.').",.rake,s.rb") + elseif ft == 'eruby' + call self.setvar('&suffixesadd',".".s:gsub(s:view_types,',',',.').",.rb,.css,.js,.html,.yml,.csv") if exists("g:loaded_allml") " allml is available on vim.org. - let b:allml_stylesheet_link_tag = "<%= stylesheet_link_tag '\r' %>" - let b:allml_javascript_include_tag = "<%= javascript_include_tag '\r' %>" - let b:allml_doctype_index = 10 + call self.setvar('allml_stylesheet_link_tag', "<%= stylesheet_link_tag '\r' %>") + call self.setvar('allml_javascript_include_tag', "<%= javascript_include_tag '\r' %>") + call self.setvar('allml_doctype_index', 10) endif endif - if &filetype == "eruby" || &filetype == "yaml" + if ft == 'eruby' || ft == 'yaml' " surround.vim if exists("g:loaded_surround") " The idea behind the || part here is that one can normally define the @@ -4455,19 +4548,19 @@ function! s:BufSettings() " difficult if you really don't want a hyphen in Rails ERuby files. If " this is your desire, you will need to accomplish it via a rails.vim " autocommand. - if !exists("b:surround_45") || b:surround_45 == "<% \r %>" " - - let b:surround_45 = "<% \r -%>" + if self.getvar('surround_45') == '' || self.getvar('surround_45') == "<% \r %>" " - + call self.setvar('surround_45', "<% \r -%>") endif - if !exists("b:surround_61") " = - let b:surround_61 = "<%= \r %>" + if self.getvar('surround_61') == '' " = + call self.setvar('surround_61', "<%= \r %>") endif - if !exists("b:surround_35") " # - let b:surround_35 = "<%# \r %>" + if self.getvar("surround_35") == '' " # + call self.setvar('surround_35', "<%# \r %>") endif - if !exists("b:surround_101") || b:surround_101 == "<% \r %>\n<% end %>" "e - let b:surround_5 = "<% \r -%>\n<% end -%>" - let b:surround_69 = "<% \1expr: \1 -%>\r<% end -%>" - let b:surround_101 = "<% \r -%>\n<% end -%>" + if self.getvar('surround_101') == '' || self.getvar('surround_101')== "<% \r %>\n<% end %>" "e + call self.setvar('surround_5', "<% \r -%>\n<% end -%>") + call self.setvar('surround_69', "<% \1expr: \1 -%>\r<% end -%>") + call self.setvar('surround_101', "<% \r -%>\n<% end -%>") endif endif endif @@ -4485,6 +4578,7 @@ augroup railsPluginAuto 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/environment.rb call rails#cache_clear("default_locale") 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") dot.vim/autoload/rails.vim @@ -14,6 +14,7 @@ Author: Tim Pope <vimNOSPAM@tpope.info> |rails-plugin-author| |rails-controller-navigation| Controller Navigation Commands |rails-misc-navigation| Miscellaneous Navigation Commands |rails-custom-navigation| Custom Navigation Commands +|rails-rake| Rake |rails-scripts| Script Wrappers |rails-refactoring| Refactoring Helpers |rails-partials| Partial Extraction @@ -50,23 +51,23 @@ Rails application development. out of your way if you're not using its features. (If you find a situation where this is not a case, contact the |rails-plugin-author|.) -3. Provides reasonable settings for working with Rails applications. Rake is - the 'makeprg' (and it always knows where your Rakefile is), 'shiftwidth' - is 2, and 'path' includes an appropriate collection of directories from - your application. |rails-options| - -4. Easy navigation of the Rails directory structure. |gf| considers context +3. Easy navigation of the Rails directory structure. |gf| considers context and knows about partials, fixtures, and much more. There are two commands, :A (alternate) and :R (related) for easy jumping between files, including favorites like model to migration, template to helper, and controller to functional test. For more advanced usage, :Rmodel, :Rview, :Rcontroller, and several other commands are provided. |rails-navigation| -5. Enhanced syntax highlighting. From has_and_belongs_to_many to +4. Enhanced syntax highlighting. From has_and_belongs_to_many to 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| +5. Interface to rake. Use :Rake to run the current test, spec, or feature. + Use :.Rake to do a focused run of just the method, example, or scenario on + the current line. :Rake can also run arbitrary migrations, load individual + fixtures, and more. |rails-rake| + 6. Interface to script/*. Generally, use ":Rscript about" to call "script/about". Most commands have wrappers with additional features: ":Rgenerate controller Blog" generates a blog controller and edits @@ -79,8 +80,8 @@ Rails application development. |:Rinvert| takes a self.up migration and writes a self.down. |rails-refactoring| -8. Integration with other plugins. |:Rproject| creates a new project.vim - project or spawns NERDTree. If dbext.vim is installed, it will be +8. Integration with other plugins. |:Rtree| spawns NERDTree.vim or creates a + new project.vim project. 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| @@ -134,24 +135,9 @@ actually edit a file from a Rails application. :Rails {directory} The only global command. Creates a new Rails application in {directory}, and loads the README. - *rails-:Rake* -:[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!* -:[range]Rake! {targets} Called with a bang, :Rake will use an alternate - 'errorformat' which attempts to parse the full stack - backtrace. For purely informative rake tasks (stats, - routes, notes, etc), the preview pane is opened with - the full output of the command. +:Rails! Show the version of rails.vim installed. If rails.vim + is active for the current buffer, also show the type + of Rails file detected. *rails-:Rcd* :Rcd [{directory}] |:cd| to /path/to/railsapp/{directory}. @@ -189,15 +175,19 @@ actually edit a file from a Rails application. *rails-:Rpreview* :Rpreview [{path}] Creates a URL from http://localhost:3000/ and the - {path} given. If {path} is omitted, a sensible - default is used (considers the current - controller/template, but does not take routing into - account). The not too useful default is to then edit - this URL using Vim itself, allowing |netrw| to + {path} given. The not too useful default is to then + edit this URL using Vim itself, allowing |netrw| to download it. More useful is to define a :OpenURL command, which will be used instead (see - |rails-:OpenURL|). - + |rails-:OpenURL|). If {path} is omitted, a sensible + default is used (considers the current + controller/template, but does not take routing into + account). The default is overridden by comments like + the following that are either before the current + method call or at the top of the file: > + # GET /users + # PUT /users/1 +< *rails-:Rpreview!* :Rpreview! [{path}] As with :Rpreview, except :OpenURL is never used. @@ -300,19 +290,21 @@ Alternate and Related Files ~ Two commands, :A and :R, are used quickly jump to an "alternate" and a "related" file, defined below. - *rails-:A* *rails-:AE* *rails-:AS* *rails-:AV* *rails-:AT* + *rails-:A* *rails-:AE* *rails-:AS* *rails-:AV* *rails-:AT* *rails-:AD* :A These commands were picked to mimic Michael Sharpe's :AE a.vim. Briefly, they edit the "alternate" file, in :AS either the same window (:A and :AE), a new split -:AV window (:AS), a new vertically split window (:AV), or -:AT a new tab (:AT). A mapping for :A is [f . +:AV window (:AS), a new vertically split window (:AV), a +:AT new tab (:AT), or read it into the current buffer +:AD (:AD). A mapping for :A is [f . - *rails-:R* *rails-:RE* *rails-:RS* *rails-:RV* *rails-:RT* + *rails-:R* *rails-:RE* *rails-:RS* *rails-:RV* *rails-:RT* *rails-:RD* :R These are similar |rails-:A| and friends above, only :RE they jump to the "related" file rather than the :RS "alternate." A mapping for :R is ]f . :RV :RT +:RD *rails-alternate* *rails-related* The alternate file is most frequently the test file, though there are @@ -321,12 +313,12 @@ location in the file. For example, when editing a controller, the related file is template for the method currently being edited. The easiest way to learn these commands is to experiment. A few examples of -alternate and related files follow: +alternate and related files for a Test::Unit application follow: Current file Alternate file Related file ~ -model unit test related migration +model unit test schema definition controller (in method) functional test template (view) -template (view) helper controller (jump to method) +template (view) functional test controller (jump to method) migration previous migration next migration config/routes.rb config/database.yml config/environment.rb @@ -343,12 +335,12 @@ 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). They -also allow for jumping to methods or line numbers using the same syntax as -|:Redit|. +Each of the following commands has variants for splitting, vertical splitting, +opening in a new tab, and reading the file into the current buffer. For +:Rmodel, those variants would be :RSmodel, :RVmodel, :RTmodel, and :RDmodel. +There is also :REmodel which is a synonym for :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 ~ @@ -432,16 +424,15 @@ like: > that cannot be found. A new layout will be created if an extension is given. - *rails-:Rapi* -:Rapi [{name}] Edit the API for the specified controller. This - command is deprecated; add it yourself with - |:Rnavcommand| if you still desire it. - *rails-:Rfunctionaltest* :Rfunctionaltest [{name}] Edit the functional test or controller spec for the specified controller. + *rails-:Rapi* +:Rapi [{name}] This command is obsolete; add it yourself with + |:Rnavcommand| if you still desire it. + Miscellaneous Navigation Commands ~ *rails-misc-navigation* @@ -455,6 +446,7 @@ The following commands are not clearly associated with models or controllers. :Rmetal |rails-:Rmetal| :Renvironment |rails-:Renvironment| :Rinitializer |rails-:Rinitializer| +:Rlocale |rails-:Rlocale| :Rintegrationtest |rails-:Rintegrationtest| :Rspec |rails-:Rspec| @@ -497,11 +489,17 @@ The following commands are not clearly associated with models or controllers. :Rinitializer [{name}] Edit the config/initializers file specified. With no argument, defaults to editing config/routes.rb. + *rails-:Rlocale* +:Rlocale [{name}] Edit the config/locale file specified, optionally + adding a yml or rb extension if none is given. With + no argument, checks config/environment.rb for the + default locale. + *rails-:Rintegrationtest* :Rintegrationtest [{name}] - Edit the integration test or cucumber feature - specified. With no argument, defaults to editing - test/test_helper.rb. + Edit the integration test, integration spec, 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 @@ -533,7 +531,7 @@ in an initialization routine of some sort (e.g., an autocommand); see is used as a default. *rails-:Rcommand* -:Rcommand Deprecated alias for |:Rnavcommand| +:Rcommand Obsolete alias for |:Rnavcommand|. Examples: > Rnavcommand api app/apis -glob=**/* -suffix=_api.rb @@ -547,6 +545,64 @@ above is |CTRL-^|. This keystroke edits the previous file, and is helpful to back out of any of the above commands. ============================================================================== +RAKE *rails-rake* + +Rake integration happens through the :Rake command. + + *rails-:Rake* +:[range]Rake {targets} Calls |:make!| {targets} (with 'makeprg' being rake) + and opens the quickfix window if there were any + errors. If {targets} are omitted, :Rake defaults to + something sensible as described below. Giving a line + number argument may affect that default. + + *rails-:Rake!* +:[range]Rake! {targets} Called with a bang, :Rake will forgo opening the + quickfix window. + + *rails-rake-defaults* + +Generally, the default task is one that runs the test you'd expect. For +example, if you're in a view in an RSpec application, the view spec is run, +but if it's a Test::Unit application, the functional test for the +corresponding controller is run. The following table lists the most +interesting mappings: + +File Task ~ +unit test test:units TEST=... +functional test test:functionals TEST=... +integration test test:integration TEST=... +spec spec SPEC=... +feature cucumber FEATURE=... +model test:units TEST=... spec SPEC=... +controller test:functionals TEST=... spec SPEC=... +helper test:functionals TEST=... spec SPEC=... +view test:functionals TEST=... spec SPEC=... +fixtures db:fixtures:load FIXTURES=... +migration db:migrate VERSION=... +config/routes.rb routes +db/seeds.rb db:seed + +Additionally, when :Rake is given a line number (e.g., :.Rake), the following +additional tasks can be invoked: + +File Task ~ +unit test test:units TEST=... TESTOPTS=-n... +functional test test:functionals TEST=... TESTOPTS=-n... +integration test test:integration TEST=... TESTOPTS=-n... +spec spec SPEC=... SPEC_OPTS=--line=... +feature cucumber FEATURE=...:... +controller routes CONTROLLER=... +fixtures db:fixtures:identify LABEL=... +migration in self.up db:migrate:up VERSION=... +migration in self.down db:migrate:down VERSION=... +migration elsewhere db:migrate:redo VERSION=... +task ... (try to guess currently edited declaration) + +Finally, you can override the default task with a comment like "# rake ..." +before the method pointed to by [range] or at the top of the file. + +============================================================================== SCRIPT WRAPPERS *rails-scripts* The following commands are wrappers around the scripts in the script directory @@ -559,14 +615,7 @@ A limited amount of completion with <Tab> is supported. calling script/console. *rails-:Rconsole* -: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!) +:Rconsole {options} Obsolete. Call |:Rscript| instead. *rails-:Rrunner* :[range]Rrunner {code} Executes {code} with script/runner. Differs from @@ -619,7 +668,7 @@ The :Rextract command can be used to extract a partial to a new file. *rails-:Rpartial* :[range]Rpartial [{controller}/]{name} - Deprecated alias for :Rextract. + Obsolete alias for :Rextract. If this is your file, in app/views/blog/show.html.erb: > @@ -680,13 +729,14 @@ A handful of Vim plugins are enhanced by rails.vim. All plugins mentioned can be found at http://www.vim.org/. Cream and GUI menus (for lack of a better place) are also covered in this section. - *rails-:Rproject* *rails-project* -:Rproject [{file}] This command is only provided when the |project| - plugin is installed. Invoke :Project (typically - without an argument), and search for the root of the - current Rails application. If it is not found, create - a new project, with appropriate directories (app, - etc., but not vendor). + *rails-:Rtree* *rails-:Rproject* +:Rtree [{arg}] If |NERDTree| is installed, open a tree for the + application root or the given subdirectory. + Otherwise, if when the |project| plugin is installed, + invoke :Project (typically without an argument), and + search for the root of the current Rails application. + If it is not found, create a new project, with + appropriate directories (app, etc., but not vendor). *rails-:Rdbext* *rails-dbext* :Rdbext [{environment}] This command is only provided when the |dbext| plugin @@ -700,13 +750,6 @@ place) are also covered in this section. 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, and has been largely - superseded by |:Rake| db:create. - *rails-surround* The |surround| plugin available from vim.org enables adding and removing "surroundings" like parentheses, quotes, and HTML tags. Even by itself, it is @@ -914,11 +957,6 @@ The 'includeexpr' option is set to enable the magic described in |rails-gf|. Useful information is added to the 'statusline', when |g:rails_statusline| is enabled. - *rails-'makeprg'* *rails-'mp'* - *rails-'errorformat'* *rails-'efm'* -Rake is used as the 'makeprg', so |:make| will work as expected. Also, -'errorformat' is set appropriately to handle your tests. - *rails-'filetype'* *rails-'ft'* The 'filetype' is sometimes adjusted for Rails files. Most notably, *.rxml and *.rjs are treated as Ruby files, and files that have been falsely @@ -941,15 +979,16 @@ loaded, you can use an autocommand like the following in your vimrc: > autocmd User Rails silent! Rlcd autocmd User Rails map <buffer> <F9> :Rake<CR> You can also have autocommands that only apply to certain types of files. -These are based off the information shown in the 'statusline' (see -|rails-'statusline'|), with hyphens changed to periods. A few examples: > +These are based off the information shown when running the |:Rails!| +command, 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.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 - autocmd User Rails/**/foo_bar.rb Rabbrev FB:: FooBar +specification, to allow for more specific subtypes to be added in the future. +There is also a filename matching syntax: > + autocmd User Rails/config/environment.rb Rabbrev c config + autocmd User Rails/**/foo_bar.rb Rabbrev FB:: FooBar Use the filetype based syntax whenever possible, reserving the filename based syntax for more advanced cases. @@ -989,8 +1028,6 @@ Option Meaning ~ b:alternate Custom alternate file for :A, relative to the Rails root b:controller Default controller for certain commands (e.g., :Rhelper) b:model Default model for certain commands (e.g., :Rfixtures) -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 @@ -1107,8 +1144,10 @@ 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. (Does anybody care about this? Years after writing it the author is -beginning to think it is mostly a waste of space.) +default. This used to be a far more verbose indicator which included the +type of Rails file. If you actually liked this, you can add either +%{rails#statusline(1)} or %{rails#STATUSLINE(1)} to 'statusline' explicitly +(and let the author know, because this fallback is likely getting the boot). *g:rails_syntax* > let g:rails_syntax=1 dot.vim/doc/rails.txt @@ -83,16 +83,12 @@ multiple-items-example yankring.txt /*multiple-items-example* rails rails.txt /*rails* rails-'cfu' rails.txt /*rails-'cfu'* rails-'completefunc' rails.txt /*rails-'completefunc'* -rails-'efm' rails.txt /*rails-'efm'* -rails-'errorformat' rails.txt /*rails-'errorformat'* rails-'et' rails.txt /*rails-'et'* rails-'expandtab' rails.txt /*rails-'expandtab'* rails-'filetype' rails.txt /*rails-'filetype'* rails-'ft' rails.txt /*rails-'ft'* rails-'includeexpr' rails.txt /*rails-'includeexpr'* rails-'inex' rails.txt /*rails-'inex'* -rails-'makeprg' rails.txt /*rails-'makeprg'* -rails-'mp' rails.txt /*rails-'mp'* rails-'pa' rails.txt /*rails-'pa'* rails-'path' rails.txt /*rails-'path'* rails-'shiftwidth' rails.txt /*rails-'shiftwidth'* @@ -104,12 +100,14 @@ rails-'sua' rails.txt /*rails-'sua'* rails-'suffixesadd' rails.txt /*rails-'suffixesadd'* rails-'sw' rails.txt /*rails-'sw'* rails-:A rails.txt /*rails-:A* +rails-:AD rails.txt /*rails-:AD* rails-:AE rails.txt /*rails-:AE* rails-:AS rails.txt /*rails-:AS* rails-:AT rails.txt /*rails-:AT* rails-:AV rails.txt /*rails-:AV* rails-:OpenURL rails.txt /*rails-:OpenURL* rails-:R rails.txt /*rails-:R* +rails-:RD rails.txt /*rails-:RD* rails-:RE rails.txt /*rails-:RE* rails-:RS rails.txt /*rails-:RS* rails-:RT rails.txt /*rails-:RT* @@ -125,7 +123,6 @@ rails-:Rcommand rails.txt /*rails-:Rcommand* rails-:Rconsole rails.txt /*rails-:Rconsole* rails-:Rcontroller rails.txt /*rails-:Rcontroller* rails-:Rdbext rails.txt /*rails-:Rdbext* -rails-:Rdbext! rails.txt /*rails-:Rdbext!* rails-:Rdestroy rails.txt /*rails-:Rdestroy* rails-:Rdoc rails.txt /*rails-:Rdoc* rails-:Rdoc! rails.txt /*rails-:Rdoc!* @@ -144,6 +141,7 @@ rails-:Rjavascript rails.txt /*rails-:Rjavascript* rails-:Rlayout rails.txt /*rails-:Rlayout* rails-:Rlcd rails.txt /*rails-:Rlcd* rails-:Rlib rails.txt /*rails-:Rlib* +rails-:Rlocale rails.txt /*rails-:Rlocale* rails-:Rlog rails.txt /*rails-:Rlog* rails-:Rmetal rails.txt /*rails-:Rmetal* rails-:Rmigration rails.txt /*rails-:Rmigration* @@ -168,6 +166,7 @@ rails-:Rspec rails.txt /*rails-:Rspec* rails-:Rstylesheet rails.txt /*rails-:Rstylesheet* rails-:Rtags rails.txt /*rails-:Rtags* rails-:Rtask rails.txt /*rails-:Rtask* +rails-:Rtree rails.txt /*rails-:Rtree* rails-:Runittest rails.txt /*rails-:Runittest* rails-:Rview rails.txt /*rails-:Rview* rails-:Ry rails.txt /*rails-:Ry* @@ -202,8 +201,9 @@ rails-navigation rails.txt /*rails-navigation* rails-options rails.txt /*rails-options* rails-partials rails.txt /*rails-partials* rails-plugin-author rails.txt /*rails-plugin-author* -rails-project rails.txt /*rails-project* rails-rails-integration rails.txt /*rails-rails-integration* +rails-rake rails.txt /*rails-rake* +rails-rake-defaults rails.txt /*rails-rake-defaults* rails-refactoring rails.txt /*rails-refactoring* rails-related rails.txt /*rails-related* rails-rspec rails.txt /*rails-rspec* dot.vim/doc/tags @@ -1,8 +1,8 @@ "============================================================================= " File: gist.vim " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com> -" Last Change: 03-Jul-2009. -" Version: 2.7 +" Last Change: 31-Oct-2009. +" Version: 3.1 " WebPage: http://github.com/mattn/gist-vim/tree/master " Usage: " @@ -18,10 +18,17 @@ " :Gist -a " post whole text to gist with anonymous. " +" :Gist -m +" post multi buffer to gist. +" " :Gist -e " edit the gist. (shoud be work on gist buffer) " you can update the gist with :w command on gist buffer. " +" :Gist -d +" delete the gist. (should be work on gist buffer) +" password authentication is needed. +" " :Gist -e foo.js " edit the gist with name 'foo.js'. (shoud be work on gist buffer) " @@ -159,10 +166,10 @@ function! s:GistList(user, token, gistls) exe "normal \<c-w>".winnum."w" endif setlocal modifiable - silent %d _ else exec 'silent split gist:'.a:gistls endif + silent %d _ exec 'silent 0r! curl -s '.url silent! %s/>/>\r/g silent! %s/</\r</g @@ -228,7 +235,6 @@ function! s:GistGet(user, token, gistid, clipboard) exe "normal \<c-w>".winnum."w" endif setlocal modifiable - silent %d _ else exec 'silent split gist:'.a:gistid endif @@ -301,13 +307,67 @@ function! s:GistUpdate(user, token, content, gistid, gistnm) let res = substitute(res, '^.*: ', '', '') if len(res) > 0 && res != 'http://gist.github.com/gists' setlocal nomodified - echo 'done: '.res + echo 'Done: '.res else echoerr 'Edit failed' endif return res endfunction +function! s:GistGetSessionID(user, password) + let query = [ + \ 'login=%s', + \ 'password=%s', + \ ] + let squery = printf(join(query, '&'), + \ s:encodeURIComponent(a:user), + \ s:encodeURIComponent(a:password)) + unlet query + + let file = tempname() + exec 'redir! > '.file + silent echo squery + redir END + let quote = &shellxquote == '"' ? "'" : '"' + let url = 'https://gist.github.com/session' + let res = system('curl -i -d @'.quote.file.quote.' '.url) + call delete(file) + let loc = matchstr(split(res, '\(\r\?\n\|\r\n\?\)'), '^Location: ') + let loc = substitute(res, '^.*: ', '', '') + if len(loc) + let res = matchstr(split(res, '\(\r\?\n\|\r\n\?\)'), '^Set-Cookie: ') + let res = substitute(res, '^.*: \([^;]\+\).*$', '\1', '') + else + let res = '' + endif + return res +endfunction + +function! s:GistDelete(user, token, gistid) + let password = inputsecret('Password:') + if len(password) == 0 + echo 'Canceled' + return + endif + echon "Login to gist... " + let cookie = s:GistGetSessionID(a:user, password) + if len(cookie) == 0 + echo 'Failed' + return + endif + echon " Deleting gist... " + let quote = &shellxquote == '"' ? "'" : '"' + let url = 'http://gist.github.com/delete/'.a:gistid + let res = system('curl -i -b '.quote.cookie.quote.' '.url) + let res = matchstr(split(res, '\(\r\?\n\|\r\n\?\)'), '^Location: ') + let res = substitute(res, '^.*: ', '', '') + if len(res) > 0 && res != 'http://gist.github.com/gists' + echo 'Done: ' + else + echoerr 'Delete failed' + endif +endfunction + function! s:GistPost(user, token, content, private) let ext = expand('%:e') let ext = len(ext) ? '.'.ext : '' @@ -326,7 +386,7 @@ function! s:GistPost(user, token, content, private) endif if a:private - call add(query, 'private=on') + call add(query, 'action_button=private') endif let squery = printf(join(query, '&'), \ s:encodeURIComponent(ext), @@ -347,8 +407,70 @@ function! s:GistPost(user, token, content, private) call delete(file) let res = matchstr(split(res, '\(\r\?\n\|\r\n\?\)'), '^Location: ') let res = substitute(res, '^.*: ', '', '') - if len(res) > 0 && res != 'http://gist.github.com/gists' - echo 'done: '.res + if len(res) > 0 && res =~ '^\(http\|https\):\/\/gist\.github\.com\/' + echo 'Done: '.res + else + echoerr 'Post failed' + endif + return res +endfunction + +function! s:GistPostBuffers(user, token, private) + let bufnrs = range(1, last_buffer_nr()) + let bn = bufnr('%') + let query = [] + if len(a:user) > 0 && len(a:token) > 0 + call add(query, 'login=%s') + call add(query, 'token=%s') + else + call add(query, '%.0s%.0s') + endif + if a:private + call add(query, 'action_button=private') + endif + let squery = printf(join(query, "&"), + \ s:encodeURIComponent(a:user), + \ s:encodeURIComponent(a:token)) . '&' + + let query = [ + \ 'file_ext[gistfile]=%s', + \ 'file_name[gistfile]=%s', + \ 'file_contents[gistfile]=%s', + \ ] + let format = join(query, "&") . '&' + + let index = 1 + for bufnr in bufnrs + if buflisted(bufnr) == 0 || bufwinnr(bufnr) == -1 + continue + endif + echo "Creating gist content".index."... " + silent! exec "buffer! ".bufnr + let content = join(getline(1, line('$')), "\n") + let ext = expand('%:e') + let ext = len(ext) ? '.'.ext : '' + let name = expand('%:t') + let squery .= printf(substitute(format, 'gistfile', 'gistfile'.index, 'g'), + \ s:encodeURIComponent(ext), + \ s:encodeURIComponent(name), + \ s:encodeURIComponent(content)) + let index = index + 1 + endfor + silent! exec "buffer! ".bn + + let file = tempname() + exec 'redir! > '.file + silent echo squery + redir END + echo "Posting it to gist... " + let quote = &shellxquote == '"' ? "'" : '"' + let url = 'http://gist.github.com/gists' + let res = system('curl -i -d @'.quote.file.quote.' '.url) + call delete(file) + let res = matchstr(split(res, '\(\r\?\n\|\r\n\?\)'), '^Location: ') + let res = substitute(res, '^.*: ', '', '') + if len(res) > 0 && res =~ '^\(http\|https\):\/\/gist\.github\.com\/' + echo 'Done: '.res else echoerr 'Post failed' endif @@ -379,7 +501,9 @@ function! Gist(line1, line2, ...) let gistls = '' let gistnm = '' let private = 0 + let multibuffer = 0 let clipboard = 0 + let deletepost = 0 let editpost = 0 let listmx = '^\(-l\|--list\)\s*\([^\s]\+\)\?$' let bufnamemx = '^gist:\(\d\+\)$' @@ -390,6 +514,8 @@ function! Gist(line1, line2, ...) let gistls = '-all' elseif arg =~ '^\(-l\|--list\)$' let gistls = g:github_user + elseif arg =~ '^\(-m\|--multibuffer\)$' + let multibuffer = 1 elseif arg =~ '^\(-p\|--private\)$' let private = 1 elseif arg =~ '^\(-a\|--anonymous\)$' @@ -397,11 +523,14 @@ function! Gist(line1, line2, ...) let token = '' elseif arg =~ '^\(-c\|--clipboard\)$' let clipboard = 1 + elseif arg =~ '^\(-d\|--delete\)$' && bufname =~ bufnamemx + let deletepost = 1 + let gistid = substitute(bufname, bufnamemx, '\1', '') elseif arg =~ '^\(-e\|--edit\)$' && bufname =~ bufnamemx let editpost = 1 let gistid = substitute(bufname, bufnamemx, '\1', '') elseif len(gistnm) == 0 - if editpost == 1 + if editpost == 1 || deletepost == 1 let gistnm = arg elseif len(gistls) > 0 let gistls = arg @@ -421,24 +550,31 @@ function! Gist(line1, line2, ...) "echo "private=".private "echo "clipboard=".clipboard "echo "editpost=".editpost + "echo "deletepost=".deletepost if len(gistls) > 0 call s:GistList(user, token, gistls) - elseif len(gistid) > 0 && editpost == 0 + elseif len(gistid) > 0 && editpost == 0 && deletepost == 0 call s:GistGet(user, token, gistid, clipboard) else - let content = join(getline(a:line1, a:line2), "\n") - if editpost == 1 - let url = s:GistUpdate(user, token, content, gistid, gistnm) + if multibuffer == 1 + let url = s:GistPostBuffers(user, token, private) else - let url = s:GistPost(user, token, content, private) - endif - if len(url) > 0 && g:gist_open_browser_after_post - let cmd = substitute(g:gist_browser_command, '%URL%', url, 'g') - if cmd =~ '^!' - silent! exec cmd + let content = join(getline(a:line1, a:line2), "\n") + if editpost == 1 + let url = s:GistUpdate(user, token, content, gistid, gistnm) + elseif deletepost == 1 + let url = s:GistDelete(user, token, gistid) else - call system(cmd) + let url = s:GistPost(user, token, content, private) + endif + if len(url) > 0 && g:gist_open_browser_after_post + let cmd = substitute(g:gist_browser_command, '%URL%', url, 'g') + if cmd =~ '^!' + silent! exec cmd + else + call system(cmd) + endif endif endif endif @@ -446,3 +582,4 @@ function! Gist(line1, line2, ...) endfunction command! -nargs=? -range=% Gist :call Gist(<line1>, <line2>, <f-args>) +" vim:set et: dot.vim/plugin/gist.vim @@ -70,7 +70,7 @@ 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_ctags_arguments","--exclude=facebox.js --exclude=\"*.*.js\"") +call s:SetOptDefault("rails_ctags_arguments","--exclude=\"*.js\"") call s:SetOptDefault("rails_expensive",1) call s:SetOptDefault("rails_dbext",g:rails_expensive) call s:SetOptDefault("rails_default_file","README") dot.vim/plugin/rails.vim 7af2ed545580640dabf50106ecdf7e6587a81f88 kenchan kenichi.taka@gmail.com http://github.com/kenchan/dotfiles/commit/34ede5be04582a653b89f79538bde1fa244b6921 34ede5be04582a653b89f79538bde1fa244b6921 2009-11-05T02:12:29-08:00 2009-11-05T02:12:29-08:00 executed GLVS 67b989ef7af3b6aadc3d84556b6edc5528ebc3f9 kenchan kenichi.taka@gmail.com