quby-compiler 0.5.9 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 392bac29f2cc7b4b00ce1344f010b39941148e96e5e529d6487f8e0d49a5a5fe
-  data.tar.gz: 7c0538c6243f30481c3f282bfc2892874494454b64f5eb0013b0a0a4aa56e0c8
+  metadata.gz: b8077f55592000120cadb53b6bf02081d2f1bb98bacdfd7a35133efc91d64fff
+  data.tar.gz: 05c78c8b6c61f5317d087145ede42828d62df898be40f8fd8c9e584d6625f865
 SHA512:
-  metadata.gz: 8360a9fd3ec70b80766ece8d51bbbc301067ae7eb8c441515c06dc8c8003205527290c10b1249948deb5b4fab798a1e61ba56e03594f1e5188f5a43d3fbffa9f
-  data.tar.gz: 16b077a6db915f93dd30f6c6bb8f411c5c21e8cd2adc3ba279abbc11596a34598bd3e80dbea4527b431e7f1719f5eecb78c39f1c1252011c7d71a2332b576331
+  metadata.gz: 51256d96238a758e40e9dac04cad8e011038ccb98b0a97c27b134e05505f2fa28145b6a4296ae778e661483460feff6c2d6ab7208f06fc5b975236a08d60c080
+  data.tar.gz: 5f7b82f1f302c1677a0e50764ec58576be05ba4d06218710e85190f4ffab8a3433cc13e3a79af17a4a80edb2cb0b9c7c8a5ef0e99440a2c74d38e820d6fe64c3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 0.5.11
+
+* dsl
+  * Add layout_version
+* quby2.json
+  * Add layout_version
+* roqua.json
+  * Add renderer based on layout_version
+
+# 0.5.10
+
+* Removed only_for_export flag. No longer used and did not do what people expected it to do.
+
 # 0.5.9
 
 * added `require 'ostruct'` since running quby-compile suddenly fails on this.

data/lib/quby/compiler/dsl/questionnaire_builder.rb

@@ -131,8 +131,8 @@ module Quby
           @questionnaire.enable_previous_questionnaire_button = true
         end
 
-        def renderer_version(version)
-          @questionnaire.renderer_version = version
+        def layout_version(version)
+          @questionnaire.layout_version = version
         end
 
         def css(value)

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

@@ -4,7 +4,7 @@ module Quby
   module Compiler
     module Entities
       class Flag < Struct.new(:key, :description_true, :description_false, :description, :internal, :trigger_on,
-                              :shows_questions, :hides_questions, :depends_on, :default_in_interface)
+                              :shows_questions, :hides_questions, :depends_on, :default)
         # rubocop:disable ParameterLists
         def initialize(key:,
                        description_true: nil,
@@ -15,10 +15,11 @@ module Quby
                        shows_questions: [],
                        hides_questions: [],
                        depends_on: [], # used in interface to hide this flag unless the depended on flag is set to true
+                       default: nil,
                        default_in_interface: nil) # used in interface to set a default for the flag state,
                                                   # 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)
+                hides_questions, Array.wrap(depends_on).map(&:to_s), (default.nil? ? default_in_interface : default))
         end
         # rubocop:enable ParameterLists
 

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

@@ -37,7 +37,7 @@ module Quby
           @charts = Charting::Charts.new
           @fields = Fields.new(self)
           @license = :unknown
-          @renderer_version = :v1
+          @layout_version = nil
           @extra_css = ""
           @allow_switch_to_bulk = false
           @panels = []
@@ -71,7 +71,7 @@ module Quby
         attr_accessor :panels
         attr_accessor :score_calculations
         attr_accessor :default_answer_value
-        attr_accessor :renderer_version
+        attr_accessor :layout_version
         attr_writer   :leave_page_alert
         attr_reader   :fields
         attr_accessor :extra_css

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

@@ -10,8 +10,6 @@ module Quby
         # The shortened key that will used as the field/column name for csv and oru exports,
         # excluding the questionnaire key part
         attribute :export_key, Types::Symbol
-        # [Optional] Whether this score will only be exported through oru/api/data exports, but not shown in interfaces
-        attribute :only_for_export?, Types::Bool
         # [Optional] The key of the variable definition used to calculate the subscore result.
         attribute :calculation_key?, Types::Symbol
         # [Optional argument] The name of the outcome table where this subscore should be shown. Used for cases where scores

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

@@ -225,7 +225,6 @@ module Quby
                   key: subschema.key,
                   label: subschema.label,
                   export_key: subschema.export_key,
-                  only_for_export: subschema.only_for_export
                 }
               end
             }
@@ -283,7 +282,7 @@ module Quby
               shows_questions: flag.shows_questions,
               hides_questions: flag.hides_questions,
               depends_on: flag.depends_on,
-              default_in_interface: flag.default_in_interface,
+              default: flag.default,
             }
           end
         end
@@ -332,7 +331,6 @@ module Quby
             license: questionnaire.license,
             licensor: questionnaire.licensor,
             language: questionnaire.language,
-            renderer_version: questionnaire.renderer_version,
             last_author: questionnaire.last_author,
             extra_css: questionnaire.extra_css,
             allow_switch_to_bulk: questionnaire.allow_switch_to_bulk,

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

@@ -13,6 +13,7 @@ module Quby
         def as_json(options = {})
           {
             key: key,
+            layout_version: layout_version || :v1,
             title: title,
             language: language || "nl",
             description: description,

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

@@ -23,6 +23,7 @@ module Quby
         def as_json(options = {})
           {
             key: questionnaire.key,
+            renderer:,
             versions: versions,
             keys: questionnaire.roqua_keys,
             roqua_keys: questionnaire.roqua_keys,
@@ -45,6 +46,14 @@ module Quby
           }
         end
 
+        def renderer
+          case questionnaire.layout_version
+          when :v2 then 'quby2'
+          when :v1 then 'quby'
+          else nil
+          end
+        end
+
         def versions
           questionnaire.versions.map do |version|
             {
@@ -261,7 +270,6 @@ module Quby
               key: subscore.key,
               label: subscore.label,
               export_key: subscore.export_key,
-              only_for_export: subscore.only_for_export.presence,
               type: subscore.type
             }.compact
           }
@@ -279,7 +287,8 @@ module Quby
               shows_questions: flag.shows_questions,
               hides_questions: flag.hides_questions,
               depends_on: flag.depends_on,
-              default_in_interface: flag.default_in_interface
+              default: flag.default,
+              default_in_interface: flag.default # TODO: Remove this when Roqua supports default natively
             }
           end
         end

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

@@ -45,6 +45,10 @@ module Quby
           if questionnaire.description && questionnaire.description.size > 255
             fail "Questionnaire description is too long."
           end
+
+          unless [nil, :v1, :v2].include?(questionnaire.layout_version)
+            fail "Questionnaire layout_version must be either :v1 or :v2."
+          end
         end
 
         def validate_fields(questionnaire)

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

@@ -315,15 +315,10 @@ module Quby
           questionnaire.score_schemas.values.each do |score_schema|
             score_labels << score_schema.label
             score_keys << score_schema.subscore_schemas.map do |subschema|
-              hash = {
+              {
                 key: subschema.key,
                 header: subschema.export_key.to_s # a shortened key used as PART OF the csv export column headers
               }
-              if subschema.only_for_export
-                hash.merge(hidden: true)
-              else
-                hash
-              end
             end
 
             headers = score_schema.subscore_schemas.map(&:label)

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.9"
+    VERSION = "0.5.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.11
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel