fhir_dstu2_models 1.0.6 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c22d19c33c6fd72cefbe2aea9b999e17ebd054d5126bbdbb9ce2b4b8b4a49b5
-  data.tar.gz: f0f268df74f53918d47e8781ef48eb4b5f5b967668363aaa2cdab1eaba9afe6b
+  metadata.gz: dbc067c3c0131d09389762011313c28ce54cfb0cff5fd7f5620141bb398cc836
+  data.tar.gz: 2ede16263fc0b8bd831b73e3dabf9d53c0e9d1f263b06a7fab5054a77d5279e0
 SHA512:
-  metadata.gz: cbe3ed2a3c9164617dac497b0e0b04fcbe8041300b2833a6edcbf317b7a81c0e4acff8339187502dd83a0f9000110bb7dca742d353519f190e4d9cc004f867be
-  data.tar.gz: a618f6baf40efd7e9d3a94f52280f7238dfcffa0595577c8e4b753ffd5064d2e1be21bc09695fa76b19ccf1b3ed47e5ac00010cde00d1eccd93b3da5e39ed6e4
+  metadata.gz: 427ed8a3a9f179ce1f155ce999e61c47e1a79d84b1148d90002a9cd74df70bdabc33409285e0f80179f21b7044e78ae65b816b81f80c26e1c3b842e2960d4747
+  data.tar.gz: 6b3883925afc71acf2b61806c16c26330882c1c11238602e3550b30dd2e8c690f214aae81b756c038f4a5000033b19fbf4df2323ec9f45f281aeb7c5bce12184

data/.codeclimate.yml

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

data/.gitignore

@@ -1,2 +1,4 @@
 .DS_Store
-coverage/*
+coverage/*
+
+.idea

data/.rubocop.yml

@@ -1,14 +1,25 @@
 inherit_from: .rubocop_todo.yml
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.7
   Exclude:
     - 'test/**/*'
     - 'spec/**/*'
-    - 'lib/fhir_dstu2_models/fhir/**/*'
-    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+    - 'lib/fhir_stu3_models/fhir/**/*'
+    - 'lib/fhir_stu3_models/fluentpath/evaluate.rb'
+    - 'lib/**/*.rake'
     - 'tmp/**/*'
     - '*.gemspec'
     - 'bin/*'
-    - 'vendor/**/*'
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+inherit_mode:
+  merge:
+    - Exclude

data/.rubocop_todo.yml

@@ -1,79 +1,337 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-02-25 13:02:53 -0500 using RuboCop version 0.47.1.
+# on 2021-03-30 17:40:28 -0400 using RuboCop version 0.80.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.
 
-Performance/Caller:
+# Offense count: 23
+# Cop supports --auto-correct.
+# Configuration parameters: IndentationWidth.
+Layout/AssignmentIndentation:
   Enabled: false
 
-# Offense count: 37
+# Offense count: 55
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/definitions.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/generator.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/preprocess.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/xml.rb'
+    - 'lib/fhir_dstu2_models/deprecate.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/element_definition.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_compare.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/parse.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLines:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fhir/resources/ClaimResponse.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
+Layout/EmptyLinesAroundClassBody:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fhir/resources/ClaimResponse.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
+Layout/EmptyLinesAroundModuleBody:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fhir/metadata.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/RescueEnsureAlignment:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
+
+# Offense count: 19223
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
+  Enabled: false
+
+# Offense count: 10414
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+# Offense count: 120
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
+  Enabled: false
+
+# Offense count: 23
+# Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Lint/NonDeterministicRequireOrder:
+  Exclude:
+    - 'lib/fhir_dstu2_models.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/ToJSON:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/json.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_finding.rb'
+
+# Offense count: 41
 Metrics/AbcSize:
-  Max: 423
+  Max: 461
 
 # Offense count: 10
 # Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 150
+  Max: 131
 
-# Offense count: 1
+# Offense count: 45
 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
-  Max: 5
+  Max: 6
 
-# Offense count: 5
+# Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 499
+  Max: 470
 
-# Offense count: 26
+# Offense count: 30
 Metrics/CyclomaticComplexity:
-  Max: 69
+  Max: 142
 
-# Offense count: 40
-# Configuration parameters: CountComments.
+# Offense count: 48
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 120
+  Max: 463
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 120
+  Max: 520
 
-
-# Offense count: 25
+# Offense count: 28
 Metrics/PerceivedComplexity:
-  Max: 72
+  Max: 145
 
-# Offense count: 16
+# Offense count: 118
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Enabled: false
+
+# Offense count: 96
+# Configuration parameters: EnforcedStyle, IgnoredPatterns.
+# SupportedStyles: snake_case, camelCase
+Naming/MethodName:
+  Enabled: false
+
+# Offense count: 4
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os, pp
+Naming/MethodParameterName:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_compare.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredName.
+Naming/RescuedExceptionsVariableName:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
+
+# Offense count: 1
+# Configuration parameters: .
+# SupportedStyles: inline, group
+Style/AccessModifierDeclarations:
+  EnforcedStyle: inline
+
+# Offense count: 19
 Style/ClassVars:
   Exclude:
     - 'lib/fhir_dstu2_models/bootstrap/definitions.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
     - 'lib/fhir_dstu2_models/fluentpath/parse.rb'
 
-# Offense count: 14
+# Offense count: 6
+Style/CommentedKeyword:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+
+# Offense count: 358
 Style/Documentation:
+  Enabled: false
+
+# Offense count: 16
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+
+# Offense count: 31
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/generator.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/template.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/xml.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_compare.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: line_count_dependent, lambda, literal
+Style/Lambda:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: call, braces
+Style/LambdaCall:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
+
+# Offense count: 1
+Style/MethodMissingSuper:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
+
+# Offense count: 1
+Style/MissingRespondToMissing:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
+
+# Offense count: 3
+Style/MultipleComparison:
   Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
     - 'lib/fhir_dstu2_models/bootstrap/definitions.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/field.rb'
+
+# Offense count: 494
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_compare.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/OrAssignment:
+  Exclude:
     - 'lib/fhir_dstu2_models/bootstrap/generator.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fluentpath/expression.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/RescueModifier:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+
+# Offense count: 18
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, explicit
+Style/RescueStandardError:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/definitions.rb'
     - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
     - 'lib/fhir_dstu2_models/bootstrap/json.rb'
     - 'lib/fhir_dstu2_models/bootstrap/model.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/preprocess.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/template.rb'
     - 'lib/fhir_dstu2_models/bootstrap/xml.rb'
     - 'lib/fhir_dstu2_models/fhir.rb'
     - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
     - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_finding.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
     - 'lib/fhir_dstu2_models/fluentpath/expression.rb'
     - 'lib/fhir_dstu2_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_dstu2_models/bootstrap/definitions.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/xml.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
+
 # Offense count: 1
-Style/MethodMissing:
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: require_parentheses, require_no_parentheses
+Style/StabbyLambdaParentheses:
   Exclude:
-    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: .
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: percent
+  MinSize: 13
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/WhileUntilModifier:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+
+# Offense count: 624
+# Cop supports --auto-correct.
+# Configuration parameters: WordRegex.
+# SupportedStyles: percent, brackets
+Style/WordArray:
+  EnforcedStyle: percent
+  MinSize: 6402

data/.travis.yml

@@ -2,13 +2,16 @@ language: ruby
 env:
   - TESTMEMORY=0 GCDELAY=2.0
 rvm:
-  - 2.3
-  - 2.4
-  - 2.5
   - 2.6
+  - 2.7
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 script:
   - bundle exec rake
-  - bundle exec codeclimate-test-reporter
+after_script:
+  - ./cc-test-reporter after-build -t simplecov --exit-code $TRAVIS_TEST_RESULT
 notifications:
   email:
     recipients:
@@ -18,4 +21,5 @@ addons:
   code_climate:
     repo_token: 0230b3379581b30743b7b4355d7394e427648e604d19a2aba987956201eee290
 before_install:
+  - gem update --system
   - gem install bundler

data/Gemfile.lock

@@ -1,28 +1,26 @@
 PATH
   remote: .
   specs:
-    fhir_dstu2_models (1.0.5)
+    fhir_dstu2_models (1.0.11)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
-      mime-types (>= 1.16, < 3)
-      nokogiri (>= 1.8.2)
+      mime-types (>= 3.0)
+      nokogiri (>= 1.10.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.2)
     bcp47 (0.3.3)
       i18n
-    codeclimate-test-reporter (1.0.8)
-      simplecov (<= 0.13)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.8)
     date_time_precision (0.8.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.23)
+    ffi (1.11.1)
     formatador (0.2.5)
-    guard (2.14.2)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -39,61 +37,66 @@ GEM
     guard-test (2.0.8)
       guard-compat (~> 1.2)
       test-unit (~> 3.0)
-    i18n (1.5.3)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    jaro_winkler (1.5.4)
+    json (2.3.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    method_source (0.9.0)
-    mime-types (2.99.3)
-    mini_portile2 (2.3.0)
+    method_source (0.9.2)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mini_portile2 (2.5.0)
     nenv (0.3.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     nokogiri-diff (0.2.0)
       nokogiri (~> 1.5)
       tdiff (~> 0.3, >= 0.3.2)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.1)
-    parser (2.5.1.0)
-      ast (~> 2.4.0)
-    power_assert (1.1.1)
-    powerpack (0.1.1)
-    pry (0.11.3)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    power_assert (1.1.5)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.1)
+    racc (1.5.2)
+    rainbow (3.0.0)
+    rake (12.3.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rexml (3.2.4)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.49.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    rubocop (0.80.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.11.0)
     ruby_dep (1.5.0)
     shellany (0.0.1)
     simplecov (0.13.0)
@@ -101,18 +104,17 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    tdiff (0.3.3)
-    test-unit (3.2.7)
+    tdiff (0.3.4)
+    test-unit (3.3.3)
       power_assert
-    thor (0.20.0)
-    unicode-display_width (1.3.2)
+    thor (0.20.3)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
-  codeclimate-test-reporter
   fhir_dstu2_models!
   guard-rspec
   guard-test
@@ -120,12 +122,12 @@ DEPENDENCIES
   pry
   rake
   rspec
-  rubocop (= 0.49)
+  rubocop (= 0.80)
   simplecov
   test-unit
 
 RUBY VERSION
-   ruby 2.5.1p57
+   ruby 2.7.2p137
 
 BUNDLED WITH
-   1.16.2
+   2.1.4

data/LICENSE

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -69,7 +69,7 @@ puts sd.warnings
 ```
 # License
 
-Copyright 2014-2018 The MITRE Corporation
+Copyright 2014-2021 The MITRE Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/fhir_dstu2_models.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = FHIR::DSTU2::Models::VERSION
   spec.authors       = ['Jason Walonoski', 'Andre Quina', "Michael O'Keefe", 'Robert Scanlon']
   spec.email         = ['jwalonoski@mitre.org']
+  spec.licenses      = ['Apache-2.0']
 
   spec.summary       = %q{A Gem for handling FHIR DSTU2 models in ruby}
   spec.description   = %q{A Gem for handling FHIR DSTU2 models in ruby}
@@ -20,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'nokogiri', '>= 1.8.2'
+  spec.add_dependency 'nokogiri', '>= 1.10.4'
   spec.add_dependency 'date_time_precision', '>= 0.8'
   spec.add_dependency 'bcp47', '>= 0.3'
-  spec.add_dependency 'mime-types', '>= 1.16', '< 3'
+  spec.add_dependency 'mime-types', '>= 3.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
@@ -32,8 +33,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.49'
-  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'rubocop', '0.80'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'guard-test'
 end

data/lib/fhir_dstu2_models/bootstrap/generator.rb

@@ -183,7 +183,7 @@ 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?(datatype)
+                field.type_profiles = profiles if %w[Reference Extension].include?(data_type)
                 field.min = element['min']
                 field.max = element['max']
                 field.max = field.max.to_i

data/lib/fhir_dstu2_models/bootstrap/json.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module FHIR
   module DSTU2
     module Json

data/lib/fhir_dstu2_models/fhir_ext/structure_definition.rb

@@ -168,7 +168,6 @@ module FHIR
         # 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_binding = element.binding
           matching_pattern = false
           nodes.each do |value|
             matching_type = 0
@@ -205,35 +204,45 @@ module FHIR
                     matching_pattern = true if vcoding.system == pcoding.system && vcoding.code == pcoding.code
                   end
                 end
-              elsif data_type_found == 'CodeableConcept' && codeable_concept_binding
-                binding_issues =
-                  if element.binding.strength == 'extensible'
-                    @warnings
-                  elsif element.binding.strength == 'required'
-                    @errors
-                  else # e.g., example-strength or unspecified
-                    [] # Drop issues errors on the floor, in throwaway array
+              elsif %w[CodeableConcept Coding Quantity].include? data_type_found
+                required_strength = element&.binding&.strength == 'required'
+                binding_issues = required_strength ? @errors : @warnings
+
+                valueset_uri = element&.binding&.valueSetReference&.reference
+                check_code = ->coding do
+                  # Can't validate if both code and system are not given
+                  if coding['code'].nil? || coding['system'].nil?
+                    binding_issues << "#{describe_element(element)} code: #{coding.to_json} missing code" if coding['code'].nil?
+                    binding_issues << "#{describe_element(element)} code: #{coding.to_json} missing system" if coding['system'].nil?
+                    return
                   end
 
-                valueset_uri = element.binding && element.binding.valueSetReference && element.binding.valueSetReference.reference
-                vcc = FHIR::DSTU2::CodeableConcept.new(value)
-                if valueset_uri && self.class.vs_validators[valueset_uri]
+                  # ValueSet Validation
                   check_fn = self.class.vs_validators[valueset_uri]
-                  has_valid_code = vcc.coding && vcc.coding.any? { |c| check_fn.call(c) }
+                  has_valid_code = false
+                  if check_fn
+                    has_valid_code = check_fn.call(coding)
+                    binding_issues << "#{describe_element(element)} has no codings from #{valueset_uri}. Codings evaluated: #{coding.to_json}" unless has_valid_code
+                  end
 
+                  # CodeSystem Validation
                   unless has_valid_code
-                    binding_issues << "#{describe_element(element)} has no codings from #{valueset_uri}. Codings evaluated: #{vcc.to_json}"
+                    check_fn = self.class.vs_validators[coding['system']]
+                    if check_fn && !check_fn.call(coding)
+                      binding_issues << "#{describe_element(element)} has no codings from it's specified system: #{coding['system']}.  "\
+                                      "Codings evaluated: #{coding.to_json}"
+                    end
                   end
                 end
 
-                unless has_valid_code
-                  vcc.coding.each do |c|
-                    check_fn = self.class.vs_validators[c.system]
-                    if check_fn && check_fn.call(c)
-                      binding_issues << "#{describe_element(element)} has no codings from it's specified system: #{c.system}.  "\
-                                        "Codings evaluated: #{vcc.to_json}"
-                    end
+                if data_type_found == 'CodeableConcept'
+                  value['coding']&.each do |coding|
+                    check_code.(coding)
                   end
+                else
+                  # avoid checking Codings twice if they are already checked as part of a CodeableConcept
+                  # The CodeableConcept should contain the binding for the children Codings
+                  check_code.(value) unless element.path == 'CodeableConcept.coding'
                 end
 
               elsif data_type_found == 'String' && !element.maxLength.nil? && (value.size > element.maxLength)
@@ -284,13 +293,9 @@ module FHIR
           unless definition.nil?
             ret_val = false
             begin
-              # klass = Module.const_get("FHIR::DSTU2::#{data_type_code}")
-              # ret_val = definition.validates_resource?(klass.new(deep_copy(value)))
               ret_val = definition.validates_hash?(value)
-              unless ret_val
-                @errors += definition.errors
-                @warnings += definition.warnings
-              end
+              @errors += definition.errors
+              @warnings += definition.warnings
             rescue
               @errors << "Unable to verify #{data_type_code} as a FHIR::DSTU2 Resource."
             end
@@ -308,13 +313,9 @@ module FHIR
           if !definition.nil?
             ret_val = false
             begin
-              # klass = Module.const_get("FHIR::DSTU2::#{resource_type}")
-              # ret_val = definition.validates_resource?(klass.new(deep_copy(value)))
               ret_val = definition.validates_hash?(value)
-              unless ret_val
-                @errors += definition.errors
-                @warnings += definition.warnings
-              end
+              @errors += definition.errors
+              @warnings += definition.warnings
             rescue
               @errors << "Unable to verify #{resource_type} as a FHIR::DSTU2 Resource."
             end
@@ -334,13 +335,9 @@ module FHIR
           if !definition.nil?
             ret_val = false
             begin
-              # klass = Module.const_get("FHIR::DSTU2::#{data_type_code}")
-              # ret_val = definition.validates_resource?(klass.new(deep_copy(value)))
               ret_val = definition.validates_hash?(value)
-              unless ret_val
-                @errors += definition.errors
-                @warnings += definition.warnings
-              end
+              @errors += definition.errors
+              @warnings += definition.warnings
             rescue
               @errors << "Unable to verify #{data_type_code} as a FHIR::DSTU2 type."
             end

data/lib/fhir_dstu2_models/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_dstu2_models
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.11
 platform: ruby
 authors:
 - Jason Walonoski
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
   name: date_time_precision
   requirement: !ruby/object:Gem::Requirement
@@ -61,20 +61,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -179,28 +173,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.49'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.80'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +226,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
@@ -2125,7 +2106,8 @@ files:
 - lib/fhir_dstu2_models/tasks/tasks.rake
 - lib/fhir_dstu2_models/version.rb
 homepage: https://github.com/fhir-crucible/fhir_dstu2_models
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -2142,8 +2124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Gem for handling FHIR DSTU2 models in ruby