witch_doctor 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b90d201e964e217789d40cb46ece7c0cac3e62e6
-  data.tar.gz: 3fb22f847c9fe7a42e8d2e7d0e89aab3c912b7d1
+  metadata.gz: 0a68de9c0229908f16ef56db5233f76fc4ec7759
+  data.tar.gz: c181046a0c33f9284bba71b7958f8fd05f94e9a4
 SHA512:
-  metadata.gz: af212a673286818932bbd24897c9de1cfe53443923fd64ae07c470492d278b35fc7b0265cd9eed716a9521fc664783a5baf66abe538aaad498609d875b369216
-  data.tar.gz: 0000d5200b7c430f40432b66061c013e628197bace0d721699f8ae206ee81aee2cdef64fce786a66abcdd78d0ba157571b77367bf72675d2e5a28721afe7eb3a
+  metadata.gz: 27093f9bec95fb4a47e6d51ff70afad73fc0a1100d80f70f02e52982efccf413c875fd37b0d06b6fa3dfcaee544b5cd00e1392b237b6a171253e3621f4f3addc
+  data.tar.gz: 6953f75161977291f1ca2226a49f795fbb5b4ec6d2bf74caefd5af42187cd72dd56a4f689976dfeba9fd26ca7849e19790690e788371096b15111f18b7626780

data/app/helpers/witch_doctor/application_helper.rb

@@ -1,15 +1,21 @@
 module WitchDoctor
   module ApplicationHelper
+    UnknownAntivirusScanState = Class.new(StandardError)
+
     def antivirus(resource, mount_point)
       av = resource.send("#{mount_point}_antivirus")
-      if !av.checked?
+      if !av.scheduled?
+        'Antivirus scan has not been scheduled<br>'.html_safe
+      elsif !av.checked?
         'File waiting for Antivirus check<br>'.html_safe
       elsif av.clean?
         yield
       elsif av.error?
         "Antivirus scan couldn't be completed<br>".html_safe
-      else
+      elsif av.infected?
         'File Contains Virus<br>'.html_safe
+      else
+        raise UnknownAntivirusScanState
       end
     end
   end

data/lib/witch_doctor/antivirus.rb

@@ -9,18 +9,22 @@ module WitchDoctor
     end
 
     def latest_scan
-      resource
+      @latest_scan ||= resource
         .virus_scans
         .select { |vs| vs.mount_point == mount_point }
         .last
     end
 
+    def scheduled?
+      !latest_scan.nil?
+    end
+
     def checked?
-      latest_scan.scan_result.present?
+      scheduled? && latest_scan.scan_result.present?
     end
 
     def infected?
-      checked? && !clean? && !error?
+      checked? && latest_scan.scan_result == 'VirusInfected'
     end
 
     def error?

data/lib/witch_doctor/antivirus_concern.rb

@@ -14,7 +14,7 @@ module WitchDoctor
       def schedule_virus_scan(options)
         mount_point = options.fetch(:on)
 
-        after_save "schedule_#{mount_point}_virus_scan", if: "schedule_#{mount_point}_virus_scan?"
+        after_save "schedule_#{mount_point}_virus_scan", if: ["schedule_#{mount_point}_virus_scan?", :virus_scan_scheduling_on?]
         after_destroy "unschedule_#{mount_point}_virus_scan"
 
         define_method("unschedule_#{mount_point}_virus_scan") do
@@ -24,12 +24,6 @@ module WitchDoctor
         define_method("schedule_#{mount_point}_virus_scan") do
           virus_scans.create! do |vs|
             vs.mount_point = mount_point.to_s
-            # This is especially useful for integration testing, since your application may
-            # make assumptions (e.g. in the views) about the existence of a virus scan
-            unless virus_scan_scheduling_on?
-              vs.scan_result = 'Clean'
-              vs.scanned_at = Time.now
-            end
           end
         end
 

data/lib/witch_doctor/version.rb

@@ -1,3 +1,3 @@
 module WitchDoctor
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end