quby-compiler 0.4.12 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f80c06ecab5163ba31ba68e5548ec4e53211b4d327d738b07947578409afed
-  data.tar.gz: a56fa925a142ec55eb909e33257c3f399d8990c79ace266e6ebc7687cefb49cc
+  metadata.gz: 864809e71abc58743617937e4cd9967afa23b80958a5c7fef3c7265d77404d08
+  data.tar.gz: b3abb8c5572b12ac98b0f8fb81258cbf621adc20c00f978d24f8251533c8279d
 SHA512:
-  metadata.gz: 3aa823181f25722654444f7ad79e8922b59f6cb93463e12e61abef7ead8a391695156fcb4cb8f4551ad115b6a710ab2e5d81138575d7fce05d442db1e86dd809
-  data.tar.gz: 89376384e57965c290e667984fd98605668ef2a832a87d78215e6c0435379bd6ce4b4cf994091bcc9975554fb05e7ed3f6bfbf4beab6af13115fb3489cd87a94
+  metadata.gz: dd7c67aa581503fcc3451d2a62e182e22c3bbb38f27f61c7347dd4a2a743e47b524c5b667acdf36293225da1807ad439a10ef172eede13da526de71c6dc319cb
+  data.tar.gz: eedc2ae95790da8039f2f1b56c2526b710db523fe4eff4d47345a405c907331146852e5c8d526a9343577d4aaf261fd8d0f3843afffa89b20208f51897e6287c

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.4.14
+
+* DSL: Add `hide_pii_from_researchers` and `hide_values_from_professionals`
+* roqua.json: Add anonymous_conditions
+
+# 0.4.13
+
+* quby2.json:
+  * string-questions: Don't pass a size of 30, when no size had been specified
+  * rename date type to date_parts, switch to use `date_parts: [{part: year, key: 'yyyy'}, ..]`
+
 # 0.4.12
 
 * roqua.json: Add questionnaire license

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/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/questions/date_question.rb

@@ -24,7 +24,8 @@ module Quby
           def initialize(key, options = {})
             super
 
-            @components = options[:components] || DEFAULT_COMPONENTS
+            # only possible order we support.
+            @components = options[:components] ? POSSIBLE_COMPONENTS & options[:components] : DEFAULT_COMPONENTS
             @required_components = options[:required_components] || @components
             @optional_components = @components - @required_components
 
@@ -39,7 +40,8 @@ module Quby
           def add_date_validation(explanation)
             @validations << {type: :valid_date,
                              subtype: :"valid_date_#{components.sort.join('_')}",
-                             explanation: explanation}
+                             explanation: explanation,
+                             requiredParts: required_components}
           end
 
           def claimed_keys
@@ -60,10 +62,16 @@ module Quby
           end
 
           def as_json(options = {})
-            component_keys = components.each_with_object({}) do |component, hash|
-              hash["#{component}Key"] = send("#{component}_key")
-            end
-            super.merge(components: components).merge(component_keys)
+            super.merge(
+              type: 'date_parts',
+              as: 'date_parts',
+              dateParts: components.map { |component|
+                {
+                  part: component,
+                  key: send("#{component}_key")
+                }
+              }
+            )
           end
         end
       end

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

@@ -6,7 +6,7 @@ module Quby
       module Questions
         class StringQuestion < Question
           def as_json(options = {})
-            super.merge(autocomplete: @autocomplete, size: @size || 30)
+            super.merge(autocomplete: @autocomplete, size: @size)
           end
         end
       end

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

@@ -6,7 +6,7 @@ module Quby
       module Questions
         class TextQuestion < Question
           def as_json(options = {})
-            super.merge(autocomplete: @autocomplete, lines: lines, cols: cols)
+            super.merge(autocomplete: @autocomplete, lines: lines)
           end
         end
       end

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.12"
+    VERSION = "0.4.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.14
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-09-21 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