canql 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 328610120dd48f5efc67704d2c77b7516f8d36a3e03977baad98563421037026
-  data.tar.gz: ceb762e0315a816778c25437036ea0a89bcecab4a915ae228cde51d98cda9868
+  metadata.gz: 87171fd5abf69aee98a167172876bac2cb49bc71ce9d754544e407066fedb32e
+  data.tar.gz: b419dcc8fae8bea2b7f3e499037ef06552d082ec94527cba6cac14d44d175146
 SHA512:
-  metadata.gz: 469d32c7c3e8dd9a7b790b72aa0db40cab6a534faa5c4018db805013d9bd0d5b7d83758498b58dda1f7685c18962f2d8fff8f7a7ceb0113bada1a33b57b0899d
-  data.tar.gz: f08d2e66f6d1ec90ffa0a889c81fd6bfc726e4b5d25e0c674287be381503b35189e8a0e7afe277370bd35fc89ff9e4233bbc134982de362e944f44b1e5c92654
+  metadata.gz: 8e9906dadb517f20d9b06dded4dc283c73485a6393088acb63b832c1897a640e97b4ec811d26f28d98dad027f2833c67b1cb616529fa7cc29f894264f7e2c406
+  data.tar.gz: 2f903fe2616f43b0c39900c002ccc76ef72159c00eca03f7cb8793602de907a20e20dd0be9eaa6a8d2fc8b575a0ba2727cfc79e6d1b20b6f1f3e3e9a300cce7e

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 2.7.0 / 2019-03-21
+### Added
+* Added support for NIPT, RD_DEATH and UMUM batch types (#23)
+
 ## 2.6.0 / 2019-03-12
 ### Added
 * Added the ability to limit cases to primary or alias patients (#20)

data/code_safety.yml

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: d26cf2ffd4e2615c9c140cce56be1a809252f331
+    safe_revision: 1c52e8012fa111fc6d07bd1b67b30b43bc0e5fd2
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -77,7 +77,7 @@ file safety:
   lib/canql/grammars/batch_types.treetop:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: '0967ae095f7215d4972856133f5c36bf00a28391'
+    safe_revision: 1892161f3c300f3b199aa318b3fe23a54dd80829
   lib/canql/grammars/dates.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -134,7 +134,7 @@ file safety:
   lib/canql/nodes/batch_types.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: '0967ae095f7215d4972856133f5c36bf00a28391'
+    safe_revision: 1892161f3c300f3b199aa318b3fe23a54dd80829
   lib/canql/nodes/dates.rb:
     comments: 
     reviewed_by: timgentry
@@ -178,7 +178,7 @@ file safety:
   lib/canql/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: d26cf2ffd4e2615c9c140cce56be1a809252f331
+    safe_revision: 1c52e8012fa111fc6d07bd1b67b30b43bc0e5fd2
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: timgentry
@@ -206,7 +206,7 @@ file safety:
   test/nodes/e_base_records_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: '0967ae095f7215d4972856133f5c36bf00a28391'
+    safe_revision: 1892161f3c300f3b199aa318b3fe23a54dd80829
   test/nodes/genetic_tests_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -218,7 +218,7 @@ file safety:
   test/nodes/mother_e_base_records_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: '0967ae095f7215d4972856133f5c36bf00a28391'
+    safe_revision: 1892161f3c300f3b199aa318b3fe23a54dd80829
   test/nodes/patient_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/batch_types.treetop

@@ -1,7 +1,7 @@
 module Canql
   grammar BatchTypes
     rule batch_type
-      (paediatric / enote2 / badger / ucyto) <Nodes::BatchTypeNode>
+      (paediatric / enote2 / badger / ucyto / nipt / rddeath / umum) <Nodes::BatchTypeNode>
     end
 
     rule paediatric
@@ -19,5 +19,17 @@ module Canql
     rule ucyto
       ('ucyto' / 'cytogenetic' / 'cyto') <Nodes::UcytoNode>
     end
+
+    rule nipt
+      'nipt' <Nodes::NiptNode>
+    end
+
+    rule rddeath
+      ('rddeath' / 'rare disease death') <Nodes::RddeathNode>
+    end
+
+    rule umum
+      ('umum' / 'mum') <Nodes::UmumNode>
+    end
   end
 end

data/lib/canql/nodes/batch_types.rb

@@ -32,5 +32,23 @@ module Canql #:nodoc: all
         'ucyto'
       end
     end
+
+    module NiptNode
+      def normalise
+        'nipt'
+      end
+    end
+
+    module RddeathNode
+      def normalise
+        'rd_death'
+      end
+    end
+
+    module UmumNode
+      def normalise
+        'umum'
+      end
+    end
   end
 end

data/lib/canql/version.rb

@@ -2,5 +2,5 @@
 
 # This stores the current version of the Canql gem
 module Canql
-  VERSION = '2.6.0'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic