onc_certification_g10_test_kit 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e30707252971322a92bc313ff1d95705aea89c475cc2a1f307328ecbc09337
-  data.tar.gz: d3c87ac998c3369798d33125a1f71fb0b7fd10d032bf2aa6557b0a79786baf9f
+  metadata.gz: b5babf8413662a8280eac15f50f5cb634bfa2e2cdd637982c7dfb123817f2dfa
+  data.tar.gz: 36f285e6677cfd7114695620898d0bfe1cc304325dae63055f5fc12ade27b4b6
 SHA512:
-  metadata.gz: bf3740b53d586ac040f415f33575cee9d3a4391531f2b921f020de599931937e4dc55776c108e95be872df48831c32b8f256c15773d7105a64756ff11033ff9a
-  data.tar.gz: 24e3d183e40bcbdac46e6cc497788f014b42b432bf0589231fc6b3996c3c6ca87a621f224b9cb446196ff3e94a09d3eddfda2aaf6913f24223a5b9038a47b853
+  metadata.gz: ed759baf8f19a6c2ad5afe841219c087d17c363efa3fbdb1385e214cf350d1a4d4ef886eaccb4586d960540b1f8125ae0065aeeb05318dd6bc7d3af5542ee734
+  data.tar.gz: f0c151db9d23d5b89a8f48d5f7953d6ca568f79e1f36b7e86f2a5f041b6e7f3abcf12731b5fd1363e70b0c6a83d59f1b50f2b7a46e714b3c982fa3a751df858a

data/lib/onc_certification_g10_test_kit/patient_scope_test.rb

@@ -16,14 +16,40 @@ module ONCCertificationG10TestKit
     id :g10_patient_scope
     input :received_scopes
 
+    def scope_version
+      config.options[:scope_version]
+    end
+
     run do
-      expected_scope = if config.options[:scope_version] == :v2
-                         'patient/Patient.rs'
-                       else
-                         'patient/Patient.read'
-                       end
-      assert received_scopes&.include?(expected_scope),
-             "#{expected_scope} scope was requested, but not received. Received: `#{received_scopes}`"
+      expected_scopes =
+        if scope_version == :v2
+          [
+            Regexp.new(scope_regex_string('patient/Patient.rs').gsub('.rs', '.r?s')),
+            Regexp.new(scope_regex_string('patient/Patient.rs').gsub('.rs', '.rs?'))
+          ]
+        else
+          [Regexp.new(scope_regex_string('patient/Patient.read'))]
+        end
+
+      received_scopes = self.received_scopes.split
+
+      unmatched_scopes =
+        expected_scopes.reject do |expected_scope|
+          received_scopes.any? { |received_scope| received_scope.match? expected_scope }
+        end
+
+      assert unmatched_scopes.blank?,
+             "No scope matching the following was received: `#{unmatched_scopes_string(unmatched_scopes)}`"
+    end
+
+    def scope_regex_string(scope)
+      "\\A#{Regexp.quote(scope)}\\z"
+    end
+
+    def unmatched_scopes_string(unmatched_scopes)
+      unmatched_scopes
+        .map { |scope| "`#{scope.source}`" }
+        .join(', ')
     end
   end
 end

data/lib/onc_certification_g10_test_kit/version.rb

@@ -1,3 +1,3 @@
 module ONCCertificationG10TestKit
-  VERSION = '6.0.1'.freeze
+  VERSION = '6.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onc_certification_g10_test_kit
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bloomer
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner-sequel
   requirement: !ruby/object:Gem::Requirement