summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ale_linters/eruby/erubis.vim18
-rw-r--r--test/command_callback/test_erubis_command_callback.vader21
2 files changed, 36 insertions, 3 deletions
diff --git a/ale_linters/eruby/erubis.vim b/ale_linters/eruby/erubis.vim
index be9332df..ac356aeb 100644
--- a/ale_linters/eruby/erubis.vim
+++ b/ale_linters/eruby/erubis.vim
@@ -1,11 +1,23 @@
-" Author: Jake Zimmerman <jake@zimmerman.io>
+" Author: Jake Zimmerman <jake@zimmerman.io>, Eddie Lebow https://github.com/elebow
" Description: eruby checker using `erubis`, instead of `erb`
+function! ale_linters#eruby#erubis#GetCommand(buffer) abort
+ let l:rails_root = ale#ruby#FindRailsRoot(a:buffer)
+
+ if empty(l:rails_root)
+ return 'erubis -x %t | ruby -c'
+ endif
+
+ " Rails-flavored eRuby does not comply with the standard as understood by
+ " Erubis, so we'll have to do some substitution. This does not reduce the
+ " effectiveness of the linter—the translated code is still evaluated.
+ return 'ruby -r erubis -e ' . ale#Escape('puts Erubis::Eruby.new($stdin.read.gsub(%{<%=},%{<%})).src') . ' | ruby -c'
+endfunction
+
call ale#linter#Define('eruby', {
\ 'name': 'erubis',
\ 'executable': 'erubis',
\ 'output_stream': 'stderr',
-\ 'command': 'erubis -x %t | ruby -c',
+\ 'command_callback': 'ale_linters#eruby#erubis#GetCommand',
\ 'callback': 'ale#handlers#ruby#HandleSyntaxErrors',
\})
-
diff --git a/test/command_callback/test_erubis_command_callback.vader b/test/command_callback/test_erubis_command_callback.vader
new file mode 100644
index 00000000..68624ec6
--- /dev/null
+++ b/test/command_callback/test_erubis_command_callback.vader
@@ -0,0 +1,21 @@
+Before:
+ runtime ale_linters/eruby/erubis.vim
+ call ale#test#SetDirectory('/testplugin/test/command_callback')
+
+After:
+ call ale#linter#Reset()
+ call ale#test#RestoreDirectory()
+
+Execute(Executable should not contain any filter code by default):
+ call ale#test#SetFilename('../ruby_fixtures/not_a_rails_app/file.rb')
+
+ AssertEqual
+ \ 'erubis -x %t | ruby -c',
+ \ ale_linters#eruby#erubis#GetCommand(bufnr(''))
+
+Execute(Executable should filter invalid eRuby when inside a Rails project):
+ call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/app/views/my_great_view.html.erb')
+
+ AssertEqual
+ \ 'ruby -r erubis -e ' . ale#Escape('puts Erubis::Eruby.new($stdin.read.gsub(%{<%=},%{<%})).src') . ' | ruby -c',
+ \ ale_linters#eruby#erubis#GetCommand(bufnr(''))