canql 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3c990a0548eca6080965ce9c1ef4d2a32f14557420941fbffa0f54051b4c79b
-  data.tar.gz: 82ecc585caca911ae3c7462f54e307fb75ec8ac261aa742c87dd49dca056ab29
+  metadata.gz: 360922ab34dbdcb72c3cad8ba6ae105044534b8955c77237dcc90789e610caca
+  data.tar.gz: 7b8f9550fcf004647b8831cbc401c417a34c81e3c27dbd7446725acca012b3ac
 SHA512:
-  metadata.gz: 7526043f1b2789fdd4c934b1616296e6742ede5e0f96ef55e6eb6e52fef981056b6288cee3fd863ca6705f269b72965e2d77c51dac47c9f3e3ec2f7c5308528f
-  data.tar.gz: b2b8feddac3280ebc84c053db3e5ec9c4f4eac641cbb23ad6b873e26e1f8df2e2b3c69827a024caeb019eebe2978ff17d4a54bfcc78c792074f93699df817ee9
+  metadata.gz: b7c4eefb874fd4f0dd5b9ad0a5cdaab212d595d5ddd46a60f9f0b02704309597bda66b39edaf2abdf9d488e6676c9b81e1e09660700bedd3e744c24dd45fc481
+  data.tar.gz: 33a6c07541a128f31393d219246bf1e2135ac25ad30f84926232a1b86574ccf88ba159ef1b5798bb5a8e8d4e05ef279aa330c82c7779ff36230b7ef553297afa

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## 6.0.1 / 2024-10-14
+### Fixed
+* Code only misspelling of existence
+* Code only misspelling of modifier
+* Code only misspelling of number
+* Code only misspelling of acceptance
+* Moved development dependencies to Gem files
+
 ## 6.0.0 / 2024-09-30
 ### Changed
 * Changed the hes event filter to align with other new event filter

data/lib/canql/grammars/anomaly.treetop

@@ -1,7 +1,7 @@
 module Canql
   grammar Anomaly
     rule anomalies
-      and_keyword? existance_modifier:anomalies_no_keyword? status_type:anomaly_status? natal_period:anomalies_natal_period? screening_status_type:anomaly_screening_status? code_data:(space first:anomalies_icd_code rest:more_anomalies_icd_codes* word_break)? anomalies_keyword <Nodes::Anomaly::WithCondition>
+      and_keyword? existence_modifier:anomalies_no_keyword? status_type:anomaly_status? natal_period:anomalies_natal_period? screening_status_type:anomaly_screening_status? code_data:(space first:anomalies_icd_code rest:more_anomalies_icd_codes* word_break)? anomalies_keyword <Nodes::Anomaly::WithCondition>
     end
 
     rule anomalies_no_keyword

data/lib/canql/grammars/events.treetop

@@ -1,7 +1,7 @@
 module Canql
   grammar Events
     rule events
-      and_keyword? existance_modifier:events_no_keyword? events_name event_object_keyword <Nodes::Events::WithCondition>
+      and_keyword? existence_modifier:events_no_keyword? events_name event_object_keyword <Nodes::Events::WithCondition>
     end
 
     rule events_no_keyword

data/lib/canql/grammars/genetic_test.treetop

@@ -1,7 +1,7 @@
 module Canql
   grammar GeneticTest
     rule genetic_tests
-      and_keyword? existance_modifier:genetic_tests_no_keyword? genetic_tests_keyword <Nodes::GeneticTest::WithCondition>
+      and_keyword? existence_modifier:genetic_tests_no_keyword? genetic_tests_keyword <Nodes::GeneticTest::WithCondition>
     end
 
     rule genetic_tests_no_keyword

data/lib/canql/grammars/main.treetop

@@ -92,7 +92,7 @@ grammar Canql
      space 'and' word_break
   end
 
-  rule existance_keyword
+  rule existence_keyword
      space ('missing' / ('field' 's'?) / 'populated') word_break
   end
 
@@ -130,12 +130,12 @@ grammar Canql
 
   rule case_with_conditions
      anomalies / genetic_tests / test_results / perinatal_hospital /
-     case_field_existance / test_acceptance_existance / test_result_groups /
+     case_field_existence / test_acceptance_existence / test_result_groups /
      mother_conditions / action_or_ebr / events
   end
 
   rule patient_with_conditions
-     anomalies / genetic_tests / test_results / patient_field_existance /
+     anomalies / genetic_tests / test_results / patient_field_existence /
      action_or_ebr / events
   end
 end

data/lib/canql/grammars/patient.treetop

@@ -30,12 +30,12 @@ module Canql
       expected_keyword fuzzy_date <Nodes::Patient::ExpectedDateRangeNode>
     end
 
-    rule case_field_existance
-      and_keyword? field_existance_modifier:existance_keyword patient_field_list:case_field_list  <Nodes::Patient::FieldExists>
+    rule case_field_existence
+      and_keyword? field_existence_modifier:existence_keyword patient_field_list:case_field_list  <Nodes::Patient::FieldExists>
     end
 
-    rule patient_field_existance
-      and_keyword? field_existance_modifier:existance_keyword patient_field_list:patient_field_list  <Nodes::Patient::FieldExists>
+    rule patient_field_existence
+      and_keyword? field_existence_modifier:existence_keyword patient_field_list:patient_field_list  <Nodes::Patient::FieldExists>
     end
 
     rule patient_fields_keyword
@@ -84,7 +84,7 @@ module Canql
     end
 
     rule mother_with_conditions
-      patient_field_existance / action_or_ebr
+      patient_field_existence / action_or_ebr
     end
   end
 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::WithCondition>
+      and_keyword? existence_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/grammars/test_result_group.treetop

@@ -1,10 +1,10 @@
 module Canql
   grammar TestResultGroup
     rule test_result_groups
-      and_keyword? existance_modifier:test_result_group_existance_keyword group:test_result_group_names <Nodes::TestResultGroup::WithCondition>
+      and_keyword? existence_modifier:test_result_group_existence_keyword group:test_result_group_names <Nodes::TestResultGroup::WithCondition>
     end
 
-    rule test_result_group_existance_keyword
+    rule test_result_group_existence_keyword
       # If in furture the reverse is needed use 'supplied require'
       space ('missing required' / 'missing' / 'supplied required' / 'supplied') word_break
     end
@@ -13,11 +13,11 @@ module Canql
       space ('screening' / 'anomaly scan' / 'fetal medicine' / 'dating') word_break
     end
 
-    rule test_acceptance_existance
-      and_keyword? existance_modifier:test_acceptance_existance_keyword acceptance:test_acceptance_names <Nodes::TestAcceptanceExistamce::WithCondition>
+    rule test_acceptance_existence
+      and_keyword? existence_modifier:test_acceptance_existence_keyword acceptance:test_acceptance_names <Nodes::TestAcceptanceExistence::WithCondition>
     end
 
-    rule test_acceptance_existance_keyword
+    rule test_acceptance_existence_keyword
       space ('missing required' / 'missing' ) word_break
     end
 

data/lib/canql/nodes/age.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module Age
       module BirthDateNode

data/lib/canql/nodes/anomaly.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module Anomaly
       module WithCondition
@@ -17,7 +17,7 @@ module Canql #:nodoc: all
         end
 
         def to_anomaly
-          anomaly_hash = { 'exists' => existance_filter }
+          anomaly_hash = { 'exists' => existence_filter }
           anomaly_hash['type'] = anomaly_type_filter if anomaly_type.present?
           anomaly_hash['status'] = anomaly_status_type_filter if anomaly_status_type.present?
           if anomaly_screening_status_type.present?
@@ -30,16 +30,14 @@ module Canql #:nodoc: all
 
         def code_filters(anomaly_hash)
           anomaly_hash['icd_codes'] = code_filter[:icd_code] if code_filter[:icd_code].present?
-          if code_filter[:code_group].present?
-            anomaly_hash['code_groups'] = code_filter[:code_group]
-          end
+          anomaly_hash['code_groups'] = code_filter[:code_group] if code_filter[:code_group].present?
           return if code_filter[:fasp_rating].blank?
 
           anomaly_hash['fasp_rating'] = code_filter[:fasp_rating]
         end
 
-        def existance_filter
-          { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
+        def existence_filter
+          { Canql::EQUALS => existence_modifier.text_value.strip != 'no' }
         end
 
         def anomaly_type_filter
@@ -73,28 +71,20 @@ module Canql #:nodoc: all
           clean_code_array(code_array)
 
           code_filters = {}
-          if code_array[:icd_code].any?
-            code_filters[:icd_code] = { Canql::BEGINS => code_array[:icd_code] }
-          end
-
-          if code_array[:code_group].any?
-            code_filters[:code_group] = { Canql::EQUALS => code_array[:code_group] }
-          end
-
-          if code_array[:fasp_rating].any?
-            code_filters[:fasp_rating] = { Canql::EQUALS => code_array[:fasp_rating] }
-          end
+          code_filters[:icd_code] = { Canql::BEGINS => code_array[:icd_code] } if code_array[:icd_code].any?
+          code_filters[:code_group] = { Canql::EQUALS => code_array[:code_group] } if code_array[:code_group].any?
+          code_filters[:fasp_rating] = { Canql::EQUALS => code_array[:fasp_rating] } if code_array[:fasp_rating].any?
 
           code_filters
         end
 
         def clean_code_array(code_array)
           code_array[:icd_code].flatten!
-          code_array[:icd_code].delete_if(&:blank?)
+          code_array[:icd_code].compact_blank!
           code_array[:code_group].flatten!
-          code_array[:code_group].delete_if(&:blank?)
+          code_array[:code_group].compact_blank!
           code_array[:fasp_rating].flatten!
-          code_array[:fasp_rating].delete_if(&:blank?)
+          code_array[:fasp_rating].compact_blank!
         end
 
         def code_filter

data/lib/canql/nodes/dates.rb

@@ -3,7 +3,7 @@
 require 'chronic'
 require 'ndr_support/daterange'
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module FuzzyDateNode
       delegate :to_daterange, to: :date
@@ -25,12 +25,12 @@ module Canql #:nodoc: all
     module YearQuarterNode
       def to_daterange
         quarter = text_value[0..1]
-        year = text_value[3..-1]
+        year = text_value[3..]
         quarters = {
-          'q1': "01-04-#{year}",
-          'q2': "01-07-#{year}",
-          'q3': "01-10-#{year}",
-          'q4': "01-01-#{year.to_i + 1}"
+          q1: "01-04-#{year}",
+          q2: "01-07-#{year}",
+          q3: "01-10-#{year}",
+          q4: "01-01-#{year.to_i + 1}"
         }
         Daterange.new(quarters[quarter.to_sym].to_date,
                       quarters[quarter.to_sym].to_date + 3.months - 1.day)

data/lib/canql/nodes/e_base_records.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module EBaseRecordsNode
       def meta_data_item

data/lib/canql/nodes/events.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module Events
       module WithCondition
@@ -32,7 +32,7 @@ module Canql #:nodoc: all
         end
 
         def existence_filter
-          { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
+          { Canql::EQUALS => existence_modifier.text_value.strip != 'no' }
         end
       end
     end

data/lib/canql/nodes/genetic_test.rb

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

data/lib/canql/nodes/main.rb

@@ -2,7 +2,7 @@
 
 # require 'active_support/core_ext/object/blank'
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module RecordCountNode
       def meta_data_item
@@ -12,7 +12,7 @@ module Canql #:nodoc: all
   end
 end
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     # Returns a filter detailing the require result type (cases or patients)
     module SubjectNode

data/lib/canql/nodes/patient.rb

@@ -66,9 +66,9 @@ module Canql # :nodoc: all
           field_names = actual_field_names(
             patient_field_list.text_values_for_marker(:patient_field_name), subject.to_sym
           )
-          modifer = field_existance_modifier.text_value.strip
-          existance = modifer == 'missing' ? 'fields_missing' : 'fields_populated'
-          { "#{subject}.#{existance}" => { Canql::EQUALS => field_names } }
+          modifier = field_existence_modifier.text_value.strip
+          existence = modifier == 'missing' ? 'fields_missing' : 'fields_populated'
+          { "#{subject}.#{existence}" => { Canql::EQUALS => field_names } }
         end
 
         def actual_field_names(fields, subject)

data/lib/canql/nodes/patient_events.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module PatientEvents
       module WithCondition
         def to_events
-          event_name = event_type_name()
+          event_name = event_type_name
           { "#{event_name}_event" => existence_filter }
         end
 
@@ -28,7 +28,7 @@ module Canql #:nodoc: all
         end
 
         def existence_filter
-          { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
+          { Canql::EQUALS => existence_modifier.text_value.strip != 'no' }
         end
       end
     end

data/lib/canql/nodes/perinatal_hospital.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module PerinatalProviderCodeNode
       def meta_data_item

data/lib/canql/nodes/registry.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module RegistryNode
       def meta_data_item

data/lib/canql/nodes/test_result.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module TestResult
       module WithCondition
@@ -9,13 +9,13 @@ module Canql #:nodoc: all
         end
 
         def to_test_result
-          test_result_hash = { 'exists' => existance_filter }
+          test_result_hash = { 'exists' => existence_filter }
           test_result_hash['type'] = test_result_type_filter if test_result_type.present?
           test_result_hash
         end
 
-        def existance_filter
-          { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
+        def existence_filter
+          { Canql::EQUALS => existence_modifier.text_value.strip != 'no' }
         end
 
         def test_result_type_filter

data/lib/canql/nodes/test_result_group.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module TestResultGroup
       module WithCondition
@@ -9,16 +9,16 @@ module Canql #:nodoc: all
         end
 
         def to_test_result_group
-          test_result_group_hash = { 'exists' => existance_filter }
+          test_result_group_hash = { 'exists' => existence_filter }
           test_result_group_hash['required'] = requirement_filter
           test_result_group_hash['group'] = test_result_group_filter if test_result_group.present?
           test_result_group_hash
         end
 
-        def existance_filter
+        def existence_filter
           {
             Canql::EQUALS => ['supplied required', 'supplied'].include?(
-              existance_modifier.text_value.strip
+              existence_modifier.text_value.strip
             )
           }
         end
@@ -26,7 +26,7 @@ module Canql #:nodoc: all
         def requirement_filter
           {
             Canql::EQUALS => ['supplied required', 'missing required'].include?(
-              existance_modifier.text_value.strip
+              existence_modifier.text_value.strip
             )
           }
         end
@@ -37,23 +37,23 @@ module Canql #:nodoc: all
       end
     end
 
-    module TestAcceptanceExistamce
+    module TestAcceptanceExistence
       module WithCondition
         def test_acceptance
           acceptance.text_value.strip.parameterize.underscore
         end
 
         def to_test_acceptance
-          test_acceptance_hash = { 'exists' => existance_filter }
+          test_acceptance_hash = { 'exists' => existence_filter }
           test_acceptance_hash['required'] = requirement_filter
           test_acceptance_hash['acceptance'] = test_acceptance_filter if test_acceptance.present?
           test_acceptance_hash
         end
 
-        def existance_filter
+        def existence_filter
           {
             Canql::EQUALS => ['supplied required', 'supplied'].include?(
-              existance_modifier.text_value.strip
+              existence_modifier.text_value.strip
             )
           }
         end
@@ -61,7 +61,7 @@ module Canql #:nodoc: all
         def requirement_filter
           {
             Canql::EQUALS => ['supplied required', 'missing required'].include?(
-              existance_modifier.text_value.strip
+              existence_modifier.text_value.strip
             )
           }
         end

data/lib/canql/treetop/extensions.rb

@@ -26,7 +26,8 @@ module Treetop
 
       def reverse_scan_for_marker(marker)
         marker_value = reverse_marker_scanner(self, marker)
-        return if marker_value.nil? || marker_value.empty?
+        return if marker_value.blank?
+
         marker_value
       end
 
@@ -34,6 +35,7 @@ module Treetop
 
       def text_values_for_marker_scanner(root, marker, list)
         return if root.elements.nil?
+
         root.elements.each do |e|
           list << e.send(marker).text_value if e.respond_to?(marker)
           text_values_for_marker_scanner(e, marker, list)
@@ -43,10 +45,9 @@ module Treetop
 
       def reverse_marker_scanner(root, marker)
         return if root.nil? || root.elements.nil?
+
         marker_value = root.send(marker).text_value if root.respond_to?(marker)
-        if marker_value.nil? || marker_value.empty?
-          marker_value = reverse_marker_scanner(root.parent, marker)
-        end
+        marker_value = reverse_marker_scanner(root.parent, marker) if marker_value.blank?
         marker_value
       end
     end

data/lib/canql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - NHSD NDRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -78,138 +78,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.10
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: ndr_dev_support
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Domain Specific Language for querying NHS NCARDRS datastores
 email: []
 executables: []