quby-compiler 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f80c06ecab5163ba31ba68e5548ec4e53211b4d327d738b07947578409afed
-  data.tar.gz: a56fa925a142ec55eb909e33257c3f399d8990c79ace266e6ebc7687cefb49cc
+  metadata.gz: f13fa5a2d4c4da7b41e4a32905226d0523709bac245a9d7cba3d28fd927d2b6a
+  data.tar.gz: 4e8f0dfab2c05e6166176f5ddb951e5f4e51962b9902e75ea3e8561e9cda3392
 SHA512:
-  metadata.gz: 3aa823181f25722654444f7ad79e8922b59f6cb93463e12e61abef7ead8a391695156fcb4cb8f4551ad115b6a710ab2e5d81138575d7fce05d442db1e86dd809
-  data.tar.gz: 89376384e57965c290e667984fd98605668ef2a832a87d78215e6c0435379bd6ce4b4cf994091bcc9975554fb05e7ed3f6bfbf4beab6af13115fb3489cd87a94
+  metadata.gz: fb6313ab623e76109aa94871bb192da9c95bbaa5809472b29bc88c2f7b61ebcb18b03b7433fe162209c33a1113aa7f359722c8927196d0d9b7ebf022e457e5b4
+  data.tar.gz: 3b3c6aeb7d590570defc880d3b1743ff64c1cb4c6227da2bb779c93057a7c1c249563f0e2366a1e6e13b6760fa90c010f66b57757159b24e0073af71403b6098

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 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/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/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.4.12"
+    VERSION = "0.4.13"
   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.13
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Quby::Compiler compiles a DSL for questionnaires to JSON