quby-compiler 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3a0e71ca3c1110d28db3bcedb2e61c335fab0460ccb4855b217e8268d19ca16
-  data.tar.gz: d091545bbb7eda297678b5352067b75dd5af1a6b00d850ffd6d27ae4789e5f85
+  metadata.gz: 3b15f3bb6d801cc4285f64d05d715cbf86326ae4a6aae32767b3e1bd720c805f
+  data.tar.gz: 6ff6dbd94acf1c14ae61f6bc3eb96f6e462b4728ad2e781752cc8980380377ff
 SHA512:
-  metadata.gz: de9c43f71a64feb71bb3afba79e50d7284f4b6202395ac8e7167ee9e093af0db10afd9f3ce676ee8a2f2bf95806935ad8b4426739c4676fe90a0149bb4552309
-  data.tar.gz: a6176b0e5a8f2570dbc022131739ae14de775e502f77561969f547d567cd29e5ba46e4d4c2dce8e0279e85d8b496fda580298abb37a60256ed0f587858642623
+  metadata.gz: 6fd74f49d869607c6306a0d6c6fe62088930cbfd7a894be53f04a16efa7f15846fb2876f37171f92df3137e180bec112e76f322d7a78c973474f2c16f7e45f88
+  data.tar.gz: 15a0708156bcfb9563bc1c684da99a4a9ad523a3d6ff92571a4a3d1bacd8b1106b05ae629f1b76d60bcf178cee6cd54a1d7ae89f31d950165400cd7814597a7c

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.6.7
+
+* dsl_quby2.json: Add single_select_label to s-expressions.
+
+# 0.6.6
+
+* dsl: Add Question#subtype (iso_country_number).
+* roqua.json: Add Question#subtype.
+
 # 0.6.5
 
 * Fix issue with key prefix checking of check_boxes with inner_titles.

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

@@ -49,7 +49,7 @@ module Quby
 
           content = sources.map { |url, ext| tag.source src: url, type: "video/#{ext}" }
             .append(I18n.t('video_not_supported'))
-            .yield_self(&tag.method(:safe_join))
+            .then { safe_join(_1) }
 
           content_tag(:video, content, options)
         end

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

@@ -19,6 +19,10 @@ module Quby::Compiler
         Entities::SexpVariables::StringValue.new(op: :string_value, key: key)
       end
 
+      def single_select_label(key)
+        Entities::SexpVariables::SingleSelectLabel.new(op: :single_select_label, key: key)
+      end
+
       def number_value(key)
         Entities::SexpVariables::NumberValue.new(op: :number_value, key: key)
       end

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

@@ -24,6 +24,9 @@ module Quby
 
         # What kind of question is this?
         attr_accessor :type
+        # More specific type, useful for outcome pages and api users.
+        attr_accessor :subtype
+        validates :subtype, inclusion: {in: [nil, :iso_country_number]}
 
         # How should we display this question
         attr_accessor :as
@@ -147,6 +150,7 @@ module Quby
           @key = key
           @sbg_key = options[:sbg_key]
           @type = options[:type]
+          @subtype = options[:subtype]
           @as = options[:as]
           @title = options[:title]
           @context_free_title = options[:context_free_title]

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

@@ -14,7 +14,7 @@ module Quby::Compiler::Entities
     def validate(questionnaire, calculation: self.calculation)
       validate_node(calculation, questionnaire:, type:)
     end
-    
+
     private
 
     def validate_node(node, questionnaire:, type:)
@@ -27,6 +27,9 @@ module Quby::Compiler::Entities
       when SexpVariables::StringValue
         validate_question_exist(questionnaire, node)
         validate_value_is_string(questionnaire, node)
+      when SexpVariables::SingleSelectLabel
+        validate_question_exist(questionnaire, node)
+        validate_value_is_single_select(questionnaire, node)
       when SexpVariables::NumberReducer
         node.values.each do |value|
           validate_node(value, questionnaire:, type: :number)
@@ -44,7 +47,7 @@ module Quby::Compiler::Entities
     def validate_type(node, type:)
       return if type == :number && SexpVariables::NumericType === node
       return if type == :boolean && SexpVariables::BooleanType === node
-      return if type == :string && SexpVariables::StringValue === node
+      return if type == :string && SexpVariables::StringType === node
 
       fail "sexp_variable #{key} has invalid type #{node.class} for expected type #{type}."
     end
@@ -65,6 +68,16 @@ module Quby::Compiler::Entities
       fail "sexp_variable #{key} uses non-numeric question #{sexp.key} for number_value."
     end
 
+    def validate_value_is_single_select(questionnaire, sexp)
+      question = questionnaire.question_hash[sexp.key]
+      case question
+      when Questions::RadioQuestion, Questions::SelectQuestion
+        return
+      end
+
+      fail "sexp_variable #{key} uses non-single-select question #{sexp.key} for single_select_label."
+    end
+
     def validate_value_is_string(questionnaire, sexp)
       question = questionnaire.question_hash[sexp.key]
       case question

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

@@ -24,6 +24,14 @@ module Quby::Compiler::Entities
       attribute :key, Quby::Types::Symbol
     end
 
+    # label of the selected option of a single-select (radio, scale, select) question.
+    class SingleSelectLabel < Base
+      attribute :op, Quby::Types::Symbol.enum(:single_select_label)
+      attribute :key, Quby::Types::Symbol
+    end
+
+    StringType = StringValue | SingleSelectLabel
+
     class Number
       attribute :op, Quby::Types::Symbol.enum(:number)     
       attribute :value, Quby::Types::Integer | Quby::Types::Float

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

@@ -206,6 +206,7 @@ module Quby
               key: question.key,
               sbg_key: question.sbg_key,
               type: QUBY_TYPE_TO_ROQUA_TYPE.fetch(question.type),
+              subtype: question.subtype,
               title: parse_markdown_and_strip_tags(question.title),
               context_free_title: question.context_free_title,
               unit: question.unit,

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.6.5"
+    VERSION = "0.6.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -13,44 +13,62 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +167,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - marten@veldthuis.com
 executables: