quby-compiler 0.5.35 → 0.5.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a21391f3c8b8e87e569154611f701918f002f296dd989f6a2a3fb532c6e97b57
-  data.tar.gz: bb2269eee7a3c44155416d5b55fae9363b501180c24140f8b46dccca7f5259d0
+  metadata.gz: f99d7e4e00d6ab08172da731229ed790720f8131ca55a9919a8d6f4823da1bbe
+  data.tar.gz: a7855f35d16daded7a21e60564322576b7ea8f967052e72d8d4f8eb194b53f04
 SHA512:
-  metadata.gz: c0658acad6b54a986f2033d8807bf0d837a9c3725cdde0e5d41fbf9a8c208252a085bffa96229b6462bd76e0d1408f911d7d441ff039133716e534adbdc4eb9f
-  data.tar.gz: 33bcd08d06a3afa16b2d9903b4c454f4c9a22e43da01212c6d2d601504446c5e2830fd521820eca2cb5a7c9502ba5bd0306599f87299de365bd1f1e032420008
+  metadata.gz: 4c0260b251395ef6fcf757ecc1ddaf120139716c6f0ae27a77450dea9719d76f103891b060b74146aee408d68febffd398436ce613d3c8031215e6f6b01035d6
+  data.tar.gz: e20c44b3fba04514aa601e52c9b7321e185bbea66d9e12e112efdd20023b91bfc52f30de3f4ebf0959426eb4aa351499abe2b7b4b5e5ac5ea2b6b04b5e4f5544

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.5.37
+
+* added support for indenting questions
+* quby2: Added versionNumber.
+* added validations for checkbox options to have a (context_free_)description
+* removed bulkview logic
+
+# 0.5.36
+
+* Fix visibility_rules ordering.
+* seeds.yml: use option#label when available.
+
 # 0.5.35
 
 * Fix sexp validations not always recursing right.

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/dsl/questionnaire_builder.rb

@@ -151,8 +151,8 @@ module Quby
           @questionnaire.css_vars.merge!(value)
         end
 
+        # deprecated no-op
         def allow_switch_to_bulk(value=true)
-          @questionnaire.allow_switch_to_bulk = value
         end
 
         def default_answer_value(value)

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

@@ -30,6 +30,9 @@ module Quby
 
         # extra styling options
         attr_accessor :css_vars
+        # indent the question, to make it belong to the previous one.
+        attr_accessor :indent
+        validates :indent, inclusion: {in: [nil, 0, 1], message: "must be 0 or 1"}
 
         # To hide old questions
         attr_accessor :hidden
@@ -169,6 +172,7 @@ module Quby
           @default_invisible = options[:default_invisible] || false
           @labels ||= []
           @css_vars = options[:css_vars]
+          @indent = options[:indent]
 
           @col_span = options[:col_span] || 1
           @row_span = options[:row_span] || 1

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

@@ -14,6 +14,8 @@ module Quby
         validates :value, numericality: {allow_nil: true} # nil for checkbox questions.
         attr_reader :label
         attr_reader :description, :context_free_description
+        validates :context_free_description, presence: {if: -> { question.type == :check_box && label.blank? && description.blank? && !inner_title }, message: "(context_free_)description must be present"}
+
         attr_reader :questions
         # for scale/radio/checbox questions, piece of of html that is rendered between the options
         attr_reader :inner_title

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

@@ -41,7 +41,6 @@ module Quby
           @layout_version = nil
           @extra_css = ""
           @css_vars = nil
-          @allow_switch_to_bulk = false
           @panels = []
           @flags = {}.with_indifferent_access
           @textvars = {}.with_indifferent_access
@@ -82,7 +81,6 @@ module Quby
         attr_reader   :fields
         attr_accessor :extra_css
         attr_accessor :css_vars
-        attr_accessor :allow_switch_to_bulk
         attr_reader   :license
         attr_accessor :licensor
         attr_accessor :language
@@ -136,6 +134,10 @@ module Quby
           @roqua_keys || [key]
         end
 
+        def version_number
+          versions.last&.number || 0
+        end
+
         def to_param
           key
         end
@@ -398,7 +400,7 @@ module Quby
         # This is important since a shown question can't be hidden, so each question is only ever changed once while looping over the rules.
         def visibility_rules
           return @visibility_rules if @visibility_rules
-          question_order = sorted_questions.map.with_index{ [_1, _2] }.to_h
+          question_order = sorted_questions.map.with_index{ [_1.key, _2] }.to_h
           @visibility_rules ||= [
             *flags.values.flat_map { |flag| VisibilityRule.from_flag(flag) },
             *sorted_questions.flat_map { |question| VisibilityRule.from(question) },

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

@@ -9,24 +9,24 @@ module Quby
             # Transform "default invisible" into just being hidden by itself,
             # since any other question showing it will take precedence anyway.
             if question.default_invisible
-              rules << new(condition: { type: :always, field_key: question.key },
-                           action: { type: :hide_question, field_key: question.key })
+              rules << new(condition: { type: 'always', field_key: question.key },
+                           action: { type: 'hide_question', field_key: question.key })
             end
             if question.hidden # hide by default, show if data is already present.
-              rules << new(condition: { type: :always, field_key: question.key },
-                           action: { type: :hide_question, field_key: question.key })
-              rules << new(condition: { type: :answered, evenWhenHidden: true, field_key: question.key },
-                           action: { type: :show_question, field_key: question.key })
+              rules << new(condition: { type: 'always', field_key: question.key },
+                           action: { type: 'hide_question', field_key: question.key })
+              rules << new(condition: { type: 'answered', evenWhenHidden: true, field_key: question.key },
+                           action: { type: 'show_question', field_key: question.key })
             end
 
             case question.type
             when :radio, :scale, :select
               question.all_options.each do |option|
-                rules.concat rules_for_option(question, option, type: :equal)
+                rules.concat rules_for_option(question, option, type: 'equal')
               end
             when :check_box
               question.options.each do |option|
-                rules.concat rules_for_option(question, option, type: :contains)
+                rules.concat rules_for_option(question, option, type: 'contains')
               end
             end
           end
@@ -36,12 +36,12 @@ module Quby
           [].tap do |rules|
             option.shows_questions.each do |shows_question|
               rules << new(condition: { type: type, field_key: question.key, value: option.key },
-                           action: { type: :show_question, field_key: shows_question })
+                           action: { type: 'show_question', field_key: shows_question })
             end
 
             option.hides_questions.each do |hides_question|
               rules << new(condition: { type: type, field_key: question.key, value: option.key },
-                           action: { type: :hide_question, field_key: hides_question })
+                           action: { type: 'hide_question', field_key: hides_question })
             end
           end
         end

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

@@ -335,7 +335,6 @@ module Quby
             language: questionnaire.language,
             last_author: questionnaire.last_author,
             extra_css: questionnaire.extra_css,
-            allow_switch_to_bulk: questionnaire.allow_switch_to_bulk,
 
             panels: panels,
             score_calculations: score_calculations,

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

@@ -27,6 +27,7 @@ module Quby
             visibilityRules: visibility_rules.as_json,
             sexpVariables: sexp_variables,
             cssVars: css_vars,
+            versionNumber: version_number,
           }.compact.tap do |json|
             validate_all_questions_in_a_panel_question_keys(json)
           end
@@ -202,6 +203,8 @@ module Quby
             contextDescription: handle_html(question.context_description, type: :prose, v1_markdown: false),
             type: question_type(question),
             cssVars: question.css_vars,
+            indent: question.indent,
+
             hidden: question.hidden?,
             displayModes: question.display_modes,
             viewSelector: question.view_selector,

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

@@ -40,7 +40,7 @@ module Quby
             when :select
               d_qtypes[question.key.to_s] = { type: :discrete }
               for option in question.all_options
-                d_qtypes[question.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || option.description || "") unless option.placeholder
+                d_qtypes[question.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || option.label || option.description || "") unless option.placeholder
               end
               update_hidden_questions_for(question)
             when :check_box
@@ -53,7 +53,7 @@ module Quby
                 end
                 value = 1
                 option_type = { type: :discrete }
-                option_type[value.to_s] = (option.context_free_description || option.description || "")
+                option_type[value.to_s] = (option.context_free_description || option.label || option.description || "")
                 option_type[:depends] = { values: [value, value.to_s].uniq, variable: option.key.to_s } unless options[:without_depends]
                 d_qtypes[option.key.to_s] = option_type
                 values = [value, value.to_s].uniq
@@ -278,7 +278,7 @@ module Quby
           update_hidden_questions_for(question)
           for option in question.all_options
             next if option.inner_title
-            d_qtypes[question.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || option.description || "")
+            d_qtypes[question.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || option.label || option.description || "")
             values << option.value.to_s
             key = question.key.to_s
             handle_subquestions(question, quests, d_qtypes, vars, option, [option.value.to_s], key)

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.35"
+    VERSION = "0.5.37"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.35
+  version: 0.5.37
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 2025-10-16 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