fhir_dstu2_models 1.1.1 → 1.2.0

data/lib/fhir_dstu2_models/fhir/types/SampledData.rb

@@ -5,18 +5,18 @@ module FHIR
       include FHIR::DSTU2::Json
       include FHIR::DSTU2::Xml
 
-      SEARCH_PARAMS = 
-      METADATA = {
-        'id' => {'type'=>'id', 'path'=>'SampledData.id', 'min'=>0, 'max'=>1},
-        'extension' => {'type'=>'Extension', 'path'=>'SampledData.extension', 'min'=>0, 'max'=>Float::INFINITY},
-        'origin' => {'type'=>'Quantity', 'path'=>'SampledData.origin', 'min'=>1, 'max'=>1},
-        'period' => {'type'=>'decimal', 'path'=>'SampledData.period', 'min'=>1, 'max'=>1},
-        'factor' => {'type'=>'decimal', 'path'=>'SampledData.factor', 'min'=>0, 'max'=>1},
-        'lowerLimit' => {'type'=>'decimal', 'path'=>'SampledData.lowerLimit', 'min'=>0, 'max'=>1},
-        'upperLimit' => {'type'=>'decimal', 'path'=>'SampledData.upperLimit', 'min'=>0, 'max'=>1},
-        'dimensions' => {'type'=>'positiveInt', 'path'=>'SampledData.dimensions', 'min'=>1, 'max'=>1},
-        'data' => {'type'=>'string', 'path'=>'SampledData.data', 'min'=>1, 'max'=>1}
-      }
+      SEARCH_PARAMS =
+        METADATA = {
+          'id' => { 'type' => 'id', 'path' => 'SampledData.id', 'min' => 0, 'max' => 1 },
+          'extension' => { 'type' => 'Extension', 'path' => 'SampledData.extension', 'min' => 0, 'max' => Float::INFINITY },
+          'origin' => { 'type' => 'Quantity', 'path' => 'SampledData.origin', 'min' => 1, 'max' => 1 },
+          'period' => { 'type' => 'decimal', 'path' => 'SampledData.period', 'min' => 1, 'max' => 1 },
+          'factor' => { 'type' => 'decimal', 'path' => 'SampledData.factor', 'min' => 0, 'max' => 1 },
+          'lowerLimit' => { 'type' => 'decimal', 'path' => 'SampledData.lowerLimit', 'min' => 0, 'max' => 1 },
+          'upperLimit' => { 'type' => 'decimal', 'path' => 'SampledData.upperLimit', 'min' => 0, 'max' => 1 },
+          'dimensions' => { 'type' => 'positiveInt', 'path' => 'SampledData.dimensions', 'min' => 1, 'max' => 1 },
+          'data' => { 'type' => 'string', 'path' => 'SampledData.data', 'min' => 1, 'max' => 1 }
+        }
 
       attr_accessor :id         # 0-1 id
       attr_accessor :extension  # 0-* [ Extension ]
@@ -29,4 +29,4 @@ module FHIR
       attr_accessor :data       # 1-1 string
     end
   end
-end
+end

data/lib/fhir_dstu2_models/fhir/types/Signature.rb

@@ -8,17 +8,17 @@ module FHIR
       MULTIPLE_TYPES = {
         'who' => ['uri', 'Reference']
       }
-      SEARCH_PARAMS = 
-      METADATA = {
-        'id' => {'type'=>'id', 'path'=>'Signature.id', 'min'=>0, 'max'=>1},
-        'extension' => {'type'=>'Extension', 'path'=>'Signature.extension', 'min'=>0, 'max'=>Float::INFINITY},
-        'type' => {'valid_codes'=>{'http://hl7.org/fhir/valueset-signature-type'=>['1.2.840.10065.1.12.1.1', '1.2.840.10065.1.12.1.2', '1.2.840.10065.1.12.1.3', '1.2.840.10065.1.12.1.4', '1.2.840.10065.1.12.1.5', '1.2.840.10065.1.12.1.6', '1.2.840.10065.1.12.1.7', '1.2.840.10065.1.12.1.8', '1.2.840.10065.1.12.1.9', '1.2.840.10065.1.12.1.10', '1.2.840.10065.1.12.1.11', '1.2.840.10065.1.12.1.12', '1.2.840.10065.1.12.1.13', '1.2.840.10065.1.12.1.14', '1.2.840.10065.1.12.1.15', '1.2.840.10065.1.12.1.16', '1.2.840.10065.1.12.1.17']}, 'type'=>'Coding', 'path'=>'Signature.type', 'min'=>1, 'max'=>Float::INFINITY, 'binding'=>{'strength'=>'preferred', 'uri'=>'http://hl7.org/fhir/ValueSet/signature-type'}},
-        'when' => {'type'=>'instant', 'path'=>'Signature.when', 'min'=>1, 'max'=>1},
-        'whoUri' => {'type'=>'uri', 'path'=>'Signature.who[x]', 'min'=>1, 'max'=>1},
-        'whoReference' => {'type'=>'Reference', 'path'=>'Signature.who[x]', 'min'=>1, 'max'=>1},
-        'contentType' => {'type'=>'code', 'path'=>'Signature.contentType', 'min'=>1, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://www.rfc-editor.org/bcp/bcp13.txt'}},
-        'blob' => {'type'=>'base64Binary', 'path'=>'Signature.blob', 'min'=>1, 'max'=>1}
-      }
+      SEARCH_PARAMS =
+        METADATA = {
+          'id' => { 'type' => 'id', 'path' => 'Signature.id', 'min' => 0, 'max' => 1 },
+          'extension' => { 'type' => 'Extension', 'path' => 'Signature.extension', 'min' => 0, 'max' => Float::INFINITY },
+          'type' => { 'valid_codes' => { 'http://hl7.org/fhir/valueset-signature-type' => ['1.2.840.10065.1.12.1.1', '1.2.840.10065.1.12.1.2', '1.2.840.10065.1.12.1.3', '1.2.840.10065.1.12.1.4', '1.2.840.10065.1.12.1.5', '1.2.840.10065.1.12.1.6', '1.2.840.10065.1.12.1.7', '1.2.840.10065.1.12.1.8', '1.2.840.10065.1.12.1.9', '1.2.840.10065.1.12.1.10', '1.2.840.10065.1.12.1.11', '1.2.840.10065.1.12.1.12', '1.2.840.10065.1.12.1.13', '1.2.840.10065.1.12.1.14', '1.2.840.10065.1.12.1.15', '1.2.840.10065.1.12.1.16', '1.2.840.10065.1.12.1.17'] }, 'type' => 'Coding', 'path' => 'Signature.type', 'min' => 1, 'max' => Float::INFINITY, 'binding' => { 'strength' => 'preferred', 'uri' => 'http://hl7.org/fhir/ValueSet/signature-type' } },
+          'when' => { 'type' => 'instant', 'path' => 'Signature.when', 'min' => 1, 'max' => 1 },
+          'whoUri' => { 'type' => 'uri', 'path' => 'Signature.who[x]', 'min' => 1, 'max' => 1 },
+          'whoReference' => { 'type' => 'Reference', 'path' => 'Signature.who[x]', 'min' => 1, 'max' => 1 },
+          'contentType' => { 'type' => 'code', 'path' => 'Signature.contentType', 'min' => 1, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://www.rfc-editor.org/bcp/bcp13.txt' } },
+          'blob' => { 'type' => 'base64Binary', 'path' => 'Signature.blob', 'min' => 1, 'max' => 1 }
+        }
 
       attr_accessor :id           # 0-1 id
       attr_accessor :extension    # 0-* [ Extension ]
@@ -30,4 +30,4 @@ module FHIR
       attr_accessor :blob         # 1-1 base64Binary
     end
   end
-end
+end

data/lib/fhir_dstu2_models/fhir/types/Timing.rb

@@ -5,14 +5,14 @@ module FHIR
       include FHIR::DSTU2::Json
       include FHIR::DSTU2::Xml
 
-      SEARCH_PARAMS = 
-      METADATA = {
-        'id' => {'type'=>'id', 'path'=>'Timing.id', 'min'=>0, 'max'=>1},
-        'extension' => {'type'=>'Extension', 'path'=>'Timing.extension', 'min'=>0, 'max'=>Float::INFINITY},
-        'event' => {'type'=>'dateTime', 'path'=>'Timing.event', 'min'=>0, 'max'=>Float::INFINITY},
-        'repeat' => {'type'=>'Timing::Repeat', 'path'=>'Timing.repeat', 'min'=>0, 'max'=>1},
-        'code' => {'valid_codes'=>{'http://hl7.org/fhir/timing-abbreviation'=>['QD', 'QOD', 'Q4H', 'Q6H'], 'http://hl7.org/fhir/v3/GTSAbbreviation'=>['AM', 'BID', 'JB', 'JE', 'JH', '_GTSAbbreviationHolidaysChristianRoman', 'JHCHREAS', 'JHCHRGFR', 'JHCHRNEW', 'JHCHRPEN', 'JHCHRXME', 'JHCHRXMS', 'JHNNL', 'JHNNLLD', 'JHNNLQD', 'JHNNLSK', 'JHNUS', 'JHNUSCLM', 'JHNUSIND', 'JHNUSIND1', 'JHNUSIND5', 'JHNUSLBR', 'JHNUSMEM', 'JHNUSMEM5', 'JHNUSMEM6', 'JHNUSMLK', 'JHNUSPRE', 'JHNUSTKS', 'JHNUSTKS5', 'JHNUSVET', 'PM', 'QID', 'TID']}, 'type'=>'CodeableConcept', 'path'=>'Timing.code', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'preferred', 'uri'=>'http://hl7.org/fhir/ValueSet/timing-abbreviation'}}
-      }
+      SEARCH_PARAMS =
+        METADATA = {
+          'id' => { 'type' => 'id', 'path' => 'Timing.id', 'min' => 0, 'max' => 1 },
+          'extension' => { 'type' => 'Extension', 'path' => 'Timing.extension', 'min' => 0, 'max' => Float::INFINITY },
+          'event' => { 'type' => 'dateTime', 'path' => 'Timing.event', 'min' => 0, 'max' => Float::INFINITY },
+          'repeat' => { 'type' => 'Timing::Repeat', 'path' => 'Timing.repeat', 'min' => 0, 'max' => 1 },
+          'code' => { 'valid_codes' => { 'http://hl7.org/fhir/timing-abbreviation' => ['QD', 'QOD', 'Q4H', 'Q6H'], 'http://hl7.org/fhir/v3/GTSAbbreviation' => ['AM', 'BID', 'JB', 'JE', 'JH', '_GTSAbbreviationHolidaysChristianRoman', 'JHCHREAS', 'JHCHRGFR', 'JHCHRNEW', 'JHCHRPEN', 'JHCHRXME', 'JHCHRXMS', 'JHNNL', 'JHNNLLD', 'JHNNLQD', 'JHNNLSK', 'JHNUS', 'JHNUSCLM', 'JHNUSIND', 'JHNUSIND1', 'JHNUSIND5', 'JHNUSLBR', 'JHNUSMEM', 'JHNUSMEM5', 'JHNUSMEM6', 'JHNUSMLK', 'JHNUSPRE', 'JHNUSTKS', 'JHNUSTKS5', 'JHNUSVET', 'PM', 'QID', 'TID'] }, 'type' => 'CodeableConcept', 'path' => 'Timing.code', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'preferred', 'uri' => 'http://hl7.org/fhir/ValueSet/timing-abbreviation' } }
+        }
 
       class Repeat < FHIR::DSTU2::Model
         include FHIR::DSTU2::Hashable
@@ -23,21 +23,21 @@ module FHIR
           'bounds' => ['Quantity', 'Range', 'Period']
         }
         METADATA = {
-          'id' => {'type'=>'id', 'path'=>'Repeat.id', 'min'=>0, 'max'=>1},
-          'extension' => {'type'=>'Extension', 'path'=>'Repeat.extension', 'min'=>0, 'max'=>Float::INFINITY},
-          'boundsQuantity' => {'type'=>'Quantity', 'path'=>'Repeat.bounds[x]', 'min'=>0, 'max'=>1},
-          'boundsRange' => {'type'=>'Range', 'path'=>'Repeat.bounds[x]', 'min'=>0, 'max'=>1},
-          'boundsPeriod' => {'type'=>'Period', 'path'=>'Repeat.bounds[x]', 'min'=>0, 'max'=>1},
-          'count' => {'type'=>'integer', 'path'=>'Repeat.count', 'min'=>0, 'max'=>1},
-          'duration' => {'type'=>'decimal', 'path'=>'Repeat.duration', 'min'=>0, 'max'=>1},
-          'durationMax' => {'type'=>'decimal', 'path'=>'Repeat.durationMax', 'min'=>0, 'max'=>1},
-          'durationUnits' => {'valid_codes'=>{'http://unitsofmeasure.org'=>['s', 'min', 'h', 'd', 'wk', 'mo', 'a']}, 'type'=>'code', 'path'=>'Repeat.durationUnits', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/units-of-time'}},
-          'frequency' => {'type'=>'integer', 'path'=>'Repeat.frequency', 'min'=>0, 'max'=>1},
-          'frequencyMax' => {'type'=>'integer', 'path'=>'Repeat.frequencyMax', 'min'=>0, 'max'=>1},
-          'period' => {'type'=>'decimal', 'path'=>'Repeat.period', 'min'=>0, 'max'=>1},
-          'periodMax' => {'type'=>'decimal', 'path'=>'Repeat.periodMax', 'min'=>0, 'max'=>1},
-          'periodUnits' => {'valid_codes'=>{'http://unitsofmeasure.org'=>['s', 'min', 'h', 'd', 'wk', 'mo', 'a']}, 'type'=>'code', 'path'=>'Repeat.periodUnits', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/units-of-time'}},
-          'when' => {'valid_codes'=>{'http://hl7.org/fhir/v3/TimingEvent'=>['AC', 'ACD', 'ACM', 'ACV', 'C', 'CD', 'CM', 'CV', 'HS', 'IC', 'ICD', 'ICM', 'ICV', 'PC', 'PCD', 'PCM', 'PCV', 'WAKE']}, 'type'=>'code', 'path'=>'Repeat.when', 'min'=>0, 'max'=>1, 'binding'=>{'strength'=>'required', 'uri'=>'http://hl7.org/fhir/ValueSet/event-timing'}}
+          'id' => { 'type' => 'id', 'path' => 'Repeat.id', 'min' => 0, 'max' => 1 },
+          'extension' => { 'type' => 'Extension', 'path' => 'Repeat.extension', 'min' => 0, 'max' => Float::INFINITY },
+          'boundsQuantity' => { 'type' => 'Quantity', 'path' => 'Repeat.bounds[x]', 'min' => 0, 'max' => 1 },
+          'boundsRange' => { 'type' => 'Range', 'path' => 'Repeat.bounds[x]', 'min' => 0, 'max' => 1 },
+          'boundsPeriod' => { 'type' => 'Period', 'path' => 'Repeat.bounds[x]', 'min' => 0, 'max' => 1 },
+          'count' => { 'type' => 'integer', 'path' => 'Repeat.count', 'min' => 0, 'max' => 1 },
+          'duration' => { 'type' => 'decimal', 'path' => 'Repeat.duration', 'min' => 0, 'max' => 1 },
+          'durationMax' => { 'type' => 'decimal', 'path' => 'Repeat.durationMax', 'min' => 0, 'max' => 1 },
+          'durationUnits' => { 'valid_codes' => { 'http://unitsofmeasure.org' => ['s', 'min', 'h', 'd', 'wk', 'mo', 'a'] }, 'type' => 'code', 'path' => 'Repeat.durationUnits', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/units-of-time' } },
+          'frequency' => { 'type' => 'integer', 'path' => 'Repeat.frequency', 'min' => 0, 'max' => 1 },
+          'frequencyMax' => { 'type' => 'integer', 'path' => 'Repeat.frequencyMax', 'min' => 0, 'max' => 1 },
+          'period' => { 'type' => 'decimal', 'path' => 'Repeat.period', 'min' => 0, 'max' => 1 },
+          'periodMax' => { 'type' => 'decimal', 'path' => 'Repeat.periodMax', 'min' => 0, 'max' => 1 },
+          'periodUnits' => { 'valid_codes' => { 'http://unitsofmeasure.org' => ['s', 'min', 'h', 'd', 'wk', 'mo', 'a'] }, 'type' => 'code', 'path' => 'Repeat.periodUnits', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/units-of-time' } },
+          'when' => { 'valid_codes' => { 'http://hl7.org/fhir/v3/TimingEvent' => ['AC', 'ACD', 'ACM', 'ACV', 'C', 'CD', 'CM', 'CV', 'HS', 'IC', 'ICD', 'ICM', 'ICV', 'PC', 'PCD', 'PCM', 'PCV', 'WAKE'] }, 'type' => 'code', 'path' => 'Repeat.when', 'min' => 0, 'max' => 1, 'binding' => { 'strength' => 'required', 'uri' => 'http://hl7.org/fhir/ValueSet/event-timing' } }
         }
 
         attr_accessor :id             # 0-1 id
@@ -64,4 +64,4 @@ module FHIR
       attr_accessor :code      # 0-1 CodeableConcept
     end
   end
-end
+end

data/lib/fhir_dstu2_models/fhir.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require 'logger'
+require 'uri'
 
 module FHIR
   module DSTU2
@@ -35,11 +36,11 @@ module FHIR
       when 'string', 'markdown'
         value.is_a?(String)
       when 'decimal'
-        !(value.to_s =~ /\A([-+]?([0]|([1-9][0-9]*))(\.[0-9]+)?)\Z/).nil?
+        !(value.to_s =~ /\A([-+]?(0|([1-9][0-9]*))(\.[0-9]+)?)\Z/).nil?
       when 'uri'
         begin
           !URI.parse(value).nil?
-        rescue
+        rescue StandardError
           false
         end
       when 'base64binary'
@@ -48,7 +49,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?
@@ -63,16 +64,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_dstu2_models/fhir_ext/element_definition.rb

@@ -26,6 +26,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
@@ -33,6 +34,7 @@ module FHIR
 
       def sweep_children
         return unless @children
+
         @children.each(&:sweep_children)
         @children = @children.keep_if(&:marked_for_keeping)
         @marked_for_keeping = !@children.empty? || @marked_for_keeping
@@ -41,6 +43,7 @@ module FHIR
       def print_children(spaces = 0)
         puts "#{' ' * spaces}+#{local_name || path} #{name} #{min}..#{max}"
         return nil unless @children
+
         @children.each do |child|
           child.print_children(spaces + 2)
         end

data/lib/fhir_dstu2_models/fhir_ext/structure_definition.rb

@@ -61,7 +61,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
@@ -103,13 +103,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
@@ -129,11 +131,11 @@ 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
 
         begin
           data_type_found = element.type.first.code
-        rescue
+        rescue StandardError
           data_type_found = nil
         end
 
@@ -165,9 +167,10 @@ module FHIR
         end
 
         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
-          codeable_concept_pattern = element.pattern && element.pattern.is_a?(FHIR::DSTU2::CodeableConcept)
+          codeable_concept_pattern = element.pattern&.is_a?(FHIR::DSTU2::CodeableConcept)
           matching_pattern = false
           nodes.each do |value|
             matching_type = 0
@@ -204,7 +207,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
 
@@ -277,6 +280,7 @@ module FHIR
 
         # check children if the element has any
         return unless element.children
+
         nodes.each do |node|
           element.children.each do |child|
             verify_element(child, node)
@@ -296,7 +300,7 @@ module FHIR
               ret_val = definition.validates_hash?(value)
               @errors += definition.errors
               @warnings += definition.warnings
-            rescue
+            rescue StandardError
               @errors << "Unable to verify #{data_type_code} as a FHIR::DSTU2 Resource."
             end
             return ret_val
@@ -316,7 +320,7 @@ module FHIR
               ret_val = definition.validates_hash?(value)
               @errors += definition.errors
               @warnings += definition.warnings
-            rescue
+            rescue StandardError
               @errors << "Unable to verify #{resource_type} as a FHIR::DSTU2 Resource."
             end
             ret_val
@@ -338,7 +342,7 @@ module FHIR
               ret_val = definition.validates_hash?(value)
               @errors += definition.errors
               @warnings += definition.warnings
-            rescue
+            rescue StandardError
               @errors << "Unable to verify #{data_type_code} as a FHIR::DSTU2 type."
             end
             ret_val
@@ -356,13 +360,13 @@ module FHIR
 
         matching_type = 0
 
-        if %w[http://hl7.org/fhir/ValueSet/content-type http://www.rfc-editor.org/bcp/bcp13.txt].include?(vs_uri)
+        if ['http://hl7.org/fhir/ValueSet/content-type', 'http://www.rfc-editor.org/bcp/bcp13.txt'].include?(vs_uri)
           matches = MIME::Types[value]
           if (matches.nil? || matches.size.zero?) && !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 %w[http://hl7.org/fhir/ValueSet/languages http://tools.ietf.org/html/bcp47].include?(vs_uri)
+        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
@@ -395,10 +399,11 @@ module FHIR
 
       def some_type_of_xml_or_json?(code)
         m = code.downcase
-        return true if %w[xml json].include?(m)
+        return true if ['xml', 'json'].include?(m)
         return true if (m.starts_with?('application/') || m.starts_with?('text/')) && (m.ends_with?('json') || m.ends_with?('xml'))
         return true if m.starts_with?('application/xml') || m.starts_with?('text/xml')
         return true if m.starts_with?('application/json') || m.starts_with?('text/json')
+
         false
       end
       deprecate :is_some_type_of_xml_or_json, :some_type_of_xml_or_json?

data/lib/fhir_dstu2_models/fhir_ext/structure_definition_compare.rb

@@ -57,6 +57,7 @@ module FHIR
         # generate warnings for missing fields (ignoring extensions)
         left_missing.each do |e|
           next if e.include? 'extension'
+
           elem = get_element_by_path(e, right_elements)
           if !elem.min.nil? && elem.min > 0
             @errors << @finding.error(e, 'min', 'Missing REQUIRED element', 'Missing', elem.min.to_s)
@@ -68,6 +69,7 @@ module FHIR
         end
         right_missing.each do |e|
           next if e.include? 'extension'
+
           elem = get_element_by_path(e, left_elements)
           if !elem.min.nil? && elem.min > 0
             @errors << @finding.error(e, 'min', 'Missing REQUIRED element', elem.min.to_s, 'Missing')
@@ -114,6 +116,7 @@ module FHIR
           end
           y = get_extension(x.type[0].profile, right_extensions)
           next unless !y.nil? && x.name != y.name
+
           # both profiles share the same extension definition but with a different name
           checked_extensions << x.name
           checked_extensions << y.name
@@ -121,6 +124,7 @@ module FHIR
         end
         right_extensions.each do |y|
           next if checked_extensions.include?(y.name)
+
           x = get_extension(y.name, left_extensions)
           unless x.nil?
             # both profiles share an extension with the same name
@@ -129,6 +133,7 @@ module FHIR
           end
           x = get_extension(y.type[0].profile, left_extensions)
           next unless !x.nil? && x.name != y.name && !checked_extensions.include?(x.name)
+
           # both profiles share the same extension definition but with a different name
           checked_extensions << x.name
           checked_extensions << y.name
@@ -180,13 +185,16 @@ module FHIR
           x = path.split('.')
           root = x.first(x.size - 1).join('.')
           next unless root.include? '.'
+
           # get the root element to fill in the details
           elem = get_element_by_path(root, elements)
           # get the data type definition to fill in the details
           # assume missing elements are from first data type (gross)
           next if elem.type.nil? || elem.type.empty?
+
           type_def = FHIR::DSTU2::Definitions.type_definition(elem.type[0].code)
           next if type_def.nil?
+
           type_elements = Array.new(type_def.snapshot.element)
           # _DEEP_ copy
           type_elements.map! do |e| # {|e| FHIR::DSTU2::ElementDefinition.from_fhir_json(e.to_fhir_json) }
@@ -200,6 +208,7 @@ module FHIR
           type_elements.each do |z|
             y = get_element_by_path(z.path, elements)
             next unless y.nil?
+
             elements << z
             # else
             #   @warnings << "StructureDefinition #{name} already contains #{z.path}"
@@ -368,6 +377,7 @@ module FHIR
 
         # isModifier
         return unless x.isModifier != y.isModifier
+
         @errors << @finding.error(x.path.to_s, 'isModifier', 'Incompatible isModifier', (x.isModifier || false).to_s, (y.isModifier || false).to_s)
       end
 

data/lib/fhir_dstu2_models/fhir_ext/structure_definition_finding.rb

@@ -16,7 +16,7 @@ module FHIR
         "#{resourceType},#{profileIdA},#{profileIdB},#{path},#{attribute},#{status},#{message},#{valueA},#{valueB}"
       end
 
-      def to_json
+      def to_json(*_args)
         JSON.pretty_unparse(as_json)
       end
 
@@ -31,7 +31,7 @@ module FHIR
             hash.each do |key, value|
               obj.send("#{key}=".to_sym, value) if value
             end
-          rescue => e
+          rescue StandardError => e
             FHIR::DSTU2.logger.error "Failed to parse JSON: #{e.message}"
             return nil
           end

data/lib/fhir_dstu2_models/fluentpath/evaluate.rb

@@ -20,12 +20,14 @@ module FluentPath
       return 'http://unitsofmeasure.org' if key == '%ucum'
       return 'http://snomed.info/sct' if key == '%sct'
       return 'http://loinc.org' if key == '%loinc'
-      return key.gsub!(/\A\'|\'\Z/, '') if key.start_with?("'") && key.end_with?("'")
+      return key.gsub!(/\A'|'\Z/, '') if key.start_with?("'") && key.end_with?("'")
+
       key.gsub!(/\A"|"\Z/, '') # remove quotes around path if they exist
       if hash.is_a?(Array)
         response = []
         hash.each do |e|
           next unless e.is_a?(Hash)
+
           item = e[key]
           if item.is_a?(Array)
             item.each { |i| response << i }
@@ -37,6 +39,7 @@ module FluentPath
       end
       return :null unless hash.is_a?(Hash)
       return hash if hash['resourceType'] == key
+
       val = hash[key]
       if val.nil?
         # this block is a dangerous hack to get fields of multiple data types
@@ -60,6 +63,7 @@ module FluentPath
       return false if value.is_a?(Hash) && value.empty?
       return false if value == :null
       return false if value == false
+
       true
     end
 
@@ -99,7 +103,7 @@ module FluentPath
           if node.is_a?(String) && !(node.start_with?("'") && node.end_with?("'"))
             array_index = nil
             if node.include?('[') && node.end_with?(']')
-              array_index = node[node.index('[')..-1].gsub(/\[|\]/, '')
+              array_index = node[node.index('[')..].gsub(/\[|\]/, '')
               t = get(array_index, data)
               t = array_index.to_i if t.nil? || t == :null
               array_index = t
@@ -128,14 +132,15 @@ module FluentPath
                 raise 'Where function requires a block.'
               end
               previous_node = [] if previous_node == :null
-              if previous_node.is_a?(Array)
+              case previous_node
+              when Array
                 previous_node.keep_if do |item|
                   sub = compute(block.clone, item)
                   convert_to_boolean(sub)
                 end
                 tree[index] = previous_node
                 clean_index(tree, previous_index)
-              elsif previous_node.is_a?(Hash)
+              when Hash
                 sub = compute(block, previous_node)
                 tree[index] = convert_to_boolean(sub) ? previous_node : {}
                 clean_index(tree, previous_index)
@@ -154,13 +159,14 @@ module FluentPath
                 raise 'Select function requires a block.'
               end
               previous_node = [] if previous_node == :null
-              if previous_node.is_a?(Array)
+              case previous_node
+              when Array
                 previous_node.map! do |item|
                   compute(block.clone, item)
                 end
                 tree[index] = previous_node
                 clean_index(tree, previous_index)
-              elsif previous_node.is_a?(Hash)
+              when Hash
                 tree[index] = compute(block, previous_node)
                 clean_index(tree, previous_index)
               else
@@ -182,8 +188,8 @@ module FluentPath
                 if exts.is_a?(Array)
                   url = nil
                   begin
-                    url = block.tree.first.gsub(/\'|\"/, '')
-                  rescue
+                    url = block.tree.first.gsub(/'|"/, '')
+                  rescue StandardError
                     raise 'Extension function requires a single URL as String.'
                   end
                   ext = exts.select { |x| x['url'] == url }.first
@@ -380,9 +386,10 @@ module FluentPath
               break
             when :toInteger
               # the previous node should be a data (as String, Integer, Boolean)
-              if previous_node.is_a?(String)
+              case previous_node
+              when String
                 tree[index] = previous_node.to_i rescue 0
-              elsif previous_node.is_a?(Numeric)
+              when Numeric
                 tree[index] = previous_node.to_i
               else
                 tree[index] = 0
@@ -587,4 +594,4 @@ module FluentPath
       tree.first
     end
   end
-end
+end

data/lib/fhir_dstu2_models/fluentpath/expression.rb

@@ -17,11 +17,9 @@ module FluentPath
 
       def clone
         clone_tree = @tree.map do |x|
-          begin
-            x.clone
-          rescue
-            x
-          end
+          x.clone
+        rescue StandardError
+          x
         end
         FluentPath::DSTU2::Expression.new(clone_tree)
       end

data/lib/fhir_dstu2_models/fluentpath/parse.rb

@@ -8,7 +8,7 @@ module FluentPath
 
     # This method tokenizes the expression into a flat array of tokens
     def self.tokenize(expression)
-      raw_tokens = expression.gsub('()', '').split(%r{(\(|\)|\s|>=|<=|>|<|=|!=|\+|-|\/|\*)})
+      raw_tokens = expression.gsub('()', '').split(%r{(\(|\)|\s|>=|<=|>|<|=|!=|\+|-|/|\*)})
       # recreate strings if they were split
       size = nil
       while raw_tokens.include?("'") && size != raw_tokens.length
@@ -45,13 +45,15 @@ module FluentPath
     def self.reassemble_strings(tokens)
       tokens.each_with_index do |token, index|
         next unless token.is_a?(String)
+
         e_index = nil
         if token.start_with?('"') && !token.end_with?('"')
-          e_index = tokens[index..-1].index { |t| t.end_with?('"') }
+          e_index = tokens[index..].index { |t| t.end_with?('"') }
         elsif token.start_with?("'") && !token.end_with?("'")
-          e_index = tokens[index..-1].index { |t| t.end_with?("'") }
+          e_index = tokens[index..].index { |t| t.end_with?("'") }
         end
         next unless e_index
+
         i = index + 1
         while i <= index + e_index
           tokens[index] += tokens[i]
@@ -64,6 +66,7 @@ module FluentPath
     # This method builds an Abstract Syntax Tree (AST) from a flat list of tokens
     def self.build_tree(tokens)
       return if tokens.empty?
+
       tree = []
       until tokens.empty?
         token = tokens.delete_at(0)
@@ -92,7 +95,7 @@ module FluentPath
       value = token
       begin
         value = Float(token)
-      rescue
+      rescue StandardError
         value = token
         value = token.to_sym if @@reserved.include?(token)
         value = true if token == 'true'

data/lib/fhir_dstu2_models/version.rb

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