Fix duplication issues

ABaldwinHunter · ABaldwinHunter · commit 57d97e46c654 · 2016-09-21T21:31:02.000-04:00
The validation criteria and any related calculations and messaging belong to
each validation class, but the interface with the underlying issue object
should remain consistent.

Since that's the case, we can reduce duplication by moving some commonly
accessed attributes into the parent class.
diff --git a/lib/cc/analyzer/formatters/formatter.rb b/lib/cc/analyzer/formatters/formatter.rb
@@ -7,7 +7,18 @@ def initialize(filesystem, output = $stdout)
           @output = output
         end
 
-        def write(_data)
+        def write(data)
+          json = JSON.parse(data)
+          json["engine_name"] = current_engine.name
+
+          case json["type"].downcase
+          when "issue"
+            issues << json
+          when "warning"
+            warnings << json
+          else
+            raise "Invalid type found: #{json["type"]}"
+          end
         end
 
         def started
diff --git a/lib/cc/analyzer/formatters/html_formatter.rb b/lib/cc/analyzer/formatters/html_formatter.rb
@@ -26,20 +26,6 @@ def pluralize(number, noun)
           end
         end
 
-        def write(data)
-          json = JSON.parse(data)
-          json["engine_name"] = current_engine.name
-
-          case json["type"].downcase
-          when "issue"
-            issues << json
-          when "warning"
-            warnings << json
-          else
-            raise "Invalid type found: #{json["type"]}"
-          end
-        end
-
         def finished
           template = ReportTemplate.new(issues.length, issues_by_path)
           puts template.render
diff --git a/lib/cc/analyzer/formatters/plain_text_formatter.rb b/lib/cc/analyzer/formatters/plain_text_formatter.rb
@@ -10,20 +10,6 @@ def started
           puts colorize("Starting analysis", :green)
         end
 
-        def write(data)
-          json = JSON.parse(data)
-          json["engine_name"] = current_engine.name
-
-          case json["type"].downcase
-          when "issue"
-            issues << json
-          when "warning"
-            warnings << json
-          else
-            raise "Invalid type found: #{json["type"]}"
-          end
-        end
-
         def finished
           puts
 
diff --git a/lib/cc/analyzer/issue_validations/content_validation.rb b/lib/cc/analyzer/issue_validations/content_validation.rb
@@ -15,10 +15,6 @@ def message
         def has_content?
           object.key?("content")
         end
-
-        def content
-          object["content"]
-        end
       end
     end
   end
diff --git a/lib/cc/analyzer/issue_validations/path_existence_validation.rb b/lib/cc/analyzer/issue_validations/path_existence_validation.rb
@@ -3,18 +3,12 @@ module Analyzer
     module IssueValidations
       class PathExistenceValidation < Validation
         def valid?
-          File.exist?(path)
+          path && File.exist?(path)
         end
 
         def message
           "File does not exist: '#{path}'"
         end
-
-        private
-
-        def path
-          object.fetch("location", {}).fetch("path", "")
-        end
       end
     end
   end
diff --git a/lib/cc/analyzer/issue_validations/path_is_file_validation.rb b/lib/cc/analyzer/issue_validations/path_is_file_validation.rb
@@ -3,18 +3,12 @@ module Analyzer
     module IssueValidations
       class PathIsFileValidation < Validation
         def valid?
-          File.file?(path)
+          path && File.file?(path)
         end
 
         def message
           "Path is not a file: '#{path}'"
         end
-
-        private
-
-        def path
-          object.fetch("location", {}).fetch("path", "")
-        end
       end
     end
   end
diff --git a/lib/cc/analyzer/issue_validations/path_presence_validation.rb b/lib/cc/analyzer/issue_validations/path_presence_validation.rb
@@ -9,12 +9,6 @@ def valid?
         def message
           "Path must be present"
         end
-
-        private
-
-        def path
-          object.fetch("location", {})["path"]
-        end
       end
     end
   end
diff --git a/lib/cc/analyzer/issue_validations/relative_path_validation.rb b/lib/cc/analyzer/issue_validations/relative_path_validation.rb
@@ -22,10 +22,6 @@ def relative_to?(directory)
 
           expanded_path.start_with?(expanded_base)
         end
-
-        def path
-          object.fetch("location", {})["path"]
-        end
       end
     end
   end
diff --git a/lib/cc/analyzer/issue_validations/type_validation.rb b/lib/cc/analyzer/issue_validations/type_validation.rb
@@ -9,12 +9,6 @@ def valid?
         def message
           "Type must be 'issue' but was '#{type}'"
         end
-
-        private
-
-        def type
-          object["type"]
-        end
       end
     end
   end
diff --git a/lib/cc/analyzer/issue_validations/validation.rb b/lib/cc/analyzer/issue_validations/validation.rb
@@ -17,6 +17,18 @@ def message
         private
 
         attr_reader :object
+
+        def path
+          object.fetch("location", {})["path"]
+        end
+
+        def type
+          object["type"]
+        end
+
+        def content
+          object["content"]
+        end
       end
     end
   end
