canql 5.2.0 → 5.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 +6 -1
  3. data/code_safety.yml +8 -8
  4. data/lib/canql/grammars/patient.treetop +6 -1
  5. data/lib/canql/nodes/patient.rb +5 -5
  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: c11d88eb61eaebcc1fee8bbcf02c3528a26799b7a62800971c34517619b98668
4
- data.tar.gz: ac2d55b1fcf88636a1ccfdf3a2f11b4d4ef7e878ba886fceddd2dcdce26a6fb6
3
+ metadata.gz: ae3a56f2f18e07ba44242415dba078f1a95b7b23f151964a7d4609df6fd1de6a
4
+ data.tar.gz: 4b3ed23c5649700c5ad282fa59bc08f5b74b1e57cff818ed776bfc4ce3c1b178
5
5
  SHA512:
6
- metadata.gz: 767d7da5878ba53e624db9090a0bce25ee2b17c039b5ecce4bbb65126f0d32bc988851f7b31e41be235f9911919051a07a7e5478b54d11bc0aefdf7c6a939389
7
- data.tar.gz: bd874eb46ba2641c84ba40d2a521db212b218879cf6e789777514d36bea0672fd9b38e24804ca4a86b54b722c62b5a7a89003d3040cd8179991b134ebb7543ab
6
+ metadata.gz: cb9f4a4566ac1489921fa2e154abf67fdda5453f19572331e06829a7195204dd81376221ae7b44cce4fc4e6f16b817d40cb3259aa3e91626094432412f09e6f5
7
+ data.tar.gz: 8f4151afa3555cbfdcd168131c893924c1edadeb5fb8d017a3ea1725d65f006c9040c68e9438285bbf76fa7f4382d64d2326f11abeb013e61877b77b90102fa0
data/CHANGELOG.md CHANGED
@@ -1,5 +1,10 @@
1
1
  ## [Unreleased]
2
- * no relevent changes
2
+ * no relvent changes
3
+
4
+
5
+ ## 5.3.0 / 2021-03-05
6
+
7
+ * Added new FASP case RAG rating filters (#66)
3
8
 
4
9
  ## 5.2.0 / 2021-03-04
5
10
 
data/code_safety.yml CHANGED
@@ -27,7 +27,7 @@ file safety:
27
27
  CHANGELOG.md:
28
28
  comments:
29
29
  reviewed_by: ollietulloch
30
- safe_revision: 9af6ea0bcdac493fe5f31d62b504b285658867c4
30
+ safe_revision: 64a8f1007fe57afd5bd886e6b02b17b7a6e874c4
31
31
  CODE_OF_CONDUCT.md:
32
32
  comments:
33
33
  reviewed_by: drewthorp
@@ -107,8 +107,8 @@ file safety:
107
107
  lib/canql/grammars/patient.treetop:
108
108
  comments: It is a known issue that this is potentially susceptible to certain
109
109
  kinds of DoS attack
110
- reviewed_by: josh.pencheon
111
- safe_revision: 7490099869e368dcd5c26ded11eb90229baf4cae
110
+ reviewed_by: ollietulloch
111
+ safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
112
112
  lib/canql/grammars/perinatal_hospital.treetop:
113
113
  comments:
114
114
  reviewed_by: josh.pencheon
@@ -165,8 +165,8 @@ file safety:
165
165
  safe_revision: 361dea5dc6d64bdb7b03434dd2878f8c3b128c95
166
166
  lib/canql/nodes/patient.rb:
167
167
  comments:
168
- reviewed_by: josh.pencheon
169
- safe_revision: 7490099869e368dcd5c26ded11eb90229baf4cae
168
+ reviewed_by: ollietulloch
169
+ safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
170
170
  lib/canql/nodes/perinatal_hospital.rb:
171
171
  comments:
172
172
  reviewed_by: josh.pencheon
@@ -194,7 +194,7 @@ file safety:
194
194
  lib/canql/version.rb:
195
195
  comments:
196
196
  reviewed_by: ollietulloch
197
- safe_revision: 9af6ea0bcdac493fe5f31d62b504b285658867c4
197
+ safe_revision: 64a8f1007fe57afd5bd886e6b02b17b7a6e874c4
198
198
  test/anomaly_test_helper.rb:
199
199
  comments:
200
200
  reviewed_by: ollietulloch
@@ -249,8 +249,8 @@ file safety:
249
249
  safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
250
250
  test/nodes/patient_test.rb:
251
251
  comments:
252
- reviewed_by: josh.pencheon
253
- safe_revision: 43425805d9ad4a99e63eeb5d50495fa14eaa053b
252
+ reviewed_by: ollietulloch
253
+ safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
254
254
  test/nodes/perinatal_hospital_test.rb:
255
255
  comments:
256
256
  reviewed_by: josh.pencheon
data/lib/canql/grammars/patient.treetop CHANGED
@@ -13,7 +13,12 @@ module Canql
13
13
  end
14
14
 
15
15
  rule category
16
- space category:('eurocat amber and green' / 'eurocat red and amber' / 'eurocat red' / 'eurocat amber' / 'eurocat green' / 'eurocat') word_break <Nodes::Patient::CategoryNode>
16
+ space category:('eurocat amber and green' /
17
+ 'eurocat red and amber' / 'eurocat red' / 'eurocat amber' /
18
+ 'eurocat green' / 'eurocat' /
19
+ 'fasp red and amber' / 'fasp amber and red' / 'fasp red' /
20
+ 'fasp amber' / 'fasp green' / 'fasp excluded'
21
+ ) word_break <Nodes::Patient::CategoryNode>
17
22
  end
18
23
 
19
24
  rule expected_keyword
data/lib/canql/nodes/patient.rb CHANGED
@@ -27,11 +27,11 @@ module Canql #:nodoc: all
27
27
  end
28
28
 
29
29
  def clean_category
30
- return 'eurocat_red' if 'eurocat red' == category.text_value
31
- return 'eurocat_amber' if 'eurocat amber' == category.text_value
32
- return 'eurocat_green' if 'eurocat green' == category.text_value
33
- return 'eurocat_amber_green' if 'eurocat amber and green' == category.text_value
34
- return 'eurocat_red_amber' if 'eurocat red and amber' == category.text_value
30
+ if category.text_value.start_with?('eurocat ') || category.text_value.start_with?('fasp ')
31
+ filter_value = category.text_value.gsub(/( )/, '_').downcase.gsub(/(_and_)/, '_')
32
+ filter_value = 'fasp_red_amber' if filter_value == 'fasp_amber_red'
33
+ return filter_value
34
+ end
35
35
 
36
36
  category.text_value
37
37
  end
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 = '5.2.0'
5
+ VERSION = '5.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: 5.2.0
4
+ version: 5.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: 2021-03-04 00:00:00.000000000 Z
11
+ date: 2021-03-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: chronic