qti 1.0.11 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0369a1eaf87bdecfae0f4c08e738088d1c065ee3'
-  data.tar.gz: 7d9672b8b3e612cd0458730e17abd25a23458763
+  metadata.gz: e4aee322bc3949281194bb63959f4ef4bf084d03
+  data.tar.gz: 782d6a831b7ec7c309781592924d1b683e6e2407
 SHA512:
-  metadata.gz: 387299550290124d9825e0195ea6f3ba4b3bc2137d7caf75ac94908584daaf2c5b59155ae9394d47c4849dcbc1d82aeb86825c90a9932b1ce9447bb55291aeab
-  data.tar.gz: 74f0d0de3c9e519c899e84ffadfabd0df9fde95078da77b6114273dcbed97aad1751603739aa1d27b557eef4550d1abf25fea6d7e6ea5aadd21a8dcd694fcdaa
+  metadata.gz: ba7ecb2c6765ed021d6ff31d90918b9dc7ce52f8ba62d107e69f52fbd896939417e7d016401bdecdc5f55bf28bfb146b1c424c7dc2819ec7331b83622107ace8
+  data.tar.gz: 0edb24529f59bf862e4687aa09d0a3c6e5f703c9ef4f947947de92e5dcedde7fddf8b887607b5489ba00c8755fc79638f2cc7b4d5f2b3c59e92f4f99e5233986

data/README.md

@@ -81,7 +81,7 @@ Individual spec runs can be started like so:
 
 ```bash
 docker-compose run --rm app /bin/bash -l -c \
-  "BUNDLE_GEMFILE=spec/gemfiles/rails-5.2.gemfile rvm-exec 2.5 rspec"
+  "BUNDLE_GEMFILE=spec/gemfiles/rails-6.0.gemfile rvm-exec 2.5 rspec"
 ```
 
 If you'd like to mount your git checkout within the docker container running

data/lib/qti.rb

@@ -1,4 +1,16 @@
+require 'action_view'
+require 'active_support/core_ext/array/access'
+require 'active_support/core_ext/string'
+require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/module/delegation'
+require 'dry-struct'
 require 'find'
+require 'mathml2latex'
+require 'nokogiri'
+require 'pathname'
+require 'sanitize'
+require 'uri'
+require 'zip'
 
 module Qti
   class Importer
@@ -57,22 +69,60 @@ module Qti
   end
 end
 
-require 'active_support/core_ext/string'
-require 'active_support/core_ext/module/delegation'
+# The load order of all of these is important.
+
+require 'null_logger'
+
+require 'qti/version'
+
+require 'qti/assessment_item_exporter'
+require 'qti/content_packaging'
+require 'qti/exporter'
+require 'qti/sanitizer'
+require 'qti/xpath_helpers'
+
+require 'qti/content_packaging/simple_choice'
+require 'qti/content_packaging/choice_interaction'
+require 'qti/content_packaging/assessment_item'
+require 'qti/content_packaging/outcome_declaration'
+require 'qti/content_packaging/assessment_test'
 
-require 'qti/models/manifest'
 require 'qti/models/base'
+require 'qti/models/assessment_meta'
 
 require 'qti/v1/models/base'
-require 'qti/v1/models/interactions/base_interaction'
-require 'qti/v1/models/interactions/base_fill_blank_interaction'
-require 'qti/v1/models/interactions/choice_interaction'
-
 require 'qti/v1/models/assessment'
+
+require 'qti/v2/models/base'
+require 'qti/v2/models/assessment_test'
+
+require 'qti/models/metadata'
+require 'qti/models/resource'
+require 'qti/models/manifest'
+
 require 'qti/v1/models/assessment_item'
 require 'qti/v1/models/choices/logical_identifier_choice'
 require 'qti/v1/models/choices/fill_blank_choice'
 require 'qti/v1/models/scoring_data'
+require 'qti/v1/models/stimulus_item'
+require 'qti/v1/models/question_group'
+
+require 'qti/v1/models/interactions/base_interaction'
+require 'qti/v1/models/interactions/choice_interaction'
+
+require 'qti/v1/models/interactions/base_fill_blank_interaction'
+require 'qti/v1/models/interactions/canvas_multiple_dropdown'
+require 'qti/v1/models/interactions/fill_blank_interaction'
+require 'qti/v1/models/interactions/formula_interaction'
+require 'qti/v1/models/interactions/match_interaction'
+require 'qti/v1/models/interactions/numeric_interaction'
+require 'qti/v1/models/interactions/ordering_interaction'
+require 'qti/v1/models/interactions/string_interaction'
+require 'qti/v1/models/interactions/upload_interaction'
+
+require 'qti/v1/models/interactions'
+
+require 'qti/v1/models/numerics/scoring_base'
 
 require 'qti/v1/models/numerics/exact_match'
 require 'qti/v1/models/numerics/margin_error'
@@ -80,23 +130,26 @@ require 'qti/v1/models/numerics/precision'
 require 'qti/v1/models/numerics/scoring_data'
 require 'qti/v1/models/numerics/scoring_node'
 require 'qti/v1/models/numerics/within_range'
-require 'qti/v1/models/stimulus_item'
-require 'qti/v1/models/question_group'
 
-require 'qti/v2/models/base'
-require 'qti/v2/models/choices/simple_choice'
-require 'qti/v2/models/choices/simple_associable_choice'
-require 'qti/v2/models/choices/gap_match_choice'
 require 'qti/v2/models/assessment_item'
 require 'qti/v2/models/stimulus_item'
-require 'qti/v2/models/assessment_test'
+require 'qti/v2/models/interactions'
 require 'qti/v2/models/non_assessment_test'
 require 'qti/v2/models/scoring_data'
 
-require 'zip'
-require 'qti/exporter'
+require 'qti/v2/models/interactions/base_interaction'
 
-require 'qti/content_packaging'
-require 'qti/assessment_item_exporter'
+require 'qti/v2/models/interactions/categorization_interaction'
+require 'qti/v2/models/interactions/choice_interaction'
+require 'qti/v2/models/interactions/extended_text_interaction'
+require 'qti/v2/models/interactions/gap_match_interaction'
+require 'qti/v2/models/interactions/match_interaction'
+require 'qti/v2/models/interactions/ordering_interaction'
+require 'qti/v2/models/interactions/short_text_interaction'
 
-require 'null_logger'
+require 'qti/v2/models/interactions/match_item_tag_processors/associate_interaction_tag_processor'
+require 'qti/v2/models/interactions/match_item_tag_processors/match_interaction_tag_processor'
+
+require 'qti/v2/models/choices/simple_choice'
+require 'qti/v2/models/choices/simple_associable_choice'
+require 'qti/v2/models/choices/gap_match_choice'

data/lib/qti/content_packaging.rb

@@ -1,5 +1,3 @@
-require 'dry-struct'
-
 module Qti
   module ContentPackaging
     module Types
@@ -7,9 +5,3 @@ module Qti
     end
   end
 end
-
-require 'qti/content_packaging/outcome_declaration'
-require 'qti/content_packaging/simple_choice'
-require 'qti/content_packaging/choice_interaction'
-require 'qti/content_packaging/assessment_item'
-require 'qti/content_packaging/assessment_test'

data/lib/qti/models/assessment_meta.rb

@@ -1,5 +1,3 @@
-require 'qti/v1/models/base'
-
 module Qti
   module Models
     class AssessmentMeta < Qti::Models::Base

data/lib/qti/models/base.rb

@@ -1,8 +1,3 @@
-require 'nokogiri'
-require 'pathname'
-require 'mathml2latex'
-require 'qti/sanitizer'
-
 module Qti
   class ParseError < StandardError; end
   class SpecificationViolation < StandardError; end

data/lib/qti/models/manifest.rb

@@ -1,15 +1,9 @@
-require 'qti/v1/models/base'
-require 'qti/models/assessment_meta'
-require 'qti/v1/models/assessment'
-require 'qti/v2/models/assessment_test'
-require 'qti/v2/models/non_assessment_test'
-require 'qti/models/resource'
-
 module Qti
   module Models
     class Manifest < Qti::Models::Base
       include Qti::Models::ResourceGroup
       include Qti::XPathHelpers
+
       def assessment_test(resource_id = nil)
         resource_id ||= assessment_identifiers.first
         test = assessment_from_identifier(resource_id)

data/lib/qti/models/metadata.rb

@@ -52,12 +52,5 @@ module Qti
         taxon(node.xpath('imsmd:taxon')&.first, path)
       end
     end
-
-    module MetaDataBase
-      delegate :taxonpath, to: :@meta_data, allow_nil: true
-      def metadata_from_node!(node)
-        @meta_data ||= MetaData.new(node)
-      end
-    end
   end
 end

data/lib/qti/models/resource.rb

@@ -1,16 +1,10 @@
-require 'qti/v1/models/base'
-require 'qti/models/assessment_meta'
-require 'qti/v1/models/assessment'
-require 'qti/v2/models/assessment_test'
-require 'qti/v2/models/non_assessment_test'
-require 'qti/xpath_helpers'
-require 'qti/models/metadata'
-
 module Qti
   module Models
     class Resource < Qti::Models::Base
-      include Qti::Models::MetaDataBase
       include Qti::XPathHelpers
+
+      delegate :taxonpath, to: :@metadata, allow_nil: true
+
       def initialize(node, parent)
         @node = node
         @parent = parent
@@ -24,7 +18,7 @@ module Qti
       end
 
       def metadata
-        @metadata = metadata_from_node!(@node)
+        @metadata ||= MetaData.new(@node)
       end
 
       def canvas_metadata

data/lib/qti/sanitizer.rb

@@ -1,7 +1,3 @@
-require 'nokogiri'
-require 'sanitize'
-require 'uri'
-
 module Qti
   class Sanitizer
     ELEMENTS_REMAP = {

data/lib/qti/v1/models/assessment.rb

@@ -1,11 +1,9 @@
-require 'qti/v1/models/base'
-require 'qti/models/assessment_meta'
-
 module Qti
   module V1
     module Models
       class Assessment < Qti::V1::Models::Base
         include Qti::Models::AssessmentMetaBase
+
         GROUP_ID = 'xmlns:section/xmlns:selection_ordering'.freeze
 
         def title

data/lib/qti/v1/models/assessment_item.rb

@@ -1,6 +1,3 @@
-require 'qti/v1/models/base'
-require 'qti/v1/models/interactions'
-
 module Qti
   module V1
     module Models

data/lib/qti/v1/models/base.rb

@@ -1,5 +1,3 @@
-require 'qti/models/base'
-
 module Qti
   module V1
     module Models

data/lib/qti/v1/models/choices/fill_blank_choice.rb

@@ -1,5 +1,3 @@
-require 'qti/v1/models/base'
-
 module Qti
   module V1
     module Models

data/lib/qti/v1/models/choices/logical_identifier_choice.rb

@@ -1,5 +1,3 @@
-require 'qti/v1/models/base'
-
 module Qti
   module V1
     module Models

data/lib/qti/v1/models/interactions.rb

@@ -1,7 +1,3 @@
-require 'active_support/core_ext/hash/except'
-# Populate the subclasses
-Dir["#{__dir__}/interactions/*.rb"].each { |f| load f }
-
 module Qti
   module V1
     module Models

data/lib/qti/v1/models/interactions/base_fill_blank_interaction.rb

@@ -3,7 +3,7 @@ module Qti
     module Models
       module Interactions
         class BaseFillBlankInteraction < BaseInteraction
-          CANVAS_REGEX ||= /(\[.+?\])/
+          CANVAS_REGEX ||= /(\[.+?\])/.freeze
 
           def canvas_stem_items(item_prompt)
             item_prompt.split(CANVAS_REGEX).map.with_index do |stem_item, index|

data/lib/qti/v1/models/interactions/formula_interaction.rb

@@ -37,13 +37,11 @@ module Qti
           end
 
           def answer_tolerance
-            @answer_tolernance ||= @node.at_xpath('.//xmlns:answer_tolerance').text
+            @answer_tolerance ||= @node.at_xpath('.//xmlns:answer_tolerance').text
           end
 
           def margin_of_error
-            if answer_tolerance.ends_with? '%'
-              return { margin: answer_tolerance[0..-2], margin_type: 'percent' }
-            end
+            return { margin: answer_tolerance[0..-2], margin_type: 'percent' } if answer_tolerance.ends_with? '%'
             { margin: answer_tolerance, margin_type: 'absolute' }
           end
 

data/lib/qti/v1/models/interactions/match_interaction.rb

@@ -26,7 +26,7 @@ module Qti
           end
 
           def scoring_data_structs
-            @scoring_data ||= parse_scoring_data
+            @scoring_data_structs ||= parse_scoring_data
           end
 
           def distractors
@@ -38,7 +38,7 @@ module Qti
           private
 
           def parse_scoring_data
-            # This preserves the original behavior while not breaking on itemfeedback
+            # This preserves the original behavior while not breaking on item feedback
             path = './/xmlns:respcondition/xmlns:setvar/../xmlns:conditionvar/xmlns:varequal'
             matches = node.xpath(path).map do |node|
               [node.attributes['respident'].value, answers_map[node.content]]

data/lib/qti/v1/models/numerics/exact_match.rb

@@ -1,5 +1,3 @@
-require 'qti/v1/models/numerics/scoring_base'
-
 module Qti
   module V1
     module Models

data/lib/qti/v1/models/numerics/margin_error.rb

@@ -1,5 +1,3 @@
-require 'qti/v1/models/numerics/scoring_base'
-
 module Qti
   module V1
     module Models

data/lib/qti/v1/models/numerics/precision.rb

@@ -1,5 +1,3 @@
-require 'qti/v1/models/numerics/scoring_base'
-
 module Qti
   module V1
     module Models
@@ -55,7 +53,7 @@ module Qti
             end
             # this is not exactly significant digits
             # trailing zeros are ignored
-            # because gt_node and lte_ndoe don't expect trailing zeros
+            # because gt_node and lte_node don't expect trailing zeros
             sig
           end
         end

data/lib/qti/v1/models/numerics/within_range.rb

@@ -1,5 +1,3 @@
-require 'qti/v1/models/numerics/scoring_base'
-
 module Qti
   module V1
     module Models

data/lib/qti/v1/models/question_group.rb

@@ -1,6 +1,3 @@
-require 'qti/v1/models/base'
-require 'qti/v1/models/interactions'
-
 module Qti
   module V1
     module Models

data/lib/qti/v2/models/assessment_item.rb

@@ -1,6 +1,3 @@
-require 'qti/v2/models/base'
-require 'qti/v2/models/interactions'
-
 module Qti
   module V2
     module Models

data/lib/qti/v2/models/assessment_test.rb

@@ -1,20 +1,17 @@
-require 'qti/v2/models/base'
-require 'qti/models/assessment_meta'
-require 'qti/xpath_helpers'
-
 module Qti
   module V2
     module Models
       class AssessmentTest < Qti::V2::Models::Base
         include Qti::Models::AssessmentMetaBase
         include Qti::XPathHelpers
+
         def title
           @title ||= xpath_with_single_check('//xmlns:assessmentTest/@title')&.content || File.basename(@path, '.xml')
         end
 
         def assessment_items
           # Return the xml files we should be parsing
-          @assessment_item_reference_hrefs ||= begin
+          @assessment_items ||= begin
             @doc.xpath('//xmlns:assessmentItemRef/@href').map(&:content).map do |href|
               { path: remap_href_path(href), resource: self }
             end

data/lib/qti/v2/models/base.rb

@@ -1,5 +1,3 @@
-require 'qti/models/base'
-
 module Qti
   module V2
     module Models

data/lib/qti/v2/models/choices/gap_match_choice.rb

@@ -1,5 +1,3 @@
-require 'qti/v2/models/base'
-
 module Qti
   module V2
     module Models

data/lib/qti/v2/models/choices/simple_associable_choice.rb

@@ -1,5 +1,3 @@
-require 'qti/v2/models/base'
-
 module Qti
   module V2
     module Models

data/lib/qti/v2/models/choices/simple_choice.rb

@@ -1,5 +1,3 @@
-require 'qti/v2/models/base'
-
 module Qti
   module V2
     module Models