quby-compiler 0.4.13 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f13fa5a2d4c4da7b41e4a32905226d0523709bac245a9d7cba3d28fd927d2b6a
-  data.tar.gz: 4e8f0dfab2c05e6166176f5ddb951e5f4e51962b9902e75ea3e8561e9cda3392
+  metadata.gz: dc2baf7860d3a8c906f3e3cafef35525bdad0e02ed5fc78848061e9ed4ffe7cc
+  data.tar.gz: 9d53e98b35d034369731244fac42869ab7e90c06e30696e11f673e749ee8195f
 SHA512:
-  metadata.gz: fb6313ab623e76109aa94871bb192da9c95bbaa5809472b29bc88c2f7b61ebcb18b03b7433fe162209c33a1113aa7f359722c8927196d0d9b7ebf022e457e5b4
-  data.tar.gz: 3b3c6aeb7d590570defc880d3b1743ff64c1cb4c6227da2bb779c93057a7c1c249563f0e2366a1e6e13b6760fa90c010f66b57757159b24e0073af71403b6098
+  metadata.gz: c89d1de0be9a9d7959d072f1e473ae597ff3c00b90da846dff1c1c9da03492988f289687d8f800fd40be7895cf720c857d95f50efcaa09f7d3dbb6af5e87ff2e
+  data.tar.gz: 9d95cd492d5ef6fb4ebaafa242d9855d71fe7fbc9f8c0f89e30a76b341636b8cbcc57f5ffaa8de8a11c10ebcfe6544b2e23b3ffade8179433a3ad95a83624628

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 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`
+* roqua.json: Add anonymous_conditions
+
 # 0.4.13
 
 * quby2.json:

data/exe/quby-compile

@@ -40,7 +40,7 @@ paths.each do |path|
   definition = Quby::Compiler.validate(key, sourcecode, lookup_tables: lookup_tables)
   if definition.errors.any?
     error = definition.errors[:sourcecode].first
-    STDERR.puts error[:message], error[:backtrace], ''
+    STDERR.puts(error)
     validation_errors_found = true
     next # let's not create new output files for questionnaires with errors
   end

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

@@ -147,6 +147,14 @@ module Quby
           @questionnaire.default_answer_value = value
         end
 
+        def hide_pii_from_researchers(value)
+          @questionnaire.anonymous_conditions = @questionnaire.anonymous_conditions.new(hide_pii_from_researchers: value)
+        end
+
+        def hide_values_from_professionals(value)
+          @questionnaire.anonymous_conditions = @questionnaire.anonymous_conditions.new(hide_values_from_professionals: value)
+        end
+
         def panel(title = nil, options = {}, &block)
           panel = PanelBuilder.build(title, **options, **default_panel_options, &block)
           @questionnaire.add_panel(panel)

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

@@ -0,0 +1,23 @@
+module Quby
+  module Compiler
+    module Entities
+      class AnonymousConditions < Dry::Struct
+        class ConstantRule < Dry::Struct
+          attribute :type, Types::String.constrained(eql: "constant")
+          attribute :value, Types::Bool
+        end
+
+        class BasedOnValueRule < Dry::Struct
+          attribute :type, Types::String.constrained(eql: "based_on_value")
+          attribute :question_key, Types::String
+          attribute :question_value, Types::String
+        end
+
+        Rule = ConstantRule | BasedOnValueRule
+
+        attribute? :hide_pii_from_researchers, Rule.optional
+        attribute? :hide_values_from_professionals, Rule.optional
+      end
+    end
+  end
+end

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/questionnaire.rb

@@ -53,6 +53,7 @@ module Quby
           @lookup_tables = {}
           @versions = []
           @seeds_patch = {}
+          @anonymous_conditions = Entities::AnonymousConditions.new
         end
 
         attr_accessor :key
@@ -100,6 +101,7 @@ module Quby
         attr_accessor :outcome_tables
         attr_accessor :score_schemas
         attr_accessor :lookup_tables
+        attr_accessor :anonymous_conditions
 
         delegate :question_hash, :input_keys, :answer_keys, :expand_input_keys, to: :fields
 

data/lib/quby/compiler/entities.rb

@@ -7,6 +7,7 @@ require 'quby/compiler/entities/version'
 require 'quby/compiler/entities/question_option'
 require 'quby/compiler/entities/item'
 require 'quby/compiler/entities/score_calculation'
+require 'quby/compiler/entities/anonymous_conditions'
 
 require 'quby/compiler/entities/subscore_schema'
 require 'quby/compiler/entities/score_schema'

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

@@ -36,6 +36,7 @@ module Quby
             outcome_tables_schema: outcome_tables_schema,
             questions: questions,
             scores: scores,
+            anonymous_conditions: questionnaire.anonymous_conditions,
             license: questionnaire.license,
             licensor: questionnaire.licensor,
           }
@@ -271,6 +272,7 @@ module Quby
           end \
             .text
             .gsub(/\s+/, ' ')
+            .strip
             .presence
         end
       end

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.4.13"
+    VERSION = "0.4.15"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.15
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -186,6 +186,7 @@ files:
 - lib/quby/compiler/dsl/standardized_panel_generators.rb
 - lib/quby/compiler/dsl/table_builder.rb
 - lib/quby/compiler/entities.rb
+- lib/quby/compiler/entities/anonymous_conditions.rb
 - lib/quby/compiler/entities/charting/bar_chart.rb
 - lib/quby/compiler/entities/charting/chart.rb
 - lib/quby/compiler/entities/charting/charts.rb