canql 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0bf9c1067bbfdecf14c5e4835bb5a2eadca68e718d3e14280e84838f75b4ffc8
-  data.tar.gz: 8716857a8c0fe1928c7eda79e663866f962e8488957ffcf16db55c34526d919c
+SHA1:
+  metadata.gz: ec5860921323a9b19adb7e31a3e3df34f9154572
+  data.tar.gz: 5af7802c15c0d787c87dfc48dcb4e2fc93361093
 SHA512:
-  metadata.gz: 03b0e5ccde1478aa7a23c4bf3a6da94185c4e32ad575ca919a3d6cfb4b94a0c2928d3eba302df2641be1fb4c506e1bc467b8c4ff9756ec0aed2c54db7ff66506
-  data.tar.gz: 72322bf3fc7fa52c02b2935a19d3240d3140b204916f4d6f4cccd199c47e2f95e3d1d42905bd27e61b1b871754e3ab9ac446def16b6a40f312712195066c07db
+  metadata.gz: 2d05ac765951510e9746f4f65e4fddd9778d634b7999bc1719fcd770b6695f5e9ef6b4c2eecc8cfee3411c7bda9462ad5e804f97b96ecec43f3e282fda533e37
+  data.tar.gz: d52b09c8edaaaa4e4f6c365a73d9481c64f6f3909aa8dce988dcd70a79204460257bb329a9752501bbe6a6962fb10ed328bc951cf900a5ffda1d210d0dba2710

data/README.md

@@ -50,7 +50,7 @@ would output:
 
 The parser is case insensitive. An example of an almost fully involved CANQL query is:
 
-> First 27 Male Liveborn Thames Cases Due between 20/06/2015 and 25/06/2015 and Born on 22/06/2015 and that Died on 07/07/2015 with Prenatal Suspected Q20 Anomalies and Postnatal Tests and Missing Postcode and Date of Birth and QA Action and Unprocessed paediatric records and Mother Born between 01/10/1990 and 10/01/1999 and who Died on 01/08/2015 with Populated Postcode and NHS Number
+> First 27 Male Liveborn Thames Cases Due between 20/06/2015 and 25/06/2015 and Born on 22/06/2015 and that Died on 07/07/2015 with Suspected Prenatal Q20 Anomalies and Postnatal Tests and Missing Postcode and Date of Birth and QA Action and Unprocessed paediatric records and Mother Born between 01/10/1990 and 10/01/1999 and who Died on 01/08/2015 with Populated Postcode and NHS Number
 
 Please see the tests for many more examples.
 

data/code_safety.yml

@@ -31,7 +31,7 @@ file safety:
   README.md:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d3ea041b101e40e6847608705ecc2c3f6e0ca03f
+    safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
   Rakefile:
     comments: 
     reviewed_by: timgentry
@@ -68,8 +68,8 @@ file safety:
   lib/canql/grammars/anomaly.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
-    reviewed_by: josh.pencheon
-    safe_revision: 03d2f9e0a1d3c178241a28e20bcd222165027e01
+    reviewed_by: timgentry
+    safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
   lib/canql/grammars/batch_types.treetop:
     comments: 
     reviewed_by: timgentry
@@ -114,7 +114,7 @@ file safety:
   lib/canql/nodes/anomaly.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
+    safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
   lib/canql/nodes/batch_types.rb:
     comments: 
     reviewed_by: timgentry
@@ -153,12 +153,12 @@ file safety:
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/version.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 518365b3f1ffc28debccb6bcef055b4329e90739
+    reviewed_by: timgentry
+    safe_revision: 78fc6f6aaee47fc11b073a8d8d975b4f7c9101cc
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
+    safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
   test/canql_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -177,8 +177,8 @@ file safety:
     safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
   test/nodes/code_test.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 03d2f9e0a1d3c178241a28e20bcd222165027e01
+    reviewed_by: timgentry
+    safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
   test/nodes/e_base_records_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -190,7 +190,7 @@ file safety:
   test/nodes/patient_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
+    safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
   test/nodes/registry_test.rb:
     comments: 
     reviewed_by: timgentry

data/lib/canql/grammars/anomaly.treetop

@@ -21,15 +21,19 @@ module Canql
     end
 
     rule more_anomalies_icd_codes
-      ','? space? ('or' space)? anomalies_icd_code <Nodes::Anomaly::AdditionalIcdCodeNode>
+      ','? space? ('or' space)? anomalies_icd_code <Nodes::Anomaly::AdditionalCodeNode>
     end
 
     rule anomalies_icd_code
-      icd_code_name <Nodes::Anomaly::SingleIcdCodeNode>
+      (icd_code_name / code_group)
     end
 
     rule icd_code_name
-      [a-z] [0-9] 1..3
+      [a-z] [0-9] 1..3 <Nodes::Anomaly::SingleIcdCodeNode>
+    end
+
+    rule code_group
+      ('fasp' / 'structural' / 'trisomy') <Nodes::Anomaly::SingleCodeGroupNode>
     end
   end
 end

data/lib/canql/nodes/anomaly.rb

@@ -16,7 +16,9 @@ module Canql #:nodoc: all
           anomaly_hash = { 'exists' => existance_filter }
           anomaly_hash['type'] = anomaly_type_filter if anomaly_type.present?
           anomaly_hash['status'] = anomaly_status_type_filter if anomaly_status_type.present?
-          anomaly_hash['icd_codes'] = code_filter if code_filter.any?
+          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
 
@@ -32,23 +34,56 @@ module Canql #:nodoc: all
           { Canql::EQUALS => anomaly_status_type }
         end
 
+        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
+
+        def prepare_code_filters(code_array)
+          code_array[:icd_code].flatten!
+          code_array[:icd_code].delete_if(&:blank?)
+          code_array[:code_group].flatten!
+          code_array[:code_group].delete_if(&:blank?)
+
+          code_filters = {}
+          if code_array[:icd_code].any?
+            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
+
         def code_filter
           return {} if code_data.text_value.blank?
 
-          code_array = [code_data.first.to_code]
+          code_arrays = { icd_code: [], code_group: [] }
+          code_arrays[code_type(code_data.first)] << code_value(code_data.first)
           code_data.rest.elements.each do |code|
-            code_array << code.try(:to_code)
+            code_arrays[code_type(code)] << code_value(code)
           end
-          code_array.flatten!
-          code_array.delete_if(&:blank?)
-
-          { Canql::BEGINS => code_array }
+          prepare_code_filters(code_arrays)
         end
       end
 
-      module AdditionalIcdCodeNode
+      module AdditionalCodeNode
+        def code_type
+          return :icd_code if anomalies_icd_code.respond_to?(:to_code)
+          :code_group
+        end
+
         def to_code
-          anomalies_icd_code.to_code
+          anomalies_icd_code.to_code if :icd_code == code_type
+        end
+
+        def to_code_group
+          anomalies_icd_code.to_code_group if :code_group == code_type
         end
       end
 
@@ -57,6 +92,12 @@ module Canql #:nodoc: all
           text_value.upcase
         end
       end
+
+      module SingleCodeGroupNode
+        def to_code_group
+          text_value.upcase
+        end
+      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.0.1'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Congenital Anomaly Natural Query Language