quby-compiler 0.5.16 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fbd126d732f2ab8201f325d09041cb564138354150fbedc83f3f7e9f68a755f
-  data.tar.gz: df750a8516c8596596cf11a03f3ce758bdb745de607068d4b8b753ae62a95e17
+  metadata.gz: 168356d0b927759c32a749e4ada4abd56817009e2f232bfc88acaceb95d7ac7d
+  data.tar.gz: 6d9d11e31936ff6dc2ab8a78e17709a07bdef35135bbbfebc8e7ec8a59ab0140
 SHA512:
-  metadata.gz: ddd7e5767209991dd94f35b086294903cc2616d76104cbdaf776181e661e0cefe501393033abc41674aed88f14a7849a3f275c81330c72c68384dd42cf9052a3
-  data.tar.gz: 1ba99e0f79496a7d64d95952739bd5fcc1f0ef6f1927c2cd5ce211c6bddd134dd37f617400dd3201344d35a58503e7b14503856c274404f41d6e90391b07ace3
+  metadata.gz: 9b0a3ec50fdbc0b2c2c48e9c64c75439239acfa8bfbb534f17d479a8c97ccac39ad25516ed498904fefd9b82085fdaeb86563553b784e84a12b10dc396d1d39b
+  data.tar.gz: 48551cd16d4d780348ed7e3634fee6515dfece2a3d13c4a6eb9f6b4fd02beef1036f66481894b648474683d3da09dcf3188dbfb483f85fcde48a54bba9ca2f4b

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# 0.5.18
+
+* add footer (quby2 only)
+* fix sexp_variable, op needs to be number for float/integer scalars
+
+# 0.5.17
+
+* Add option#label.
+* quby.json
+  * Add option#label to option#description just in case.
+* quby2.json:
+  * Pass options#hidden.
+  * Allow hr tags in prose.
+  * Allow all prose tags in question#description, except headers.
+  * Allow css_vars to be defined on questionnaire and question level.
+  * Add option#label
+  * quby2.json: Add option#label (without fallback for now, until quby2 0.9.7 is deployed everywhere).
+
 # 0.5.16
 
 * add integer as split_to_units option, with units and conversions as attributes

data/lib/quby/compiler/dsl/merge(values(:v_1, :v_2), values(v_4).rb

@@ -0,0 +1,16 @@
+merge(values(:v_1, :v_2), values(v_4).recode(1 => 3)).sum
+
+
+
+divide(value(:v_2), multiply(value(:v_1), value(:v_1)))
+
+w / l * l
+
+
+sexp_variable :key1 do
+  foo = values(:v_1, :v_2)
+  bar = recode(foo, 1 => 3)
+  bla = merge(foo, bar)
+  sum(bla)
+
+end

data/lib/quby/compiler/dsl/questionnaire_builder.rb

@@ -71,6 +71,10 @@ module Quby
           @questionnaire.short_description = description
         end
 
+        def footer(footer)
+          @questionnaire.footer = footer
+        end
+
         def sbg_key(sbg_key)
           @questionnaire.sbg_key = sbg_key
         end
@@ -140,6 +144,12 @@ module Quby
           @questionnaire.extra_css += value
         end
 
+        # css_vars("option-gap-y" => 1)
+        def css_vars(value)
+          @questionnaire.css_vars ||= {}
+          @questionnaire.css_vars.merge!(value)
+        end
+
         def allow_switch_to_bulk(value=true)
           @questionnaire.allow_switch_to_bulk = value
         end

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

@@ -30,6 +30,9 @@ module Quby
         # How should we display this question
         attr_accessor :as
 
+        # extra styling options
+        attr_accessor :css_vars
+
         # To hide old questions
         attr_accessor :hidden
         validates :hidden, inclusion: {in: [true, false, nil], message: "must be boolean"}
@@ -164,6 +167,7 @@ module Quby
           @cols = options[:cols] || 40
           @default_invisible = options[:default_invisible] || false
           @labels ||= []
+          @css_vars = options[:css_vars]
 
           @col_span = options[:col_span] || 1
           @row_span = options[:row_span] || 1

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

@@ -12,6 +12,7 @@ module Quby
         attr_reader :key
         attr_reader :value
         validates :value, numericality: {allow_nil: true} # nil for checkbox questions.
+        attr_reader :label
         attr_reader :description, :context_free_description
         attr_reader :questions
         # for scale/radio/checbox questions, piece of of html that is rendered between the options
@@ -32,6 +33,7 @@ module Quby
           @key         = key
           @question    = question
           @value       = options[:value]
+          @label       = options[:label]
           @description = options[:description]
           @context_free_description = options[:context_free_description]
           @questions   = []

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

@@ -40,6 +40,7 @@ module Quby
           @license = :unknown
           @layout_version = nil
           @extra_css = ""
+          @css_vars = nil
           @allow_switch_to_bulk = false
           @panels = []
           @flags = {}.with_indifferent_access
@@ -64,6 +65,7 @@ module Quby
         attr_accessor :description
         attr_accessor :outcome_description
         attr_accessor :short_description
+        attr_accessor :footer
         attr_writer   :roqua_keys
         attr_accessor :sbg_key # not required to be unique
         attr_accessor :sbg_domains
@@ -77,6 +79,7 @@ module Quby
         attr_writer   :leave_page_alert
         attr_reader   :fields
         attr_accessor :extra_css
+        attr_accessor :css_vars
         attr_accessor :allow_switch_to_bulk
         attr_reader   :license
         attr_accessor :licensor

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

@@ -22,7 +22,7 @@ module Quby::Compiler::Entities
     end
 
     class Number
-      attribute :op, Quby::Types::Symbol.enum(:value)     
+      attribute :op, Quby::Types::Symbol.enum(:number)     
       attribute :value, Quby::Types::Integer | Quby::Types::Float
     end
 

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

@@ -192,7 +192,7 @@ module Quby
           {
             key: option.key,
             value: option.value,
-            description: option.description,
+            description: option.label ? "#{option.label} #{option.description}" : option.description,
             context_free_description: option.context_free_description,
             questions: option.questions.map {|question| question_as_json(question)},
             inner_title: option.inner_title,

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

@@ -18,6 +18,7 @@ module Quby
             language: language || "nl",
             description: description,
             shortDescription: short_description,
+            footer: footer,
             defaultAnswerValue: Services::TransformQuby1ValuesIntoQuby2Values.run!(@questionnaire, default_answer_value),
             panels: panels.map { panel(_1) },
             questions: questions,
@@ -25,7 +26,8 @@ module Quby
             validations: validations,
             visibilityRules: visibility_rules.as_json,
             sexpVariables: sexp_variables,
-          }
+            cssVars: css_vars,
+          }.compact
         end
 
         def panel(panel)
@@ -149,6 +151,7 @@ module Quby
             description: handle_html(question.description, type: :question_description),
             contextDescription: handle_html(question.context_description, type: :prose, v1_markdown: false),
             type: question_type(question),
+            cssVars: question.css_vars,
             hidden: question.hidden?,
             displayModes: question.display_modes,
             viewSelector: question.view_selector,
@@ -215,8 +218,10 @@ module Quby
             type: 'option',
             key: option.key,
             value: option.question.type != :check_box && option.value,
+            label: option.label, # TODO fallback on description and empty description if no label (after quby2 has been deployed)
             description: option.question.type == :select ? option.description : handle_html(option.description),
-            questions: option.question.type != :select && option.questions.map{ question(_1) }, 
+            questions: option.question.type != :select && option.questions.map{ question(_1) },
+            hidden: option.hidden.presence,
             viewId: option.view_id
         }.compact
         end
@@ -252,9 +257,9 @@ module Quby
             when :simple
               html_sanitizer.sanitize(html, tags: %w[strong em sup sub br span], attributes: %w[class])
             when :question_description
-              html_sanitizer.sanitize(html, tags: %w[strong em b i u sup sub p span br ul ol li], attributes: %w[class])
+              html_sanitizer.sanitize(html, tags: %w[strong em b i u sup sub pre blockquote p span br ul ol li a], attributes: %w[class])
             when :prose
-              html_sanitizer.sanitize(html, tags: %w[strong em b i u sup sub pre blockquote p span br ul ol li a h1 h2 h3 h4], attributes: %w[href class target])
+              html_sanitizer.sanitize(html, tags: %w[strong em b i u sup sub pre blockquote p span br ul ol li a h1 h2 h3 h4 hr], attributes: %w[href class target])
             end
           elsif v1_markdown
             Quby::Compiler::MarkdownParser.new(html).to_html

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.16"
+    VERSION = "0.5.18"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.18
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-03-23 00:00:00.000000000 Z
+date: 2025-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -150,6 +150,7 @@ files:
 - lib/quby/compiler/dsl/charting/overview_chart_builder.rb
 - lib/quby/compiler/dsl/charting/radar_chart_builder.rb
 - lib/quby/compiler/dsl/helpers.rb
+- lib/quby/compiler/dsl/merge(values(:v_1, :v_2), values(v_4).rb
 - lib/quby/compiler/dsl/panel_builder.rb
 - lib/quby/compiler/dsl/question_builder.rb
 - lib/quby/compiler/dsl/questionnaire_builder.rb