fhir_dstu2_models 1.1.1 → 1.2.0

data/lib/fhir_dstu2_models/bootstrap/definitions.rb

@@ -44,6 +44,7 @@ module FHIR
       def self.type_definition(type_name)
         return nil if type_name.nil?
         return @@cache[type_name] if @@cache[type_name]
+
         definition = types.find { |x| x['xmlId'] == type_name || x['name'] == type_name || x['url'] == type_name }
         @@cache[type_name] = FHIR::DSTU2::StructureDefinition.new(definition) if definition
         @@cache[type_name]
@@ -73,6 +74,7 @@ module FHIR
       def self.resource_definition(resource_name)
         return nil if resource_name.nil?
         return @@cache[resource_name] if @@cache[resource_name]
+
         definition = resources.find { |x| x['xmlId'] == resource_name || x['name'] == resource_name || x['url'] == resource_name }
         @@cache[resource_name] = FHIR::DSTU2::StructureDefinition.new(definition) if definition
         @@cache[resource_name]
@@ -103,8 +105,10 @@ module FHIR
 
       def self.extension_definition(extension_name)
         return nil if extension_name.nil?
+
         extension = extensions.find { |x| x['xmlId'] == extension_name || x['name'] == extension_name || x['url'] == extension_name }
         return nil if extension.nil?
+
         FHIR::DSTU2::StructureDefinition.new(extension)
       end
       deprecate :get_extension_definition, :extension_definition
@@ -112,8 +116,10 @@ module FHIR
       # Get the basetype (String) for a given profile or extension.
       def self.basetype(uri)
         return nil if uri.nil?
+
         defn = profiles.detect { |x| x['url'] == uri } || extensions.detect { |x| x['url'] == uri }
         return nil if defn.nil?
+
         defn['baseType']
       end
       deprecate :get_basetype, :basetype
@@ -121,14 +127,17 @@ module FHIR
       # Get the StructureDefinition for a given profile.
       def self.profile(uri)
         return nil if uri.nil?
+
         defn = profiles.detect { |x| x['url'] == uri } || extensions.detect { |x| x['url'] == uri }
         return nil if defn.nil?
+
         FHIR::DSTU2::StructureDefinition.new(defn)
       end
       deprecate :get_profile, :profile
 
       def self.profiles_for_resource(resource_name)
         return nil if resource_name.nil?
+
         profiles.select { |x| x['baseType'] == resource_name }.map { |x| FHIR::DSTU2::StructureDefinition.new(x) }
       end
       deprecate :get_profiles_for_resource, :profile_for_resource
@@ -136,6 +145,7 @@ module FHIR
       # Get a dynamically generated class for a given profile.
       def self.get_profile_class(uri)
         return nil if uri.nil?
+
         load_profiles
         load_extensions
 
@@ -161,7 +171,7 @@ module FHIR
             load f
             # set the return class type
             klass = Object.const_get("FHIR::DSTU2::Profile::#{id}::#{type}")
-          rescue
+          rescue StandardError
             FHIR::DSTU2.logger.error "Failed to generate class for profile #{uri}"
           end
           # unlink the file so it can be garbage collected
@@ -197,6 +207,7 @@ module FHIR
       def self.get_codes(uri, parent_code = nil)
         return nil if uri.nil?
         return @@cache[uri] if @@cache[uri]
+
         FHIR::DSTU2.logger.debug "Looking up codes for #{uri}"
         valueset = valuesets.select { |x| x['url'] == uri }.first
         if valueset.nil?
@@ -234,8 +245,9 @@ module FHIR
                                          []
                                        end
               end
-              x['concept'].each { |y| @@cache[uri][system] += get_codes_from_concept(y, parent_code) } if x['concept']
+              x['concept']&.each { |y| @@cache[uri][system] += get_codes_from_concept(y, parent_code) }
               next unless x['filter']
+
               x['filter'].each do |filter|
                 if filter['property'] == 'concept' && filter['op'] == 'is-a'
                   codes = get_codes(system, filter['value'])
@@ -255,7 +267,7 @@ module FHIR
                                            []
                                          end
                 end
-                x['concept'].each { |y| @@cache[uri][system].delete(y['code']) } if x['concept']
+                x['concept']&.each { |y| @@cache[uri][system].delete(y['code']) }
               end
             end
           end
@@ -273,6 +285,7 @@ module FHIR
                   codes = lookup[sys] if lookup
                 end
                 next unless codes
+
                 codes.each do |code|
                   @@cache[uri][sys] = [] unless @@cache[uri].keys.include?(sys)
                   @@cache[uri][sys] << code
@@ -296,7 +309,7 @@ module FHIR
           end
         end
         codes
-      rescue => e
+      rescue StandardError => e
         FHIR::DSTU2.logger.debug "Unable to extract codes from concept #{concept}: #{e.message}"
       end
 
@@ -342,6 +355,7 @@ module FHIR
 
       def self.search_parameters(type_name)
         return nil if type_name.nil?
+
         search_params.select { |p| p['base'].include?(type_name) && p['xpath'] && !p['xpath'].include?('extension') }.map { |p| p['code'] }
       end
       deprecate :get_search_parameters, :search_parameters

data/lib/fhir_dstu2_models/bootstrap/field.rb

@@ -23,7 +23,7 @@ module FHIR
       def serialize
         hash = {}
         instance_variables.each do |v|
-          hash[v.to_s[1..-1]] = instance_variable_get(v)
+          hash[v.to_s[1..]] = instance_variable_get(v)
         end
         hash.delete('name')
         hash.keep_if do |_key, value|
@@ -37,7 +37,7 @@ module FHIR
 
       def fix_name(name)
         fix = nil
-        fix = "local_#{name}" if %w[class method resourceType].include?(name)
+        fix = "local_#{name}" if ['class', 'method', 'resourceType'].include?(name)
         fix
       end
     end

data/lib/fhir_dstu2_models/bootstrap/generator.rb

@@ -120,6 +120,7 @@ module FHIR
             # skip the first element
             next if element['path'] == path_type
             next unless element['type']
+
             unique_types = element['type'].map { |t| t['code'] }.uniq
             if unique_types.include?('Element') || unique_types.include?('BackboneElement')
               child_templates << element['path']
@@ -129,6 +130,7 @@ module FHIR
           child_templates.each do |child_name|
             child_fixed_name = cap_first(child_name.gsub("#{type_name}.", ''))
             next if child_fixed_name.include?('.')
+
             child_def = { 'id' => child_fixed_name, 'snapshot' => { 'element' => [] } }
             # Copy the element definitions for the child structure
             structure_def['snapshot']['element'].each do |element|
@@ -183,13 +185,13 @@ module FHIR
                 field.path = element['path'].gsub(path_type, type_name)
                 field.type = data_type
                 field.type = 'Extension' if field.path.end_with?('extension')
-                field.type_profiles = profiles if %w[Reference Extension].include?(data_type)
+                field.type_profiles = profiles if ['Reference', 'Extension'].include?(data_type)
                 field.min = element['min']
                 field.max = element['max']
                 field.max = field.max.to_i
                 field.max = '*' if element['max'] == '*'
 
-                if %w[code Coding CodeableConcept].include?(data_type) && element['binding']
+                if ['code', 'Coding', 'CodeableConcept'].include?(data_type) && element['binding']
                   field.binding = element['binding']
                   field.binding['uri'] = field.binding['valueSetUri']
                   field.binding['uri'] = field.binding['valueSetReference'] if field.binding['uri'].nil?
@@ -206,7 +208,7 @@ module FHIR
                     @missing_expansions = true
                     @missing_required_expansion = (field.binding['strength'] == 'required') unless @missing_required_expansion
                   end
-                elsif %w[Element BackboneElement].include?(data_type)
+                elsif ['Element', 'BackboneElement'].include?(data_type)
                   # This is a nested structure or class
                   field.type = "#{hierarchy.join('::')}::#{cap_first(field.name)}"
                 end
@@ -217,7 +219,7 @@ module FHIR
               field = FHIR::DSTU2::Field.new(field_base_name)
               field.path = element['path'].gsub(path_type, type_name)
               field.type = element['nameReference']
-              field.type = field.type[1..-1] if field.type[0] == '#'
+              field.type = field.type[1..] if field.type[0] == '#'
               hindex = hierarchy.index { |x| x.casecmp(field.type).zero? }
               if hindex
                 # reference to self

data/lib/fhir_dstu2_models/bootstrap/hashable.rb

@@ -39,11 +39,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
@@ -86,17 +87,17 @@ module FHIR
         if child['resourceType'] && !klass::METADATA['resourceType']
           klass = begin
             FHIR::DSTU2.const_get(child['resourceType'])
-          rescue => exception
+          rescue StandardError => e
             # TODO: this appears to be a dead code branch
-            FHIR::DSTU2.logger.error("Unable to identify embedded class #{child['resourceType']}\n#{exception.message}\n#{exception.backtrace}")
+            FHIR::DSTU2.logger.error("Unable to identify embedded class #{child['resourceType']}\n#{e.message}\n#{e.backtrace}")
             nil
           end
         end
         begin
           obj = klass.new(child)
-        rescue => exception
+        rescue StandardError => e
           # TODO: this appears to be a dead code branch
-          FHIR::DSTU2.logger.error("Unable to inflate embedded class #{klass}\n#{exception.message}\n#{exception.backtrace}")
+          FHIR::DSTU2.logger.error("Unable to inflate embedded class #{klass}\n#{e.message}\n#{e.backtrace}")
         end
         obj
       end

data/lib/fhir_dstu2_models/bootstrap/json.rb

@@ -7,7 +7,7 @@ module FHIR
       #  This module includes methods to serialize or deserialize FHIR::DSTU2 resources to and from JSON.
       #
 
-      def to_json
+      def to_json(*_args)
         JSON.pretty_unparse(to_hash)
       end
 
@@ -18,7 +18,7 @@ module FHIR
           resource_type = hash['resourceType']
           klass = Module.const_get("FHIR::DSTU2::#{resource_type}")
           resource = klass.new(hash)
-        rescue => e
+        rescue StandardError => e
           FHIR::DSTU2.logger.error("Failed to deserialize JSON:\n#{e.message}\n#{e.backtrace}")
           FHIR::DSTU2.logger.debug("JSON:\n#{json}")
           resource = nil

data/lib/fhir_dstu2_models/bootstrap/model.rb

@@ -23,40 +23,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::DSTU2 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
@@ -66,6 +65,7 @@ module FHIR
       def equals?(other, exclude = [])
         self.class::METADATA.each do |key, value|
           next if exclude.include?(key)
+
           local_name = key
           local_name = value['local_name'] if value['local_name']
           return false unless compare_attribute(instance_variable_get("@#{local_name}".to_sym), other.instance_variable_get("@#{local_name}".to_sym), exclude)
@@ -77,6 +77,7 @@ module FHIR
         misses = []
         self.class::METADATA.each do |key, value|
           next if exclude.include?(key)
+
           local_name = key
           local_name = value['local_name'] if value['local_name']
           these = attribute_mismatch(instance_variable_get("@#{local_name}".to_sym), other.instance_variable_get("@#{local_name}".to_sym), exclude)
@@ -150,14 +151,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}")
@@ -166,8 +167,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
@@ -230,10 +232,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
@@ -256,6 +260,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
@@ -267,7 +272,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
@@ -288,12 +293,12 @@ module FHIR
 
       def check_binding_uri(uri, value)
         valid = false
-        if %w[http://hl7.org/fhir/ValueSet/content-type http://www.rfc-editor.org/bcp/bcp13.txt].include?(uri)
+        if ['http://hl7.org/fhir/ValueSet/content-type', '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 = %w[text/cql application/cql+text].include?(value)
+          known_weird = ['text/cql', 'application/cql+text'].include?(value)
           valid = json_or_xml || known_weird || (!matches.nil? && !matches.empty?)
-        elsif %w[http://hl7.org/fhir/ValueSet/languages http://tools.ietf.org/html/bcp47].include?(uri)
+        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?)
         else
@@ -323,7 +328,15 @@ 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
 end

data/lib/fhir_dstu2_models/bootstrap/preprocess.rb

@@ -12,12 +12,13 @@ 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 entry['resource']['resourceType'] == 'StructureDefinition'
             pre_process_valueset(entry['resource']) if entry['resource']['resourceType'] == 'ValueSet'
             pre_process_codesystem(entry['resource']) if entry['resource']['resourceType'] == 'CodeSystem'
@@ -35,26 +36,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
@@ -64,16 +69,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
@@ -81,15 +88,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

data/lib/fhir_dstu2_models/bootstrap/xml.rb

@@ -25,7 +25,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)
+        if hash['resourceType'].is_a?(String)
           child_name = hash['resourceType']
           hash.delete('resourceType')
           child = hash_to_xml_node(child_name, hash, doc)
@@ -34,11 +34,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::DSTU2::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))
@@ -63,7 +65,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::DSTU2::RESOURCES.include?(name)
         node
       end
@@ -79,7 +81,7 @@ module FHIR
           resource_type = doc.root.name
           klass = Module.const_get("FHIR::DSTU2::#{resource_type}")
           resource = klass.new(hash)
-        rescue => e
+        rescue StandardError => e
           FHIR::DSTU2.logger.error("Failed to deserialize XML:\n#{e.message}\n#{e.backtrace}")
           FHIR::DSTU2.logger.debug("XML:\n#{xml}")
           resource = nil
@@ -109,7 +111,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::DSTU2::RESOURCES.include?(node.name)
 

data/lib/fhir_dstu2_models/deprecate.rb

@@ -11,6 +11,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_dstu2_models/fhir/metadata.rb

@@ -1,28 +1,26 @@
 module FHIR
   module DSTU2
-
     PRIMITIVES = {
-      'markdown' => {'type'=>'string'},
-      'integer' => {'type'=>'number', 'regex'=>'-?([0]|([1-9][0-9]*))'},
-      'dateTime' => {'type'=>'string', 'regex'=>'-?[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)))?)?)?'},
-      'unsignedInt' => {'type'=>'number', 'regex'=>'[0]|([1-9][0-9]*)'},
-      'code' => {'type'=>'string', 'regex'=>'[^\\s]+([\\s][^\\s]+)*'},
-      'date' => {'type'=>'string', 'regex'=>'-?[0-9]{4}(-(0[1-9]|1[0-2])(-(0[0-9]|[1-2][0-9]|3[0-1]))?)?'},
-      'decimal' => {'type'=>'number', 'regex'=>'-?([0]|([1-9][0-9]*))(\\.[0-9]+)?'},
-      'uri' => {'type'=>'string'},
-      'id' => {'type'=>'string', 'regex'=>'[A-Za-z0-9\\-\\.]{1,64}'},
-      'base64Binary' => {'type'=>'string'},
-      'time' => {'type'=>'string', 'regex'=>'([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?'},
-      'oid' => {'type'=>'string', 'regex'=>'urn:oid:(0|[1-9][0-9]*)(\\.(0|[1-9][0-9]*))*'},
-      'positiveInt' => {'type'=>'number', 'regex'=>'[1-9][0-9]*'},
-      'string' => {'type'=>'string'},
-      'boolean' => {'type'=>'true | false'},
-      'uuid' => {'type'=>'string', 'regex'=>'urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'},
-      'instant' => {'type'=>'string'},
-      'xhtml' => {'type'=>'string'}
+      'markdown' => { 'type' => 'string' },
+      'integer' => { 'type' => 'number', 'regex' => '-?([0]|([1-9][0-9]*))' },
+      'dateTime' => { 'type' => 'string', 'regex' => '-?[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)))?)?)?' },
+      'unsignedInt' => { 'type' => 'number', 'regex' => '[0]|([1-9][0-9]*)' },
+      'code' => { 'type' => 'string', 'regex' => '[^\\s]+([\\s][^\\s]+)*' },
+      'date' => { 'type' => 'string', 'regex' => '-?[0-9]{4}(-(0[1-9]|1[0-2])(-(0[0-9]|[1-2][0-9]|3[0-1]))?)?' },
+      'decimal' => { 'type' => 'number', 'regex' => '-?([0]|([1-9][0-9]*))(\\.[0-9]+)?' },
+      'uri' => { 'type' => 'string' },
+      'id' => { 'type' => 'string', 'regex' => '[A-Za-z0-9\\-\\.]{1,64}' },
+      'base64Binary' => { 'type' => 'string' },
+      'time' => { 'type' => 'string', 'regex' => '([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?' },
+      'oid' => { 'type' => 'string', 'regex' => 'urn:oid:(0|[1-9][0-9]*)(\\.(0|[1-9][0-9]*))*' },
+      'positiveInt' => { 'type' => 'number', 'regex' => '[1-9][0-9]*' },
+      'string' => { 'type' => 'string' },
+      'boolean' => { 'type' => 'true | false' },
+      'uuid' => { 'type' => 'string', 'regex' => 'urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' },
+      'instant' => { 'type' => 'string' },
+      'xhtml' => { 'type' => 'string' }
     }
     TYPES = ['Address', 'Annotation', 'Attachment', 'BackboneElement', 'CodeableConcept', 'Coding', 'ContactPoint', 'Element', 'ElementDefinition', 'Extension', 'HumanName', 'Identifier', 'Meta', 'Narrative', 'Period', 'Quantity', 'Range', 'Ratio', 'Reference', 'SampledData', 'Signature', 'Timing']
     RESOURCES = ['Account', 'AllergyIntolerance', 'Appointment', 'AppointmentResponse', 'AuditEvent', 'Basic', 'Binary', 'BodySite', 'Bundle', 'CarePlan', 'Claim', 'ClaimResponse', 'ClinicalImpression', 'Communication', 'CommunicationRequest', 'Composition', 'ConceptMap', 'Condition', 'Conformance', 'Contract', 'Coverage', 'DataElement', 'DetectedIssue', 'Device', 'DeviceComponent', 'DeviceMetric', 'DeviceUseRequest', 'DeviceUseStatement', 'DiagnosticOrder', 'DiagnosticReport', 'DocumentManifest', 'DocumentReference', 'DomainResource', 'EligibilityRequest', 'EligibilityResponse', 'Encounter', 'EnrollmentRequest', 'EnrollmentResponse', 'EpisodeOfCare', 'ExplanationOfBenefit', 'FamilyMemberHistory', 'Flag', 'Goal', 'Group', 'HealthcareService', 'ImagingObjectSelection', 'ImagingStudy', 'Immunization', 'ImmunizationRecommendation', 'ImplementationGuide', 'List', 'Location', 'Media', 'Medication', 'MedicationAdministration', 'MedicationDispense', 'MedicationOrder', 'MedicationStatement', 'MessageHeader', 'NamingSystem', 'NutritionOrder', 'Observation', 'OperationDefinition', 'OperationOutcome', 'Order', 'OrderResponse', 'Organization', 'Parameters', 'Patient', 'PaymentNotice', 'PaymentReconciliation', 'Person', 'Practitioner', 'Procedure', 'ProcedureRequest', 'ProcessRequest', 'ProcessResponse', 'Provenance', 'Questionnaire', 'QuestionnaireResponse', 'ReferralRequest', 'RelatedPerson', 'Resource', 'RiskAssessment', 'Schedule', 'SearchParameter', 'Slot', 'Specimen', 'StructureDefinition', 'Subscription', 'Substance', 'SupplyDelivery', 'SupplyRequest', 'TestScript', 'ValueSet', 'VisionPrescription']
-
   end
-end
+end