canql 2.1.0 → 2.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +13 -11
  3. data/code_safety.yml +12 -12
  4. data/lib/canql/grammars/patient.treetop +5 -1
  5. data/lib/canql/nodes/patient.rb +11 -8
  6. data/lib/canql/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ec5860921323a9b19adb7e31a3e3df34f9154572
4
- data.tar.gz: 5af7802c15c0d787c87dfc48dcb4e2fc93361093
3
+ metadata.gz: f708fda533a83ddd144a192462447f8fe23d3fb1
4
+ data.tar.gz: 4540092c6a500eb725a5412cba8d22fb7a21d881
5
5
  SHA512:
6
- metadata.gz: 2d05ac765951510e9746f4f65e4fddd9778d634b7999bc1719fcd770b6695f5e9ef6b4c2eecc8cfee3411c7bda9462ad5e804f97b96ecec43f3e282fda533e37
7
- data.tar.gz: d52b09c8edaaaa4e4f6c365a73d9481c64f6f3909aa8dce988dcd70a79204460257bb329a9752501bbe6a6962fb10ed328bc951cf900a5ffda1d210d0dba2710
6
+ metadata.gz: 3556bec1bd958b22fabb14b238e27f98bc393bdbb323d7ec5da0249a072407eb5b661a25e59d3a109f4ec0844d0a2d89b041ae0df149cdae8df7c409b180f4e7
7
+ data.tar.gz: dc8c7218e5dd4907d81e2516ff115ef3b4fcee400917d9686207d6a2f7e61f3199ef417e39b726d00151a8a05ea333248fb5a7e6c06d7d937708fef927c23848
data/.travis.yml CHANGED
@@ -1,16 +1,18 @@
1
1
  language: ruby
2
-
3
2
  rvm:
4
- - 2.3
5
- - 2.4
6
- - 2.5
7
-
3
+ - 2.3
4
+ - 2.4
5
+ - 2.5
8
6
  sudo: false
9
-
10
7
  cache: bundler
11
-
12
8
  before_install:
13
- - gem update --system
14
- - gem install bundler
15
-
16
- before_script: "bundle update"
9
+ - gem update --system
10
+ - gem install bundler
11
+ before_script: bundle update
12
+ notifications:
13
+ slack:
14
+ on_pull_requests: false
15
+ on_success: always
16
+ on_failure: always
17
+ rooms:
18
+ secure: ixok7nqnRMtP4IqhLhSetpK8AI70aUhqUYiijoCkQ65I/TwRz0cbkl4PChTBLMbUiN1lhXtujg8CcVf++6QMj+vzrpfTIPkw3W/TG4zTJa0FaSg9h1zHX/9hXXw4QOIUvwstH51ay2ONZDVvm2Z1dIMkOFkcw2ndl4VnvtX5Xnekf3jUUvAmCNboLaKiUx5mqKo6KvMq3w7yakik5kQ3462QXoaI7PCEYiPK+CoskqX6aEyDREhCjV6nnzbEaZPBfpJjDp5KLRoFN6BT+Px8tD/lrAHMrW5gkzOtN5zGw9jjgjxp8cOsPoaYsCApQWjnSnRjcXy+g2Pw+SyxIshPE07cazB9fjTVDEiz2P+tb7hh/YEjM3uSJQFs37mIqir2NaUlFQSLwLP2HAX3DvYZeVKQMj8X+pH7Ad6iYGs8soGxrjznL7e1hfUoB89SkNHYTzBbsFy7pMVmTEfPG/MvjFmUgTai40lEvWyRJ4CbDsJ6W/KaLKUOMZpFZ+x/Sc10r9O1FZCKVpfnuRHLQXUj8cqcDags9evB5x6/ECn8zEGs7aX6ZTebPx+2D9sywmvy2LFL9Sjx+L8FYtzTXGBwip3rZOTNZhByzPDVwb0gJqamqRF0cET5RwNqb0Pohs9ScMMQwJnZGznvUbmjMQcemq/s51A6n+5g/Z31j+T482g=
data/code_safety.yml CHANGED
@@ -14,8 +14,8 @@ file safety:
14
14
  safe_revision: 5bc563431f7822e2baf37bbeac9861c36675602d
15
15
  ".travis.yml":
16
16
  comments:
17
- reviewed_by: timgentry
18
- safe_revision: b0b9a616908e7aab28c8c47f997b6af8062aa83a
17
+ reviewed_by: josh.pencheon
18
+ safe_revision: ce5d961ef757500c8d12d7ca72a900ff7040378a
19
19
  CODE_OF_CONDUCT.md:
20
20
  comments:
21
21
  reviewed_by: drewthorp
@@ -91,8 +91,8 @@ file safety:
91
91
  lib/canql/grammars/patient.treetop:
92
92
  comments: It is a known issue that this is potentially susceptible to certain
93
93
  kinds of DoS attack
94
- reviewed_by: timgentry
95
- safe_revision: 0bf684b681372d16145cae8c6bb831f1bb96f442
94
+ reviewed_by: josh.pencheon
95
+ safe_revision: a1686a3905ee6d7ebc8c5b1786efba4f8df42a2d
96
96
  lib/canql/grammars/registry.treetop:
97
97
  comments: It is a known issue that this is potentially susceptible to certain
98
98
  kinds of DoS attack
@@ -133,8 +133,8 @@ file safety:
133
133
  safe_revision: c39d24bb500719971969762e94545e82866bf92f
134
134
  lib/canql/nodes/patient.rb:
135
135
  comments:
136
- reviewed_by: timgentry
137
- safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
136
+ reviewed_by: josh.pencheon
137
+ safe_revision: a1686a3905ee6d7ebc8c5b1786efba4f8df42a2d
138
138
  lib/canql/nodes/registry.rb:
139
139
  comments:
140
140
  reviewed_by: timgentry
@@ -153,8 +153,8 @@ file safety:
153
153
  safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
154
154
  lib/canql/version.rb:
155
155
  comments:
156
- reviewed_by: timgentry
157
- safe_revision: 78fc6f6aaee47fc11b073a8d8d975b4f7c9101cc
156
+ reviewed_by: josh.pencheon
157
+ safe_revision: fd9111207d7d42f278568eddbc677789219f0109
158
158
  test/anomaly_test_helper.rb:
159
159
  comments:
160
160
  reviewed_by: timgentry
@@ -189,8 +189,8 @@ file safety:
189
189
  safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
190
190
  test/nodes/patient_test.rb:
191
191
  comments:
192
- reviewed_by: timgentry
193
- safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
192
+ reviewed_by: josh.pencheon
193
+ safe_revision: a1686a3905ee6d7ebc8c5b1786efba4f8df42a2d
194
194
  test/nodes/registry_test.rb:
195
195
  comments:
196
196
  reviewed_by: timgentry
@@ -205,5 +205,5 @@ file safety:
205
205
  safe_revision: c39d24bb500719971969762e94545e82866bf92f
206
206
  test/test_helper.rb:
207
207
  comments:
208
- reviewed_by: timgentry
209
- safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
208
+ reviewed_by: josh.pencheon
209
+ safe_revision: a1686a3905ee6d7ebc8c5b1786efba4f8df42a2d
data/lib/canql/grammars/patient.treetop CHANGED
@@ -29,7 +29,11 @@ module Canql
29
29
  end
30
30
 
31
31
  rule patient_field_names
32
- patient_field_name:('date of birth' / 'dob' / 'nhs number' / 'postcode' / 'birth weight' / 'place of delivery' / 'sex' / 'outcome')
32
+ patient_field_name:(
33
+ 'date of birth' / 'dob' / 'nhs number' / 'postcode' / 'birth weight' /
34
+ 'place of delivery' / 'sex' / 'outcome' / 'edd' /
35
+ 'expected delivery date' / 'booking hospital'
36
+ )
33
37
  end
34
38
 
35
39
  rule mother_conditions
data/lib/canql/nodes/patient.rb CHANGED
@@ -17,14 +17,17 @@ module Canql #:nodoc: all
17
17
 
18
18
  module FieldExists
19
19
  FIELDS = {
20
- 'date of birth': { patient: 'birthdate', mother: 'birthdate' },
21
- 'dob': { patient: 'birthdate', mother: 'birthdate' },
22
- 'postcode': { patient: 'postcode', mother: 'postcode' },
23
- 'nhs number': { patient: 'nhsnumber', mother: 'nhsnumber' },
24
- 'birth weight': { patient: 'weight' },
25
- 'place of delivery': { patient: 'placeofdelivery' },
26
- 'sex': { patient: 'sex' },
27
- 'outcome': { patient: 'outcome' }
20
+ 'date of birth': { patient: 'birthdate', mother: 'birthdate' },
21
+ 'dob': { patient: 'birthdate', mother: 'birthdate' },
22
+ 'postcode': { patient: 'postcode', mother: 'postcode' },
23
+ 'nhs number': { patient: 'nhsnumber', mother: 'nhsnumber' },
24
+ 'birth weight': { patient: 'weight' },
25
+ 'place of delivery': { patient: 'placeofdelivery' },
26
+ 'sex': { patient: 'sex' },
27
+ 'outcome': { patient: 'outcome' },
28
+ 'edd': { patient: 'expecteddeliverydate' },
29
+ 'expected delivery date': { patient: 'expecteddeliverydate' },
30
+ 'booking hospital': { patient: 'booking_hospital' }
28
31
  }.freeze
29
32
 
30
33
  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 = '2.1.0'
5
+ VERSION = '2.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: 2.1.0
4
+ version: 2.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: 2018-06-04 00:00:00.000000000 Z
11
+ date: 2018-06-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: chronic