qti 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7fc942a2aa4b470281f508a68ad81434679c6e
-  data.tar.gz: a8a21f43f3ef70c48a8067584c5cb91334aed794
+  metadata.gz: e53f243da494ee925b59209d0dd07bb4a2cabe94
+  data.tar.gz: 824890bebce7299bf5d4acfb11a8499354452965
 SHA512:
-  metadata.gz: 922bc9b6756301d46f486045ba50fb956368a6df78a79df8c7ef119d0ab8f5376c49b28e597c8797319c141c9d5b453e8033d50b59859014cd36dbc909609860
-  data.tar.gz: 5a4b21afa5a9ae87c303c01997f0b17820be9631e59f30e376fde7da639521eac207e31f21ce2971ef439345a3c7209b664375675e8313c214b7b22e4db409bf
+  metadata.gz: 60fb5c2db7b83bc57183d633f95d1929aa6601975eb796c87f5e9a84ca378d68f645468c4d280717ae715030e699cce580037c5f6f572e6aa846a9407489537f
+  data.tar.gz: 8879e659c17e6e7cc0c4400eacabcc594b2964dca2ce45175a84b320ce92c2621d99277b3a755b11a3a7d09a1fcda1544d67c9fdbc374b21b066a38763d07b9b

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

@@ -19,7 +19,7 @@ module Qti
           matches = Interactions.get_matches(node, parent, subclasses)
           matches = Interactions.get_matches(node, parent, FALLBACK_CLASSES) if matches.empty?
 
-          raise UnsupportedSchema if matches.size != 1
+          raise UnsupportedSchema, "Multiple Types (#{matches.map(&:class)})" if matches.size != 1
           matches.first
         end
 

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

@@ -11,8 +11,19 @@ module Qti
 
           def self.canvas_multiple_fib?(node)
             matches = node.xpath('.//xmlns:response_lid')
-            return false if matches.count <= 1
-            node.at_xpath('.//xmlns:fieldentry').text == 'fill_in_multiple_blanks_question'
+            return false if matches.count < 1
+            question_type(node) == 'fill_in_multiple_blanks_question'
+          end
+
+          def self.question_type(node)
+            path = './/xmlns:qtimetadatafield/xmlns:fieldlabel' \
+              '[text()="question_type"]/../xmlns:fieldentry'
+            node.at_xpath(path)&.text
+          end
+
+          def self.maybe_question_type(node, qtype)
+            question_type = self.question_type(node)
+            !question_type || question_type == qtype
           end
 
           def initialize(node, parent)

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

@@ -5,6 +5,7 @@ module Qti
         class ChoiceInteraction < BaseInteraction
           # This will know if a class matches
           def self.matches(node, parent)
+            return false unless maybe_choice_type(node)
             matches = node.xpath('.//xmlns:response_lid')
             return false if matches.count > 1 || matches.empty?
             rcardinality = matches.first.attributes['rcardinality']&.value || 'Single'
@@ -12,6 +13,13 @@ module Qti
             new(node, parent)
           end
 
+          def self.maybe_choice_type(node)
+            question_type = self.question_type(node)
+            return true unless question_type
+            valid_types = %w[multiple_choice_question multiple_answers_question true_false_question]
+            valid_types.include?(question_type)
+          end
+
           def answers
             @answers ||= answer_nodes.map do |node|
               V1::Models::Choices::LogicalIdentifierChoice.new(node, self)

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

@@ -27,7 +27,7 @@ module Qti
           end
 
           def canvas_multiple_fib?
-            BaseInteraction.canvas_multiple_fib?(@node)
+            @canvas_multiple_fib ||= BaseInteraction.canvas_multiple_fib?(@node)
           end
 
           def stem_items
@@ -50,7 +50,7 @@ module Qti
           end
 
           def single_fill_in_blank?
-            blanks.count == 1
+            !canvas_multiple_fib? && blanks.count == 1
           end
 
           def blanks

data/lib/qti/version.rb

@@ -1,3 +1,3 @@
 module Qti
-  VERSION = '1.0.7'.freeze
+  VERSION = '1.0.8'.freeze
 end

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

@@ -0,0 +1,49 @@
+<?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 ident="i244ba14e56b64f3df2a0fc8becc49966" title="Question">
+    <itemmetadata>
+      <qtimetadata>
+        <qtimetadatafield>
+          <fieldlabel>question_type</fieldlabel>
+          <fieldentry>fill_in_multiple_blanks_question</fieldentry>
+        </qtimetadatafield>
+        <qtimetadatafield>
+          <fieldlabel>points_possible</fieldlabel>
+          <fieldentry>1.0</fieldentry>
+        </qtimetadatafield>
+        <qtimetadatafield>
+          <fieldlabel>assessment_question_identifierref</fieldlabel>
+          <fieldentry>i66da2dd13053deb08f20ed05ac1c74c8</fieldentry>
+        </qtimetadatafield>
+      </qtimetadata>
+    </itemmetadata>
+    <presentation>
+      <material>
+        <mattext texttype="text/html">&lt;div&gt;&lt;p&gt;Bird, bird, bird, bird is the [word]&lt;/p&gt;&lt;/div&gt;</mattext>
+      </material>
+      <response_lid ident="response_word">
+        <material>
+          <mattext>word</mattext>
+        </material>
+        <render_choice>
+          <response_label ident="3537">
+            <material>
+              <mattext texttype="text/plain">word</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="response_word">3537</varequal>
+        </conditionvar>
+        <setvar varname="SCORE" action="Add">100.00</setvar>
+      </respcondition>
+    </resprocessing>
+  </item>
+</questestinterop>

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

@@ -154,4 +154,63 @@ describe Qti::V1::Models::Interactions::FillBlankInteraction do
       expect(subject.scoring_data_structs.first.case).to eq 'no'
     end
   end
+
+  context 'fib_str.xml' do
+    let(:file_path) { File.join(fixtures_path, 'fib_str.xml') }
+    let(:shuffle_value) { false }
+    let(:scoring_data_ids) { %w[FIB01 FIB02 FIB03] }
+    let(:scoring_data_values) { %w[Winter Summer York] }
+    let(:scoring_data_case) { %w[Yes Yes Yes] }
+    let(:answer_count) { 3 }
+    let(:expected_blanks) { [{ id: 'FIB01' }, { id: 'FIB02' }, { id: 'FIB03' }] }
+    let(:expected_stem_items) do
+      [
+        { id: 'stem_0', position: 1, type: 'text', value: 'Fill-in-the blanks in this text from Richard III: ' },
+        { id: 'stem_1', position: 2, type: 'text', value: 'Now is the ' },
+        { id: 'stem_2', position: 3, type: 'blank', blank_id: 'FIB01' },
+        { id: 'stem_3', position: 4, type: 'text', value: ' of our discontent made glorious ' },
+        { id: 'stem_4', position: 5, type: 'blank', blank_id: 'FIB02' },
+        { id: 'stem_5', position: 6, type: 'text', value: ' by these sons of ' },
+        { id: 'stem_6', position: 7, type: 'blank', blank_id: 'FIB03' }
+      ]
+    end
+
+    include_examples 'shuffled?'
+    include_examples 'answers'
+    include_examples 'scoring_data_structs'
+    include_examples 'blanks'
+    include_examples 'stem_items'
+
+    it 'returns false for #single_fill_in_blank?' do
+      expect(loaded_class.single_fill_in_blank?).to eq false
+    end
+  end
+
+  context 'canvas multiple fill in the blank questions with a single blank' do
+    let(:file_path) { File.join(fixtures_path, 'canvas_multiple_fib_as_single.xml') }
+    let(:shuffle_value) { false }
+    let(:scoring_data_ids) { %w[3537] }
+    let(:scoring_data_values) { %w[word] }
+    let(:scoring_data_case) { %w[no] }
+    let(:answer_count) { 1 }
+    let(:expected_blanks) { [{ id: '3537' }] }
+    let(:expected_stem_items) do
+      [
+        { id: 'stem_0', position: 1, type: 'text', value: '<div><p>Bird, bird, bird, bird is the ' },
+        { id: 'stem_1', position: 2, type: 'blank', blank_id: 'response_word' },
+        { id: 'stem_2', position: 3, type: 'text', value: '</p></div>' }
+      ]
+    end
+
+    include_examples 'shuffled?'
+    include_examples 'answers'
+    include_examples 'scoring_data_structs'
+    include_examples 'blanks'
+    include_examples 'stem_items'
+
+    it 'returns false for #single_fill_in_blank?' do
+      puts "LOADED CLASS: #{loaded_class}"
+      expect(loaded_class.single_fill_in_blank?).to eq false
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qti
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Hannah Bottalla
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -358,6 +358,7 @@ files:
 - spec/fixtures/items_1.2/canvas_multiple_dropdown.xml
 - spec/fixtures/items_1.2/canvas_multiple_dropdowns.xml
 - spec/fixtures/items_1.2/canvas_multiple_fib.xml
+- spec/fixtures/items_1.2/canvas_multiple_fib_as_single.xml
 - spec/fixtures/items_1.2/choice.xml
 - spec/fixtures/items_1.2/essay.xml
 - spec/fixtures/items_1.2/fib.xml
@@ -691,6 +692,7 @@ test_files:
 - spec/fixtures/items_1.2/canvas_multiple_dropdown.xml
 - spec/fixtures/items_1.2/canvas_multiple_dropdowns.xml
 - spec/fixtures/items_1.2/canvas_multiple_fib.xml
+- spec/fixtures/items_1.2/canvas_multiple_fib_as_single.xml
 - spec/fixtures/items_1.2/choice.xml
 - spec/fixtures/items_1.2/essay.xml
 - spec/fixtures/items_1.2/fib.xml