canql 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f708fda533a83ddd144a192462447f8fe23d3fb1
-  data.tar.gz: 4540092c6a500eb725a5412cba8d22fb7a21d881
+  metadata.gz: fa1d31ca5b1532394ba5988520cf393d0d64a47a
+  data.tar.gz: efef75eab310ba0284b6c23fd047ed4febf6ccc1
 SHA512:
-  metadata.gz: 3556bec1bd958b22fabb14b238e27f98bc393bdbb323d7ec5da0249a072407eb5b661a25e59d3a109f4ec0844d0a2d89b041ae0df149cdae8df7c409b180f4e7
-  data.tar.gz: dc8c7218e5dd4907d81e2516ff115ef3b4fcee400917d9686207d6a2f7e61f3199ef417e39b726d00151a8a05ea333248fb5a7e6c06d7d937708fef927c23848
+  metadata.gz: 2acbf6e64b433c5d33f7dfd5eb4ae7c39fbef1ebab51c496331643e1510239958a4a4e7846dc168b6b5fc262064f28f349fc1eb65d26cb07e0093241ed69ec30
+  data.tar.gz: 24623f83a1f7dcede1ac8a37c23d464f874f1c438968c64d0f3fce3b6cf3810074cda026de2814689205c11fcda2196f932f20f319ea50abf60da8ebf18c0235

data/code_safety.yml

@@ -91,8 +91,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: a1686a3905ee6d7ebc8c5b1786efba4f8df42a2d
+    reviewed_by: timgentry
+    safe_revision: 1b73bdcf483c6e44979e183c5873a1f0612a49a1
   lib/canql/grammars/registry.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -126,7 +126,7 @@ file safety:
   lib/canql/nodes/e_base_records.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
+    safe_revision: 1b73bdcf483c6e44979e183c5873a1f0612a49a1
   lib/canql/nodes/main.rb:
     comments: 
     reviewed_by: timgentry
@@ -153,8 +153,8 @@ file safety:
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/version.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: fd9111207d7d42f278568eddbc677789219f0109
+    reviewed_by: timgentry
+    safe_revision: df59353b99c2536124308c7c137e8f0587676200
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: timgentry
@@ -187,6 +187,10 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
+  test/nodes/mother_e_base_records_test.rb:
+    comments: 
+    reviewed_by: timgentry
+    safe_revision: 1b73bdcf483c6e44979e183c5873a1f0612a49a1
   test/nodes/patient_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/patient.treetop

@@ -53,7 +53,7 @@ module Canql
     end
 
     rule mother_with_conditions
-      patient_field_existance
+      patient_field_existance / action_or_ebr
     end
   end
 end

data/lib/canql/nodes/e_base_records.rb

@@ -4,13 +4,14 @@ module Canql #:nodoc: all
   module Nodes
     module EBaseRecordsNode
       def meta_data_item
+        subject = reverse_scan_for_marker(:subject) == 'mother' ? '.mother' : ''
         filter =
           if types.empty?
             { Canql::ALL => true }
           else
             { Canql::EQUALS => types.to_list }
           end
-        { 'unprocessed_records.sources' => filter }
+        { "unprocessed_records#{subject}.sources" => filter }
       end
     end
 
@@ -33,31 +34,37 @@ module Canql #:nodoc: all
 
     module AllOrNoneActionsNode
       def meta_data_item
+        subject = reverse_scan_for_marker(:subject) == 'mother' ? '.mother' : ''
         action_type = all_or_none_action_type.text_value.upcase.strip
-        { 'action.actioninitiated' => { Canql::ALL => action_type == 'AN OUTSTANDING' } }
+        { "action#{subject}.actioninitiated" => { Canql::ALL => action_type == 'AN OUTSTANDING' } }
       end
     end
 
     module ActionsNode
       def meta_data_item
-        { 'action.actioninitiated' => { Canql::EQUALS => action_type.text_value.upcase.strip } }
+        subject = reverse_scan_for_marker(:subject) == 'mother' ? '.mother' : ''
+        { "action#{subject}.actioninitiated" => {
+          Canql::EQUALS => action_type.text_value.upcase.strip
+        } }
       end
     end
 
     module ActionProviderCodeNode
       def meta_data_item
         # default to provider
+        subject = reverse_scan_for_marker(:subject) == 'mother' ? '.mother' : ''
         key = 'providercode'
-        { "action.#{key}" => { Canql::EQUALS => code.text_value.upcase } }
+        { "action#{subject}.#{key}" => { Canql::EQUALS => code.text_value.upcase } }
       end
     end
 
     module ActionProviderNameNode
       def meta_data_item
         # default to provider
+        subject = reverse_scan_for_marker(:subject) == 'mother' ? '.mother' : ''
         key = provider_type.text_value == 'cancer network' ? 'cn_ukacrname' : 'providername'
         {
-          "action.#{key}" => {
+          "action#{subject}.#{key}" => {
             Canql::BEGINS => short_desc.text_value.upcase,
             :interval => interval
           }

data/lib/canql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic