quby 4.0.2 → 5.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca4ec590512a375ce3cef25aa1630ad6ab4a4bd05174e66bf919c06e8babdf79
-  data.tar.gz: 421fd333ee6608ff4dd230dbd66f55bea9ca411e95c3d8d182487b2e493b9cf8
+  metadata.gz: ddc10a44111cef2b40f5bdacb0e71087d785834eb1870318eb7c98f29cbbfb3e
+  data.tar.gz: 974ad9eca496310b69b7b6c1b99ddd4c37207b83f4bf4e34ab5b21b474792f61
 SHA512:
-  metadata.gz: bd8be25a600524b60166b943bee7e186742d53cb2a59dea6002be2586d44647c65d9c4d409935f7c8c9c1c58e9280050d410d2b273bb1d4cf7d38606e3cc2d3b
-  data.tar.gz: 4d217cd346e901b5d27b95d048507cc4851f99126fafaaa964fe4ec42f0506a7ee9c4a262977a4a30bc8133ba48c124d98d7371282dcc5c94572d463cedb38f0
+  metadata.gz: 7e5cde14431489cb85d05cba333d6f4f3daca33d5859ebf7342a127f9a7807822d0376fb24f396799b0049c90d6a965da2827fb9b576af46854836032fbf1c3b
+  data.tar.gz: ed1786bc33ffb3c17ccc49cde2ae7afc6610ee52a57f709e669ebabec761af91c3633ffe75dd46951bb3b0fc447efe4211f5447033208afb32181dbaab33ef28

data/README.markdown

@@ -27,7 +27,6 @@ and where it can store its answers.
 ```ruby
 Quby.questionnaire_repo      = Quby::Questionnaires::Repos::DiskRepo.new(Rails.root.join("db/questionnaires/definitions"))
 Quby.answer_repo             = Quby::Answers::Repos::MongoidRepo.new
-Quby.lookup_table_repo       = Quby::LookupTableRepo::Disk.new(Rails.root.join("db/questionnaires/lookup_tables"))
 Quby::Settings.shared_secret = ENV["QUBY_SHARED_SECRET"]
 ```
 

data/lib/quby.rb

@@ -38,14 +38,6 @@ module Quby
       @questionnaires_api = nil
     end
 
-    def lookup_table_repo=(repo)
-      @lookup_table_repo = repo
-    end
-
-    def lookup_table_repo
-      @lookup_table_repo  || fail("Quby does not have its lookup table repo (Quby.lookup_table_repo) configured.")
-    end
-
     def fixtures_path
       File.expand_path File.join('..', '..', 'spec', 'fixtures'), __FILE__
     end
@@ -79,7 +71,7 @@ module Quby
 end
 
 require 'quby/settings'
+require 'quby/table_backend/range_tree'
 require 'quby/questionnaires'
 require 'quby/answers'
-require 'quby/engine'
-require 'quby/lookup_table_repo'
+require 'quby/engine'

data/lib/quby/answers/entities/answer.rb

@@ -82,7 +82,7 @@ module Quby
         attr_accessor :extra_question_values
         attr_accessor :extra_failed_validations
 
-        def initialize(_id: nil, questionnaire_id: nil, questionnaire_key: nil,
+        def initialize(_id: nil, questionnaire_id: nil, questionnaire_key: nil, questionnaire: nil,
           raw_params: nil, value: nil, patient_id: nil, patient: nil,
           token: nil, active: true, test: false, created_at: nil, updated_at: nil,
           started_at: nil, completed_at: nil, outcome: nil, outcome_generated_at: nil,
@@ -111,6 +111,8 @@ module Quby
           self.import_notes = import_notes || {}
           self.flags = flags
           self.textvars = textvars
+
+          @questionnaire = questionnaire
         end
 
         def id
@@ -162,7 +164,7 @@ module Quby
 
         # Faux belongs_to :questionnaire
         def questionnaire
-          Quby.questionnaires.find(questionnaire_key)
+          @questionnaire ||= Quby.questionnaires.find(questionnaire_key)
         end
 
         def mark_completed(start_time)

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

@@ -74,8 +74,7 @@ module Quby
         end
 
         def value_by_regular_values
-          regular_values = answer.value_by_regular_values
-          @value_by_regular_values ||= regular_values.sort_by do |key, value|
+          @value_by_regular_values ||= answer.value_by_regular_values.sort_by do |key, value|
             questionnaire.fields.question_hash.keys.index(key) || Float::INFINITY
           end.to_h
         end

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

@@ -231,9 +231,7 @@ module Quby
         end
 
         def table_lookup(table_key, parameters)
-          @questionnaire.lookup_tables[table_key] ||= Quby::LookupTable.new table_key
-          @questionnaire.lookup_tables[table_key] \
-                        .lookup(parameters)
+          @questionnaire.lookup_tables.fetch(table_key).lookup(parameters)
         end
 
         # Public: Ensure given question_keys have answers. Strings with nothing but whitespace are

data/lib/quby/engine.rb

@@ -15,7 +15,6 @@ require 'jquery-ui-rails'
 require 'compass-blueprint'
 
 require 'susy'
-require 'quby/lookup_table'
 require 'quby/range_categories'
 require 'quby/pdf_renderer'
 

data/lib/quby/questionnaires.rb

@@ -3,3 +3,4 @@
 require 'quby/questionnaires/dsl'
 require 'quby/questionnaires/repos'
 require 'quby/questionnaires/api'
+require 'quby/questionnaires/deserializer'

data/lib/quby/questionnaires/api.rb

@@ -39,7 +39,11 @@ module Quby
 
       def build_from_definition(definition)
         ActiveSupport::Notifications.instrument('quby.questionaire.build') do
-          DSL.build_from_definition(definition)
+          if definition.json
+            DSL.from_json(definition.json)
+          else
+            DSL.build_from_definition(definition)
+          end
         end
       end
 

data/lib/quby/questionnaires/deserializer.rb

@@ -0,0 +1,439 @@
+module Quby
+  module Questionnaires
+    module Deserializer
+      # This symbolizes various things. Do not run on arbitrary JSON.
+      def self.from_json(json)
+        # TODO: last_update
+        Entities::Questionnaire.new(json.fetch("key"), json).tap do |questionnaire|
+          questionnaire.title = json.fetch("title")
+          questionnaire.description = json.fetch("description")
+          questionnaire.outcome_description = json.fetch("outcome_description")
+          questionnaire.short_description = json.fetch("short_description")
+          questionnaire.abortable = json.fetch("abortable")
+          questionnaire.enable_previous_questionnaire_button = json.fetch("enable_previous_questionnaire_button")
+          questionnaire.default_answer_value = json.fetch("default_answer_value")
+          questionnaire.leave_page_alert = json.fetch("leave_page_alert")
+          questionnaire.allow_hotkeys = json.fetch("allow_hotkeys")
+          questionnaire.license = json.fetch("license").try(:to_sym)
+          questionnaire.licensor = json.fetch("licensor")
+          questionnaire.language = json.fetch("language").try(:to_sym)
+          questionnaire.renderer_version = json.fetch("renderer_version")
+          questionnaire.last_update = Time.zone.parse(json.fetch("last_update"))
+          questionnaire.last_author = json.fetch("last_author")
+          questionnaire.extra_css = json.fetch("extra_css")
+          questionnaire.allow_switch_to_bulk = json.fetch("allow_switch_to_bulk")
+
+          questionnaire.flags = json.fetch("flags").with_indifferent_access.transform_values do |attrs|
+            build_flag(attrs)
+          end
+
+          questionnaire.textvars = json.fetch("textvars").with_indifferent_access.transform_values do |attrs|
+            build_textvar(attrs)
+          end
+
+          questionnaire.lookup_tables = YAML.load(json.fetch("lookup_tables")).transform_values do |attrs|
+            Quby::TableBackend::RangeTree.new(levels: attrs[:levels], tree: attrs[:tree])
+          end
+
+          questionnaire.score_calculations = json.fetch("score_calculations").with_indifferent_access.transform_values do |attrs|
+            build_score_calculation(attrs)
+          end
+
+          questionnaire.score_schemas = json.fetch("score_schemas").with_indifferent_access.transform_values do |schema|
+            build_score_schema(schema)
+          end
+
+          json.fetch("panels").each do |panel_json|
+            load_panel(questionnaire, panel_json)
+          end
+
+          # roqua domain
+          questionnaire.roqua_keys = json.fetch("roqua_keys")
+          questionnaire.sbg_key = json.fetch("sbg_key")
+          questionnaire.sbg_domains = json.fetch("sbg_domains").map(&:symbolize_keys)
+          questionnaire.outcome_regeneration_requested_at = json.fetch("outcome_regeneration_requested_at").try { |str| Time.zone.parse(str) }
+          questionnaire.deactivate_answers_requested_at = json.fetch("deactivate_answers_requested_at").try { |str| Time.zone.parse(str) }
+          questionnaire.respondent_types = json.fetch("respondent_types").map(&:to_sym)
+          questionnaire.tags = json.fetch("tags")
+
+          if overview_json = json.fetch("charts").fetch("overview")
+            questionnaire.charts.overview = Quby::Questionnaires::Entities::Charting::OverviewChart.new(
+              subscore: overview_json.fetch("subscore").to_sym,
+              y_max: overview_json.fetch("y_max"),
+            )
+          end
+
+          json.fetch("charts").fetch("others").each do |chart_json|
+            questionnaire.add_chart(build_chart(questionnaire, chart_json))
+          end
+
+          questionnaire.outcome_tables = json.fetch("outcome_tables").map do |attributes|
+            build_outcome_table(questionnaire, attributes)
+          end
+        end
+      end
+
+      def self.load_panel(questionnaire, panel_json)
+        panel = Entities::Panel.new(
+          questionnaire: questionnaire,
+          key: panel_json.fetch("key"),
+          title: panel_json.fetch("title"),
+          items: []
+        )
+
+        panel_json.fetch("items").each do |item_json|
+          load_item(questionnaire, item_json, panel: panel)
+        end
+
+        questionnaire.add_panel(panel)
+      end
+
+      def self.load_item(questionnaire, item_json, panel: nil)
+        case item_json.fetch("type")
+        when "text"
+          panel.items << build_text(item_json)
+        when "question"
+          question = build_question(questionnaire, item_json)
+          questionnaire.register_question(question)
+          panel.items << question
+        when "table"
+          table = Entities::Table.new(
+            title: item_json.fetch("title"),
+            description: item_json.fetch("description"),
+            columns: item_json.fetch("columns"),
+            show_option_desc: item_json.fetch("show_option_desc"),
+          )
+          panel.items << table
+
+          item_json.fetch("items").each do |table_item_json|
+            case table_item_json.fetch("type")
+            when "text"
+              table.items << build_text(table_item_json)
+            when "question"
+              question = build_question(questionnaire, table_item_json, table: table)
+              questionnaire.register_question(question)
+              table.items << question
+              panel.items << question
+            else
+              raise "Unknown table item: #{table_item_json}"
+            end
+          end
+        else
+          raise "Unknown item: #{item_json}"
+        end
+      end
+
+      def self.build_text(item_json)
+        Entities::Text.new(item_json.fetch("str"), {
+          html_content: item_json.fetch("html_content"),
+          display_in: item_json.fetch("display_in").map(&:to_sym),
+          col_span: item_json.fetch("col_span"),
+          row_span: item_json.fetch("row_span"),
+          raw_content: item_json.fetch("raw_content"),
+          switch_cycle: item_json.fetch("switch_cycle")
+        })
+      end
+
+      def self.build_question(questionnaire, item_json, parent: nil, table: nil)
+        key = item_json.fetch("key").to_sym
+        attributes = {
+          questionnaire: questionnaire,
+          parent: parent,
+          type: item_json.fetch("question_type").to_sym,
+          title: item_json.fetch("title"),
+          context_free_title: item_json.fetch("context_free_title"),
+          description: item_json.fetch("description"),
+          presentation: item_json.fetch("presentation").to_sym,
+          hidden: item_json.fetch("hidden"),
+          depends_on: item_json.fetch("depends_on")&.map(&:to_sym),
+          default_position: item_json.fetch("default_position"),
+          validations: item_json.fetch("validations").map {|attrs| build_question_validation(attrs)},
+          table: table,
+          col_span: item_json.fetch("col_span"),
+          row_span: item_json.fetch("row_span"),
+
+          # only selectable via options passed in DSL, not via DSL methods
+          # many apply only to certain types of questions
+          sbg_key: item_json.fetch("sbg_key"),
+          allow_duplicate_option_values: item_json.fetch("allow_duplicate_option_values"),
+          allow_blank_titles: item_json.fetch("allow_blank_titles"),
+          as: item_json.fetch("as")&.to_sym,
+          display_modes: item_json.fetch("display_modes")&.map(&:to_sym),
+          autocomplete: item_json.fetch("autocomplete"),
+          show_values: item_json.fetch("show_values").to_sym,
+          deselectable: item_json.fetch("deselectable"),
+          disallow_bulk: item_json.fetch("disallow_bulk"),
+          score_header: item_json.fetch("score_header").to_sym,
+          sets_textvar: item_json.fetch("sets_textvar"),
+          default_invisible: item_json.fetch("default_invisible"),
+          question_group: item_json.fetch("question_group"), # sometimes string, sometimes a symbol in the DSL. Just have to hope this works
+          group_minimum_answered: item_json.fetch("group_minimum_answered"),
+          group_maximum_answered: item_json.fetch("group_maximum_answered"),
+          value_tooltip: item_json.fetch("value_tooltip"),
+
+          #  might be able to deduce from tree structure
+          parent_option_key: item_json.fetch("parent_option_key")&.to_sym
+        }
+
+        case item_json.fetch("question_type")
+        when "check_box"
+          Entities::Questions::CheckboxQuestion.new(key, attributes.merge(
+            check_all_option: item_json.fetch("check_all_option")&.to_sym,
+            uncheck_all_option: item_json.fetch("uncheck_all_option")&.to_sym,
+            maximum_checked_allowed: item_json.fetch("maximum_checked_allowed"),
+            minimum_checked_required: item_json.fetch("minimum_checked_required"),
+          )).tap do |question|
+            item_json.fetch("options").each do |option_json|
+              question.options << build_option(questionnaire, question, option_json)
+            end
+          end
+        when "date"
+          Entities::Questions::DateQuestion.new(key, attributes.merge(
+            components: item_json.fetch("components").map(&:to_sym),
+            required_components: item_json.fetch("required_components").map(&:to_sym),
+            year_key: item_json.fetch("year_key")&.to_sym,
+            month_key: item_json.fetch("month_key")&.to_sym,
+            day_key: item_json.fetch("day_key")&.to_sym,
+            hour_key: item_json.fetch("hour_key")&.to_sym,
+            minute_key: item_json.fetch("minute_key")&.to_sym,
+          ))
+        when "deprecated", "hidden"
+          Entities::Questions::DeprecatedQuestion.new(key, attributes).tap do |question|
+            item_json.fetch("options").each do |option_json|
+              question.options << build_option(questionnaire, question, option_json)
+            end
+          end
+        when "float"
+          Entities::Questions::FloatQuestion.new(key, attributes.merge(
+            labels: item_json.fetch("labels"),
+            unit: item_json.fetch("unit"),
+            size: item_json.fetch("size"),
+          ))
+        when "integer"
+          Entities::Questions::IntegerQuestion.new(key, attributes.merge(
+            labels: item_json.fetch("labels"),
+            unit: item_json.fetch("unit"),
+            size: item_json.fetch("size"),
+          ))
+        when "radio", "scale"
+          Entities::Questions::RadioQuestion.new(key, attributes).tap do |question|
+            item_json.fetch("options").each do |option_json|
+              question.options << build_option(questionnaire, question, option_json)
+            end
+          end
+        when "select"
+          Entities::Questions::SelectQuestion.new(key, attributes).tap do |question|
+            item_json.fetch("options").each do |option_json|
+              question.options << build_option(questionnaire, question, option_json)
+            end
+          end
+        when "string"
+          Entities::Questions::StringQuestion.new(key, attributes.merge(
+            unit: item_json.fetch("unit"),
+            size: item_json.fetch("size"),
+          ))
+        when "textarea"
+          Entities::Questions::TextQuestion.new(key, attributes.merge(
+            lines: item_json.fetch("lines"),
+          ))
+        else
+          raise "Unknown question type: #{item_json}"
+        end
+      end
+
+      def self.build_option(questionnaire, question, option_json)
+        option = Entities::QuestionOption.new(option_json.fetch("key")&.to_sym, question,
+          value: option_json.fetch("value"),
+          description: option_json.fetch("description"),
+          context_free_description: option_json.fetch("context_free_description"),
+          inner_title: option_json.fetch("inner_title"),
+          hides_questions: option_json.fetch("hides_questions").map(&:to_sym),
+          shows_questions: option_json.fetch("shows_questions").map(&:to_sym),
+          hidden: option_json.fetch("hidden"),
+          placeholder: option_json.fetch("placeholder"),
+        )
+
+        option_json.fetch("questions").each do |question_json|
+          subquestion = build_question(questionnaire, question_json, parent: question)
+          questionnaire.register_question(subquestion)
+          option.questions << subquestion
+        end
+
+        option
+      end
+
+      def self.build_question_validation(attrs)
+        base_validation = {
+          type: attrs.fetch("type").to_sym,
+          explanation: attrs["explanation"] # not always specified for min/max validation
+        }
+
+        case attrs.fetch("type")
+        when "requires_answer"
+          base_validation
+        when "answer_group_minimum", "answer_group_maximum"
+          base_validation.merge(
+            group: attrs.fetch("group"), # TODO: sometimes a symbol, sometimes a string in the original, but I hope it doesn't matter
+            value: attrs.fetch("value")
+          )
+        when "valid_integer", "valid_float"
+          base_validation
+        when "valid_date"
+          base_validation.merge(
+            subtype: attrs.fetch("subtype").to_sym
+          )
+        when "minimum", "maximum"
+          value = case attrs.fetch("value_type")
+          when "Date"
+            Date.parse(attrs.fetch("value"))
+          when "DateTime"
+            DateTime.parse(attrs.fetch("value"))
+          when "Time", "ActiveSuport::TimeWithZone"
+            Time.zone.parse(attrs.fetch("value"))
+          else
+            attrs.fetch("value")
+          end
+
+          base_validation.merge(
+            value: value,
+            subtype: attrs.fetch("subtype").to_sym,
+          )
+        when "too_many_checked"
+          base_validation.merge(
+            uncheck_all_key: attrs.fetch("uncheck_all_key").to_sym
+          )
+        when "minimum_checked_required"
+          base_validation.merge(
+            minimum_checked_value: attrs.fetch("minimum_checked_value")
+          )
+        when "maximum_checked_allowed"
+          base_validation.merge(
+            maximum_checked_value: attrs.fetch("maximum_checked_value")
+          )
+        when "regexp"
+          base_validation.merge(
+            matcher: Regexp.new(attrs.fetch("matcher"))
+          )
+        when "not_all_checked"
+          base_validation.merge(
+            check_all_key: attrs.fetch("check_all_key").to_sym
+          )
+        else
+          raise "Unknown validation type: #{attrs.inspect}"
+        end
+      end
+
+      def self.build_score_calculation(attrs)
+        Entities::ScoreCalculation.new(attrs.fetch("key").to_sym,
+          label: attrs.fetch("label"),
+          sbg_key: attrs.fetch("sbg_key"),
+          options: attrs.fetch("options").symbolize_keys,
+          sourcecode: attrs.fetch("sourcecode"),
+        )
+      end
+
+      def self.build_flag(attrs)
+        Entities::Flag.new(
+          key: attrs.fetch("key").to_sym,
+          description_true: attrs.fetch("description_true"),
+          description_false: attrs.fetch("description_false"),
+          description: attrs.fetch("description"),
+          internal: attrs.fetch("internal"),
+          trigger_on: attrs.fetch("trigger_on"),
+          shows_questions: attrs.fetch("shows_questions").map(&:to_sym),
+          hides_questions: attrs.fetch("hides_questions").map(&:to_sym),
+          depends_on: attrs.fetch("depends_on"),                              # TODO: emperically determined to be a string in DSL, is that right?
+          default_in_interface: attrs.fetch("default_in_interface"),
+        )
+      end
+
+      def self.build_textvar(attrs)
+        Entities::Textvar.new(
+          key: attrs.fetch("key").to_sym,
+          description: attrs.fetch("description"),
+          default: attrs.fetch("default"),
+          depends_on_flag: attrs.fetch("depends_on_flag")&.to_sym
+        )
+      end
+
+      def self.build_chart(questionnaire, chart_json)
+        base_args = {
+          title: chart_json.fetch("title"),
+          plottables: chart_json.fetch("plottables").map do |plottable_json|
+            Quby::Questionnaires::Entities::Charting::Plottable.new(
+              plottable_json.fetch("key").to_sym,
+              label: plottable_json.fetch("label"),
+              plotted_key: plottable_json.fetch("plotted_key").to_sym,
+              global: plottable_json.fetch("global"),
+              questionnaire_key: plottable_json.fetch("questionnaire_key")
+            )
+          end,
+          y_categories: chart_json.fetch("y_categories"),
+          y_range_categories: chart_json.fetch("y_range_categories"),
+          chart_type: chart_json.fetch("chart_type"),
+          y_range: deserialize_range(chart_json.fetch("y_range")),
+          tick_interval: chart_json.fetch("tick_interval"),
+          plotbands: chart_json.fetch("plotbands").map do |plotband_json|
+            {
+              color: plotband_json.fetch("color").to_sym,
+              from: plotband_json.fetch("from"),
+              to: plotband_json.fetch("to")
+            }
+          end,
+        }
+
+        case chart_json.fetch("type")
+        when "bar_chart"
+          Quby::Questionnaires::Entities::Charting::BarChart.new(chart_json.fetch("key").to_sym,
+            plotlines: chart_json.fetch("plotlines"),
+            **base_args
+          )
+        when "line_chart"
+          Quby::Questionnaires::Entities::Charting::LineChart.new(chart_json.fetch("key").to_sym,
+            y_label: chart_json.fetch("y_label"),
+            tonality: chart_json.fetch("tonality").to_sym,
+            baseline: YAML.load(chart_json.fetch("baseline")),
+            clinically_relevant_change: chart_json.fetch("clinically_relevant_change"),
+            **base_args
+          )
+        when "radar_chart"
+          Quby::Questionnaires::Entities::Charting::BarChart.new(chart_json.fetch("key").to_sym,
+            plotlines: chart_json.fetch("plotlines"),
+            **base_args
+          )
+        end
+      end
+
+      def self.build_score_schema(attributes)
+        Entities::ScoreSchema.new(
+          key: attributes.fetch("key").to_sym,
+          label: attributes.fetch("label"),
+          subscore_schemas: attributes.fetch("subscore_schemas").map do |subschema|
+            {
+              key: subschema.fetch("key").to_sym,
+              label: subschema.fetch("label"),
+              export_key: subschema.fetch("export_key").to_sym,
+              only_for_export: subschema.fetch("only_for_export")
+            }
+          end
+        )
+      end
+
+      def self.build_outcome_table(questionnaire, attributes)
+        Entities::OutcomeTable.new(
+          questionnaire: questionnaire,
+          key: attributes.fetch("key").to_sym,
+          score_keys: attributes.fetch("score_keys").map(&:to_sym),
+          subscore_keys: attributes.fetch("subscore_keys").map(&:to_sym),
+          name: attributes.fetch("name"),
+          default_collapsed: attributes.fetch("default_collapsed"),
+        )
+      end
+
+      def self.deserialize_range(range_attributes)
+        return unless range_attributes
+        Range.new(range_attributes.fetch("begin"), range_attributes.fetch("end"), range_attributes.fetch("exclude_end"))
+      end
+    end
+  end
+end