quby-compiler 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a3b1948f1047978b5362a22a102cadcf1e73614008ab01ba4c9700ca8a2f49
-  data.tar.gz: 854cd8345cf21de03ba5262ce08db475b39c106d9ea1874a2106c24a33196820
+  metadata.gz: 10321dd1aa2034171ba876aeb77622bde63eac65938ce0a0bec9663119461396
+  data.tar.gz: b98a34612065d23a611ae5d0437463fe20557fbc0c238d50034e528676565284
 SHA512:
-  metadata.gz: df9bf74043519c50553993a151d30c75ad98d894ed56504705f32d525a5f927e67c54d8af83b287eafe6d05bfef5e744e107527b7dbeb2f898eb1665124b1c5f
-  data.tar.gz: 2eae0ecda1fa65a11b0fb97189f006136f8c8bff684e6884b8b9b25cbd20c09ef143e3c6a4d0729a4c43b00718994b2d2c85fa2321a02fae6e1fad6cd1093f21
+  metadata.gz: a3544401b0db094144e7de1e0e172499a26a37111b73c01abd9ba027c33ac992c0c580e15b3fbd552bf196f70c1ed3dccab12ccb064dc68d3e3d80ff98740bc1
+  data.tar.gz: 0dd6d579368d571f57ea15dc20a5711ae8ba7e548049f8fd0abaaa43f15d1ca1454c1711f573e3d6b5143d198cbca8878f37399219a67c8330396c6fb57eb09e

data/CHANGELOG.md

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

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/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.
@@ -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?

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

@@ -4,6 +4,8 @@ module Quby
   module Compiler
     module Entities
       class QuestionOption
+        include ActiveModel::Validations
+
         MARKDOWN_ATTRIBUTES = %w(description).freeze
 
         attr_reader :key
@@ -11,16 +13,17 @@ module Quby
         attr_reader :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

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

@@ -161,8 +161,12 @@ module Quby
         # type [string]
         # title [nil/string] no html
         # context_free_title [nil/string] no html, 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
@@ -175,16 +179,20 @@ module Quby
                 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),
+                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
@@ -203,6 +211,7 @@ module Quby
         # key [string]
         # value [nil/string] nil for check_box, string otherwise
         # description [nil/string] context_free_description, no html
+        # child_question_keys [nil/[string]]
         def options_for(question)
           return nil if question.options.empty?
 
@@ -213,7 +222,8 @@ module Quby
               {
                 key: option.key,
                 value: (option.value.to_s unless question.type == :check_box),
-                description: strip_tags_without_html_encode(option.context_free_description)
+                description: strip_tags_without_html_encode(option.context_free_description),
+                child_question_keys: option.questions.map(&:key).presence
               }.compact
             ]
           }
@@ -246,7 +256,7 @@ module Quby
         end
 
         def strip_tags_without_html_encode(html)
-          Nokogiri::HTML(html).text
+          Nokogiri::HTML(html).text.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/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.4.5"
+    VERSION = "0.4.6"
   end
 end

metadata

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