canql 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcf2d37654027295939edf58f998fcc355b899da
-  data.tar.gz: 5f13b67d937e9e5f7517f06a7cd7d296d82e87df
+  metadata.gz: 908424649a7d28653da8efecfbadc19b5d7fe4d3
+  data.tar.gz: 43ac92a2d6a232e5ea830314cdee6f1c9fd62463
 SHA512:
-  metadata.gz: d8adc584f9bc0c2a66c80217875d838591b38838e2a9a1ef1da96b42445877db37f4b3a829f2b67601e1a3d6d616592738d62844a1b2f9e91ff6b29e714bb6ae
-  data.tar.gz: 0d591c714d021a59182f9fbd129734fd59e07496c9bfeb24f586614f894ae9ce655fbb5559294e3d75ab83a9bcc6b971a299f77c340fe1f37bbf7cb5c4986255
+  metadata.gz: a68ca31580f89e796ef63917ce02ef7d40c52e5f07ce006977f641f8a1a15943e4f68fe9d61f021959cb9a09e1ab5fed5de14826ff8abf568a711e33524f3ae2
+  data.tar.gz: fdb25b3ebb45c2e1957dc42c51f45e66b0fba9507f6fc990336bae6796e5a1fda3963573d789c41589e558c3db108b17240f9d37f84ebb6926f2779b9fc9292f

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 Anomalies and Postnatal Tests and Missing Postcode and Date of Birth and Wait 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 Prenatal Anomalies and Postnatal Tests and Missing Postcode and Date of Birth and Check 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: cb1bd5162935d259f67a42044cbe5644fe6a76f8
+    safe_revision: 3951ebc4b8d0a4cf30f3ce048a4ce33ffccdbd26
   Rakefile:
     comments: 
     reviewed_by: timgentry
@@ -82,7 +82,7 @@ file safety:
   lib/canql/grammars/e_base_records.treetop:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 41d8f146c456e7bf252784476438574a9d283408
+    safe_revision: 1c30c1e78d86b74d747204ea40ae709ceaaf66b5
   lib/canql/grammars/main.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -122,11 +122,11 @@ file safety:
   lib/canql/nodes/dates.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 2346abb4435bf95cbe9b4d8c124123b9fefe60d6
+    safe_revision: 9b72e0c6f96aaa8b8d45e137bed846d76d357028
   lib/canql/nodes/e_base_records.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 1c30c1e78d86b74d747204ea40ae709ceaaf66b5
   lib/canql/nodes/main.rb:
     comments: 
     reviewed_by: timgentry
@@ -154,7 +154,7 @@ file safety:
   lib/canql/version.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: b67d28ae2648219607e40dc77d6aef846a64f647
+    safe_revision: 578a3f31d507cb2c73ea37c3cec14731a364f73c
   test/canql_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -174,7 +174,7 @@ file safety:
   test/nodes/e_base_rescords_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 1c30c1e78d86b74d747204ea40ae709ceaaf66b5
   test/nodes/main_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -182,7 +182,7 @@ file safety:
   test/nodes/patient_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 0bf684b681372d16145cae8c6bb831f1bb96f442
+    safe_revision: 9b72e0c6f96aaa8b8d45e137bed846d76d357028
   test/nodes/registry_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -194,7 +194,7 @@ file safety:
   test/parser_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: a923656606f581c220ea7af16196f2c68b5248f2
+    safe_revision: 3951ebc4b8d0a4cf30f3ce048a4ce33ffccdbd26
   test/test_helper.rb:
     comments: 
     reviewed_by: timgentry

data/lib/canql/grammars/e_base_records.treetop

@@ -1,7 +1,7 @@
 module Canql
   grammar EBaseRecords
     rule action_or_ebr
-      and_keyword? action_and_ebr / actions / e_base_records
+      and_keyword? action_and_ebr / all_or_none_actions / actions / e_base_records
     end
 
     rule action_and_ebr
@@ -41,13 +41,24 @@ module Canql
     end
 
     rule accepted_action
-     'wait' / 'proforma' / 'transfer' / 'notes' / 'child' /
-      'qa' / 'tag' / 'qc' / 'query' /
-      'moreinfo' / 'search' / 'check' / 'gpsearch'
+      'check' / 'coding_clinic' / 'coding_group' / 'complete' / 'reg_group' /
+      'scr_check' / 'scr_checked' / 'search' / 'technical'
+    end
+
+    rule all_or_none_actions
+      all_or_none_action_type action_keyword <Nodes::AllOrNoneActionsNode>
+    end
+
+    rule all_or_none_action_type
+      space all_or_none_action word_break
+    end
+
+    rule all_or_none_action
+      'no outstanding' / 'an outstanding'
     end
 
     rule action_keyword
-      space 'action' word_break
+      space 'action' 's'? word_break
     end
 
     rule at_keyword

data/lib/canql/nodes/dates.rb

@@ -48,7 +48,7 @@ module Canql #:nodoc: all
 
     module ChronicDateNode
       def to_daterange
-        chronic = Chronic.parse(text_value.to_s, context: :past, guess: false)
+        chronic = Chronic.parse(text_value.to_s, guess: false)
         if chronic.instance_of?(Chronic::Span)
           Daterange.new(chronic.begin, chronic.end - 1.day)
         else

data/lib/canql/nodes/e_base_records.rb

@@ -30,6 +30,13 @@ module Canql #:nodoc: all
       end
     end
 
+    module AllOrNoneActionsNode
+      def meta_data_item
+        action_type = all_or_none_action_type.text_value.upcase.strip
+        { 'action.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 } }

data/lib/canql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ndr_support