codeclimate 0.63.5 → 0.63.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11dfd2b77e1b00acf30d6ad1299abfa96e7d2d8e
-  data.tar.gz: a9be19297272feb11bcc44200ce35c0f940cd746
+  metadata.gz: a0910a8c5ed74b148c5a1b5a218e6c200c2b74da
+  data.tar.gz: 6d1908dce5f304cddb4a42c631740b4b3a203b44
 SHA512:
-  metadata.gz: 5df2636a2cbf2ebbeaa5459b4bca139ca94a2e06d0f6a802cbb10f790b436cf82ba40fc690de3435c32660ea90242699c3cc5e0f7a09c52e63764d7ee4e7e7df
-  data.tar.gz: 0ad116622093f5f77bb5d9e369179fc970ebdb3d979b237c0f966b657795bb4fea458cd07436e5f10c2ca0ccf53f0f214889adfffc489a3f821b0b6ebf6e13ab
+  metadata.gz: f2e936686b3f67520cca272dc0ea8a1695132ffbd5608859ad5f883f478b0505af785c248f24f74bb0cbe342daa9c6e29a4f5dbecbd87da79434bbff67d69c5b
+  data.tar.gz: dc35be23df2007e0be97437e9f980be65ddd05a3eb60885fcca2e0c681dab0dde0b283ceb178a2cc41bd1cc6bae0f97188ac6d9a0657f4a944533d2c0ca7ae7f

data/lib/cc/analyzer/engine_output_filter.rb

@@ -23,6 +23,8 @@ module CC
 
       def ignore_fingerprint?(issue)
         @config.fetch("exclude_fingerprints", []).include?(issue.fingerprint)
+      rescue SourceExtractor::InvalidLocation
+        false
       end
 
       def check_config(check_name)

data/lib/cc/analyzer/issue_validations/location_format_validation.rb

@@ -2,42 +2,69 @@ module CC
   module Analyzer
     module IssueValidations
       class LocationFormatValidation < Validation
-        def valid?
-          if location["lines"]
-            valid_lines?(location["lines"])
-          elsif location["positions"]
-            valid_positions?(location["positions"])
-          else
-            false
+        class Validator
+          def initialize(location)
+            @location = location
+            check_validity
           end
-        end
 
-        def message
-          "Location is not formatted correctly"
-        end
+          def valid?
+            error.nil?
+          end
 
-        private
+          def message
+            if error
+              "Location is not formatted correctly: #{error}"
+            end
+          end
+
+          private
+
+          attr_accessor :error
 
-        def location
-          @location ||= object.fetch("location", {})
+          attr_reader :location
+
+          def check_validity
+            if location["lines"]
+              self.error = "location.lines is not valid: #{JSON.dump(location["lines"])}" unless valid_lines?(location["lines"])
+            elsif location["positions"]
+              self.error = "location.positions is not valid: #{JSON.dump(location["positions"])}" unless valid_positions?(location["positions"])
+            else
+              self.error = "location.lines or location.positions must be present"
+            end
+          end
+
+          def valid_positions?(positions)
+            positions.is_a?(Hash) &&
+              valid_position?(positions["begin"]) &&
+              valid_position?(positions["end"])
+          end
+
+          def valid_position?(position)
+            position &&
+              (
+                [position["line"], position["column"]].all? { |value| value.is_a?(Integer) } ||
+                position["offset"].is_a?(Integer)
+              )
+          end
+
+          def valid_lines?(lines)
+            lines.is_a?(Hash) && [lines["begin"], lines["end"]].all? { |value| value.is_a?(Integer) }
+          end
         end
 
-        def valid_positions?(positions)
-          positions.is_a?(Hash) &&
-            valid_position?(positions["begin"]) &&
-            valid_position?(positions["end"])
+        def valid?
+          validation.valid?
         end
 
-        def valid_position?(position)
-          position &&
-            (
-              [position["line"], position["column"]].all? { |value| value.is_a?(Integer) } ||
-              position["offset"].is_a?(Integer)
-            )
+        def message
+          validation.message
         end
 
-        def valid_lines?(lines)
-          lines.is_a?(Hash) && [lines["begin"], lines["end"]].all? { |value| value.is_a?(Integer) }
+        private
+
+        def validation
+          @validation ||= Validator.new(object.fetch("location", {}))
         end
       end
     end

data/lib/cc/analyzer/source_extractor.rb

@@ -1,13 +1,15 @@
 module CC
   module Analyzer
     class SourceExtractor
-      InvalidLocationPositions = Class.new(StandardError)
+      InvalidLocation = Class.new(StandardError)
 
       def initialize(source)
         @source = source
       end
 
       def extract(location)
+        validate_location(location)
+
         if (lines = location["lines"])
           extract_from_lines(lines)
         elsif (positions = location["positions"])
@@ -17,7 +19,14 @@ module CC
 
       private
 
-      attr_reader :location, :source
+      attr_reader :source
+
+      def validate_location(location)
+        validator = IssueValidations::LocationFormatValidation::Validator.new(location)
+        unless validator.valid?
+          raise InvalidLocation, validator.message
+        end
+      end
 
       def extract_from_lines(lines)
         begin_index = lines.fetch("begin") - 1
@@ -40,23 +49,14 @@ module CC
 
       def convert_to_offsets(positions)
         positions.each_with_object({}) do |(key, value), memo|
-          if value.key?("offset")
-            memo[key] = value
-          else
-            validate_position_format!(value)
-
-            memo[key] = {
-              "offset" => to_offset(value["line"] - 1, value["column"] - 1),
-            }
-          end
-        end
-      end
-
-      def validate_position_format!(position)
-        unless position.key?("line") && position.key?("column")
-          message = "Location positions must have either line/column or offset form"
-
-          raise InvalidLocationPositions, message
+          memo[key] =
+            if value.key?("offset")
+              value
+            else
+              {
+                "offset" => to_offset(value["line"] - 1, value["column"] - 1),
+              }
+            end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.63.5
+  version: 0.63.6
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Code Climate CLI