quby-compiler 0.3.7 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9afe2a68ca9334f324a6d096918e625d432016b631794fdfe1db307acd25ebff
-  data.tar.gz: 87cce57c50f1509b48ef072d53dfa4f56a8880b3dc82c002dbd9c6b70a368c7b
+  metadata.gz: 51cced2ed60f5bf58986b0bb1359a06e20349ee41f8313a86fd8abe7743b942f
+  data.tar.gz: 63dfc7514011d1a0518a5a5fd5dec191dd326104dab042eba491bb3b71380ff8
 SHA512:
-  metadata.gz: 32acc8cd41565840352dc2c5b3137aca5f31422ee000424dd0b412d9ae9cadde00ff7d1eb5b92eb54b6b4ee493bd581413aee3c93fd01c2fd176fc57d7ec2e3b
-  data.tar.gz: 6f677f3ea56d37009e637298d58d1969761fa6793c412b42dc8068ca99bb47a185427d31beae7e29b60236ea724929e911ebafca78db2e0a2755babf9b1956bd
+  metadata.gz: 0cef3595b41bdeb1eb0cd4ced9b903fc63441359a98a12b2999bdfda66daa2b705c07316cf6eaf16912e64a20098296348b838565eb89c6f15b42bab659fbdee
+  data.tar.gz: a5ad54369e5bf53e516d2f03665309d0e3e530b3acd488be9cad1eb4d1bcab0cebb6e3d23274c5d3bbfba225475e8970aa24fc776eee1b5206049428dd8c1d0d

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# 0.4.3
+
+* roqua.json: add scores hash.
+
+# 0.4.2
+
+* quby2: Added labels to slider questions.
+
+# 0.4.1
+
+* seeds: Fix depends: :present rule being overridden.
+
+# 0.4.0
+
+* rename flag visibilty rule value to trigger_on
+* Don't parse select option descriptions as markdown.
+
 # 0.3.7
 
 * Remove last_update

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

@@ -89,7 +89,7 @@ module Quby
         end
 
         def as_json
-          question_hash
+          question_hash.as_json
         end
 
         private

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

@@ -231,7 +231,6 @@ module Quby
             title: Quby::MarkdownParser.new(title).to_html,
             description: Quby::MarkdownParser.new(description).to_html,
             type: type,
-            unit: unit,
             size: size,
             hidden: hidden?,
             displayModes: display_modes,
@@ -243,7 +242,10 @@ module Quby
             presentation: presentation,
             as: as,
             questionGroup: question_group
-          )
+          ).tap do |json|
+            json[:unit] = unit if %i[integer float string].include?(type) && as != :slider
+            json[:labels] = labels if as == :slider
+          end
         end
 
         # Returns all keys belonging to html inputs generated by this question.

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

@@ -57,8 +57,12 @@ module Quby
           {
             key: key,
             value: value,
-            description: Quby::MarkdownParser.new(description).to_html,
-            context_free_description: Quby::MarkdownParser.new(context_free_description).to_html,
+            description: question.type == :select \
+              ? description
+              : Quby::MarkdownParser.new(description).to_html,
+            context_free_description: question.type == :select \
+              ? context_free_description
+              : Quby::MarkdownParser.new(context_free_description).to_html,
             questions: questions,
             innerTitle: inner_title,
             hidesQuestions: hides_questions,

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

@@ -193,7 +193,7 @@ module Quby
             outcomeDescription: outcome_description,
             shortDescription: short_description,
             panels: panels,
-            fields: fields,
+            fields: fields.as_json,
             flags: flags,
             textvars: textvars,
             validations: validations,

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

@@ -39,7 +39,7 @@ module Quby
         end
 
         def self.from_flag(flag)
-          condition = { type: "flag_equal", flag_key: flag.key, value: flag.trigger_on }
+          condition = { type: "flag_equal", flag_key: flag.key, trigger_on: flag.trigger_on }
 
           [].tap do |rules|
             flag.shows_questions.each do |question_key|

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

@@ -22,6 +22,7 @@ module Quby
             tags: questionnaire.tags.to_h.keys,
             charts: charts,
             outcome_tables_schema: outcome_tables_schema,
+            scores: scores,
           }
         end
 
@@ -139,7 +140,33 @@ module Quby
             tables: tables,
           }
         end
+
+        # [{ key: { ..,  subscores: { subkey: {..} } } }]
+        def scores
+          questionnaire.score_schemas.transform_values { |score|
+            {
+              key: score.key,
+              label: score.label,
+              subscores: subscores_for(score)
+            }
+          }
+        end
+
+        # { subkey: {..} }
+        def subscores_for(score)
+          score.subscore_schemas.to_h { |subscore|
+            [
+              subscore.key,
+              {
+                key: subscore.key,
+                label: subscore.label,
+                export_key: subscore.export_key,
+                only_for_export: subscore.only_for_export.presence
+              }.compact
+            ]
+          }
+        end
       end
     end
   end
-end
+end

data/lib/quby/compiler/services/quby_proxy.rb

@@ -30,9 +30,6 @@ module Quby
           @hidden_questions = {} # hash containing questions hidden by other questions
 
           for question in questions_flat
-            if question.hidden && question.type != :check_box
-              d_qtypes[question.key.to_s] = { depends: :present } unless options[:without_depends]
-            end
             unless question.hidden && (question.type == :check_box || question.type == :hidden)
               vars << question.key.to_s
             end
@@ -184,6 +181,9 @@ module Quby
           if hidden = @hidden_questions[question.key.to_s]
             d_qtypes[question.key.to_s][:depends] ||= hidden unless options[:without_depends]
           end
+          if question.hidden && question.type != :check_box
+            d_qtypes[question.key.to_s][:depends] = :present unless options[:without_depends]
+          end
         end
 
         def generate_question_titles

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.3.7"
+    VERSION = "0.4.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.3
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -144,21 +144,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitlab-ci.yml"
-- ".rspec"
-- ".ruby-version"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Dockerfile
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/rspec
-- bin/setup
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/nl.yml
@@ -167,7 +156,6 @@ files:
 - config/locales/rails-i18n/en.yml
 - config/locales/rails-i18n/nl.yml
 - exe/quby-compile
-- lib/quby/.DS_Store
 - lib/quby/array_attribute_valid_validator.rb
 - lib/quby/attribute_valid_validator.rb
 - lib/quby/compiler.rb
@@ -250,7 +238,6 @@ files:
 - lib/quby/settings.rb
 - lib/quby/text_transformation.rb
 - lib/quby/type_validator.rb
-- quby-compiler.gemspec
 homepage: https://gitlab.roqua.nl/roqua/quby-compiler
 licenses:
 - MIT
@@ -271,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Quby::Compiler compiles a DSL for questionnaires to JSON

data/.gitignore

@@ -1,13 +0,0 @@
-.DS_Store
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/output/
-
-# rspec failure tracking
-.rspec_status

data/.gitlab-ci.yml

@@ -1,5 +0,0 @@
-test:
-  image: docker
-  script:
-    - docker build . --tag quby-compiler-$CI_COMMIT_SHA
-    - docker run quby-compiler-$CI_COMMIT_SHA bundle exec rspec

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.ruby-version

@@ -1 +0,0 @@
-2.7.2

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at marten@veldthuis.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [https://contributor-covenant.org/version/1/4][version]
-
-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/

data/Dockerfile

@@ -1,11 +0,0 @@
-FROM ruby:2.7-alpine
-
-RUN apk update && apk add docker git g++ make
-
-RUN gem update --system
-RUN gem install bundler
-
-WORKDIR /app
-
-ADD . /app
-RUN bundle install

data/Gemfile

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in quby-compiler.gemspec
-gemspec
-
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
-gem 'pry'

data/Gemfile.lock

@@ -1,130 +0,0 @@
-PATH
-  remote: .
-  specs:
-    quby-compiler (0.3.7)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
-      activesupport (>= 5.0)
-      dry-struct (>= 1.3.0)
-      method_source
-      nokogiri (>= 1.8)
-      nokogumbo
-      redcarpet (~> 3.5)
-      roqua-support
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionview (6.1.4)
-      activesupport (= 6.1.4)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (4.0.6)
-      activemodel (>= 5, < 7)
-      activesupport (>= 5, < 7)
-    activemodel (6.1.4)
-      activesupport (= 6.1.4)
-    activerecord (6.1.4)
-      activemodel (= 6.1.4)
-      activesupport (= 6.1.4)
-    activesupport (6.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    appsignal (3.0.15)
-      rack
-    builder (3.2.4)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    crass (1.0.6)
-    diff-lcs (1.4.4)
-    dry-configurable (0.13.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.9.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.1)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-struct (1.4.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-types (~> 1.5)
-      ice_nine (~> 0.11)
-    dry-types (1.5.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    erubi (1.10.0)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    loofah (2.12.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (1.0.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
-    naught (1.1.0)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
-      racc (~> 1.4)
-    nokogumbo (2.0.5)
-      nokogiri (~> 1.8, >= 1.8.4)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    rake (12.3.3)
-    redcarpet (3.5.1)
-    roqua-support (0.4.1)
-      active_interaction (>= 3.0, < 5.0)
-      activesupport (>= 5.2, < 6.2)
-      appsignal (>= 2.9, < 3.1)
-      naught (~> 1.0)
-      with_advisory_lock (~> 3.2)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    with_advisory_lock (3.2.0)
-      activerecord (>= 3.2)
-    zeitwerk (2.5.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  pry
-  quby-compiler!
-  rake (~> 12.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.2.15

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "quby/compiler"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/rspec

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/quby-compiler.gemspec

@@ -1,39 +0,0 @@
-require_relative 'lib/quby/compiler/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "quby-compiler"
-  spec.version       = Quby::Compiler::VERSION
-  spec.authors       = ["Marten Veldthuis"]
-  spec.email         = ["marten@veldthuis.com"]
-
-  spec.summary       = %q{Quby::Compiler compiles a DSL for questionnaires to JSON}
-  #spec.description   = %q{TODO: Write a longer description or delete this line.}
-  spec.homepage      = "https://gitlab.roqua.nl/roqua/quby-compiler"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-
-  #spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  #spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-  #spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "activemodel", ">= 5.0"
-  spec.add_dependency "actionview", ">= 5.0"
-  spec.add_dependency "activesupport", ">= 5.0"
-  spec.add_dependency 'dry-struct', '>= 1.3.0'
-  spec.add_dependency 'nokogiri', '>= 1.8'
-  spec.add_dependency 'nokogumbo'
-  spec.add_dependency "redcarpet", '~> 3.5'
-  spec.add_dependency "method_source"
-  spec.add_dependency "roqua-support"
-end