quby-compiler 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa19b0ae3da964273f613a8705e3b63e699dc14fc9793f67e13b891f5e6f42f
-  data.tar.gz: 8b2e41485f4d05711ea4098f1bbc23fdfe6e43fac6764047760434bbc04c41b3
+  metadata.gz: 204fe4926804a88d4ba8889a7dc644cf0e6e526f4f0535b066e78cc47fb1dee3
+  data.tar.gz: 0fc9f69f7305608de6b1349c3b283da728bea6037689c8d4272012ec56cc23e7
 SHA512:
-  metadata.gz: 127e6a879195d5ee84994016e53e7dbb99cb5a188023df2156e708f1e7ca57464d589b7c49adbae203acefbd1ad2eaecf943fa069466d82209a624f477f611dd
-  data.tar.gz: 5256bfbd80fa05c961cd7cfd0c59c78c35fa6b24fb3581534a7a10d926f58ab5432cdc674ee9ad9abd5262981657f6d164914229a2c28c0a6d836372fff5a08a
+  metadata.gz: 24e4d191808d82cd3185d7aa645579af39906b38d02c3bfef736a1d42b49c867086f9a7ac23c6275e7b8918655997edd7b1b1b5b5b3b6d91f47e2e9f89c984a6
+  data.tar.gz: 0f888b7293af6f9e5a7dc35fc935c8008af5c61682756a78c8e00fcfa07e19c7de0148ea85971f36b3879f29f5ea3a5a65f8033dcca1f448a0c0a9c0fb772cd4

data/CHANGELOG.md

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