codeqa 0.3.1 → 0.4.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c09b3131b75904946b9e3e24a598b59ab86d40b
-  data.tar.gz: 19994d97490645b0fd3badda12d8e9cafd70f50d
+  metadata.gz: 3ae0299a503f1cb9639e037907ade194edfe3db0
+  data.tar.gz: 859128b8f52f560cc2dedb79157134237179b042
 SHA512:
-  metadata.gz: 809b78c163111c868e33489ca63044cf3da990bb1f84eed7a3add12fe40869d15e8768923896fd3dad1701b13e23e372b1e4cc9ca9b2aa842b90dff774cba2ea
-  data.tar.gz: da7709431d55c0b3244f81b9034d619e7906dcc110bcf3082ac7cca7db80137d4ae74b0433aa9c00f84ff93b0a760042737fac1f8f676d33681755bbb6f2e6dc
+  metadata.gz: 198df6738b57d3fbfb076bd3522b7b715b10245ce40769bbfb6b67e3e4af07df622504edc2d867d98cf8fc713582cbf95aa63de01c9a69e914e78c7d6d00c991
+  data.tar.gz: ec6c8833e4b66ba642b0ee30016f2c7d5d7e477f64cc59f69c5d6c49202c41667496e998631687e2ae863fa95f8f9c37a3cbbe0bfab81370ff2ceddecb5dc626

data/Gemfile

@@ -4,7 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rubocop'
   gem 'guard-rspec'
   gem 'guard-rubocop'
   gem 'rb-inotify', :require => false
@@ -12,6 +11,12 @@ group :development do
   # gem 'rb-fchange', :require => false #windows only
 end
 
+group :development, :test do
+  gem 'pry-byebug'
+  gem 'nokogiri'
+  gem 'rubocop'
+end
+
 group :test do
   gem 'simplecov', :require => false
   gem 'coveralls', :require => false

data/Guardfile

@@ -9,9 +9,8 @@ group :red_green_refactor, halt_on_fail: true do
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})               { |m| "spec/lib/#{m[1]}_spec.rb" }
     watch('spec/spec_helper.rb')            { 'spec' }
-    watch('spec/factories.rb')              { 'spec' }
-    watch('spec/support/jobs.json')         { 'spec' }
-    watch(%r{^spec/factories/(.+)\.rb})     { 'spec' }
+    watch(%r{^spec/support/(.+)\.rb})       { 'spec' }
+    watch(%r{^spec/fixtures/(.+)})          { 'spec' }
   end
 
   guard :rubocop, cli: %w(--display-cop-names --auto-correct) do

data/lib/codeqa.rb

@@ -64,7 +64,6 @@ end
 require 'codeqa/version'
 require 'codeqa/sourcefile'
 require 'codeqa/checker'
-require 'codeqa/check_errors'
 require 'codeqa/runner'
 require 'codeqa/runner_decorator'
 

data/lib/codeqa/checker.rb

@@ -1,6 +1,7 @@
 require 'stringio'
 require 'tempfile'
 require 'forwardable'
+require 'codeqa/utils/check_errors'
 
 module Codeqa
   class Checker
@@ -33,15 +34,5 @@ module Codeqa
         end
       end
     end
-
-    def capture
-      $stdout, stdout = StringIO.new, $stdout
-      $stderr, stderr = StringIO.new, $stderr
-      result = yield
-      [result, $stdout.string + $stderr.string]
-    ensure
-      $stdout = stdout
-      $stderr = stderr
-    end
   end
 end

data/lib/codeqa/checkers/check_erb.rb

@@ -24,10 +24,10 @@ module Codeqa
         else
           ERB.new(sourcefile.content.gsub('<%=', '<%'), nil, '-').result
         end
-      rescue SyntaxError
+      rescue SyntaxError => e
         errors.add(nil, <<-EOF)
-        #{$!.message}
-        #{$!.backtrace.join("\n")}
+        #{e.message}
+        #{e.backtrace.join("\n")}
         EOF
       rescue Exception
         true # valid syntax - just the proper setup for the template/rendering is missing

data/lib/codeqa/checkers/check_erb_html.rb

@@ -1,4 +1,4 @@
-require 'codeqa/fake_erb'
+require 'codeqa/utils/erb_sanitizer'
 require 'open3'
 module Codeqa
   module Checkers
@@ -25,13 +25,13 @@ module Codeqa
         end # Tempfile
 
         return unless result
-        errors.add(nil, html)
+        errors.add(:source, html)
         errors.add(nil, result)
       end
 
       def html
         @html ||= begin
-                    html = FakeERB.new(sourcefile.content.gsub('<%=', '<%')).result
+                    html = ErbSanitizer.new(sourcefile.content).result
                     html = html.force_encoding('UTF-8') if html.respond_to?(:force_encoding)
                     html.gsub(%r{<script[ >].*?</script>|<style[ >].*?</style>}m,
                               '<!--removed script/style tag-->')

data/lib/codeqa/checkers/html_validator.rb

@@ -0,0 +1,52 @@
+require 'codeqa/utils/erb_sanitizer'
+
+module Codeqa
+  module Checkers
+    class HtmlValidator < Checker
+      def self.check?(sourcefile)
+        sourcefile.html?
+      end
+
+      def self.available?
+        nokogiri?
+      end
+
+      def name
+        'html'
+      end
+
+      def hint
+        'Nokogiri found XHTML errors, please fix them.'
+      end
+
+      REMOVED_NOKOGIRI_ERRORS = Regexp.union(
+        /Opening and ending tag mismatch: (special line 1|\w+ line 1 and special)/,
+        /Premature end of data in tag special/,
+        /Extra content at the end of the document/,
+        /xmlParseEntityRef: no name/
+      )
+      def check
+        return unless self.class.nokogiri?
+        doc = Nokogiri::XML "<special>#{stripped_html}</special>"
+
+        doc.errors.delete_if{ |e| e.message =~ REMOVED_NOKOGIRI_ERRORS }
+        errors.add(:source, sourcefile.content) unless doc.errors.empty?
+        # errors.add(:source, stripped_html) unless doc.errors.empty?
+        doc.errors.each do |error|
+          errors.add(error.line, error.message) unless error.warning?
+        end
+      end
+
+      def stripped_html
+        @html ||= ErbSanitizer.new(sourcefile.content).result
+      end
+
+      def self.nokogiri?
+        @loaded ||= begin
+                      require 'nokogiri'
+                      true
+                    end
+      end
+    end
+  end
+end

data/lib/codeqa/checkers/pattern_checker.rb

@@ -4,7 +4,7 @@ module Codeqa
       def check
         sourcefile.content.lines.each.with_index do |line, line_number|
           pos = (line =~ pattern)
-          errors.add("#{line_number + 1},#{pos + 1}", error_msg(line, line_number + 1, pos)) if pos
+          errors.add([line_number + 1, pos + 1], error_msg(line, line_number + 1, pos)) if pos
         end
       end
 

data/lib/codeqa/checkers/rubocop_full.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module Codeqa
   module Checkers
     class Rubocop < Checker
@@ -21,14 +23,14 @@ module Codeqa
         return unless self.class.rubocop?
         with_existing_file do |filename|
           args = config_args << filename
-          success, captured = capture do
+          success, raw_json = capture do
             if defined?(RuboCop) # its RuboCop since 0.24
               ::RuboCop::CLI.new.run(default_args + args) == 0
             else
               ::Rubocop::CLI.new.run(default_args + args) == 0
             end
           end
-          errors.add(nil, captured) unless success
+          handle_rubocop_results(raw_json) unless success
         end
       end
 
@@ -39,15 +41,39 @@ module Codeqa
       end
 
       def default_args
-        %w(--display-cop-names --format emacs)
+        %w(--format json)
       end
 
+      def handle_rubocop_results(raw)
+        data = JSON.parse raw, :object_class => OpenStruct
+        data.files.
+             reject{ |f| f.offenses.empty? }.
+             each do |file|
+               file.offenses.each do |offense|
+                 position = [offense.location.line, offense.location.column]
+                 errors.add(position, "#{offense.cop_name}: #{offense.message}")
+               end
+             end
+      end
       def self.rubocop?
         @loaded ||= begin
                       require 'rubocop'
                       true
                     end
       end
+
+      # Since using the json format we only care about stdout
+      # stderr will be silent
+      def capture
+        $stdout, stdout = StringIO.new, $stdout
+        $stderr, stderr = StringIO.new, $stderr
+        result = yield
+        # [result, $stdout.string + $stderr.string]
+        [result, $stdout.string]
+      ensure
+        $stdout = stdout
+        $stderr = stderr
+      end
     end
   end
 end

data/lib/codeqa/runner_decorator.rb

@@ -32,13 +32,26 @@ module Codeqa
 
   private
 
+    # TODO: move this error formating into check error class
     def error_details
       msg = ''
       @runner.failures.each do |checker|
-        msg << error("------- #{checker.name} -------\n")
-        msg << error("#{checker.hint}\n")
-        checker.errors.details.each do |detail|
-          msg << info("#{detail[1]}\n")
+        msg << error("------- #{checker.name} -------") << "\n"
+        msg << error("#{checker.hint}") << "\n"
+        checker.errors.details.each do |type, content|
+          case type
+          when :source
+            content.each_line.with_index do |l, i|
+              msg << yellow((i + 1).to_s.rjust(3)) << '|' << l
+            end
+          when Integer
+            msg << info('Line: ') << yellow(type) << '|' << info(content)
+          when Array
+            msg << info('Pos: ') << yellow(type.join(',')) << '|' << info(content)
+          when nil
+            msg << info(content)
+          end
+          msg << "\n"
         end
       end
       msg
@@ -73,9 +86,9 @@ module Codeqa
       colorize(32, txt)
     end
 
-    # def yellow(txt)
-    #   colorize(33, txt)
-    # end
+    def yellow(txt)
+      colorize(33, txt)
+    end
 
     # def pink(txt)
     #   colorize(35, txt)

data/lib/codeqa/utils/erb_sanitizer.rb

@@ -0,0 +1,85 @@
+require 'erb'
+# Based on ERB source from ruby 2.1.2
+# https://github.com/ruby/ruby/blob/v2_1_2/lib/erb.rb#L597
+module Codeqa
+  class ErbSanitizer < ERB
+    def make_compiler(trim_mode)
+      ErbSanitizer::Compiler.new(trim_mode)
+    end
+
+    class Compiler < ERB::Compiler
+      # Compiles an ERB template into Ruby code.  Returns an array of the code
+      # and encoding like ["code", Encoding].
+      # rubocop:disable Style/CyclomaticComplexity
+      def compile(s)
+        enc = s.encoding
+        raise ArgumentError, "#{enc} is not ASCII compatible" if enc.dummy?
+        s = s.b # see String#b
+        enc = detect_magic_comment(s) || enc
+        out = Buffer.new(self, enc)
+
+        content = ''
+        scanner = make_scanner(s)
+        scanner.scan do |token|
+          next if token.nil?
+          next if token == ''
+          if scanner.stag.nil?
+            case token
+            when PercentLine
+              add_put_cmd(out, content) if content.size > 0
+              content = ''
+              out.push(token.to_s)
+              out.cr
+            when :cr
+              out.cr
+            when '<%', '<%=', '<%#'
+              scanner.stag = token
+              add_put_cmd(out, content) if content.size > 0
+              content = ''
+            when "\n"
+              content << "\n"
+              add_put_cmd(out, content)
+              content = ''
+            when '<%%'
+              content << '<%'
+            else
+              content << token
+            end
+          else
+            case token
+            when '%>'
+              # in here we deal with the content of a erb tag
+              (content.scan("\n").count).times do
+                add_put_cmd(out, "\n")
+              end
+              # case scanner.stag
+              # when '<%'
+              #   if content[-1] == ?\n
+              #     content.chop!
+              #     out.push(content)
+              #     out.cr
+              #   else
+              #     out.push(content)
+              #   end
+              # when '<%='
+              #   add_insert_cmd(out, content)
+              # when '<%#'
+              #   # out.push("# #{content_dump(content)}")
+              # end
+              scanner.stag = nil
+              content = ''
+            when '%%>'
+              content << '%>'
+            else
+              content << token
+            end
+          end
+        end
+        add_put_cmd(out, content) if content.size > 0
+        out.close
+        [out.script, enc]
+      end
+      # rubocop:enable Style/CyclomaticComplexity
+    end
+  end
+end

data/lib/codeqa/version.rb

@@ -1,3 +1,3 @@
 module Codeqa
-  VERSION = '0.3.1'
+  VERSION = '0.4.0.pre'
 end

data/lib/templates/pre-commit

@@ -38,13 +38,11 @@ print "Codeqa checking #{files_to_check.count} files"
 # fail fast
 success = files_to_check.all? do |file|
   print '.'
-  Codeqa.check(file, :silent => true)
+  Codeqa.check(file, :silent_success => true)
 end
 
 if success
-  puts 'success'
   exit 0
 else
-  puts 'error'
   exit 1
 end

data/spec/fixtures/erb_example.html

@@ -0,0 +1,31 @@
+<body>
+<div class="jobdetail">
+  
+
+
+
+
+
+  
+      
+
+
+
+  
+      <iframe src="" scrolling="no">
+      </iframe>
+  
+</div>
+
+
+
+
+
+
+
+
+
+<script>
+    ujsOpenDialog('.ujsDialog');
+</script>
+</body>

data/spec/fixtures/erb_example.html.erb

@@ -0,0 +1,31 @@
+<body>
+<div class="jobdetail">
+  <%= render :partial => 'header',
+             :locals => @header_options.reverse_merge(
+                     :position_presenter => @position_presenter,
+                     :bookmark => @bookmark,
+                     :account_id => @account.id,
+                     :social_share => @social_share) if @position_presenter.show_header? %>
+  <%  if @position_presenter.internal_view? %>
+      <%= render :partial => 'intern',
+                 :locals => @header_options.reverse_merge(
+                         :position_presenter => @position_presenter,
+                         :account_id => @account.id) %>
+  <% else %>
+      <iframe src="<%= raw @position_presenter.url %>" scrolling="no">
+      </iframe>
+  <% end %>
+</div>
+
+<%#
+params:
+@header_options
+@account_id
+@bookmark
+@position
+@position_presenter
+%>
+<script>
+    ujsOpenDialog('.ujsDialog');
+</script>
+</body>

data/spec/lib/codeqa/checkers/check_conflict_spec.rb

@@ -15,9 +15,9 @@ describe Codeqa::Checkers::CheckConflict do
     checker = check_with(described_class, source)
     expect(checker).to be_error
     expect(checker.errors.details).to eq([
-      ['2,1', 'conflict leftovers in line 2, please merge properly'],
-      ['3,1', 'conflict leftovers in line 3, please merge properly'],
-      ['5,1', 'conflict leftovers in line 5, please merge properly']
+      [[2, 1], 'conflict leftovers in line 2, please merge properly'],
+      [[3, 1], 'conflict leftovers in line 3, please merge properly'],
+      [[5, 1], 'conflict leftovers in line 5, please merge properly']
     ])
   end
 

data/spec/lib/codeqa/checkers/check_erb_html_spec.rb

@@ -21,7 +21,7 @@ unless ENV['TRAVIS']
       checker = check_with(described_class, source)
       expect(checker).to be_error
       expect(checker.errors.details).to eq([
-        [nil, '<div><ul></div>'],
+        [:source, '<div><ul></div>'],
         [nil, "line 1 column 10 - Error: unexpected </div> in <ul>\n"]])
     end
 
@@ -30,7 +30,7 @@ unless ENV['TRAVIS']
       checker = check_with(described_class, source)
       expect(checker).to be_error
       expect(checker.errors.details).to eq([
-        [nil, "<div class='halfopen></div>"],
+        [:source, "<div class='halfopen></div>"],
         [nil, "line 1 column 28 - Warning: <div> end of file while parsing attributes\n"]])
 
     end
@@ -39,7 +39,7 @@ unless ENV['TRAVIS']
       checker = check_with(described_class, source)
       expect(checker).to be_error
       expect(checker.errors.details).to eq([
-        [nil, "<div class=\"halfopen next=\"ok\"></div>"],
+        [:source, "<div class=\"halfopen next=\"ok\"></div>"],
         [nil, "line 1 column 1 - Warning: <div> attribute with missing trailing quote mark\n"]])
 
     end

data/spec/lib/codeqa/checkers/check_linkto_spec.rb

@@ -14,7 +14,9 @@ describe Codeqa::Checkers::CheckLinkto do
     source = source_with("<% link_to '/page',do_some_paths do%>", 'file.html.erb')
     checker = check_with(described_class, source)
     expect(checker).to be_error
-    expect(checker.errors.details).to eq([['1,1', 'old style block link_to in line 1']])
+    expect(checker.errors.details).to eq([
+      [[1, 1], 'old style block link_to in line 1']
+    ])
   end
 
   it 'should find not find if not there ' do

data/spec/lib/codeqa/checkers/check_strange_chars_spec.rb

@@ -14,14 +14,18 @@ describe Codeqa::Checkers::CheckStrangeChars do
     source = source_with("one\x09two")
     checker = check_with(described_class, source)
     expect(checker).to be_error
-    expect(checker.errors.details).to eq([['1,4', 'TAB x09 at line 1 column 4']])
+    expect(checker.errors.details).to eq([
+      [[1, 4], 'TAB x09 at line 1 column 4']
+    ])
   end
 
   it 'should detect form feeds' do
     source = source_with("one\n\x0ctwo")
     checker = check_with(described_class, source)
     expect(checker).to be_error
-    expect(checker.errors.details).to eq([['2,1', 'FORM FEED x0C at line 2 column 1']])
+    expect(checker.errors.details).to eq([
+      [[2, 1], 'FORM FEED x0C at line 2 column 1']
+    ])
   end
 
 end

data/spec/lib/codeqa/checkers/html_validator_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+describe Codeqa::Checkers::HtmlValidator do
+  it_behaves_like 'a checker'
+
+  it 'should check erb files' do
+    source = source_with('', 'file.html.erb')
+    expect(described_class.check?(source)).to be_truthy
+    source = source_with('', 'test.rhtml')
+    expect(described_class.check?(source)).to be_truthy
+    source = source_with('', 'test.text.html')
+    expect(described_class.check?(source)).to be_truthy
+
+    source = source_with('', 'zipped.zip')
+    expect(described_class.check?(source)).to be_falsey
+  end
+
+  it 'should detect html tag errors' do
+    text = '<div><ul></div>'
+    source = source_with(text)
+    checker = check_with(described_class, source)
+    expect(checker).to be_error
+    expect(checker.errors.details).to eq([
+      [:source, text],
+      [1, 'Opening and ending tag mismatch: ul line 1 and div']
+    ])
+  end
+
+  it 'should detect attribute till end of file errors' do
+    text = "<div class='halfopen></div>"
+    source = source_with(text)
+    checker = check_with(described_class, source)
+    expect(checker).to be_error
+    expect(checker.errors.details).to eq([
+      [:source, text],
+      [1, "Unescaped '<' not allowed in attributes values"],
+      [1, 'attributes construct error'],
+      [1, "Couldn't find end of Start Tag div line 1"]
+    ])
+  end
+  it 'should detect attribute with missing trailing qute mark' do
+    text = '<div class="halfopen next="ok"></div>'
+    source = source_with(text)
+    checker = check_with(described_class, source)
+    expect(checker).to be_error
+    expect(checker.errors.details).to eq([
+      [:source, text],
+      [1, 'attributes construct error'],
+      [1, "Couldn't find end of Start Tag div line 1"]
+    ])
+  end
+
+  it 'should find not find errors if html is ok ' do
+    source = source_with('<div><ul></ul></div>')
+    checker = check_with(described_class, source)
+    expect(checker).to be_success
+  end
+
+  # context 'javascript' do
+  #   it 'should ignore javascript' do
+  #     source = source_with('<div><script></ul></script></div>')
+  #     checker = check_with(described_class, source)
+  #     expect(checker).to be_success
+  #   end
+  #   it 'should ignore javascript' do
+  #     source = source_with('<div><script type="text/javascript" charset="utf-8"></ul></script></div>')
+  #     checker = check_with(described_class, source)
+  #     expect(checker).to be_success
+  #     source = source_with("<div><script>multiline\n</ul></script></div>")
+  #     checker = check_with(described_class, source)
+  #     expect(checker).to be_success
+  #   end
+  #   it 'should ignore javascript' do
+  #     source = source_with('<div><style></ul></style></div>')
+  #     checker = check_with(described_class, source)
+  #     expect(checker).to be_success
+  #   end
+  # end
+end

data/spec/lib/codeqa/checkers/rubocop_lint_spec.rb

@@ -14,7 +14,7 @@ describe Codeqa::Checkers::RubocopLint do
     source = source_with('class MyClass')
     checker = check_with(described_class, source)
     expect(checker).to be_error
-    expect(checker.errors.details.first[1]).to match(/unexpected token/)
+    expect(checker.errors.details.first).to eq([[1, 14], 'Syntax: unexpected token $end'])
   end
 
   it 'should find not find if not there ' do

data/spec/lib/codeqa/runner_decorator_spec.rb

@@ -1,19 +1,78 @@
 require 'spec_helper'
 
 describe Codeqa::RunnerDecorator do
-  it 'should run provide the errors if the checker failed' do
-    source = source_with('def syntax_error', 'ruby.rb')
-    runner = Codeqa::Runner.run(source)
-    expect(runner.success?).to be false
-    decorator = Codeqa::RunnerDecorator.new(runner)
-    expect(decorator.to_s).to match(/syntax/)
+  let(:errors){ Codeqa::CheckErrors.new }
+  let(:decorator) do
+    checker = double(Codeqa::Checker, :errors => errors,
+                                      :name   => 'test',
+                                      :hint   => 'testtest')
+    runner = double(Codeqa::Runner, :failures   => [checker],
+                                    :sourcefile => Codeqa::Sourcefile.new('foo.rb', 'foo'),
+                                    :success?   => false)
+    Codeqa::RunnerDecorator.new(runner)
   end
-  it 'should run list the ran checkers' do
-    source = source_with('def foo; end', 'ruby.rb')
-    runner = Codeqa::Runner.run(source)
-    expect(runner.success?).to be true
-    decorator = Codeqa::RunnerDecorator.new(runner)
-    expect(decorator.to_s).to match(/Passed tests.+strange chars/)
+
+  it 'should format error as line if number given' do
+    errors.add(77, 'test message')
+    expect(decorator.details_to_s).to eq(<<-EOF)
+\e[31m------- test -------\e[0m
+\e[31mtesttest\e[0m
+Line: \e[33m77\e[0m|test message
+EOF
+  end
+
+  it 'should format error as position if array given' do
+    errors.add([22, 77], 'test message')
+    expect(decorator.details_to_s).to eq(<<-EOF)
+\e[31m------- test -------\e[0m
+\e[31mtesttest\e[0m
+Pos: \e[33m22,77\e[0m|test message
+EOF
+  end
+
+  it 'should simply print error content if no context is given' do
+    errors.add(nil, 'test message')
+    expect(decorator.details_to_s).to eq(<<-EOF)
+\e[31m------- test -------\e[0m
+\e[31mtesttest\e[0m
+test message
+EOF
+  end
+
+  it 'should format error as source if :source token given' do
+    errors.add(:source, 'test message')
+    expect(decorator.details_to_s).to eq(<<-EOF)
+\e[31m------- test -------\e[0m
+\e[31mtesttest\e[0m
+\e[33m  1\e[0m|test message
+EOF
+  end
+
+  it 'should correctly format multiline source' do
+    errors.add(:source, "test message\nline two\nthird\n\nfifth")
+    expect(decorator.details_to_s).to eq(<<-EOF)
+\e[31m------- test -------\e[0m
+\e[31mtesttest\e[0m
+\e[33m  1\e[0m|test message
+\e[33m  2\e[0m|line two
+\e[33m  3\e[0m|third
+\e[33m  4\e[0m|
+\e[33m  5\e[0m|fifth
+EOF
   end
+  # it 'should run provide the errors if the checker failed' do
+  #   source = source_with('def syntax_error', 'ruby.rb')
+  #   runner = Codeqa::Runner.run(source)
+  #   expect(runner.success?).to be false
+  #   decorator = Codeqa::RunnerDecorator.new(runner)
+  #   expect(decorator.to_s).to match(/syntax/)
+  # end
+  # it 'should run list the ran checkers' do
+  #   source = source_with('def foo; end', 'ruby.rb')
+  #   runner = Codeqa::Runner.run(source)
+  #   expect(runner.success?).to be true
+  #   decorator = Codeqa::RunnerDecorator.new(runner)
+  #   expect(decorator.to_s).to match(/Passed tests.+strange chars/)
+  # end
 
 end

data/spec/lib/codeqa/utils/erb_sanitizer_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Codeqa::ErbSanitizer do
+  context 'erb' do
+    # let(:source) do
+    #   source_with(
+    #     IO.read(
+    #       Codeqa.root.join('spec', 'fixtures', 'erb_example.html.erb')
+    #     )
+    #   )
+    # end
+    def compile(content)
+      described_class.new(content).result
+    end
+
+    it 'should remove erb tags' do
+      source = '<div><% some ruby %></div>'
+      expected = '<div></div>'
+      doc = compile(source)
+      expect(doc).to eq(expected)
+      expect(Nokogiri::XML(doc).errors).to be_empty
+    end
+    it 'should remove erb tags within attributes' do
+      source = '<div <%dont touch this%> baz="bla <%=inside%> <%=inside2%> stuff" after="meh"></div>'
+      expected = '<div  baz="bla   stuff" after="meh"></div>'
+      doc = compile(source)
+      expect(doc).to eq(expected)
+      expect(Nokogiri::XML(doc).errors).to be_empty
+    end
+    it 'should properly remove multiline erb tags and keep the correct line numbers' do
+      source = <<-EOR
+<div>
+<% render :partial => :foo, :locals => { :foo => 'foo',
+                                         :bar => 'bar'
+                                         :baz => 'baz' }%>
+</div>
+EOR
+      expected = <<-EOR
+<div>
+
+
+
+</div>
+EOR
+      doc = compile(source)
+      expect(doc).to eq(expected)
+      expect(Nokogiri::XML(doc).errors).to be_empty
+    end
+
+    it 'should work on a more difficult example' do
+      source = IO.read(Codeqa.root.join('spec', 'fixtures', 'erb_example.html.erb'))
+      expected = IO.read(Codeqa.root.join('spec', 'fixtures', 'erb_example.html'))
+      doc = compile(source)
+      expect(doc).to eq(expected)
+      expect(Nokogiri::XML(doc).errors).to be_empty
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeqa
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0.pre
 platform: ruby
 authors:
 - Peter Schrammel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,7 +79,6 @@ files:
 - codeqa.gemspec
 - config/default.rb
 - lib/codeqa.rb
-- lib/codeqa/check_errors.rb
 - lib/codeqa/checker.rb
 - lib/codeqa/checkers/check_conflict.rb
 - lib/codeqa/checkers/check_erb.rb
@@ -91,17 +90,21 @@ files:
 - lib/codeqa/checkers/check_strange_chars.rb
 - lib/codeqa/checkers/check_utf8_encoding.rb
 - lib/codeqa/checkers/check_yard.rb
+- lib/codeqa/checkers/html_validator.rb
 - lib/codeqa/checkers/pattern_checker.rb
 - lib/codeqa/checkers/rubocop_formatter.rb
 - lib/codeqa/checkers/rubocop_full.rb
 - lib/codeqa/checkers/rubocop_lint.rb
 - lib/codeqa/configuration.rb
-- lib/codeqa/fake_erb.rb
 - lib/codeqa/runner.rb
 - lib/codeqa/runner_decorator.rb
 - lib/codeqa/sourcefile.rb
+- lib/codeqa/utils/check_errors.rb
+- lib/codeqa/utils/erb_sanitizer.rb
 - lib/codeqa/version.rb
 - lib/templates/pre-commit
+- spec/fixtures/erb_example.html
+- spec/fixtures/erb_example.html.erb
 - spec/fixtures/html_error.html.erb
 - spec/fixtures/html_error.text.html
 - spec/fixtures/isolation/home/project/dir/.gitkeep
@@ -119,6 +122,7 @@ files:
 - spec/lib/codeqa/checkers/check_strange_chars_spec.rb
 - spec/lib/codeqa/checkers/check_utf8_encoding_spec.rb
 - spec/lib/codeqa/checkers/check_yard_spec.rb
+- spec/lib/codeqa/checkers/html_validator_spec.rb
 - spec/lib/codeqa/checkers/rubocop_formatter_spec.rb
 - spec/lib/codeqa/checkers/rubocop_full_spec.rb
 - spec/lib/codeqa/checkers/rubocop_lint_spec.rb
@@ -126,6 +130,7 @@ files:
 - spec/lib/codeqa/runner_decorator_spec.rb
 - spec/lib/codeqa/runner_spec.rb
 - spec/lib/codeqa/sourcefile_spec.rb
+- spec/lib/codeqa/utils/erb_sanitizer_spec.rb
 - spec/lib/codeqa_spec.rb
 - spec/spec_helper.rb
 - spec/support/checker.rb
@@ -144,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -154,6 +159,8 @@ signing_key:
 specification_version: 4
 summary: Code checker
 test_files:
+- spec/fixtures/erb_example.html
+- spec/fixtures/erb_example.html.erb
 - spec/fixtures/html_error.html.erb
 - spec/fixtures/html_error.text.html
 - spec/fixtures/isolation/home/project/dir/.gitkeep
@@ -171,6 +178,7 @@ test_files:
 - spec/lib/codeqa/checkers/check_strange_chars_spec.rb
 - spec/lib/codeqa/checkers/check_utf8_encoding_spec.rb
 - spec/lib/codeqa/checkers/check_yard_spec.rb
+- spec/lib/codeqa/checkers/html_validator_spec.rb
 - spec/lib/codeqa/checkers/rubocop_formatter_spec.rb
 - spec/lib/codeqa/checkers/rubocop_full_spec.rb
 - spec/lib/codeqa/checkers/rubocop_lint_spec.rb
@@ -178,6 +186,7 @@ test_files:
 - spec/lib/codeqa/runner_decorator_spec.rb
 - spec/lib/codeqa/runner_spec.rb
 - spec/lib/codeqa/sourcefile_spec.rb
+- spec/lib/codeqa/utils/erb_sanitizer_spec.rb
 - spec/lib/codeqa_spec.rb
 - spec/spec_helper.rb
 - spec/support/checker.rb

data/lib/codeqa/fake_erb.rb

@@ -1,80 +0,0 @@
-require 'erb'
-module Codeqa
-  # copied from ERB
-  # throws away all the erb stuff so only html remains
-  # rubocop:disable MethodLength, LineLength, CyclomaticComplexity, BlockNesting
-  class FakeERB < ERB
-    def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout', compiler_class=FakeERB::Compiler)
-      @safe_level = safe_level
-      compiler = compiler_class.new(trim_mode)
-      set_eoutvar(compiler, eoutvar)
-      @src = compiler.compile(str)
-      @filename = nil
-    end
-
-    class Compiler < ERB::Compiler # :nodoc:
-      def compile(s)
-        out = Buffer.new(self)
-
-        content = ''
-        scanner = make_scanner(s)
-        scanner.scan do |token|
-          next if token.nil?
-          next if token == ''
-          if scanner.stag.nil?
-            case token
-            when PercentLine
-              out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
-              content = ''
-              out.push(token.to_s)
-              out.cr
-            when :cr
-              out.cr
-            when '<%', '<%=', '<%#'
-              scanner.stag = token
-              out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
-              content = ''
-            when "\n"
-              content << "\n"
-              out.push("#{@put_cmd} #{content_dump(content)}")
-              content = ''
-            when '<%%'
-              content << '<%'
-            else
-              content << token
-            end
-          else
-            case token
-            when '%>'
-              case scanner.stag
-              when '<%'
-                if content[-1] == "\n"
-                  content.chop!
-                  # out.push(content)
-                  out.cr
-                else
-                  # out.push(content)
-                end
-              when '<%='
-                # out.push("#{@insert_cmd}((#{content}).to_s)")
-              when '<%#'
-                # out.push("# #{content_dump(content)}")
-              end
-              scanner.stag = nil
-              content = ''
-            when '%%>'
-              content << '%>'
-            else
-              content << token
-            end
-          end
-        end
-        # puts "pushed2 #{content}"
-        out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
-        out.close
-        out.script
-      end
-    end
-  end
-  # rubocop:enable MethodLength, LineLength, CyclomaticComplexity, BlockNesting
-end