codeqa 0.4.0.pre2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b47b37862da4f231fa163a9161ea66758c543de5
-  data.tar.gz: a36f9e4ac2f21942121b32be320dccfbf0198b17
+  metadata.gz: cb14655f903fb0f5d90f7951a2d19c4cf2711b2b
+  data.tar.gz: e4ca534c7c1d8889642c9cd8f5f51f248a37884b
 SHA512:
-  metadata.gz: 23e80489e8084d42a8d3a7c760bd70af2a34f7023fa9612c507d0800e8cd334e06164b9e366a277c263a2b639a674db69ee191b314cf159b4e3f1dbf5d2c9419
-  data.tar.gz: f1c7db9caef0fed024e0f6a64d6de6dc931adfbed55c37718eeab541a3861cbc0f834329034b734bf7e07329e78cee9c311fa62094cb2c1df21901d4d4a058c7
+  metadata.gz: 64b5071a1fc28a0a15eb6485c00c6278581dfe819eac401db80c3b02c0329de70e434c65ce22bd9f0483fea93a5478b9cebf009f9c9dc4408101de4554392214
+  data.tar.gz: 6f7852a8eadd489496b95e06f0b1040e2d251dc7d3745c3e40dc0fdba314ccde9d8eb17c4b30ca9af2e668b98fd34d10a54b06512983be278583467bca98141c

data/lib/codeqa/checkers/html_validator.rb

@@ -21,7 +21,7 @@ module Codeqa
       end
 
       REMOVED_NOKOGIRI_ERRORS = Regexp.union(
-        /Opening and ending tag mismatch: (special line 1|\w+ line 1 and special)/,
+        /Opening and ending tag mismatch: (special line 1|\w+ line \d* and special)/,
         /Premature end of data in tag special/,
         /Extra content at the end of the document/,
         /xmlParseEntityRef: no name/,
@@ -39,10 +39,12 @@ module Codeqa
       end
 
       def stripped_html
-        ErbSanitizer.
-          new(sourcefile.content).
-          result.
-          gsub(%r{<script[ >](.*)</script>}m){ "<!-- script#{"\n" * $1.scan("\n").count} /script -->" }
+        @stripped_html ||= ErbSanitizer.
+                            new(sourcefile.content).
+                            result.
+                            gsub(%r{<script[ >](.*?)</script>}m) do
+                              "<!-- script#{"\n" * $1.scan("\n").count} /script -->"
+                            end
       end
 
       def self.nokogiri?

data/lib/codeqa/runner_decorator.rb

@@ -36,8 +36,8 @@ module Codeqa
     def error_details
       msg = ''
       @runner.failures.each do |checker|
-        msg << error("------- #{checker.name} -------") << "\n"
-        msg << error("#{checker.hint}") << "\n"
+        # msg << error("------- #{checker.name} -------") << "\n"
+        # msg << error("#{checker.hint}") << "\n"
         checker.errors.details.each do |type, content|
           case type
           when :source

data/lib/codeqa/version.rb

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

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

@@ -86,6 +86,32 @@ EOR
 
  /script -->
 </div>
+EOR
+    end
+    it 'should replace script tags when there are multiple script tags in the text' do
+      text = <<-EOR
+<div>
+  <script>
+    var some = 'javascript';
+  </script>
+  content
+  <script>
+    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 -->
+  content
+  <!-- script
+
+ /script -->
+</div>
 EOR
     end
   end

data/spec/lib/codeqa/runner_decorator_spec.rb

@@ -15,8 +15,6 @@ describe Codeqa::RunnerDecorator do
   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
@@ -24,8 +22,6 @@ EOF
   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
@@ -33,8 +29,6 @@ EOF
   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
@@ -42,8 +36,6 @@ EOF
   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
@@ -51,8 +43,6 @@ EOF
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeqa
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre2
+  version: 0.4.0
 platform: ruby
 authors:
 - Peter Schrammel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -191,9 +191,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2