quby-compiler 0.4.10 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a76be7d6ec0fbd4f1fabe4beeacd159210a050fe62ab79b69198f472dfefd42
-  data.tar.gz: 01a6a867ec3680ae24f49447000bd0d95dcb465cd1c9cba5fd71d66079c5c150
+  metadata.gz: f13fa5a2d4c4da7b41e4a32905226d0523709bac245a9d7cba3d28fd927d2b6a
+  data.tar.gz: 4e8f0dfab2c05e6166176f5ddb951e5f4e51962b9902e75ea3e8561e9cda3392
 SHA512:
-  metadata.gz: 4a863660e2399ca7472cd1e2353c72444405fb8bd859da2c5b259097e77d0522493867ccd0b6b690a2c6c5000c65fc829ff4e85ac69f46a7b0ddd0dd960a756c
-  data.tar.gz: b96591eb23810f2e66cbf1111e9232a691b3bf508efe8402cf3473e5201a734818c0f459b6fb959a6b54303c81f83e7c41019b8815a94fda7ac424410fb43c36
+  metadata.gz: fb6313ab623e76109aa94871bb192da9c95bbaa5809472b29bc88c2f7b61ebcb18b03b7433fe162209c33a1113aa7f359722c8927196d0d9b7ebf022e457e5b4
+  data.tar.gz: 3b3c6aeb7d590570defc880d3b1743ff64c1cb4c6227da2bb779c93057a7c1c249563f0e2366a1e6e13b6760fa90c010f66b57757159b24e0073af71403b6098

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 0.4.13
+
+* quby2.json:
+  * string-questions: Don't pass a size of 30, when no size had been specified
+  * rename date type to date_parts, switch to use `date_parts: [{part: year, key: 'yyyy'}, ..]`
+
+# 0.4.12
+
+* roqua.json: Add questionnaire license
+* roqua.json: Add `unchecks_all_others` for radio/checkbox question options
+
+# 0.4.11
+
+* roqua.json: Baseline for a chart now always exports as a hash of gender/age => value
+
 # 0.4.10
 
 * quby2.json: Fix validations json (regex-serialization and key-capitalization)

data/lib/quby/compiler/entities/questions/date_question.rb

@@ -24,7 +24,8 @@ module Quby
           def initialize(key, options = {})
             super
 
-            @components = options[:components] || DEFAULT_COMPONENTS
+            # only possible order we support.
+            @components = options[:components] ? POSSIBLE_COMPONENTS & options[:components] : DEFAULT_COMPONENTS
             @required_components = options[:required_components] || @components
             @optional_components = @components - @required_components
 
@@ -39,7 +40,8 @@ module Quby
           def add_date_validation(explanation)
             @validations << {type: :valid_date,
                              subtype: :"valid_date_#{components.sort.join('_')}",
-                             explanation: explanation}
+                             explanation: explanation,
+                             requiredParts: required_components}
           end
 
           def claimed_keys
@@ -60,10 +62,16 @@ module Quby
           end
 
           def as_json(options = {})
-            component_keys = components.each_with_object({}) do |component, hash|
-              hash["#{component}Key"] = send("#{component}_key")
-            end
-            super.merge(components: components).merge(component_keys)
+            super.merge(
+              type: 'date_parts',
+              as: 'date_parts',
+              dateParts: components.map { |component|
+                {
+                  part: component,
+                  key: send("#{component}_key")
+                }
+              }
+            )
           end
         end
       end

data/lib/quby/compiler/entities/questions/string_question.rb

@@ -6,7 +6,7 @@ module Quby
       module Questions
         class StringQuestion < Question
           def as_json(options = {})
-            super.merge(autocomplete: @autocomplete, size: @size || 30)
+            super.merge(autocomplete: @autocomplete, size: @size)
           end
         end
       end

data/lib/quby/compiler/entities/questions/text_question.rb

@@ -6,7 +6,7 @@ module Quby
       module Questions
         class TextQuestion < Question
           def as_json(options = {})
-            super.merge(autocomplete: @autocomplete, lines: lines, cols: cols)
+            super.merge(autocomplete: @autocomplete, lines: lines)
           end
         end
       end

data/lib/quby/compiler/outputs/roqua_serializer.rb

@@ -36,6 +36,8 @@ module Quby
             outcome_tables_schema: outcome_tables_schema,
             questions: questions,
             scores: scores,
+            license: questionnaire.license,
+            licensor: questionnaire.licensor,
           }
         end
 
@@ -60,9 +62,8 @@ module Quby
               case chart
               when Quby::Compiler::Entities::Charting::LineChart
                 {
-                  y_label: chart.y_label,
                   tonality: chart.tonality,
-                  baseline: YAML.dump(chart.baseline),
+                  baseline: chart_baseline(chart.baseline),
                   clinically_relevant_change: chart.clinically_relevant_change,
                 }
               when Quby::Compiler::Entities::Charting::OverviewChart
@@ -89,6 +90,17 @@ module Quby
           }
         end
 
+        def chart_baseline(baseline)
+          case baseline
+          when nil
+            nil
+          when Float, Integer
+            {default: {default: baseline}}
+          when Hash
+            baseline
+          end
+        end
+
         # configuration for outcome tables.
         # tables:
         #   <outcome_table_name:Symbol>: # each entry is a table.
@@ -220,7 +232,8 @@ module Quby
               key: option.key,
               value: (option.value.to_s unless question.type == :check_box),
               description: option.context_free_description || parse_markdown_and_strip_tags(option.description),
-              child_question_keys: option.questions.map(&:key).presence
+              child_question_keys: option.questions.map(&:key).presence,
+              unchecks_all_others: question.try(:uncheck_all_option) && question.uncheck_all_option == option.key
             }.compact
           }
         end

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

@@ -137,14 +137,14 @@ module Quby
           unknown_questions = flag.shows_questions.select { |key| !questionnaire.key_in_use?(key) }
           return if unknown_questions.blank?
 
-          fail ArgumentError, "Flag '#{key}' has unknown shows_questions keys #{unknown_questions}"
+          fail ArgumentError, "Flag '#{flag.key}' has unknown shows_questions keys #{unknown_questions}"
         end
 
         def validate_flag_hides(questionnaire, flag)
           unknown_questions = flag.hides_questions.select { |key| !questionnaire.key_in_use?(key) }
           return if unknown_questions.blank?
 
-          fail ArgumentError, "Flag '#{key}' has unknown hides_questions keys #{unknown_questions}"
+          fail ArgumentError, "Flag '#{flag.key}' has unknown hides_questions keys #{unknown_questions}"
         end
 
         def validate_flag_depends_on(questionnaire, flag)

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.4.10"
+    VERSION = "0.4.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.13
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Quby::Compiler compiles a DSL for questionnaires to JSON