ae_easy-qa 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b37b9eefd295fd1816c02b906a56eeb0ed2d0a8108c3e93992e4953f36786387
-  data.tar.gz: f8e58457cf18340e6879d088e94031cdc869c05866324474a68465b9aa9318f7
+  metadata.gz: 0b72afb2dc8f9f4fa1511094aafff7f9a41eb21004e73a22a3428c528b5625d1
+  data.tar.gz: 48c731914135716f47ca59007bc708fd9f8552948f8f56d7db761a911a12f98c
 SHA512:
-  metadata.gz: e2ed8e4b43bef024e4543255123a3df6423ffd6a3c3a72d4bb0b440bcc6eb92c86591ddcf9dbccf0ebcc53b42756c0cf6b191ac4ffa9c2f130a3964d47dbda4d
-  data.tar.gz: 284d9e40adb10130d153a6758714af314e228352e805d6882dbf5acb695cd59ea41692db999305d3c294b93ee3e39f41832b63a9f2c7a05ee1567fb83747d398
+  metadata.gz: ca1cf82ef35e66bb1fe09d244a3d36adb4b4c3b58d360d4691a245d122f83034e431a8dfd89d6a9e6281bc9f09fe80f945bc1d7bb7710fccb451aba632e16cfb
+  data.tar.gz: f69ac55402c72d9524ea69a6e427c70f3fd7dd18a61b84bbd153dbcfe06b80d21188e5c921ee5bad33c8416eee81c01a571303a862ab4c62154dd588288303cd

data/lib/ae_easy/qa/save_output.rb

@@ -20,7 +20,7 @@ module AeEasy
 
       def run
         gather_threshold_totals
-        gather_fields_to_ignore
+        gather_validations_to_ignore
         save_group_errors
         save_errors
         save_summary
@@ -32,55 +32,77 @@ module AeEasy
         rules.each{|field_to_validate, field_options|
           field_threshold = return_threshold(field_to_validate, field_options)
           if field_threshold
+            gather_field_threshold_totals(field_to_validate, field_options)
+          else
+            gather_specific_validation_totals(field_to_validate, field_options)
+          end
+        }
+      end
+
+      def gather_field_threshold_totals(field_to_validate, field_options)
+        error_total = errors[:errored_items].inject(0){|total, errored_item|
+          failed_fields = errored_item[:failures].keys.collect{|failure_key|
+            extract_field(failure_key)
+          }.uniq
+          total += 1 if failed_fields.include?(field_to_validate)
+          total
+        }
+        error_totals[field_to_validate] = error_total
+      end
+
+      def gather_specific_validation_totals(field_to_validate, field_options)
+        field_options.each do |validation|
+          potential_failure_name = "#{field_to_validate}_#{validation[0]}_fail"
+          if options['thresholds'] && options['thresholds'][potential_failure_name]
             error_total = errors[:errored_items].inject(0){|total, errored_item|
-              failed_fields = errored_item[:failures].keys.collect{|failure_key|
-                extract_field(failure_key)
-              }.uniq
-              total += 1 if failed_fields.include?(field_to_validate)
+              failed_validations = errored_item[:failures].keys.collect{|failure_key|
+                "#{failure_key}_fail"
+              }
+              total += 1 if failed_validations.include?(potential_failure_name)
               total
             }
-            error_totals[field_to_validate] = error_total
-          else
-            field_options.each do |validation|
-              potential_failure_name = "#{field_to_validate}_#{validation[0]}_fail"
-              if options['thresholds'][potential_failure_name]
-                error_total = errors[:errored_items].inject(0){|total, errored_item|
-                  failed_validations = errored_item[:failures].keys.collect{|failure_key|
-                    "#{failure_key}_fail"
-                  }
-                  total += 1 if failed_validations.include?(potential_failure_name)
-                  total
-                }
-                error_totals[potential_failure_name] = error_total
-              end
-            end
+            error_totals[potential_failure_name] = error_total
           end
-        }
+        end
       end
 
-      def gather_fields_to_ignore
+      def gather_validations_to_ignore
         rules.each{|field_to_validate, field_options|
           field_threshold = return_threshold(field_to_validate, field_options)
           if field_threshold
-            total_errors = error_totals[field_to_validate]
-            if total_errors
-              success_ratio = (total_items - total_errors).to_f / total_items
-              fields_to_ignore.push(field_to_validate) if success_ratio > field_threshold
-            end
+            gather_fields_to_ignore(field_to_validate, field_threshold)
           else
-            field_options.each do |validation|
-              potential_failure_name = "#{field_to_validate}_#{validation[0]}_fail"
-              total_errors = error_totals[potential_failure_name]
-              if total_errors
-                specific_validation_threshold = options['thresholds'][potential_failure_name].to_f
-                success_ratio = (total_items - total_errors).to_f / total_items
-                specific_validations_to_ignore.push(potential_failure_name) if success_ratio > specific_validation_threshold
-              end
-            end
+            gather_specific_validations_to_ignore(field_to_validate, field_options)
           end
         }
       end
 
+      def gather_fields_to_ignore(field_to_validate, field_threshold)
+        total_errors = error_totals[field_to_validate]
+        if total_errors
+          success_ratio = (total_items - total_errors).to_f / total_items
+          if success_ratio > field_threshold.to_f
+            puts "Ignoring #{field_to_validate}"
+            fields_to_ignore.push(field_to_validate)
+          end
+        end
+      end
+
+      def gather_specific_validations_to_ignore(field_to_validate, field_options)
+        field_options.each do |validation|
+          potential_failure_name = "#{field_to_validate}_#{validation[0]}_fail"
+          total_errors = error_totals[potential_failure_name]
+          if total_errors
+            specific_validation_threshold = options['thresholds'][potential_failure_name].to_f
+            success_ratio = (total_items - total_errors).to_f / total_items
+            if success_ratio > specific_validation_threshold
+              puts "Ignoring #{potential_failure_name}"
+              specific_validations_to_ignore.push(potential_failure_name)
+            end
+          end
+        end
+      end
+
       def return_threshold(field_to_validate, field_options)
         if options['thresholds']
           options['thresholds'][field_to_validate]

data/lib/ae_easy/qa/validate_internal.rb

@@ -12,23 +12,38 @@ module AeEasy
       def run
         begin
           scrapers.each do |scraper_name, collections|
-            ValidateScraper.new(scraper_name, collections, rules, outputs).run
+            ValidateScraper.new(scraper_name, collections, rules, outputs, thresholds).run
           end
         rescue StandardError => e
           puts "An error has occurred: #{e}"
           return nil
         end
       end
+
+      private
+
+      def thresholds
+        @thresholds ||= begin
+                          file_path = File.expand_path('thresholds.yaml', Dir.pwd)
+                          if File.exists? file_path
+                            YAML.load(File.open(file_path))
+                          else
+                            nil
+                          end
+                        end
+      end
     end
 
     class ValidateScraper
-      attr_reader :scraper_name, :collections, :rules, :outputs
+      attr_reader :scraper_name, :collections, :rules, :outputs, :options
 
-      def initialize(scraper_name, collections, rules, outputs)
+      def initialize(scraper_name, collections, rules, outputs, thresholds)
         @scraper_name = scraper_name
         @collections = collections
         @rules = rules
         @outputs = outputs
+        @options = {}
+        options['thresholds'] = thresholds[scraper_name] if thresholds && thresholds[scraper_name]
       end
 
       def run
@@ -44,41 +59,51 @@ module AeEasy
       private
 
       def output_scraper
-        puts "Validating scraper: #{scraper_name}"
+        puts "validating scraper: #{scraper_name}"
       end
 
       def status_ok?
-        collection_counts.code == 200
+        !collection_response.parsed_response.nil? && collection_response.code == 200
       end
 
       def validate_collections
         collections.each do |collection_name|
-          ValidateCollection.new(scraper_name, collection_name, total_records(collection_name), rules, outputs).run
+          collection = collection_counts.find{|collection_hash| collection_hash['collection'] == collection_name }
+          if collection
+            ValidateCollection.new(scraper_name, collection_name, collection['outputs'], rules, outputs, options).run
+          else
+            puts "collection #{collection_name} is missing"
+          end
         end
       end
 
       def output_response
-        puts collection_counts.parsed_response['message']
+        if collection_response.parsed_response.nil?
+          puts "collection response is null"
+        else
+          puts collection_response.parsed_response['message']
+        end
       end
 
-      def total_records(collection_name)
-        collection_counts.find{|collection_hash| collection_hash['collection'] == collection_name }['outputs']
+      def collection_counts
+        @collection_counts ||= collection_response.parsed_response
       end
 
-      def collection_counts
-        @collection_counts ||= AnswersEngine::Client::ScraperJobOutput.new.collections(scraper_name)
+      def collection_response
+        @collection_response || AnswersEngine::Client::ScraperJobOutput.new.collections(scraper_name)
       end
     end
 
     class ValidateCollection
-      attr_reader :scraper_name, :collection_name, :total_records, :rules, :errors, :outputs
+      attr_reader :scraper_name, :collection_name, :total_records, :rules, :errors, :outputs, :options
 
-      def initialize(scraper_name, collection_name, total_records, rules, outputs)
+      def initialize(scraper_name, collection_name, total_records, rules, outputs, options)
         @scraper_name = scraper_name
         @collection_name = collection_name
         @total_records = total_records
         @rules = rules
         @outputs = outputs
+        @options = options
         @errors = { errored_items: [] }
       end
 
@@ -88,7 +113,7 @@ module AeEasy
           ValidateGroups.new(data, scraper_name, collection_name, errors).run
           ValidateRules.new(data, errors, rules).run if rules
         end
-        SaveOutput.new(data.count, rules, errors, outputs_collection_name, outputs, {}).run
+        SaveOutput.new(data.count, rules, errors, outputs_collection_name, outputs, options).run
       end
 
       private

data/lib/ae_easy/qa/version.rb

@@ -1,5 +1,5 @@
 module AeEasy
   module Qa
-    VERSION = "0.0.21"
+    VERSION = "0.0.22"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_easy-qa
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - David Lynam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: answersengine