quby-compiler 0.5.37 → 0.5.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f99d7e4e00d6ab08172da731229ed790720f8131ca55a9919a8d6f4823da1bbe
-  data.tar.gz: a7855f35d16daded7a21e60564322576b7ea8f967052e72d8d4f8eb194b53f04
+  metadata.gz: 2279e5f134b33df182ad29e5ef668b690ec78bf64a155943da2572d5427e9515
+  data.tar.gz: e57c0a3a82e23aaa73230141439b3787df75f1143cd2a4192749d6ebb4ae783b
 SHA512:
-  metadata.gz: 4c0260b251395ef6fcf757ecc1ddaf120139716c6f0ae27a77450dea9719d76f103891b060b74146aee408d68febffd398436ce613d3c8031215e6f6b01035d6
-  data.tar.gz: e20c44b3fba04514aa601e52c9b7321e185bbea66d9e12e112efdd20023b91bfc52f30de3f4ebf0959426eb4aa351499abe2b7b4b5e5ac5ea2b6b04b5e4f5544
+  metadata.gz: 174970b103cd572b7d9920c4f135069672339dcfdc8e212dad1209476db4a0cff4fb744a2033b4c39ac12a4745a01344f2ebefad3c61c4b7ab1beb47fe8dba12
+  data.tar.gz: 22374d446918b0b6a04732ac0c024c98c2ffca0ee831f1121e8035285fc5706d967dcf44a074007a5635ccb9d6a6c262b31a29a92576376e7ba8f5108b00a2b7

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.5.39
+
+* Remove ostruct dependency (next ruby version requires a gem for this). Make tags simple array and only export to roqua.json.
+* Remove unneeded attributes from frontend v1 json.
+
+# 0.5.38
+
+* Fail when using unsupported features in layout_version :v2
+* Allow context_description to set via question options, so custom_methods don't have to specifically mention it.
+
 # 0.5.37
 
 * added support for indenting questions

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

@@ -152,6 +152,7 @@ module Quby
           @context_free_title = options[:context_free_title]
           @allow_blank_titles = options[:allow_blank_titles]
           @description = options[:description]
+          @context_description = options[:context_description]
           @display_modes = options[:display_modes]
           @presentation = options[:presentation]
           @validations = []

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'ostruct'
 require 'active_model'
 require 'quby/settings'
 require 'quby/compiler/entities/flag'
@@ -46,7 +45,7 @@ module Quby
           @textvars = {}.with_indifferent_access
           @language = :nl
           @respondent_types = []
-          @tags = OpenStruct.new
+          @tags = []
           @check_key_clashes = true
           @validate_html = true
           @score_schemas = {}.with_indifferent_access
@@ -96,7 +95,6 @@ module Quby
         # If false, we don't check html for validity (for mate1 and mate1_pre)
         attr_accessor :validate_html
 
-        attr_accessor :last_author
         attr_writer   :allow_hotkeys # allow hotkeys for :all views, just :bulk views (default), or :none for never
 
         attr_accessor :charts
@@ -116,9 +114,7 @@ module Quby
         delegate :question_hash, :input_keys, :answer_keys, :expand_input_keys, to: :fields
 
         def tags=(tags)
-          tags.each do |tag|
-            @tags[tag] = true
-          end
+          @tags = @tags.union(tags)
         end
 
         def leave_page_alert

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

@@ -233,45 +233,6 @@ module Quby
           end
         end
 
-        def charts
-          {
-            overview: questionnaire.charts.overview && {
-              subscore: questionnaire.charts.overview.subscore,
-              y_max: questionnaire.charts.overview.y_max,
-            },
-            others: questionnaire.charts.map do |chart|
-              case chart
-              when Quby::Compiler::Entities::Charting::LineChart
-                {
-                  y_label: chart.y_label,
-                  tonality: chart.tonality,
-                  baseline: YAML.dump(chart.baseline),
-                  clinically_relevant_change: chart.clinically_relevant_change,
-                }
-              when Quby::Compiler::Entities::Charting::OverviewChart
-                {
-                  subscore: chart.subscore,
-                  y_max: chart.y_max,
-                }
-              else
-                {}
-              end.merge(
-                key: chart.key,
-                type: chart.type,
-                title: chart.title,
-                plottables: chart.plottables,
-                y_categories: chart.y_categories,
-                y_range_categories: chart.y_range_categories,
-                chart_type: chart.chart_type,
-                y_range: range_as_json(chart.y_range),
-                tick_interval: chart.tick_interval,
-                plotbands: chart.plotbands,
-                plotlines: chart.plotlines
-              )
-            end
-          }
-        end
-
         def flags
           questionnaire.flags.transform_values do |flag|
             {
@@ -305,35 +266,16 @@ module Quby
           YAML.dump(questionnaire.lookup_tables)
         end
 
-        def outcome_tables
-          # TODO DOes not seem to be used in definitions?
-          questionnaire.outcome_tables.map do |outcome_table|
-            {
-              key: outcome_table.key,
-              score_keys: outcome_table.score_keys,
-              subscore_keys: outcome_table.subscore_keys,
-              name: outcome_table.name,
-              default_collapsed: outcome_table.default_collapsed,
-            }
-          end
-        end
-
         def as_json(options = {})
           {
             key: questionnaire.key,
             title: questionnaire.title,
-            description: questionnaire.description,
-            outcome_description: questionnaire.outcome_description,
-            short_description: questionnaire.short_description,
             abortable: questionnaire.abortable,
             enable_previous_questionnaire_button: questionnaire.enable_previous_questionnaire_button,
             default_answer_value: questionnaire.default_answer_value,
             leave_page_alert: questionnaire.leave_page_alert,
             allow_hotkeys: questionnaire.allow_hotkeys,
-            license: questionnaire.license,
-            licensor: questionnaire.licensor,
             language: questionnaire.language,
-            last_author: questionnaire.last_author,
             extra_css: questionnaire.extra_css,
 
             panels: panels,
@@ -342,17 +284,6 @@ module Quby
             flags: flags,
             textvars: textvars,
             lookup_tables: lookup_tables,
-
-            # belong to roqua domain, but for now they're here too:
-            roqua_keys: questionnaire.roqua_keys,
-            sbg_key: questionnaire.sbg_key,
-            sbg_domains: questionnaire.sbg_domains,
-            outcome_regeneration_requested_at: questionnaire.outcome_regeneration_requested_at,
-            deactivate_answers_requested_at: questionnaire.deactivate_answers_requested_at,
-            respondent_types: questionnaire.respondent_types,
-            tags: questionnaire.tags.to_h.keys,
-            charts: charts,
-            outcome_tables: outcome_tables,
           }
         end
 

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

@@ -32,7 +32,7 @@ module Quby
             outcome_regeneration_requested_at: questionnaire.outcome_regeneration_requested_at,
             deactivate_answers_requested_at: questionnaire.deactivate_answers_requested_at,
             respondent_types: questionnaire.respondent_types,
-            tags: questionnaire.tags.to_h.keys,
+            tags: questionnaire.tags,
             charts: charts,
             outcome_tables_schema: outcome_tables_schema,
             outcome_description: questionnaire.outcome_description,

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

@@ -30,6 +30,7 @@ module Quby
           validate_info_blocks(questionnaire)
           validate_checkbox_options(questionnaire)
           validate_visiblity_rules(questionnaire)
+          validate_quby2_unsupported_features(questionnaire)
         # Some compilation errors are Exceptions (pure syntax errors) and some StandardErrors (NameErrors)
         rescue Exception => exception # rubocop:disable Lint/RescueException
           definition.errors.add(:sourcecode, message: "Questionnaire error: #{definition.key}\n" \
@@ -436,6 +437,29 @@ scores_schema tables to the resulting seed."
             end
           end
         end
+
+        def validate_quby2_unsupported_features(questionnaire)
+          return unless questionnaire.layout_version == :v2
+
+          if questionnaire.extra_css.present?
+            fail "'extra_css' unsupported for Quby 2 layout."
+          end
+          questionnaire.questions.each do |question|
+            if question.title_question
+              fail "Question #{question.key} uses unsupported feature 'title_question' for Quby 2 layout."
+            end
+            if question.display_modes.present?
+              fail "Question #{question.key} uses unsupported feature 'display_modes' for Quby 2 layout."
+            end
+          end
+          questionnaire.panels.each do |panel|
+            panel.items.each do |item|
+              if item.is_a?(Entities::Table)
+                fail "Questionnaire uses unsupported feature 'table' for Quby 2 layout."
+              end
+            end
+          end
+        end
       end
     end
   end

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.37"
+    VERSION = "0.5.39"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.37
+  version: 0.5.39
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-10-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -51,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +165,6 @@ files:
 - lib/quby/compiler/dsl/charting/radar_chart_builder.rb
 - lib/quby/compiler/dsl/helpers.rb
 - lib/quby/compiler/dsl/info_block_builder.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
@@ -251,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Quby::Compiler compiles a DSL for questionnaires to JSON
 test_files: []

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

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