codeqa 0.4.0.pre → 0.4.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ae0299a503f1cb9639e037907ade194edfe3db0
-  data.tar.gz: 859128b8f52f560cc2dedb79157134237179b042
+  metadata.gz: b47b37862da4f231fa163a9161ea66758c543de5
+  data.tar.gz: a36f9e4ac2f21942121b32be320dccfbf0198b17
 SHA512:
-  metadata.gz: 198df6738b57d3fbfb076bd3522b7b715b10245ce40769bbfb6b67e3e4af07df622504edc2d867d98cf8fc713582cbf95aa63de01c9a69e914e78c7d6d00c991
-  data.tar.gz: ec6c8833e4b66ba642b0ee30016f2c7d5d7e477f64cc59f69c5d6c49202c41667496e998631687e2ae863fa95f8f9c37a3cbbe0bfab81370ff2ceddecb5dc626
+  metadata.gz: 23e80489e8084d42a8d3a7c760bd70af2a34f7023fa9612c507d0800e8cd334e06164b9e366a277c263a2b639a674db69ee191b314cf159b4e3f1dbf5d2c9419
+  data.tar.gz: f1c7db9caef0fed024e0f6a64d6de6dc931adfbed55c37718eeab541a3861cbc0f834329034b734bf7e07329e78cee9c311fa62094cb2c1df21901d4d4a058c7

data/Gemfile

@@ -12,9 +12,7 @@ group :development do
 end
 
 group :development, :test do
-  gem 'pry-byebug'
-  gem 'nokogiri'
-  gem 'rubocop'
+  gem 'pry-byebug', :platform => :mri
 end
 
 group :test do

data/README.md

@@ -1,9 +1,9 @@
 # Codeqa
 
-[![Gem Version](https://badge.fury.io/rb/codeqa.svg)](http://badge.fury.io/rb/codeqa)
-[![Build Status](https://travis-ci.org/experteer/codeqa.svg?branch=master)](https://travis-ci.org/experteer/codeqa)
-[![Coverage Status](https://img.shields.io/coveralls/experteer/codeqa.svg)](https://coveralls.io/r/experteer/codeqa)
-[![Code Climate](https://codeclimate.com/github/experteer/codeqa/badges/gpa.svg)](https://codeclimate.com/github/experteer/codeqa)
+[![Gem Version](http://img.shields.io/gem/v/codeqa.svg?style=flat)](https://rubygems.org/gems/codeqa)
+[![Build Status](http://img.shields.io/travis/experteer/codeqa.svg?style=flat)](https://travis-ci.org/experteer/codeqa)
+[![Coverage Status](https://img.shields.io/coveralls/experteer/codeqa.svg?style=flat)](https://coveralls.io/r/experteer/codeqa)
+[![Code Climate](http://img.shields.io/codeclimate/github/experteer/codeqa.svg?style=flat)](https://codeclimate.com/github/experteer/codeqa)
 
 With codeqa you can check your code to comply to certain coding rules (utf8 only chars, indenting) or to avoid typical errors or
 enforce deprecations. You might even put it into a pre commit hook.
@@ -85,6 +85,7 @@ end
 - erb
   - CheckErb (tests erb template for syntax errors using either `erb` or `action_view`
   - CheckErbHtml (removes all erb tags and tests with `tidy` if the template is valid XML)
+  - HtmlValidator (uses Nokogiri to check stripped html.erb files against XML errors)
 - yard
   - CheckYard (checks YARD for warnings)
 - CheckRubySyntax (runs file though `ruby -c`, use RubocopLint if possible)

data/bin/codeqa

@@ -15,9 +15,14 @@ ARGV.options do |opts|
   opts.separator ''
   opts.separator 'Specific Options:'
 
-  opts.on('-s', '--silent', 'No output if no error') do
+  opts.on('-s', '--silent', 'No output') do
     options[:silent] = true
   end
+
+  opts.on('-e', '--silent-success', 'only Output errors') do
+    options[:silent_success] = true
+  end
+
   opts.on('-f', '--fail-fast', 'Fail right after the first error.') do
     options[:failfast] = true
   end

data/codeqa.gemspec

@@ -18,7 +18,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0'
 
+  gem.add_dependency 'multi_json', '>= 1.0'
+
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '>=3.0'
   gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'nokogiri'
+  gem.add_development_dependency 'rubocop'
 end

data/lib/codeqa/checkers/html_validator.rb

@@ -1,4 +1,5 @@
 require 'codeqa/utils/erb_sanitizer'
+require 'nokogiri'
 
 module Codeqa
   module Checkers
@@ -23,7 +24,8 @@ module Codeqa
         /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/
+        /xmlParseEntityRef: no name/,
+        /Entity 'nbsp' not defined/
       )
       def check
         return unless self.class.nokogiri?
@@ -31,14 +33,16 @@ module Codeqa
 
         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
+        ErbSanitizer.
+          new(sourcefile.content).
+          result.
+          gsub(%r{<script[ >](.*)</script>}m){ "<!-- script#{"\n" * $1.scan("\n").count} /script -->" }
       end
 
       def self.nokogiri?

data/lib/codeqa/checkers/rubocop_full.rb

@@ -1,4 +1,4 @@
-require 'ostruct'
+require 'multi_json'
 
 module Codeqa
   module Checkers
@@ -45,15 +45,14 @@ module Codeqa
       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
+        MultiJson.load(raw)['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
@@ -63,7 +62,8 @@ module Codeqa
       end
 
       # Since using the json format we only care about stdout
-      # stderr will be silent
+      # stderr will be silenced
+      # (internal rubocop errors/warning will be printed there)
       def capture
         $stdout, stdout = StringIO.new, $stdout
         $stderr, stderr = StringIO.new, $stderr

data/lib/codeqa/utils/erb_sanitizer.rb

@@ -49,7 +49,7 @@ module Codeqa
             case token
             when '%>'
               # in here we deal with the content of a erb tag
-              (content.scan("\n").count).times do
+              content.scan("\n").count.times do
                 add_put_cmd(out, "\n")
               end
               # case scanner.stag

data/lib/codeqa/version.rb

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

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

@@ -54,25 +54,39 @@ describe Codeqa::Checkers::HtmlValidator do
     checker = check_with(described_class, source)
     expect(checker).to be_success
   end
+  it "should no complain about nbsp 'spaces'" do
+    source = source_with('<div>something&nbsp;fooo</div>')
+    checker = check_with(described_class, source)
+    expect(checker).to be_success
+  end
+
+  context 'script tags' do
+    it 'should replace script tags with html comment' do
+      text = '<div><script>foo</script></div>'
+      source = source_with(text)
+      checker = described_class.new(source)
+      expect(checker.stripped_html).to eq('<div><!-- script /script --></div>')
+    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
+    it 'should replace multiline script tags while keeping the linecount correct' do
+      text = <<-EOR
+<div>
+  <script>
+    var some = 'javascript';
+    console.log(some);
+  </script>
+</div>
+EOR
+      source = source_with(text)
+      checker = described_class.new(source)
+      expect(checker.stripped_html).to eq(<<-EOR)
+<div>
+  <!-- script
+
+
+ /script -->
+</div>
+EOR
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeqa
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre
+  version: 0.4.0.pre2
 platform: ruby
 authors:
 - Peter Schrammel
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +67,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Checks your code (esp Rails) for common errors
 email:
 - peter.schrammel@experteer.com