quby-compiler 0.5.36 → 0.5.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45c8bbec37f2c99aaf33cbb7eb1fd0d7ab0e652c9173bf65cd9e84495f7adf23
-  data.tar.gz: 4a17cf5484dc9154e5c96b276a1c2f0cfa3358adb9ce0e1f0a37a51690493e18
+  metadata.gz: 9f717b87f1eeac5b54e6230cc80880a40b46596790536a513a3802d050e25ab6
+  data.tar.gz: e28bf580f65ab625b51d8448f5a49f03169694a0864e7d3d888cef7d7d83f3f3
 SHA512:
-  metadata.gz: 68acd5fbc780bd6b31fdc43aa1d2a266ab69416c16ba2475fed0ecce8de526b443c0d69b07a45076de2ffedb633222b60cf3eb3f8f3312ccca6042129acad80c
-  data.tar.gz: 93b072eea61d9833505d08cd022ba9651a8f513bb006d881d04512d46211fdf2368ead687f2bf05bf85eb97c94b532b18e9ede1e9398a83c9f80e13f746050ad
+  metadata.gz: 0ee40da6cd79071369b6b183ef357b915a03a6f7755a92e06ee61167c7a39863086656b61e715e03e68db0d856d4fbf76b394801ae488c5673750aa7ac57cd2e
+  data.tar.gz: be3c0096361e0713738fdbbd3e2d497c9788a0dfe72df83298e189caa811ca55707d57f78bc32c7acb6ae42c7f4e9b3f646865e675b86a2c60a458d865c41528

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.5.38
+
+* Fail when using unsupported features in layout_version :v2
+* Allow context_description to set via question options, so custom_methods don't have to specifically mention it.
+
+# 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.

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
@@ -149,6 +152,7 @@ module Quby
           @context_free_title = options[:context_free_title]
           @allow_blank_titles = options[:allow_blank_titles]
           @description = options[:description]
+          @context_description = options[:context_description]
           @display_modes = options[:display_modes]
           @presentation = options[:presentation]
           @validations = []
@@ -169,6 +173,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

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

@@ -30,6 +30,7 @@ module Quby
           validate_info_blocks(questionnaire)
           validate_checkbox_options(questionnaire)
           validate_visiblity_rules(questionnaire)
+          validate_quby2_unsupported_features(questionnaire)
         # Some compilation errors are Exceptions (pure syntax errors) and some StandardErrors (NameErrors)
         rescue Exception => exception # rubocop:disable Lint/RescueException
           definition.errors.add(:sourcecode, message: "Questionnaire error: #{definition.key}\n" \
@@ -436,6 +437,29 @@ scores_schema tables to the resulting seed."
             end
           end
         end
+
+        def validate_quby2_unsupported_features(questionnaire)
+          return unless questionnaire.layout_version == :v2
+
+          if questionnaire.extra_css.present?
+            fail "'extra_css' unsupported for Quby 2 layout."
+          end
+          questionnaire.questions.each do |question|
+            if question.title_question
+              fail "Question #{question.key} uses unsupported feature 'title_question' for Quby 2 layout."
+            end
+            if question.display_modes.present?
+              fail "Question #{question.key} uses unsupported feature 'display_modes' for Quby 2 layout."
+            end
+          end
+          questionnaire.panels.each do |panel|
+            panel.items.each do |item|
+              if item.is_a?(Entities::Table)
+                fail "Questionnaire uses unsupported feature 'table' for Quby 2 layout."
+              end
+            end
+          end
+        end
       end
     end
   end

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.36"
+    VERSION = "0.5.38"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.36
+  version: 0.5.38
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-10-01 00:00:00.000000000 Z
+date: 2025-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -151,7 +151,6 @@ 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

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

@@ -1,16 +0,0 @@
-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