quby-compiler 0.5.25 → 0.5.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88d7b643df83366f5d577296c9d157aa6862a1f67f859e04031bef70bc43a40d
-  data.tar.gz: 7e7dcd545a28bbf2089d1d024a4670fb4b6e661d992f4e2fde8aed059440a1da
+  metadata.gz: a93d6d4ac13078651742bb23af84089fa529ac307fe1352e54bebd563d76b168
+  data.tar.gz: 4289ba8dd18fce9b9524442c47505be23026e2b9a5588281bba80feeafffe96c
 SHA512:
-  metadata.gz: d13f171ab6f4c2ef3944435b3a9b2974e4d872341128d2d6d461ee9502331086cf30a7b4b9b65d9efa194e34d8facb6489db686e06c0ad2d70fc07a4d4825bdc
-  data.tar.gz: 263f34523e7de734570fb375c1887dc77d4ed307574087cef3d8debf455a3f0c01e45f9a359314502efcb34640c453f4de02a809bbe5b4c0d0c16ac3a60b6d01
+  metadata.gz: 4375702ad36d91113b3c1845e2689bef9f4da47c4de32d877c3f26f5c08268ecb8aaef851acd1b2cc7b22879a7845094b2a768caa26db8ab344058f086885474
+  data.tar.gz: c5464526e4bc0b4ccb0228e83179140477c72a5bc8fb1eae2ff6a12bad94af7e505afc60104e395d9a572cb45837b599b0d5767cc636671fac79a162f4c2afc2

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 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
+* Added numeric_compare visibility rule to questions
+
 # 0.5.25
 
 * Give info block a type in ruby (new validator expects it)

data/lib/quby/compiler/dsl/questions/base.rb

@@ -83,6 +83,36 @@ module Quby
           end
         end
 
+        module CompareVisibilityRule
+          def compare_value(op:, value:, show_questions: [], hide_questions: [])
+            raise "unknown op #{op} for #{@question.key}" unless %i[gt gteq lt lteq eq].include?(op)
+            condition = {
+              type: 'numeric_compare',
+              field_key: @question.key,
+              op:,
+              value:
+            }
+            show_questions.each do |show_key|
+              @question.visibility_rules << Entities::VisibilityRule.new(
+                condition:,
+                action: {
+                  type: 'show_question',
+                  field_key: show_key
+                }
+              )
+            end
+            hide_questions.each do |hide_key|
+              @question.visibility_rules << Entities::VisibilityRule.new(
+                condition:,
+                action: {
+                  type: 'hide_question',
+                  field_key: hide_key
+                }
+              )
+            end
+          end
+        end
+
         module Labeling
           def label(value)
             @question.labels << value

data/lib/quby/compiler/dsl/questions/float_question_builder.rb

@@ -9,6 +9,7 @@ module Quby
           include Labeling
           include Units
           include Sizes
+          include CompareVisibilityRule
 
           def initialize(key, **options, &block)
             super

data/lib/quby/compiler/dsl/questions/integer_question_builder.rb

@@ -9,6 +9,7 @@ module Quby
           include Labeling
           include Units
           include Sizes
+          include CompareVisibilityRule
 
           def initialize(key, **options, &block)
             super

data/lib/quby/compiler/dsl/questions/radio_question_builder.rb

@@ -8,6 +8,7 @@ module Quby
           include MultipleChoice
           include Subquestions
           include InnerTitles
+          include CompareVisibilityRule
 
           def initialize(key, **options, &block)
             super

data/lib/quby/compiler/dsl/questions/select_question_builder.rb

@@ -6,6 +6,7 @@ module Quby
       module Questions
         class SelectQuestionBuilder < Base
           include MultipleChoice
+          include CompareVisibilityRule
 
           def initialize(key, **options, &block)
             super

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

@@ -69,6 +69,7 @@ module Quby
 
         # Structuring
         attr_accessor :validations
+        attr_reader :visibility_rules # Quby2 only
         attr_accessor :dependencies
 
         # To display unit for number items
@@ -150,6 +151,7 @@ module Quby
           @display_modes = options[:display_modes]
           @presentation = options[:presentation]
           @validations = []
+          @visibility_rules = []
           @parent = options[:parent]
           @hidden = options[:hidden]
           @table = options[:table]

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

@@ -4,6 +4,8 @@ module Quby
       class VisibilityRule
         def self.from(question)
           [].tap do |rules|
+            rules.concat question.visibility_rules
+
             # Transform "default invisible" into just being hidden by itself,
             # since any other question showing it will take precedence anyway.
             if question.default_invisible

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
@@ -331,11 +335,11 @@ module Quby
           if layout_version == :v2
             case type
             when :simple
-              html_sanitizer.sanitize(html, tags: %w[strong em sup sub br span], attributes: %w[class])
+              html_sanitizer.sanitize(html, tags: %w[strong em sup sub br span img], attributes: %w[class src alt width height])
             when :question_description
-              html_sanitizer.sanitize(html, tags: %w[strong em b i u sup sub pre blockquote p span br ul ol li a], attributes: %w[class])
+              html_sanitizer.sanitize(html, tags: %w[strong em b i u sup sub pre blockquote p span br ul ol li a img], attributes: %w[class href target src alt width height])
             when :prose
-              html_sanitizer.sanitize(html, tags: %w[strong em b i u sup sub pre blockquote p span br ul ol li a h1 h2 h3 h4 hr], attributes: %w[href class target])
+              html_sanitizer.sanitize(html, tags: %w[strong em b i u sup sub pre blockquote p span br ul ol li a img h1 h2 h3 h4 hr], attributes: %w[href class target  src alt width height])
             end
           elsif v1_markdown
             Quby::Compiler::MarkdownParser.new(html).to_html

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

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.25"
+    VERSION = "0.5.27"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.25
+  version: 0.5.27
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-07-07 00:00:00.000000000 Z
+date: 2025-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel