canql 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa6dc69bfb7e032c2dcd93159ba65ee5b7219a9f
-  data.tar.gz: eebc970de0149954705316e1b885738df799a3e4
+  metadata.gz: 2f5ebcaf0870cdc1190bb62c79c3bb126a9beae6
+  data.tar.gz: e3eeef88f61de69b357d6bbee97dff1ddc9ea214
 SHA512:
-  metadata.gz: 0106a96983cebd417e48d8e75da2f48fc14d9762a6ac4b2c0306b46abb64f4745382da3f787be0b4ab8b010eb74332594c183a60920c9b42c053c3d7f7f1bea2
-  data.tar.gz: 9ba145d699797af1c723b74254259c3bf9ea7aeae622f35a408109f316d0bced8d9feb67b107918e1118acbd2c8682be63a8735a8c51e4357886f70c09e2f345
+  metadata.gz: f0543f4edbc2c7a3008c716876ba5bb738fe228d8657cb7923b9449dd4916c4a0f8c4a047ba9aa1da9c6d5ef9855df0d24ec88ae3ffec2b79ad27de2b298e894
+  data.tar.gz: dd56e722700df17f71ba35800b31b0181c99d72fe0486d639e16af793bbd90d718616e1ec15fc84199ddb7d58b1ed12e3f9752641d83bc4af24cdacffb9d62a4

data/.rubocop.yml

@@ -4,6 +4,7 @@ Rails:
   Enabled: false
 
 AllCops:
+  TargetRailsVersion: 4.2
   TargetRubyVersion: 2.3
 
 Style/FrozenStringLiteralComment:

data/.travis.yml

@@ -1,11 +1,16 @@
 language: ruby
 
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.3
+  - 2.4
+  - 2.5
 
 sudo: false
 
 cache: bundler
 
-before_script: "bundle update"
+before_install:
+  - gem update --system
+  - gem install bundler
+
+before_script: "bundle update"

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in canql.gemspec

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 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 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
 
 Please see the tests for many more examples.
 

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'ndr_dev_support/tasks'

data/canql.gemspec

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'canql/version'
@@ -23,17 +24,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'chronic', '~> 0.3.0'
   spec.add_dependency 'ndr_support', '>= 3.0', '< 6'
+  spec.add_dependency 'rails', '>= 4.1', '< 6'
   spec.add_dependency 'treetop', '>= 1.4.10'
-  spec.add_dependency 'chronic', '~> 0.3.0'
 
-  spec.add_development_dependency 'ndr_dev_support', '~> 2.0', '>= 2.0.2'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'guard'
-  spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'guard-minitest'
+  spec.add_development_dependency 'guard-rubocop'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'ndr_dev_support', '>= 3.0', '<6'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'terminal-notifier-guard' if RUBY_PLATFORM =~ /darwin/
 end

data/code_safety.yml

@@ -11,11 +11,11 @@ file safety:
   ".rubocop.yml":
     comments: 
     reviewed_by: timgentry
-    safe_revision: 618d1e7fa4793df5bff0bdb763ff90dd5ea63236
+    safe_revision: 5bc563431f7822e2baf37bbeac9861c36675602d
   ".travis.yml":
     comments: 
     reviewed_by: timgentry
-    safe_revision: 5c88b8eec43f7e7fd18fae6ac952ea6c2efddbbc
+    safe_revision: b0b9a616908e7aab28c8c47f997b6af8062aa83a
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -23,7 +23,7 @@ file safety:
   Gemfile:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   LICENSE.txt:
     comments: 
     reviewed_by: timgentry
@@ -31,11 +31,11 @@ file safety:
   README.md:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 336a2445709947df89a739ca611cf02f10783c08
+    safe_revision: d3ea041b101e40e6847608705ecc2c3f6e0ca03f
   Rakefile:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 16a9dac62316fbc2ef953457732bc7d9b2f67111
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   bin/console:
     comments: 
     reviewed_by: timgentry
@@ -47,11 +47,11 @@ file safety:
   canql.gemspec:
     comments: 
     reviewed_by: timgentry
-    safe_revision: b67d28ae2648219607e40dc77d6aef846a64f647
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/constants.rb:
     comments: 
     reviewed_by: timgentry
@@ -59,7 +59,7 @@ file safety:
   lib/canql/grammars.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/grammars/age.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -69,7 +69,7 @@ file safety:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
     reviewed_by: timgentry
-    safe_revision: a7b0ddabf0c3f7d8b129b4cd206b6e1d65781a10
+    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
   lib/canql/grammars/batch_types.treetop:
     comments: 
     reviewed_by: timgentry
@@ -87,7 +87,7 @@ file safety:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
     reviewed_by: timgentry
-    safe_revision: 67be9ba603f1f1d1bd73c696fc1d814b4138ba5f
+    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
   lib/canql/grammars/patient.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -102,100 +102,108 @@ file safety:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
     reviewed_by: timgentry
-    safe_revision: a7b0ddabf0c3f7d8b129b4cd206b6e1d65781a10
+    safe_revision: c39d24bb500719971969762e94545e82866bf92f
   lib/canql/nodes.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/age.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/anomaly.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
   lib/canql/nodes/batch_types.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/dates.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 9b72e0c6f96aaa8b8d45e137bed846d76d357028
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/e_base_records.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 1c30c1e78d86b74d747204ea40ae709ceaaf66b5
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/main.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: c39d24bb500719971969762e94545e82866bf92f
   lib/canql/nodes/patient.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 0bf684b681372d16145cae8c6bb831f1bb96f442
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/registry.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/test_result.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: c39d24bb500719971969762e94545e82866bf92f
   lib/canql/parser.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: a923656606f581c220ea7af16196f2c68b5248f2
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/treetop/extensions.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/version.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 9a1b4b24ff53f60d505c6b6f02e3b913ab88ff04
+    safe_revision: fff6aa11e725708b9e077feb6bef28aa27fa43f5
+  test/anomaly_test_helper.rb:
+    comments: 
+    reviewed_by: timgentry
+    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
   test/canql_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   test/minitest_helper.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   test/nodes/age_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 2346abb4435bf95cbe9b4d8c124123b9fefe60d6
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   test/nodes/anomaly_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
+  test/nodes/code_test.rb:
+    comments: 
+    reviewed_by: timgentry
+    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
   test/nodes/e_base_records_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: e97a98051e1adfc03fa977f0d0da587df0d48f63
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   test/nodes/main_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   test/nodes/patient_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 336a2445709947df89a739ca611cf02f10783c08
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   test/nodes/registry_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   test/nodes/test_results_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: c39d24bb500719971969762e94545e82866bf92f
   test/parser_test.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 336a2445709947df89a739ca611cf02f10783c08
+    safe_revision: c39d24bb500719971969762e94545e82866bf92f
   test/test_helper.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
+    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca

data/lib/canql.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/time'
 
 require 'canql/version'

data/lib/canql/grammars.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'treetop'
 
 Treetop.load File.expand_path('grammars/age', File.dirname(__FILE__))

data/lib/canql/grammars/anomaly.treetop

@@ -1,7 +1,7 @@
 module Canql
   grammar Anomaly
     rule anomalies
-      and_keyword? existance_modifier:anomalies_no_keyword? natal_period:anomalies_natal_period? anomalies_keyword <Nodes::Anomaly::Exists>
+      and_keyword? existance_modifier:anomalies_no_keyword? status_type:anomaly_status? natal_period:anomalies_natal_period? code_data:(space first:anomalies_icd_code rest:more_anomalies_icd_codes* word_break)? anomalies_keyword <Nodes::Anomaly::WithCondition>
     end
 
     rule anomalies_no_keyword
@@ -12,8 +12,24 @@ module Canql
       (prenatal_keyword / postnatal_keyword)
     end
 
+    rule anomaly_status
+      (suspected_keyword / confirmed_keyword / probable_keyword / diagnosed_keyword)
+    end
+
     rule anomalies_keyword
       space 'anomalies' word_break
     end
+
+    rule more_anomalies_icd_codes
+      ','? space? ('and' space)? anomalies_icd_code <Nodes::Anomaly::AdditionalIcdCodeNode>
+    end
+
+    rule anomalies_icd_code
+      icd_code_name <Nodes::Anomaly::SingleIcdCodeNode>
+    end
+
+    rule icd_code_name
+      [a-z] [0-9] 1..3
+    end
   end
 end

data/lib/canql/grammars/main.treetop

@@ -53,7 +53,7 @@ grammar Canql
   end
 
   rule with_clause
-    with_keyword post:with_conditions+
+    with_keyword post:with_conditions+ <Nodes::WithConditions>
   end
 
   rule with_keyword
@@ -80,6 +80,22 @@ grammar Canql
     space 'postnatal' word_break
   end
 
+  rule suspected_keyword
+    space 'suspected' word_break
+  end
+
+  rule confirmed_keyword
+    space 'confirmed' word_break
+  end
+
+  rule probable_keyword
+    space 'probable' word_break
+  end
+
+  rule diagnosed_keyword
+    space 'diagnosed' word_break
+  end
+
   rule with_conditions
      anomalies / test_results / patient_field_existance / mother_conditions / action_or_ebr
   end

data/lib/canql/grammars/test_result.treetop

@@ -1,7 +1,7 @@
 module Canql
   grammar TestResult
     rule test_results
-      and_keyword? existance_modifier:test_result_no_keyword? natal_period:test_result_natal_period? test_results_keyword <Nodes::TestResult::Exists>
+      and_keyword? existance_modifier:test_result_no_keyword? natal_period:test_result_natal_period? test_results_keyword <Nodes::TestResult::WithCondition>
     end
 
     rule test_result_no_keyword

data/lib/canql/nodes.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # These file contain custom mixins for treetop
 # nodes that enable them to generate meta_data_items, etc.
 

data/lib/canql/nodes/age.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Canql #:nodoc: all
   module Nodes
     module Age

data/lib/canql/nodes/anomaly.rb

@@ -1,21 +1,60 @@
 # frozen_string_literal: true
+
 module Canql #:nodoc: all
   module Nodes
     module Anomaly
-      module Exists
+      module WithCondition
         def anomaly_type
-          text_value = natal_period.text_value.strip
-          return '' if '' == text_value
+          natal_period.text_value.strip
+        end
+
+        def anomaly_status_type
+          status_type.text_value.strip
+        end
+
+        def to_anomaly
+          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
+        end
+
+        def existance_filter
+          { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
+        end
+
+        def anomaly_type_filter
+          { Canql::EQUALS => anomaly_type }
+        end
+
+        def anomaly_status_type_filter
+          { Canql::EQUALS => anomaly_status_type }
+        end
+
+        def code_filter
+          return {} if code_data.text_value.blank?
+
+          code_array = [code_data.first.to_code]
+          code_data.rest.elements.each do |code|
+            code_array << code.try(:to_code)
+          end
+          code_array.flatten!
+          code_array.delete_if(&:blank?)
 
-          ".#{text_value}"
+          { Canql::BEGINS => code_array }
         end
+      end
+
+      module AdditionalIcdCodeNode
+        def to_code
+          anomalies_icd_code.to_code
+        end
+      end
 
-        def meta_data_item
-          {
-            "anomaly#{anomaly_type}.exists" => {
-              Canql::EQUALS => existance_modifier.text_value.strip != 'no'
-            }
-          }
+      module SingleIcdCodeNode
+        def to_code
+          text_value.upcase
         end
       end
     end

data/lib/canql/nodes/batch_types.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Canql #:nodoc: all
   module Nodes
     module BatchTypeNode

data/lib/canql/nodes/dates.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'chronic'
 require 'ndr_support/daterange'
 

data/lib/canql/nodes/e_base_records.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Canql #:nodoc: all
   module Nodes
     module EBaseRecordsNode

data/lib/canql/nodes/main.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # require 'active_support/core_ext/object/blank'
 
 module Canql #:nodoc: all
@@ -10,3 +11,26 @@ module Canql #:nodoc: all
     end
   end
 end
+
+module Canql #:nodoc: all
+  module Nodes
+    # Provides meta data for with conditions that return
+    # multiple instances of a condition type as an array
+    module WithConditions
+      def meta_data_item
+        conditions = {}
+        anomalies = []
+        test_results = []
+
+        post.elements.each do |element|
+          anomalies << element.to_anomaly if element.respond_to?(:to_anomaly)
+          test_results << element.to_test_result if element.respond_to?(:to_test_result)
+        end
+
+        conditions['anomalies'] = { Canql::ALL => anomalies } if anomalies.any?
+        conditions['test_results'] = { Canql::ALL => test_results } if test_results.any?
+        conditions
+      end
+    end
+  end
+end

data/lib/canql/nodes/patient.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Canql #:nodoc: all
   module Nodes
     module Patient

data/lib/canql/nodes/registry.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Canql #:nodoc: all
   module Nodes
     module RegistryNode

data/lib/canql/nodes/test_result.rb

@@ -1,19 +1,25 @@
 # frozen_string_literal: true
+
 module Canql #:nodoc: all
   module Nodes
     module TestResult
-      module Exists
+      module WithCondition
         def test_result_type
-          text_value = natal_period.text_value.strip
-          return '' if '' == text_value
+          natal_period.text_value.strip
+        end
+
+        def to_test_result
+          test_result_hash = { 'exists' => existance_filter }
+          test_result_hash['type'] = test_result_type_filter if test_result_type.present?
+          test_result_hash
+        end
 
-          ".#{text_value}"
+        def existance_filter
+          { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
         end
 
-        def meta_data_item
-          { "testresults#{test_result_type}.exists" => {
-            Canql::EQUALS => existance_modifier.text_value.strip != 'no'
-          } }
+        def test_result_type_filter
+          { Canql::EQUALS => test_result_type }
         end
       end
     end

data/lib/canql/parser.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'canql/nodes'
 require 'canql/grammars'
 

data/lib/canql/treetop/extensions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Treetop
   module Runtime
     # We extend the SyntaxNode class to include a hash of meta data.

data/lib/canql/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: ndr_support
   requirement: !ruby/object:Gem::Requirement
@@ -31,55 +45,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
-  name: treetop
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.10
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.10
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.4.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.4.10
 - !ruby/object:Gem::Dependency
-  name: ndr_dev_support
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,7 +107,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,7 +121,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,7 +135,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,21 +149,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: ndr_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,7 +183,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -254,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Congenital Anomaly Natural Query Language