quby-compiler 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82298997f758c4ea2df21fe0c773a16ae92d25ac1074bf1a5b28481d5f9df91c
-  data.tar.gz: 20f134c1d21d928ff998066c776470dd4b15b3b74c337d8a8b1ff4cecca570ac
+  metadata.gz: b8077f55592000120cadb53b6bf02081d2f1bb98bacdfd7a35133efc91d64fff
+  data.tar.gz: 05c78c8b6c61f5317d087145ede42828d62df898be40f8fd8c9e584d6625f865
 SHA512:
-  metadata.gz: 178feed69dac1d95d8a8323d783f09abb134cffd870d857e1fc709b1044992016985242c77d35a72ce4c6b4e36f4f3dea8110d7f7e5bc47ccc275f491f611823
-  data.tar.gz: e2d3e142e77b3806c2c407eff25fb71513f7fedacbce04a97c2d89c5352b9dca3aa45210ba67e2f79fb81290a1eb11377ae669f900b8266fa37c8f458299c616
+  metadata.gz: 51256d96238a758e40e9dac04cad8e011038ccb98b0a97c27b134e05505f2fa28145b6a4296ae778e661483460feff6c2d6ab7208f06fc5b975236a08d60c080
+  data.tar.gz: 5f7b82f1f302c1677a0e50764ec58576be05ba4d06218710e85190f4ffab8a3433cc13e3a79af17a4a80edb2cb0b9c7c8a5ef0e99440a2c74d38e820d6fe64c3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 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.

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/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/outputs/quby_frontend_v1_serializer.rb

@@ -331,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|
             {

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/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.10"
+    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.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2025-01-22 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.5.3
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: Quby::Compiler compiles a DSL for questionnaires to JSON