quby-compiler 0.4.4 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: affdedce52abd30377ecb0919b012353f6af8139cea5747acc4b82c67d9923a8
-  data.tar.gz: d21ad635fd6d232a58d0fd691b91d5f9f9a35f5fe36a024b3056e501870a05ac
+  metadata.gz: 886ce60c1b1c37de0dfdbb8d0b14b4c2ed2574f873a2230ff50e80413e50c031
+  data.tar.gz: ee12f0733d624ffea8061b4f9f7bcbcdea9c904eb05d9b1e426b9f646bae91da
 SHA512:
-  metadata.gz: 83a2a47a517f5666bd34b76d1528ca1ccb7f38e60991eda82c134bec2116640e191954cc643d588a3aa8f95c9bc779ddeabe2152d1d689f3dcdd53a7a029da35
-  data.tar.gz: e44964d5ea73973db1058018ce460fa0a5ef2da25d7acdf0ee6d1891ef7a42254cf55c2485b04af9fa02af881ae7ef6fb3c4c0e5b3ff452a39f6769d97f63bef
+  metadata.gz: d24325dcee35fafd2d99d65bc6761eb7fa764efe2c5b549208e5130b3b0218bdc2dbf9e932886f1f05a8ac9461236dd398e9d8d733a4a715c2a62fddeb768da0
+  data.tar.gz: 0d45e85ea11b5c03710011aff584bf6df363f140184519e6a5c374651e516599a7667921560b41d3870b4c3ef98a55cfc097550aba39199f4be233001453e0fc

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+# 0.4.8
+
+* roqua.json: 
+  * sort parent questions before it's children, to make the order more logical to just dumbly show
+  * parse markdown before stripping tags (questiom.title, option.description)
+  * context-free-titles no longer contain the title as fallback
+* quby2.json
+  * sort visibility rules: flags first, then in question order, so we can apply them in order without issue
+
+# 0.4.7
+
+* seeds.yml: Fix missing title questions (broken by 0.4.6)
+
+# 0.4.6
+
+* Added type validations for boolean attributes
+* roqua.json
+  * add unit to questions
+  * add title_question_key to questions
+  * add parent_question_key and parent_option_key to questions
+  * add child_question_keys to question_options
+* models
+  * Made title_question attribute on question instead of adding options.last.questions.
+  * Made v1 serializer create backward compatible json (for now)
+  * Made v1 serializer add the full title_question json to question.title_question.
+
+# 0.4.5
+
+* roqua.json: Don't add inner titles and placeholder options
+
 # 0.4.4
 
 * quby-compile will now validate, not compile invalid questionnaires and return 1  when any invalid.

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

@@ -114,16 +114,6 @@ module Quby
           def initialize(key, **options, &block)
             super
             @default_question_options = options[:default_question_options] || {}
-            @title_question = nil
-          end
-
-          def build
-            if @title_question
-              @question.options.last.questions << @title_question
-              @title_question = nil
-            end
-
-            super
           end
 
           def title_question(key, **options, &block)
@@ -138,7 +128,7 @@ module Quby
             question = QuestionBuilder.build(key, **options, &block)
 
             @questionnaire.register_question(question)
-            @title_question = question
+            @question.title_question = question
           end
 
           def question(key, **options, &block)

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

@@ -31,17 +31,6 @@ module Quby
           "#{description} (true - '#{description_true}', false - '#{description_false}')"
         end
 
-        def to_codebook(_options = {})
-          output = []
-          output << "#{key} flag"
-          output << "'#{description}'" if description.present?
-          output << " 'true' - #{description_true}"
-          output << " 'false' - #{description_false}"
-          output << " '' (leeg) - Vlag niet ingesteld, informatie onbekend"
-          output << ""
-          output.join("\n")
-        end
-
         private
 
         def ensure_valid_descriptions

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

@@ -30,10 +30,6 @@ module Quby
             class: self.class.to_s
           }
         end
-
-        def to_codebook(questionnaire, options = {})
-          ""
-        end
       end
     end
   end

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

@@ -29,9 +29,11 @@ module Quby
 
         # To hide old questions
         attr_accessor :hidden
+        validates :hidden, inclusion: {in: [true, false, nil], message: "must be boolean"}
 
         # Whether to skip the uniqueness validation on radio and select option values
         attr_reader :allow_duplicate_option_values
+        validates :allow_duplicate_option_values, inclusion: {in: [true, false, nil], message: "must be boolean"}
 
         # In what modes do we display this question
         # NOTE We always display questions in print-view (if they have an answer)
@@ -40,9 +42,13 @@ module Quby
         # Multiple-choice questions have options to choose from
         attr_accessor :options
 
+        # string question that is displayed after the  title of this  question.
+        attr_accessor :title_question
+
         # Question validation fails when there are no title and no context_free_title.
         # When :allow_blank_titles => true passed, validation does not fail. Any other value will raise the failure.
         attr_accessor :allow_blank_titles
+        validates :allow_blank_titles, inclusion: {in: [true, false, nil], message: "must be boolean"}
 
         # Minimum and maximum values for float and integer types
         attr_accessor :minimum
@@ -72,6 +78,7 @@ module Quby
 
         # Whether this radio question is deselectable
         attr_accessor :deselectable
+        validates :deselectable, inclusion: {in: [true, false, nil], message: "must be boolean"}
 
         # Some questions are a tree.
         attr_accessor :parent
@@ -79,6 +86,7 @@ module Quby
 
         # Whether we can collapse this in bulk view
         attr_accessor :disallow_bulk
+        validates :disallow_bulk, inclusion: {in: [true, false, nil], message: "must be boolean"}
 
         # This question should not validate itself unless the depends_on question is answered.
         # May also be an array of "#{question_key}_#{option_key}" strings that specify options
@@ -115,6 +123,7 @@ module Quby
         attr_accessor :row_span
 
         attr_accessor :default_invisible
+        validates :default_invisible, inclusion: {in: [true, false], message: "must be boolean"}
 
         # Slider only: where to place the sliding thing by default
         # Can have value :hidden for a hidden handle.
@@ -200,6 +209,10 @@ module Quby
         end
         # rubocop:enable CyclomaticComplexity, Metrics/MethodLength
 
+        def context_free_title_or_title
+          context_free_title || title
+        end
+
         # rubocop:disable AccessorMethodName
         def set_depends_on(keys)
           return if keys.blank?
@@ -208,10 +221,6 @@ module Quby
         end
         # rubocop:enable AccessorMethodName
 
-        def context_free_title
-          @context_free_title || @title
-        end
-
         def expand_depends_on_input_keys
           return unless @depends_on
           @depends_on = questionnaire.expand_input_keys(@depends_on)
@@ -247,6 +256,10 @@ module Quby
           end
         end
 
+        def title_question?
+          presentation == :next_to_title
+        end
+
         # Returns all keys belonging to html inputs generated by this question.
         def input_keys
           if options.blank?
@@ -316,39 +329,8 @@ module Quby
           !parent_option_key.nil?
         end
 
-        def to_codebook(questionnaire, opts = {})
-          output = []
-          question_key = codebook_key(key, questionnaire, opts)
-          output << "#{question_key} #{codebook_output_type} #{codebook_output_range}#{' deprecated' if hidden}"
-          output << "\"#{context_free_title}\"" unless context_free_title.blank?
-          options_string = options.map do |option|
-            option.to_codebook(questionnaire, opts)
-          end.compact.join("\n")
-          output << options_string unless options.blank?
-          output.join("\n")
-        end
-
-        def codebook_key(key, questionnaire, opts = {})
-          key.to_s.gsub(/^v_/, "#{opts[:roqua_key] || questionnaire.key.to_s}_")
-        end
-
-        def codebook_output_type
-          type
-        end
-
-        def codebook_output_range
-          range_min = validations.find { |i| i[:type] == :minimum }&.fetch(:value, nil)
-          range_max = validations.find { |i| i[:type] == :maximum }&.fetch(:value, nil)
-
-          if range_min || range_max
-            "(#{[range_min, "value", range_max].compact.join(" &lt;= ")})"
-          else
-            ""
-          end
-        end
-
         def variable_descriptions
-          {key => context_free_title}.with_indifferent_access
+          {key => context_free_title_or_title}.with_indifferent_access
         end
       end
     end

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

@@ -4,23 +4,26 @@ module Quby
   module Compiler
     module Entities
       class QuestionOption
+        include ActiveModel::Validations
+
         MARKDOWN_ATTRIBUTES = %w(description).freeze
 
         attr_reader :key
         attr_reader :value
-        attr_reader :description
+        attr_reader :description, :context_free_description
         attr_reader :questions
         attr_reader :inner_title
+        validates :inner_title, inclusion: {in: [true, false, nil], message: "must be boolean"}
         attr_reader :hides_questions
         attr_reader :shows_questions
         attr_reader :hidden
+        validates :hidden, inclusion: {in: [true, false], message: "must be boolean"}
         attr_reader :placeholder
+        validates :placeholder, inclusion: {in: [true, false], message: "must be boolean"}
         attr_reader :question
         attr_reader :view_id
         attr_reader :input_key
 
-        attr_reader :start_chosen
-
         def initialize(key, question, options = {})
           @key         = key
           @question    = question
@@ -49,10 +52,6 @@ module Quby
           false
         end
 
-        def context_free_description
-          @context_free_description || @description
-        end
-
         def as_json(options = {})
           {
             key: key,
@@ -72,28 +71,6 @@ module Quby
             viewId: view_id
           }
         end
-
-        def to_codebook(questionnaire, opts)
-          return nil if inner_title
-          output = []
-
-          if question.type == :check_box
-            option_key = question.codebook_key(key, questionnaire, opts)
-            output << "#{option_key} #{question.codebook_output_type}#{' deprecated' if hidden || question.hidden }"
-            output << "\"#{question.title} -- #{description}\"" unless question.title.blank? and description.blank?
-            output << "1\tChecked"
-            output << "0\tUnchecked"
-            output << "empty\tUnchecked"
-          else
-            output << "#{value || key}\t\"#{description}\"#{' deprecated' if hidden}"
-          end
-
-          questions.each do |subquestion|
-            output << "\t#{subquestion.to_codebook(questionnaire, opts).gsub("\n", "\n\t")}"
-          end
-
-          output.join("\n")
-        end
       end
     end
   end

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

@@ -172,6 +172,19 @@ module Quby
           end)
         end
 
+        # sorts parents before children, so showing makes more sense and visiblity rules are ordered correctly
+        def sorted_questions
+          return @sorted_questions if @sorted_questions
+
+          key_to_order_by = questions.map.with_index.to_h { [_1.key, [_2]] }
+          questions.each do |question|
+            if question.parent
+              key_to_order_by[question.key].unshift(key_to_order_by[question.parent.key].first)
+            end
+          end
+          @sorted_questions = questions.sort_by { key_to_order_by[_1.key] }
+        end
+
         def questions
           question_hash.values
         end
@@ -201,43 +214,6 @@ module Quby
           }
         end
 
-        # rubocop:disable Metrics/MethodLength
-        def to_codebook(options = {})
-          output = []
-          output << title
-          output << "Date unknown"
-          output << ""
-
-          options[:extra_vars]&.each do |var|
-            output << "#{var[:key]} #{var[:type]}"
-            output << "\"#{var[:description]}\""
-            output << ""
-          end
-
-          top_questions = panels.map do |panel|
-            panel.items.select { |item| item.is_a? Question }
-          end.flatten.compact
-
-          top_questions.each do |question|
-            output << question.to_codebook(self, options)
-            output << ""
-          end
-
-          flags.each_value do |flag|
-            output << flag.to_codebook(options)
-            output << ""
-          end
-
-          textvars.each_value do |textvar|
-            output << textvar.to_codebook(options)
-            output << ""
-          end
-
-          output = output.join("\n")
-          strip_tags(output.gsub(/\<([ 1-9])/, '&lt;\1')).gsub("&lt;", "<")
-        end
-        # rubocop:enable Metrics/MethodLength
-
         def key_in_use?(key)
           fields.key_in_use?(key) || score_calculations.key?(key)
         end
@@ -415,9 +391,14 @@ module Quby
           end.uniq(&:config)
         end
 
+        # Order is important
+        # quby2 follows them one by one and ignores rules by hidden question, so needs to be in order of interface.
+        # Flags don't have this issue, so as long as they are first, their order doesn't matter.
         def visibility_rules
-          @visibility_rules ||= fields.question_hash.values.flat_map { |question| VisibilityRule.from(question) } \
-                              + flags.values.flat_map { |flag| VisibilityRule.from_flag(flag) }
+          @visibility_rules ||= [
+            *flags.values.flat_map { |flag| VisibilityRule.from_flag(flag) },
+            *sorted_questions.flat_map { |question| VisibilityRule.from(question) }
+          ]
         end
 
         private

data/lib/quby/compiler/entities/questions/checkbox_question.rb

@@ -51,9 +51,9 @@ module Quby
           end
 
           def variable_descriptions
-            options.each_with_object(key => context_free_title) do |option, hash|
+            options.each_with_object(key => context_free_title_or_title) do |option, hash|
               next if option.input_key.blank?
-              hash[option.input_key] = "#{context_free_title} - #{option.description}"
+              hash[option.input_key] = "#{context_free_title_or_title} - #{option.description}"
             end.with_indifferent_access
           end
 
@@ -69,12 +69,6 @@ module Quby
           def as_json(options = {})
             super.merge(options: @options.as_json)
           end
-
-          def to_codebook(questionnaire, opts = {})
-            options.map do |option|
-              option.to_codebook(questionnaire, opts)
-            end.compact.join("\n\n")
-          end
         end
       end
     end

data/lib/quby/compiler/entities/questions/date_question.rb

@@ -53,9 +53,9 @@ module Quby
           end
 
           def variable_descriptions
-            components.each_with_object(key => context_free_title) do |component, hash|
+            components.each_with_object(key => context_free_title_or_title) do |component, hash|
               key = send("#{component}_key")
-              hash[key] = "#{context_free_title} (#{I18n.t component})"
+              hash[key] = "#{context_free_title_or_title} (#{I18n.t component})"
             end.with_indifferent_access
           end
 
@@ -65,18 +65,6 @@ module Quby
             end
             super.merge(components: components).merge(component_keys)
           end
-
-          def to_codebook(questionnaire, opts = {})
-            output = []
-            components.each do |component|
-              output << "#{codebook_key(send("#{component}_key"), questionnaire, opts)} " \
-              "#{type}_#{component} #{codebook_output_range}"
-              output << "\"#{title}\"" unless title.blank?
-              output << options.map(&:to_codebook).join("\n") unless options.blank?
-              output << ""
-            end
-            output.join("\n")
-          end
         end
       end
     end

data/lib/quby/compiler/entities/questions/radio_question.rb

@@ -8,10 +8,6 @@ module Quby
           def as_json(options = {})
             super.merge(options: @options.as_json)
           end
-
-          def codebook_output_type
-            :radio
-          end
         end
       end
     end

data/lib/quby/compiler/entities/questions/select_question.rb

@@ -8,10 +8,6 @@ module Quby
           def as_json(options = {})
             super.merge(options: @options.as_json)
           end
-
-          def codebook_output_type
-            :radio
-          end
         end
       end
     end

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

@@ -10,13 +10,6 @@ module Quby
           super(key, description, default, depends_on_flag)
         end
         # rubocop:enable ParameterLists
-
-        def to_codebook(_options = {})
-          output = []
-          output << "#{key} Textvariabele"
-          output << description
-          output.join("\n")
-        end
       end
     end
   end

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

@@ -61,6 +61,7 @@ module Quby
             question_type: question.type,
             key: question.key,
             title: question.title,
+            title_question: (question_as_json(question.title_question) if question.title_question),
             context_free_title: question.context_free_title,
             description: question.description,
             presentation: question.presentation,
@@ -96,7 +97,7 @@ module Quby
           case question
           when Quby::Compiler::Entities::Questions::CheckboxQuestion
             base_options.merge(
-              options: question.options.map { |option| option_as_json(option) },
+              options: options_as_json(question),
               check_all_option: question.check_all_option,
               uncheck_all_option: question.uncheck_all_option,
               maximum_checked_allowed: question.maximum_checked_allowed,
@@ -114,7 +115,7 @@ module Quby
             )
           when Quby::Compiler::Entities::Questions::DeprecatedQuestion
             base_options.merge(
-              options: question.options.map { |option| option_as_json(option) }
+              options: options_as_json(question)
             )
           when Quby::Compiler::Entities::Questions::FloatQuestion
             base_options.merge(
@@ -130,11 +131,11 @@ module Quby
             )
           when Quby::Compiler::Entities::Questions::RadioQuestion
             base_options.merge(
-              options: question.options.map { |option| option_as_json(option) }
+              options: options_as_json(question)
             )
           when Quby::Compiler::Entities::Questions::SelectQuestion
             base_options.merge(
-              options: question.options.map { |option| option_as_json(option) }
+              options: options_as_json(question)
             )
           when Quby::Compiler::Entities::Questions::StringQuestion
             base_options.merge(
@@ -177,6 +178,16 @@ module Quby
           end
         end
 
+        # Also adds the title question under the last option.
+        # TODO old dsl put it there, remove after quby gem uses title_question
+        def options_as_json(question)
+          question.options.map { |option| option_as_json(option) }.tap do |options_json|
+            if question.title_question
+              options_json.last[:questions] << question_as_json(question.title_question)
+            end
+          end
+        end
+
         def option_as_json(option)
           {
             key: option.key,

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

@@ -160,31 +160,39 @@ module Quby
         # sbg_key [nil/string] _not_ defaulted to key
         # type [string]
         # title [nil/string] no html
-        # context_free_title [nil/string] no html, defaulted to title
+        # context_free_title [nil/string] no html, not defaulted to title!
+        # unit [nil/string] no html (not in quby either)
         # deprecated [nil/true] only show if filled for old answers
         # default_invisible [nil/true] only show if filled or when all questions are shown
+        # parent_question_key [nil/string] title_questions or question defined under option
+        # parent_option_key [nil/string] question defined under option
+        # title_question_key [nil/string]
         # date_parts [nil/{..}]
         # options: [nil/{..}]
         def questions
-          questionnaire.questions.reject{_1.type == :hidden}.to_h { |question|
+          questionnaire.sorted_questions.reject{_1.type == :hidden}.to_h { |question|
             [
               question.key,
               {
                 key: question.key,
                 sbg_key: question.sbg_key,
                 type: QUBY_TYPE_TO_ROQUA_TYPE.fetch(question.type),
-                title: strip_tags_without_html_encode(question.title),
-                context_free_title: strip_tags_without_html_encode(question.context_free_title),
+                title: parse_markdown_and_strip_tags(question.title),
+                context_free_title: question.context_free_title,
+                unit: question.unit,
                 deprecated: question.hidden.presence,
                 default_invisible: question.default_invisible.presence,
+                parent_question_key: question.parent&.key,
+                parent_option_key: question.parent_option_key,
+                title_question_key: question.title_question&.key,
                 date_parts: date_parts_for(question),
-                options: options_for(question),
+                options: options_for(question)
               }.compact
             ]
           }
         end
 
-        # {year_key: {key: "v_date_yyyy"}, ..}
+        # {year: {key: "v_date_yyyy"}, ..}
         # key [string]
         def date_parts_for(question)
           return nil unless question.type == :date
@@ -202,17 +210,20 @@ module Quby
         # {a1: {..}}
         # key [string]
         # value [nil/string] nil for check_box, string otherwise
-        # description [nil/string] context_free_description, no html
+        # description [nil/string] context_free_description or parsed/stripped description, no html
+        # child_question_keys [nil/[string]]
         def options_for(question)
           return nil if question.options.empty?
 
-          question.options.to_h { |option|
+          question.options.reject { |option| option.inner_title || option.placeholder }
+                          .to_h { |option|
             [
               option.key,
               {
                 key: option.key,
                 value: (option.value.to_s unless question.type == :check_box),
-                description: strip_tags_without_html_encode(option.context_free_description)
+                description: option.context_free_description || parse_markdown_and_strip_tags(option.description),
+                child_question_keys: option.questions.map(&:key).presence
               }.compact
             ]
           }
@@ -244,8 +255,17 @@ module Quby
           }
         end
 
+        def parse_markdown_and_strip_tags(markdown)
+          strip_tags_without_html_encode(Quby::MarkdownParser.new(markdown).to_html)
+        end
+
         def strip_tags_without_html_encode(html)
-          Nokogiri::HTML(html).text
+          Nokogiri::HTML(html).tap do |doc|
+            doc.css('br, hr, img').each { |node| node.replace(' ') }
+          end \
+            .text
+            .gsub!(/\s+/, ' ')
+            .presence
         end
       end
     end

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

@@ -100,6 +100,9 @@ module Quby
         def validate_question_options(questionnaire, question)
           question.options.each do |option|
             msg_base = "Question #{option.question.key} option #{option.key}"
+            unless option.valid?
+              fail "#{msg_base} #{option.errors.full_messages.to_sentence}"
+            end
             to_be_hidden_questions_exist_and_not_subquestion?(questionnaire, option, msg_base: msg_base)
             to_be_shown_questions_exist_and_not_subquestion?(questionnaire, option, msg_base: msg_base)
           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.options
-                d_qtypes[question.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || "") unless option.placeholder
+                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
@@ -49,16 +49,19 @@ module Quby
                 next if option.inner_title
                 vars << option.key.to_s
                 if question.hidden
-                  question_titles[option.key.to_s] = strip_tags question.context_free_title
+                  question_titles[option.key.to_s] = strip_tags(question.context_free_title_or_title)
                 end
                 value = 1
                 option_type = { type: :discrete }
-                option_type[value.to_s] = (option.context_free_description || "")
+                option_type[value.to_s] = (option.context_free_description || 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
                 handle_subquestions(question, question_titles, d_qtypes, vars, option, values, option.key.to_s)
               end
+              if question.title_question
+                subquestion(question, question_titles, d_qtypes, vars, question.title_question, nil, nil)
+              end
               update_hidden_questions_for(question, for_checkbox: true)
             when :textarea
               d_qtypes[question.key.to_s] = { type: :text_field }
@@ -72,7 +75,7 @@ module Quby
               end
             when :hidden
               if question.options.blank? # string
-                question_titles[question.key.to_s] = strip_tags question.context_free_title
+                question_titles[question.key.to_s] = strip_tags(question.context_free_title_or_title)
                 vars << question.key.to_s unless vars.include? question.key.to_s
                 d_qtypes[question.key.to_s] = { type: :text }
                 d_qtypes[question.key.to_s][:depends] = :present unless options[:without_depends]
@@ -85,16 +88,16 @@ module Quby
                     next if option.inner_title
                     d_qtypes[question.key.to_s] ||= { type: :scale }
                     values << option.value.to_s
-                    d_qtypes[question.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || "")
+                    d_qtypes[question.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || option.description || "")
                     # TODO: missing sub-questions
                   else # check_box
                     d_qtypes[question.key.to_s] ||= { type: :check_box }
                     no_keys = false
-                    question_titles[option.key.to_s] = strip_tags question.context_free_title
+                    question_titles[option.key.to_s] = strip_tags(question.context_free_title_or_title)
                     vars << option.key.to_s
                     value = option.value || 1
                     option_type = { type: :discrete }
-                    option_type[value.to_s] = (option.context_free_description || "")
+                    option_type[value.to_s] = (option.context_free_description || 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
                     # TODO: missing sub-questions
@@ -102,7 +105,7 @@ module Quby
                 end
                 if no_keys # scale or radio
                   d_qtypes[question.key.to_s][:depends] = { values: values, variable: question.key.to_s } unless options[:without_depends]
-                  question_titles[question.key.to_s] = strip_tags question.context_free_title
+                  question_titles[question.key.to_s] = strip_tags(question.context_free_title_or_title)
                 end
               end
             else
@@ -191,7 +194,7 @@ module Quby
 
           for question in questions_flat
             unless question.hidden && (question.type == :check_box || question.type == :hidden)
-              title = question.context_free_title || question.description || ""
+              title = question.context_free_title_or_title || question.description || ""
               question_titles[question.key.to_s] = strip_tags(title)
             end
           end
@@ -237,24 +240,24 @@ module Quby
             end
           end
           d_qtypes[quest.key.to_s][:label] = quest.unit unless quest.unit.blank?
-          quests[quest.key.to_s] = strip_tags(quest.context_free_title || "")
+          quests[quest.key.to_s] = strip_tags(quest.context_free_title || quest.title || "")
           vars << quest.key.to_s
         end
 
         def sub_textfield(question, quests, d_qtypes, vars, quest, values, key)
           d_qtypes[quest.key.to_s] = { type: :text_field }
           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 || "")
+          quests[quest.key.to_s] = strip_tags(quest.context_free_title || quest.title || "")
           vars << quest.key.to_s
         end
 
         def sub_radio(question, quests, d_qtypes, vars, quest, values, key)
           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 || "")
+          quests[quest.key.to_s] = strip_tags(quest.context_free_title || quest.title || "")
           for option in quest.options
             next if option.inner_title
-            d_qtypes[quest.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || "")
+            d_qtypes[quest.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || option.description || "")
           end
           vars << quest.key.to_s
           update_hidden_questions_for(quest)
@@ -266,7 +269,7 @@ module Quby
             vars << key
             hash[component] = key.to_s
           end
-          quests[quest.key.to_s] = strip_tags(quest.context_free_title || "")
+          quests[quest.key.to_s] = strip_tags(quest.context_free_title || quest.title || "")
         end
 
         def handle_scale(question, quests, d_qtypes, vars)
@@ -275,11 +278,14 @@ module Quby
           update_hidden_questions_for(question)
           for option in question.options
             next if option.inner_title
-            d_qtypes[question.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || "")
+            d_qtypes[question.key.to_s][option.value.to_s] = strip_p_tag(option.context_free_description || 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)
           end
+          if question.title_question
+            subquestion(question, quests, d_qtypes, vars, question.title_question, nil, nil)
+          end
         end
 
         def handle_textfield(question, d_qtypes)

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.4.4"
+    VERSION = "0.4.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.8
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel