canql 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fe418e0e14b173d9d9034224dc47c109d3fa6c49ca7d4787cba069aeac13fd5
-  data.tar.gz: 2bdd3fc53230d07714d58d6b03e4d787fdc564ad42c7278f77877a8ada72a709
+  metadata.gz: cae877e85501e0232435e382e6d85d2e459f7e6d56949af56da961b61cd6cad3
+  data.tar.gz: e4784685847d709ee82f5efc5604bf64580abd40086508405ecb81033ef18bb1
 SHA512:
-  metadata.gz: 2aa9bad734c41ae1a9e40c5eee1685d81d23342def83496141f8b996e599aacc5d2fcd0f73d0678e5372045d47237deb06fca4ed8cd35ca0a6a80b7ebec2d6dc
-  data.tar.gz: 0e67202d76e7d32fa80c0409a125245fedc898263b35b6c049350480f4ff6197f95cc75cae7970077c0ee7c9569e992647c5e83db7a966f8d3a77bd165fa63b6
+  metadata.gz: e6422e9a620ca68b7b2e2652acac3a5c26a23b9df77805cb447dbf8686a2a83854724d04494724b1191dbfc23c49364962651661ff626ad01c61cd093c8a4ab3
+  data.tar.gz: 226e646ada25dfd3b642b10c21436d500be7cc3ed7597fe5d6f5cc6c824a3165d88a8b9d227004db3e550bcb2bf2c94431068f10fba2ecddc794e6ae8e9178d5

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 4.2.0 / 2020-03-25
+### Added
+* Added additional EUROCAT category filters for RAG combination
+
 ## 4.1.0 / 2020-03-19
 ### Added
 * Added filters for EUROCAT RAG rating (#39)

data/code_safety.yml

@@ -18,8 +18,8 @@ file safety:
     safe_revision: 8adb767031a19aa6b3cea3f1cb05b4a9bcc964f3
   CHANGELOG.md:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: cef1ddd804f00d7639947464f2f0e5660e9f0fc7
+    reviewed_by: josh.pencheon
+    safe_revision: 9eb40acab7fee77ec063809d284116abfaca226c
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -99,8 +99,8 @@ file safety:
   lib/canql/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: 05ccd47fcbba92bf5525c4d36118274696169d61
+    reviewed_by: josh.pencheon
+    safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
   lib/canql/grammars/perinatal_hospital.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -153,8 +153,8 @@ file safety:
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   lib/canql/nodes/patient.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
+    reviewed_by: josh.pencheon
+    safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
   lib/canql/nodes/perinatal_hospital.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -177,8 +177,8 @@ file safety:
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/version.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: cef1ddd804f00d7639947464f2f0e5660e9f0fc7
+    reviewed_by: josh.pencheon
+    safe_revision: 9eb40acab7fee77ec063809d284116abfaca226c
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -201,8 +201,8 @@ file safety:
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/nodes/case_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
+    reviewed_by: josh.pencheon
+    safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
   test/nodes/code_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -233,8 +233,8 @@ file safety:
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/nodes/patient_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
+    reviewed_by: josh.pencheon
+    safe_revision: ed542274fcb2a9ad9982825fc42f2ab5948d73b6
   test/nodes/perinatal_hospital_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/patient.treetop

@@ -13,7 +13,7 @@ module Canql
     end
 
     rule category
-      space category:('eurocat red' / 'eurocat amber' / 'eurocat green' / 'eurocat') word_break <Nodes::Patient::CategoryNode>
+      space category:('eurocat amber and green' / 'eurocat red and amber' / 'eurocat red' / 'eurocat amber' / 'eurocat green' / 'eurocat') word_break <Nodes::Patient::CategoryNode>
     end
 
     rule expected_keyword

data/lib/canql/nodes/patient.rb

@@ -30,6 +30,8 @@ module Canql #:nodoc: all
           return 'eurocat_red' if 'eurocat red' == category.text_value
           return 'eurocat_amber' if 'eurocat amber' == category.text_value
           return 'eurocat_green' if 'eurocat green' == category.text_value
+          return 'eurocat_amber_green' if 'eurocat amber and green' == category.text_value
+          return 'eurocat_red_amber' if 'eurocat red and amber' == category.text_value
 
           category.text_value
         end

data/lib/canql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic