quby-compiler 0.4.15 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc2baf7860d3a8c906f3e3cafef35525bdad0e02ed5fc78848061e9ed4ffe7cc
-  data.tar.gz: 9d53e98b35d034369731244fac42869ab7e90c06e30696e11f673e749ee8195f
+  metadata.gz: c114222ce815660bdbff3a284c6893b8dc809760818d1839193fec984a1027e3
+  data.tar.gz: 8b7938ae820807e963178a251313a3f6a237a3103e0d9aab92539eb5a534cd51
 SHA512:
-  metadata.gz: c89d1de0be9a9d7959d072f1e473ae597ff3c00b90da846dff1c1c9da03492988f289687d8f800fd40be7895cf720c857d95f50efcaa09f7d3dbb6af5e87ff2e
-  data.tar.gz: 9d95cd492d5ef6fb4ebaafa242d9855d71fe7fbc9f8c0f89e30a76b341636b8cbcc57f5ffaa8de8a11c10ebcfe6544b2e23b3ffade8179433a3ad95a83624628
+  metadata.gz: 65bba6e155ee6722e836054f584c8df708c1ef9e8a87d9cb560d8020c8c16b3dadfb17b59da4ec0df128f9236f4ff20a69705af6f456c11204f8195a3cb01c36
+  data.tar.gz: b9f974a3ab3e6da317397726cad05b3913cc12f81b912ef928fcec50ed9b994196a7404e99f18754abcf4632fab19aad5656e354021ce3573d6735d1a42b1af5

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# 0.5.0
+
+* quby2.json BREAKING CHANGES!: 
+  * Renamed: Questionnaire#fields to Questionnaire#questions
+  * Removed: Question#options
+  * Removed: Option#innerTitle and Option#placeholder
+  * Removed: Option#context_free_title
+
+# 0.4.16
+
+* quby2:
+  * Added children attribute to select questions to replace the options
+  * children can be of type option/html/placeholder
+  * Deprecate: Question#options 
+  * Deprecate: Option#innerTitle moved to html type
+  * Deprecate: Option#placeholder moved to Question#placeholder attr
+  * Deprecate: Option#context_free_title, never needed
+
 # 0.4.15
 
 * quby2.json: Question#size is now always an integer/nil

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

@@ -12,12 +12,14 @@ module Quby
         attr_reader :value
         attr_reader :description, :context_free_description
         attr_reader :questions
+        # for scale/radio/checbox questions, piece of of html that is rendered between the options
         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"}
+        # for select questions, option with no value and key is removed from answers if this one is selected.
         attr_reader :placeholder
         validates :placeholder, inclusion: {in: [true, false], message: "must be boolean"}
         attr_reader :question
@@ -53,21 +55,35 @@ module Quby
         end
 
         def as_json(options = {})
+          if inner_title
+            inner_title_as_json(options)
+          elsif placeholder
+            nil # placeholder attr on question.
+          else
+            option_as_json(options)
+          end
+        end
+
+        def inner_title_as_json(options = {})
+          {
+            type: 'html',
+            key: SecureRandom.uuid,
+            html: Quby::MarkdownParser.new(description).to_html
+          }
+        end
+
+        def option_as_json(options = {})
           {
+            type: 'option',
             key: key,
             value: value,
             description: question.type == :select \
               ? description
               : Quby::MarkdownParser.new(description).to_html,
-            context_free_description: question.type == :select \
-              ? context_free_description
-              : Quby::MarkdownParser.new(context_free_description).to_html,
             questions: questions,
-            innerTitle: inner_title,
             hidesQuestions: hides_questions,
             showsQuestions: shows_questions,
             hidden: hidden,
-            placeholder: placeholder,
             viewId: view_id
           }
         end

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

@@ -208,7 +208,7 @@ module Quby
             outcomeDescription: outcome_description,
             shortDescription: short_description,
             panels: panels,
-            fields: fields.as_json,
+            questions: fields.question_hash.as_json,
             flags: flags,
             textvars: textvars,
             visibilityRules: visibility_rules

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

@@ -67,7 +67,7 @@ module Quby
           end
 
           def as_json(options = {})
-            super.merge(options: @options.as_json)
+            super.merge(children: @options.as_json)
           end
         end
       end

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

@@ -6,7 +6,7 @@ module Quby
       module Questions
         class RadioQuestion < Question
           def as_json(options = {})
-            super.merge(options: @options.as_json)
+            super.merge(children: @options.as_json)
           end
         end
       end

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

@@ -6,7 +6,10 @@ module Quby
       module Questions
         class SelectQuestion < Question
           def as_json(options = {})
-            super.merge(options: @options.as_json)
+            super.merge(
+              children: @options.as_json.compact, # for now just options, but we'll add optgroups later.
+              placeholder: @options.find { _1.placeholder }&.description # nil for no placeholder
+            )
           end
         end
       end

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.4.15"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.5.0
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel