quby-compiler 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6057e46b6b390c3a3d4ecdf461f1e8970c3c42de8d2b5ec50cb14a1544eff8c9
-  data.tar.gz: ae3e2dd60f2e9dbc655bee2f32cb110e1daf399fecdc8d653e1a3df39fe267af
+  metadata.gz: a56013c91225af82fd15a27e8195ca88b22dcb3ea94354ab2ef62cef50532bf2
+  data.tar.gz: 6412e7e3ef45dd548dc10eea9e2b72da4b7cc64d94d9de2a3ede13db70c5be25
 SHA512:
-  metadata.gz: 0fc383d185fd6ef9a11f4bc1d952ecefa89c6853cc1ef3f8e00a80b86d9c779a470309106492b57890da29424fc8cd9dc092c08df9a135d140d01cbcb226a5b2
-  data.tar.gz: 979aea81dcfa1a4f15060ba9cea59f5d3bffc94983b59383323e5e00fea3d57f2967fd8cc17a66b11e3fc16eb823b91c3f83d8f06845eac7445e3d374619a68f
+  metadata.gz: 67d746a71ccbd1c0780a836579000efdf50e825a10906a10992abaf3612340039e9670320814d6cb7f6baf3eb041e85c3872496e4d95a70ed4195d61632b969a
+  data.tar.gz: 51151607042665ecbdd7f4b9448e24a220350cd132ec1e5ef509dfd71b5abca5668686de5231cfd40a27e43ecead4003e1f41ab04e01f952fae95ecc3f96a7cf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quby-compiler (0.3.4)
+    quby-compiler (0.3.5)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       activesupport (>= 5.0)
@@ -21,8 +21,8 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (3.8.3)
-      activemodel (>= 4, < 7)
+    active_interaction (4.0.2)
+      activemodel (>= 5, < 7)
     activemodel (6.0.4)
       activesupport (= 6.0.4)
     activerecord (6.0.4)
@@ -34,7 +34,7 @@ GEM
       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)
@@ -44,13 +44,13 @@ GEM
     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)
@@ -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/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/outputs/roqua_serializer.rb

@@ -84,11 +84,47 @@ 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?
@@ -97,7 +133,7 @@ module Quby
               headers[subschema.key] = subschema.label
             end
           end
-          
+
           {
             headers: headers,
             tables: tables,

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.3.5"
+    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.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel