qti 0.4.16 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f6c8a03de219970a4b393485157b90247559323
-  data.tar.gz: b92d0b520d3b4ed2f18ad89eb25c4b77435c55e1
+  metadata.gz: 4883be4fd0b3c4f0f662068c6b7d42e2cfee0645
+  data.tar.gz: 262e1f6ad0e5d3d80c844d30084bcb6eb461fcf0
 SHA512:
-  metadata.gz: f1d379ca58f26bdb0d92db3a3f3929f90774a05104381c9653246a228d9dd3998b78c77b660fb74ae1a049e846bdf2eb8b042d0dcef27ee59781622efcdae95f
-  data.tar.gz: 70bba648502519b9d9f6a43c7cdf97dddb141e5359e0e1391ea3db138397a4d0dfd630b593abe6d9a505f48e4bfdb728fc051177848e395f07a5dba6895fdf60
+  metadata.gz: beddd3cfcec82686646a5635773414d32502f58ea993719afb175f4ca9adaeed7ee9f6a622016618497a0a6f474915a0ff205d80fd0984f610ce1093675270ba
+  data.tar.gz: 81bc3c599b5c15b0c1437d1abf2fe985676d1f9d2ec2e433f5be5d1cac458822a113eb1e5e6290d995315a05984cf541a89453e4a900597bd5fc5d799762184b

data/lib/qti.rb

@@ -62,7 +62,6 @@ require 'qti/v1/models/choices/fill_blank_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/choices/gap_match_choice'

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

@@ -3,18 +3,12 @@ module Qti
     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)

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

@@ -5,6 +5,13 @@ module Qti
     module Models
       module Choices
         class SimpleAssociableChoice < SimpleChoice
+          def match_max
+            @_match_max ||= @node.attributes['matchMax'].value || 0
+          end
+
+          def match_min
+            @_match_min ||= @node.attributes['matchMin'].value || 0
+          end
         end
       end
     end

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

@@ -6,6 +6,7 @@ module Qti
       module Choices
         class SimpleChoice < Qti::V2::Models::Base
           PROHIBITED_NODE_NAMES = %w(feedbackInline).join(',').freeze
+
           def initialize(node)
             @node = node
           end

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

@@ -1,4 +1,4 @@
-# Populate the subclasses
+require 'qti/v2/models/interactions/base_interaction'
 Dir["#{__dir__}/interactions/*.rb"].each { |f| load f }
 
 module Qti
@@ -7,8 +7,6 @@ module Qti
       module Interactions
         # This one finds the correct parsing model based on the provided xml node
         def self.interaction_model(node)
-          subclasses = constants.map { |c| const_get(c) }
-
           # Check for matches
           matches = subclasses.each_with_object([]) do |interaction_class, result|
             match = interaction_class.matches(node)
@@ -19,6 +17,12 @@ module Qti
 
           matches.first
         end
+
+        def self.subclasses
+          constants.map { |c| const_get(c) }
+                   .reject { |c| c.name =~ /Implementations|Base/ }
+                   .select { |c| c.name =~ /^Qti::V2.*Interaction$/ }
+        end
       end
     end
   end

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

@@ -0,0 +1,69 @@
+require_relative 'match_interaction'
+
+module Qti
+  module V2
+    module Models
+      module Interactions
+        class CategorizationInteraction < MatchInteraction
+          def self.matches(node)
+            if use_match_interaction_implementation?(node)
+              new(node, MatchItemTagProcesssors::MatchInteractionTagProcessor)
+            else
+              false
+            end
+          end
+
+          def self.use_match_interaction_implementation?(node)
+            MatchItemTagProcesssors::MatchInteractionTagProcessor.match_interaction_tag?(node) &&
+              MatchItemTagProcesssors::MatchInteractionTagProcessor.number_of_questions_per_answer(node)
+                                                                   .any? { |n| n != 1 }
+          end
+
+          def scoring_data_structs
+            questions_categories_choices_hash.map do |category_choice, questions_choices|
+              ScoringData.new(category_choice.text, 'directedPair',
+                id: node_identifier(category_choice),
+                questions_ids: questions_choices.map { |q| node_identifier(q) })
+            end
+          end
+
+          private
+
+          def questions_categories_choices_hash
+            category_choices.each_with_object({}) do |category_choice, hash|
+              hash[category_choice] = questions_for_category_choice(category_choice)
+            end
+          end
+
+          def questions_for_category_choice(choice)
+            choice_identifier = node_identifier(choice)
+            category_questions_ids = implementation.question_response_pairs
+                                                   .select { |_, category_id| category_id == choice_identifier }
+                                                   .map { |question_id, _| question_id }
+            question_choices.select { |q| category_questions_ids.include? node_identifier(q) }
+          end
+
+          def category_choices
+            @_category_choices ||= implementation.choices.select { |c| categories_ids.include? node_identifier(c) }
+          end
+
+          def question_choices
+            @_question_choices ||= implementation.choices.select { |c| questions_ids.include? node_identifier(c) }
+          end
+
+          def categories_ids
+            @_categories_ids ||= implementation.question_response_pairs.map { |_, category_id| category_id }.uniq
+          end
+
+          def questions_ids
+            @_questions_ids ||= implementation.question_response_pairs.map { |question_id, _| question_id }.uniq
+          end
+
+          def node_identifier(node)
+            node.attributes['identifier'].value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,51 +1,48 @@
+require_relative 'match_item_tag_processors/match_interaction_tag_processor'
+require_relative 'match_item_tag_processors/associate_interaction_tag_processor'
+
 module Qti
   module V2
     module Models
       module Interactions
         class MatchInteraction < BaseInteraction
-          def self.matches(node)
-            matches = node.xpath('//xmlns:matchInteraction')
-            return false if matches.count != 1
-            new(node)
-          end
+          extend Forwardable
 
-          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
+          attr_reader :implementation
 
-          def shuffled?
-            node.at_xpath('.//xmlns:matchInteraction').attributes['shuffle']&.value.try(:downcase) == 'true'
+          def initialize(node, implementation)
+            super(node)
+            @implementation = implementation.new(node)
           end
 
-          def answers
-            answer_nodes.map { |node| Choices::SimpleAssociableChoice.new(node) }
-          end
+          def_delegators :@implementation, :answers, :questions, :shuffled?
 
           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')]
+            implementation.scoring_data_structs
           end
 
-          private
+          def self.matches(node)
+            implementation =
+              if use_associate_interaction_implementation?(node)
+                MatchItemTagProcesssors::AssociateInteractionTagProcessor
+              elsif use_match_interaction_implementation?(node)
+                MatchItemTagProcesssors::MatchInteractionTagProcessor
+              end
+
+            return false unless implementation.present?
+            new(node, implementation)
+          end
 
-          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
+          def self.use_associate_interaction_implementation?(node)
+            MatchItemTagProcesssors::AssociateInteractionTagProcessor.associate_interaction_tag?(node) &&
+              MatchItemTagProcesssors::AssociateInteractionTagProcessor.number_of_questions_per_answer(node)
+                                                                       .all? { |n| n == 1 }
           end
 
-          def answer_nodes
-            node.xpath('.//xmlns:matchInteraction//xmlns:simpleMatchSet[2]//xmlns:simpleAssociableChoice')
+          def self.use_match_interaction_implementation?(node)
+            MatchItemTagProcesssors::MatchInteractionTagProcessor.match_interaction_tag?(node) &&
+              MatchItemTagProcesssors::MatchInteractionTagProcessor.number_of_questions_per_answer(node)
+                                                                   .all? { |n| n == 1 }
           end
         end
       end

data/lib/qti/v2/models/interactions/match_item_tag_processors/associate_interaction_tag_processor.rb

@@ -0,0 +1,75 @@
+module Qti
+  module V2
+    module Models
+      module Interactions
+        module MatchItemTagProcesssors
+          class AssociateInteractionTagProcessor < Interactions::BaseInteraction
+            def self.associate_interaction_tag?(node)
+              node.xpath('.//xmlns:associateInteraction').count == 1
+            end
+
+            def self.number_of_questions_per_answer(node)
+              question_response_pairs = node.xpath('.//xmlns:correctResponse//xmlns:value').map do |value|
+                value.content.split
+              end
+              count = Hash.new { 0 }
+              question_response_pairs.reduce(count) do |acc, pair|
+                acc.update pair.last => acc[pair.last] + 1
+              end
+              count.values
+            end
+
+            def shuffled?
+              node.at_xpath('.//xmlns:associateInteraction').attributes['shuffle']&.value.try(:downcase) == 'true'
+            end
+
+            def questions
+              questions_ids.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.map do |question_id, answer_id|
+                content = choices_by_identifier[answer_id].content
+                ScoringData.new(content, 'Pair', id: answer_id, question_id: question_id)
+              end
+            end
+
+            private
+
+            def choices_by_identifier
+              @_choices_by_identifier ||= choices.reduce({}) do |acc, choice|
+                acc.update choice.attributes['identifier'].value => choice
+              end
+            end
+
+            def answer_nodes
+              @_answer_nodes ||= choices.select { |c| answer_ids.include?(c.attributes['identifier'].value) }
+            end
+
+            def questions_ids
+              @_questions_ids ||= question_response_pairs.map { |question_id, _| question_id }
+            end
+
+            def answer_ids
+              @_answer_ids ||= question_response_pairs.map { |_, answer_id| answer_id }
+            end
+
+            def choices
+              node.xpath('.//xmlns:simpleAssociableChoice')
+            end
+
+            def question_response_pairs
+              node.xpath('.//xmlns:correctResponse//xmlns:value').map do |value|
+                value.content.split
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/qti/v2/models/interactions/match_item_tag_processors/match_interaction_tag_processor.rb

@@ -0,0 +1,67 @@
+module Qti
+  module V2
+    module Models
+      module Interactions
+        module MatchItemTagProcesssors
+          class MatchInteractionTagProcessor < Interactions::BaseInteraction
+            def self.match_interaction_tag?(node)
+              node.xpath('//xmlns:matchInteraction').count == 1
+            end
+
+            def self.number_of_questions_per_answer(node)
+              correct_categories = node.xpath('.//xmlns:correctResponse//xmlns:value')
+                                       .map { |value| value.content.split.last }
+
+              correct_categories.each_with_object(Hash.new(0)) { |category_id, counts| counts[category_id] += 1 }.values
+            end
+
+            def questions
+              questions_ids.map { |id| { id: id, question_body: choices_by_identifier[id].content } }
+            end
+
+            def shuffled?
+              node.at_xpath('.//xmlns:matchInteraction').attributes['shuffle']&.value.try(:downcase) == 'true'
+            end
+
+            def answers
+              answer_nodes.map { |node| Choices::SimpleAssociableChoice.new(node) }
+            end
+
+            def scoring_data_structs
+              question_response_pairs.map do |question_id, answer_id|
+                content = choices_by_identifier[answer_id].content
+                ScoringData.new(content, 'Pair', id: answer_id, question_id: question_id)
+              end
+            end
+
+            def choices
+              node.xpath('.//xmlns:simpleAssociableChoice')
+            end
+
+            def question_response_pairs
+              node.xpath('.//xmlns:correctResponse//xmlns:value').map do |value|
+                value.content.split
+              end
+            end
+
+            private
+
+            def questions_ids
+              @_questions_ids ||= question_response_pairs.map { |question_id, _| question_id }
+            end
+
+            def choices_by_identifier
+              @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
+end

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

@@ -1,9 +1,9 @@
 module Qti
   module V2
     module Models
-      ScoringData = Struct.new(:values, :type, :id, :case) do
-        def initialize(values, rcardinality, options={})
-          super(values, rcardinality, options[:id], options[:case])
+      ScoringData = Struct.new(:values, :type, :id, :case, :question_id, :questions_ids) do
+        def initialize(values, type, options={})
+          super(values, type, options[:id], options[:case], options[:question_id], options[:questions_ids])
         end
       end
     end

data/spec/fixtures/items_2.1/categorization.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assessmentItem xmlns="http://www.imsglobal.org/xsd/imsqti_v2p2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_v2p2  http://www.imsglobal.org/xsd/qti/qtiv2p2/imsqti_v2p2.xsd" identifier="match" title="Characters and Plays" adaptive="false" timeDependent="false">
+  <responseDeclaration identifier="RESPONSE" cardinality="multiple" baseType="directedPair">
+    <correctResponse>
+      <value>C R</value>
+      <value>D M</value>
+      <value>L M</value>
+      <value>P T</value>
+    </correctResponse>
+    <mapping defaultValue="0">
+      <mapEntry mapKey="C R" mappedValue="1"/>
+      <mapEntry mapKey="D M" mappedValue="0.5"/>
+      <mapEntry mapKey="L M" mappedValue="0.5"/>
+      <mapEntry mapKey="P T" mappedValue="1"/>
+    </mapping>
+  </responseDeclaration>
+  <outcomeDeclaration identifier="SCORE" cardinality="single" baseType="float"/>
+  <itemBody>
+    <matchInteraction responseIdentifier="RESPONSE" shuffle="true" maxAssociations="4">
+      <prompt>Match the following characters to the Shakespeare play they appeared in:</prompt>
+      <simpleMatchSet>
+        <simpleAssociableChoice identifier="C" matchMax="1">Capulet</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="D" matchMax="1">Demetrius</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="L" matchMax="1">Lysander</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="P" matchMax="1">Prospero</simpleAssociableChoice>
+      </simpleMatchSet>
+      <simpleMatchSet>
+        <simpleAssociableChoice identifier="M" matchMax="4">A Midsummer-Night's Dream</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="R" matchMax="4">Romeo and Juliet</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="T" matchMax="4">The Tempest</simpleAssociableChoice>
+      </simpleMatchSet>
+    </matchInteraction>
+  </itemBody>
+  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p2/rptemplates/map_response"/>
+</assessmentItem>

data/spec/fixtures/items_2.1/match.xml

@@ -1,35 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assessmentItem xmlns="http://www.imsglobal.org/xsd/imsqti_v2p2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_v2p2  http://www.imsglobal.org/xsd/qti/qtiv2p2/imsqti_v2p2.xsd" identifier="match" title="Characters and Plays" adaptive="false" timeDependent="false">
-  <responseDeclaration identifier="RESPONSE" cardinality="multiple" baseType="directedPair">
+<?xml version="1.0" encoding="utf-8"?>
+<assessmentItem xmlns="http://www.imsglobal.org/xsd/imsqti_v2p1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_v2p1 http://www.imsglobal.org/xsd/qti/qtiv2p1/imsqti_v2p1p2.xsd" identifier="associate" title="Shakespearian Rivals" adaptive="false" timeDependent="false">
+  <responseDeclaration identifier="RESPONSE" cardinality="multiple" baseType="pair">
     <correctResponse>
-      <value>C R</value>
-      <value>D M</value>
-      <value>L M</value>
-      <value>P T</value>
+      <value>A P</value>
+      <value>C M</value>
+      <value>D L</value>
     </correctResponse>
     <mapping defaultValue="0">
-      <mapEntry mapKey="C R" mappedValue="1"/>
-      <mapEntry mapKey="D M" mappedValue="0.5"/>
-      <mapEntry mapKey="L M" mappedValue="0.5"/>
-      <mapEntry mapKey="P T" mappedValue="1"/>
+      <mapEntry mapKey="A P" mappedValue="2"/>
+      <mapEntry mapKey="C M" mappedValue="1"/>
+      <mapEntry mapKey="D L" mappedValue="1"/>
     </mapping>
   </responseDeclaration>
   <outcomeDeclaration identifier="SCORE" cardinality="single" baseType="float"/>
   <itemBody>
-    <matchInteraction responseIdentifier="RESPONSE" shuffle="true" maxAssociations="4">
-      <prompt>Match the following characters to the Shakespeare play they appeared in:</prompt>
-      <simpleMatchSet>
-        <simpleAssociableChoice identifier="C" matchMax="1">Capulet</simpleAssociableChoice>
-        <simpleAssociableChoice identifier="D" matchMax="1">Demetrius</simpleAssociableChoice>
-        <simpleAssociableChoice identifier="L" matchMax="1">Lysander</simpleAssociableChoice>
-        <simpleAssociableChoice identifier="P" matchMax="1">Prospero</simpleAssociableChoice>
-      </simpleMatchSet>
-      <simpleMatchSet>
-        <simpleAssociableChoice identifier="M" matchMax="4">A Midsummer-Night's Dream</simpleAssociableChoice>
-        <simpleAssociableChoice identifier="R" matchMax="4">Romeo and Juliet</simpleAssociableChoice>
-        <simpleAssociableChoice identifier="T" matchMax="4">The Tempest</simpleAssociableChoice>
-      </simpleMatchSet>
-    </matchInteraction>
+    <associateInteraction responseIdentifier="RESPONSE" shuffle="true" maxAssociations="3">
+      <prompt>Hidden in this list of characters from famous Shakespeare plays are three pairs of rivals. Can you match each character to his adversary?</prompt>
+      <simpleAssociableChoice identifier="A" matchMax="1">Antonio</simpleAssociableChoice>
+      <simpleAssociableChoice identifier="C" matchMax="1">Capulet</simpleAssociableChoice>
+      <simpleAssociableChoice identifier="D" matchMax="1">Demetrius</simpleAssociableChoice>
+      <simpleAssociableChoice identifier="L" matchMax="1">Lysander</simpleAssociableChoice>
+      <simpleAssociableChoice identifier="M" matchMax="1">Montague</simpleAssociableChoice>
+      <simpleAssociableChoice identifier="P" matchMax="1">Prospero</simpleAssociableChoice>
+    </associateInteraction>
   </itemBody>
-  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p2/rptemplates/map_response"/>
+  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_response"/>
 </assessmentItem>

data/spec/fixtures/items_2.1/match2.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file was created using: Onyx Editor, Version 3.4.3 (Full, licensed version), (c)2012 BPS Bildungsportal Sachsen GmbH-->
+<assessmentItem xmlns="http://www.imsglobal.org/xsd/imsqti_v2p2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_v2p2 http://www.imsglobal.org/xsd/qti/qtiv2p2/imsqti_v2p2.xsd" identifier="Matchsingle_143114773" title="match (single)" adaptive="false" timeDependent="false">
+  <responseDeclaration identifier="RESPONSE" cardinality="multiple" baseType="directedPair">
+    <correctResponse>
+      <value>Match28433682 Match2675678</value>
+      <value>Match7191791 Match9372581</value>
+      <value>Match20473010 Match22744006</value>
+      <value>Match6429655 Match17943221</value>
+    </correctResponse>
+  </responseDeclaration>
+  <outcomeDeclaration identifier="SCORE" cardinality="single" baseType="float">
+    <defaultValue>
+      <value>0.0</value>
+    </defaultValue>
+  </outcomeDeclaration>
+  <outcomeDeclaration identifier="MAXSCORE" cardinality="single" baseType="float">
+    <defaultValue>
+      <value>1.0</value>
+    </defaultValue>
+  </outcomeDeclaration>
+  <outcomeDeclaration identifier="FEEDBACKBASIC" cardinality="single" baseType="identifier">
+    <defaultValue>
+      <value>empty</value>
+    </defaultValue>
+  </outcomeDeclaration>
+  <outcomeDeclaration identifier="FEEDBACKMODAL" cardinality="multiple" baseType="identifier" view="testConstructor"/>
+  <itemBody>
+    <div>Der wichtigste, größte und einzig schiffbare Fluss des Bundeslandes Sachsens ist die
+      Elbe. Die verschiedene Quellflüsse der Elbe durchziehen die sächsischen Städte.
+      <br/>Ordne anhand des Flusslaufs die Quellflüsse den gegebenen Städten zu.</div>
+    <matchInteraction responseIdentifier="RESPONSE" shuffle="true" maxAssociations="0">
+      <simpleMatchSet>
+        <simpleAssociableChoice identifier="Match28433682" fixed="false" matchMin="1" matchMax="1">Weißeritz</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="Match7191791" fixed="false" matchMin="1" matchMax="1">Mulde</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="Match20473010" fixed="false" matchMin="1" matchMax="1">Saale</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="Match6429655" fixed="false" matchMin="1" matchMax="1">Spree</simpleAssociableChoice>
+      </simpleMatchSet>
+      <simpleMatchSet>
+        <simpleAssociableChoice identifier="Match2675678" fixed="false" matchMin="1" matchMax="1">Dresden</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="Match9372581" fixed="false" matchMin="1" matchMax="1">Leipzig</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="Match22744006" fixed="false" matchMin="1" matchMax="1">Halle</simpleAssociableChoice>
+        <simpleAssociableChoice identifier="Match17943221" fixed="false" matchMin="1" matchMax="1">Bautzen</simpleAssociableChoice>
+      </simpleMatchSet>
+    </matchInteraction>
+  </itemBody>
+  <responseProcessing>
+    <responseCondition>
+      <responseIf>
+        <isNull>
+          <variable identifier="RESPONSE"/>
+        </isNull>
+        <setOutcomeValue identifier="FEEDBACKBASIC">
+          <baseValue baseType="identifier">empty</baseValue>
+        </setOutcomeValue>
+      </responseIf>
+      <responseElseIf>
+        <match>
+          <variable identifier="RESPONSE"/>
+          <correct identifier="RESPONSE"/>
+        </match>
+        <setOutcomeValue identifier="SCORE">
+          <sum>
+            <variable identifier="SCORE"/>
+            <variable identifier="MAXSCORE"/>
+          </sum>
+        </setOutcomeValue>
+        <setOutcomeValue identifier="FEEDBACKBASIC">
+          <baseValue baseType="identifier">correct</baseValue>
+        </setOutcomeValue>
+      </responseElseIf>
+      <responseElse>
+        <setOutcomeValue identifier="FEEDBACKBASIC">
+          <baseValue baseType="identifier">incorrect</baseValue>
+        </setOutcomeValue>
+      </responseElse>
+    </responseCondition>
+    <responseCondition>
+      <responseIf>
+        <and>
+          <match>
+            <baseValue baseType="identifier">correct</baseValue>
+            <variable identifier="FEEDBACKBASIC"/>
+          </match>
+        </and>
+        <setOutcomeValue identifier="FEEDBACKMODAL">
+          <multiple>
+            <variable identifier="FEEDBACKMODAL"/>
+            <baseValue baseType="identifier">FEEDBACK_27448254</baseValue>
+          </multiple>
+        </setOutcomeValue>
+      </responseIf>
+    </responseCondition>
+    <responseCondition>
+      <responseIf>
+        <and>
+          <match>
+            <baseValue baseType="identifier">incorrect</baseValue>
+            <variable identifier="FEEDBACKBASIC"/>
+          </match>
+        </and>
+        <setOutcomeValue identifier="FEEDBACKMODAL">
+          <multiple>
+            <variable identifier="FEEDBACKMODAL"/>
+            <baseValue baseType="identifier">FEEDBACK_16479834</baseValue>
+          </multiple>
+        </setOutcomeValue>
+      </responseIf>
+    </responseCondition>
+  </responseProcessing>
+  <modalFeedback identifier="FEEDBACK_27448254" outcomeIdentifier="FEEDBACKMODAL" showHide="show" title="Richtig!">Die Elbe durchzieht den Freistaat von Südosten nach Nordwesten. Wichtige
+    Quellflüsse sind die Mulde, die Weißeritz, die Zschopau, die Weiße Elster und die Spree,
+    deren allgemeine Fließrichtung Norden ist und die ebenfalls zum Fluss-System der Elbe
+    gehören.</modalFeedback>
+  <modalFeedback identifier="FEEDBACK_16479834" outcomeIdentifier="FEEDBACKMODAL" showHide="show" title="Leider Falsch!">Die Elbe durchzieht den Freistaat von Südosten nach Nordwesten.
+    Wichtige Quellflüsse sind die Mulde, die Weißeritz, die Zschopau, die Weiße Elster und die
+    Spree, deren allgemeine Fließrichtung Norden ist und die ebenfalls zum Fluss-System der Elbe
+    gehören.</modalFeedback>
+</assessmentItem>

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

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Qti::V1::Models::Interactions::MatchInteraction do
+  let(:file) { File.join('spec', 'fixtures', 'items_1.2', 'matching.xml') }
+  let(:assessment) { Qti::V1::Models::Assessment.from_path!(file) }
+  let(:item) { assessment.assessment_items.first }
+  subject { described_class.new(item) }
+
+  it 'returns shuffle setting' do
+    expect(subject.shuffled?).to eq false
+  end
+
+  it 'returns the answers' do
+    expect(subject.answers.map(&:item_body)).to eq(
+      ['Magnify up to about 400 times. Sometimes requires colored staining of cells.',
+       "Uses a beam of electrons. Can provide details of cells' internal structure.",
+       'A distractor answer.']
+    )
+  end
+
+  describe '.matches' do
+    it 'matches the item in file' do
+      expect(described_class.matches(item)).to be_truthy
+    end
+  end
+
+  describe '#scoring_data_structs' do
+    it 'grabs scoring data value for matching questions' do
+      expect(subject.scoring_data_structs.first.values).to eq(
+        'question_1' => 'Magnify up to about 400 times. Sometimes requires colored staining of cells.',
+        'question_2' => "Uses a beam of electrons. Can provide details of cells' internal structure."
+      )
+    end
+  end
+
+  describe '#questions' do
+    it 'returns the questions' do
+      expect(subject.questions).to eq(
+        [{ id: 'question_1', question_body: 'Light Microscope' },
+         { id: 'question_2', question_body: 'Electron Microscopes' }]
+      )
+    end
+  end
+end

data/spec/lib/qti/v2/models/assessment_item_spec.rb

@@ -64,28 +64,4 @@ describe Qti::V2::Models::AssessmentItem do
       end
     end
   end
-
-  describe '#scoring_data_structs' do
-    it 'grabs scoring data value for matching questions' do
-      assessment_item = Qti::V2::Models::AssessmentItem.from_path! 'spec/fixtures/items_2.1/match.xml'
-      expect(assessment_item.interaction_model).to be_instance_of Qti::V2::Models::Interactions::MatchInteraction
-      expect(assessment_item.scoring_data_structs.first.values).to eq(
-        'C' => 'Romeo and Juliet',
-        'D' => "A Midsummer-Night's Dream",
-        'L' => "A Midsummer-Night's Dream",
-        'P' => 'The Tempest'
-      )
-      expect(assessment_item.interaction_model.questions).to eq(
-        [{ id: 'C', question_body: 'Capulet' },
-         { id: 'D', question_body: 'Demetrius' },
-         { id: 'L', question_body: 'Lysander' },
-         { id: 'P', question_body: 'Prospero' }]
-      )
-      expect(assessment_item.interaction_model.answers.map(&:item_body)).to eq(
-        ["A Midsummer-Night's Dream",
-         'Romeo and Juliet',
-         'The Tempest']
-      )
-    end
-  end
 end

data/spec/lib/qti/v2/models/choices/simple_associable_choice_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Qti::V2::Models::Choices::SimpleAssociableChoice do
+  let(:io) { File.read('spec/fixtures/items_2.1/match2.xml') }
+  let(:nodes) { Nokogiri::XML(io).xpath('//xmlns:simpleAssociableChoice') }
+  let(:choices) { nodes.map { |node| described_class.new(node) } }
+
+  it 'returns the expected attributes' do
+    expected_attrs = [
+      %w(Match28433682 1 1 Weißeritz),
+      %w(Match7191791 1 1 Mulde),
+      %w(Match20473010 1 1 Saale),
+      %w(Match6429655 1 1 Spree),
+      %w(Match2675678 1 1 Dresden),
+      %w(Match9372581 1 1 Leipzig),
+      %w(Match22744006 1 1 Halle),
+      %w(Match17943221 1 1 Bautzen)
+    ]
+    expect(choices.map { |c| [c.identifier, c.match_min, c.match_max, c.item_body] }).to eq expected_attrs
+  end
+end

data/spec/lib/qti/v2/models/interactions/categorization_interaction_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Qti::V2::Models::Interactions::CategorizationInteraction do
+  let(:assessment_item) { Qti::V2::Models::AssessmentItem.from_path! 'spec/fixtures/items_2.1/categorization.xml' }
+  subject { assessment_item.interaction_model }
+
+  it { is_expected.to be_an_instance_of(described_class) }
+
+  it 'returns shuffle setting' do
+    expect(subject.shuffled?).to eq true
+  end
+
+  describe '#scoring_data_structs' do
+    it 'returns the scoring data for categorization questions' do
+      expected_scoring_data_structs = [
+        Qti::V2::Models::ScoringData.new("A Midsummer-Night's Dream", "directedPair", id: "M", questions_ids: ["D", "L"]),
+        Qti::V2::Models::ScoringData.new('Romeo and Juliet', "directedPair", id: "R", questions_ids: ['C']),
+        Qti::V2::Models::ScoringData.new('The Tempest', "directedPair", id: "T", questions_ids: ['P']),
+      ]
+      expect(subject.scoring_data_structs).to eq expected_scoring_data_structs
+    end
+  end
+end

data/spec/lib/qti/v2/models/interactions/match_interaction_spec.rb

@@ -1,15 +1,79 @@
 require 'spec_helper'
 
 describe Qti::V2::Models::Interactions::MatchInteraction do
-  let(:file) { File.read(File.join('spec', 'fixtures', 'items_2.1', 'match.xml')) }
-  let(:node) { Nokogiri::XML(file) }
-  subject { described_class.new(node) }
+  context 'assessmentItem is implemented with <associateInteraction>' do
+    let(:assessment_item) { Qti::V2::Models::AssessmentItem.from_path! 'spec/fixtures/items_2.1/match.xml' }
+    subject { assessment_item.interaction_model }
 
-  it 'returns shuffle setting' do
-    expect(subject.shuffled?).to eq true
+    it { is_expected.to be_an_instance_of(described_class) }
+
+    it 'returns shuffle setting' do
+      expect(subject.shuffled?).to eq true
+    end
+
+    describe '#scoring_data_structs' do
+      it 'grabs scoring data value for matching questions' do
+        expect(subject.scoring_data_structs).to eq [
+          Qti::V2::Models::ScoringData.new('Prospero', 'Pair', id: 'P', question_id: 'A'),
+          Qti::V2::Models::ScoringData.new('Montague', 'Pair', id: 'M', question_id: 'C'),
+          Qti::V2::Models::ScoringData.new('Lysander', 'Pair', id: 'L', question_id: 'D')
+        ]
+      end
+    end
+
+    describe '#answers' do
+      it 'returns the correct_answers' do
+        expect(subject.answers.map(&:item_body)).to eq(%w[Lysander Montague Prospero])
+      end
+    end
+
+    describe '#questions' do
+      it 'returns the questions' do
+        expect(subject.questions).to eq(
+          [{ id: 'A', question_body: 'Antonio' },
+           { id: 'C', question_body: 'Capulet' },
+           { id: 'D', question_body: 'Demetrius' }]
+        )
+      end
+    end
   end
 
-  it 'returns the answers' do
-    expect(subject.answers.map(&:item_body)).to eq ["A Midsummer-Night's Dream", 'Romeo and Juliet', 'The Tempest']
+  context 'assessmentItem is implemented with <matchInteraction>' do
+    let(:assessment_item) { Qti::V2::Models::AssessmentItem.from_path! 'spec/fixtures/items_2.1/match2.xml' }
+    subject { assessment_item.interaction_model }
+
+    it { is_expected.to be_an_instance_of(described_class) }
+
+    it 'returns shuffle setting' do
+      expect(subject.shuffled?).to eq true
+    end
+
+    describe '#scoring_data_structs' do
+      it 'grabs scoring data value for matching questions' do
+        expect(subject.scoring_data_structs).to eq [
+          Qti::V2::Models::ScoringData.new('Dresden', 'Pair', id: 'Match2675678', question_id: 'Match28433682'),
+          Qti::V2::Models::ScoringData.new('Leipzig', 'Pair', id: 'Match9372581', question_id: 'Match7191791'),
+          Qti::V2::Models::ScoringData.new('Halle'  , 'Pair', id: 'Match22744006', question_id: 'Match20473010'),
+          Qti::V2::Models::ScoringData.new('Bautzen', 'Pair', id: 'Match17943221', question_id: 'Match6429655')
+        ]
+      end
+    end
+
+    describe '#answers' do
+      it 'returns the correct_answers' do
+        expect(subject.answers.map(&:item_body)).to eq %w[Dresden Leipzig Halle Bautzen]
+      end
+    end
+
+    describe '#questions' do
+      it 'returns the questions' do
+        expect(subject.questions).to eq(
+          [{ id: 'Match28433682', question_body: 'Weißeritz' },
+           { id: 'Match7191791', question_body: 'Mulde' },
+           { id: 'Match20473010', question_body: 'Saale' },
+           { id: 'Match6429655', question_body: 'Spree' }]
+        )
+      end
+    end
   end
 end

data/spec/support/monkey_patches.rb

@@ -0,0 +1,14 @@
+# ObjectSpace.each_object(Class).select { |c| c.name =~ /V1.*(?<!Base)Interaction$/ }.each do |klass|
+#   klass.class_eval do
+#     class << self
+#       alias_method :old_matches?, :matches?
+#       def matches?(node)
+#         raise ArgumentError.new("Expected Nokogiri::XML::Element and got #{node.class}") unless item_element?(node)
+#         old_matches?(node)
+#       end
+#       def item_element?(node)
+#         node.class == Nokogiri::XML::Element && node.name == 'item'
+#       end
+#     end
+#   end
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qti
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.5.16
 platform: ruby
 authors:
 - Hannah Bottalla
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -165,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -223,10 +237,13 @@ files:
 - lib/qti/v2/models/choices/simple_choice.rb
 - lib/qti/v2/models/interactions.rb
 - lib/qti/v2/models/interactions/base_interaction.rb
+- lib/qti/v2/models/interactions/categorization_interaction.rb
 - lib/qti/v2/models/interactions/choice_interaction.rb
 - lib/qti/v2/models/interactions/extended_text_interaction.rb
 - lib/qti/v2/models/interactions/gap_match_interaction.rb
 - lib/qti/v2/models/interactions/match_interaction.rb
+- lib/qti/v2/models/interactions/match_item_tag_processors/associate_interaction_tag_processor.rb
+- lib/qti/v2/models/interactions/match_item_tag_processors/match_interaction_tag_processor.rb
 - lib/qti/v2/models/scoring_data.rb
 - spec/fixtures/items_1.2/choice.xml
 - spec/fixtures/items_1.2/essay.xml
@@ -247,6 +264,7 @@ files:
 - spec/fixtures/items_2.1/adaptive_template.xml
 - spec/fixtures/items_2.1/associate.xml
 - spec/fixtures/items_2.1/audio-video.xml
+- spec/fixtures/items_2.1/categorization.xml
 - spec/fixtures/items_2.1/choice.xml
 - spec/fixtures/items_2.1/choice_aria.xml
 - spec/fixtures/items_2.1/choice_fixed.xml
@@ -304,6 +322,7 @@ files:
 - spec/fixtures/items_2.1/inline_choice_math.xml
 - spec/fixtures/items_2.1/likert.xml
 - spec/fixtures/items_2.1/match.xml
+- spec/fixtures/items_2.1/match2.xml
 - spec/fixtures/items_2.1/math.xml
 - spec/fixtures/items_2.1/mc_calc3.xml
 - spec/fixtures/items_2.1/mc_calc5.xml
@@ -422,11 +441,14 @@ files:
 - spec/lib/qti/v1/models/choices/logical_identifier_choice_spec.rb
 - spec/lib/qti/v1/models/interactions/choice_interaction_spec.rb
 - spec/lib/qti/v1/models/interactions/fill_blank_interaction_spec.rb
+- spec/lib/qti/v1/models/interactions/match_interaction_spec.rb
 - spec/lib/qti/v1/models/interactions/string_interaction_spec.rb
 - spec/lib/qti/v2/models/assessment_item_spec.rb
 - spec/lib/qti/v2/models/assessment_test_spec.rb
 - spec/lib/qti/v2/models/choices/gap_match_choice_spec.rb
+- spec/lib/qti/v2/models/choices/simple_associable_choice_spec.rb
 - spec/lib/qti/v2/models/choices/simple_choice_spec.rb
+- spec/lib/qti/v2/models/interactions/categorization_interaction_spec.rb
 - spec/lib/qti/v2/models/interactions/choice_interaction_spec.rb
 - spec/lib/qti/v2/models/interactions/extended_text_interaction_spec.rb
 - spec/lib/qti/v2/models/interactions/gap_match_interaction_spec.rb
@@ -434,6 +456,7 @@ files:
 - spec/lib/qti_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb
+- spec/support/monkey_patches.rb
 homepage: 
 licenses: []
 metadata: {}
@@ -477,6 +500,7 @@ test_files:
 - spec/fixtures/items_2.1/adaptive_template.xml
 - spec/fixtures/items_2.1/associate.xml
 - spec/fixtures/items_2.1/audio-video.xml
+- spec/fixtures/items_2.1/categorization.xml
 - spec/fixtures/items_2.1/choice.xml
 - spec/fixtures/items_2.1/choice_aria.xml
 - spec/fixtures/items_2.1/choice_fixed.xml
@@ -534,6 +558,7 @@ test_files:
 - spec/fixtures/items_2.1/inline_choice_math.xml
 - spec/fixtures/items_2.1/likert.xml
 - spec/fixtures/items_2.1/match.xml
+- spec/fixtures/items_2.1/match2.xml
 - spec/fixtures/items_2.1/math.xml
 - spec/fixtures/items_2.1/mc_calc3.xml
 - spec/fixtures/items_2.1/mc_calc5.xml
@@ -652,11 +677,14 @@ test_files:
 - spec/lib/qti/v1/models/choices/logical_identifier_choice_spec.rb
 - spec/lib/qti/v1/models/interactions/choice_interaction_spec.rb
 - spec/lib/qti/v1/models/interactions/fill_blank_interaction_spec.rb
+- spec/lib/qti/v1/models/interactions/match_interaction_spec.rb
 - spec/lib/qti/v1/models/interactions/string_interaction_spec.rb
 - spec/lib/qti/v2/models/assessment_item_spec.rb
 - spec/lib/qti/v2/models/assessment_test_spec.rb
 - spec/lib/qti/v2/models/choices/gap_match_choice_spec.rb
+- spec/lib/qti/v2/models/choices/simple_associable_choice_spec.rb
 - spec/lib/qti/v2/models/choices/simple_choice_spec.rb
+- spec/lib/qti/v2/models/interactions/categorization_interaction_spec.rb
 - spec/lib/qti/v2/models/interactions/choice_interaction_spec.rb
 - spec/lib/qti/v2/models/interactions/extended_text_interaction_spec.rb
 - spec/lib/qti/v2/models/interactions/gap_match_interaction_spec.rb
@@ -664,3 +692,4 @@ test_files:
 - spec/lib/qti_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb
+- spec/support/monkey_patches.rb