quby-compiler 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a88dc734b7b4dcec4c90b1a296ce1daa1db155b7c07c6e8211f510d6f6d6a8
-  data.tar.gz: d7f5255fc362997ed992b3a8fa5b3b7419e6944d5ec33275c968e8fa41eed6e8
+  metadata.gz: 01cfba3183d5a4279b2c73b3c9cee99b676bb878fe4fb41750966dff9f3cee05
+  data.tar.gz: b73b3f4426dc2a4f995fd03164a49ef65d27a723d7de870fdeceaebf26efecc0
 SHA512:
-  metadata.gz: be0139d2d2fb49f4d282fe2ff0bf8eecfcfadf0e54ac5a5f7ed5c05b1797e687690666bba7cc8cd4504bff8860d3c4353b23fa99fc7296e6763758a5d603ee17
-  data.tar.gz: cc9c0bea2deb15f53da4a299f63117a93cce53326e333cba11e1ce08d5047ad968eb0d91cc1393b4620adfa945affc93f1049cfb2f18a5f9aa9a471260318da3
+  metadata.gz: 7babf0bc0256ed62390f442b34104eaf64778ad04a563fa3ffd239091bcca67f0d3058a42a67df4b8db50a12a8e6bd064636f290cc519233065c7d0a18175e9f
+  data.tar.gz: c65d1f03ed2219c8b3704a843323ef92bb019baef95889ee86d40ecc67fb4f4eda5a2bdb5905adf652178657b783232c85353db0fb726076efbaad1ea342ce21

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.6.8
+
+* dsl_quby2.json: Add count_selected to s-expressions.
+* dsl_quby2.json: Add cond, true and false to s-expressions. cond evaluates the body of the first clause whose test is true; each body must have the same type.
+* dsl_quby2.json: single_select_label variables (also via cond) must be declared `type: :quest_i18n_key` and are serialized with that type.
+
+# 0.6.7
+
+* dsl_quby2.json: Add single_select_label to s-expressions.
+
 # 0.6.6
 
 * dsl: Add Question#subtype (iso_country_number).

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,14 @@ 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 count_selected(key)
+        Entities::SexpVariables::CountSelected.new(key: key)
+      end
+
       def number_value(key)
         Entities::SexpVariables::NumberValue.new(op: :number_value, key: key)
       end
@@ -49,6 +57,16 @@ module Quby::Compiler
         Entities::SexpVariables::NumberMethod.new(op: :round, value: value)
       end
 
+      # cond(clause(gt(left: number_value(:v_1), right: 2), 4), clause(true, 0))
+      # evaluates the body of the first clause whose test is true, so `clause(true, ...)` acts as the default case.
+      def cond(*clauses)
+        Entities::SexpVariables::Cond.new(op: :cond, clauses:)
+      end
+
+      def clause(test, body)
+        Entities::SexpVariables::Cond::Clause.new(test: wrap_scalars(test), body: wrap_scalars(body))
+      end
+
       def build
         Entities::SexpVariable.new(key:, calculation:, type:)
       end
@@ -63,9 +81,15 @@ module Quby::Compiler
         case value
         when Numeric
           Entities::SexpVariables::Number.new(op: :number, value: value)
+        when true
+          Entities::SexpVariables::True.new
+        when false
+          Entities::SexpVariables::False.new
+        when String
+          fail ArgumentError, "string literals are not supported in sexp_variables (they can't be translated), use string_value(:key) to reference a string question."
         else
           value
-        end 
+        end
       end
     end
   end

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

@@ -14,7 +14,11 @@ module Quby::Compiler::Entities
     def validate(questionnaire, calculation: self.calculation)
       validate_node(calculation, questionnaire:, type:)
     end
-    
+
+    def as_json(options = nil)
+      {key:, type: node_type(calculation), calculation:}.as_json(options)
+    end
+
     private
 
     def validate_node(node, questionnaire:, type:)
@@ -27,6 +31,12 @@ 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::CountSelected
+        validate_question_exist(questionnaire, node)
+        validate_value_is_multi_select(questionnaire, node)
       when SexpVariables::NumberReducer
         node.values.each do |value|
           validate_node(value, questionnaire:, type: :number)
@@ -38,13 +48,17 @@ module Quby::Compiler::Entities
       when SexpVariables::Comparer
         validate_node(node.left, questionnaire:, type: :number)
         validate_node(node.right, questionnaire:, type: :number)
+      when SexpVariables::Cond
+        node.clauses.each do |clause|
+          validate_node(clause.test, questionnaire:, type: :boolean)
+
+          validate_node(clause.body, questionnaire:, type: type)
+        end
       end
     end
 
     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 == node_type(node)
 
       fail "sexp_variable #{key} has invalid type #{node.class} for expected type #{type}."
     end
@@ -65,6 +79,23 @@ 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_multi_select(questionnaire, sexp)
+      question = questionnaire.question_hash[sexp.key]
+      return if Questions::CheckboxQuestion === question
+
+      fail "sexp_variable #{key} uses non-multi-select question #{sexp.key} for count_selected."
+    end
+
     def validate_value_is_string(questionnaire, sexp)
       question = questionnaire.question_hash[sexp.key]
       case question
@@ -74,5 +105,20 @@ module Quby::Compiler::Entities
 
       fail "sexp_variable #{key} uses non-string question #{sexp.key} for string_value."
     end
+
+    def node_type(node)
+      case(node)
+      when SexpVariables::Cond # match first, since it's in all types.
+        node_type(node.clauses.first.body)
+      when SexpVariables::BooleanType
+        :boolean
+      when SexpVariables::NumericType
+        :number
+      when SexpVariables::StringType
+        :string
+      when SexpVariables::QuestI18nKeyType
+        :quest_i18n_key
+      end
+    end
   end
 end

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

@@ -4,28 +4,62 @@ module Quby::Compiler::Entities
     end
 
     # recursive dependencies, we so we define the classes first.
+    class Cond < Base; end
+
     class NumberValue < Base; end
     class Number < Base; end
     class NumberReducer < Base; end
     class NumberMethod < Base; end
+    class CountSelected < Base; end
+
     class BooleanReducer < Base; end
     class Comparer < Base; end
+    class True < Base; end
+    class False < Base; end
 
-    NumericType = Number | NumberReducer | NumberMethod | NumberValue
-    BooleanType = BooleanReducer | Comparer
+    class StringValue < Base; end
+    class SingleSelectLabel < Base; end
+
+    NumericType = Number | NumberReducer | NumberMethod | NumberValue | CountSelected | Cond
+    BooleanType = BooleanReducer | Comparer | True | False | Cond
+    StringType = StringValue | Cond
+    QuestI18nKeyType = SingleSelectLabel | Cond
+    AllTypes = NumericType | BooleanType | StringType | QuestI18nKeyType
 
     class NumberValue
       attribute :op, Quby::Types::Symbol.enum(:number_value)
       attribute :key, Quby::Types::Symbol
     end
 
-    class StringValue < Base
+    class StringValue
       attribute :op, Quby::Types::Symbol.enum(:string_value)
       attribute :key, Quby::Types::Symbol
     end
 
+    # label of the selected option of a single-select (radio, scale, select) question.
+    class SingleSelectLabel
+      attribute :op, Quby::Types::Symbol.enum(:single_select_label)
+      attribute :key, Quby::Types::Symbol
+    end
+
+    # returning a Boolean: always true. Used as the default case of a cond.
+    class True
+      attribute :op, Quby::Types::Symbol.default(:true).enum(:true)
+    end
+
+    # returning a Boolean: always false.
+    class False
+      attribute :op, Quby::Types::Symbol.default(:false).enum(:false)
+    end
+
+    # number of selected options of a multi-select (check_box) question.
+    class CountSelected
+      attribute :op, Quby::Types::Symbol.default(:count_selected).enum(:count_selected)
+      attribute :key, Quby::Types::Symbol
+    end
+
     class Number
-      attribute :op, Quby::Types::Symbol.enum(:number)     
+      attribute :op, Quby::Types::Symbol.enum(:number)
       attribute :value, Quby::Types::Integer | Quby::Types::Float
     end
 
@@ -50,8 +84,20 @@ module Quby::Compiler::Entities
 
     # returning a Number
     class NumberMethod
-      attribute :op, Quby::Types::Symbol.enum(:round)     
+      attribute :op, Quby::Types::Symbol.enum(:round)
       attribute :value, NumericType
     end
+
+    # evaluates the body of the first clause whose test is true.
+    # Each body should have the same type, which determines the result type.
+    class Cond
+      class Clause < Base
+        attribute :test, BooleanType
+        attribute :body, AllTypes
+      end
+
+      attribute :op, Quby::Types::Symbol.enum(:cond)
+      attribute :clauses, Quby::Types::Array.of(Clause).constrained(min_size: 1)
+    end
   end
 end

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.6.6"
+    VERSION = "0.6.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 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: