fhir_models 4.1.1 → 4.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: db2933023633aa9e43310d61b9d593a1a2c056347feb74922cfaa2dc1934f4ca
4
- data.tar.gz: '083c6ff6f4d751c35e8b870f2754a504aa98225dfd704c432204eac1317d4280'
3
+ metadata.gz: 68f887e4edac39b8eaa531ab225b2a33753b6048f08e3ebfa047299494754d96
4
+ data.tar.gz: dee551b676cdefe72315ce96bef9fbf87192b17f2fbd9549ff37fbd526a8a3d1
5
5
  SHA512:
6
- metadata.gz: 75a6c986f98952e192d9c11f0f863796248b4ab45809131c3e2b31c2a7718378ea28685acf4fc035d685fced81e681bceada6f0c5e668ec3e5d237e5ec563542
7
- data.tar.gz: 266c2d2bf9f9c6c92edc5f41a7d3fe1d257502b26b84995a381152c0e1a923b83ecd55769e9bfe888e78a968339bd1f895c60064d642355c88e2a961bf197ef3
6
+ metadata.gz: 1147f42000517894330092a862e16a5419b02362d3ad49f31cff326d73ec600f1b43a83dab789cee039d8c263d1fcc0e4d1c57e0bdcf6f3e107d1bea6cc8bd62
7
+ data.tar.gz: b2d33004faa1027461ca9baebaff8ec1e3d086156e55ab98b013c3e7498a8c279e0f9023559d59399ff250ee017a4dfbfb8aa1d588b1c876f457c7d308917892
data/.codeclimate.yml CHANGED
@@ -9,7 +9,7 @@ engines:
9
9
  enabled: true
10
10
  rubocop:
11
11
  enabled: true
12
- channel: rubocop-0-67
12
+ channel: rubocop-0-80
13
13
  ratings:
14
14
  paths:
15
15
  - "**.inc"
data/.rubocop.yml CHANGED
@@ -10,10 +10,16 @@ AllCops:
10
10
  - 'tmp/**/*'
11
11
  - '*.gemspec'
12
12
  - 'bin/*'
13
- Metrics/LineLength:
13
+ Layout/LineLength:
14
14
  Enabled: false
15
15
  Style/FrozenStringLiteralComment:
16
16
  Enabled: false
17
+ Style/HashEachMethods:
18
+ Enabled: true
19
+ Style/HashTransformKeys:
20
+ Enabled: true
21
+ Style/HashTransformValues:
22
+ Enabled: true
17
23
  inherit_mode:
18
24
  merge:
19
25
  - Exclude
data/.rubocop_todo.yml CHANGED
@@ -1,6 +1,6 @@
1
1
  # This configuration was generated by
2
2
  # `rubocop --auto-gen-config`
3
- # on 2019-07-01 12:11:28 -0400 using RuboCop version 0.67.2.
3
+ # on 2021-03-30 16:14:38 -0400 using RuboCop version 0.80.0.
4
4
  # The point is for the user to remove these configuration records
5
5
  # one by one as the offenses are removed from the code base.
6
6
  # Note that changes in the inspected code, or installation of new
@@ -45,7 +45,7 @@ Metrics/AbcSize:
45
45
  Metrics/BlockLength:
46
46
  Max: 78
47
47
 
48
- # Offense count: 10
48
+ # Offense count: 12
49
49
  # Configuration parameters: CountBlocks.
50
50
  Metrics/BlockNesting:
51
51
  Max: 5
@@ -53,7 +53,7 @@ Metrics/BlockNesting:
53
53
  # Offense count: 7
54
54
  # Configuration parameters: CountComments.
55
55
  Metrics/ClassLength:
56
- Max: 358
56
+ Max: 356
57
57
 
58
58
  # Offense count: 23
59
59
  Metrics/CyclomaticComplexity:
@@ -62,7 +62,7 @@ Metrics/CyclomaticComplexity:
62
62
  # Offense count: 44
63
63
  # Configuration parameters: CountComments, ExcludedMethods.
64
64
  Metrics/MethodLength:
65
- Max: 135
65
+ Max: 133
66
66
 
67
67
  # Offense count: 2
68
68
  # Configuration parameters: CountComments.
@@ -73,30 +73,19 @@ Metrics/ModuleLength:
73
73
  Metrics/PerceivedComplexity:
74
74
  Max: 68
75
75
 
76
- # Offense count: 1
77
- # Configuration parameters: PreferredName.
78
- Naming/RescuedExceptionsVariableName:
79
- Exclude:
80
- - 'lib/fhir_models/bootstrap/hashable.rb'
81
-
82
76
  # Offense count: 4
83
77
  # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
84
- # AllowedNames: io, id, to, by, on, in, at, ip, db
85
- Naming/UncommunicativeMethodParamName:
78
+ # AllowedNames: io, id, to, by, on, in, at, ip, db, os, pp
79
+ Naming/MethodParameterName:
86
80
  Exclude:
87
81
  - 'lib/fhir_models/fhir_ext/structure_definition_compare.rb'
88
82
 
89
- # Offense count: 3
90
- Performance/Caller:
91
- Exclude:
92
- - 'lib/fhir_models/bootstrap/model.rb'
93
- - 'lib/fhir_models/deprecate.rb'
94
-
95
- # Offense count: 1
83
+ # Offense count: 2
96
84
  # Cop supports --auto-correct.
97
- Performance/InefficientHashSearch:
85
+ # Configuration parameters: PreferredName.
86
+ Naming/RescuedExceptionsVariableName:
98
87
  Exclude:
99
- - 'lib/fhir_models/bootstrap/template.rb'
88
+ - 'lib/fhir_models/bootstrap/hashable.rb'
100
89
 
101
90
  # Offense count: 1
102
91
  # Configuration parameters: .
@@ -141,7 +130,6 @@ Style/Documentation:
141
130
  Style/IfUnlessModifier:
142
131
  Exclude:
143
132
  - 'lib/fhir_models/bootstrap/generator.rb'
144
- - 'lib/fhir_models/bootstrap/hashable.rb'
145
133
  - 'lib/fhir_models/bootstrap/model.rb'
146
134
  - 'lib/fhir_models/bootstrap/template.rb'
147
135
  - 'lib/fhir_models/bootstrap/xml.rb'
@@ -175,7 +163,7 @@ Style/NumericPredicate:
175
163
  - 'spec/**/*'
176
164
  - 'lib/fhir_models/fhir_ext/structure_definition_compare.rb'
177
165
 
178
- # Offense count: 2
166
+ # Offense count: 1
179
167
  # Cop supports --auto-correct.
180
168
  Style/OrAssignment:
181
169
  Exclude:
@@ -200,8 +188,8 @@ Style/RescueStandardError:
200
188
 
201
189
  # Offense count: 4
202
190
  # Cop supports --auto-correct.
203
- # Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
204
- # Whitelist: present?, blank?, presence, try, try!
191
+ # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
192
+ # AllowedMethods: present?, blank?, presence, try, try!
205
193
  Style/SafeNavigation:
206
194
  Exclude:
207
195
  - 'lib/fhir_models/bootstrap/definitions.rb'
data/.travis.yml CHANGED
@@ -2,7 +2,6 @@ language: ruby
2
2
  env:
3
3
  - TESTMEMORY=0 GCDELAY=2.0
4
4
  rvm:
5
- - 2.5
6
5
  - 2.6
7
6
  - 2.7
8
7
  before_script:
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- fhir_models (4.1.1)
4
+ fhir_models (4.1.2)
5
5
  bcp47 (>= 0.3)
6
6
  date_time_precision (>= 0.8)
7
7
  mime-types (>= 3.0)
@@ -10,11 +10,11 @@ PATH
10
10
  GEM
11
11
  remote: https://rubygems.org/
12
12
  specs:
13
- ast (2.4.1)
13
+ ast (2.4.2)
14
14
  bcp47 (0.3.3)
15
15
  i18n
16
16
  coderay (1.1.3)
17
- concurrent-ruby (1.1.7)
17
+ concurrent-ruby (1.1.8)
18
18
  coolline (0.5.0)
19
19
  unicode_utils (~> 1.4)
20
20
  date_time_precision (0.8.1)
@@ -39,7 +39,7 @@ GEM
39
39
  guard-test (2.0.8)
40
40
  guard-compat (~> 1.2)
41
41
  test-unit (~> 3.0)
42
- i18n (1.8.5)
42
+ i18n (1.8.9)
43
43
  concurrent-ruby (~> 1.0)
44
44
  jaro_winkler (1.5.4)
45
45
  json (2.3.1)
@@ -50,19 +50,20 @@ GEM
50
50
  method_source (1.0.0)
51
51
  mime-types (3.3.1)
52
52
  mime-types-data (~> 3.2015)
53
- mime-types-data (3.2020.1104)
54
- mini_portile2 (2.4.0)
53
+ mime-types-data (3.2021.0225)
54
+ mini_portile2 (2.5.0)
55
55
  nenv (0.3.0)
56
- nokogiri (1.10.10)
57
- mini_portile2 (~> 2.4.0)
56
+ nokogiri (1.11.2)
57
+ mini_portile2 (~> 2.5.0)
58
+ racc (~> 1.4)
58
59
  nokogiri-diff (0.2.0)
59
60
  nokogiri (~> 1.5)
60
61
  tdiff (~> 0.3, >= 0.3.2)
61
62
  notiffany (0.1.3)
62
63
  nenv (~> 0.1)
63
64
  shellany (~> 0.0)
64
- parallel (1.20.0)
65
- parser (2.7.2.0)
65
+ parallel (1.20.1)
66
+ parser (3.0.0.0)
66
67
  ast (~> 2.4.1)
67
68
  power_assert (1.2.0)
68
69
  pry (0.13.1)
@@ -70,12 +71,13 @@ GEM
70
71
  method_source (~> 1.0)
71
72
  pry-coolline (0.2.5)
72
73
  coolline (~> 0.5)
73
- psych (3.2.0)
74
+ racc (1.5.2)
74
75
  rainbow (3.0.0)
75
76
  rake (13.0.1)
76
77
  rb-fsevent (0.10.4)
77
78
  rb-inotify (0.10.1)
78
79
  ffi (~> 1.0)
80
+ rexml (3.2.4)
79
81
  rspec (3.10.0)
80
82
  rspec-core (~> 3.10.0)
81
83
  rspec-expectations (~> 3.10.0)
@@ -89,15 +91,15 @@ GEM
89
91
  diff-lcs (>= 1.2.0, < 2.0)
90
92
  rspec-support (~> 3.10.0)
91
93
  rspec-support (3.10.0)
92
- rubocop (0.67.0)
94
+ rubocop (0.80.0)
93
95
  jaro_winkler (~> 1.5.1)
94
96
  parallel (~> 1.10)
95
- parser (>= 2.5, != 2.5.1.1)
96
- psych (>= 3.1.0)
97
+ parser (>= 2.7.0.1)
97
98
  rainbow (>= 2.2.2, < 4.0)
99
+ rexml
98
100
  ruby-progressbar (~> 1.7)
99
- unicode-display_width (>= 1.4.0, < 1.6)
100
- ruby-progressbar (1.10.1)
101
+ unicode-display_width (>= 1.4.0, < 1.7)
102
+ ruby-progressbar (1.11.0)
101
103
  shellany (0.0.1)
102
104
  simplecov (0.17.1)
103
105
  docile (~> 1.1)
@@ -108,7 +110,7 @@ GEM
108
110
  test-unit (3.3.6)
109
111
  power_assert
110
112
  thor (1.0.1)
111
- unicode-display_width (1.5.0)
113
+ unicode-display_width (1.6.1)
112
114
  unicode_utils (1.4.0)
113
115
 
114
116
  PLATFORMS
@@ -124,12 +126,12 @@ DEPENDENCIES
124
126
  pry-coolline
125
127
  rake
126
128
  rspec
127
- rubocop (= 0.67)
129
+ rubocop (= 0.80)
128
130
  simplecov (~> 0.17.0)
129
131
  test-unit
130
132
 
131
133
  RUBY VERSION
132
- ruby 2.5.8p224
134
+ ruby 2.7.2p137
133
135
 
134
136
  BUNDLED WITH
135
137
  2.1.4
data/LICENSE ADDED
@@ -0,0 +1,201 @@
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
4
+
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+ 1. Definitions.
8
+
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "{}"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright {yyyy} {name of copyright owner}
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
data/README.md CHANGED
@@ -73,7 +73,7 @@ $ bundle exec rake fhir:console
73
73
  ```
74
74
  # License
75
75
 
76
- Copyright 2014-2020 The MITRE Corporation
76
+ Copyright 2014-2021 The MITRE Corporation
77
77
 
78
78
  Licensed under the Apache License, Version 2.0 (the "License");
79
79
  you may not use this file except in compliance with the License.
data/fhir_models.gemspec CHANGED
@@ -8,6 +8,7 @@ Gem::Specification.new do |spec|
8
8
  spec.version = FHIR::Models::VERSION
9
9
  spec.authors = ['Jason Walonoski', 'Andre Quina', "Michael O'Keefe", 'Robert Scanlon', 'Reece Adamson']
10
10
  spec.email = ['jwalonoski@mitre.org']
11
+ spec.licenses = ['Apache-2.0']
11
12
 
12
13
  spec.summary = %q{A Gem for handling FHIR models in ruby}
13
14
  spec.description = %q{A Gem for handling FHIR models in ruby}
@@ -33,7 +34,7 @@ Gem::Specification.new do |spec|
33
34
  spec.add_development_dependency 'rspec'
34
35
  spec.add_development_dependency 'simplecov', '~> 0.17.0'
35
36
  spec.add_development_dependency 'nokogiri-diff'
36
- spec.add_development_dependency 'rubocop', '0.67'
37
+ spec.add_development_dependency 'rubocop', '0.80'
37
38
  spec.add_development_dependency 'guard-rspec'
38
39
  spec.add_development_dependency 'guard-test'
39
40
  end
data/lib/fhir_models.rb CHANGED
@@ -7,29 +7,29 @@ require File.join(root, 'lib', 'fhir_models', 'deprecate')
7
7
  require File.join(root, 'lib', 'fhir_models', 'bootstrap', 'hashable.rb')
8
8
  require File.join(root, 'lib', 'fhir_models', 'bootstrap', 'json.rb')
9
9
 
10
- Dir.glob(File.join(root, 'lib', 'fhir_models', 'bootstrap', '*.rb')).each do |file|
10
+ Dir.glob(File.join(root, 'lib', 'fhir_models', 'bootstrap', '*.rb')).sort.each do |file|
11
11
  require file
12
12
  end
13
- Dir.glob(File.join(root, 'lib', 'fhir_models', 'bootstrap', '**', '*.rb')).each do |file|
13
+ Dir.glob(File.join(root, 'lib', 'fhir_models', 'bootstrap', '**', '*.rb')).sort.each do |file|
14
14
  require file
15
15
  end
16
16
 
17
17
  require File.join(root, 'lib', 'fhir_models', 'fhir.rb')
18
18
 
19
19
  # Require the generated code
20
- Dir.glob(File.join(root, 'lib', 'fhir_models', 'fhir', '*.rb')).each do |file|
20
+ Dir.glob(File.join(root, 'lib', 'fhir_models', 'fhir', '*.rb')).sort.each do |file|
21
21
  require file
22
22
  end
23
- Dir.glob(File.join(root, 'lib', 'fhir_models', 'fhir', '**', '*.rb')).each do |file|
23
+ Dir.glob(File.join(root, 'lib', 'fhir_models', 'fhir', '**', '*.rb')).sort.each do |file|
24
24
  require file
25
25
  end
26
26
 
27
27
  # Require the FHIRPath code
28
- Dir.glob(File.join(root, 'lib', 'fhir_models', 'fhirpath', '*.rb')).each do |file|
28
+ Dir.glob(File.join(root, 'lib', 'fhir_models', 'fhirpath', '*.rb')).sort.each do |file|
29
29
  require file
30
30
  end
31
31
 
32
32
  # Require the fhir_ext code
33
- Dir.glob(File.join(root, 'lib', 'fhir_models', 'fhir_ext', '*.rb')).each do |file|
33
+ Dir.glob(File.join(root, 'lib', 'fhir_models', 'fhir_ext', '*.rb')).sort.each do |file|
34
34
  require file
35
35
  end
@@ -17,8 +17,8 @@ module FHIR
17
17
  resource_type = hash['resourceType']
18
18
  klass = Module.const_get("FHIR::#{resource_type}")
19
19
  resource = klass.new(hash)
20
- rescue => ex
21
- FHIR.logger.error("Failed to deserialize JSON:\n#{ex.backtrace}")
20
+ rescue => e
21
+ FHIR.logger.error("Failed to deserialize JSON:\n#{e.backtrace}")
22
22
  FHIR.logger.debug("JSON:\n#{json}")
23
23
  resource = nil
24
24
  end
@@ -78,8 +78,8 @@ module FHIR
78
78
  resource_type = doc.root.name
79
79
  klass = Module.const_get("FHIR::#{resource_type}")
80
80
  resource = klass.new(hash)
81
- rescue => ex
82
- FHIR.logger.error("Failed to deserialize XML:\n#{ex.backtrace}")
81
+ rescue => e
82
+ FHIR.logger.error("Failed to deserialize XML:\n#{e.backtrace}")
83
83
  FHIR.logger.debug("XML:\n#{xml}")
84
84
  resource = nil
85
85
  end
@@ -59,8 +59,8 @@ module FHIR
59
59
  if json.is_a? String
60
60
  begin
61
61
  json = JSON.parse(json)
62
- rescue => ex
63
- @errors << "Failed to parse JSON: #{ex.message} %n #{h} %n #{ex.backtrace.join("\n")}"
62
+ rescue => e
63
+ @errors << "Failed to parse JSON: #{e.message} %n #{h} %n #{e.backtrace.join("\n")}"
64
64
  return false
65
65
  end
66
66
  end
@@ -161,7 +161,6 @@ module FHIR
161
161
  if !element.type.empty? && element.path != id
162
162
  # element.type not being empty implies data_type_found != nil, for valid profiles
163
163
  codeable_concept_pattern = element.pattern && element.pattern.is_a?(FHIR::CodeableConcept)
164
- codeable_concept_binding = element.binding
165
164
  matching_pattern = false
166
165
  nodes.each do |value|
167
166
  matching_type = 0
@@ -30,8 +30,8 @@ module FHIR
30
30
  hash.each do |key, value|
31
31
  obj.send("#{key}=".to_sym, value) if value
32
32
  end
33
- rescue => ex
34
- FHIR.logger.error "Failed to parse JSON: #{ex.message}"
33
+ rescue => e
34
+ FHIR.logger.error "Failed to parse JSON: #{e.message}"
35
35
  return nil
36
36
  end
37
37
  end
@@ -1,5 +1,5 @@
1
1
  module FHIR
2
2
  module Models
3
- VERSION = '4.1.1'.freeze
3
+ VERSION = '4.1.2'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fhir_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.1
4
+ version: 4.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jason Walonoski
@@ -9,10 +9,10 @@ authors:
9
9
  - Michael O'Keefe
10
10
  - Robert Scanlon
11
11
  - Reece Adamson
12
- autorequire:
12
+ autorequire:
13
13
  bindir: exe
14
14
  cert_chain: []
15
- date: 2020-11-16 00:00:00.000000000 Z
15
+ date: 2021-03-31 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: nokogiri
@@ -188,14 +188,14 @@ dependencies:
188
188
  requirements:
189
189
  - - '='
190
190
  - !ruby/object:Gem::Version
191
- version: '0.67'
191
+ version: '0.80'
192
192
  type: :development
193
193
  prerelease: false
194
194
  version_requirements: !ruby/object:Gem::Requirement
195
195
  requirements:
196
196
  - - '='
197
197
  - !ruby/object:Gem::Version
198
- version: '0.67'
198
+ version: '0.80'
199
199
  - !ruby/object:Gem::Dependency
200
200
  name: guard-rspec
201
201
  requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,7 @@ files:
242
242
  - Gemfile
243
243
  - Gemfile.lock
244
244
  - Guardfile
245
+ - LICENSE
245
246
  - README.md
246
247
  - Rakefile
247
248
  - bin/console
@@ -3955,9 +3956,10 @@ files:
3955
3956
  - lib/fhir_models/tasks/tasks.rake
3956
3957
  - lib/fhir_models/version.rb
3957
3958
  homepage: https://github.com/fhir-crucible/fhir_models
3958
- licenses: []
3959
+ licenses:
3960
+ - Apache-2.0
3959
3961
  metadata: {}
3960
- post_install_message:
3962
+ post_install_message:
3961
3963
  rdoc_options: []
3962
3964
  require_paths:
3963
3965
  - lib
@@ -3972,9 +3974,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
3972
3974
  - !ruby/object:Gem::Version
3973
3975
  version: '0'
3974
3976
  requirements: []
3975
- rubyforge_project:
3976
- rubygems_version: 2.7.6.2
3977
- signing_key:
3977
+ rubygems_version: 3.1.4
3978
+ signing_key:
3978
3979
  specification_version: 4
3979
3980
  summary: A Gem for handling FHIR models in ruby
3980
3981
  test_files: []