quby-compiler 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9585291a3d8622c9a7d8af491999e99258f50f85ba7af81b2189418fb7ba581a
-  data.tar.gz: 41c7638af19d0837ffce3a0c6d57f8d06cdf8401c2c9864f8a167c2cf0b02087
+  metadata.gz: 44068865d5a7d4dab6a76cf5d6b11bc8c6ce64be7f373e822e3e1ec30bbd1889
+  data.tar.gz: f0a6dc1e26bc3b212370054b1dbaad1af344b6833ea056b9c618b264b2a8e4f5
 SHA512:
-  metadata.gz: 491d4aad787b486403d23dab908931da75d81afc02d13dcabef924e6ac108aab65e8822a1ae450c32cd8cbce7d6789a0ce18618fc0f0a3172312cc06ba288674
-  data.tar.gz: 8f27a6cabf5bf5451348255f81bab64483d690797786860739f69d43637e87698df3cce4c1726f4a4c01c5473797b0b08832a05a6fd3408f9460001a2c8541d5
+  metadata.gz: 1d57ad082868f0f5e37dc1cf7094037d631dbc76232ec83400155ad07a05f6e4a37b569843750a973fa2543d134d5cbda63465775d0d64d912af1357c71ca56d
+  data.tar.gz: 3301d9eeca5a25a3186043c506b39beab4568d99f7945f0e646d29bdbd223e7813fd3479e6c3a215ef28e9ca36f0edb63a168b2abcdb5fe9600b15e21edd8e4f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.5.8
+
+* DefinitionValidator: Add uniqueness check over all question, flags, textvars and score keys. 
+* Moved flag description validation to definition_validator
+
 # 0.5.7
 
 * quby2.json

data/lib/quby/compiler/entities/flag.rb

@@ -19,21 +19,12 @@ module Quby
                                                   # does not have an effect outside of the interface
           super(key, description_true, description_false, description, internal, trigger_on, shows_questions,
                 hides_questions, Array.wrap(depends_on).map(&:to_s), default_in_interface)
-          ensure_valid_descriptions
         end
         # rubocop:enable ParameterLists
 
         def if_triggered_by(answer_flags)
           yield if answer_flags[key] == trigger_on
         end
-
-        private
-
-        def ensure_valid_descriptions
-          unless (description_false.present? && description_true.present?) || description.present?
-            raise "Flag '#{key}' Requires at least either both description_true and description_false or a description"
-          end
-        end
       end
     end
   end

data/lib/quby/compiler/services/definition_validator.rb

@@ -21,6 +21,7 @@ module Quby
           validate_scores(questionnaire)
           validate_table_edgecases(questionnaire)
           validate_flags(questionnaire)
+          validate_key_uniqueness(questionnaire)
           validate_respondent_types(questionnaire)
           validate_outcome_tables(questionnaire)
           validate_markdown_fields(questionnaire) if questionnaire.validate_html
@@ -127,12 +128,19 @@ module Quby
 
         def validate_flags(questionnaire)
           questionnaire.flags.each_value do |flag|
+            ensure_valid_descriptions(questionnaire, flag)
             validate_flag_shows(questionnaire, flag)
             validate_flag_hides(questionnaire, flag)
             validate_flag_depends_on(questionnaire, flag)
           end
         end
 
+        def ensure_valid_descriptions(questionnaire, flag)
+          unless (flag.description_false.present? && flag.description_true.present?) || flag.description.present?
+            fail ArgumentError, "Flag '#{flag.key}' Requires at least either both description_true and description_false or a description"
+          end
+        end
+
         def validate_flag_shows(questionnaire, flag)
           unknown_questions = flag.shows_questions.select { |key| !questionnaire.key_in_use?(key) }
           return if unknown_questions.blank?
@@ -153,6 +161,18 @@ module Quby
           fail ArgumentError, "Flag #{flag.key} depends_on nonexistent flag '#{missing.to_sentence}'"
         end
 
+        def validate_key_uniqueness(questionnaire)
+          keys = questionnaire.fields.answer_keys.to_a \
+            + questionnaire.score_schemas.keys.map(&:to_sym) \
+            + questionnaire.flags.keys.map { delete_prefix(_1, questionnaire).to_sym } \
+            + questionnaire.textvars.keys.map { delete_prefix(_1, questionnaire).to_sym }
+
+          return if keys.size == keys.uniq.size
+
+          duplicates = keys.tally.filter_map { |k,v| k if v > 1 }
+          fail ArgumentError, "Duplicate keys: #{duplicates.to_sentence}"
+        end
+
         def validate_respondent_types(questionnaire)
           valid_respondent_types = Entities::Questionnaire::RESPONDENT_TYPES
 
@@ -339,6 +359,10 @@ scores_schema tables to the resulting seed."
 
           fail "#{key || html} contains invalid html: #{fragment.errors.map(&:to_s).join(', ')}."
         end
+
+        def delete_prefix(key, questionnaire)
+          key.delete_prefix("#{questionnaire.key}_")
+        end
       end
     end
   end

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.7"
+    VERSION = "0.5.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Quby::Compiler compiles a DSL for questionnaires to JSON