canql 4.0.1 → 4.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/canql.gemspec +1 -1
- data/code_safety.yml +18 -18
- data/lib/canql/grammars/main.treetop +2 -2
- data/lib/canql/grammars/patient.treetop +4 -0
- data/lib/canql/nodes/patient.rb +14 -0
- data/lib/canql/version.rb +1 -1
- metadata +4 -10
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7fe418e0e14b173d9d9034224dc47c109d3fa6c49ca7d4787cba069aeac13fd5
|
4
|
+
data.tar.gz: 2bdd3fc53230d07714d58d6b03e4d787fdc564ad42c7278f77877a8ada72a709
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2aa9bad734c41ae1a9e40c5eee1685d81d23342def83496141f8b996e599aacc5d2fcd0f73d0678e5372045d47237deb06fca4ed8cd35ca0a6a80b7ebec2d6dc
|
7
|
+
data.tar.gz: 0e67202d76e7d32fa80c0409a125245fedc898263b35b6c049350480f4ff6197f95cc75cae7970077c0ee7c9569e992647c5e83db7a966f8d3a77bd165fa63b6
|
data/CHANGELOG.md
CHANGED
data/canql.gemspec
CHANGED
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
|
|
36
36
|
spec.add_development_dependency 'guard-minitest'
|
37
37
|
spec.add_development_dependency 'guard-rubocop'
|
38
38
|
spec.add_development_dependency 'minitest'
|
39
|
-
spec.add_development_dependency 'ndr_dev_support', '~>
|
39
|
+
spec.add_development_dependency 'ndr_dev_support', '~> 5.6'
|
40
40
|
spec.add_development_dependency 'pry'
|
41
41
|
spec.add_development_dependency 'rake'
|
42
42
|
spec.add_development_dependency 'terminal-notifier-guard' if RUBY_PLATFORM =~ /darwin/
|
data/code_safety.yml
CHANGED
@@ -18,8 +18,8 @@ file safety:
|
|
18
18
|
safe_revision: 8adb767031a19aa6b3cea3f1cb05b4a9bcc964f3
|
19
19
|
CHANGELOG.md:
|
20
20
|
comments:
|
21
|
-
reviewed_by:
|
22
|
-
safe_revision:
|
21
|
+
reviewed_by: timgentry
|
22
|
+
safe_revision: cef1ddd804f00d7639947464f2f0e5660e9f0fc7
|
23
23
|
CODE_OF_CONDUCT.md:
|
24
24
|
comments:
|
25
25
|
reviewed_by: drewthorp
|
@@ -50,8 +50,8 @@ file safety:
|
|
50
50
|
safe_revision: 6a666fcabe027056b1c774b2eabb3fdf686911d2
|
51
51
|
canql.gemspec:
|
52
52
|
comments:
|
53
|
-
reviewed_by:
|
54
|
-
safe_revision:
|
53
|
+
reviewed_by: timgentry
|
54
|
+
safe_revision: 6cb13f43b4353ab7c90ff0406ec13ac169b8e64c
|
55
55
|
lib/canql.rb:
|
56
56
|
comments:
|
57
57
|
reviewed_by: timgentry
|
@@ -94,13 +94,13 @@ file safety:
|
|
94
94
|
lib/canql/grammars/main.treetop:
|
95
95
|
comments: It is a known issue that this is potentially susceptible to certain
|
96
96
|
kinds of DoS attack
|
97
|
-
reviewed_by:
|
98
|
-
safe_revision:
|
97
|
+
reviewed_by: timgentry
|
98
|
+
safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
|
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:
|
103
|
-
safe_revision:
|
102
|
+
reviewed_by: timgentry
|
103
|
+
safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
|
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:
|
157
|
-
safe_revision:
|
156
|
+
reviewed_by: timgentry
|
157
|
+
safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
|
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:
|
181
|
-
safe_revision:
|
180
|
+
reviewed_by: timgentry
|
181
|
+
safe_revision: cef1ddd804f00d7639947464f2f0e5660e9f0fc7
|
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:
|
205
|
-
safe_revision:
|
204
|
+
reviewed_by: timgentry
|
205
|
+
safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
|
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:
|
237
|
-
safe_revision:
|
236
|
+
reviewed_by: timgentry
|
237
|
+
safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
|
238
238
|
test/nodes/perinatal_hospital_test.rb:
|
239
239
|
comments:
|
240
240
|
reviewed_by: josh.pencheon
|
@@ -249,8 +249,8 @@ file safety:
|
|
249
249
|
safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
|
250
250
|
test/parser_test.rb:
|
251
251
|
comments:
|
252
|
-
reviewed_by:
|
253
|
-
safe_revision:
|
252
|
+
reviewed_by: timgentry
|
253
|
+
safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
|
254
254
|
test/test_helper.rb:
|
255
255
|
comments:
|
256
256
|
reviewed_by: josh.pencheon
|
@@ -59,11 +59,11 @@ grammar Canql
|
|
59
59
|
end
|
60
60
|
|
61
61
|
rule case_preconditions
|
62
|
-
registry / gender / outcome / primacy
|
62
|
+
registry / gender / outcome / primacy / category
|
63
63
|
end
|
64
64
|
|
65
65
|
rule patient_preconditions
|
66
|
-
gender / primacy
|
66
|
+
gender / primacy / category
|
67
67
|
end
|
68
68
|
|
69
69
|
rule case_additional_conditions
|
@@ -12,6 +12,10 @@ module Canql
|
|
12
12
|
space primacy:('primary' / 'alias' ) word_break <Nodes::Patient::PrimacyNode>
|
13
13
|
end
|
14
14
|
|
15
|
+
rule category
|
16
|
+
space category:('eurocat red' / 'eurocat amber' / 'eurocat green' / 'eurocat') word_break <Nodes::Patient::CategoryNode>
|
17
|
+
end
|
18
|
+
|
15
19
|
rule expected_keyword
|
16
20
|
space ('expected' / 'due') word_break
|
17
21
|
end
|
data/lib/canql/nodes/patient.rb
CHANGED
@@ -21,6 +21,20 @@ module Canql #:nodoc: all
|
|
21
21
|
end
|
22
22
|
end
|
23
23
|
|
24
|
+
module CategoryNode
|
25
|
+
def meta_data_item
|
26
|
+
{ 'patient.category' => { Canql::EQUALS => clean_category } }
|
27
|
+
end
|
28
|
+
|
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
|
+
|
34
|
+
category.text_value
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
24
38
|
module FieldExists
|
25
39
|
FIELDS = {
|
26
40
|
'date of birth': { patient: 'birthdate', mother: 'birthdate' },
|
data/lib/canql/version.rb
CHANGED
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.0
|
4
|
+
version: 4.1.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:
|
11
|
+
date: 2020-03-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: chronic
|
@@ -154,20 +154,14 @@ dependencies:
|
|
154
154
|
requirements:
|
155
155
|
- - "~>"
|
156
156
|
- !ruby/object:Gem::Version
|
157
|
-
version: '
|
158
|
-
- - ">="
|
159
|
-
- !ruby/object:Gem::Version
|
160
|
-
version: 3.1.3
|
157
|
+
version: '5.6'
|
161
158
|
type: :development
|
162
159
|
prerelease: false
|
163
160
|
version_requirements: !ruby/object:Gem::Requirement
|
164
161
|
requirements:
|
165
162
|
- - "~>"
|
166
163
|
- !ruby/object:Gem::Version
|
167
|
-
version: '
|
168
|
-
- - ">="
|
169
|
-
- !ruby/object:Gem::Version
|
170
|
-
version: 3.1.3
|
164
|
+
version: '5.6'
|
171
165
|
- !ruby/object:Gem::Dependency
|
172
166
|
name: pry
|
173
167
|
requirement: !ruby/object:Gem::Requirement
|