quby 5.0.3 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66f07f18ebbeb641abfe598e1c45a0ff88905fbf374a91bce621215d5aa39d0e
-  data.tar.gz: 1b8923d50074731a333228e8036410c1d0914c51fafc8b35fe034325b171e0f8
+  metadata.gz: 791dc35955fc33de42a6fdadceb82d3b9ac244b5f361bfb40aa864f2932b9789
+  data.tar.gz: 48d1d7c68d27ae3ed2541f48f33f991d3eb7e59d7ea417e1d85082d1b97b1f54
 SHA512:
-  metadata.gz: 3a786a92c02715ba51e93d55b6b8aeecc62de6a63f05ee4c6733216621a3d8abe443dca7df63b08cf38b36c971cd8aef66a555fcc108506023e51bb2d4db9f6f
-  data.tar.gz: 44a0d1a9df8175255dea96833abfc022aebb93cf520adee23cd6f28efa5411bed89ef4557b8286ac590cc8955ce6c1b684aa59e7ed13a0684d11c2072987e71c
+  metadata.gz: 76dc22bfca03f05fcb79b7c6596b8e7f5139db5fad2f5521f2b76f5b7ca80b1d84738f497457c8cd84ede32022d293f180870c100cf9fe7db5d0ed332c1c06bf
+  data.tar.gz: e44cc1c13839f862946174a497577cd1bc836f0534579f187e56d9500d40cc40fa486d3e69cba418a5503a50083187ceaa7767a4a6300d88f16c6ebe99d73bda

data/README.markdown

@@ -45,13 +45,22 @@ To generate PDF files, the html_to_pdf docker container must be running and an e
 ENV['HTML_TO_PDF_URL']      = 'http://127.0.0.1:7768'
 ```
 
+## Docker
+
+```bash
+docker-compose build
+docker-compose run test appraisal install # generate lockfiles in mounted local gemfiles. alernatively remove volume.
+docker-compose run --rm test bundle exec appraisal rails60 rspec
+docker-compose run --rm test bundle exec appraisal rails60 teaspoon -r spec/teaspoon_env.rb
+```
+
 ## Testing
 
 When testing with guard or teaspoon, choose the Rails version you want to use and set the teaspoon environment:
 
 ```ruby
-bundle exec appraisal rails52 bundle # install dependencies for Rails 5.2
-TEASPOON_RAILS_ENV=test bundle exec appraisal rails52 guard
+bundle exec appraisal rails60 bundle # install dependencies for Rails 6.0
+TEASPOON_RAILS_ENV=test bundle exec appraisal rails60 guard
 ```
 
 ## Contributing to Quby

data/app/assets/javascripts/quby/answers/validation.js

@@ -309,7 +309,9 @@
     var hidden = 0;
 
     for(var i = 0; i < groupItems.length; i++){
-      var inputs = $(groupItems[i]).find("input, textarea, select").not(":disabled, :hidden");
+      var inputs = $(groupItems[i]).find("input, textarea, select").not(":disabled, :hidden")
+              .add($(groupItems[i]).find("input.made-slider:hidden")); // slider inputs
+
       if (inputs.length == 0) {
         hidden++;
       } else {

data/lib/quby/answers/repos/disk_repo.rb

@@ -61,7 +61,7 @@ module Quby
         end
 
         def entity(record)
-          entity_class.new(record.to_h).tap(&:enhance_by_dsl)
+          entity_class.new(**record.to_h).tap(&:enhance_by_dsl)
         end
       end
     end

data/lib/quby/answers/repos/memory_repo.rb

@@ -40,7 +40,7 @@ module Quby
         end
 
         def entity(record)
-          entity_class.new(record.to_h).tap(&:enhance_by_dsl)
+          entity_class.new(**record.to_h).tap(&:enhance_by_dsl)
         end
       end
     end

data/lib/quby/answers/services/answer_validator.rb

@@ -126,6 +126,11 @@ module Quby
         end
 
         def validate_regexp(question, validation, value)
+          # We have decided not to allow bypassing this validation when
+          # aborted, since whatever is using this data further on is likely not
+          # built to take into account values that do not conform to the given
+          # format.
+
           return if value.blank?
           match = validation[:matcher].match(value)
           unless match && match[0] == value
@@ -134,6 +139,11 @@ module Quby
         end
 
         def validate_minimum(question, validation, value)
+          # We have decided not to allow bypassing this validation when
+          # aborted, since whatever is using this data further on is likely not
+          # built to take into account values outside the intended range. (e.g.
+          # BMI calculation)
+
           return if value.blank? || (question.type == :date && value.values.all?(&:empty?))
           converted_answer_value = convert_answer_value(question, value)
           if converted_answer_value < validation[:value]
@@ -142,7 +152,13 @@ module Quby
         end
 
         def validate_maximum(question, validation, value)
+          # We have decided not to allow bypassing this validation when
+          # aborted, since whatever is using this data further on is likely not
+          # built to take into account values outside the intended range. (e.g.
+          # BMI calculation)
+
           return if value.blank? || (question.type == :date && value.values.all?(&:blank?))
+
           converted_answer_value = convert_answer_value(question, value)
           if converted_answer_value > validation[:value]
             answer.send(:add_error, question, validation[:type], validation[:message] || "Exceeds maximum")
@@ -150,12 +166,24 @@ module Quby
         end
 
         def validate_too_many_checked(question, validation, value)
+          # We have decided not to allow bypassing this validation when
+          # aborted, since it's possible to make a decision about which fields
+          # to keep and which ones to blank. If you want to do anything at all
+          # with this completion, you'll need to decide that at some point
+          # anyway, so we think it's best to do that as early as possible.
+
           if answer.send(question.uncheck_all_option) == 1 and value.values.reduce(:+) > 1
             answer.send(:add_error, question, :too_many_checked, validation[:message] || "Invalid combination of options.")
           end
         end
 
         def validate_not_all_checked(question, validation, value)
+          # We have decided not to allow bypassing this validation when
+          # aborted, since it's possible to make a decision about which fields
+          # to keep and which ones to blank. If you want to do anything at all
+          # with this completion, you'll need to decide that at some point
+          # anyway, so we think it's best to do that as early as possible.
+
           if answer.send(question.check_all_option) == 1 and
               value.values.reduce(:+) < value.length - (question.uncheck_all_option ? 1 : 0)
             answer.send(:add_error, question, :not_all_checked, validation[:message] || "Invalid combination of options.")
@@ -163,18 +191,28 @@ module Quby
         end
 
         def validate_maximum_checked_allowed(question, validation, value)
+          # We have decided not to allow bypassing this validation when
+          # aborted, since it's possible to make a decision about which fields
+          # to keep and which ones to blank. If you want to do anything at all
+          # with this completion, you'll need to decide that at some point
+          # anyway, so we think it's best to do that as early as possible.
+
           if value.values.reduce(:+) > question.maximum_checked_allowed.to_i
             answer.send(:add_error, question, :maximum_checked_allowed, validation[:message] || "Too many options checked.")
           end
         end
 
         def validate_minimum_checked_required(question, validation, value)
+          return if @answer.aborted
+
           if value.values.reduce(:+) < question.minimum_checked_required.to_i
             answer.send(:add_error, question, :minimum_checked_required, validation[:message] || "Not enough options checked.")
           end
         end
 
         def validate_answer_group_minimum(question, validation, value)
+          return if @answer.aborted
+
           answered = answer.send(:calc_answered, answer.question_groups[validation[:group]])
           if answered < validation[:value]
             answer.send(:add_error, question, :answer_group_minimum,
@@ -183,6 +221,12 @@ module Quby
         end
 
         def validate_answer_group_maximum(question, validation, value)
+          # We have decided not to allow bypassing this validation when
+          # aborted, since it's possible to make a decision about which fields
+          # to keep and which ones to blank. If you want to do anything at all
+          # with this completion, you'll need to decide that at some point
+          # anyway, so we think it's best to do that as early as possible.
+
           answered = answer.send(:calc_answered, answer.question_groups[validation[:group]])
           if answered > validation[:value]
             answer.send(:add_error, question, :answer_group_maximum,

data/lib/quby/answers/services/build_answer.rb

@@ -13,7 +13,7 @@ module Quby
         end
 
         def build
-          Quby::Answers::Entities::Answer.new(attributes)
+          Quby::Answers::Entities::Answer.new(**attributes)
         end
 
         private

data/lib/quby/answers/services/score_calculator.rb

@@ -12,7 +12,8 @@ module Quby
         class MissingAnswerValues < StandardError
           attr_reader :questionnaire_key, :values, :missing
 
-          def initialize(questionnaire_key:, values:, missing:)
+          def initialize(msg = nil, questionnaire_key:, values:, missing:)
+            super(msg)
             @questionnaire_key = questionnaire_key
             @values = values
             @missing = missing
@@ -21,8 +22,8 @@ module Quby
 
         # Evaluates block within the context of a new calculator
         # instance. All instance methods are accessible.
-        def self.calculate(*args, &block)
-          instance = new(*args)
+        def self.calculate(**kwargs, &block)
+          instance = new(**kwargs)
           result = instance.instance_eval(&block)
           result = result.merge(referenced_values: instance.referenced_values) if result.respond_to?(:merge)
           result
@@ -246,9 +247,10 @@ module Quby
           unanswered_keys = keys.select { |key| missing_value?(@values[key], missing_values: missing_values) }
 
           if unanswered_keys.size > keys.size - minimum_present
-            fail MissingAnswerValues, questionnaire_key: @questionnaire.key,
-                                      values: @values,
-                                      missing: unanswered_keys
+            raise MissingAnswerValues.new \
+                    questionnaire_key: @questionnaire.key,
+                    values: @values,
+                    missing: unanswered_keys
           end
         end
 

data/lib/quby/questionnaires/dsl.rb

@@ -5,14 +5,14 @@ module Quby
     module DSL
       # Deprecated, precompile elsewhere and use from_json
       def self.build_from_definition(definition)
-        compiled = Quby::Compiler.compile(definition.key, definition.sourcecode, seeds: [], lookup_tables: {}, path: definition.path, last_update: definition.timestamp)
+        compiled = Quby::Compiler.compile(definition.key, definition.sourcecode, lookup_tables: {}, path: definition.path, last_update: definition.timestamp)
         data = JSON.parse(compiled[:outputs][:quby_frontend_v1].content)
         Deserializer.from_json(data)
       end
 
       # Deprecated, precompile elsewhere and use from_json
       def self.build(key, sourcecode = nil, timestamp: nil, &block)
-        compiled = Quby::Compiler.compile(key, sourcecode, seeds: [], lookup_tables: {}, last_update: timestamp, &block)
+        compiled = Quby::Compiler.compile(key, sourcecode, lookup_tables: {}, last_update: timestamp, &block)
         data = JSON.parse(compiled[:outputs][:quby_frontend_v1].content)
         Deserializer.from_json(data)
       end

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

@@ -273,7 +273,7 @@ module Quby
           end
           flag_options[:key] = flag_key
           fail(ArgumentError, "Flag '#{flag_key}' already defined") if flags.key?(flag_key)
-          flags[flag_key] = Flag.new(flag_options)
+          flags[flag_key] = Flag.new(**flag_options)
         end
 
         def filter_flags(given_flags)

data/lib/quby/questionnaires/specs/api_specs.rb

@@ -2,18 +2,20 @@
 
 if defined?(RSpec)
   RSpec.shared_examples 'a valid backend for the questionnaires api' do
+    let(:api) { Quby::Questionnaires::API.new(questionnaire_repo: repo) }
+
     it 'supports finding a questionnaire' do
-      expect(Quby.questionnaires.find('simple').key).to eq('simple')
+      expect(api.find('simple').key).to eq('simple')
     end
 
     it 'supports checking whether a questionnaire exists' do
-      expect(Quby.questionnaires.exists? 'simple').to be_truthy
-      expect(Quby.questionnaires.exists? 'inexistant_questionnaire').to be_falsey
+      expect(api.exists? 'simple').to be_truthy
+      expect(api.exists? 'inexistant_questionnaire').to be_falsey
     end
 
     it 'supports finding all questionnaires' do
-      expect(Quby.questionnaires.all.map(&:key)).to include('simple')
-      expect(Quby.questionnaires.all.map(&:key)).to include('simple_with_outcome')
+      expect(api.all.map(&:key)).to include('simple')
+      expect(api.all.map(&:key)).to include('simple_with_outcome')
     end
   end
 end

data/lib/quby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quby
-  VERSION = "5.0.3"
+  VERSION = "5.1.1"
 end

data/spec/features/editing_completed_answer_spec.rb

@@ -25,7 +25,7 @@ feature 'Editing a completed answer' do
     expect(find('#answer_v_1_a2')).to be_checked
 
     # make sure subquestions of selected answers are enabled
-    expect(find('#answer_v_1_a2_val')[:disabled]).to be_falsey
-    expect(find('#answer_v_1_a1_val')[:disabled]).to be_truthy
+    expect(find('#answer_v_1_a2_val')[:disabled]).to eq 'false'
+    expect(find('#answer_v_1_a1_val')[:disabled]).to eq 'true'
   end
 end

data/spec/features/hiding_questions_spec.rb

@@ -66,7 +66,7 @@ feature 'Hiding and showing questions' do
     end
 
     scenario 'by visiting an answer with a flag that hides a question set to true', js: true do
-      answer = create_new_answer_for(questionnaire, {}, flags: {question_hiding_hides_flag: true})
+      answer = create_new_answer_for(questionnaire, flags: {question_hiding_hides_flag: true})
       visit_new_answer_for(questionnaire, "paged", answer)
       expect(page).to have_selector("#item_v_7.hide", visible: false)
     end
@@ -250,7 +250,7 @@ feature 'Hiding and showing questions' do
     end
 
     scenario 'by visiting an answer with a flag that shows a question set to true', js: true do
-      answer = create_new_answer_for(questionnaire, {}, flags: {question_hiding_shows_flag: true})
+      answer = create_new_answer_for(questionnaire, flags: {question_hiding_shows_flag: true})
       visit_new_answer_for(questionnaire, "paged", answer)
       goto_second_page
       expect(page).to have_selector("[data-for=v_9].show", count: 8)

data/spec/features/question_dependencies/group_maximum_answered_spec.rb

@@ -64,6 +64,13 @@ shared_examples 'group_maximum_answered_tests' do
     expect_saved_value 'v_date_day', "10"
   end
 
+  it 'is valid when only slider question filled in' do
+    set_slider_value('v_slider', '50')
+    run_validations
+    expect_no_errors
+    # expect_saved_value 'v_slider', "50" # occasional client side rounding issue :S
+  end
+
   it 'is valid when only radio question is not filled' do
     # select_radio_option 'v_radio', 'a1'
     select_radio_option 'v_scale', 'a1'
@@ -76,6 +83,7 @@ shared_examples 'group_maximum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_no_errors
     # expect_saved_value 'v_radio', 'a1'
@@ -102,6 +110,7 @@ shared_examples 'group_maximum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_no_errors
     expect_saved_value 'v_radio', 'a1'
@@ -128,6 +137,7 @@ shared_examples 'group_maximum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_no_errors
     expect_saved_value 'v_radio', 'a1'
@@ -154,6 +164,7 @@ shared_examples 'group_maximum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_no_errors
     expect_saved_value 'v_radio', 'a1'
@@ -180,6 +191,7 @@ shared_examples 'group_maximum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_no_errors
     expect_saved_value 'v_radio', 'a1'
@@ -206,6 +218,7 @@ shared_examples 'group_maximum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_no_errors
     expect_saved_value 'v_radio', 'a1'
@@ -232,6 +245,7 @@ shared_examples 'group_maximum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_no_errors
     expect_saved_value 'v_radio', 'a1'
@@ -258,6 +272,7 @@ shared_examples 'group_maximum_answered_tests' do
     # fill_in_question('v_date_year',  '2013')
     # fill_in_question('v_date_month', '12')
     # fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_no_errors
     expect_saved_value 'v_radio', 'a1'
@@ -272,6 +287,33 @@ shared_examples 'group_maximum_answered_tests' do
     # expect_saved_value 'v_date_day', "10"
   end
 
+  it 'is valid when only slider question is not filled' do
+    select_radio_option 'v_radio', 'a1'
+    select_radio_option 'v_scale', 'a1'
+    select_select_option 'v_select', 'a1'
+    check_option 'v_ck_a1'
+    uncheck_option 'v_ck_a2'
+    fill_in_question 'v_string', 'kittens!'
+    fill_in_question 'v_integer', '37'
+    fill_in_question 'v_float', '4.2'
+    fill_in_question('v_date_year',  '2013')
+    fill_in_question('v_date_month', '12')
+    fill_in_question('v_date_day',   '10')
+    # set_slider_value('v_slider', '50')
+    run_validations
+    expect_no_errors
+    expect_saved_value 'v_radio', 'a1'
+    expect_saved_value 'v_scale', 'a1'
+    expect_saved_value 'v_select', 'a1'
+    expect_saved_value 'v_check_box', {'v_ck_a1' => 1, 'v_ck_a2' => 0}
+    expect_saved_value 'v_string', 'kittens!'
+    expect_saved_value 'v_integer', "37"
+    expect_saved_value 'v_float', "4.2"
+    expect_saved_value 'v_date_year', "2013"
+    expect_saved_value 'v_date_month', "12"
+    expect_saved_value 'v_date_day', "10"
+  end
+
   it 'is not valid when all questions are filled in' do
     select_radio_option 'v_radio', 'a1'
     select_radio_option 'v_scale', 'a1'
@@ -284,6 +326,7 @@ shared_examples 'group_maximum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_errors_on_group
   end
@@ -296,7 +339,7 @@ shared_examples 'group_maximum_answered' do
   context 'maximum number of given answers in a group' do
     let(:questionnaire) do
       inject_questionnaire 'test', <<-END
-        n = 7
+        n = 8
 
         panel do
           question :v_radio, type: :radio, question_group: :group1, group_maximum_answered: n do
@@ -340,6 +383,12 @@ shared_examples 'group_maximum_answered' do
                             year_key: :v_date_year, month_key: :v_date_month, day_key: :v_date_day do
             title "Enter a date"
           end
+
+          question :v_slider, type: :float, as: :slider, size: 20, default_position: :hidden,
+                              question_group: :group1, group_maximum_answered: n do
+            title "Slider"
+            validates_in_range 0..100
+          end
         end; end_panel
       END
     end
@@ -350,7 +399,7 @@ shared_examples 'group_maximum_answered' do
   context 'maximum number of given answers in a group, with a table in the mix' do
     let(:questionnaire) do
       inject_questionnaire 'test', <<-END
-        n = 7
+        n = 8
 
         panel do
           table columns: 20 do
@@ -396,6 +445,12 @@ shared_examples 'group_maximum_answered' do
               title "Enter a date"
             end
           end
+
+          question :v_slider, type: :float, as: :slider, size: 20, default_position: :hidden,
+                              question_group: :group1, group_maximum_answered: n do
+            title "Slider"
+            validates_in_range 0..100
+          end
         end; end_panel
       END
     end
@@ -427,6 +482,13 @@ shared_examples 'group_maximum_answered' do
             option :a1, value: 1, description: "Select Option 1"
             option :a2, value: 2, description: "Select Option 2"
           end
+
+          question :v_slider, type: :float, as: :slider, size: 20, default_position: :hidden,
+                              default_invisible: true,
+                              question_group: :grp1, group_maximum_answered: n do
+            title "Slider"
+            validates_in_range 0..100
+          end
         end; end_panel
       END
     end
@@ -448,6 +510,7 @@ shared_examples 'group_maximum_answered' do
     expect_error_on 'v_integer', 'answer_group_maximum'
     expect_error_on 'v_float', 'answer_group_maximum'
     expect_error_on 'v_date', 'answer_group_maximum'
+    expect_error_on 'v_slider', 'answer_group_maximum'
   end
 end