tnql 1.0.4 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e85b569fef0cbd1ba25ceeea0a548eb818e7962f332302319a5a672745a4bbf
-  data.tar.gz: 06f4321bceb7fd86941687856b34d4172adc2ffdb6a0c81f91d53f7412b0a01f
+  metadata.gz: 5e7fe1a52c8dd14cff3661003715b53dac3d454d7e95d6dff273d58d55da8773
+  data.tar.gz: 042eb326a98fba15bd0bdd92de8360aaac1ab8b7c010a9a9907a64deefd23720
 SHA512:
-  metadata.gz: ad05b2df59958f3c1725efd06394e27920c1f1618e77fb971003c18e77301cd0f1cafd099abbe18f1a1fc7abff227d030894d8511c2b9282488fc211edfb619c
-  data.tar.gz: aa8072f958a046b342cc045f9d17d7743c09a164b3879c7bc1d5bac5c61dfad5a9bf6286f5b54b04002cb32cf9be296f442bc1b63a3eb13783685873407400dd
+  metadata.gz: 5e1b1e45ad2efb145fa60ba7282ede036e9d69d874fef6e31724f428fa2d90fdc7b61045afd4ef6b93487ceba9c6f861fa8414423c67b705869a50f73c3c50ed
+  data.tar.gz: 4854b60d9c41af4d0b98bb20b39dad440c07de54488c95bef6a1797a242cf0ba1b7f136b19621fe0ebe5bf28b53cdcefa90389220a526bc7ee911ed7622b762a

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
-*no unreleased changes*
+* No unreleased changes
+
+## 1.1.1 / 2022-12-08
+### Fixed
+* Drop support for Ruby 2.6
+* Support Ruby 3.1, Rails 7.0
+* Replace Public Health England naming with NHS Digital
+
+## 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

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Public Health England
+Copyright (c) 2015-2022 NHS Digital
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,6 @@
-# TNQL [![Build Status](https://github.com/publichealthengland/tnql/workflows/Test/badge.svg)](https://github.com/publichealthengland/tnql/actions?query=workflow%3Atest) [![Gem Version](https://badge.fury.io/rb/tnql.svg)](https://rubygems.org/gems/tnql)
+# TNQL [![Build Status](https://github.com/NHSDigital/tnql/workflows/Test/badge.svg)](https://github.com/NHSDigital/tnql/actions?query=workflow%3Atest) [![Gem Version](https://badge.fury.io/rb/tnql.svg)](https://rubygems.org/gems/tnql)
 
-Tumour Natural Query Language (TNQL) is a [Treetop](http://treetop.rubyforge.org/) driven Domain Specific Language (DSL) used by the Public Health England (PHE) National Cancer Registration and Analysis Service (NCRAS) to identify cohorts of tumours.
+Tumour Natural Query Language (TNQL) is a [Treetop](http://treetop.rubyforge.org/) driven Domain Specific Language (DSL) used by the NHS Digital (NHS-D) National Cancer Registration and Analysis Service (NCRAS) to identify cohorts of tumours.
 
 Used for analysis, research and day-to-day operations, it was first created in March 2011 to empower non-technical users to write sophisticated human readable queries without the need to know or understand the underlying datastore and/or schema.
 
@@ -64,7 +64,7 @@ PLEASE NOTE: A side-effect of decoupling TNQL from the NCRAS SQL adapter is that
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/PublicHealthEngland/tnql.
+Bug reports and pull requests are welcome on GitHub at https://github.com/NHSDigital/tnql.
 
 This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 

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.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tnql
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors:
-- PHE NDR IT Development Team
-autorequire: 
+- NHSD NDRS Development Team
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2022-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.18
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,21 @@ dependencies:
         version: 3.2.18
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: ndr_support
   requirement: !ruby/object:Gem::Requirement
@@ -65,35 +79,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.10
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ndr_dev_support
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,7 +121,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,35 +149,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: ndr_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '6.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,7 +183,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -210,24 +216,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/CODEOWNERS"
-- ".github/workflows/lint.yml"
-- ".github/workflows/test.yml"
-- ".gitignore"
-- ".hound.yml"
-- ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
-- code_safety.yml
-- gemfiles/Gemfile.rails52
-- gemfiles/Gemfile.rails60
 - lib/tnql.rb
 - lib/tnql/constants.rb
 - lib/tnql/grammars.rb
@@ -263,12 +256,11 @@ files:
 - lib/tnql/parser.rb
 - lib/tnql/treetop/extensions.rb
 - lib/tnql/version.rb
-- tnql.gemspec
-homepage: https://github.com/PublicHealthEngland/tnql
+homepage: https://github.com/NHSDigital/tnql
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -276,15 +268,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Tumour Natural Query Language
 test_files: []

data/.github/CODEOWNERS

@@ -1,2 +0,0 @@
-# Admins should have oversight of the version:
-lib/tnql/version.rb      @publichealthengland/ndr-admins

data/.github/workflows/lint.yml

@@ -1,23 +0,0 @@
-name: Lint
-
-on: [pull_request]
-
-jobs:
-  rubocop:
-    name: RuboCop
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0 # fetch everything
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.0
-    - name: Install dependencies
-      run: bundle install
-    - name: Run RuboCop against BASE..HEAD changes
-      run: bundle exec rake rubocop:diff origin/${GITHUB_BASE_REF#*/}
-

data/.github/workflows/test.yml

@@ -1,71 +0,0 @@
-name: Test
-
-on: [push]
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        ruby-version:
-          - 2.6
-          - 2.7
-          - 3.0
-        gemfile:
-          - gemfiles/Gemfile.rails52
-          - gemfiles/Gemfile.rails60
-
-    name: Ruby ${{ matrix.ruby-version }} / Bundle ${{ matrix.gemfile }}
-
-    runs-on: ubuntu-latest
-
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake
-
-  # A utility job upon which Branch Protection can depend,
-  # thus remaining agnostic of the matrix.
-  test_matrix:
-    if: ${{ always() }}
-    runs-on: ubuntu-latest
-    name: Matrix
-    needs: test
-    steps:
-    - name: Check build matrix status
-      if: ${{ needs.test.result != 'success' }}
-      run: exit 1
-
-  notify:
-    # Run only on master, but regardless of whether tests past:
-    if: ${{ always() && github.ref == 'refs/heads/master' }}
-
-    needs: test_matrix
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: 8398a7/action-slack@v3
-      with:
-        status: custom
-        fields: workflow,commit,author
-        custom_payload: |
-          {
-            channel: 'C7FQWGDHP',
-            username: 'CI – ' + '${{ github.repository }}'.split('/')[1],
-            icon_emoji: ':hammer_and_wrench:',
-            attachments: [{
-              color: '${{ needs.test_matrix.result }}' === 'success' ? 'good' : '${{ needs.test_matrix.result }}' === 'failure' ? 'danger' : 'warning',
-              text: `${process.env.AS_WORKFLOW} against \`${{ github.ref }}\` (${process.env.AS_COMMIT}) for ${{ github.actor }} resulted in *${{ needs.test_matrix.result }}*.`
-            }]
-          }
-      env:
-        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

data/.gitignore

@@ -1,11 +0,0 @@
-/.rubocop-https---raw-githubusercontent-com-PublicHealthEngland-ndr-dev-support-master--rubocop-yml
-/.bundle/
-/.yardoc
-/gemfiles/*.lock
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/.hound.yml

@@ -1,10 +0,0 @@
-fail_on_violations: true
-
-coffeescript:
-  enabled: false
-javascript:
-  enabled: false
-ruby:
-  config_file: .rubocop.yml
-scss:
-  enabled: false

data/.rubocop.yml

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

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in tnql.gemspec
-gemspec

data/Guardfile

@@ -1,15 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-# automatically check Ruby code style with Rubocop when files are modified
-guard :rubocop, all_on_start: false, keep_failed: false do
-  watch(/.+\.rb$/)
-  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
-end
-
-guard :minitest do
-  watch(%r{^test/.+_test\.rb$})
-  watch('test/test_helper.rb') { 'test' }
-
-  watch(%r{^lib/tnql/(.+)\.rb$}) { |m| "test/#{m[1]}_test.rb" }
-end

data/bin/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'tnql'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-require 'pry'
-Pry.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/code_safety.yml

@@ -1,292 +0,0 @@
----
-file safety:
-  ".github/CODEOWNERS":
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: b2ac2de6856884bdb1e0cb369b02d30c1fd64166
-  ".github/workflows/lint.yml":
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: b2ac2de6856884bdb1e0cb369b02d30c1fd64166
-  ".github/workflows/test.yml":
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: b2ac2de6856884bdb1e0cb369b02d30c1fd64166
-  ".gitignore":
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: fbc1cf349a296e3489e4b27b4de6c52222113926
-  ".hound.yml":
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 1cf068b17559ed381e013fe71a481eb3db15f553
-  ".rubocop.yml":
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: b85a30c6fd89eddc6597323f7afe7ea2859ae9ac
-  CHANGELOG.md:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 745de7ab45ca525e2eecd53c4c6b55152f33039e
-  CODE_OF_CONDUCT.md:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 065dcccb9db71374cea5aad104657a5c1f877d1c
-  Gemfile:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 065dcccb9db71374cea5aad104657a5c1f877d1c
-  Guardfile:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  LICENSE.txt:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 065dcccb9db71374cea5aad104657a5c1f877d1c
-  README.md:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: b2ac2de6856884bdb1e0cb369b02d30c1fd64166
-  Rakefile:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  bin/console:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: fdea3ed4f37453978857611724116f70dd08f1fd
-  bin/setup:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 065dcccb9db71374cea5aad104657a5c1f877d1c
-  gemfiles/Gemfile.rails52:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 3316c8246806653c6ae3f50864b710dd76a064b3
-  gemfiles/Gemfile.rails60:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 8f52c0cbddb974f10eb4f8c3de06038aa95e3429
-  lib/tnql.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  lib/tnql/constants.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  lib/tnql/grammars.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  lib/tnql/grammars/age.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/batch_types.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/dates.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/diagnosis.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/e_base_records.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/main.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/patient.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/provider.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/registration_status.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  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
-  lib/tnql/grammars/staging.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/treatment.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/tumour_type.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/grammars/vital_status.treetop:
-    comments: It is a known issue that this is potentially susceptible to certain
-      kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: b3a8b33cbc5dd29822e0e6ded32500ccd7a15670
-  lib/tnql/nodes.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  lib/tnql/nodes/age.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  lib/tnql/nodes/batch_types.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  lib/tnql/nodes/dates.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  lib/tnql/nodes/diagnosis.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  lib/tnql/nodes/e_base_records.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  lib/tnql/nodes/main.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  lib/tnql/nodes/patient.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  lib/tnql/nodes/provider.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  lib/tnql/nodes/registration_status.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  lib/tnql/nodes/registry.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  lib/tnql/nodes/staging.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  lib/tnql/nodes/treatment.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  lib/tnql/nodes/tumour_type.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  lib/tnql/nodes/vital_status.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  lib/tnql/parser.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 40100d5f23601b0033ddcf0bd7a6367446066cc5
-  lib/tnql/treetop/extensions.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  lib/tnql/version.rb:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 745de7ab45ca525e2eecd53c4c6b55152f33039e
-  test/nodes/age_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/dates_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/diagnosis_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/e_base_records_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: '0749ad008871e286c6e0450a733599f0c86ced5f'
-  test/nodes/main_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/patient_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/provider_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/registration_status_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/registry_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/staging_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/treatment_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/tumour_type_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/nodes/vital_status_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  test/parser_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 40100d5f23601b0033ddcf0bd7a6367446066cc5
-  test/test_helper.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2c3dd20879903b98f7f05d5d3e73b1478c275c93
-  test/tnql_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 61b0293f89d57118268e15fc49b529c64bbbe2b7
-  tnql.gemspec:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: a669dac8f97b3e0675b8c4b2e9e891705566f039

data/gemfiles/Gemfile.rails52

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 5.2.0'

data/gemfiles/Gemfile.rails60

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 6.0'

data/tnql.gemspec

@@ -1,41 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'tnql/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'tnql'
-  spec.version       = Tnql::VERSION
-  spec.authors       = ['PHE NDR IT Development Team']
-  spec.email         = []
-
-  spec.summary       = 'Tumour Natural Query Language'
-  spec.description   = 'Domain Specific Language for querying PHE NCRAS datastores'
-  spec.homepage      = 'https://github.com/PublicHealthEngland/tnql'
-  spec.license       = 'MIT'
-
-  spec.files         = `git ls-files -z`.split("\x0").
-                       reject { |f| f.match(%r{^(test|spec|features)/}) }
-  # SECURE BNS 2018-08-06: Minimise sharing of (public-key encrypted) slack secrets in .travis.yml
-  spec.files         -= %w[.travis.yml] # Not needed in the gem
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.required_ruby_version = '>= 2.6'
-
-  spec.add_dependency 'activesupport', '>= 3.2.18', '< 7'
-  spec.add_dependency 'ndr_support', '>= 3.0', '< 6'
-  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 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest', '>= 5.0.0'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'guard'
-  spec.add_development_dependency 'guard-rubocop'
-  spec.add_development_dependency 'guard-minitest'
-  spec.add_development_dependency 'terminal-notifier-guard' if RUBY_PLATFORM =~ /darwin/
-end