onc_certification_g10_test_kit 2.1.0.rc1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 136583ee432ecaa86193ce86c3e09ba9c3fd69cd745d6663243a8fc4b0ab2071
-  data.tar.gz: b914f640ba8c3c577d1d531952944027fec53582f6faa22efedbb62d5fe018a7
+  metadata.gz: 645d73a288a5f76e9b94634ed2be17253ce34f0e0eb6df7df6b7410e7a1d9175
+  data.tar.gz: f299ae93813a1b05ef838824bfbb4f7f7734e8695118e37f0eb7b3c08e28a2c1
 SHA512:
-  metadata.gz: 6e0b7538709edc9dc43a3069197df5550ba403193d12dea576851fba09b472679c3475f9d47e3d3f6496d6c8dd35c20981fe46f968824919b1dce7e3ae4c0032
-  data.tar.gz: 18ad6fce7e21583ef641a74765a58ffdccc559a5a8b70038330368c6bbafe29584a5204cc36bbc1bb62122aea2b89c321b9fa76865ccd768355e6df7e03f091a
+  metadata.gz: 46773dc8eb92ee96afb593506a1b16b5f6af23c62f9ff7f988789d27a38b7a54bab21f69e03f336df1d9c8d3e4f3929b69028a9d99fffebdeb2eda12f66fbce7
+  data.tar.gz: 87c04c10d334d9c469af26d8618cfa7ec83246b008f0f05fae632f8f2029a11f89e00dda164b2aedc318aab02055f4e928d8bb11545d84f9c32f2be70477116a

data/lib/onc_certification_g10_test_kit/bulk_export_validation_tester.rb

@@ -51,6 +51,10 @@ module ONCCertificationG10TestKit
       @metadata_list ||= determine_metadata
     end
 
+    def resources_from_all_files
+      @resources_from_all_files ||= {}
+    end
+
     def patient_ids_seen
       scratch[:patient_ids_seen] ||= []
     end
@@ -126,6 +130,7 @@ module ONCCertificationG10TestKit
         @metadata = meta
         @missing_elements = nil
         @missing_slices = nil
+        @missing_extensions = nil
         begin
           perform_must_support_test(resources[meta.profile_url])
         rescue Inferno::Exceptions::PassException
@@ -173,8 +178,9 @@ module ONCCertificationG10TestKit
       }
 
       stream_ndjson(url, build_headers(requires_access_token), process_line, process_headers)
-      validate_conformance(resources)
-
+      resources_from_all_files.merge!(resources) do |_key, all_resources, file_resources|
+        all_resources | file_resources
+      end
       line_count
     end
 
@@ -190,11 +196,14 @@ module ONCCertificationG10TestKit
         skip message
       end
 
+      @resources_from_all_files = {}
       success_count = 0
       file_list.each do |file|
         success_count += check_file_request(file['url'])
       end
 
+      validate_conformance(resources_from_all_files)
+
       pass "Successfully validated #{success_count} #{resource_type} resource(s)."
     end
   end

data/lib/onc_certification_g10_test_kit/tasks/generate_matrix.rb

@@ -198,10 +198,14 @@ module ONCCertificationG10TestKit
           ['Inferno Test ID', 22, ->(test) { test.short_id.to_s }],
           ['Inferno Test Name', 65, ->(test) { test.title }],
           ['Inferno Test Description', 65, lambda do |test|
-            natural_indent = test.description.lines
-              .collect { |l| l.index(/[^ ]/) }
-              .select { |l| !l.nil? && l.positive? }.min || 0
-            test.description.lines.map { |l| l[natural_indent..] || "\n" }.join.strip
+            description = test.description || ''
+            natural_indent =
+              description
+                .lines
+                .collect { |l| l.index(/[^ ]/) }
+                .select { |l| !l.nil? && l.positive? }
+                .min || 0
+            description.lines.map { |l| l[natural_indent..] || "\n" }.join.strip
           end],
           ['Test Procedure Steps', 30, ->(test) { inferno_to_procedure_map[test.short_id].join(', ') }]
         ]
@@ -227,7 +231,7 @@ module ONCCertificationG10TestKit
               this_row.each_with_index do |value, index|
                 inferno_worksheet.add_cell(row, index, value).change_text_wrap(true)
               end
-              inferno_worksheet.change_row_height(row, [26, (test.description.strip.lines.count * 10) + 10].max)
+              inferno_worksheet.change_row_height(row, [26, ((test.description || '').strip.lines.count * 10) + 10].max)
               inferno_worksheet.change_row_vertical_alignment(row, 'top')
               row += 1
             end

data/lib/onc_certification_g10_test_kit/version.rb

@@ -1,3 +1,3 @@
 module ONCCertificationG10TestKit
-  VERSION = '2.1.0.rc1'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onc_certification_g10_test_kit
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc1
+  version: 2.1.0
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bloomer
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner-sequel
   requirement: !ruby/object:Gem::Requirement
@@ -304,9 +304,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: