tnql 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e85b569fef0cbd1ba25ceeea0a548eb818e7962f332302319a5a672745a4bbf
-  data.tar.gz: 06f4321bceb7fd86941687856b34d4172adc2ffdb6a0c81f91d53f7412b0a01f
+  metadata.gz: 84f8dbf9e2ffa3742f3862ceab072de0b902a7898d3d02a41f46e4f7edaf0da6
+  data.tar.gz: 777e9c6aeb0db7ddc37c9629053c69b42e4a7a23fc8b3d5ebdbac0680ba57929
 SHA512:
-  metadata.gz: ad05b2df59958f3c1725efd06394e27920c1f1618e77fb971003c18e77301cd0f1cafd099abbe18f1a1fc7abff227d030894d8511c2b9282488fc211edfb619c
-  data.tar.gz: aa8072f958a046b342cc045f9d17d7743c09a164b3879c7bc1d5bac5c61dfad5a9bf6286f5b54b04002cb32cf9be296f442bc1b63a3eb13783685873407400dd
+  metadata.gz: faf39b0b48420853a4684f4a54b2bba3590e029dd3e41d7315d5b0442358a9160d5b06637d9599384b681e85de36a6213f7666ea1d7d176e72f3f479414c284b
+  data.tar.gz: b447671bf6d26ed0d6218704098ff906faffee0c2ce9aa505b8d3463a0e6acf8f96a496824cce9bc5ffef031eecac2403cb46d418c405b6a7983c7e29901fbb8

data/.rubocop.yml

@@ -1,7 +1 @@
-inherit_from: 'https://raw.githubusercontent.com/PublicHealthEngland/ndr_dev_support/master/.rubocop.yml'
-
-Rails:
-  Enabled: false
-
-AllCops:
-  TargetRubyVersion: 2.3
+require: ndr_dev_support

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 1.1.0 / 2021-11-25
+### Added
+* allow exclusion of crown dependency from corresponding registry
+### Fixed
+* update rubocop configuration
+* bump dependent gem `ndr_dev_support` to v6.0
+
 ## 1.0.4 / 2021-01-29
 ### Fixed
 * Compatibility with Rails 6

data/code_safety.yml

@@ -22,12 +22,12 @@ file safety:
     safe_revision: 1cf068b17559ed381e013fe71a481eb3db15f553
   ".rubocop.yml":
     comments: 
-    reviewed_by: timgentry
-    safe_revision: b85a30c6fd89eddc6597323f7afe7ea2859ae9ac
+    reviewed_by: ollietulloch
+    safe_revision: b1aeb26ad5721337fc37605b11e2a4a859ebc1f7
   CHANGELOG.md:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 745de7ab45ca525e2eecd53c4c6b55152f33039e
+    comments: Incorrectly bumped to v1.5.0 from v1.0.4 previously
+    reviewed_by: ollietulloch
+    safe_revision: dbd0e04b521511e49b7e5b004d1ca7e915867c09
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -128,8 +128,8 @@ file safety:
   lib/tnql/grammars/registry.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
+    reviewed_by: ollietulloch
+    safe_revision: 0ba6205a546963eb7e7387bea51f81e6b5485af8
   lib/tnql/grammars/staging.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -192,8 +192,8 @@ file safety:
     safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
   lib/tnql/nodes/registry.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
+    reviewed_by: ollietulloch
+    safe_revision: 96b9ba36a2da7246bff2f0a49cef0e1808ddb4e5
   lib/tnql/nodes/staging.rb:
     comments: 
     reviewed_by: timgentry
@@ -219,9 +219,9 @@ file safety:
     reviewed_by: timgentry
     safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
   lib/tnql/version.rb:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 745de7ab45ca525e2eecd53c4c6b55152f33039e
+    comments: Incorrectly bumped to v1.5.0 from v1.0.4 previously
+    reviewed_by: ollietulloch
+    safe_revision: dbd0e04b521511e49b7e5b004d1ca7e915867c09
   test/nodes/age_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -256,8 +256,8 @@ file safety:
     safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
   test/nodes/registry_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
+    reviewed_by: ollietulloch
+    safe_revision: 0ba6205a546963eb7e7387bea51f81e6b5485af8
   test/nodes/staging_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -288,5 +288,5 @@ file safety:
     safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
   tnql.gemspec:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: a669dac8f97b3e0675b8c4b2e9e891705566f039
+    reviewed_by: ollietulloch
+    safe_revision: 14e059d904af19a4921a37b2949529b916d19b93

data/lib/tnql/grammars/registry.treetop

@@ -1,7 +1,11 @@
 module Tnql
   grammar Registry
     rule registry
-      space registry:(registry_code / registry_abbr) <Nodes::RegistryNode>
+      exclude:exclude_crown_dependencies? space registry:(registry_code / registry_abbr) <Nodes::RegistryNode>
+    end
+
+    rule exclude_crown_dependencies
+      space ('not' / 'non' / 'exclude') space crown_dependency:('channel islands' / 'iom' / 'isle of man') <Nodes::ExcludeCrownDependencyNode>
     end
 
     rule registry_code

data/lib/tnql/nodes/registry.rb

@@ -2,7 +2,21 @@ module Tnql #:nodoc: all
   module Nodes
     module RegistryNode
       def meta_data_item
-        { 'tumour.registry' => { Tnql::EQUALS => registry.to_registrycode } }
+        registrycode = registry.to_registrycode
+        exclude_crown_dependency = !exclude.blank? && exclude.to_registrycode == registrycode
+        { 'tumour.registry' => { Tnql::EQUALS => [registrycode, exclude_crown_dependency] } }
+      end
+    end
+
+    module ExcludeCrownDependencyNode
+      CROWN_DEPENDENCY_REGISTRY = {
+        'channel islands' => 'Y1001',
+        'iom' => 'Y1701',
+        'isle of man' => 'Y1701'
+      }.freeze unless defined?(CROWN_DEPENDENCY_REGISTRY)
+
+      def to_registrycode
+        CROWN_DEPENDENCY_REGISTRY[crown_dependency.text_value]
       end
     end
 

data/lib/tnql/version.rb

@@ -1,4 +1,4 @@
 # This stores the current version of the Tnql gem
 module Tnql
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/tnql.gemspec

@@ -1,5 +1,5 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tnql/version'
 
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'treetop', '>= 1.4.10'
   spec.add_dependency 'chronic', '~> 0.3'
 
-  spec.add_development_dependency 'ndr_dev_support', '~> 5.9'
+  spec.add_development_dependency 'ndr_dev_support', '~> 6.0'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest', '>= 5.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tnql
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - PHE NDR IT Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Tumour Natural Query Language