quby-compiler 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d882604750c6b9e14ef80ebf8251f0cd921b7f9e7db31b843b1c279676904c4
-  data.tar.gz: db31a32e46f675814f9ea97d00b0c8b35a45d60b895834c0aeaf0eec58c4ae57
+  metadata.gz: a56013c91225af82fd15a27e8195ca88b22dcb3ea94354ab2ef62cef50532bf2
+  data.tar.gz: 6412e7e3ef45dd548dc10eea9e2b72da4b7cc64d94d9de2a3ede13db70c5be25
 SHA512:
-  metadata.gz: 816477fed5ba4f5e9c1c36a0766e9e832bb8c9a37ab22e8547f8980937e98b915188a51e5154cde2c88cb0af578fb16d42d0709133c6e1b1622054cb2415e5ae
-  data.tar.gz: 97cf01e8fd73955ce8f51e399db8017705a69785f7e48c2f4dc6c40652f17d9638b17542725803442d1c6ca567d7c79bbc49e72d2df7f60cd9481e9aa0ac11c2
+  metadata.gz: 67d746a71ccbd1c0780a836579000efdf50e825a10906a10992abaf3612340039e9670320814d6cb7f6baf3eb041e85c3872496e4d95a70ed4195d61632b969a
+  data.tar.gz: 51151607042665ecbdd7f4b9448e24a220350cd132ec1e5ef509dfd71b5abca5668686de5231cfd40a27e43ecead4003e1f41ab04e01f952fae95ecc3f96a7cf

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+2.7.2

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+# 0.3.6
+
+* `outcome_table` panel dsl method now exports the given outcome table definition to `roqua.json`
+  This can't be used in combination with the `outcome_table: ` attibute in score schemas. 
+
+# 0.3.5
+
+* Allow score_schema's outcome_table to be set to nil to hide values from outcome tables
+
+# 0.3.4
+
+* Added preliminary support for sliders to the v2 output.
+
+# 0.3.3
+
+* Replace `options={}` with `**options` in the builders to prevent prepare for ruby 3.0
+
+# 0.3.2
+
+* Fix slashes-after-numbers removal when question does not have a title
+
 # 0.3.1
 
 * Slashes after numbers are now removed from question titles when making RoQua seeds (quests attribute).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quby-compiler (0.3.1)
+    quby-compiler (0.3.5)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       activesupport (>= 5.0)
@@ -15,42 +15,42 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actionview (6.0.4)
+      activesupport (= 6.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (3.8.3)
-      activemodel (>= 4, < 7)
-    activemodel (6.0.3.5)
-      activesupport (= 6.0.3.5)
-    activerecord (6.0.3.5)
-      activemodel (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
-    activesupport (6.0.3.5)
+    active_interaction (4.0.2)
+      activemodel (>= 5, < 7)
+    activemodel (6.0.4)
+      activesupport (= 6.0.4)
+    activerecord (6.0.4)
+      activemodel (= 6.0.4)
+      activesupport (= 6.0.4)
+    activesupport (6.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    appsignal (2.10.12)
+    appsignal (3.0.8)
       rack
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     diff-lcs (1.4.4)
     dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
+    dry-container (0.8.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
+    dry-core (0.6.0)
       concurrent-ruby (~> 1.0)
     dry-inflector (0.2.0)
-    dry-logic (1.1.0)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
     dry-struct (1.4.0)
@@ -64,20 +64,20 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     erubi (1.10.0)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    loofah (2.9.0)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.5.3)
     minitest (5.14.4)
     naught (1.1.0)
-    nokogiri (1.11.1)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    nokogumbo (2.0.4)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -91,10 +91,10 @@ GEM
       loofah (~> 2.3)
     rake (12.3.3)
     redcarpet (3.5.1)
-    roqua-support (0.3.5)
-      active_interaction (~> 3.0)
-      activesupport (>= 5.1, < 6.1)
-      appsignal (>= 2.9, < 2.11)
+    roqua-support (0.4.0)
+      active_interaction (>= 3.0, < 5.0)
+      activesupport (>= 5.2, < 6.2)
+      appsignal (>= 2.9, < 3.1)
       naught (~> 1.0)
       with_advisory_lock (~> 3.2)
     rspec (3.9.0)

data/exe/quby-compile

@@ -21,7 +21,7 @@ OptionParser.new do |opts|
   end
 
   opts.on("--seeds=INPUT") do |value|
-    seeds_path = value
+    puts '--seeds is a deprecated option, questionnaire definitions should use seed_patches to conserve seed tweaks'
   end
 end.parse!
 
@@ -38,7 +38,7 @@ lookup_tables = Quby::Compiler::Entities::LookupTables.new(lookup_tables_path)
 paths.each do |path|
   puts "Compiling #{path}"
 
-  key = File.basename(path, File.extname(path))
+  key = File.basename(File.dirname(path))
   sourcecode = File.read(path)
   last_update = File.mtime(path)
   seed_path = File.join(seeds_path, "#{key}.yml")
@@ -46,7 +46,6 @@ paths.each do |path|
   compiled = Quby::Compiler.compile(key, sourcecode, path: path, seeds: seeds, lookup_tables: lookup_tables, last_update: last_update)
 
   FileUtils.mkdir_p(File.join(output_path, key))
-
   compiled[:outputs].each do |type, output|
     next unless output
     File.open(File.join(output_path, key, output.filename), 'w') do |file|

data/lib/quby/compiler/dsl.rb

@@ -10,15 +10,15 @@ module Quby
     module DSL
       def self.build_from_definition(definition)
         Entities::Questionnaire.new(definition.key, last_update: definition.timestamp).tap do |questionnaire|
-          builder = QuestionnaireBuilder.new(questionnaire)
+          builder = QuestionnaireBuilder.new(questionnaire, lookup_tables: definition.lookup_tables)
           builder.instance_eval(definition.sourcecode, definition.path) if definition.sourcecode
           questionnaire.callback_after_dsl_enhance_on_questions
         end
       end
 
-      def self.build(key, sourcecode = nil, path: nil, timestamp: nil, &block)
+      def self.build(key, sourcecode = nil, path: nil, timestamp: nil, lookup_tables: {}, &block)
         Entities::Questionnaire.new(key, last_update: timestamp).tap do |questionnaire|
-          builder = QuestionnaireBuilder.new(questionnaire)
+          builder = QuestionnaireBuilder.new(questionnaire, lookup_tables: lookup_tables)
           builder.instance_eval(sourcecode, path || key) if sourcecode
           builder.instance_eval(&block) if block
           questionnaire.callback_after_dsl_enhance_on_questions

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

@@ -9,8 +9,8 @@ module Quby
       class Base
         include Helpers
 
-        def self.build(*args, &block)
-          builder = new(*args)
+        def self.build(*args, **kwargs, &block)
+          builder = new(*args, **kwargs)
           builder.instance_eval(&block) if block
           builder.build
         end

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

@@ -6,8 +6,7 @@ module Quby
       module CallsCustomMethods
         attr_reader :custom_methods
 
-        def initialize(*args)
-          options = args.last.is_a?(::Hash) ? args.last : {}
+        def initialize(*args, **options)
           @custom_methods = options[:custom_methods] || {}
           super
         end

data/lib/quby/compiler/dsl/charting/chart_builder.rb

@@ -16,8 +16,8 @@ module Quby
           @chart_class
         end
 
-        def initialize(questionnaire, key, options = {})
-          @chart = self.class.chart_class.new(key, options)
+        def initialize(questionnaire, key, **options)
+          @chart = self.class.chart_class.new(key, **options)
           @questionnaire = questionnaire
         end
 
@@ -49,7 +49,7 @@ module Quby
           @chart.plotlines << {value: value, color: color}
         end
 
-        def plot(key, options = {})
+        def plot(key, **options)
           unless plottable = @questionnaire.find_plottable(key)
             fail "Questionnaire #{@questionnaire.key} chart #{@chart.key} references unknown score or question #{key}"
           end

data/lib/quby/compiler/dsl/charting/overview_chart_builder.rb

@@ -7,7 +7,7 @@ module Quby
       class OverviewChartBuilder < ChartBuilder
         set_chart_class(Entities::Charting::OverviewChart)
 
-        def initialize(questionnaire, options = {})
+        def initialize(questionnaire, **options)
           @questionnaire = questionnaire
           @chart = self.class.chart_class.new
         end

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

@@ -7,8 +7,8 @@ module Quby
         include ActionView::Helpers::TagHelper
         include ActionView::Helpers::OutputSafetyHelper
 
-        def image_tag(source, options = {})
-          tag.img(options.reverse_merge(src: source, alt: image_alt(source)))
+        def image_tag(source, **options)
+          tag.img(**options.reverse_merge(src: source, alt: image_alt(source)))
         end
 
         # Copied from ActionController::Base.helpers.image_alt, because it will be removed from Rails 6.0, but we want
@@ -18,7 +18,7 @@ module Quby
         end
 
         def check_question_keys_uniqueness(key, options, questionnaire)
-          keys = QuestionBuilder.build(key, options).claimed_keys
+          keys = QuestionBuilder.build(key, **options).claimed_keys
           if keys.any? { |k| questionnaire.key_in_use? k }
             fail "#{questionnaire.key}:#{key}: A question or option with input key #{key} is already defined."
           end

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

@@ -9,9 +9,9 @@ module Quby
         attr_reader :title
         attr_reader :questionnaire
 
-        def initialize(title, options = {})
-          @panel = Entities::Panel.new(options.merge(title: title, items: []))
-          @default_question_options = options[:default_question_options] || {}
+        def initialize(title, default_question_options: {}, **options)
+          @panel = Entities::Panel.new({title: title, items: [], **options})
+          @default_question_options = default_question_options
           @questionnaire = options[:questionnaire]
           @custom_methods = options[:custom_methods] || {}
         end
@@ -41,25 +41,28 @@ module Quby
           @panel.items << Entities::Text.new('', raw_content: video_html)
         end
 
-        def default_question_options(options = {})
+        def default_question_options(**options)
           @default_question_options = @default_question_options.merge(options)
         end
 
-        def question(key, options = {}, &block)
+        def question(key, **options, &block)
           options = @default_question_options.merge(options).merge(questionnaire: @panel.questionnaire)
 
           check_question_keys_uniqueness key, options, @questionnaire
 
-          question = QuestionBuilder.build(key, options, &block)
+          question = QuestionBuilder.build(key, **options, &block)
 
           @questionnaire.register_question(question)
           @panel.items << question
         end
 
-        def table(options = {}, &block)
-          table_builder = TableBuilder.new(@panel, options.merge(questionnaire: @panel.questionnaire,
-                                                                 default_question_options: @default_question_options,
-                                                                 custom_methods: @custom_methods))
+        def table(**options, &block)
+          table_builder = TableBuilder.new \
+            @panel,
+            questionnaire: @panel.questionnaire,
+            default_question_options: @default_question_options,
+            custom_methods: @custom_methods,
+            **options
           table_builder.instance_eval(&block) if block
         end
 

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

@@ -31,8 +31,8 @@ module Quby
           'hidden'    => Questions::DeprecatedQuestionBuilder
         }
 
-        def self.build(key, options = {}, &block)
-          BUILDERS.fetch(options.fetch(:type).to_s).build(key, options, &block)
+        def self.build(key, **options, &block)
+          BUILDERS.fetch(options.fetch(:type).to_s).build(key, **options, &block)
         end
       end
     end

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

@@ -19,7 +19,7 @@ module Quby
         include StandardizedPanelGenerators
         include Helpers
 
-        def initialize(target_instance, lookup_tables: nil)
+        def initialize(target_instance, lookup_tables:)
           @questionnaire = target_instance
           @lookup_tables = lookup_tables
           @default_question_options = {}
@@ -148,7 +148,7 @@ module Quby
         end
 
         def panel(title = nil, options = {}, &block)
-          panel = PanelBuilder.build(title, options.merge(default_panel_options), &block)
+          panel = PanelBuilder.build(title, **options, **default_panel_options, &block)
           @questionnaire.add_panel(panel)
         end
 
@@ -167,28 +167,28 @@ module Quby
           @questionnaire.lookup_tables[key] = {levels: levels, tree: tree}
         end
 
-        def default_question_options(options = {})
+        def default_question_options(**options)
           @default_question_options.merge!(options)
         end
 
         # Short-circuit the question command to perform an implicit panel
-        def question(key, options = {}, &block)
+        def question(key, **options, &block)
           panel(nil, default_panel_options) do
-            question(key, @default_question_options.merge(options).merge(questionnaire: @questionnaire), &block)
+            question(key, questionnaire: @questionnaire, **@default_question_options, **options, &block)
           end
         end
 
         # Short-circuit the text command to perform an implicit panel
-        def text(value, options = {})
-          panel(nil, default_panel_options) do
-            text(value, options)
+        def text(value, **options)
+          panel(nil, **default_panel_options) do
+            text(value, **options)
           end
         end
 
         # Short-circuit the table command to perform an implicit panel
-        def table(options = {}, &block)
-          panel(nil, default_panel_options) do
-            table(options, &block)
+        def table(**options, &block)
+          panel(nil, **default_panel_options) do
+            table(**options, &block)
           end
         end
 
@@ -197,15 +197,15 @@ module Quby
         #   # variables are private to the score calculation
         #   q01 + q02 + q03
         # end
-        def variable(key, options = {}, &block)
-          @questionnaire.add_score_calculation ScoreBuilder.new(key, options, &block).build
+        def variable(key, **options, &block)
+          @questionnaire.add_score_calculation ScoreBuilder.new(key, **options, &block).build
         end
 
-        def score(key, options = {}, &block)
+        def score(key, **options, &block)
           @questionnaire.errors.add "Score #{key}", 'misses label in score call' if options[:label].blank?
           schema = options.delete(:schema)
           score_schema(key, options[:label], schema) if schema.present?
-          variable(key, options.reverse_merge(score: true), &block)
+          variable(key, score: true, **options, &block)
         end
 
         def score_schema(key, label, options = nil, &block)
@@ -222,16 +222,16 @@ module Quby
           end
         end
 
-        def attention(options = {}, &block)
-          variable(:attention, options.reverse_merge(action: true), &block)
+        def attention(**options, &block)
+          variable(:attention, action: true, **options, &block)
         end
 
-        def alarm(options = {}, &block)
-          variable(:alarm, options.reverse_merge(action: true), &block)
+        def alarm(**options, &block)
+          variable(:alarm, action: true, **options, &block)
         end
 
-        def completion(options = {}, &block)
-          variable(:completion, options.reverse_merge(completion: true), &block)
+        def completion(**options, &block)
+          variable(:completion, completion: true, **options, &block)
         end
 
         def overview_chart(*args, &block)
@@ -255,15 +255,15 @@ module Quby
           @questionnaire.add_chart(builder.build(&block))
         end
 
-        def flag(flag_options)
+        def flag(**flag_options)
           @questionnaire.add_flag flag_options
         end
 
-        def textvar(textvar_options)
+        def textvar(**textvar_options)
           @questionnaire.add_textvar textvar_options
         end
 
-        def outcome_table(table_options)
+        def outcome_table(**table_options)
           @questionnaire.add_outcome_table table_options
         end
 

data/lib/quby/compiler/dsl/questions/base.rb

@@ -10,8 +10,8 @@ module Quby
           attr_reader :type
           attr_reader :questionnaire
 
-          def initialize(key, options = {})
-            @questionnaire = options[:questionnaire]
+          def initialize(key, questionnaire:, **options)
+            @questionnaire = questionnaire
           end
 
           def build
@@ -111,7 +111,7 @@ module Quby
         end
 
         module Subquestions
-          def initialize(key, options = {}, &block)
+          def initialize(key, **options, &block)
             super
             @default_question_options = options[:default_question_options] || {}
             @title_question = nil
@@ -126,7 +126,7 @@ module Quby
             super
           end
 
-          def title_question(key, options = {}, &block)
+          def title_question(key, **options, &block)
             options = @default_question_options.merge({depends_on: @question.key,
                                                        questionnaire: @questionnaire,
                                                        parent: @question,
@@ -135,13 +135,13 @@ module Quby
 
             check_question_keys_uniqueness key, options, @questionnaire
 
-            question = QuestionBuilder.build(key, options, &block)
+            question = QuestionBuilder.build(key, **options, &block)
 
             @questionnaire.register_question(question)
             @title_question = question
           end
 
-          def question(key, options = {}, &block)
+          def question(key, **options, &block)
             options = @default_question_options.merge(options)
                                                .merge(questionnaire: @questionnaire,
                                                       parent: @question,
@@ -149,7 +149,7 @@ module Quby
 
             check_question_keys_uniqueness key, options, @questionnaire
 
-            question = QuestionBuilder.build(key, options, &block)
+            question = QuestionBuilder.build(key, **options, &block)
 
             @questionnaire.register_question(question)
             @question.options.last.questions << question

data/lib/quby/compiler/dsl/questions/checkbox_question_builder.rb

@@ -9,7 +9,7 @@ module Quby
           include Subquestions
           include InnerTitles
 
-          def initialize(key, options = {}, &block)
+          def initialize(key, **options, &block)
             super
             @question = Entities::Questions::CheckboxQuestion.new(key, options)
           end

data/lib/quby/compiler/dsl/questions/date_question_builder.rb

@@ -7,7 +7,7 @@ module Quby
         class DateQuestionBuilder < Base
           include MinMaxValidations
 
-          def initialize(key, options = {}, &block)
+          def initialize(key, **options, &block)
             super
             @question = Entities::Questions::DateQuestion.new(key, options)
           end

data/lib/quby/compiler/dsl/questions/deprecated_question_builder.rb

@@ -7,7 +7,7 @@ module Quby
         class DeprecatedQuestionBuilder < Base
           include MultipleChoice
 
-          def initialize(key, options = {}, &block)
+          def initialize(key, **options, &block)
             super
             @question = Entities::Questions::DeprecatedQuestion.new(key, options)
           end

data/lib/quby/compiler/dsl/questions/float_question_builder.rb

@@ -10,7 +10,7 @@ module Quby
           include Units
           include Sizes
 
-          def initialize(key, options = {}, &block)
+          def initialize(key, **options, &block)
             super
             @question = Entities::Questions::FloatQuestion.new(key, options)
           end

data/lib/quby/compiler/dsl/questions/integer_question_builder.rb

@@ -10,7 +10,7 @@ module Quby
           include Units
           include Sizes
 
-          def initialize(key, options = {}, &block)
+          def initialize(key, **options, &block)
             super
             @question = Entities::Questions::IntegerQuestion.new(key, options)
           end

data/lib/quby/compiler/dsl/questions/radio_question_builder.rb

@@ -9,7 +9,7 @@ module Quby
           include Subquestions
           include InnerTitles
 
-          def initialize(key, options = {}, &block)
+          def initialize(key, **options, &block)
             super
             @question = Entities::Questions::RadioQuestion.new(key, options)
           end

data/lib/quby/compiler/dsl/questions/select_question_builder.rb

@@ -7,7 +7,7 @@ module Quby
         class SelectQuestionBuilder < Base
           include MultipleChoice
 
-          def initialize(key, options = {}, &block)
+          def initialize(key, **options, &block)
             super
             @question = Entities::Questions::SelectQuestion.new(key, options)
           end

data/lib/quby/compiler/dsl/questions/string_question_builder.rb

@@ -9,7 +9,7 @@ module Quby
           include Units
           include Sizes
 
-          def initialize(key, options = {}, &block)
+          def initialize(key, **options, &block)
             super
             @question = Entities::Questions::StringQuestion.new(key, options)
           end

data/lib/quby/compiler/dsl/questions/text_question_builder.rb

@@ -7,7 +7,7 @@ module Quby
         class TextQuestionBuilder < Base
           include RegexpValidations
 
-          def initialize(key, options = {}, &block)
+          def initialize(key, **options, &block)
             super
             @question = Entities::Questions::TextQuestion.new(key, options)
           end

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

@@ -9,7 +9,7 @@ module Quby
         attr_reader :key
         attr_reader :calculation
 
-        def initialize(key, options = {}, &block)
+        def initialize(key, **options, &block)
           @score = Entities::ScoreCalculation.new(key, options, &block)
         end
 

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

@@ -9,10 +9,10 @@ module Quby
         prepend CallsCustomMethods
         include Helpers
 
-        def initialize(panel, options = {})
+        def initialize(panel, default_question_options: {}, **options)
           @panel = panel
           @table = Entities::Table.new(options)
-          @default_question_options = options[:default_question_options] || {}
+          @default_question_options = default_question_options
           @panel.items << @table
         end
 
@@ -24,11 +24,11 @@ module Quby
           @table.description = value
         end
 
-        def text(value, options = {})
+        def text(value, **options)
           @table.items << Entities::Text.new(value.to_s, options)
         end
 
-        def question(key, options = {}, &block)
+        def question(key, **options, &block)
           options = @default_question_options.merge(options)
                                              .merge(table: @table,
                                                     questionnaire: @panel.questionnaire)
@@ -36,7 +36,7 @@ module Quby
           check_question_keys_uniqueness key, options, @panel.questionnaire
           fail "You can't create a slider in a table at the moment" if options[:as] == :slider
 
-          question = QuestionBuilder.build(key, options, &block)
+          question = QuestionBuilder.build(key, **options, &block)
 
           @panel.questionnaire.register_question(question)
           @table.items << question

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

@@ -10,13 +10,14 @@ module Quby
         extend  ActiveModel::Naming
         include ActiveModel::Validations
 
-        attr_accessor :key, :sourcecode, :timestamp, :path
+        attr_accessor :key, :sourcecode, :timestamp, :path, :lookup_tables
 
-        def initialize(key:, path:, sourcecode: "", timestamp: nil)
+        def initialize(key:, path:, sourcecode: "", timestamp: nil, lookup_tables: {})
           @path = path
           @key = key
           @sourcecode = sourcecode
           @timestamp = timestamp
+          @lookup_tables = lookup_tables
         end
 
         validates_with Services::DefinitionValidator

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

@@ -15,6 +15,7 @@ module Quby
         validates :score_keys, :subscore_keys, :questionnaire, :key, presence: true
         validates :name, presence: true, if: proc { |table| table.default_collapsed }
         validate :references_existing_score_keys
+        validate :no_outcome_tables_defined_in_score_schemas
 
         def references_existing_score_keys
           (score_keys - questionnaire.score_schemas.values.map(&:key)).each do |missing_key|
@@ -25,6 +26,17 @@ module Quby
             errors.add :subscore_keys, "#{missing_key.inspect} not found in subscore schemas"
           end
         end
+
+        def no_outcome_tables_defined_in_score_schemas
+          if questionnaire.score_schemas.values.any? do |schema|
+            schema.subscore_schemas.any? do |subscore|
+              subscore.outcome_table != :main
+            end
+          end
+            errors.add :score_schemas,
+              "Outcome table associations defined in score schemas should not be combined with explicit outcome tables"
+          end
+        end
       end
     end
   end

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

@@ -283,7 +283,7 @@ module Quby
           end
           flag_options[:key] = flag_key
           fail(ArgumentError, "Flag '#{flag_key}' already defined") if flags.key?(flag_key)
-          flags[flag_key] = Flag.new(flag_options)
+          flags[flag_key] = Flag.new(**flag_options)
         end
 
         def filter_flags(given_flags)
@@ -297,7 +297,7 @@ module Quby
           textvar_options[:key] = textvar_key
           validate_textvar_keys_unique(textvar_key)
           validate_depends_on_flag(textvar_key, textvar_options)
-          textvars[textvar_key] = Textvar.new(textvar_options)
+          textvars[textvar_key] = Textvar.new(**textvar_options)
         end
 
         def filter_textvars(given_textvars)

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

@@ -5,6 +5,15 @@ module Quby
     module Entities
       module Questions
         class FloatQuestion < Question
+          def as_json(options = {})
+            super.merge(
+              minimum: minimum,
+              maximum: maximum,
+              step: 0.01, # fixed in v1.
+              # defaultPosition: default_position # Needs discussion, can be number or string "hidden"
+            )
+          end
+
           def size
             @size || 30
           end

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

@@ -5,6 +5,15 @@ module Quby
     module Entities
       module Questions
         class IntegerQuestion < Question
+          def as_json(options = {})
+            super.merge(
+              minimum: minimum,
+              maximum: maximum,
+              step: 1, # fixed in v1.
+              # defaultPosition: default_position # Needs discussion, can be number or string "hidden"
+            )
+          end
+
           def size
             @size || 30
           end

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

@@ -16,7 +16,8 @@ module Quby
         attribute :calculation_key?, Types::Symbol
         # [Optional argument] The name of the outcome table where this subscore should be shown. Used for cases where scores
         # differ in subscores too much to be shown as one table. By default, all scores end up in the `:main` table.
-        attribute :outcome_table, Types::Symbol.default(:main).meta(omittable: true)
+        # When outcome_table is explicitly nil, the value should not be shown in outcome tables
+        attribute :outcome_table, Types::Symbol.optional.default(:main)
       end
     end
   end

data/lib/quby/compiler/instance.rb

@@ -11,7 +11,7 @@ module Quby
         if block # defined in block for tests
           questionnaire = DSL.build(key, path: path, &block)
         else # sourcecode given as string
-          tempfile = Tempfile.new(key)
+          tempfile = Tempfile.new([key, '.rb'])
           questionnaire = Entities::Questionnaire.new(key, last_update: last_update)
           Thread.current["quby-questionnaire-loading"] = Quby::Compiler::DSL::QuestionnaireBuilder.new(questionnaire, lookup_tables: lookup_tables)
 
@@ -63,7 +63,7 @@ module Quby
       end
 
       def validate(key:, sourcecode:)
-        definition = Entities::Definition.new(key: key, sourcecode: sourcecode, path: "validating '#{key}'")
+        definition = Entities::Definition.new(key: key, sourcecode: sourcecode, path: "validating '#{key}'", lookup_tables: lookup_tables)
         definition.valid?
         definition
       end

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

@@ -84,19 +84,56 @@ module Quby
         #   <subscore_key:Symbol>: <subscore.label:String> # headers for each subscore key for all tables.
 
         def outcome_tables_schema
+          if questionnaire.outcome_tables.present?
+            outcome_tables_from_definition
+          else
+            outcome_tables_from_score_schemas
+          end
+        end
+
+        def outcome_tables_from_definition
+          # hash of tables, with the score keys (rows) and subscore keys (columns) used for each
+          tables = {}
+          # hash of `subscore_key: subscore_label` pairs used in tables
+          headers = {}
+
+          questionnaire.outcome_tables.each do |table|
+            tables[table.key] = {name: table.name,
+                                 default_collapsed: table.default_collapsed,
+                                 score_keys: table.score_keys,
+                                 subscore_keys: table.subscore_keys}.compact
+
+            table.subscore_keys.each do |subscore_key|
+              table.score_keys.find do |score_key|
+                subschema = questionnaire.score_schemas[score_key].subscore_schemas.find do |subschema|
+                  subschema.key == subscore_key
+                end
+                headers[subscore_key] = subschema&.label
+              end
+            end
+          end
+
+          {
+            headers: headers,
+            tables: tables,
+          }
+        end
+
+        def outcome_tables_from_score_schemas
           # hash of tables, with the score keys (rows) and subscore keys (columns) used for each
           tables = Hash.new{ |hash, key| hash[key] = {score_keys: Set.new, subscore_keys: Set.new } }
           # hash of `subscore_key: subscore_label` pairs used in tables
           headers = {}
-          
+
           questionnaire.score_schemas.values.each do |schema|
             schema.subscore_schemas.each do |subschema|
+              next if subschema.outcome_table.blank?
               tables[subschema.outcome_table][:subscore_keys] << subschema.key
               tables[subschema.outcome_table][:score_keys] << schema.key
               headers[subschema.key] = subschema.label
             end
           end
-          
+
           {
             headers: headers,
             tables: tables,

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

@@ -25,12 +25,11 @@ module Quby
           validate_outcome_tables(questionnaire)
           validate_markdown_fields(questionnaire) if questionnaire.validate_html
           validate_raw_content_items(questionnaire) if questionnaire.validate_html
-          validate_scores(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" \
                                                        "#{exception.message}",
-                                              backtrace: exception.backtrace[0..5].join("<br/>")})
+                                              backtrace: exception.backtrace[0..20]})
         end
 
         def validate_fields(questionnaire)
@@ -81,6 +80,13 @@ module Quby
             fail "Score #{score.key} does not have a score schema" unless score_schema
             fail "Score label langer dan 100 tekens (geeft problemen oru accare)\n #{score_schema.label}" if score_schema.label&.length > 100
           end
+
+          export_keys = questionnaire.score_schemas.flat_map { |_key, score_schema|
+            score_schema.subscore_schemas.map(&:export_key)
+          }
+
+          duplicate_export_keys = export_keys.tally.select { |key, count| count > 1 }.keys
+          fail "Score export keys not unique, duplicates: #{duplicate_export_keys}" if duplicate_export_keys.present?
         end
 
         def validate_question_options(questionnaire, question)
@@ -241,8 +247,6 @@ scores_schema tables to the resulting seed."
 
         def validate_score_label_present(score)
           fail "Score #{score.key} label must be passed in as an option." unless score.label.present?
-
-
         end
 
         def validate_subquestion_absence_in_select(question)

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

@@ -292,19 +292,19 @@ module Quby
 
         def strip_question_number_slashes(quests)
           quests.transform_values! do |value|
-            value.gsub /^(\s*\d+)\\/, '\1'
+            value&.gsub /^(\s*\d+)\\/, '\1'
           end
         end
 
         def process_scores
           scores_from_schemas
         end
-      
+
         def scores_from_schemas
           score_headers = [] # headers outcome (humanized name for subscores)
           score_keys    = [] # headers data-export (not all of it, just the score_subscore part, shortened)
           score_labels  = [] # score names outcome (humanized name for score as a whole)
-      
+
           questionnaire.score_schemas.values.each do |score_schema|
             score_labels << score_schema.label
             score_keys << score_schema.subscore_schemas.map do |subschema|
@@ -318,18 +318,18 @@ module Quby
                 hash
               end
             end
-      
+
             headers = score_schema.subscore_schemas.map(&:label)
             score_headers += headers - score_headers
           end
-      
+
           {
             headers: score_headers,
             keys: score_keys,
             labels: score_labels
           }
         end
-      
+
         class ShortenKeysUniq
           def initialize
             @seen_results = []

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.3.1"
+    VERSION = "0.3.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Quby::Compiler compiles a DSL for questionnaires to JSON