quby-compiler 0.5.31 → 0.5.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6013111357cf3e8e7e55045da2b06aeec8040b66034709091357ed43fb2eff6
-  data.tar.gz: eac3c3ce3e2d961336fe7b230d9f299a3fc0065cac2695e87019ba12ad9d60ed
+  metadata.gz: 4c1af309fb9a9b4b95c7ec4e7d41cc9e1f69a21bfbf2b7267649f50b7d87bffe
+  data.tar.gz: 06caabaaed4da6c9951f37491e0d8e31817ec2998b3662bb09186d024a52ce52
 SHA512:
-  metadata.gz: 6ecb2bf5bdfaad1a377466e14d8c9cf39cf7d761144c0fa4c203e42ecfdeb46b5495005a029274c6bfe1baabf0e2bb526de080b1e2170a35f9ea3c5e973439a9
-  data.tar.gz: 45da18a37f6878de89bab06f3c9d87fa0ab52cb8ef767a796689d8ca8b9fd6511e9a9672b4095eba5220d93a8105b035a949a418e530f9fe73d0d4dc187defd1
+  metadata.gz: b46018e140022030f7aa573e02d9ac213fd8acd28c3d31b24ac4f06d079deade64f60a39455476e337ff34499eb6921449d4f73024d579eb61fe9aabfba0008c
+  data.tar.gz: 821f576e5a389a6cd6f988e667e6440e3aecdc025443caf56a572773065d7142110f298331140b7555fe35867e11ebcfc26a16ab74a4656f4e28413b7a7d2aab

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.5.33
+
+* quby_proxy: fixes for optgroups.
+
+# 0.5.32
+
+* quby2.json: Add label to optgroups.
+
 # 0.5.31
 
 * Fix validator not looking inside optgroups.

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

@@ -248,6 +248,7 @@ module Quby
             if child.is_a?(Quby::Compiler::Entities::QuestionOptgroup)
               { type: 'optgroup',
                 key: child.key,
+                label: child.label,
                 options: child.options.map { option_as_json(_1) }
               }
             elsif child.inner_title

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

@@ -39,13 +39,13 @@ module Quby
               handle_scale(question, question_titles, d_qtypes, vars)
             when :select
               d_qtypes[question.key.to_s] = { type: :discrete }
-              for option in question.options
+              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
               end
               update_hidden_questions_for(question)
             when :check_box
               d_qtypes[question.key.to_s] = { type: :check_box }
-              question.options.each do |option|
+              question.all_options.each do |option|
                 next if option.inner_title
                 vars << option.key.to_s
                 if question.hidden
@@ -82,7 +82,7 @@ module Quby
               else
                 no_keys = true
                 values = []
-                question.options.each do |option|
+                question.all_options.each do |option|
                   if option.value # scale or radio
                     vars << question.key.to_s unless vars.include? question.key.to_s
                     next if option.inner_title
@@ -150,7 +150,7 @@ module Quby
         end
 
         def update_hidden_questions_for(question, for_checkbox: false)
-          shows = question.options.each_with_object({}) do |option, shows|
+          shows = question.all_options.each_with_object({}) do |option, shows|
             next if option.inner_title
             for key in option.shows_questions
               skey = key.to_s
@@ -255,7 +255,7 @@ module Quby
           d_qtypes[quest.key.to_s] = { type: :scale }
           d_qtypes[quest.key.to_s][:depends] = { values: values, variable: key } unless options[:without_depends]
           quests[quest.key.to_s] = strip_tags(quest.context_free_title || quest.title || "")
-          for option in quest.options
+          for option in quest.all_options
             next if option.inner_title
             d_qtypes[quest.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || option.description || "")
           end
@@ -276,7 +276,7 @@ module Quby
           d_qtypes[question.key.to_s] = { type: :scale }
           values = []
           update_hidden_questions_for(question)
-          for option in question.options
+          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 || "")
             values << option.value.to_s

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.31"
+    VERSION = "0.5.33"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.31
+  version: 0.5.33
 platform: ruby
 authors:
 - Marten Veldthuis