tnql 1.0.4 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +1 -7
- data/CHANGELOG.md +7 -0
- data/code_safety.yml +16 -16
- data/lib/tnql/grammars/registry.treetop +5 -1
- data/lib/tnql/nodes/registry.rb +15 -1
- data/lib/tnql/version.rb +1 -1
- data/tnql.gemspec +2 -2
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 84f8dbf9e2ffa3742f3862ceab072de0b902a7898d3d02a41f46e4f7edaf0da6
|
4
|
+
data.tar.gz: 777e9c6aeb0db7ddc37c9629053c69b42e4a7a23fc8b3d5ebdbac0680ba57929
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: faf39b0b48420853a4684f4a54b2bba3590e029dd3e41d7315d5b0442358a9160d5b06637d9599384b681e85de36a6213f7666ea1d7d176e72f3f479414c284b
|
7
|
+
data.tar.gz: b447671bf6d26ed0d6218704098ff906faffee0c2ce9aa505b8d3463a0e6acf8f96a496824cce9bc5ffef031eecac2403cb46d418c405b6a7983c7e29901fbb8
|
data/.rubocop.yml
CHANGED
data/CHANGELOG.md
CHANGED
@@ -1,6 +1,13 @@
|
|
1
1
|
## [Unreleased]
|
2
2
|
*no unreleased changes*
|
3
3
|
|
4
|
+
## 1.1.0 / 2021-11-25
|
5
|
+
### Added
|
6
|
+
* allow exclusion of crown dependency from corresponding registry
|
7
|
+
### Fixed
|
8
|
+
* update rubocop configuration
|
9
|
+
* bump dependent gem `ndr_dev_support` to v6.0
|
10
|
+
|
4
11
|
## 1.0.4 / 2021-01-29
|
5
12
|
### Fixed
|
6
13
|
* Compatibility with Rails 6
|
data/code_safety.yml
CHANGED
@@ -22,12 +22,12 @@ file safety:
|
|
22
22
|
safe_revision: 1cf068b17559ed381e013fe71a481eb3db15f553
|
23
23
|
".rubocop.yml":
|
24
24
|
comments:
|
25
|
-
reviewed_by:
|
26
|
-
safe_revision:
|
25
|
+
reviewed_by: ollietulloch
|
26
|
+
safe_revision: b1aeb26ad5721337fc37605b11e2a4a859ebc1f7
|
27
27
|
CHANGELOG.md:
|
28
|
-
comments:
|
29
|
-
reviewed_by:
|
30
|
-
safe_revision:
|
28
|
+
comments: Incorrectly bumped to v1.5.0 from v1.0.4 previously
|
29
|
+
reviewed_by: ollietulloch
|
30
|
+
safe_revision: dbd0e04b521511e49b7e5b004d1ca7e915867c09
|
31
31
|
CODE_OF_CONDUCT.md:
|
32
32
|
comments:
|
33
33
|
reviewed_by: timgentry
|
@@ -128,8 +128,8 @@ file safety:
|
|
128
128
|
lib/tnql/grammars/registry.treetop:
|
129
129
|
comments: It is a known issue that this is potentially susceptible to certain
|
130
130
|
kinds of DoS attack
|
131
|
-
reviewed_by:
|
132
|
-
safe_revision:
|
131
|
+
reviewed_by: ollietulloch
|
132
|
+
safe_revision: 0ba6205a546963eb7e7387bea51f81e6b5485af8
|
133
133
|
lib/tnql/grammars/staging.treetop:
|
134
134
|
comments: It is a known issue that this is potentially susceptible to certain
|
135
135
|
kinds of DoS attack
|
@@ -192,8 +192,8 @@ file safety:
|
|
192
192
|
safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
|
193
193
|
lib/tnql/nodes/registry.rb:
|
194
194
|
comments:
|
195
|
-
reviewed_by:
|
196
|
-
safe_revision:
|
195
|
+
reviewed_by: ollietulloch
|
196
|
+
safe_revision: 96b9ba36a2da7246bff2f0a49cef0e1808ddb4e5
|
197
197
|
lib/tnql/nodes/staging.rb:
|
198
198
|
comments:
|
199
199
|
reviewed_by: timgentry
|
@@ -219,9 +219,9 @@ file safety:
|
|
219
219
|
reviewed_by: timgentry
|
220
220
|
safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
|
221
221
|
lib/tnql/version.rb:
|
222
|
-
comments:
|
223
|
-
reviewed_by:
|
224
|
-
safe_revision:
|
222
|
+
comments: Incorrectly bumped to v1.5.0 from v1.0.4 previously
|
223
|
+
reviewed_by: ollietulloch
|
224
|
+
safe_revision: dbd0e04b521511e49b7e5b004d1ca7e915867c09
|
225
225
|
test/nodes/age_test.rb:
|
226
226
|
comments:
|
227
227
|
reviewed_by: timgentry
|
@@ -256,8 +256,8 @@ file safety:
|
|
256
256
|
safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
|
257
257
|
test/nodes/registry_test.rb:
|
258
258
|
comments:
|
259
|
-
reviewed_by:
|
260
|
-
safe_revision:
|
259
|
+
reviewed_by: ollietulloch
|
260
|
+
safe_revision: 0ba6205a546963eb7e7387bea51f81e6b5485af8
|
261
261
|
test/nodes/staging_test.rb:
|
262
262
|
comments:
|
263
263
|
reviewed_by: timgentry
|
@@ -288,5 +288,5 @@ file safety:
|
|
288
288
|
safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
|
289
289
|
tnql.gemspec:
|
290
290
|
comments:
|
291
|
-
reviewed_by:
|
292
|
-
safe_revision:
|
291
|
+
reviewed_by: ollietulloch
|
292
|
+
safe_revision: 14e059d904af19a4921a37b2949529b916d19b93
|
@@ -1,7 +1,11 @@
|
|
1
1
|
module Tnql
|
2
2
|
grammar Registry
|
3
3
|
rule registry
|
4
|
-
space registry:(registry_code / registry_abbr) <Nodes::RegistryNode>
|
4
|
+
exclude:exclude_crown_dependencies? space registry:(registry_code / registry_abbr) <Nodes::RegistryNode>
|
5
|
+
end
|
6
|
+
|
7
|
+
rule exclude_crown_dependencies
|
8
|
+
space ('not' / 'non' / 'exclude') space crown_dependency:('channel islands' / 'iom' / 'isle of man') <Nodes::ExcludeCrownDependencyNode>
|
5
9
|
end
|
6
10
|
|
7
11
|
rule registry_code
|
data/lib/tnql/nodes/registry.rb
CHANGED
@@ -2,7 +2,21 @@ module Tnql #:nodoc: all
|
|
2
2
|
module Nodes
|
3
3
|
module RegistryNode
|
4
4
|
def meta_data_item
|
5
|
-
|
5
|
+
registrycode = registry.to_registrycode
|
6
|
+
exclude_crown_dependency = !exclude.blank? && exclude.to_registrycode == registrycode
|
7
|
+
{ 'tumour.registry' => { Tnql::EQUALS => [registrycode, exclude_crown_dependency] } }
|
8
|
+
end
|
9
|
+
end
|
10
|
+
|
11
|
+
module ExcludeCrownDependencyNode
|
12
|
+
CROWN_DEPENDENCY_REGISTRY = {
|
13
|
+
'channel islands' => 'Y1001',
|
14
|
+
'iom' => 'Y1701',
|
15
|
+
'isle of man' => 'Y1701'
|
16
|
+
}.freeze unless defined?(CROWN_DEPENDENCY_REGISTRY)
|
17
|
+
|
18
|
+
def to_registrycode
|
19
|
+
CROWN_DEPENDENCY_REGISTRY[crown_dependency.text_value]
|
6
20
|
end
|
7
21
|
end
|
8
22
|
|
data/lib/tnql/version.rb
CHANGED
data/tnql.gemspec
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
# coding: utf-8
|
2
|
-
lib = File.expand_path('
|
2
|
+
lib = File.expand_path('lib', __dir__)
|
3
3
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
4
4
|
require 'tnql/version'
|
5
5
|
|
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
|
|
29
29
|
spec.add_dependency 'treetop', '>= 1.4.10'
|
30
30
|
spec.add_dependency 'chronic', '~> 0.3'
|
31
31
|
|
32
|
-
spec.add_development_dependency 'ndr_dev_support', '~>
|
32
|
+
spec.add_development_dependency 'ndr_dev_support', '~> 6.0'
|
33
33
|
spec.add_development_dependency 'bundler'
|
34
34
|
spec.add_development_dependency 'rake'
|
35
35
|
spec.add_development_dependency 'minitest', '>= 5.0.0'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tnql
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0
|
4
|
+
version: 1.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- PHE NDR IT Development Team
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-11-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -84,14 +84,14 @@ dependencies:
|
|
84
84
|
requirements:
|
85
85
|
- - "~>"
|
86
86
|
- !ruby/object:Gem::Version
|
87
|
-
version: '
|
87
|
+
version: '6.0'
|
88
88
|
type: :development
|
89
89
|
prerelease: false
|
90
90
|
version_requirements: !ruby/object:Gem::Requirement
|
91
91
|
requirements:
|
92
92
|
- - "~>"
|
93
93
|
- !ruby/object:Gem::Version
|
94
|
-
version: '
|
94
|
+
version: '6.0'
|
95
95
|
- !ruby/object:Gem::Dependency
|
96
96
|
name: bundler
|
97
97
|
requirement: !ruby/object:Gem::Requirement
|
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
283
283
|
- !ruby/object:Gem::Version
|
284
284
|
version: '0'
|
285
285
|
requirements: []
|
286
|
-
rubygems_version: 3.
|
286
|
+
rubygems_version: 3.0.3
|
287
287
|
signing_key:
|
288
288
|
specification_version: 4
|
289
289
|
summary: Tumour Natural Query Language
|