canql 2.8.0 → 2.9.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/code_safety.yml +6 -6
- data/lib/canql/grammars/e_base_records.treetop +10 -2
- data/lib/canql/nodes/e_base_records.rb +14 -0
- data/lib/canql/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 38321557e5517c77caf018f023577752e98fe518d41616415c4e49b7bb5b6d8f
|
4
|
+
data.tar.gz: 663c6544c8b51686bec057544c3ec98481a0b2950443271a6ab3ac09d11c371f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7fd854a998a4216d62dd15577fb1de94574ee403f675f16d94235f7e298a6a08df05d4ebc7adb5593bdac37ff33b40a61a10526aa356c798b3e5fed84bf98c79
|
7
|
+
data.tar.gz: 7a7cf98ed521dca34ea8f8059e83256253e0d514438cf38d5e17b2914581913a96e9c31fe84992d4a47d08756fb2910562ed22b718e9888dfa645592c7373041
|
data/CHANGELOG.md
CHANGED
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:
|
22
|
+
safe_revision: 48060910ebf28f1ee88fe0faa4e7bd70daeaa3c6
|
23
23
|
CODE_OF_CONDUCT.md:
|
24
24
|
comments:
|
25
25
|
reviewed_by: drewthorp
|
@@ -86,7 +86,7 @@ file safety:
|
|
86
86
|
lib/canql/grammars/e_base_records.treetop:
|
87
87
|
comments:
|
88
88
|
reviewed_by: josh.pencheon
|
89
|
-
safe_revision:
|
89
|
+
safe_revision: 4805609963f75639e2444df8f42d2d6d65005b7c
|
90
90
|
lib/canql/grammars/genetic_test.treetop:
|
91
91
|
comments:
|
92
92
|
reviewed_by: josh.pencheon
|
@@ -142,7 +142,7 @@ file safety:
|
|
142
142
|
lib/canql/nodes/e_base_records.rb:
|
143
143
|
comments:
|
144
144
|
reviewed_by: josh.pencheon
|
145
|
-
safe_revision:
|
145
|
+
safe_revision: 4805609963f75639e2444df8f42d2d6d65005b7c
|
146
146
|
lib/canql/nodes/genetic_test.rb:
|
147
147
|
comments:
|
148
148
|
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:
|
181
|
+
safe_revision: 48060910ebf28f1ee88fe0faa4e7bd70daeaa3c6
|
182
182
|
test/anomaly_test_helper.rb:
|
183
183
|
comments:
|
184
184
|
reviewed_by: josh.pencheon
|
@@ -206,7 +206,7 @@ file safety:
|
|
206
206
|
test/nodes/e_base_records_test.rb:
|
207
207
|
comments:
|
208
208
|
reviewed_by: josh.pencheon
|
209
|
-
safe_revision:
|
209
|
+
safe_revision: 4805609963f75639e2444df8f42d2d6d65005b7c
|
210
210
|
test/nodes/genetic_tests_test.rb:
|
211
211
|
comments:
|
212
212
|
reviewed_by: josh.pencheon
|
@@ -218,7 +218,7 @@ file safety:
|
|
218
218
|
test/nodes/mother_e_base_records_test.rb:
|
219
219
|
comments:
|
220
220
|
reviewed_by: josh.pencheon
|
221
|
-
safe_revision:
|
221
|
+
safe_revision: 4805609963f75639e2444df8f42d2d6d65005b7c
|
222
222
|
test/nodes/patient_test.rb:
|
223
223
|
comments:
|
224
224
|
reviewed_by: josh.pencheon
|
@@ -1,11 +1,11 @@
|
|
1
1
|
module Canql
|
2
2
|
grammar EBaseRecords
|
3
3
|
rule action_or_ebr
|
4
|
-
and_keyword? action_and_ebr / all_or_none_actions / actions / e_base_records
|
4
|
+
and_keyword? action_and_ebr / all_or_none_actions / actions / e_base_records / processing_date
|
5
5
|
end
|
6
6
|
|
7
7
|
rule action_and_ebr
|
8
|
-
actions and_keyword e_base_records
|
8
|
+
actions and_keyword e_base_records processing_date?
|
9
9
|
end
|
10
10
|
|
11
11
|
rule e_base_records
|
@@ -24,6 +24,14 @@ module Canql
|
|
24
24
|
','? space? ('or' space)? batch_type <Nodes::MoreTypesNode>
|
25
25
|
end
|
26
26
|
|
27
|
+
rule processing_date
|
28
|
+
space processing_date_keyword fuzzy_date <Nodes::ProcessingDateNode>
|
29
|
+
end
|
30
|
+
|
31
|
+
rule processing_date_keyword
|
32
|
+
'dated' ' for processing'?
|
33
|
+
end
|
34
|
+
|
27
35
|
rule with_keyword
|
28
36
|
space 'with' word_break
|
29
37
|
end
|
@@ -72,5 +72,19 @@ module Canql #:nodoc: all
|
|
72
72
|
}
|
73
73
|
end
|
74
74
|
end
|
75
|
+
|
76
|
+
module ProcessingDateNode
|
77
|
+
def meta_data_item
|
78
|
+
subject = reverse_scan_for_marker(:subject) == 'mother' ? '.mother' : ''
|
79
|
+
range = fuzzy_date.to_daterange
|
80
|
+
{
|
81
|
+
"unprocessed_records#{subject}.processing_date" => {
|
82
|
+
Canql::LIMITS => [
|
83
|
+
range.date1.try(:to_date).try(:iso8601), range.date2.try(:to_date).try(:iso8601)
|
84
|
+
]
|
85
|
+
}
|
86
|
+
}
|
87
|
+
end
|
88
|
+
end
|
75
89
|
end
|
76
90
|
end
|
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: 2.
|
4
|
+
version: 2.9.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: 2019-
|
11
|
+
date: 2019-05-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: chronic
|
@@ -278,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
278
278
|
- !ruby/object:Gem::Version
|
279
279
|
version: '0'
|
280
280
|
requirements: []
|
281
|
-
rubygems_version: 3.0.
|
281
|
+
rubygems_version: 3.0.3
|
282
282
|
signing_key:
|
283
283
|
specification_version: 4
|
284
284
|
summary: Congenital Anomaly Natural Query Language
|