canql 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f586e9d223aea47683f240305b7d9758216117f02f15c492f383b4bbcc37b8e0
-  data.tar.gz: 1141e02d6e8480d024e56dc1d0065b30f39d957d0a3b2243f6348b9ab9cd54b6
+  metadata.gz: 7fe418e0e14b173d9d9034224dc47c109d3fa6c49ca7d4787cba069aeac13fd5
+  data.tar.gz: 2bdd3fc53230d07714d58d6b03e4d787fdc564ad42c7278f77877a8ada72a709
 SHA512:
-  metadata.gz: 57a5c3751535acc940f8f44bc7b8a39e2e693e0e9d53e93e70ed79605f1d5b8f4020c91977c37314bb818afe8437d40a4d710484d7e58bf99965041b7fd9de78
-  data.tar.gz: e325a15f297ce5a9d89538e39b945eb1211b703cb02eddc8856f2c1d8fe595b52238b35c7946e71e9fab2305ae994599bbbfa0b55a2bf63dcbf626dd67887981
+  metadata.gz: 2aa9bad734c41ae1a9e40c5eee1685d81d23342def83496141f8b996e599aacc5d2fcd0f73d0678e5372045d47237deb06fca4ed8cd35ca0a6a80b7ebec2d6dc
+  data.tar.gz: 0e67202d76e7d32fa80c0409a125245fedc898263b35b6c049350480f4ff6197f95cc75cae7970077c0ee7c9569e992647c5e83db7a966f8d3a77bd165fa63b6

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 4.1.0 / 2020-03-19
+### Added
+* Added filters for EUROCAT RAG rating (#39)
+
 ## 4.0.1 / 2019-10-29
 ### Fixed
 * Relax `chronic` dependency

data/canql.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'ndr_dev_support', '~> 3.1', '>= 3.1.3'
+  spec.add_development_dependency 'ndr_dev_support', '~> 5.6'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'terminal-notifier-guard' if RUBY_PLATFORM =~ /darwin/

data/code_safety.yml

@@ -18,8 +18,8 @@ file safety:
     safe_revision: 8adb767031a19aa6b3cea3f1cb05b4a9bcc964f3
   CHANGELOG.md:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 03c6aaec256bc3b0500f422e0f97f84804bfeffa
+    reviewed_by: timgentry
+    safe_revision: cef1ddd804f00d7639947464f2f0e5660e9f0fc7
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -50,8 +50,8 @@ file safety:
     safe_revision: 6a666fcabe027056b1c774b2eabb3fdf686911d2
   canql.gemspec:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: c3a0f7aae0658ce6236b82c715a4ace57e4bf513
+    reviewed_by: timgentry
+    safe_revision: 6cb13f43b4353ab7c90ff0406ec13ac169b8e64c
   lib/canql.rb:
     comments: 
     reviewed_by: timgentry
@@ -94,13 +94,13 @@ file safety:
   lib/canql/grammars/main.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
-    reviewed_by: josh.pencheon
-    safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+    reviewed_by: timgentry
+    safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
   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: e258a1a403b7474f8919b1a76127f9ad71a640ad
+    reviewed_by: timgentry
+    safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
   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: josh.pencheon
-    safe_revision: e258a1a403b7474f8919b1a76127f9ad71a640ad
+    reviewed_by: timgentry
+    safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
   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: josh.pencheon
-    safe_revision: 03c6aaec256bc3b0500f422e0f97f84804bfeffa
+    reviewed_by: timgentry
+    safe_revision: cef1ddd804f00d7639947464f2f0e5660e9f0fc7
   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: josh.pencheon
-    safe_revision: e258a1a403b7474f8919b1a76127f9ad71a640ad
+    reviewed_by: timgentry
+    safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
   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: josh.pencheon
-    safe_revision: e258a1a403b7474f8919b1a76127f9ad71a640ad
+    reviewed_by: timgentry
+    safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
   test/nodes/perinatal_hospital_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -249,8 +249,8 @@ file safety:
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/parser_test.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: e258a1a403b7474f8919b1a76127f9ad71a640ad
+    reviewed_by: timgentry
+    safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/main.treetop

@@ -59,11 +59,11 @@ grammar Canql
   end
 
   rule case_preconditions
-    registry / gender / outcome / primacy
+    registry / gender / outcome / primacy / category
   end
 
   rule patient_preconditions
-     gender / primacy
+     gender / primacy / category
   end
 
   rule case_additional_conditions

data/lib/canql/grammars/patient.treetop

@@ -12,6 +12,10 @@ module Canql
       space primacy:('primary' / 'alias' ) word_break <Nodes::Patient::PrimacyNode>
     end
 
+    rule category
+      space category:('eurocat red' / 'eurocat amber' / 'eurocat green' / 'eurocat') word_break <Nodes::Patient::CategoryNode>
+    end
+
     rule expected_keyword
       space ('expected' / 'due') word_break
     end

data/lib/canql/nodes/patient.rb

@@ -21,6 +21,20 @@ module Canql #:nodoc: all
         end
       end
 
+      module CategoryNode
+        def meta_data_item
+          { 'patient.category' => { Canql::EQUALS => clean_category } }
+        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
+
+          category.text_value
+        end
+      end
+
       module FieldExists
         FIELDS = {
           'date of birth':          { patient: 'birthdate', mother: 'birthdate' },

data/lib/canql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -154,20 +154,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '5.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '5.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement