canql 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 876c07af5b28f571465a44fd8093d648f5a0323e991a41a440428dd08d369eec
-  data.tar.gz: 4440b547119f18e7e815c76753695decd9ebe3f134f9bd3ff04fc099b70e913c
+  metadata.gz: 38321557e5517c77caf018f023577752e98fe518d41616415c4e49b7bb5b6d8f
+  data.tar.gz: 663c6544c8b51686bec057544c3ec98481a0b2950443271a6ab3ac09d11c371f
 SHA512:
-  metadata.gz: 3422683985fe7a7708d596638331e745dc11ec864dd38f188b939572f51de773097f0dc628003036304753273ae32015c8bf56153bd6f513b51bf3a53fe0a93f
-  data.tar.gz: b6ee6b275bca9282c72ad00e052e48842f5d112cd57aaa95df787939aa638e51450c6ae63865c95c81fab09f7debb130dead8ebb74a6ec1e6fee2860390c0aed
+  metadata.gz: 7fd854a998a4216d62dd15577fb1de94574ee403f675f16d94235f7e298a6a08df05d4ebc7adb5593bdac37ff33b40a61a10526aa356c798b3e5fed84bf98c79
+  data.tar.gz: 7a7cf98ed521dca34ea8f8059e83256253e0d514438cf38d5e17b2914581913a96e9c31fe84992d4a47d08756fb2910562ed22b718e9888dfa645592c7373041

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 2.9.0 / 2019-05-14
+### Added
+* Add filter for processing date for unprocessed records (#28)
+
 ## 2.8.0 / 2019-04-09
 ### Added
 * Added filtering by anomaly screening status (#25)

data/code_safety.yml

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 6275607eaf61d9f767977c4e1984c57bb3080984
+    safe_revision: 48060910ebf28f1ee88fe0faa4e7bd70daeaa3c6
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -86,7 +86,7 @@ file safety:
   lib/canql/grammars/e_base_records.treetop:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c431b8a476b84d077e9c39a2a13c2b17a296773d
+    safe_revision: 4805609963f75639e2444df8f42d2d6d65005b7c
   lib/canql/grammars/genetic_test.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -142,7 +142,7 @@ file safety:
   lib/canql/nodes/e_base_records.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c431b8a476b84d077e9c39a2a13c2b17a296773d
+    safe_revision: 4805609963f75639e2444df8f42d2d6d65005b7c
   lib/canql/nodes/genetic_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -178,7 +178,7 @@ file safety:
   lib/canql/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 6275607eaf61d9f767977c4e1984c57bb3080984
+    safe_revision: 48060910ebf28f1ee88fe0faa4e7bd70daeaa3c6
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -206,7 +206,7 @@ file safety:
   test/nodes/e_base_records_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1892161f3c300f3b199aa318b3fe23a54dd80829
+    safe_revision: 4805609963f75639e2444df8f42d2d6d65005b7c
   test/nodes/genetic_tests_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -218,7 +218,7 @@ file safety:
   test/nodes/mother_e_base_records_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1892161f3c300f3b199aa318b3fe23a54dd80829
+    safe_revision: 4805609963f75639e2444df8f42d2d6d65005b7c
   test/nodes/patient_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/e_base_records.treetop

@@ -1,11 +1,11 @@
 module Canql
   grammar EBaseRecords
     rule action_or_ebr
-      and_keyword? action_and_ebr / all_or_none_actions / actions / e_base_records
+      and_keyword? action_and_ebr / all_or_none_actions / actions / e_base_records / processing_date
     end
 
     rule action_and_ebr
-      actions and_keyword e_base_records
+      actions and_keyword e_base_records processing_date?
     end
 
     rule e_base_records
@@ -24,6 +24,14 @@ module Canql
       ','? space? ('or' space)? batch_type <Nodes::MoreTypesNode>
     end
 
+    rule processing_date
+      space processing_date_keyword fuzzy_date <Nodes::ProcessingDateNode>
+    end
+
+    rule processing_date_keyword
+      'dated' ' for processing'?
+    end
+
     rule with_keyword
       space 'with' word_break
     end

data/lib/canql/nodes/e_base_records.rb

@@ -72,5 +72,19 @@ module Canql #:nodoc: all
         }
       end
     end
+
+    module ProcessingDateNode
+      def meta_data_item
+        subject = reverse_scan_for_marker(:subject) == 'mother' ? '.mother' : ''
+        range = fuzzy_date.to_daterange
+        {
+          "unprocessed_records#{subject}.processing_date" => {
+            Canql::LIMITS => [
+              range.date1.try(:to_date).try(:iso8601), range.date2.try(:to_date).try(:iso8601)
+            ]
+          }
+        }
+      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.8.0'
+  VERSION = '2.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -278,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Congenital Anomaly Natural Query Language