quby-compiler 0.5.26 → 0.5.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb03f5addb141e1e202837e24ca40e98f9e9c8e2560eccfbdd3685dbe88d2f4a
-  data.tar.gz: 4d5b0f40b267fc8e2b538edcb0e7af777fb63df221aa982f8fb8a8f2c334491f
+  metadata.gz: 258b02451b98e7d37bda66a027d936e29dc81de2ec230e6cb304e957aa707daa
+  data.tar.gz: 32afc3c10ac8dc491dea798046ae4175e0c71cdcf31137dc22c822bdf81d5c8b
 SHA512:
-  metadata.gz: bdc2a846329dd4f32cbbdaf6b29eac0112d02777c1105773321c864addef32158005b1660ad6012ae83ccfeea0d5e5e18c730b6737b911a432d5f9ca768f0c10
-  data.tar.gz: be50d806c0711d615bf3dc2de53d1646253e945345c73f984e8111b4cf0af2edc93dca50ecaa5157e9fdd8d3c011b8efee00a7018c5d2587f9b291ab99c1b0ee
+  metadata.gz: 71caf12ba67af3315949989b6b37213168cb5c18ea1ee2199668ed10c91123af67e23304b55bedbea6522acf89af939b47d3891b1aa24c47197aa7b86aea9fb2
+  data.tar.gz: c52b9f16bdbf8bd70094dd6d51ec7e29890a55f24e15adb8e727ae42cb4df85db1b3ebc69bf238ec09974c9bab14615c49d02f884b4d96073ab8e7f50ebcf0a6

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.5.28
+
+* roqua.json: Don't parse markdown in title/descriptions for layour_version :v2
+
+# 0.5.27
+
+* roqua.json: put label in context_free description if present.
+* quby2.json: write option#description to label when no label present. parse/sanitize label when not select.
+
 # 0.5.26
 
 * Quby2: Allow img tags

data/lib/quby/compiler/dsl/merge(values(:v_1, :v_2), values(v_4).rb

@@ -0,0 +1,16 @@
+merge(values(:v_1, :v_2), values(v_4).recode(1 => 3)).sum
+
+
+
+divide(value(:v_2), multiply(value(:v_1), value(:v_1)))
+
+w / l * l
+
+
+sexp_variable :key1 do
+  foo = values(:v_1, :v_2)
+  bar = recode(foo, 1 => 3)
+  bla = merge(foo, bar)
+  sum(bla)
+
+end

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

@@ -261,12 +261,16 @@ module Quby
         end
 
         def option_as_json(option)
+          label = option.label || option.description
+          label = handle_html(label) if option.question.type != :select
+          description = !option.label ? nil : option.description
+          description  = handle_html(description) if option.question.type != :select
           {
             type: 'option',
             key: option.key,
             value: option.question.type != :check_box && option.value,
-            label: option.label, # TODO fallback on description and empty description if no label (after quby2 has been deployed)
-            description: option.question.type == :select ? option.description : handle_html(option.description),
+            label:,
+            description:,
             questions: option.question.type != :select && option.questions.map{ question(_1) },
             hidden: option.hidden.presence,
             viewId: option.view_id

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

@@ -244,7 +244,7 @@ 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),
+              description: option.context_free_description || parse_markdown_and_strip_tags(option.label || option.description),
               child_question_keys: option.questions.map(&:key).presence,
               unchecks_all_others: question.try(:uncheck_all_option) && question.uncheck_all_option == option.key
             }.compact
@@ -304,8 +304,13 @@ module Quby
           end
         end
 
-        def parse_markdown_and_strip_tags(markdown)
-          strip_tags_without_html_encode(Quby::Compiler::MarkdownParser.new(markdown).to_html)
+        # Only parses markdown for layout v1
+        def parse_markdown_and_strip_tags(markdown_or_html)
+          if questionnaire.layout_version == :v2 # only supports markdown in `text`-method, which doesn't show up in roqua.json
+            strip_tags_without_html_encode(markdown_or_html)
+          else
+            strip_tags_without_html_encode(Quby::Compiler::MarkdownParser.new(markdown_or_html).to_html)
+          end
         end
 
         def strip_tags_without_html_encode(html)

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.26"
+    VERSION = "0.5.28"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.26
+  version: 0.5.28
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-07-29 00:00:00.000000000 Z
+date: 2025-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -151,6 +151,7 @@ files:
 - lib/quby/compiler/dsl/charting/radar_chart_builder.rb
 - lib/quby/compiler/dsl/helpers.rb
 - lib/quby/compiler/dsl/info_block_builder.rb
+- lib/quby/compiler/dsl/merge(values(:v_1, :v_2), values(v_4).rb
 - lib/quby/compiler/dsl/panel_builder.rb
 - lib/quby/compiler/dsl/question_builder.rb
 - lib/quby/compiler/dsl/questionnaire_builder.rb