qti 0.2.12 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4276f67d46173a7c7059c36687cf77c930a0bb36
-  data.tar.gz: 05b05ab5d7c63ce1bcb12ae3a8a688eb30d491c3
+  metadata.gz: 7e3dbac8ff4eda0f1c6f67c6f8e7e1673ac8014b
+  data.tar.gz: 807c9a6be3ea4e1887966bb5734015dc017efa04
 SHA512:
-  metadata.gz: 10314c5ed21040925853f8b98e1e07f222d3a8921ce44875f26962dafbf43cfc8480b32523653d0161d1dcffe00573e038415ef4fff2d7956341322e3c1d530d
-  data.tar.gz: 372d29818743f5f26d26db7b2a02d995e68f4f73a7022fff9a7691584b39631a30c0f2b74110f5b39d7c4e7b3fa41816351ac444e92792e3885a7408d4b3e11d
+  metadata.gz: a628c8aa5c49fdea190b112136ab3ad22861725437b7c167c2ac6188ae7970a5641a6d794243726d4b9c24c0986ad33900d22816a4576fa056e5acc50c328db8
+  data.tar.gz: 1a92b8176ca835e95923c936ae5c86b77c60e9ba702c7f6dd0d84d082c1ae6aa6eb63a670681bbfb34bb54ada67391c2ab394f4d6182f631712bf57b5376e83f

data/Rakefile

@@ -1 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+
+desc 'Initialize console'
+task :console do
+  require 'pry'
+  require 'qti'
+  ARGV.clear
+  Pry.start
+end

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

@@ -5,11 +5,11 @@ module Qti
     module Models
       class Assessment < Qti::V1::Models::Base
         def title
-          @title ||= xpath_with_single_check('//assessment/@title').content
+          @title ||= xpath_with_single_check('.//xmlns:assessment/@title')&.content
         end
 
         def assessment_items
-          @doc.xpath('//item')
+          @doc.xpath('.//xmlns:item')
         end
       end
     end

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

@@ -7,8 +7,6 @@ module Qti
       class AssessmentItem < Qti::V1::Models::Base
         attr_reader :doc
 
-        ScoringData = Struct.new(:values, :rcardinality)
-
         def initialize(item)
           @doc = item
         end
@@ -16,8 +14,8 @@ module Qti
         def item_body
           @item_body ||= begin
             node = @doc.dup
-            presentation = node.at_xpath('./presentation')
-            prompt = presentation.at_xpath('//material/mattext').content
+            presentation = node.at_xpath('.//xmlns:presentation')
+            prompt = presentation.at_xpath('.//xmlns:mattext').content
             sanitize_content!(prompt)
           end
         end
@@ -32,12 +30,12 @@ module Qti
 
         def points_possible
           @points_possible ||= begin
-            @doc.at_xpath('.//decvar/@maxvalue')&.value || @doc.at_xpath('.//decvar/@defaultval')&.value
+            @doc.at_xpath('.//xmlns:decvar/@maxvalue')&.value || @doc.at_xpath('.//xmlns:decvar/@defaultval')&.value
           end
         end
 
         def rcardinality
-          @rcardinality ||= @doc.at_xpath('.//response_lid/@rcardinality').value
+          @rcardinality ||= @doc.at_xpath('.//xmlns:response_lid/@rcardinality').value
         end
 
         def interaction_model
@@ -47,29 +45,7 @@ module Qti
         end
 
         def scoring_data_structs
-          @scoring_data_structs ||=
-            if ordering?
-              scoring_data_structs_for_ordering
-            else
-              default_scoring_data_structs
-            end
-        end
-
-        private
-
-        def default_scoring_data_structs
-          choice_nodes = doc.xpath('.//respcondition')
-          choice_nodes.select { |choice_node| choice_node.at_xpath('.//setvar').content.to_f.positive? }
-                      .map { |value_node| ScoringData.new(value_node.at_xpath('.//varequal').content, rcardinality) }
-        end
-
-        def scoring_data_structs_for_ordering
-          correct_order = @doc.xpath('.//conditionvar/varequal').map{|node| node.content }
-          [ScoringData.new(correct_order, rcardinality)]
-        end
-
-        def ordering?
-          rcardinality == 'Ordered'
+          @scoring_data_structs ||= interaction_model.scoring_data_structs
         end
       end
     end

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

@@ -0,0 +1,33 @@
+module Qti
+  module V1
+    module Models
+      module Interactions
+        class BaseInteraction < Qti::V1::Models::Base
+          attr_reader :node
+
+          def self.matches(node)
+            false
+          end
+
+          def initialize(node)
+            @node = node
+          end
+
+          def shuffled?
+            @node.at_xpath('.//xmlns:render_choice/@shuffle')&.value == 'Yes'
+          end
+
+          def scoring_data_structs
+            raise NotImplementedError
+          end
+
+          private
+
+          def rcardinality
+            @rcardinality ||= @node.at_xpath('.//xmlns:response_lid/@rcardinality').value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Qti
+  module V1
+    module Models
+      module Interactions
+        class ChoiceInteraction < BaseInteraction
+          # This will know if a class matches
+          def self.matches(node)
+            matches = node.xpath('.//xmlns:response_lid')
+            return false if matches.count > 1  || matches.empty?
+            rcardinality = matches.first.attributes['rcardinality']&.value || 'Single'
+            return false if rcardinality == 'Ordered'
+            new(node)
+          end
+
+          def initialize(node)
+            @node = node
+          end
+
+          def shuffled?
+            node.at_xpath('.//xmlns:render_choice/@shuffle')&.value == 'Yes'
+          end
+
+          def answers
+            @answers ||= answer_nodes.map do |node|
+              V1::Models::Choices::LogicalIdentifierChoice.new(node)
+            end
+          end
+
+          def scoring_data_structs
+            choice_nodes = node.xpath('.//xmlns:respcondition')
+            set_var_nodes = choice_nodes.select { |choice_node| choice_node.at_xpath('.//xmlns:setvar').content.to_f.positive? }
+            set_var_nodes.map { |value_node| ScoringData.new(value_node.at_xpath('.//xmlns:varequal').content, rcardinality) }
+          end
+
+          private
+
+          def answer_nodes
+            node.xpath('.//xmlns:response_label')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+module Qti
+  module V1
+    module Models
+      module Interactions
+        class MatchInteraction < BaseInteraction
+          attr_reader :node
+
+          def self.matches(node)
+            matches = node.xpath('.//xmlns:response_lid')
+            return false if matches.count <= 1
+            new(node)
+          end
+
+          def initialize(node)
+            @node = node
+          end
+
+          def answers
+            @answers ||= answer_nodes.map do |node|
+              V1::Models::Choices::LogicalIdentifierChoice.new(node)
+            end
+          end
+
+          def questions
+            node.xpath('.//xmlns:response_lid').map do |lid_node|
+              question_body = lid_node.at_xpath('.//xmlns:mattext').text
+              { id: lid_node.attributes['ident'].value, question_body: question_body }
+            end
+          end
+
+          def scoring_data_structs
+            matches = node.xpath('.//xmlns:varequal').map do |node|
+              [node.attributes['respident'].value, answers_map[node.content]]
+            end
+            [Models::ScoringData.new(Hash[matches], rcardinality)]
+          end
+
+          private
+
+          def answers_map
+            @answers_map ||= answers.reduce({}) do |acc, answer|
+              acc.update answer.identifier => answer.item_body
+            end
+          end
+
+          def answer_nodes
+            responses = []
+            response_ids = {}
+            node.xpath('.//xmlns:response_label').each do |answer_node|
+              ident = answer_node.attributes['ident'].value
+              responses << answer_node unless response_ids.key? ident
+              response_ids[ident] = 1
+            end
+            responses
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Qti
+  module V1
+    module Models
+      module Interactions
+        class OrderingInteraction < ChoiceInteraction
+          # This will know if a class matches
+          def self.matches(node)
+            matches = node.xpath('.//xmlns:response_lid')
+            return false if matches.count > 1  || matches.empty?
+            rcardinality = matches.first.attributes['rcardinality']&.value || 'Single'
+            return false if rcardinality != 'Ordered'
+            new(node)
+          end
+
+          def scoring_data_structs
+            correct_order = node.xpath('.//xmlns:varequal').map(&:content)
+            [ScoringData.new(correct_order, rcardinality)]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,14 +2,12 @@ module Qti
   module V1
     module Models
       module Interactions
-        class StringInteraction < Qti::V1::Models::Base
+        class StringInteraction < BaseInteraction
           @node_name = 'response_str'.freeze
           # This will know if a class matches
           def self.matches(node)
             matches = node.children.children.select { |n| n.name == @node_name }
             return false if matches.empty?
-
-            raise Qti::UnsupportedSchema if matches.size > 1
             new(matches.first)
           end
 

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

@@ -14,9 +14,7 @@ module Qti
             match = interaction_class.matches(node)
             result << match if match
           end
-
-          raise UnsupportedSchema if matches.size > 1
-
+          raise UnsupportedSchema if matches.size != 1
           matches.first
         end
       end

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

@@ -0,0 +1,7 @@
+module Qti
+  module V1
+    module Models
+      ScoringData = Struct.new(:values, :rcardinality)
+    end
+  end
+end

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

@@ -39,16 +39,12 @@ module Qti
 
         def interaction_model
           @interaction_model ||= begin
-            V2::Models::Interactions.interaction_model(item_body_node)
+            V2::Models::Interactions.interaction_model(@doc)
           end
         end
 
         def scoring_data_structs
-          @scoring_data_structs ||= begin
-            type = xpath_with_single_check('//xmlns:responseDeclaration/@baseType').content
-            value_nodes = @doc.xpath('//xmlns:responseDeclaration/xmlns:correctResponse/xmlns:value')
-            value_nodes.map { |value_node| ScoringData.new(value_node.content, type) }
-          end
+          @scoring_data_structs ||= interaction_model.scoring_data_structs
         end
 
         private

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

@@ -0,0 +1,12 @@
+require 'qti/v2/models/base'
+
+module Qti
+  module V2
+    module Models
+      module Choices
+        class SimpleAssociableChoice < SimpleChoice
+        end
+      end
+    end
+  end
+end

data/lib/qti/v2/models/interactions/base_interaction.rb

@@ -0,0 +1,43 @@
+module Qti
+  module V2
+    module Models
+      module Interactions
+        class BaseInteraction < Qti::V2::Models::Base
+          attr_reader :node
+
+          def self.matches(node)
+            false
+          end
+
+          def initialize(node)
+            @node = node
+          end
+
+          def shuffled?
+            @node.at_xpath('.//render_choice/@shuffle')&.value == 'Yes'
+          end
+
+          def scoring_data_structs
+            @scoring_data_structs ||= begin
+              type = xpath_with_single_check('//xmlns:responseDeclaration/@baseType').content
+              value_nodes = node.xpath('//xmlns:responseDeclaration/xmlns:correctResponse/xmlns:value')
+              value_nodes.map { |value_node| Models::ScoringData.new(value_node.content, type) }
+            end
+          end
+
+          def xpath_with_single_check(xpath)
+            node_list = node.xpath(xpath)
+            raise Qti::ParseError, 'Too many matches' if node_list.count > 1
+            node_list.first
+          end
+
+          private
+
+          def rcardinality
+            @rcardinality ||= @node.at_xpath('.//response_lid/@rcardinality').value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/qti/v2/models/interactions/choice_interaction.rb

@@ -2,25 +2,15 @@ module Qti
   module V2
     module Models
       module Interactions
-        class ChoiceInteraction < Qti::V2::Models::Base
-          @node_name = 'choiceInteraction'.freeze
-          # This will know if a class matches
+        class ChoiceInteraction < BaseInteraction
           def self.matches(node)
-            matches = node.children.filter(INTERACTION_ELEMENTS_CSS).select { |n| n.name == @node_name }
+            matches = node.xpath('.//xmlns:choiceInteraction')
             return false if matches.empty?
 
             raise Qti::UnsupportedSchema if matches.size > 1
             new(matches.first)
           end
 
-          def initialize(node)
-            @node = node
-          end
-
-          def shuffled?
-            @node.attributes['shuffle'].value == 'true'
-          end
-
           def answers
             @answers ||= answer_nodes.map do |node|
               V2::Models::Choices::SimpleChoice.new(node)

data/lib/qti/v2/models/interactions/extended_text_interaction.rb

@@ -2,7 +2,7 @@ module Qti
   module V2
     module Models
       module Interactions
-        class ExtendedTextInteraction < Qti::V2::Models::Base
+        class ExtendedTextInteraction < BaseInteraction
           @node_name = 'extendedTextInteraction'.freeze
           # This will know if a class matches
           def self.matches(node)
@@ -13,10 +13,6 @@ module Qti
             new(matches.first)
           end
 
-          def initialize(node)
-            @node = node
-          end
-
           # not used yet
           def expected_lines
             @node.attributes['expectedLines']&.value&.to_i || 0

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

@@ -0,0 +1,52 @@
+module Qti
+  module V2
+    module Models
+      module Interactions
+        class MatchInteraction < BaseInteraction
+          def self.matches(node)
+            matches = node.xpath('//xmlns:matchInteraction')
+            return false if matches.empty?
+
+            raise Qti::UnsupportedSchema if matches.size > 1
+            new(node)
+          end
+
+          def questions
+            node.xpath('.//xmlns:correctResponse//xmlns:value')
+                .map { |value| value.content.split.first }
+                .map { |id| { id: id, question_body: choices_by_identifier[id].content } }
+          end
+
+          def answers
+            answer_nodes.map { |node| Choices::SimpleAssociableChoice.new(node) }
+          end
+
+          def scoring_data_structs
+            question_response_pairs = node.xpath('.//xmlns:correctResponse//xmlns:value').map do |value|
+              value.content.split
+            end
+            question_response_id_mapping = Hash[question_response_pairs]
+            data = question_response_id_mapping.reduce({}) do |acc, pair|
+              question_id, answer_id = pair
+              acc.update question_id => choices_by_identifier[answer_id].content
+            end
+            [ScoringData.new(data, 'directedPair')]
+          end
+
+          private
+
+          def choices_by_identifier
+            choices = node.xpath('.//xmlns:simpleAssociableChoice')
+            @choices_by_identifier ||= choices.reduce({}) do |acc, choice|
+              acc.update choice.attributes['identifier'].value => choice
+            end
+          end
+
+          def answer_nodes
+            node.xpath('.//xmlns:matchInteraction//xmlns:simpleMatchSet[2]//xmlns:simpleAssociableChoice')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Qti
+  module V2
+    module Models
+      ScoringData = Struct.new(:values, :type)
+    end
+  end
+end

data/lib/qti.rb

@@ -52,14 +52,20 @@ require 'qti/models/manifest'
 require 'qti/models/base'
 
 require 'qti/v1/models/base'
+require 'qti/v1/models/interactions/base_interaction'
+require 'qti/v1/models/interactions/choice_interaction'
 require 'qti/v1/models/assessment'
 require 'qti/v1/models/assessment_item'
 require 'qti/v1/models/choices/logical_identifier_choice'
+require 'qti/v1/models/scoring_data'
 
 require 'qti/v2/models/base'
+require 'qti/v2/models/interactions/base_interaction'
 require 'qti/v2/models/choices/simple_choice'
+require 'qti/v2/models/choices/simple_associable_choice'
 require 'qti/v2/models/assessment_item'
 require 'qti/v2/models/assessment_test'
+require 'qti/v2/models/scoring_data'
 
 require 'zip'
 require 'qti/exporter'

data/spec/fixtures/items_1.2/matching.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<questestinterop xmlns="http://www.imsglobal.org/xsd/ims_qtiasiv1p2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/ims_qtiasiv1p2 http://www.imsglobal.org/xsd/ims_qtiasiv1p2p1.xsd">
+  <item title="" ident="4772">
+    <itemmetadata>
+      <qtimetadata>
+        <qtimetadatafield>
+          <fieldlabel>question_type</fieldlabel>
+          <fieldentry>matching_question</fieldentry>
+        </qtimetadatafield>
+      </qtimetadata>
+    </itemmetadata>
+    <presentation>
+      <material>
+        <mattext texttype="text/html">Match the statements with the correct type of microscope</mattext>
+      </material>
+      <response_lid ident="question_1" rcardinality="Single">
+        <material>
+          <mattext texttype="text/plain">Light Microscope</mattext>
+        </material>
+        <render_choice>
+          <response_label ident="8440">
+            <material>
+              <mattext texttype="text/plain">Magnify up to about 400 times. Sometimes requires colored staining of cells.</mattext>
+            </material>
+          </response_label>
+          <response_label ident="5653">
+            <material>
+              <mattext texttype="text/plain">Uses a beam of electrons. Can provide details of cells' internal structure.</mattext>
+            </material>
+          </response_label>
+        </render_choice>
+      </response_lid>
+      <response_lid ident="question_2" rcardinality="Single">
+        <material>
+          <mattext texttype="text/plain">Electron Microscopes</mattext>
+        </material>
+        <render_choice>
+          <response_label ident="8440">
+            <material>
+              <mattext texttype="text/plain">Magnify up to about 400 times. Sometimes requires colored staining of cells.</mattext>
+            </material>
+          </response_label>
+          <response_label ident="5653">
+            <material>
+              <mattext texttype="text/plain">Uses a beam of electrons. Can provide details of cells' internal structure.</mattext>
+            </material>
+          </response_label>
+          <response_label ident="7777">
+            <material>
+              <mattext texttype="text/plain">A distractor answer.</mattext>
+            </material>
+          </response_label>
+        </render_choice>
+      </response_lid>
+    </presentation>
+    <resprocessing>
+      <outcomes>
+        <decvar maxvalue="100" minvalue="0" varname="SCORE" vartype="Decimal"/>
+      </outcomes>
+      <respcondition>
+        <conditionvar>
+          <varequal respident="question_1">8440</varequal>
+        </conditionvar>
+        <setvar varname="SCORE" action="Add">50.00</setvar>
+      </respcondition>
+      <respcondition>
+        <conditionvar>
+          <varequal respident="question_2">5653</varequal>
+        </conditionvar>
+        <setvar varname="SCORE" action="Add">50.00</setvar>
+      </respcondition>
+    </resprocessing>
+  </item>
+</questestinterop>

data/spec/fixtures/items_1.2/multiple_answer.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<questestinterop>
+<questestinterop xmlns="http://www.imsglobal.org/xsd/ims_qtiasiv1p2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/ims_qtiasiv1p2 http://www.imsglobal.org/xsd/ims_qtiasiv1p2p1.xsd">
 
 <assessment title="Quiz" ident="A1001">
 <section title="Main" ident="S1002">

data/spec/fixtures/items_1.2/multiple_choice.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<questestinterop>
+<questestinterop xmlns="http://www.imsglobal.org/xsd/ims_qtiasiv1p2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/ims_qtiasiv1p2 http://www.imsglobal.org/xsd/ims_qtiasiv1p2p1.xsd">
 
 <assessment title="1.2 Import Quiz" ident="A1001">
 <section title="Main" ident="S1002">