quby 4.0.3 → 5.0.0.pre1

data/spec/quby/questionnaires/dsl_spec.rb

@@ -8,15 +8,6 @@ module Quby::Questionnaires
         definition = repo.find('simple')
         expect(described_class.build_from_definition(definition)).to be_instance_of(Entities::Questionnaire)
       end
-
-      it 'uses a path on instance eval, so we get correct stack traces' do
-        definition = Quby::Questionnaires::Entities::Definition.new(key: 'test',
-                                                                    sourcecode: 'raise("problem")',
-                                                                    path: 'spec/fixtures/raising.rb')
-        expected_backtrace = include(end_with("spec/fixtures/raising.rb:1:in `block in build_from_definition'"))
-        expect { described_class.build_from_definition(definition) }.to \
-          raise_exception(having_attributes(backtrace: expected_backtrace))
-      end
     end
   end
 end

data/spec/quby/questionnaires/entities/fields_spec.rb

@@ -82,8 +82,8 @@ module Quby::Questionnaires::Entities
     end
 
     describe '#description_for_variable' do
-      let(:definition) do
-        %q~
+      let(:questionnaire) do
+        Quby::Questionnaires::DSL.build("test") do
           flag key: :flagtest, description_true: 'it true', description_false: 'it false', description: 'it described'
           textvar key: :textvartest, description: 'tv description'
           question :v_1, type: :radio, title: 'select a few'
@@ -105,7 +105,7 @@ module Quby::Questionnaires::Entities
           score_schema :tot, 'Total', [{key: :value, export_key: 'tot', label: 'Score'},
                                        {key: :interpretation, export_key: 'tot_i', label: 'Interpretation'}]
 
-        ~
+        end
       end
 
       it 'returns question context free titles if the variable is a question' do

data/spec/quby/questionnaires/entities/question_spec.rb

@@ -42,14 +42,6 @@ module Quby::Questionnaires::Entities
     let(:valid_question_options) { {type: :string} }
     subject(:question) { Question.new(:v_1, valid_question_options) }
 
-    it 'validates the key to be a symbol' do
-      questionnaire = Quby::Questionnaires::DSL.build("test2") do
-          question "key", type: :radio
-      end
-      expect(questionnaire.questions.first.valid?).to eq false
-      expect(questionnaire.questions.first.errors.full_messages).to eq ["Key Is not of type Symbol"]
-    end
-
     describe 'sbg_key' do
       it 'can be set by options hash' do
         expect(questionnaire.question_hash[:date].sbg_key).to eq 'foo'

data/spec/quby/questionnaires/entities/questionnaire_spec.rb

@@ -432,30 +432,6 @@ module Quby::Questionnaires::Entities
       end
     end
 
-    describe '#ensure_scores_have_schemas' do
-      let(:score_missing_schema_quest) do
-        Quby::Questionnaires::DSL.build("test") do
-          question :v_1, type: :date, title: 'vraag'
-
-          score(:key, label: 'score') { {value: 'oh no'} }
-          score(:key2, label: 'score2', schema: [{key: :value, label: 'Score', export_key: :key2}]) { {value: 'oh'} }
-          score(:key3, label: 'score3') { {value: 'oh no'} }
-        end
-      end
-
-      it 'does not validate presense of score schemas by default' do
-        expect(score_missing_schema_quest.errors.full_messages).to be_blank
-      end
-
-      describe 'if quby settings require_score_schemas is true' do
-        before { Quby::Settings.require_score_schemas = true }
-        it 'validates every score has a score schema' do
-          expect(score_missing_schema_quest.errors.full_messages).to eq(["Score key is missing a score schema",
-                                                                         "Score key3 is missing a score schema"])
-        end
-      end
-    end
-
     describe '#add_outcome_table' do
       let(:questionnaire) do
         Quby::Questionnaires::DSL.build("test") do
@@ -488,8 +464,8 @@ module Quby::Questionnaires::Entities
           {"fieldKey" => :v_2, "type" => :requires_answer, "explanation" => nil},
           # a float type automatically adds a validation that the data entered must be parseable as a float
           {"fieldKey" => :v_2, "type" => :valid_float, "explanation" => nil},
-          {"fieldKey" => :v_2, "type" => :minimum, "subtype" => :number, "value" => 5},
-          {"fieldKey" => :v_2, "type" => :maximum, "subtype" => :number, "value" => 10}
+          {"fieldKey" => :v_2, "type" => :minimum, "subtype" => :number, "value" => 5, "explanation" => nil},
+          {"fieldKey" => :v_2, "type" => :maximum, "subtype" => :number, "value" => 10, "explanation" => nil}
         ])
       end
 

data/spec/quby/table_backend/range_tree_spec.rb

@@ -101,6 +101,13 @@ describe Quby::TableBackend::RangeTree do
       end
     end
 
+    describe 'array leaves' do
+      it 'returns the leaf fully' do
+        tree = described_class.new levels: ['key', 'leaf'], tree: {a: [1, 2, 3], b: [9, 8, 7]}
+        expect(tree.lookup(key: :a)).to eq([1, 2, 3])
+      end
+    end
+
     describe 'parameter validation' do
       it 'raises when parameter keys do not match header keys' do
         params = {foo: :bar}

data/spec/spec_helper.rb

@@ -31,6 +31,7 @@ end
 require 'rspec/rails'
 require 'rails-controller-testing'
 
+require 'quby/compiler'
 require 'roqua/support/request_logger'
 require 'capybara/rspec'
 require 'capybara-screenshot'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quby
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 5.0.0.pre1
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -537,6 +537,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: quby-compiler
+  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'
 description: Quby is a Rails engine that can render and update answers for questionnaires
   defined in a custom DSL.
 email:
@@ -742,31 +756,8 @@ files:
 - lib/quby/pdf_renderer.rb
 - lib/quby/questionnaires.rb
 - lib/quby/questionnaires/api.rb
+- lib/quby/questionnaires/deserializer.rb
 - lib/quby/questionnaires/dsl.rb
-- lib/quby/questionnaires/dsl/base.rb
-- lib/quby/questionnaires/dsl/calls_custom_methods.rb
-- lib/quby/questionnaires/dsl/charting/bar_chart_builder.rb
-- lib/quby/questionnaires/dsl/charting/chart_builder.rb
-- lib/quby/questionnaires/dsl/charting/line_chart_builder.rb
-- lib/quby/questionnaires/dsl/charting/overview_chart_builder.rb
-- lib/quby/questionnaires/dsl/charting/radar_chart_builder.rb
-- lib/quby/questionnaires/dsl/helpers.rb
-- lib/quby/questionnaires/dsl/panel_builder.rb
-- lib/quby/questionnaires/dsl/question_builder.rb
-- lib/quby/questionnaires/dsl/questionnaire_builder.rb
-- lib/quby/questionnaires/dsl/questions/base.rb
-- lib/quby/questionnaires/dsl/questions/checkbox_question_builder.rb
-- lib/quby/questionnaires/dsl/questions/date_question_builder.rb
-- lib/quby/questionnaires/dsl/questions/deprecated_question_builder.rb
-- lib/quby/questionnaires/dsl/questions/float_question_builder.rb
-- lib/quby/questionnaires/dsl/questions/integer_question_builder.rb
-- lib/quby/questionnaires/dsl/questions/radio_question_builder.rb
-- lib/quby/questionnaires/dsl/questions/select_question_builder.rb
-- lib/quby/questionnaires/dsl/questions/string_question_builder.rb
-- lib/quby/questionnaires/dsl/questions/text_question_builder.rb
-- lib/quby/questionnaires/dsl/score_builder.rb
-- lib/quby/questionnaires/dsl/standardized_panel_generators.rb
-- lib/quby/questionnaires/dsl/table_builder.rb
 - lib/quby/questionnaires/entities.rb
 - lib/quby/questionnaires/entities/charting/bar_chart.rb
 - lib/quby/questionnaires/entities/charting/chart.rb
@@ -803,9 +794,9 @@ files:
 - lib/quby/questionnaires/entities/visibility_rule.rb
 - lib/quby/questionnaires/repos.rb
 - lib/quby/questionnaires/repos/base.rb
+- lib/quby/questionnaires/repos/bundle_disk_repo.rb
 - lib/quby/questionnaires/repos/disk_repo.rb
 - lib/quby/questionnaires/repos/memory_repo.rb
-- lib/quby/questionnaires/services/definition_validator.rb
 - lib/quby/questionnaires/specs.rb
 - lib/quby/questionnaires/specs/api_specs.rb
 - lib/quby/questionnaires/specs/repo_specs.rb
@@ -6333,6 +6324,8 @@ files:
 - spec/internal/tmp/capybara/screenshot_2020-10-22-10-23-49.678.png
 - spec/internal/tmp/capybara/screenshot_2020-10-22-10-23-52.495.html
 - spec/internal/tmp/capybara/screenshot_2020-10-22-10-23-52.495.png
+- spec/internal/tmp/capybara/screenshot_2020-10-27-14-25-21.063.html
+- spec/internal/tmp/capybara/screenshot_2020-10-27-14-25-21.063.png
 - spec/javascripts/ajax_callbacks_spec.coffee
 - spec/javascripts/flag_spec.coffee
 - spec/javascripts/flags_collection_spec.coffee
@@ -6370,13 +6363,7 @@ files:
 - spec/quby/lookup_table_spec.rb
 - spec/quby/markdown_parser_spec.rb
 - spec/quby/pdf_renderer_spec.rb
-- spec/quby/questionnaires/dsl/calls_custom_methods_spec.rb
-- spec/quby/questionnaires/dsl/charting/bar_chart_builder_spec.rb
-- spec/quby/questionnaires/dsl/charting/chart_builder_spec.rb
-- spec/quby/questionnaires/dsl/charting/line_chart_builder_spec.rb
-- spec/quby/questionnaires/dsl/charting/radar_chart_builder_spec.rb
-- spec/quby/questionnaires/dsl/helpers_spec.rb
-- spec/quby/questionnaires/dsl/questionnaire_builder_spec.rb
+- spec/quby/questionnaires/deserializer/questionnaire_spec.rb
 - spec/quby/questionnaires/dsl_spec.rb
 - spec/quby/questionnaires/entities/charting/bar_chart_spec.rb
 - spec/quby/questionnaires/entities/charting/chart_spec.rb
@@ -6398,7 +6385,6 @@ files:
 - spec/quby/questionnaires/entities/textvar_spec.rb
 - spec/quby/questionnaires/repos/disk_repo_spec.rb
 - spec/quby/questionnaires/repos/memory_repo_spec.rb
-- spec/quby/questionnaires/services/definition_validator_spec.rb
 - spec/quby/range_categories_spec.rb
 - spec/quby/table_backend/range_tree_spec.rb
 - spec/rcov.opts
@@ -6407,7 +6393,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/engine_controller_testing.rb
 - spec/support/examples_for_chart.rb
-- spec/support/examples_for_chart_builders.rb
 - spec/support/feature_helpers.rb
 - spec/support/javascript_numericality_validations.rb
 - spec/support/questionnaire_helpers.rb
@@ -6465,9 +6450,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key:
@@ -6479,15 +6464,8 @@ test_files:
 - spec/quby/i18n_spec.rb
 - spec/quby/questionnaires/repos/memory_repo_spec.rb
 - spec/quby/questionnaires/repos/disk_repo_spec.rb
+- spec/quby/questionnaires/deserializer/questionnaire_spec.rb
 - spec/quby/questionnaires/dsl_spec.rb
-- spec/quby/questionnaires/dsl/questionnaire_builder_spec.rb
-- spec/quby/questionnaires/dsl/helpers_spec.rb
-- spec/quby/questionnaires/dsl/charting/chart_builder_spec.rb
-- spec/quby/questionnaires/dsl/charting/line_chart_builder_spec.rb
-- spec/quby/questionnaires/dsl/charting/radar_chart_builder_spec.rb
-- spec/quby/questionnaires/dsl/charting/bar_chart_builder_spec.rb
-- spec/quby/questionnaires/dsl/calls_custom_methods_spec.rb
-- spec/quby/questionnaires/services/definition_validator_spec.rb
 - spec/quby/questionnaires/entities/outcome_table_spec.rb
 - spec/quby/questionnaires/entities/textvar_spec.rb
 - spec/quby/questionnaires/entities/sub_score_schema_spec.rb
@@ -10864,6 +10842,7 @@ test_files:
 - spec/internal/tmp/capybara/screenshot_2020-07-10-09-51-51.554.html
 - spec/internal/tmp/capybara/screenshot_2020-05-20-16-42-30.602.html
 - spec/internal/tmp/capybara/screenshot_2020-07-10-09-52-10.631.png
+- spec/internal/tmp/capybara/screenshot_2020-10-27-14-25-21.063.png
 - spec/internal/tmp/capybara/screenshot_2020-10-19-17-52-57.803.html
 - spec/internal/tmp/capybara/screenshot_2020-07-10-09-51-48.849.html
 - spec/internal/tmp/capybara/screenshot_2020-10-22-10-23-41.012.html
@@ -11022,6 +11001,7 @@ test_files:
 - spec/internal/tmp/capybara/screenshot_2020-08-20-11-34-12.962.png
 - spec/internal/tmp/capybara/screenshot_2020-10-19-16-04-07.136.png
 - spec/internal/tmp/capybara/screenshot_2020-10-19-18-32-38.667.png
+- spec/internal/tmp/capybara/screenshot_2020-10-27-14-25-21.063.html
 - spec/internal/tmp/capybara/screenshot_2020-10-19-16-04-04.546.png
 - spec/internal/tmp/capybara/screenshot_2020-10-19-17-46-33.383.png
 - spec/internal/tmp/capybara/screenshot_2020-08-20-11-33-55.775.html
@@ -12029,7 +12009,6 @@ test_files:
 - spec/rcov.opts
 - spec/requests/quby/answers_spec.rb
 - spec/support/examples_for_chart.rb
-- spec/support/examples_for_chart_builders.rb
 - spec/support/testsuite_controller.rb
 - spec/support/questionnaire_helpers.rb
 - spec/support/javascript_numericality_validations.rb

data/lib/quby/questionnaires/dsl/base.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'quby/questionnaires/dsl/helpers'
-require 'quby/questionnaires/dsl/calls_custom_methods'
-
-module Quby
-  module Questionnaires
-    module DSL
-      class Base
-        include Helpers
-
-        def self.build(*args, &block)
-          builder = new(*args)
-          builder.instance_eval(&block) if block
-          builder.build
-        end
-      end
-    end
-  end
-end

data/lib/quby/questionnaires/dsl/calls_custom_methods.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Quby
-  module Questionnaires
-    module DSL
-      module CallsCustomMethods
-        attr_reader :custom_methods
-
-        def initialize(*args)
-          options = args.last.is_a?(::Hash) ? args.last : {}
-          @custom_methods = options[:custom_methods] || {}
-          super
-        end
-
-        def method_missing(method_sym, *args, &block)
-          if @custom_methods.key? method_sym
-            instance_exec(*args, &custom_methods[method_sym])
-          else
-            super
-          end
-        end
-
-        def respond_to_missing?(method_name, include_private = false)
-          custom_methods.key?(method_name) || super
-        end
-      end
-    end
-  end
-end

data/lib/quby/questionnaires/dsl/charting/bar_chart_builder.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'quby/questionnaires/entities/charting/bar_chart'
-require_relative 'chart_builder'
-
-module Quby
-  module Questionnaires
-    module DSL
-      class BarChartBuilder < ChartBuilder
-        set_chart_class(Entities::Charting::BarChart)
-
-        def plotline(value, color)
-          @chart.plotlines << {value: value, color: color, width: 1, zIndex: 3}
-        end
-      end
-    end
-  end
-end

data/lib/quby/questionnaires/dsl/charting/chart_builder.rb

@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-require 'quby/questionnaires/entities'
-
-module Quby
-  module Questionnaires
-    module DSL
-      class ChartBuilder
-        # rubocop:disable AccessorMethodName
-        def self.set_chart_class(chart_class)
-          @chart_class = chart_class
-        end
-        # rubocop:enable AccessorMethodName
-
-        def self.chart_class
-          @chart_class
-        end
-
-        def initialize(questionnaire, key, options = {})
-          @chart = self.class.chart_class.new(key, options)
-          @questionnaire = questionnaire
-        end
-
-        def title(title)
-          @chart.title = title
-        end
-
-        def range(range)
-          @chart.y_range = range
-        end
-
-        def tick_interval(tick_interval)
-          @chart.tick_interval = tick_interval
-        end
-
-        def y_categories(y_categories)
-          @chart.y_categories = y_categories
-        end
-
-        def y_range_categories(*y_range_categories)
-          @chart.y_range_categories = RangeCategories.new(*y_range_categories).as_range_hash
-        end
-
-        def plotband(from, to, color)
-          @chart.plotbands << {from: from, to: to, color: color}
-        end
-
-        def plot(key, options = {})
-          unless plottable = @questionnaire.find_plottable(key)
-            fail "Questionnaire #{@questionnaire.key} chart #{@chart.key} references unknown score or question #{key}"
-          end
-
-          configure_options plottable, options
-
-          @chart.plottables << Entities::Charting::Plottable.new(plottable.key, options)
-        end
-
-        def chart_type(type)
-          @chart.chart_type = type
-        end
-
-        def build(&block)
-          instance_eval(&block)
-          validate!
-          @chart
-        end
-
-        def validate!
-          if @chart.y_categories.present? && @chart.y_range.present? &&
-             @chart.y_range != (0..(@chart.y_categories.count - 1))
-            fail ArgumentError, 'Y_categories size and range do not match'
-          end
-
-          true
-        end
-
-        private
-
-        def configure_options(plottable, options)
-          case plottable
-          when Entities::ScoreCalculation
-            options.reverse_merge! plottable.options
-          when Entities::Question
-            options[:label] ||= plottable.title
-          end
-          options[:questionnaire_key] = @questionnaire.key
-        end
-      end
-    end
-  end
-end

data/lib/quby/questionnaires/dsl/charting/line_chart_builder.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'quby/questionnaires/entities/charting/line_chart'
-require_relative 'chart_builder'
-
-module Quby
-  module Questionnaires
-    module DSL
-      class LineChartBuilder < ChartBuilder
-        set_chart_class(Entities::Charting::LineChart)
-
-        def y_axis_label(label)
-          @chart.y_label = label
-        end
-
-        def tonality(value)
-          @chart.tonality = value
-        end
-
-        # value - Number or a hash `{from_age..to_age => {female: 5, default: 4}, .., default: { default: 3 }}`
-        # block - deprecated.
-        def baseline(value = nil, &block)
-          unless value.nil? ^ block.nil?
-            fail ArgumentError, "Must give either value or a block"
-          end
-
-          if value && value.is_a?(Hash)
-            @chart.baseline = ->(age, gender) {
-              age_match = value.find { |age_range, _v| age && age_range === age }
-              hash_by_gender = (age_match&.last || value.stringify_keys["default"])
-
-              gender_match = hash_by_gender.find {|gender_key, _v| gender && gender_key.to_s == gender.to_s }
-              gender_match&.last || hash_by_gender.stringify_keys['default']
-            }
-          elsif value
-            @chart.baseline = ->(age, gender) { value }
-          end
-
-          if block
-            if block.arity != 2
-              fail ArgumentError, "Given block must take two arguments"
-            end
-            @chart.baseline = block
-          end
-        end
-
-        def clinically_relevant_change(value)
-          @chart.clinically_relevant_change = value
-        end
-
-        def validate!
-          fail "Chart #{@chart.key} has no range specified" unless @chart.y_range
-        end
-      end
-    end
-  end
-end