fhir_dstu2_models 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a1140fc77a44dcf10b01c38ef6513f08641eac65
-  data.tar.gz: 802d339f92786c05b707528184df1a782728264d
+SHA256:
+  metadata.gz: 0b2edac98e094284cc3ac76ad78200622695cffa5440ddb5e440fa11478754bd
+  data.tar.gz: 1f2a5f79cc61a938753b0a6824557ed615bf5188e991176f9f216cd44f15f9e1
 SHA512:
-  metadata.gz: 472ccacf205f9270cee8859250e62dda8283ea3d2ba21096a992ab46bb9e81e3f8315b7a70432c6b7eba0764cc8d2d9d64afdcc85e36b08418152ce6038370db
-  data.tar.gz: ba36e569e66c5cb18b9dfeef4fef0c78fa256ea3f25710fc505a8cb2b2e9e609b1460478fcb8cec4bdb7bbf7b844c354f5562caf60f4258c2be377c6d4474259
+  metadata.gz: 22dd05a458a4fa6be2983ce891e2abfccf4d7788249aaf733be24ac9a1b054ff8441247078880a765c0bdef27f0a594c81dc264015a75fab425b7a86b2f2fc3d
+  data.tar.gz: 65f0ee9430f85a0e88f82b6dca5641f2c402b3705d521cbe5f06bd50df1dc7855ac120f6909437a234c2064380e12f8c1f3483b5b5dd7016779d8b04045dd3d9

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 env:
   - TESTMEMORY=0 GCDELAY=2.0
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fhir_dstu2_models (1.0.4)
+    fhir_dstu2_models (1.0.5)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
       mime-types (>= 1.16, < 3)
@@ -16,7 +16,7 @@ GEM
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     date_time_precision (0.8.1)
     diff-lcs (1.3)
     docile (1.1.5)
@@ -39,7 +39,7 @@ GEM
     guard-test (2.0.8)
       guard-compat (~> 1.2)
       test-unit (~> 3.0)
-    i18n (1.0.1)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     listen (3.1.5)
@@ -125,7 +125,7 @@ DEPENDENCIES
   test-unit
 
 RUBY VERSION
-   ruby 2.2.7p470
+   ruby 2.5.1p57
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/lib/fhir_dstu2_models/fhir_ext/structure_definition.rb

@@ -16,6 +16,16 @@ module FHIR
       #                            Profile Validation
       # -------------------------------------------------------------------------
 
+      class << self; attr_accessor :vs_validators end
+      @vs_validators = {}
+      def self.validates_vs(valueset_uri, &validator_fn)
+        @vs_validators[valueset_uri] = validator_fn
+      end
+
+      def self.clear_validates_vs(valueset_uri)
+        @vs_validators.delete valueset_uri
+      end
+
       def validates_resource?(resource)
         validate_resource(resource).empty?
       end
@@ -28,6 +38,7 @@ module FHIR
         else
           @errors << "#{resource.class} is not a resource."
         end
+        # TODO: return warnings too!
         @errors
       end
 
@@ -153,6 +164,7 @@ module FHIR
         # Check the datatype for each node, only if the element has one declared, and it isn't the root element
         if !element.type.empty? && element.path != id
           codeable_concept_pattern = element.pattern && element.pattern.is_a?(FHIR::DSTU2::CodeableConcept)
+          codeable_concept_binding = element.binding
           matching_pattern = false
           nodes.each do |value|
             matching_type = 0
@@ -189,6 +201,28 @@ module FHIR
                     matching_pattern = true if vcoding.system == pcoding.system && vcoding.code == pcoding.code
                   end
                 end
+              elsif data_type_found == 'CodeableConcept' && codeable_concept_binding
+                binding_issues =
+                  if element.binding.strength == 'extensible'
+                    # TODO: make this @warnings, once we have a way to return warnings
+                    @errors
+                  elsif element.binding.strength == 'required'
+                    @errors
+                  else # e.g., example-strength or unspecified
+                    [] # Drop issues errors on the floor, in throwaway array
+                  end
+
+                valueset_uri = element.binding && element.binding.valueSetReference && element.binding.valueSetReference.reference
+                if valueset_uri && self.class.vs_validators[valueset_uri]
+                  check_fn = self.class.vs_validators[valueset_uri]
+                  vcc = FHIR::DSTU2::CodeableConcept.new(value)
+
+                  has_valid_code = vcc.coding && vcc.coding.any? { |c| check_fn.call(c) }
+
+                  unless has_valid_code
+                    binding_issues << "#{describe_element(element)} has no codings from #{valueset_uri}. Codings evaluated: #{vcc.to_json}"
+                  end
+                end
               elsif data_type_found == 'String' && !element.maxLength.nil? && (value.size > element.maxLength)
                 @errors << "#{describe_element(element)} exceed maximum length of #{element.maxLength}: #{value}"
               end

data/lib/fhir_dstu2_models/version.rb

@@ -1,7 +1,7 @@
 module FHIR
   module DSTU2
     module Models
-      VERSION = '1.0.4'.freeze
+      VERSION = '1.0.5'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_dstu2_models
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Jason Walonoski
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -2143,7 +2143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Gem for handling FHIR DSTU2 models in ruby