fhir_models 4.2.2 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1519a66581a704c52e44ce3aa98f23528fe691ecf3af22bce5b0eaa8b45af05f
-  data.tar.gz: ed8c1093325205391c68b9f71ab81e2c80d6515660aaf59e4d51bbf4ebd80ba0
+  metadata.gz: cbba24e4cace9e2cb19f53f46a06fc8731b982014ee0da534cd0c6dbe6c16199
+  data.tar.gz: 7d2834c9c61fcc01c2d851c5de645a974a8b3d9bf44da2af639b6fde75e8071e
 SHA512:
-  metadata.gz: 886b58b3631c5a7ba06f10b40f5721d12ededddc20ad692b830c88a1ea370e635fe6dae144ec90746588fc33415045936aed6f04cc803a1ec3275751d615caab
-  data.tar.gz: 2f29ad97d1f8b68a3f7e3631d7e06d6656982eff5efff162f560cd7dc715860c6d6a46d7f86b8da606bbf0e61dcec89eb80a5c732c26489c690d24d95b037939
+  metadata.gz: a60709d19586e87f86067a94e1b3867968bd06abd934cb3cfcc4d64ac138cf9389730dd1bd024e5b9ee68eff28d8d605dfdc2e4d22254d783ca56cbb719c897b
+  data.tar.gz: 51cd84621c0e66e28bc793d97edc56f25e641a0fe97e9b376f1978721ee4ffa3cf6a662364a03797e0fe4fec3d21df62ef2034e5711fe12e551be9ae80e54bc2

data/.github/workflows/ruby.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7']
+        ruby-version: ['3.0', '3.1', '3.2']
 
     steps:
     - uses: actions/checkout@v2

data/.gitignore

@@ -2,7 +2,6 @@
 **/coverage/**
 fhir_models*log*
 invariants.txt
-.ruby-version
 .ruby-gemset
 tmp/
 

data/.rubocop.yml

@@ -1,6 +1,6 @@
 inherit_from: .rubocop_todo.yml
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.0
   Exclude:
     - 'test/**/*'
     - 'spec/**/*'
@@ -12,6 +12,8 @@ AllCops:
     - 'bin/*'
 Layout/LineLength:
   Enabled: false
+Style/AccessorGrouping:
+  Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: false
 Style/HashEachMethods:
@@ -20,6 +22,8 @@ Style/HashTransformKeys:
   Enabled: true
 Style/HashTransformValues:
   Enabled: true
+Style/WordArray:
+  EnforcedStyle: brackets
 inherit_mode:
   merge:
     - Exclude

data/.rubocop_todo.yml

@@ -1,47 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-03-30 16:14:38 -0400 using RuboCop version 0.80.0.
+# on 2023-12-13 19:55:27 UTC using RuboCop version 1.23.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 51
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/fhir_models/bootstrap/definitions.rb'
-    - 'lib/fhir_models/bootstrap/generator.rb'
-    - 'lib/fhir_models/bootstrap/hashable.rb'
-    - 'lib/fhir_models/bootstrap/model.rb'
-    - 'lib/fhir_models/bootstrap/preprocess.rb'
-    - 'lib/fhir_models/bootstrap/xml.rb'
-    - 'lib/fhir_models/deprecate.rb'
-    - 'lib/fhir_models/fhir_ext/element_definition.rb'
-    - 'lib/fhir_models/fhir_ext/structure_definition.rb'
-    - 'lib/fhir_models/fhir_ext/structure_definition_compare.rb'
-    - 'lib/fhir_models/fhirpath/parse.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/RescueEnsureAlignment:
-  Exclude:
-    - 'lib/fhir_models/bootstrap/hashable.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Lint/ToJSON:
-  Exclude:
-    - 'lib/fhir_models/bootstrap/json.rb'
-    - 'lib/fhir_models/fhir_ext/structure_definition_finding.rb'
-
-# Offense count: 40
+# Offense count: 38
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 392
+  Max: 394
 
 # Offense count: 7
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: refine
 Metrics/BlockLength:
   Max: 78
 
@@ -51,47 +23,51 @@ Metrics/BlockNesting:
   Max: 5
 
 # Offense count: 7
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 356
+  Max: 355
 
-# Offense count: 23
+# Offense count: 32
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 65
+  Max: 73
 
-# Offense count: 44
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 45
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 133
+  Max: 132
 
 # Offense count: 2
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 114
+  Max: 115
 
-# Offense count: 23
+# Offense count: 28
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 68
+  Max: 76
+
+# Offense count: 5
+# Configuration parameters: EnforcedStyle, IgnoredPatterns.
+# SupportedStyles: snake_case, camelCase
+Naming/MethodName:
+  Exclude:
+    - 'lib/fhir_models/fhir_ext/structure_definition_finding.rb'
 
 # Offense count: 4
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db, os, pp
+# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
   Exclude:
     - 'lib/fhir_models/fhir_ext/structure_definition_compare.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: PreferredName.
-Naming/RescuedExceptionsVariableName:
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
   Exclude:
-    - 'lib/fhir_models/bootstrap/hashable.rb'
-
-# Offense count: 1
-# Configuration parameters: .
-# SupportedStyles: inline, group
-Style/AccessModifierDeclarations:
-  EnforcedStyle: inline
+    - '.simplecov'
 
 # Offense count: 17
 Style/ClassVars:
@@ -99,17 +75,23 @@ Style/ClassVars:
     - 'lib/fhir_models/bootstrap/definitions.rb'
     - 'lib/fhir_models/fhirpath/parse.rb'
 
+# Offense count: 1
+Style/CombinableLoops:
+  Exclude:
+    - 'lib/fhir_models/fhir_ext/structure_definition_compare.rb'
+
 # Offense count: 6
+# Cop supports --auto-correct.
 Style/CommentedKeyword:
   Exclude:
     - 'lib/fhir_models/bootstrap/hashable.rb'
     - 'lib/fhir_models/bootstrap/model.rb'
 
-# Offense count: 14
+# Offense count: 15
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
+    - '.simplecov'
     - 'lib/fhir_models/bootstrap/definitions.rb'
     - 'lib/fhir_models/bootstrap/field.rb'
     - 'lib/fhir_models/bootstrap/generator.rb'
@@ -136,71 +118,22 @@ Style/IfUnlessModifier:
     - 'lib/fhir_models/fhir_ext/structure_definition.rb'
     - 'lib/fhir_models/fhir_ext/structure_definition_compare.rb'
 
-# Offense count: 1
-Style/MethodMissingSuper:
-  Exclude:
-    - 'lib/fhir_models/bootstrap/model.rb'
-
 # Offense count: 1
 Style/MissingRespondToMissing:
   Exclude:
     - 'lib/fhir_models/bootstrap/model.rb'
 
-# Offense count: 9
-Style/MultipleComparison:
-  Exclude:
-    - 'lib/fhir_models/bootstrap/definitions.rb'
-    - 'lib/fhir_models/bootstrap/generator.rb'
-    - 'lib/fhir_models/bootstrap/model.rb'
-    - 'lib/fhir_models/fhir_ext/structure_definition.rb'
-
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/fhir_models/fhir_ext/structure_definition_compare.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/OrAssignment:
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/fhir_models/bootstrap/generator.rb'
+    - 'lib/fhir_models/bootstrap/template.rb'
 
-# Offense count: 16
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    - 'lib/fhir_models/bootstrap/definitions.rb'
-    - 'lib/fhir_models/bootstrap/hashable.rb'
-    - 'lib/fhir_models/bootstrap/json.rb'
-    - 'lib/fhir_models/bootstrap/model.rb'
-    - 'lib/fhir_models/bootstrap/xml.rb'
-    - 'lib/fhir_models/fhir.rb'
-    - 'lib/fhir_models/fhir_ext/structure_definition.rb'
-    - 'lib/fhir_models/fhir_ext/structure_definition_finding.rb'
-    - 'lib/fhir_models/fhirpath/expression.rb'
-    - 'lib/fhir_models/fhirpath/parse.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
-# AllowedMethods: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Exclude:
-    - 'lib/fhir_models/bootstrap/definitions.rb'
-    - 'lib/fhir_models/bootstrap/xml.rb'
-    - 'lib/fhir_models/fhir_ext/structure_definition.rb'
-
-# Offense count: 7
+# Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: forbid_for_all_comparison_operators, forbid_for_equality_operators_only, require_for_all_comparison_operators, require_for_equality_operators_only
-Style/YodaCondition:
+# Configuration parameters: AllowModifier.
+Style/SoleNestedConditional:
   Exclude:
-    - 'lib/fhir_models/bootstrap/preprocess.rb'
-    - 'lib/fhir_models/fhirpath/parse.rb'
+    - 'lib/fhir_models/fhir_ext/structure_definition_compare.rb'

data/.ruby-version

@@ -0,0 +1 @@
+3.1.2

data/.simplecov

@@ -1,14 +1,10 @@
 require 'simplecov'
 SimpleCov.command_name 'Unit Tests'
-SimpleCov.start do
-  add_filter "test/"
-  add_group "Library", "lib"
-end
 
 class SimpleCov::Formatter::QualityFormatter
   def format(result)
     SimpleCov::Formatter::HTMLFormatter.new.format(result)
-    File.open("coverage/covered_percent", "w") do |f|
+    File.open('coverage/covered_percent', 'w') do |f|
       f.puts result.source_files.covered_percent.to_f
     end
   end

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fhir_models (4.2.2)
+    fhir_models (4.3.0)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
       mime-types (>= 3.0)
@@ -14,7 +14,7 @@ GEM
     bcp47 (0.3.3)
       i18n
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.3.1)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
     date_time_precision (0.8.1)
@@ -39,22 +39,21 @@ GEM
     guard-test (2.0.8)
       guard-compat (~> 1.2)
       test-unit (~> 3.0)
-    i18n (1.12.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
     json (2.3.1)
     listen (3.3.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    mime-types (3.4.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    mini_portile2 (2.5.3)
+    mime-types-data (3.2024.0507)
+    mini_portile2 (2.8.6)
     nenv (0.3.0)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.16.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nokogiri-diff (0.2.0)
       nokogiri (~> 1.5)
@@ -62,22 +61,25 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
+      racc
     power_assert (1.2.0)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-coolline (0.2.5)
       coolline (~> 0.5)
-    racc (1.5.2)
-    rainbow (3.0.0)
+    racc (1.8.0)
+    rainbow (3.1.1)
     rake (13.0.1)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
+    regexp_parser (2.8.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -91,26 +93,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (0.80.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.23.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
     shellany (0.0.1)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    strscan (3.1.0)
     tdiff (0.3.4)
     test-unit (3.3.6)
       power_assert
     thor (1.0.1)
-    unicode-display_width (1.6.1)
+    unicode-display_width (2.5.0)
     unicode_utils (1.4.0)
 
 PLATFORMS
@@ -126,12 +132,12 @@ DEPENDENCIES
   pry-coolline
   rake
   rspec
-  rubocop (= 0.80)
+  rubocop (= 1.23.0)
   simplecov (~> 0.17.0)
   test-unit
 
 RUBY VERSION
-   ruby 2.7.4p191
+   ruby 3.1.2p20
 
 BUNDLED WITH
    2.2.21

data/Guardfile

@@ -15,7 +15,7 @@
 #
 # and, you'll have to watch "config/Guardfile" instead of "Guardfile"
 
-# Note: The cmd option is now required due to the increasing number of ways
+# NOTE: The cmd option is now required due to the increasing number of ways
 #       rspec may be run, below are examples of the most common uses.
 #  * bundler: 'bundle exec rspec'
 #  * bundler binstubs: 'bin/rspec'

data/fhir_models.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 3.0.0'
   spec.add_dependency 'nokogiri', '>= 1.11.4'
   spec.add_dependency 'date_time_precision', '>= 0.8'
   spec.add_dependency 'bcp47', '>= 0.3'
@@ -34,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov', '~> 0.17.0'
   spec.add_development_dependency 'nokogiri-diff'
-  spec.add_development_dependency 'rubocop', '0.80'
+  spec.add_development_dependency 'rubocop', '1.23.0'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'guard-test'
 end

data/lib/fhir_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::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::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::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::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::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::Profile::#{id}::#{type}")
-        rescue
+        rescue StandardError
           FHIR.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)
       return nil if uri.nil?
       return @@cache[uri] if @@cache[uri]
+
       valueset = expansions.find { |x| x['url'] == uri } || valuesets.find { |x| x['url'] == uri && x['resourceType'] == 'ValueSet' }
       unless valueset.nil?
         @@cache[uri] = {}
@@ -214,12 +225,12 @@ module FHIR
             system_url = code_group['system']
             @@cache[uri][system_url] ||= []
             if !code_group['concept'].nil?
-              code_group['concept'].each { |y| @@cache[uri][system_url] << y['code'] } if code_group['concept']
+              code_group['concept']&.each { |y| @@cache[uri][system_url] << y['code'] }
             elsif code_group.size == 1
               # i.e. the only key is 'system', so you import the entire thing
               systems = valuesets.select { |x| x['resourceType'] == 'CodeSystem' && x['url'] == system_url }
               systems.each do |included_system|
-                included_system['concept'].each { |y| @@cache[uri][system_url] << y['code'] } if included_system['concept']
+                included_system['concept']&.each { |y| @@cache[uri][system_url] << y['code'] }
               end
             end
           end
@@ -233,6 +244,7 @@ module FHIR
     # If one can't be found, return nil
     def self.get_display(uri, code)
       return nil if uri.nil? || code.nil?
+
       valuesets_and_expansions = expansions.select { |ex| ex['compose']['include'].detect { |i| i['system'] == uri } }
       valuesets_and_expansions += valuesets.select { |vs| vs['url'] == uri }
       code_hash = nil
@@ -272,6 +284,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_models/bootstrap/field.rb

@@ -24,7 +24,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')
       prune(hash)
@@ -32,7 +32,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_models/bootstrap/generator.rb

@@ -1,7 +1,7 @@
 module FHIR
   module Boot
     class Generator
-      KNOWN_MISSING_EXPANSIONS = %w[bcp47 bcp13.txt mimetypes LL379-9].freeze
+      KNOWN_MISSING_EXPANSIONS = ['bcp47', 'bcp13.txt', 'mimetypes', 'LL379-9'].freeze
 
       attr_accessor :lib
       attr_accessor :defn
@@ -119,6 +119,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']
@@ -128,6 +129,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|
@@ -189,13 +191,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 data_type == 'Reference' || data_type == 'Extension'
+              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['valueSet']
                 field.binding.delete('valueSet')
@@ -204,15 +206,15 @@ module FHIR
                 # set the actual code list
                 binding_uri = field.binding['uri']
                 # Strip off the |4.0.0 or |4.0.1 or |2014-03-26 or similar from the ends of URLs
-                binding_uri&.gsub!(/\|[A-Za-z0-9\.\-]*/, '')
+                binding_uri&.gsub!(/\|[A-Za-z0-9.\-]*/, '')
                 codes = @defn.get_codes(binding_uri)
                 field.valid_codes = codes unless codes.nil?
                 if field.valid_codes.empty? && binding_uri && !binding_uri.end_with?(*KNOWN_MISSING_EXPANSIONS)
                   FHIR.logger.warn "  MISSING EXPANSION -- #{field.path} #{field.min}..#{field.max}: #{binding_uri} (#{field.binding['strength']})"
                   @missing_expansions = true
-                  @missing_required_expansion = (field.binding['strength'] == 'required') unless @missing_required_expansion
+                  @missing_required_expansion ||= (field.binding['strength'] == 'required')
                 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
@@ -223,7 +225,7 @@ module FHIR
             field = FHIR::Field.new(field_base_name)
             field.path = element['path'].gsub(path_type, type_name)
             field.type = element['contentReference']
-            field.type = field.type[1..-1] if field.type[0] == '#'
+            field.type = field.type[1..] if field.type[0] == '#'
             if hierarchy.last == field.type
               # reference to self
               field.type = hierarchy.join('::').to_s