quby-compiler 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a76be7d6ec0fbd4f1fabe4beeacd159210a050fe62ab79b69198f472dfefd42
-  data.tar.gz: 01a6a867ec3680ae24f49447000bd0d95dcb465cd1c9cba5fd71d66079c5c150
+  metadata.gz: 8b2f73a073de0f20b5dfd57b8e8c3b65c1878abce2cb109e67fe1cc302900b02
+  data.tar.gz: fec490f89c77a497fbac304a381e150aec1fc8e8e4e06950aff20424561fb69c
 SHA512:
-  metadata.gz: 4a863660e2399ca7472cd1e2353c72444405fb8bd859da2c5b259097e77d0522493867ccd0b6b690a2c6c5000c65fc829ff4e85ac69f46a7b0ddd0dd960a756c
-  data.tar.gz: b96591eb23810f2e66cbf1111e9232a691b3bf508efe8402cf3473e5201a734818c0f459b6fb959a6b54303c81f83e7c41019b8815a94fda7ac424410fb43c36
+  metadata.gz: 70bbcf09fa8b4d789ec22eaebb06b46a10bbdfcf5a5125f205f26307cceb471aef5c1e5e30a5b7ea510f64a304a59e21a40c64b3c40dde6935f291f04237e6de
+  data.tar.gz: 887f84082878e3a49dda34d8c92f62db3849e5ee716e0a69f9d1b92c1543cc1a3fe21fd65c5603c7703ce4168404dab75fc191f4999bd0aeeb032137d41e50e4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 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/outputs/roqua_serializer.rb

@@ -60,9 +60,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 +88,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.

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.11"
   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.11
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel