quby-compiler 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8adddc572c511a6145f59379fa1c54d49f53fcd3487a3d9a5026fb0634b54c54
-  data.tar.gz: 5b173fb296fd7a7b88d9d60eb2357117c6f9f80eb1c800a5fe781a427d359efa
+  metadata.gz: 0a76be7d6ec0fbd4f1fabe4beeacd159210a050fe62ab79b69198f472dfefd42
+  data.tar.gz: 01a6a867ec3680ae24f49447000bd0d95dcb465cd1c9cba5fd71d66079c5c150
 SHA512:
-  metadata.gz: 6e23e0347aa449053801f045533b26d10108d8f4a62783a71a121b9cc41215dab348ca3da8e8acf528a58e4689f05219c96237218478c2368acbfcff07c220ce
-  data.tar.gz: 47e5d45f09c1452db50e29e3933967256b890090991ed715f91003b7622076aafa0adbe0d0f414506b79707187c03bc37c7217c94bad39bfd5f3a2d681dec72d
+  metadata.gz: 4a863660e2399ca7472cd1e2353c72444405fb8bd859da2c5b259097e77d0522493867ccd0b6b690a2c6c5000c65fc829ff4e85ac69f46a7b0ddd0dd960a756c
+  data.tar.gz: b96591eb23810f2e66cbf1111e9232a691b3bf508efe8402cf3473e5201a734818c0f459b6fb959a6b54303c81f83e7c41019b8815a94fda7ac424410fb43c36

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.10
+
+* quby2.json: Fix validations json (regex-serialization and key-capitalization)
+* roqua.json: Change questions, options, date_parts, scores, subscores and outcome_tables from hash to array, since ordering is important and not all systems preserve the order of  hashes (like pg's jsonb)
+
 #  0.4.9
 
 * roqua.json: Fix html stripping for string with no whitespace

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

@@ -209,7 +209,6 @@ module Quby
             fields: fields.as_json,
             flags: flags,
             textvars: textvars,
-            validations: validations,
             visibilityRules: visibility_rules
           }
         end

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

@@ -6,10 +6,23 @@ module Quby
           @questionnaire = questionnaire
         end
 
+        # TODO: Move all attributes here from Questionnaire#as_json
         def as_json(options = {})
-          @questionnaire.as_json
+          @questionnaire.as_json.merge \
+            validations: validations
+        end
+
+        def validations
+          @questionnaire.validations.map do |validation|
+            validation.config.compact
+              .transform_keys{ _1.to_s.camelize(:lower) }
+              .tap do |validation_hsh|
+                # otherwise ruby will put a (?-mix around the regex, which js errors on.
+                validation_hsh['matcher'] = validation_hsh['matcher'].source.to_s  if validation_hsh['matcher']
+              end.as_json
+          end
         end
       end
     end
   end
-end
+end

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

@@ -107,15 +107,18 @@ module Quby
 
         def outcome_tables_from_definition
           # hash of tables, with the score keys (rows) and subscore keys (columns) used for each
-          tables = {}
+          tables = []
           # hash of `subscore_key: subscore_label` pairs used in tables
           headers = {}
 
           questionnaire.outcome_tables.each do |table|
-            tables[table.key] = {name: table.name,
-                                 default_collapsed: table.default_collapsed,
-                                 score_keys: table.score_keys,
-                                 subscore_keys: table.subscore_keys}.compact
+            tables << {
+              key: table.key,
+              name: table.name,
+              default_collapsed: table.default_collapsed,
+              score_keys: table.score_keys,
+              subscore_keys: table.subscore_keys
+            }.compact
 
             table.subscore_keys.each do |subscore_key|
               table.score_keys.find do |score_key|
@@ -142,6 +145,7 @@ module Quby
           questionnaire.score_schemas.values.each do |schema|
             schema.subscore_schemas.each do |subschema|
               next if subschema.outcome_table.blank?
+              tables[subschema.outcome_table][:key] = subschema.outcome_table
               tables[subschema.outcome_table][:subscore_keys] << subschema.key
               tables[subschema.outcome_table][:score_keys] << schema.key
               headers[subschema.key] = subschema.label
@@ -150,7 +154,7 @@ module Quby
 
           {
             headers: headers,
-            tables: tables,
+            tables: tables.values,
           }
         end
 
@@ -170,25 +174,22 @@ module Quby
         # date_parts [nil/{..}]
         # options: [nil/{..}]
         def questions
-          questionnaire.sorted_questions.reject{_1.type == :hidden}.to_h { |question|
-            [
-              question.key,
-              {
-                key: question.key,
-                sbg_key: question.sbg_key,
-                type: QUBY_TYPE_TO_ROQUA_TYPE.fetch(question.type),
-                title: parse_markdown_and_strip_tags(question.title),
-                context_free_title: question.context_free_title,
-                unit: question.unit,
-                deprecated: question.hidden.presence,
-                default_invisible: question.default_invisible.presence,
-                parent_question_key: question.parent&.key,
-                parent_option_key: question.parent_option_key,
-                title_question_key: question.title_question&.key,
-                date_parts: date_parts_for(question),
-                options: options_for(question)
-              }.compact
-            ]
+          questionnaire.sorted_questions.reject{_1.type == :hidden}.map { |question|
+            {
+              key: question.key,
+              sbg_key: question.sbg_key,
+              type: QUBY_TYPE_TO_ROQUA_TYPE.fetch(question.type),
+              title: parse_markdown_and_strip_tags(question.title),
+              context_free_title: question.context_free_title,
+              unit: question.unit,
+              deprecated: question.hidden.presence,
+              default_invisible: question.default_invisible.presence,
+              parent_question_key: question.parent&.key,
+              parent_option_key: question.parent_option_key,
+              title_question_key: question.title_question&.key,
+              date_parts: date_parts_for(question),
+              options: options_for(question)
+            }.compact
           }
         end
 
@@ -197,13 +198,11 @@ module Quby
         def date_parts_for(question)
           return nil unless question.type == :date
 
-          question.components.to_h { |component|
-            [
-              component,
-              {
-                key: question.send("#{component}_key")
-              }
-            ]
+          question.components.map { |component|
+            {
+              part: component,
+              key: question.send("#{component}_key")
+            }
           }
         end
 
@@ -216,22 +215,19 @@ module Quby
           return nil if question.options.empty?
 
           question.options.reject { |option| option.inner_title || option.placeholder }
-                          .to_h { |option|
-            [
-              option.key,
-              {
-                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
-              }.compact
-            ]
+                          .map { |option|
+            {
+              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
+            }.compact
           }
         end
 
         # [{ key: { ..,  subscores: { subkey: {..} } } }]
         def scores
-          questionnaire.score_schemas.transform_values { |score|
+          questionnaire.score_schemas.values.map { |score|
             {
               key: score.key,
               label: score.label,
@@ -242,16 +238,13 @@ module Quby
 
         # { subkey: {..} }
         def subscores_for(score)
-          score.subscore_schemas.to_h { |subscore|
-            [
-              subscore.key,
-              {
-                key: subscore.key,
-                label: subscore.label,
-                export_key: subscore.export_key,
-                only_for_export: subscore.only_for_export.presence
-              }.compact
-            ]
+          score.subscore_schemas.map { |subscore|
+            {
+              key: subscore.key,
+              label: subscore.label,
+              export_key: subscore.export_key,
+              only_for_export: subscore.only_for_export.presence
+            }.compact
           }
         end
 

data/lib/quby/compiler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel