fhir_stu3_models 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec8082e82ddef2263165e8d3e8bf8796a29f7f6e24933b0ef93103c00b39141c
-  data.tar.gz: ae1ce9be9995968d47b52a2cde7761297112d53df13f3ae91458a03614b45669
+  metadata.gz: 5fad10495a24114dafe28e11c75994cfd4f724cdbeae5c52314a72fb92dcbcb1
+  data.tar.gz: fb2866760125408e5187f9bcb3b6ecfc0806b9fcd6ce9243713911985b7c20f3
 SHA512:
-  metadata.gz: f01425bc7459c9a8b7444aad6bb354e7b82d6b086033a7d05c0c237fa24abb32b07cbd701fa3e5b368cb05719621eb864d2aca1413ad3945d6a5b4e40098333c
-  data.tar.gz: 6423e8d4d0025bd9e4b9169b34de178116201e9bcbfce631e42fdd93422c4112c328bfb29f7f97da537f9136172896732a1088042c7cd55e213021546c015c9a
+  metadata.gz: 8a1e2967c6a837027428cd7b30f3bfefeb55a766bf434f7732c89cff3b3003ba5dc42ef845a171121400f92062c1d740467be86fb8e36a720b738bd0a8f9e832
+  data.tar.gz: 1582407356c083ef680a408b891f0c20d29bcd4f67a3579511acf0f0bf1cf758f63d8974a6c2bb07b810a5f598c71e52238c973882282d6cb8ba6c1be1f4ebcb

data/.codeclimate.yml

@@ -9,7 +9,7 @@ engines:
     enabled: true
   rubocop:
     enabled: true
-    channel: rubocop-0-80
+    channel: rubocop-1-23-0
 ratings:
   paths:
   - "**.inc"

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_stu3_models*log*
 invariants.txt
-.ruby-version
 .ruby-gemset
 tmp/
 .idea/

data/.rubocop.yml

@@ -1,6 +1,6 @@
 inherit_from: .rubocop_todo.yml
 AllCops:
-  TargetRubyVersion: 2.7
+  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,55 +1,21 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-03-30 17:30:14 -0400 using RuboCop version 0.80.0.
+# on 2023-12-13 21:39:37 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: 49
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/fhir_stu3_models/bootstrap/definitions.rb'
-    - 'lib/fhir_stu3_models/bootstrap/generator.rb'
-    - 'lib/fhir_stu3_models/bootstrap/hashable.rb'
-    - 'lib/fhir_stu3_models/bootstrap/model.rb'
-    - 'lib/fhir_stu3_models/bootstrap/preprocess.rb'
-    - 'lib/fhir_stu3_models/bootstrap/xml.rb'
-    - 'lib/fhir_stu3_models/deprecate.rb'
-    - 'lib/fhir_stu3_models/fhir_ext/element_definition.rb'
-    - 'lib/fhir_stu3_models/fhir_ext/structure_definition.rb'
-    - 'lib/fhir_stu3_models/fhir_ext/structure_definition_compare.rb'
-    - 'lib/fhir_stu3_models/fluentpath/parse.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/RescueEnsureAlignment:
-  Exclude:
-    - 'lib/fhir_stu3_models/bootstrap/hashable.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Lint/NonDeterministicRequireOrder:
-  Exclude:
-    - 'lib/fhir_stu3_models.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Lint/ToJSON:
-  Exclude:
-    - 'lib/fhir_stu3_models/bootstrap/json.rb'
-    - 'lib/fhir_stu3_models/fhir_ext/structure_definition_finding.rb'
-
-# Offense count: 38
+# Offense count: 37
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 405
+  Max: 407
 
 # Offense count: 7
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: refine
 Metrics/BlockLength:
-  Max: 70
+  Max: 71
 
 # Offense count: 7
 # Configuration parameters: CountBlocks.
@@ -57,47 +23,51 @@ Metrics/BlockNesting:
   Max: 5
 
 # Offense count: 6
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 345
 
-# Offense count: 25
+# Offense count: 32
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 69
+  Max: 77
 
-# Offense count: 43
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 44
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 127
+  Max: 126
 
 # Offense count: 1
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 114
+  Max: 115
 
-# Offense count: 24
+# Offense count: 29
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 72
+  Max: 80
+
+# Offense count: 5
+# Configuration parameters: EnforcedStyle, IgnoredPatterns.
+# SupportedStyles: snake_case, camelCase
+Naming/MethodName:
+  Exclude:
+    - 'lib/fhir_stu3_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_stu3_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_stu3_models/bootstrap/hashable.rb'
-
-# Offense count: 1
-# Configuration parameters: .
-# SupportedStyles: inline, group
-Style/AccessModifierDeclarations:
-  EnforcedStyle: inline
+    - '.simplecov'
 
 # Offense count: 17
 Style/ClassVars:
@@ -105,17 +75,23 @@ Style/ClassVars:
     - 'lib/fhir_stu3_models/bootstrap/definitions.rb'
     - 'lib/fhir_stu3_models/fluentpath/parse.rb'
 
+# Offense count: 1
+Style/CombinableLoops:
+  Exclude:
+    - 'lib/fhir_stu3_models/fhir_ext/structure_definition_compare.rb'
+
 # Offense count: 6
+# Cop supports --auto-correct.
 Style/CommentedKeyword:
   Exclude:
     - 'lib/fhir_stu3_models/bootstrap/hashable.rb'
     - 'lib/fhir_stu3_models/bootstrap/model.rb'
 
-# Offense count: 14
+# Offense count: 15
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
+    - '.simplecov'
     - 'lib/fhir_stu3_models/bootstrap/definitions.rb'
     - 'lib/fhir_stu3_models/bootstrap/field.rb'
     - 'lib/fhir_stu3_models/bootstrap/generator.rb'
@@ -131,13 +107,6 @@ Style/Documentation:
     - 'lib/fhir_stu3_models/fluentpath/expression.rb'
     - 'lib/fhir_stu3_models/fluentpath/parse.rb'
 
-# Offense count: 22
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
 # Offense count: 29
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
@@ -150,61 +119,22 @@ Style/IfUnlessModifier:
     - 'lib/fhir_stu3_models/fhir_ext/structure_definition.rb'
     - 'lib/fhir_stu3_models/fhir_ext/structure_definition_compare.rb'
 
-# Offense count: 1
-Style/MethodMissingSuper:
-  Exclude:
-    - 'lib/fhir_stu3_models/bootstrap/model.rb'
-
 # Offense count: 1
 Style/MissingRespondToMissing:
   Exclude:
     - 'lib/fhir_stu3_models/bootstrap/model.rb'
 
-# Offense count: 9
-Style/MultipleComparison:
+# Offense count: 2
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
   Exclude:
-    - 'lib/fhir_stu3_models/bootstrap/definitions.rb'
     - 'lib/fhir_stu3_models/bootstrap/generator.rb'
-    - 'lib/fhir_stu3_models/bootstrap/model.rb'
-    - 'lib/fhir_stu3_models/fhir_ext/structure_definition.rb'
+    - 'lib/fhir_stu3_models/bootstrap/template.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Style/OrAssignment:
-  Exclude:
-    - 'lib/fhir_stu3_models/bootstrap/generator.rb'
-
-# Offense count: 16
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
+# Configuration parameters: AllowModifier.
+Style/SoleNestedConditional:
   Exclude:
-    - 'lib/fhir_stu3_models/bootstrap/definitions.rb'
-    - 'lib/fhir_stu3_models/bootstrap/hashable.rb'
-    - 'lib/fhir_stu3_models/bootstrap/json.rb'
-    - 'lib/fhir_stu3_models/bootstrap/model.rb'
-    - 'lib/fhir_stu3_models/bootstrap/xml.rb'
-    - 'lib/fhir_stu3_models/fhir.rb'
-    - 'lib/fhir_stu3_models/fhir_ext/structure_definition.rb'
-    - 'lib/fhir_stu3_models/fhir_ext/structure_definition_finding.rb'
-    - 'lib/fhir_stu3_models/fluentpath/expression.rb'
-    - 'lib/fhir_stu3_models/fluentpath/parse.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
-# AllowedMethods: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Exclude:
-    - 'lib/fhir_stu3_models/bootstrap/xml.rb'
-    - 'lib/fhir_stu3_models/fhir_ext/structure_definition.rb'
-
-# Offense count: 7
-# 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:
-  Exclude:
-    - 'lib/fhir_stu3_models/bootstrap/preprocess.rb'
-    - 'lib/fhir_stu3_models/fluentpath/parse.rb'
+    - 'lib/fhir_stu3_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_stu3_models (3.1.1)
+    fhir_stu3_models (3.2.0)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
       mime-types (>= 3.0)
@@ -13,12 +13,12 @@ GEM
     ast (2.4.2)
     bcp47 (0.3.3)
       i18n
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.9)
     date_time_precision (0.8.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.11.1)
+    ffi (1.16.3)
     formatador (0.2.5)
     guard (2.15.0)
       formatador (>= 0.2.4)
@@ -39,21 +39,19 @@ GEM
       test-unit (~> 3.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
     json (2.5.1)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.0.13)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
-    mini_portile2 (2.5.3)
+    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)
@@ -61,20 +59,23 @@ 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.1.5)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    racc (1.5.2)
-    rainbow (3.0.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.8.0)
+    rainbow (3.1.1)
     rake (12.3.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
+    regexp_parser (2.8.3)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -88,27 +89,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    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)
-    ruby_dep (1.5.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.13.0)
       docile (~> 1.1.0)
       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.3)
       power_assert
     thor (0.20.3)
-    unicode-display_width (1.6.1)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -122,12 +126,12 @@ DEPENDENCIES
   pry
   rake
   rspec
-  rubocop (= 0.80)
+  rubocop (= 1.23.0)
   simplecov
   test-unit
 
 RUBY VERSION
-   ruby 2.7.2p137
+   ruby 3.1.2p20
 
 BUNDLED WITH
-   2.1.4
+   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_stu3_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'
@@ -33,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov'
   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_stu3_models/bootstrap/definitions.rb

@@ -45,6 +45,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::STU3::StructureDefinition.new(definition) if definition
         @@cache[type_name]
@@ -74,6 +75,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::STU3::StructureDefinition.new(definition) if definition
         @@cache[resource_name]
@@ -104,8 +106,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::STU3::StructureDefinition.new(extension)
       end
       deprecate :get_extension_definition, :extension_definition
@@ -113,8 +117,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
@@ -122,14 +128,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::STU3::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::STU3::StructureDefinition.new(x) }
       end
       deprecate :get_profiles_for_resource, :profile_for_resource
@@ -137,6 +146,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
 
@@ -162,7 +172,7 @@ module FHIR
             load f
             # set the return class type
             klass = Object.const_get("FHIR::STU3::Profile::#{id}::#{type}")
-          rescue
+          rescue StandardError
             FHIR::STU3.logger.error "Failed to generate class for profile #{uri}"
           end
           # unlink the file so it can be garbage collected
@@ -198,6 +208,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] = {}
@@ -230,6 +241,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
@@ -269,6 +281,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_stu3_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_stu3_models/bootstrap/generator.rb

@@ -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|
@@ -182,13 +184,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['valueSetUri']
                   field.binding['uri'] = field.binding['valueSetReference'] if field.binding['uri'].nil?
@@ -203,9 +205,9 @@ module FHIR
                   if field.valid_codes.empty? && field.binding['uri'] && !field.binding['uri'].end_with?('bcp47') && !field.binding['uri'].end_with?('bcp13.txt')
                     FHIR::STU3.logger.warn "  MISSING EXPANSION -- #{field.path} #{field.min}..#{field.max}: #{field.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
@@ -216,7 +218,7 @@ module FHIR
               field = FHIR::STU3::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