fhir_models 4.2.2 → 4.3.0

data/lib/fhir_models/bootstrap/hashable.rb

@@ -25,13 +25,14 @@ module FHIR
       # Inspired by active-support `blank` but in our case false isn't blank ...
       # https://github.com/rails/rails/blob/v5.2.3/activesupport/lib/active_support/core_ext/object/blank.rb
       blank = ->(obj) { obj.respond_to?(:empty?) ? obj.empty? : obj.nil? }
-      if thing.is_a?(Array)
+      case thing
+      when Array
         return nil if thing.empty?
 
         thing
           .map { |i| prune(i) }
           .reject(&blank)
-      elsif thing.is_a?(Hash)
+      when Hash
         return {} if thing.empty?
 
         new_thing = {}
@@ -59,11 +60,12 @@ module FHIR
         key = key.to_s
         meta = self.class::METADATA[key]
         next if meta.nil?
+
         local_name = key
         local_name = meta['local_name'] if meta['local_name']
         begin
           instance_variable_set("@#{local_name}", value)
-        rescue
+        rescue StandardError
           # TODO: this appears to be a dead code branch
           nil
         end
@@ -102,7 +104,7 @@ module FHIR
       if child['resourceType'] && !klass::METADATA['resourceType']
         klass = begin
           FHIR.const_get(child['resourceType'])
-        rescue => _exception
+        rescue StandardError => _e
           # TODO: this appears to be a dead code branch
           # TODO: should this log / re-raise the exception if encountered instead of silently swallowing it?
           FHIR.logger.error("Unable to identify embedded class #{child['resourceType']}\n#{exception.backtrace}")
@@ -111,9 +113,9 @@ module FHIR
       end
       begin
         obj = klass.new(child)
-      rescue => exception
+      rescue StandardError => e
         # TODO: should this re-raise the exception if encountered instead of silently swallowing it?
-        FHIR.logger.error("Unable to inflate embedded class #{klass}\n#{exception.backtrace}")
+        FHIR.logger.error("Unable to inflate embedded class #{klass}\n#{e.backtrace}")
       end
       obj
     end
@@ -125,7 +127,7 @@ module FHIR
       if meta['type'] == 'boolean'
         rval = value.strip == 'true'
       elsif FHIR::PRIMITIVES.include?(meta['type'])
-        if %w[decimal integer positiveInt unsignedInt].include?(meta['type'])
+        if ['decimal', 'integer', 'positiveInt', 'unsignedInt'].include?(meta['type'])
           rval = BigDecimal(value.to_s)
           rval = rval.frac.zero? ? rval.to_i : rval.to_f
         end # primitive is number

data/lib/fhir_models/bootstrap/json.rb

@@ -17,7 +17,7 @@ module FHIR
         resource_type = hash['resourceType']
         klass = Module.const_get("FHIR::#{resource_type}")
         resource = klass.new(hash)
-      rescue => e
+      rescue StandardError => e
         FHIR.logger.error("Failed to deserialize JSON:\n#{e.backtrace}")
         FHIR.logger.debug("JSON:\n#{json}")
         resource = nil

data/lib/fhir_models/bootstrap/model.rb

@@ -22,40 +22,39 @@ module FHIR
       to_hash.hash
     end
 
+    def respond_to_missing?(method_name, *)
+      (defined?(self.class::MULTIPLE_TYPES) && self.class::MULTIPLE_TYPES[method_name.to_s]) ||
+        (!@extension.nil? && !@extension.empty? && !find_extension(@extension, method_name).first.nil?) ||
+        (!@modifierExtension.nil? && !@modifierExtension.empty? && !find_extension(@modifierExtension, method_name).first.nil?) ||
+        super
+    end
+
     # allow two FHIR models to be compared for equality
     def ==(other)
       self.class == other.class && to_hash == other.to_hash
     end
     alias eql? ==
 
-    def method_missing(method, *_args, &_block)
-      if defined?(self.class::MULTIPLE_TYPES) && self.class::MULTIPLE_TYPES[method.to_s]
-        self.class::MULTIPLE_TYPES[method.to_s].each do |type|
+    def method_missing(method_name, *_args, &_block)
+      if defined?(self.class::MULTIPLE_TYPES) && self.class::MULTIPLE_TYPES[method_name.to_s]
+        self.class::MULTIPLE_TYPES[method_name.to_s].each do |type|
           type[0] = type[0].upcase
-          value = send("#{method}#{type}".to_sym)
+          value = send("#{method_name}#{type}".to_sym)
           return value unless value.nil?
         end
         return nil
       elsif !@extension.nil? && !@extension.empty?
-        ext = @extension.select do |x|
-          name = x.url.tr('-', '_').split('/').last
-          anchor = name.split('#').last
-          (method.to_s == name || method.to_s == anchor)
-        end
-        unless ext.first.nil?
-          return ext.first.value.nil? ? ext.first : ext.first.value
+        desired_extension = find_extension(@extension, method_name)
+        unless desired_extension.first.nil?
+          return desired_extension.first.value.nil? ? desired_extension.first : desired_extension.first.value
         end
       elsif !@modifierExtension.nil? && !@modifierExtension.empty?
-        ext = @modifierExtension.select do |x|
-          name = x.url.tr('-', '_').split('/').last
-          anchor = name.split('#').last
-          (method.to_s == name || method.to_s == anchor)
-        end
-        unless ext.first.nil?
-          return ext.first.value.nil? ? ext.first : ext.first.value
+        desired_extension = find_extension(@modifierExtension, method_name)
+        unless desired_extension.first.nil?
+          return desired_extension.first.value.nil? ? desired_extension.first : desired_extension.first.value
         end
       end
-      raise NoMethodError.new("undefined method `#{method}' for #{self.class.name}", method)
+      raise NoMethodError.new("undefined method `#{method_name}' for #{self.class.name}", method_name)
     end
 
     def to_reference
@@ -141,14 +140,14 @@ module FHIR
       end # metadata.each
       # check multiple types
       multiple_types = begin
-                         self.class::MULTIPLE_TYPES
-                       rescue
-                         {}
-                       end
+        self.class::MULTIPLE_TYPES
+      rescue StandardError
+        {}
+      end
       multiple_types.each do |prefix, suffixes|
         present = []
         suffixes.each do |suffix|
-          typename = "#{prefix}#{suffix[0].upcase}#{suffix[1..-1]}"
+          typename = "#{prefix}#{suffix[0].upcase}#{suffix[1..]}"
           # check which multiple data types are actually present, not just errors
           # actually, this might be allowed depending on cardinality
           value = instance_variable_get("@#{typename}")
@@ -157,8 +156,9 @@ module FHIR
         errors[prefix] = ["#{prefix}[x]: more than one type present."] if present.length > 1
         # remove errors for suffixes that are not present
         next unless present.length == 1
+
         suffixes.each do |suffix|
-          typename = "#{prefix}#{suffix[0].upcase}#{suffix[1..-1]}"
+          typename = "#{prefix}#{suffix[0].upcase}#{suffix[1..]}"
           errors.delete(typename) unless present.include?(typename)
         end
       end
@@ -221,10 +221,12 @@ module FHIR
         # check binding
         next unless meta['binding']
         next unless meta['binding']['strength'] == 'required'
+
         the_codes = [v]
-        if meta['type'] == 'Coding'
+        case meta['type']
+        when 'Coding'
           the_codes = [v.code]
-        elsif meta['type'] == 'CodeableConcept'
+        when 'CodeableConcept'
           the_codes = v.coding.map(&:code).compact
         end
         has_valid_code = false
@@ -247,6 +249,7 @@ module FHIR
     def validate_reference_type(ref, meta, contained_here, errors)
       return unless ref.reference && meta['type_profiles']
       return if ref.reference.start_with?('urn:uuid:', 'urn:oid:')
+
       matches_one_profile = false
       meta['type_profiles'].each do |p|
         basetype = p.split('/').last
@@ -258,7 +261,7 @@ module FHIR
       matches_one_profile = true if meta['type_profiles'].include?('http://hl7.org/fhir/StructureDefinition/Resource')
       if !matches_one_profile && ref.reference.start_with?('#')
         # we need to look at the local contained resources
-        r = contained_here.find { |x| x.id == ref.reference[1..-1] }
+        r = contained_here.find { |x| x.id == ref.reference[1..] }
         if !r.nil?
           meta['type_profiles'].each do |p|
             p = p.split('/').last
@@ -280,15 +283,15 @@ module FHIR
     def check_binding_uri(uri, value)
       valid = false
       # Strip off the |4.0.0 or |4.0.1 or |2014-03-26 or similar from the ends of URLs
-      uri&.gsub!(/\|[A-Za-z0-9\.\-]*/, '')
+      uri&.gsub!(/\|[A-Za-z0-9.\-]*/, '')
       valueset = FHIR::Definitions.get_codes(uri)
 
-      if uri == 'http://hl7.org/fhir/ValueSet/mimetypes' || uri == 'http://www.rfc-editor.org/bcp/bcp13.txt'
+      if ['http://hl7.org/fhir/ValueSet/mimetypes', 'http://www.rfc-editor.org/bcp/bcp13.txt'].include?(uri)
         matches = MIME::Types[value]
         json_or_xml = value.downcase.include?('xml') || value.downcase.include?('json')
         known_weird = ['text/cql', 'application/cql+text', 'application/hl7-v2'].include?(value)
         valid = json_or_xml || known_weird || (!matches.nil? && !matches.empty?)
-      elsif uri == 'http://hl7.org/fhir/ValueSet/languages' || uri == 'http://tools.ietf.org/html/bcp47'
+      elsif ['http://hl7.org/fhir/ValueSet/languages', 'http://tools.ietf.org/html/bcp47'].include?(uri)
         has_region = !(value =~ /-/).nil?
         valid = !BCP47::Language.identify(value.downcase).nil? && (!has_region || !BCP47::Region.identify(value.upcase).nil?)
       elsif valueset.nil?
@@ -321,6 +324,14 @@ module FHIR
       self
     end
 
-    private :validate_reference_type, :check_binding_uri, :validate_field
+    def find_extension(extension_source, method_name)
+      extension_source.select do |extension|
+        name = extension.url.tr('-', '_').split('/').last
+        anchor = name.split('#').last
+        (method_name.to_s == name || method_name.to_s == anchor)
+      end
+    end
+
+    private :validate_reference_type, :check_binding_uri, :validate_field, :find_extension
   end
 end

data/lib/fhir_models/bootstrap/preprocess.rb

@@ -11,16 +11,17 @@ module FHIR
 
         # Remove entries that do not interest us: CompartmentDefinitions, OperationDefinitions, Conformance statements
         hash['entry'].select! do |entry|
-          %w[StructureDefinition ValueSet CodeSystem SearchParameter].include? entry['resource']['resourceType']
+          ['StructureDefinition', 'ValueSet', 'CodeSystem', 'SearchParameter'].include? entry['resource']['resourceType']
         end
 
         # Remove unnecessary elements from the hash
         hash['entry'].each do |entry|
           next unless entry['resource']
-          pre_process_structuredefinition(entry['resource']) if 'StructureDefinition' == entry['resource']['resourceType']
-          pre_process_valueset(entry['resource']) if 'ValueSet' == entry['resource']['resourceType']
-          pre_process_codesystem(entry['resource']) if 'CodeSystem' == entry['resource']['resourceType']
-          pre_process_searchparam(entry['resource']) if 'SearchParameter' == entry['resource']['resourceType']
+
+          pre_process_structuredefinition(entry['resource']) if entry['resource']['resourceType'] == 'StructureDefinition'
+          pre_process_valueset(entry['resource']) if entry['resource']['resourceType'] == 'ValueSet'
+          pre_process_codesystem(entry['resource']) if entry['resource']['resourceType'] == 'CodeSystem'
+          pre_process_searchparam(entry['resource']) if entry['resource']['resourceType'] == 'SearchParameter'
           remove_fhir_comments(entry['resource'])
         end
 
@@ -34,26 +35,30 @@ module FHIR
 
       def self.pre_process_structuredefinition(hash)
         # Remove large HTML narratives and unused content
-        %w[text publisher contact description requirements mapping].each { |key| hash.delete(key) }
+        ['text', 'publisher', 'contact', 'description', 'requirements', 'mapping'].each { |key| hash.delete(key) }
 
         # Remove unused descriptions within the snapshot and differential elements
-        %w[snapshot differential].each do |key|
+        ['snapshot', 'differential'].each do |key|
           next unless hash[key]
+
           hash[key]['element'].each do |element|
-            %w[short definition comments requirements alias mapping].each { |subkey| element.delete(subkey) }
+            ['short', 'definition', 'comments', 'requirements', 'alias', 'mapping'].each { |subkey| element.delete(subkey) }
           end
         end
       end
 
       def self.pre_process_valueset(hash)
         # Remove large HTML narratives and unused content
-        %w[meta text publisher contact description requirements].each { |key| hash.delete(key) }
+        ['meta', 'text', 'publisher', 'contact', 'description', 'requirements'].each { |key| hash.delete(key) }
 
         return unless hash['compose']
-        %w[include exclude].each do |key|
+
+        ['include', 'exclude'].each do |key|
           next unless hash['compose'][key]
+
           hash['compose'][key].each do |element|
             next unless element['concept']
+
             element['concept'].each do |concept|
               concept.delete('designation')
             end
@@ -63,16 +68,18 @@ module FHIR
 
       def self.pre_process_codesystem(hash)
         # Remove large HTML narratives and unused content
-        %w[meta text publisher contact description requirements].each { |key| hash.delete(key) }
+        ['meta', 'text', 'publisher', 'contact', 'description', 'requirements'].each { |key| hash.delete(key) }
         return unless hash['concept']
+
         hash['concept'].each do |concept|
           pre_process_codesystem_concept(concept)
         end
       end
 
       def self.pre_process_codesystem_concept(hash)
-        %w[extension definition designation].each { |key| hash.delete(key) }
+        ['extension', 'definition', 'designation'].each { |key| hash.delete(key) }
         return unless hash['concept']
+
         hash['concept'].each do |concept|
           pre_process_codesystem_concept(concept)
         end
@@ -80,15 +87,16 @@ module FHIR
 
       def self.pre_process_searchparam(hash)
         # Remove large HTML narratives and unused content
-        %w[id url name date publisher contact description xpathUsage].each { |key| hash.delete(key) }
+        ['id', 'url', 'name', 'date', 'publisher', 'contact', 'description', 'xpathUsage'].each { |key| hash.delete(key) }
       end
 
       def self.remove_fhir_comments(hash)
         hash.delete('fhir_comments')
         hash.each do |_key, value|
-          if value.is_a?(Hash)
+          case value
+          when Hash
             remove_fhir_comments(value)
-          elsif value.is_a?(Array)
+          when Array
             value.each do |v|
               remove_fhir_comments(v) if v.is_a?(Hash)
             end
@@ -126,7 +134,7 @@ module FHIR
         hash = JSON.parse(json)
 
         # Remove narratives
-        %w[text].each { |key| hash.delete(key) }
+        ['text'].each { |key| hash.delete(key) }
 
         # Output the post processed file
         f = File.open(filename, 'w:UTF-8')
@@ -156,7 +164,7 @@ module FHIR
         # Remove the weird parantheses on xml example filenames
         # we do this so they match the names of the json examples
         if filename.include?('(') && filename.include?(')')
-          rename = filename.gsub(/\([A-Za-z0-9\-\.]*\)/, '')
+          rename = filename.gsub(/\([A-Za-z0-9\-.]*\)/, '')
           File.rename(filename, rename)
           filename = rename
         end

data/lib/fhir_models/bootstrap/xml.rb

@@ -24,7 +24,7 @@ module FHIR
       # if hash contains resourceType
       # create a child node with the name==resourceType
       # fill that, and place the child under the above `node`
-      if hash['resourceType'] && hash['resourceType'].is_a?(String) && name != 'instance'
+      if hash['resourceType'].is_a?(String) && name != 'instance'
         child_name = hash['resourceType']
         hash.delete('resourceType')
         child = hash_to_xml_node(child_name, hash, doc)
@@ -33,11 +33,13 @@ module FHIR
       end
 
       hash.each do |key, value|
-        next if %w[extension modifierExtension].include?(name) && key == 'url'
+        next if ['extension', 'modifierExtension'].include?(name) && key == 'url'
         next if key == 'id' && !FHIR::RESOURCES.include?(name)
-        if value.is_a?(Hash)
+
+        case value
+        when Hash
           node.add_child(hash_to_xml_node(key, value, doc))
-        elsif value.is_a?(Array)
+        when Array
           value.each do |v|
             if v.is_a?(Hash)
               node.add_child(hash_to_xml_node(key, v, doc))
@@ -62,7 +64,7 @@ module FHIR
           node.add_child(child)
         end
       end
-      node.set_attribute('url', hash['url']) if %w[extension modifierExtension].include?(name)
+      node.set_attribute('url', hash['url']) if ['extension', 'modifierExtension'].include?(name)
       node.set_attribute('id', hash['id']) if hash['id'] && !FHIR::RESOURCES.include?(name)
       node
     end
@@ -78,7 +80,7 @@ module FHIR
         resource_type = doc.root.name
         klass = Module.const_get("FHIR::#{resource_type}")
         resource = klass.new(hash)
-      rescue => e
+      rescue StandardError => e
         FHIR.logger.error("Failed to deserialize XML:\n#{e.backtrace}")
         FHIR.logger.debug("XML:\n#{xml}")
         resource = nil
@@ -108,7 +110,7 @@ module FHIR
           end
         end
       end
-      hash['url'] = node.get_attribute('url') if %w[extension modifierExtension].include?(node.name)
+      hash['url'] = node.get_attribute('url') if ['extension', 'modifierExtension'].include?(node.name)
       hash['id'] = node.get_attribute('id') if node.get_attribute('id') # Testscript fixture ids (applies to any BackboneElement)
       hash['resourceType'] = node.name if FHIR::RESOURCES.include?(node.name)
 

data/lib/fhir_models/deprecate.rb

@@ -10,6 +10,7 @@ module FHIR
         end
       end
       return unless methods.include? new_method
+
       (class << self; self; end).instance_eval do
         define_method(old_method) do |*args, &block|
           message = "DEPRECATED: `#{old_method}` has been deprecated. Use `#{new_method}` instead. Called from #{caller.first}"

data/lib/fhir_models/fhir.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require 'logger'
+require 'uri'
 
 module FHIR
   def self.logger
@@ -11,7 +12,7 @@ module FHIR
   end
 
   def self.default_logger
-    @default_logger ||= Logger.new(ENV['FHIR_LOGGER'] || STDOUT)
+    @default_logger ||= Logger.new(ENV['FHIR_LOGGER'] || $stdout)
   end
 
   def self.from_contents(contents)
@@ -38,7 +39,7 @@ module FHIR
     when 'uri'
       begin
         !URI.parse(value).nil?
-      rescue
+      rescue StandardError
         false
       end
     when 'base64binary'
@@ -47,7 +48,7 @@ module FHIR
       # whitespace is not significant so we strip it out before doing the regex so that we can be sure that
       # the number of characters is a multiple of 4.
       # https://tools.ietf.org/html/rfc4648
-      !(value.to_s.gsub(/\s/, '') =~ %r{\A(|[0-9a-zA-Z\+=/]{4}+)\Z}).nil?
+      !(value.to_s.gsub(/\s/, '') =~ %r{\A(|[0-9a-zA-Z+=/]{4}+)\Z}).nil?
     when 'instant'
       formatted_value = value.respond_to?(:xmlschema) ? value.xmlschema : value.to_s
       !(formatted_value =~ /\A([0-9]{4}(-(0[1-9]|1[0-2])(-(0[0-9]|[1-2][0-9]|3[0-1])(T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\.[0-9]+)?(Z|(\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))))))\Z/).nil?
@@ -62,16 +63,16 @@ module FHIR
     when 'time'
       !(value.to_s =~ /\A(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\.[0-9]+)?)\Z/).nil?
     when 'code'
-      !(value.to_s =~ /\A[^\s]+([\s]?[^\s]+)*\Z/).nil?
+      !(value.to_s =~ /\A[^\s]+(\s?[^\s]+)*\Z/).nil?
     when 'oid'
       !(value.to_s =~ /\Aurn:oid:[0-2](\.[1-9]\d*)+\Z/).nil?
     when 'id'
-      !(value.to_s =~ /\A[A-Za-z0-9\-\.]{1,64}\Z/).nil?
+      !(value.to_s =~ /\A[A-Za-z0-9\-.]{1,64}\Z/).nil?
     when 'xhtml'
       fragment = Nokogiri::HTML::DocumentFragment.parse(value)
       value.is_a?(String) && fragment.errors.size.zero?
     when 'unsignedint'
-      !(value.to_s =~ /\A([0]|([1-9][0-9]*))\Z/).nil?
+      !(value.to_s =~ /\A(0|([1-9][0-9]*))\Z/).nil?
     when 'positiveint'
       !(value.to_s =~ /\A+?[1-9][0-9]*\Z/).nil?
     else

data/lib/fhir_models/fhir_ext/element_definition.rb

@@ -25,6 +25,7 @@ module FHIR
     def keep_children(whitelist = [])
       @marked_for_keeping = true if whitelist.include?(path)
       return unless @children
+
       @children.each do |child|
         child.keep_children(whitelist)
       end
@@ -32,14 +33,16 @@ module FHIR
 
     def sweep_children
       return unless @children
+
       @children.each(&:sweep_children)
-      @children = @children.keep_if(&:marked_for_keeping)
+      @children.keep_if(&:marked_for_keeping)
       @marked_for_keeping = !@children.empty? || @marked_for_keeping
     end
 
     def print_children(spaces = 0)
       puts "#{' ' * spaces}+#{local_name || path}"
       return nil unless @children
+
       @children.each do |child|
         child.print_children(spaces + 2)
       end

data/lib/fhir_models/fhir_ext/structure_definition.rb

@@ -59,7 +59,7 @@ module FHIR
       if json.is_a? String
         begin
           json = JSON.parse(json)
-        rescue => e
+        rescue StandardError => e
           @errors << "Failed to parse JSON: #{e.message} %n #{h} %n #{e.backtrace.join("\n")}"
           return false
         end
@@ -99,13 +99,15 @@ module FHIR
     def get_json_nodes(json, path)
       results = []
       return [json] if path.nil?
+
       steps = path.split('.')
       steps.each.with_index do |step, index|
-        if json.is_a? Hash
+        case json
+        when Hash
           json = json[step]
-        elsif json.is_a? Array
+        when Array
           json.each do |e|
-            results << get_json_nodes(e, steps[index..-1].join('.'))
+            results << get_json_nodes(e, steps[index..].join('.'))
           end
           return results.flatten!
         else
@@ -125,7 +127,7 @@ module FHIR
 
     def verify_element(element, json)
       path = element.local_name || element.path
-      path = path[(@hierarchy.path.size + 1)..-1] if path.start_with? @hierarchy.path
+      path = path[(@hierarchy.path.size + 1)..] if path.start_with? @hierarchy.path
 
       if element.type && !element.type.empty?
         data_type_found = element.type.first.code
@@ -157,10 +159,11 @@ module FHIR
       verify_cardinality(element, nodes)
 
       return if nodes.empty?
+
       # 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
         # element.type not being empty implies data_type_found != nil, for valid profiles
-        codeable_concept_pattern = element.pattern && element.pattern.is_a?(FHIR::CodeableConcept)
+        codeable_concept_pattern = element.pattern&.is_a?(FHIR::CodeableConcept)
         matching_pattern = false
         nodes.each do |value|
           matching_type = 0
@@ -197,7 +200,7 @@ module FHIR
                   matching_pattern = true if vcoding.system == pcoding.system && vcoding.code == pcoding.code
                 end
               end
-            elsif %w[CodeableConcept Coding Quantity].include? data_type_found
+            elsif ['CodeableConcept', 'Coding', 'Quantity'].include? data_type_found
               required_strength = element&.binding&.strength == 'required'
               binding_issues = required_strength ? @errors : @warnings
 
@@ -275,20 +278,20 @@ module FHIR
       # elsewhere. There is no good way to determine "where" you should evaluate the expression.
       element.constraint.each do |constraint|
         next unless constraint.expression && !nodes.empty?
+
         nodes.each do |node|
-          begin
-            result = FHIRPath.evaluate(constraint.expression, node)
-            if !result && constraint.severity == 'error'
-              @errors << "#{describe_element(element)}: FHIRPath expression evaluates to false for #{name} (containing: #{node}) invariant rule #{constraint.key}: #{constraint.human}"
-            end
-          rescue
-            @warnings << "#{describe_element(element)}: unable to evaluate FHIRPath expression against JSON for #{name} (containing: #{node}) invariant rule #{constraint.key}: #{constraint.human}"
+          result = FHIRPath.evaluate(constraint.expression, node)
+          if !result && constraint.severity == 'error'
+            @errors << "#{describe_element(element)}: FHIRPath expression evaluates to false for #{name} (containing: #{node}) invariant rule #{constraint.key}: #{constraint.human}"
           end
+        rescue StandardError
+          @warnings << "#{describe_element(element)}: unable to evaluate FHIRPath expression against JSON for #{name} (containing: #{node}) invariant rule #{constraint.key}: #{constraint.human}"
         end
       end
 
       # check children if the element has any
       return unless element.children
+
       nodes.each do |node|
         element.children.each do |child|
           verify_element(child, node)
@@ -323,7 +326,7 @@ module FHIR
               @errors += definition.errors
               @warnings += definition.warnings
             end
-          rescue
+          rescue StandardError
             @errors << "Unable to verify #{data_type_code} as a FHIR Resource."
           end
           return ret_val
@@ -347,7 +350,7 @@ module FHIR
               @errors += definition.errors
               @warnings += definition.warnings
             end
-          rescue
+          rescue StandardError
             @errors << "Unable to verify #{resource_type} as a FHIR Resource."
           end
           ret_val
@@ -373,7 +376,7 @@ module FHIR
               @errors += definition.errors
               @warnings += definition.warnings
             end
-          rescue
+          rescue StandardError
             @errors << "Unable to verify #{data_type_code} as a FHIR type."
           end
           ret_val
@@ -395,14 +398,14 @@ module FHIR
 
       matching_type = 0
 
-      if vs_uri == 'http://hl7.org/fhir/ValueSet/mimetypes' || vs_uri == 'http://www.rfc-editor.org/bcp/bcp13.txt'
+      if ['http://hl7.org/fhir/ValueSet/mimetypes', 'http://www.rfc-editor.org/bcp/bcp13.txt'].include?(vs_uri)
         matches = MIME::Types[value]
         known_weird = ['text/cql', 'application/cql+text', 'application/hl7-v2'].include?(value)
         if (matches.nil? || matches.size.zero? || known_weird) && !some_type_of_xml_or_json?(value)
           @errors << "#{element.path} has invalid mime-type: '#{value}'"
           matching_type -= 1 if element.binding.strength == 'required'
         end
-      elsif vs_uri == 'http://hl7.org/fhir/ValueSet/languages' || vs_uri == 'http://tools.ietf.org/html/bcp47'
+      elsif ['http://hl7.org/fhir/ValueSet/languages', 'http://tools.ietf.org/html/bcp47'].include?(vs_uri)
         has_region = !(value =~ /-/).nil?
         valid = !BCP47::Language.identify(value.downcase).nil? && (!has_region || !BCP47::Region.identify(value.upcase).nil?)
         unless valid
@@ -435,9 +438,10 @@ module FHIR
 
     def some_type_of_xml_or_json?(code)
       m = code.downcase
-      return true if m == 'xml' || m == 'json'
+      return true if ['xml', 'json'].include?(m)
       return true if m.start_with?('application/', 'text/') && m.end_with?('json', 'xml')
       return true if m.start_with?('application/xml', 'text/xml', 'application/json', 'text/json')
+
       false
     end
     deprecate :is_some_type_of_xml_or_json, :some_type_of_xml_or_json?