ae_easy-qa 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a1ce11607e5b2e7535b9aeebeb577c1e59bf07de7e19a6917103d3bd9b21737
-  data.tar.gz: a88348db9faeee8202d7b97e0356345305474c87e6cc0ac63ba65e733af9b737
+  metadata.gz: 7875f0bf89a8dbe060934afe02cca6ebc96ccf53a560f825a97da4adce796d8b
+  data.tar.gz: 70803a4faa397bcece8b18306fd83123215f6e8e8afefc7b22f0b998b66a7cf8
 SHA512:
-  metadata.gz: f8c1b5796b0152aaff398211f51f8bf8be19949659313830f69288b1cda9ca7a73a4fd50321ede09ad8e8d32084508d7ba495813f2841e33a2bcb7a13f0f41ec
-  data.tar.gz: 44797dc5d2a9d73a6bf214f07c633be4bdb95112e7c8b8238b12462a8cb6d4325cd76ce3d862a6f0b6485ac7786f7b241df069d811db0acfcfcc0f225c7751fe
+  metadata.gz: ac08501f7445129fd70d1a4db8c2192b8e1ba466d7ffb4ff135fd1a5af852a336df91f46ddc9518fa81357cfe8689d61c92d4f3e1c7150be89ee2e5f57bed944
+  data.tar.gz: f17c53c1e5ccc14aef18480c9b113886f33fb4a5f9e42dc05b7ef2768f4b23d22bae70720f02b4ff2783638ecea0ad91677df6a29cf35ec8657293157f153d3d

data/lib/ae_easy/qa/validate_internal.rb

@@ -114,11 +114,16 @@ module AeEasy
 
       def run
         output_collection
-        if data.any?
-          ValidateGroups.new(data, scraper_name, collection_name, errors).run
-          ValidateRules.new(data, errors, rules).run if rules
+        if most_recent_finished_job
+          puts "data count #{data.count}"
+          if data.any?
+            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, options).run
+        else
+          puts "No job with status 'done' available"
         end
-        SaveOutput.new(data.count, rules, errors, outputs_collection_name, outputs, options).run
       end
 
       private
@@ -127,8 +132,15 @@ module AeEasy
         puts "Validating collection: #{collection_name}"
       end
 
-      def outputs_collection_name
-        @outputs_collection_name ||= "#{scraper_name}_#{collection_name}"
+      def most_recent_finished_job
+        @most_recent_finished_job ||= begin
+                                        jobs_response = AnswersEngine::Client::ScraperJob.new.all(scraper_name)
+                                        if jobs_response.code == 200
+                                          jobs_response.parsed_response.sort_by { |job| job['created_at'] }.reverse.find{|job| job['status'] == 'done' }
+                                        else
+                                          nil
+                                        end
+                                      end
       end
 
       def data
@@ -136,7 +148,7 @@ module AeEasy
                     data = []
                     page = 1
                     while data.count < total_records
-                      records = AnswersEngine::Client::ScraperJobOutput.new(per_page:500, page: page).all(scraper_name, collection_name).parsed_response
+                      records = AnswersEngine::Client::JobOutput.new(per_page:500, page: page).all(most_recent_finished_job['id'], collection_name).parsed_response
                       sleep 1
                       if records
                         records.each do |record|
@@ -151,6 +163,10 @@ module AeEasy
                     data
                   end
       end
+
+      def outputs_collection_name
+        @outputs_collection_name ||= "#{scraper_name}_#{collection_name}"
+      end
     end
   end
 end

data/lib/ae_easy/qa/version.rb

@@ -1,5 +1,5 @@
 module AeEasy
   module Qa
-    VERSION = "0.0.23"
+    VERSION = "0.0.24"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ae_easy-qa
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - David Lynam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: answersengine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,8 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AnswersEngine Easy Quality Assurance gem