quby-compiler 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38f705b91a2ad37a0babd91c08834ed37c0a0a0bfa60a3e07bebfba06c44cef
-  data.tar.gz: e98e8f2c06f6a0bd17fef8ee7f631cd0dae29f059266ac84a39e6b56175b886c
+  metadata.gz: 4d882604750c6b9e14ef80ebf8251f0cd921b7f9e7db31b843b1c279676904c4
+  data.tar.gz: db31a32e46f675814f9ea97d00b0c8b35a45d60b895834c0aeaf0eec58c4ae57
 SHA512:
-  metadata.gz: c8b98bea5143a6eca8b122b3b852944e07a29ce2783e6c7380f54b404c78749f4e68716f059217e765da199cf1387f1076dd1d4b1ed445b8cf934a6fbd6f1be5
-  data.tar.gz: 4c3590905fed76601f80c32d8646bc67c12290a89286886c652f37c6999e7d1dd1abc2540d35f06a015b075e8097d72e1e635a5cad4da30f985d705e29c345ab
+  metadata.gz: 816477fed5ba4f5e9c1c36a0766e9e832bb8c9a37ab22e8547f8980937e98b915188a51e5154cde2c88cb0af578fb16d42d0709133c6e1b1622054cb2415e5ae
+  data.tar.gz: 97cf01e8fd73955ce8f51e399db8017705a69785f7e48c2f4dc6c40652f17d9638b17542725803442d1c6ca567d7c79bbc49e72d2df7f60cd9481e9aa0ac11c2

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# 0.3.1
+
+* Slashes after numbers are now removed from question titles when making RoQua seeds (quests attribute).
+
+# 0.3.0
+
+* [Backward Incompatible]: flag.depends_on is now an array.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quby-compiler (0.1.1)
+    quby-compiler (0.3.1)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       activesupport (>= 5.0)
@@ -15,20 +15,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionview (6.0.3.5)
+      activesupport (= 6.0.3.5)
       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.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
+    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)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -38,54 +38,51 @@ GEM
       rack
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     crass (1.0.6)
     diff-lcs (1.4.4)
-    dry-configurable (0.11.6)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.0.7)
+    dry-logic (1.1.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-struct (1.3.0)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
-      dry-types (~> 1.3)
+      dry-core (~> 0.5, >= 0.5)
+    dry-struct (1.4.0)
+      dry-core (~> 0.5, >= 0.5)
+      dry-types (~> 1.5)
       ice_nine (~> 0.11)
-    dry-types (1.4.0)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    erubi (1.9.0)
-    i18n (1.8.5)
+    erubi (1.10.0)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    loofah (2.7.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
     naught (1.1.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.2)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogumbo (2.0.4)
       nokogiri (~> 1.8, >= 1.8.4)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.5.2)
     rack (2.2.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -93,8 +90,8 @@ GEM
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rake (12.3.3)
-    redcarpet (3.5.0)
-    roqua-support (0.3.4)
+    redcarpet (3.5.1)
+    roqua-support (0.3.5)
       active_interaction (~> 3.0)
       activesupport (>= 5.1, < 6.1)
       appsignal (>= 2.9, < 2.11)
@@ -114,11 +111,11 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.8)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     with_advisory_lock (3.2.0)
       activerecord (>= 3.2)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

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

@@ -14,11 +14,11 @@ module Quby
                        trigger_on: true,
                        shows_questions: [],
                        hides_questions: [],
-                       depends_on: nil, # used in interface to hide this flag unless the depended on flag is set to true
+                       depends_on: [], # used in interface to hide this flag unless the depended on flag is set to true
                        default_in_interface: nil) # used in interface to set a default for the flag state,
                                                   # does not have an effect outside of the interface
           super(key, description_true, description_false, description, internal, trigger_on, shows_questions,
-                hides_questions, depends_on, default_in_interface)
+                hides_questions, Array.wrap(depends_on).map(&:to_s), default_in_interface)
           ensure_valid_descriptions
         end
         # rubocop:enable ParameterLists

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

@@ -131,9 +131,9 @@ module Quby
         end
 
         def validate_flag_depends_on(questionnaire, flag)
-          return if flag.depends_on.blank? || questionnaire.flags.key?(flag.depends_on)
+          return if (missing = flag.depends_on - questionnaire.flags.keys).blank?
 
-          fail ArgumentError, "Flag #{flag.key} depends_on nonexistent flag '#{flag.depends_on}'"
+          fail ArgumentError, "Flag #{flag.key} depends_on nonexistent flag '#{missing.to_sentence}'"
         end
 
         def validate_respondent_types(questionnaire)

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

@@ -114,6 +114,7 @@ module Quby
             update_dqtypes_depends(d_qtypes, question, options)
           end
 
+          strip_question_number_slashes(question_titles)
           seed["quests"] = sort_nested_hash(question_titles)
           seed["d_qtypes"] = sort_nested_hash(d_qtypes)
           seed["name"] = questionnaire.title
@@ -286,7 +287,13 @@ module Quby
         end
 
         def strip_p_tag(text)
-          text.gsub(/^<p>(.*)<\/p>\n?$/, "\\1")
+          text.gsub /^<p>(.*)<\/p>\n?$/, '\1'
+        end
+
+        def strip_question_number_slashes(quests)
+          quests.transform_values! do |value|
+            value.gsub /^(\s*\d+)\\/, '\1'
+          end
         end
 
         def process_scores

data/lib/quby/compiler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -148,6 +148,7 @@ files:
 - ".gitlab-ci.yml"
 - ".rspec"
 - ".ruby-version"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile
 - Gemfile