quby-compiler 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1f976b37af794cf97fffb6ab66d420951f6d24ade6362851e0564ac504485f
-  data.tar.gz: bf363984e69fd45a2ccae488f2ea587d0482dd2cbf501a7b36fffc314368b6f3
+  metadata.gz: 0a1a654ea10bed63b7487aaaa16c663efdd89d3a034e52574ea0f05aa08c3845
+  data.tar.gz: 2e6adaba2286e5400de5bebd944fceb3c71b62d32fea9abd9462cc98a9000084
 SHA512:
-  metadata.gz: d3b3470eea0acae3245483e780baa6fe9e9e321fc37ba6422ac5674aeaf5e7ad2a3c145aa6260359a12da34b5d818187e0d9f6de4b177886c5764631aecfd0e2
-  data.tar.gz: ad44885ecf958d9cabb332081dda45710c6baa8a96620b1998c7d86c56995051547f28d7b9b2f2776ab1df5335677d6dce904b56a1c56fd565583b16db7f9e7e
+  metadata.gz: 17b23528f435db0eee2157915f3540b4bce2e1cd23adc1247a019a18740588d15ca3d93ce78612f57d0213f54d3156aaa222f8b997f8c7ff4dc9c616dbd89ca9
+  data.tar.gz: 381bc8a3debabde57309e9ae19ba4a46bf1ed7e91a9975314a12bb8784e46ca44c1538c1c6970ae2b142b67b66a00e970f241f91b4c8130c87286fa497a9f8f6

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+# 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
+* Replace `options={}` with `**options` in the builders to prevent prepare for ruby 3.0
 
 # 0.3.2
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quby-compiler (0.3.3)
+    quby-compiler (0.3.4)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       activesupport (>= 5.0)
@@ -15,20 +15,20 @@ 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)
+    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)
@@ -38,10 +38,10 @@ GEM
       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.0)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
@@ -57,27 +57,27 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-types (~> 1.5)
       ice_nine (~> 0.11)
-    dry-types (1.5.0)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.5, >= 0.5)
       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.3)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -90,7 +90,7 @@ GEM
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rake (12.3.3)
-    redcarpet (3.5.0)
+    redcarpet (3.5.1)
     roqua-support (0.3.5)
       active_interaction (~> 3.0)
       activesupport (>= 5.1, < 6.1)

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/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/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)
 

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

@@ -25,7 +25,6 @@ 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" \
@@ -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/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel