canql 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa1d31ca5b1532394ba5988520cf393d0d64a47a
-  data.tar.gz: efef75eab310ba0284b6c23fd047ed4febf6ccc1
+  metadata.gz: 5d930c202647a6b479bc8a7bea504b377155b2df
+  data.tar.gz: ca21ec21e84cecfab26ed4f687caa307d46d848b
 SHA512:
-  metadata.gz: 2acbf6e64b433c5d33f7dfd5eb4ae7c39fbef1ebab51c496331643e1510239958a4a4e7846dc168b6b5fc262064f28f349fc1eb65d26cb07e0093241ed69ec30
-  data.tar.gz: 24623f83a1f7dcede1ac8a37c23d464f874f1c438968c64d0f3fce3b6cf3810074cda026de2814689205c11fcda2196f932f20f319ea50abf60da8ebf18c0235
+  metadata.gz: 3bdfc6f29b5fcf385d936fdf14d6f7b6efcf192bbbdd7c98bc77f9448e02feac0acc3668bf7f76f33d64c3b8678fbd799c41fcadc38927949656a2d107bddbf8
+  data.tar.gz: 3d237636b1e26aa131ee3192ca7e00f2e6fd0ed83b3548d7a796236293d674eabf9a36de6a1382c17f05f938be7628c85441ad6dd43b65828f4cf33ae39918d2

data/code_safety.yml

@@ -58,8 +58,8 @@ file safety:
     safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
   lib/canql/grammars.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
+    reviewed_by: josh.pencheon
+    safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
   lib/canql/grammars/age.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -83,11 +83,15 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: 03f7a8fbee06a947e60bc554dcc1d1311c5632ac
+  lib/canql/grammars/genetic_test.treetop:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
   lib/canql/grammars/main.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
+    reviewed_by: josh.pencheon
+    safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
   lib/canql/grammars/patient.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -105,8 +109,8 @@ file safety:
     safe_revision: c39d24bb500719971969762e94545e82866bf92f
   lib/canql/nodes.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
+    reviewed_by: josh.pencheon
+    safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
   lib/canql/nodes/age.rb:
     comments: 
     reviewed_by: timgentry
@@ -127,10 +131,14 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: 1b73bdcf483c6e44979e183c5873a1f0612a49a1
+  lib/canql/nodes/genetic_test.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
   lib/canql/nodes/main.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: c39d24bb500719971969762e94545e82866bf92f
+    reviewed_by: josh.pencheon
+    safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
   lib/canql/nodes/patient.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -153,8 +161,8 @@ file safety:
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/version.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: df59353b99c2536124308c7c137e8f0587676200
+    reviewed_by: josh.pencheon
+    safe_revision: 60f7281fd6ef911b932992b2c965c6f8ace182c5
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: timgentry
@@ -183,6 +191,10 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
+  test/nodes/genetic_tests_test.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
   test/nodes/main_test.rb:
     comments: 
     reviewed_by: timgentry

data/lib/canql/grammars/genetic_test.treetop

@@ -0,0 +1,15 @@
+module Canql
+  grammar GeneticTest
+    rule genetic_tests
+      and_keyword? existance_modifier:genetic_tests_no_keyword? genetic_tests_keyword <Nodes::GeneticTest::WithCondition>
+    end
+
+    rule genetic_tests_no_keyword
+      space ('no' / 'some') word_break
+    end
+
+    rule genetic_tests_keyword
+      space 'genetic tests' word_break
+    end
+  end
+end

data/lib/canql/grammars/main.treetop

@@ -2,6 +2,7 @@ grammar Canql
   include Registry
   include Patient
   include Anomaly
+  include GeneticTest
   include TestResult
   include Dates
   include EBaseRecords
@@ -97,6 +98,6 @@ grammar Canql
   end
 
   rule with_conditions
-     anomalies / test_results / patient_field_existance / mother_conditions / action_or_ebr
+     anomalies / genetic_tests / test_results / patient_field_existance / mother_conditions / action_or_ebr
   end
 end

data/lib/canql/grammars.rb

@@ -7,6 +7,7 @@ Treetop.load File.expand_path('grammars/dates', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/anomaly', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/batch_types', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/e_base_records', File.dirname(__FILE__))
+Treetop.load File.expand_path('grammars/genetic_test', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/test_result', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/patient', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/registry', File.dirname(__FILE__))

data/lib/canql/nodes/genetic_test.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Canql #:nodoc: all
+  module Nodes
+    module GeneticTest
+      module WithCondition
+        def to_genetic_test
+          genetic_test_hash = { 'exists' => existance_filter }
+          genetic_test_hash
+        end
+
+        def existance_filter
+          { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
+        end
+      end
+    end
+  end
+end

data/lib/canql/nodes/main.rb

@@ -20,14 +20,17 @@ module Canql #:nodoc: all
       def meta_data_item
         conditions = {}
         anomalies = []
+        genetic_tests = []
         test_results = []
 
         post.elements.each do |element|
           anomalies << element.to_anomaly if element.respond_to?(:to_anomaly)
+          genetic_tests << element.to_genetic_test if element.respond_to?(:to_genetic_test)
           test_results << element.to_test_result if element.respond_to?(:to_test_result)
         end
 
         conditions['anomalies'] = { Canql::ALL => anomalies } if anomalies.any?
+        conditions['genetic_tests'] = { Canql::ALL => genetic_tests } if genetic_tests.any?
         conditions['test_results'] = { Canql::ALL => test_results } if test_results.any?
         conditions
       end

data/lib/canql/nodes.rb

@@ -15,6 +15,7 @@ require 'canql/nodes/dates'
 require 'canql/nodes/e_base_records'
 require 'canql/nodes/batch_types'
 require 'canql/nodes/anomaly'
+require 'canql/nodes/genetic_test'
 require 'canql/nodes/test_result'
 require 'canql/nodes/patient'
 require 'canql/nodes/main'

data/lib/canql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -237,6 +237,7 @@ files:
 - lib/canql/grammars/batch_types.treetop
 - lib/canql/grammars/dates.treetop
 - lib/canql/grammars/e_base_records.treetop
+- lib/canql/grammars/genetic_test.treetop
 - lib/canql/grammars/main.treetop
 - lib/canql/grammars/patient.treetop
 - lib/canql/grammars/registry.treetop
@@ -247,6 +248,7 @@ files:
 - lib/canql/nodes/batch_types.rb
 - lib/canql/nodes/dates.rb
 - lib/canql/nodes/e_base_records.rb
+- lib/canql/nodes/genetic_test.rb
 - lib/canql/nodes/main.rb
 - lib/canql/nodes/patient.rb
 - lib/canql/nodes/registry.rb