canql 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 935d92e9e0fa6135540db6a7acfdf127d9fdf395ddbd8f1c93f328b8e708983e
-  data.tar.gz: 0b55234d83f824b71c66beb3e761ce0687393bb9e2695aaa21bda055883cdec0
+  metadata.gz: ccf9f4bc0d1fdda618a088af0682af50a2a1b54bed60509b1fb6df12e13f3edb
+  data.tar.gz: b6f8736ccfe310b7ca819ac75bb477dc36429e2b97df80ff5687a9bb6ea32aa0
 SHA512:
-  metadata.gz: c97e4d469ee36061bfd75b6c27c28ec47ed63c626bfd1412a84e9d0139cc2510f2d8c429b5793eded4e174cb9ec4a7401664492ae8dc52e2bddc6ca9382bf147
-  data.tar.gz: 6f0998e8c64dd33322c70ca72c610a5b69c96956758e94a646489bf4eb14f7ee892bd268f01e6809e0cf42356591e8cedb7a6b15ffec4529001c56b000c9c191
+  metadata.gz: 583b399bd9d25da314ae8d83e005566356f439b1f5a655544756bc05e7d6a5bd3ca9ece4b37a9e93124e89571da4d112c36f98143d8e93af39657fac356822f0
+  data.tar.gz: e76786b41521bbb50affb87a6809fd7343f84eb906fe9f3074f96a105524d85a69e294f8b9e207319a35c0d5a420eaa13161b0969e876d5b2069aed7f52e9f0b

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 4.0.0 / 2019-09-06
+### Changed
+* Added case filters for delivery and booking postcode fields and removed all simple postcode field filters (#36)
+
+### Added
+* Added fasp and fasp plus code groups (#37)
+
 ## 3.0.0 / 2019-06-04
 ### Changed
 * Added new branch of CANQL for querying all patient not just child patients - modifies DIR (#29)

data/code_safety.yml

@@ -15,11 +15,11 @@ file safety:
   ".travis.yml":
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 16abb8206a3d36c7532427cd7137df79d2733d1d
+    safe_revision: 8adb767031a19aa6b3cea3f1cb05b4a9bcc964f3
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: ff70470e8fa9613a6968a7579b206b6107ef5312
+    safe_revision: ba4bdef05af213f77898488fc975407114c88e82
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -73,7 +73,7 @@ file safety:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
     reviewed_by: josh.pencheon
-    safe_revision: 73a7dac17b20fcc77bcbd9d38777c8aa4d524816
+    safe_revision: b7778ca1d536022a807420cc9fe0f1c2df7f73ef
   lib/canql/grammars/batch_types.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -100,7 +100,7 @@ file safety:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
     reviewed_by: josh.pencheon
-    safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+    safe_revision: e258a1a403b7474f8919b1a76127f9ad71a640ad
   lib/canql/grammars/perinatal_hospital.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -130,7 +130,7 @@ file safety:
   lib/canql/nodes/anomaly.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 73a7dac17b20fcc77bcbd9d38777c8aa4d524816
+    safe_revision: b7778ca1d536022a807420cc9fe0f1c2df7f73ef
   lib/canql/nodes/batch_types.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -154,7 +154,7 @@ file safety:
   lib/canql/nodes/patient.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 38369f1f26167f396d1705ec88611103d5262726
+    safe_revision: e258a1a403b7474f8919b1a76127f9ad71a640ad
   lib/canql/nodes/perinatal_hospital.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -178,7 +178,7 @@ file safety:
   lib/canql/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: ff70470e8fa9613a6968a7579b206b6107ef5312
+    safe_revision: ba4bdef05af213f77898488fc975407114c88e82
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -202,11 +202,11 @@ file safety:
   test/nodes/case_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+    safe_revision: e258a1a403b7474f8919b1a76127f9ad71a640ad
   test/nodes/code_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
+    reviewed_by: josh.pencheon
+    safe_revision: b7778ca1d536022a807420cc9fe0f1c2df7f73ef
   test/nodes/e_base_records_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -234,7 +234,7 @@ file safety:
   test/nodes/patient_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 33597126dbd2f720bd867fc357003634b73e6d0a
+    safe_revision: e258a1a403b7474f8919b1a76127f9ad71a640ad
   test/nodes/perinatal_hospital_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -250,7 +250,7 @@ file safety:
   test/parser_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+    safe_revision: e258a1a403b7474f8919b1a76127f9ad71a640ad
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/anomaly.treetop

@@ -43,7 +43,7 @@ module Canql
     end
 
     rule code_group
-      ('fasp' / 'structural' / 'trisomy') <Nodes::Anomaly::SingleCodeGroupNode>
+      ('fasp plus' / 'plus' / 'fasp' / 'structural' / 'trisomy') <Nodes::Anomaly::SingleCodeGroupNode>
     end
   end
 end

data/lib/canql/grammars/patient.treetop

@@ -42,7 +42,8 @@ module Canql
 
     rule case_field_names
       patient_field_name:(
-        'date of birth' / 'dob' / 'nhs number' / 'postcode' / 'birth weight' /
+        'date of birth' / 'dob' / 'nhs number' / 'delivery postcode' /
+        'booking postcode' / 'birth weight' /
         'place of delivery' / 'sex' / 'outcome' / 'edd' /
         'expected delivery date' / 'booking hospital' / 'screening status'
       )
@@ -50,7 +51,7 @@ module Canql
 
     rule patient_field_names
       patient_field_name:(
-        'date of birth' / 'dob' / 'nhs number' / 'postcode' / 'sex'
+        'date of birth' / 'dob' / 'nhs number' / 'sex'
       )
     end
 

data/lib/canql/nodes/anomaly.rb

@@ -25,6 +25,7 @@ module Canql #:nodoc: all
           end
           anomaly_hash['icd_codes'] = code_filter[:icd_code] if code_filter[:icd_code].present?
           return anomaly_hash if code_filter[:code_group].blank?
+
           anomaly_hash['code_groups'] = code_filter[:code_group]
           anomaly_hash
         end
@@ -48,11 +49,13 @@ module Canql #:nodoc: all
         def code_type(code)
           return :icd_code if code.respond_to?(:to_code) && code.to_code.present?
           return :code_group if code.respond_to?(:to_code_group) && code.to_code_group.present?
+
           raise 'Unable to find code type'
         end
 
         def code_value(code)
           return code.to_code if :icd_code == code_type(code)
+
           code.to_code_group
         end
 
@@ -67,6 +70,7 @@ module Canql #:nodoc: all
             code_filters[:icd_code] = { Canql::BEGINS => code_array[:icd_code] }
           end
           return code_filters if code_array[:code_group].blank?
+
           code_filters[:code_group] = { Canql::EQUALS => code_array[:code_group] }
           code_filters
         end
@@ -86,6 +90,7 @@ module Canql #:nodoc: all
       module AdditionalCodeNode
         def code_type
           return :icd_code if anomalies_icd_code.respond_to?(:to_code)
+
           :code_group
         end
 
@@ -106,7 +111,7 @@ module Canql #:nodoc: all
 
       module SingleCodeGroupNode
         def to_code_group
-          text_value.upcase
+          text_value.gsub(/( )/, '_').upcase
         end
       end
     end

data/lib/canql/nodes/patient.rb

@@ -25,7 +25,8 @@ module Canql #:nodoc: all
         FIELDS = {
           'date of birth':          { patient: 'birthdate', mother: 'birthdate' },
           'dob':                    { patient: 'birthdate', mother: 'birthdate' },
-          'postcode':               { patient: 'postcode',  mother: 'postcode'  },
+          'delivery postcode':      { patient: 'delivery_postcode' },
+          'booking postcode':       { patient: 'booking_postcode' },
           'nhs number':             { patient: 'nhsnumber', mother: 'nhsnumber' },
           'birth weight':           { patient: 'weight' },
           'place of delivery':      { patient: 'placeofdelivery' },

data/lib/canql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic