quby-compiler 0.5.35 → 0.5.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a21391f3c8b8e87e569154611f701918f002f296dd989f6a2a3fb532c6e97b57
-  data.tar.gz: bb2269eee7a3c44155416d5b55fae9363b501180c24140f8b46dccca7f5259d0
+  metadata.gz: 45c8bbec37f2c99aaf33cbb7eb1fd0d7ab0e652c9173bf65cd9e84495f7adf23
+  data.tar.gz: 4a17cf5484dc9154e5c96b276a1c2f0cfa3358adb9ce0e1f0a37a51690493e18
 SHA512:
-  metadata.gz: c0658acad6b54a986f2033d8807bf0d837a9c3725cdde0e5d41fbf9a8c208252a085bffa96229b6462bd76e0d1408f911d7d441ff039133716e534adbdc4eb9f
-  data.tar.gz: 33bcd08d06a3afa16b2d9903b4c454f4c9a22e43da01212c6d2d601504446c5e2830fd521820eca2cb5a7c9502ba5bd0306599f87299de365bd1f1e032420008
+  metadata.gz: 68acd5fbc780bd6b31fdc43aa1d2a266ab69416c16ba2475fed0ecce8de526b443c0d69b07a45076de2ffedb633222b60cf3eb3f8f3312ccca6042129acad80c
+  data.tar.gz: 93b072eea61d9833505d08cd022ba9651a8f513bb006d881d04512d46211fdf2368ead687f2bf05bf85eb97c94b532b18e9ede1e9398a83c9f80e13f746050ad

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 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/entities/questionnaire.rb

@@ -398,7 +398,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/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.36"
   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.36
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 2025-10-01 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