canql 4.2.0 → 4.3.0

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/code_safety.yml +6 -6
  4. data/lib/canql/grammars/patient.treetop +5 -4
  5. data/lib/canql/nodes/patient.rb +15 -12
  6. data/lib/canql/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cae877e85501e0232435e382e6d85d2e459f7e6d56949af56da961b61cd6cad3
4
- data.tar.gz: e4784685847d709ee82f5efc5604bf64580abd40086508405ecb81033ef18bb1
3
+ metadata.gz: 2b054c9d0f56e07afcd4521b2e56b23fc21647f419f9bef7f04104bd2544e3b5
4
+ data.tar.gz: 48bf63bc902135454291778e23905535570bc5fd3019c13acb55709c9795e827
5
5
  SHA512:
6
- metadata.gz: e6422e9a620ca68b7b2e2652acac3a5c26a23b9df77805cb447dbf8686a2a83854724d04494724b1191dbfc23c49364962651661ff626ad01c61cd093c8a4ab3
7
- data.tar.gz: 226e646ada25dfd3b642b10c21436d500be7cc3ed7597fe5d6f5cc6c824a3165d88a8b9d227004db3e550bcb2bf2c94431068f10fba2ecddc794e6ae8e9178d5
6
+ metadata.gz: ad41792d7cfb4d5c79077ac53ca462e03cac72042095c51f41a03c53b92a01e3b16777e4f55d7c3167ab589be134cdf35547724a35b61b496bf9beb58f37ae1a
7
+ data.tar.gz: ca725da517e80d207eaaed88a7128461bfdadc3a23e5754682e342367762d2dbc7d69ae9d1b462fc8529f7135a1486c90d57516882b972964642cacf8b265618
data/CHANGELOG.md CHANGED
@@ -1,6 +1,10 @@
1
1
  ## [Unreleased]
2
2
  *no unreleased changes*
3
3
 
4
+ ## 4.3.0 / 2020-06-10
5
+ ### Added
6
+ * Added additional field existance options (#45)
7
+
4
8
  ## 4.2.0 / 2020-03-25
5
9
  ### Added
6
10
  * Added additional EUROCAT category filters for RAG combination
data/code_safety.yml CHANGED
@@ -19,7 +19,7 @@ file safety:
19
19
  CHANGELOG.md:
20
20
  comments:
21
21
  reviewed_by: josh.pencheon
22
- safe_revision: 9eb40acab7fee77ec063809d284116abfaca226c
22
+ safe_revision: 23852bc731fdf82a87fd06070a89ec81affe8155
23
23
  CODE_OF_CONDUCT.md:
24
24
  comments:
25
25
  reviewed_by: drewthorp
@@ -100,7 +100,7 @@ file safety:
100
100
  comments: It is a known issue that this is potentially susceptible to certain
101
101
  kinds of DoS attack
102
102
  reviewed_by: josh.pencheon
103
- safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
103
+ safe_revision: 43425805d9ad4a99e63eeb5d50495fa14eaa053b
104
104
  lib/canql/grammars/perinatal_hospital.treetop:
105
105
  comments:
106
106
  reviewed_by: josh.pencheon
@@ -154,7 +154,7 @@ file safety:
154
154
  lib/canql/nodes/patient.rb:
155
155
  comments:
156
156
  reviewed_by: josh.pencheon
157
- safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
157
+ safe_revision: 43425805d9ad4a99e63eeb5d50495fa14eaa053b
158
158
  lib/canql/nodes/perinatal_hospital.rb:
159
159
  comments:
160
160
  reviewed_by: josh.pencheon
@@ -178,7 +178,7 @@ file safety:
178
178
  lib/canql/version.rb:
179
179
  comments:
180
180
  reviewed_by: josh.pencheon
181
- safe_revision: 9eb40acab7fee77ec063809d284116abfaca226c
181
+ safe_revision: 23852bc731fdf82a87fd06070a89ec81affe8155
182
182
  test/anomaly_test_helper.rb:
183
183
  comments:
184
184
  reviewed_by: josh.pencheon
@@ -202,7 +202,7 @@ file safety:
202
202
  test/nodes/case_test.rb:
203
203
  comments:
204
204
  reviewed_by: josh.pencheon
205
- safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
205
+ safe_revision: 43425805d9ad4a99e63eeb5d50495fa14eaa053b
206
206
  test/nodes/code_test.rb:
207
207
  comments:
208
208
  reviewed_by: josh.pencheon
@@ -234,7 +234,7 @@ file safety:
234
234
  test/nodes/patient_test.rb:
235
235
  comments:
236
236
  reviewed_by: josh.pencheon
237
- safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
237
+ safe_revision: 43425805d9ad4a99e63eeb5d50495fa14eaa053b
238
238
  test/nodes/perinatal_hospital_test.rb:
239
239
  comments:
240
240
  reviewed_by: josh.pencheon
data/lib/canql/grammars/patient.treetop CHANGED
@@ -46,16 +46,17 @@ module Canql
46
46
 
47
47
  rule case_field_names
48
48
  patient_field_name:(
49
- 'date of birth' / 'dob' / 'nhs number' / 'delivery postcode' /
50
- 'booking postcode' / 'birth weight' /
49
+ 'date of birth' / 'dob' / 'date of vital status' / 'nhs number' /
50
+ 'delivery postcode' / 'booking postcode' / 'birth weight' /
51
51
  'place of delivery' / 'sex' / 'outcome' / 'edd' /
52
- 'expected delivery date' / 'booking hospital' / 'screening status'
52
+ 'expected delivery date' / 'booking hospital' / 'screening status' /
53
+ 'number of fetuses at delivery' / 'malformed in set'
53
54
  )
54
55
  end
55
56
 
56
57
  rule patient_field_names
57
58
  patient_field_name:(
58
- 'date of birth' / 'dob' / 'nhs number' / 'sex'
59
+ 'date of birth' / 'dob' / 'date of vital status' / 'nhs number' / 'sex'
59
60
  )
60
61
  end
61
62
 
data/lib/canql/nodes/patient.rb CHANGED
@@ -39,19 +39,22 @@ module Canql #:nodoc: all
39
39
 
40
40
  module FieldExists
41
41
  FIELDS = {
42
- 'date of birth': { patient: 'birthdate', mother: 'birthdate' },
43
- 'dob': { patient: 'birthdate', mother: 'birthdate' },
44
- 'delivery postcode': { patient: 'delivery_postcode' },
45
- 'booking postcode': { patient: 'booking_postcode' },
46
- 'nhs number': { patient: 'nhsnumber', mother: 'nhsnumber' },
47
- 'birth weight': { patient: 'weight' },
48
- 'place of delivery': { patient: 'placeofdelivery' },
49
- 'sex': { patient: 'sex' },
50
- 'outcome': { patient: 'outcome' },
51
- 'edd': { patient: 'expecteddeliverydate' },
42
+ 'date of birth': { patient: 'birthdate', mother: 'birthdate' },
43
+ 'dob': { patient: 'birthdate', mother: 'birthdate' },
44
+ 'date of vital status': { patient: 'dateofvitalstatus', mother: 'dateofvitalstatus' },
45
+ 'delivery postcode': { patient: 'delivery_postcode' },
46
+ 'booking postcode': { patient: 'booking_postcode' },
47
+ 'nhs number': { patient: 'nhsnumber', mother: 'nhsnumber' },
48
+ 'birth weight': { patient: 'weight' },
49
+ 'place of delivery': { patient: 'placeofdelivery' },
50
+ 'sex': { patient: 'sex' },
51
+ 'outcome': { patient: 'outcome' },
52
+ 'edd': { patient: 'expecteddeliverydate' },
52
53
  'expected delivery date': { patient: 'expecteddeliverydate' },
53
- 'booking hospital': { patient: 'booking_hospital' },
54
- 'screening status': { patient: 'screeningstatus' }
54
+ 'booking hospital': { patient: 'booking_hospital' },
55
+ 'screening status': { patient: 'screeningstatus' },
56
+ 'number of fetuses at delivery': { patient: 'numoffetusesatdelivery' },
57
+ 'malformed in set': { patient: 'malformedinset' }
55
58
  }.freeze
56
59
 
57
60
  def meta_data_item
data/lib/canql/version.rb CHANGED
@@ -2,5 +2,5 @@
2
2
 
3
3
  # This stores the current version of the Canql gem
4
4
  module Canql
5
- VERSION = '4.2.0'
5
+ VERSION = '4.3.0'
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: canql
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.0
4
+ version: 4.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - PHE NDR Development Team
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-03-25 00:00:00.000000000 Z
11
+ date: 2020-06-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: chronic