quby-compiler 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 204fe4926804a88d4ba8889a7dc644cf0e6e526f4f0535b066e78cc47fb1dee3
-  data.tar.gz: 0fc9f69f7305608de6b1349c3b283da728bea6037689c8d4272012ec56cc23e7
+  metadata.gz: f0db7cde28558a1299251282f5fa19fef2fd8ab3528b70779930d962737f96c8
+  data.tar.gz: 74e0a2075d664b251160e2ed98ecb937185ecbcafea38ba23a777422d30d6496
 SHA512:
-  metadata.gz: 24e4d191808d82cd3185d7aa645579af39906b38d02c3bfef736a1d42b49c867086f9a7ac23c6275e7b8918655997edd7b1b1b5b5b3b6d91f47e2e9f89c984a6
-  data.tar.gz: 0f888b7293af6f9e5a7dc35fc935c8008af5c61682756a78c8e00fcfa07e19c7de0148ea85971f36b3879f29f5ea3a5a65f8033dcca1f448a0c0a9c0fb772cd4
+  metadata.gz: e9fa3343bd33f58bad878747e0d690966dec5e4b6c50b4be6b928c46642c0c1eb2515ba1b012fe06d24c7ff3b4ccf5f043b7a425e82841dd2866713cfb26cb9e
+  data.tar.gz: 3449a3124f17da8e64f45b3b941d9768d1d4011360078a25ea9694647732aa2d4aa94f2786f1a6dfd81ae3a6745eaca3cd8f63af67ebb0d43d1f2a3c2178f664

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 0.6.3
+
+* dsl + quby2.json: Add subtype to info_blocks.
+
+# 0.6.2
+
+* dsl:
+  * Add text option to info_blocks, so you can start with the key.
+  * Allow label for placeholder option.
+* quby2.json
+  *  Use . between panel/info_block key and default key for items, for more consistency. Remove double panel key for items with default key.
+  * Don't camelcase translation keys for quby2, no real benefit and was wrongly camelcasing html keys.
+
 # 0.6.1
 
 * Switch to oj for serializing, since JSON.serialize is dumb as ^%#$& (not serializing inner object)

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

@@ -11,8 +11,8 @@ module Quby
         delegate :panel, to: :info_block
         delegate :questionnaire, to: :panel
 
-        def initialize(key, start_open: true, panel:, default_question_options:, custom_methods:)
-          @info_block = Entities::InfoBlock.new(key: , panel:, start_open:)
+        def initialize(key, panel:, default_question_options:, custom_methods:, **options)
+          @info_block = Entities::InfoBlock.new(key: , panel:, **options)
           @default_question_options = default_question_options
           @custom_methods = custom_methods
           check_key_uniqueness(key, questionnaire:)
@@ -29,6 +29,10 @@ module Quby
           info_block.items << Entities::Text.new('', html_content: value.to_s, key:)
         end
 
+        def text(key:, html: nil, md: nil, **options)
+          info_block.items << Entities::Text.new(key:, md:, html_content: html, **options)
+        end
+
         def question(key, **options, &block)
           options = default_question_options.merge(options).merge(questionnaire:)
 
@@ -53,7 +57,7 @@ module Quby
         def fallback_key
           raise "Item without key in #{info_block.key}" if questionnaire.translatable?
 
-          "#{info_block.key}_item_#{info_block.items.size}"
+          "#{info_block.key}.item_#{info_block.items.size}"
         end
       end
     end

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

@@ -95,7 +95,7 @@ module Quby
         def fallback_key
           raise "Item without key in #{@panel.key}" if @questionnaire.translatable?
 
-          "#{@panel.key}_item_#{@panel.items.size}"
+          "#{@panel.key}.item_#{@panel.items.size}"
         end
       end
     end

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

@@ -2,16 +2,18 @@ module Quby
   module Compiler
     module Entities
       class InfoBlock < Item
-        attr_reader :key, :items, :start_open, :panel
+        attr_reader :key, :items, :start_open, :subtype, :panel
         attr_accessor :html
 
         validates :key, presence: true, 'quby/compiler/type': {is_a: Symbol}
         validates :html, presence: true
+        validates :subtype, presence: true, inclusion: {in: ["info", "question-bar"]}
 
-        def initialize(key:, panel:, start_open: true)
+        def initialize(key:, panel:, start_open: true, subtype: "info")
           @panel = panel
           @key = key
           @start_open = start_open
+          @subtype = subtype
           @items = []
         end
 

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

@@ -31,7 +31,7 @@ module Quby
           items.flat_map { |item|
             case item
             when Quby::Compiler::Entities::Text
-              { "#{panel.key}.#{item.key}" => item.html }
+              { "#{item.key}" => item.html }
             when Quby::Compiler::Entities::Question
               questions_for_question(item).flat_map { |question|
                 question_locale_values(question, panel:)

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

@@ -97,6 +97,7 @@ module Quby
         def info_block_item(info_block)
           {
             type: 'info',
+            subtype: info_block.subtype,
             key: info_block.key,
             html: handle_html(info_block.html, type: :prose, v1_markdown: false),
             startOpen: info_block.start_open,
@@ -178,10 +179,11 @@ module Quby
         end
 
         def select_question(question)
+          placeholder = question.all_options.find(&:placeholder)
           {
             **base_question(question),
             children: children(question),
-            placeholder: question.all_options.find { _1.placeholder }&.description,
+            placeholder: placeholder&.label || placeholder&.description,
           }.compact
         end
 
@@ -330,8 +332,7 @@ module Quby
                 key.ends_with?("context_free_title") \
                 || key.ends_with?("context_free_description") \
                 || key == "short_description"
-              } \
-              .transform_keys! { |k| k.to_s.split('.').tap{ _1[-1] = _1[-1].camelize(:lower) }.join('.') }
+              }
             }
         end
 

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.6.1"
+    VERSION = "0.6.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Marten Veldthuis