quby-compiler 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa19b0ae3da964273f613a8705e3b63e699dc14fc9793f67e13b891f5e6f42f
-  data.tar.gz: 8b2e41485f4d05711ea4098f1bbc23fdfe6e43fac6764047760434bbc04c41b3
+  metadata.gz: fdf056bcbbea1730c248d8cfb73d3fc7b51ff2f4ead55bd02781d6c81d1e5505
+  data.tar.gz: c974d4e4c67f8582325eaaf630ad71f4d7859a7835a15e125fb5407ad87e3b10
 SHA512:
-  metadata.gz: 127e6a879195d5ee84994016e53e7dbb99cb5a188023df2156e708f1e7ca57464d589b7c49adbae203acefbd1ad2eaecf943fa069466d82209a624f477f611dd
-  data.tar.gz: 5256bfbd80fa05c961cd7cfd0c59c78c35fa6b24fb3581534a7a10d926f58ab5432cdc674ee9ad9abd5262981657f6d164914229a2c28c0a6d836372fff5a08a
+  metadata.gz: 107f7a4d9cc66dd69c8acde899737d1111c82e1e4e520916a9325372d2f181e64795448b192ecd7d6073641d4bead30ec6d3bfcfd56d01b72fd4d1179f9e8568
+  data.tar.gz: 614dd011da028989a99c8c43fafce188c9662b205c15241e8df5489479afe1a433287eb984a2ed3a192716bc15ffe5fb29c8e84dfa6127b1f7a51544c550575e

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 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)
+* allow visibility_rule call within float questions, like integer. 
+* Remove empty outputs from Instance.compile.
+
 # 0.6.0
 
 * dsl:

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

@@ -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/dsl/questions/float_question_builder.rb

@@ -10,6 +10,7 @@ module Quby
           include Units
           include Sizes
           include CompareVisibilityRule
+          include VisibilityRule
 
           def initialize(key, **options, &block)
             super

data/lib/quby/compiler/instance.rb

@@ -1,3 +1,5 @@
+require "oj"
+
 module Quby
   module Compiler
     class Instance
@@ -37,7 +39,7 @@ module Quby
             roqua: Output.new(
               key: :roqua,
               filename: "roqua.json",
-              content: JSON.pretty_generate(Outputs::RoquaSerializer.new(questionnaire).as_json),
+              content: Oj.dump(Outputs::RoquaSerializer.new(questionnaire).as_json, mode: :json, indent: 2),
             ),
             seeds: Output.new(
               key: :seeds,
@@ -47,19 +49,19 @@ module Quby
             quby_frontend_v1: Output.new(
               key: :quby_frontend_v1,
               filename: "quby-frontend-v1.json",
-              content: JSON.pretty_generate(Outputs::QubyFrontendV1Serializer.new(questionnaire).as_json),
+              content: Oj.dump(Outputs::QubyFrontendV1Serializer.new(questionnaire).as_json, mode: :json, indent: 2),
             ),
             quby_frontend_v2: Output.new(
               key: :quby_frontend_v2,
               filename: "quby-frontend-v2.json",
-              content: JSON.pretty_generate(Outputs::QubyFrontendV2Serializer.new(questionnaire, translations: all_translations).as_json),
+              content: Oj.dump(Outputs::QubyFrontendV2Serializer.new(questionnaire, translations: all_translations).as_json, mode: :json, indent: 2),
             ),
-            locale: questionnaire.translatable? && Output.new(
+            locale: questionnaire.translatable?.presence && Output.new(
               key: :locale,
               filename: "#{LOCALE_FILE_PREFIX}#{questionnaire.language}.json",
-              content: JSON.pretty_generate(original_locale),
+              content: Oj.dump(original_locale, mode: :json, indent: 2),
             ),
-          },
+          }.compact
         }
       ensure
         # We can only close and remove the file once serializers have finished.

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

@@ -178,10 +178,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 +331,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/outputs/roqua_serializer.rb

@@ -45,7 +45,7 @@ module Quby
             outcome_description: questionnaire.outcome_description,
             questions: questions,
             scores: scores,
-            anonymous_conditions: questionnaire.anonymous_conditions,
+            anonymous_conditions: questionnaire.anonymous_conditions.as_json,
             flags: flags,
             textvars: textvars,
             license: questionnaire.license,

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.6.0"
+    VERSION = "0.6.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -93,6 +93,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement