quby-compiler 0.4.14 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 864809e71abc58743617937e4cd9967afa23b80958a5c7fef3c7265d77404d08
-  data.tar.gz: b3abb8c5572b12ac98b0f8fb81258cbf621adc20c00f978d24f8251533c8279d
+  metadata.gz: 1b37ba70c10be5b93150a219396c5af20cac6c9b1ec2d18e0afa2acdd8c6f7b4
+  data.tar.gz: c0782d3d8cc1fb6dbdcd21e0613811e941254dbd68edfc10bbe71084cf3c872c
 SHA512:
-  metadata.gz: dd7c67aa581503fcc3451d2a62e182e22c3bbb38f27f61c7347dd4a2a743e47b524c5b667acdf36293225da1807ad439a10ef172eede13da526de71c6dc319cb
-  data.tar.gz: eedc2ae95790da8039f2f1b56c2526b710db523fe4eff4d47345a405c907331146852e5c8d526a9343577d4aaf261fd8d0f3843afffa89b20208f51897e6287c
+  metadata.gz: ed384ce1f96bac8d3159d26111ad7ad96dc17471e849aaf495877482eb5f587d521c7698f053e7f3bcafc320417f6d164e756ac8b0ede495d33072bbf318d17d
+  data.tar.gz: cfbc1079c4a8603a16499c2b180ecc1c416d2d2338899aaf5839376cae32dffb42cfa0d2a38cc5e8b4ce570f55dfc38c657a2d8716dd1b4e8e255e9095f3f642

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+# 0.5.0
+
+* quby2.json BREAKING CHANGES!: 
+  * 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
+
 # 0.4.14
 
 * DSL: Add `hide_pii_from_researchers` and `hide_values_from_professionals`

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

@@ -240,7 +240,7 @@ module Quby
             title: Quby::MarkdownParser.new(title).to_html,
             description: Quby::MarkdownParser.new(description).to_html,
             type: type,
-            size: size,
+            size: size.presence && Integer(size), # 2022-11: 4k string and 7k integer
             hidden: hidden?,
             displayModes: display_modes,
             defaultInvisible: default_invisible,

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,7 +55,26 @@ 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 \
@@ -63,11 +84,11 @@ module Quby
               ? context_free_description
               : Quby::MarkdownParser.new(context_free_description).to_html,
             questions: questions,
-            innerTitle: inner_title,
+            innerTitle: inner_title, # deprecated, removed in 0.5.0
             hidesQuestions: hides_questions,
             showsQuestions: shows_questions,
             hidden: hidden,
-            placeholder: placeholder,
+            placeholder: placeholder, # deprecated, removed in 0.5.0
             viewId: view_id
           }
         end

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, options: @options.map(&:option_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, options: @options.map(&:option_as_json))
           end
         end
       end

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

@@ -6,7 +6,11 @@ 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.
+              options: @options.map(&:option_as_json), # deprecated, removed in 0.5
+              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.14"
+    VERSION = "0.4.16"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.16
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Quby::Compiler compiles a DSL for questionnaires to JSON