canql 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c11d88eb61eaebcc1fee8bbcf02c3528a26799b7a62800971c34517619b98668
-  data.tar.gz: ac2d55b1fcf88636a1ccfdf3a2f11b4d4ef7e878ba886fceddd2dcdce26a6fb6
+  metadata.gz: ae3a56f2f18e07ba44242415dba078f1a95b7b23f151964a7d4609df6fd1de6a
+  data.tar.gz: 4b3ed23c5649700c5ad282fa59bc08f5b74b1e57cff818ed776bfc4ce3c1b178
 SHA512:
-  metadata.gz: 767d7da5878ba53e624db9090a0bce25ee2b17c039b5ecce4bbb65126f0d32bc988851f7b31e41be235f9911919051a07a7e5478b54d11bc0aefdf7c6a939389
-  data.tar.gz: bd874eb46ba2641c84ba40d2a521db212b218879cf6e789777514d36bea0672fd9b38e24804ca4a86b54b722c62b5a7a89003d3040cd8179991b134ebb7543ab
+  metadata.gz: cb9f4a4566ac1489921fa2e154abf67fdda5453f19572331e06829a7195204dd81376221ae7b44cce4fc4e6f16b817d40cb3259aa3e91626094432412f09e6f5
+  data.tar.gz: 8f4151afa3555cbfdcd168131c893924c1edadeb5fb8d017a3ea1725d65f006c9040c68e9438285bbf76fa7f4382d64d2326f11abeb013e61877b77b90102fa0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
-* no relevent changes
+* no relvent changes
+
+
+## 5.3.0 / 2021-03-05
+
+* Added new FASP case RAG rating filters (#66)
 
 ## 5.2.0 / 2021-03-04
 

data/code_safety.yml

@@ -27,7 +27,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: ollietulloch
-    safe_revision: 9af6ea0bcdac493fe5f31d62b504b285658867c4
+    safe_revision: 64a8f1007fe57afd5bd886e6b02b17b7a6e874c4
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -107,8 +107,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: josh.pencheon
-    safe_revision: 7490099869e368dcd5c26ded11eb90229baf4cae
+    reviewed_by: ollietulloch
+    safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
   lib/canql/grammars/perinatal_hospital.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -165,8 +165,8 @@ file safety:
     safe_revision: 361dea5dc6d64bdb7b03434dd2878f8c3b128c95
   lib/canql/nodes/patient.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 7490099869e368dcd5c26ded11eb90229baf4cae
+    reviewed_by: ollietulloch
+    safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
   lib/canql/nodes/perinatal_hospital.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -194,7 +194,7 @@ file safety:
   lib/canql/version.rb:
     comments: 
     reviewed_by: ollietulloch
-    safe_revision: 9af6ea0bcdac493fe5f31d62b504b285658867c4
+    safe_revision: 64a8f1007fe57afd5bd886e6b02b17b7a6e874c4
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: ollietulloch
@@ -249,8 +249,8 @@ file safety:
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/nodes/patient_test.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 43425805d9ad4a99e63eeb5d50495fa14eaa053b
+    reviewed_by: ollietulloch
+    safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
   test/nodes/perinatal_hospital_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/patient.treetop

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

data/lib/canql/nodes/patient.rb

@@ -27,11 +27,11 @@ module Canql #:nodoc: all
         end
 
         def clean_category
-          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
+          if category.text_value.start_with?('eurocat ') || category.text_value.start_with?('fasp ')
+            filter_value = category.text_value.gsub(/( )/, '_').downcase.gsub(/(_and_)/, '_')
+            filter_value = 'fasp_red_amber' if filter_value == 'fasp_amber_red'
+            return filter_value
+          end
 
           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 = '5.2.0'
+  VERSION = '5.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic