canql 4.1.0 → 4.2.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7fe418e0e14b173d9d9034224dc47c109d3fa6c49ca7d4787cba069aeac13fd5
4
- data.tar.gz: 2bdd3fc53230d07714d58d6b03e4d787fdc564ad42c7278f77877a8ada72a709
3
+ metadata.gz: cae877e85501e0232435e382e6d85d2e459f7e6d56949af56da961b61cd6cad3
4
+ data.tar.gz: e4784685847d709ee82f5efc5604bf64580abd40086508405ecb81033ef18bb1
5
5
  SHA512:
6
- metadata.gz: 2aa9bad734c41ae1a9e40c5eee1685d81d23342def83496141f8b996e599aacc5d2fcd0f73d0678e5372045d47237deb06fca4ed8cd35ca0a6a80b7ebec2d6dc
7
- data.tar.gz: 0e67202d76e7d32fa80c0409a125245fedc898263b35b6c049350480f4ff6197f95cc75cae7970077c0ee7c9569e992647c5e83db7a966f8d3a77bd165fa63b6
6
+ metadata.gz: e6422e9a620ca68b7b2e2652acac3a5c26a23b9df77805cb447dbf8686a2a83854724d04494724b1191dbfc23c49364962651661ff626ad01c61cd093c8a4ab3
7
+ data.tar.gz: 226e646ada25dfd3b642b10c21436d500be7cc3ed7597fe5d6f5cc6c824a3165d88a8b9d227004db3e550bcb2bf2c94431068f10fba2ecddc794e6ae8e9178d5
@@ -1,6 +1,10 @@
1
1
  ## [Unreleased]
2
2
  *no unreleased changes*
3
3
 
4
+ ## 4.2.0 / 2020-03-25
5
+ ### Added
6
+ * Added additional EUROCAT category filters for RAG combination
7
+
4
8
  ## 4.1.0 / 2020-03-19
5
9
  ### Added
6
10
  * Added filters for EUROCAT RAG rating (#39)
@@ -18,8 +18,8 @@ file safety:
18
18
  safe_revision: 8adb767031a19aa6b3cea3f1cb05b4a9bcc964f3
19
19
  CHANGELOG.md:
20
20
  comments:
21
- reviewed_by: timgentry
22
- safe_revision: cef1ddd804f00d7639947464f2f0e5660e9f0fc7
21
+ reviewed_by: josh.pencheon
22
+ safe_revision: 9eb40acab7fee77ec063809d284116abfaca226c
23
23
  CODE_OF_CONDUCT.md:
24
24
  comments:
25
25
  reviewed_by: drewthorp
@@ -99,8 +99,8 @@ file safety:
99
99
  lib/canql/grammars/patient.treetop:
100
100
  comments: It is a known issue that this is potentially susceptible to certain
101
101
  kinds of DoS attack
102
- reviewed_by: timgentry
103
- safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
102
+ reviewed_by: josh.pencheon
103
+ safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
104
104
  lib/canql/grammars/perinatal_hospital.treetop:
105
105
  comments:
106
106
  reviewed_by: josh.pencheon
@@ -153,8 +153,8 @@ file safety:
153
153
  safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
154
154
  lib/canql/nodes/patient.rb:
155
155
  comments:
156
- reviewed_by: timgentry
157
- safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
156
+ reviewed_by: josh.pencheon
157
+ safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
158
158
  lib/canql/nodes/perinatal_hospital.rb:
159
159
  comments:
160
160
  reviewed_by: josh.pencheon
@@ -177,8 +177,8 @@ file safety:
177
177
  safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
178
178
  lib/canql/version.rb:
179
179
  comments:
180
- reviewed_by: timgentry
181
- safe_revision: cef1ddd804f00d7639947464f2f0e5660e9f0fc7
180
+ reviewed_by: josh.pencheon
181
+ safe_revision: 9eb40acab7fee77ec063809d284116abfaca226c
182
182
  test/anomaly_test_helper.rb:
183
183
  comments:
184
184
  reviewed_by: josh.pencheon
@@ -201,8 +201,8 @@ file safety:
201
201
  safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
202
202
  test/nodes/case_test.rb:
203
203
  comments:
204
- reviewed_by: timgentry
205
- safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
204
+ reviewed_by: josh.pencheon
205
+ safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
206
206
  test/nodes/code_test.rb:
207
207
  comments:
208
208
  reviewed_by: josh.pencheon
@@ -233,8 +233,8 @@ file safety:
233
233
  safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
234
234
  test/nodes/patient_test.rb:
235
235
  comments:
236
- reviewed_by: timgentry
237
- safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
236
+ reviewed_by: josh.pencheon
237
+ safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
238
238
  test/nodes/perinatal_hospital_test.rb:
239
239
  comments:
240
240
  reviewed_by: josh.pencheon
@@ -13,7 +13,7 @@ module Canql
13
13
  end
14
14
 
15
15
  rule category
16
- space category:('eurocat red' / 'eurocat amber' / 'eurocat green' / 'eurocat') word_break <Nodes::Patient::CategoryNode>
16
+ space category:('eurocat amber and green' / 'eurocat red and amber' / 'eurocat red' / 'eurocat amber' / 'eurocat green' / 'eurocat') word_break <Nodes::Patient::CategoryNode>
17
17
  end
18
18
 
19
19
  rule expected_keyword
@@ -30,6 +30,8 @@ module Canql #:nodoc: all
30
30
  return 'eurocat_red' if 'eurocat red' == category.text_value
31
31
  return 'eurocat_amber' if 'eurocat amber' == category.text_value
32
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
33
35
 
34
36
  category.text_value
35
37
  end
@@ -2,5 +2,5 @@
2
2
 
3
3
  # This stores the current version of the Canql gem
4
4
  module Canql
5
- VERSION = '4.1.0'
5
+ VERSION = '4.2.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.1.0
4
+ version: 4.2.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-19 00:00:00.000000000 Z
11
+ date: 2020-03-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: chronic