lib/ddr/antivirus/scan_result.rb in ddr-antivirus-1.1.0 vs lib/ddr/antivirus/scan_result.rb in ddr-antivirus-1.2.0

@@ -21,45 +21,28 @@
       def default_version
         "ddr-antivirus #{Ddr::Antivirus::VERSION}"
       end
 
       # Subclasses may override to provide description of virus found.
-      # Should return nil if no virus found.
       def virus_found; end
 
+      # Subclasses should override
       def has_virus?
         !virus_found.nil?
       end
 
-      def status
-        return status_found if has_virus?
-        return status_error if error?
-        status_ok
+      # Subclasses may override to indicate an error condition (not necessarily an exception).
+      def error?
+        false
       end
 
       def ok?
         !(has_virus? || error?)
       end
 
-      # Subclasses may implement to indicate an error condition (not necessarily an exception).
-      def error?
-        false
-      end
-
-      def status_error
-        "ERROR"
-      end
-
-      def status_ok
-        "OK"
-      end
-
-      def status_found
-        "FOUND #{virus_found}"
-      end
-
+      # Subclasses may override
       def to_s
-        "Virus scan: #{status} - #{file_path} (#{version})"
+        "#{raw} (#{version})"
       end
 
     end
   end
 end