qti 2.14.0 → 2.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce025f977e8afee917a58d479c15bc56fc7320596b1bfb0c28da5e94ad19602a
-  data.tar.gz: 642c6b5ba04eb180d5ff363d4aec28bdfc1807cb27fc8d8e99ab0d4b78c36ad0
+  metadata.gz: 8cf47da54509068528926ad9f4ef3275d70206130a19e13cd5f28f113a5f0f8c
+  data.tar.gz: 9b61ac2909cbf749e759c85f83fc340c51342caddceece2f806b3316f661845c
 SHA512:
-  metadata.gz: c96870e3a861ce1e635a5a2f09a8be85820528cc703303bdea362468c0107704be4cf87e425ed4f11d892e3db3453450d4058c5d102442e43c5caa71f3b21b4a
-  data.tar.gz: d0eac68354d0ffeeae4b1098e90bded2907462f0671ec21377de1d0fa596695fb4ae417f3f6770909c23edf108634f050b1452700b0324fd305833aedb536997
+  metadata.gz: 23ad71858fb02cc517255ae56613d606c8385a1b057b9fdac99381ac767ef8ca883e65a3d12a1d3e61b12289499addd91edd366b7364778cfe9b8914615475f5
+  data.tar.gz: 97b98fc845357d06405d8882140e59c79cd18e58522bfa11411b78649577e808620b693118dd91cfec141371525000a9fbf16a7aa4765309034a9cf116bce594

data/lib/qti/sanitizer.rb

@@ -40,7 +40,7 @@ module Qti
             'object' => MEDIA_ATTR,
             'embed' => %w[name src type allowfullscreen pluginspage wmode
                           allowscriptaccess width height],
-            'iframe' => %w[src width height name align frameborder scrolling sandbox
+            'iframe' => %w[src style width height name align frameborder scrolling sandbox
                            allowfullscreen webkitallowfullscreen mozallowfullscreen
                            allow] + ALL_DATA_ATTR, # TODO: remove explicit allow with domain whitelist account setting
             'a' => relaxed_config('a', ['target'] + ALL_DATA_ATTR),
@@ -92,7 +92,7 @@ module Qti
       lambda do |env|
         return unless FILTER_TAGS.include?(env[:node_name])
         return if env[:is_whitelisted] || !env[:node].element?
-        Sanitize.node!(env[:node], CONFIG)
+        Sanitize.node!(env[:node], Sanitize::Config.merge(Sanitize::Config::RELAXED, CONFIG))
         { node_whitelist: [env[:node]] }
       end
     end

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

@@ -63,6 +63,27 @@ module Qti
           end
         end
 
+        def parent_stimulus_item_ident_metadata?
+          if @doc.at_xpath('.//xmlns:qtimetadata').present?
+            qti_metadata_children.children.find do |node|
+              node.text == 'parent_stimulus_item_ident'
+            end.present?
+          else
+            false
+          end
+        end
+
+        def parent_stimulus_item_ident
+          @parent_stimulus_item_ident ||= begin
+            if parent_stimulus_item_ident_metadata?
+              parent_stimulus_item_ident_label = qti_metadata_children.children.find do |node|
+                node.text == 'parent_stimulus_item_ident'
+              end
+              parent_stimulus_item_ident_label.next.text
+            end
+          end
+        end
+
         def decvar_maxvalue
           @doc.at_xpath('.//xmlns:decvar/@maxvalue')&.value&.to_i ||
             @doc.at_xpath('.//xmlns:decvar/@defaultval')&.value&.to_i || 0

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

@@ -14,6 +14,10 @@ module Qti
           @title ||= @node.attributes['title']&.value
         end
 
+        def instructions
+          @instructions ||= @node.attributes['instructions']&.value
+        end
+
         def body
           @body ||= begin
             presentation = @node.at_xpath('.//xmlns:presentation')
@@ -25,6 +29,38 @@ module Qti
         def stimulus_type
           'text'
         end
+
+        def qti_metadata_children
+          @node.at_xpath('.//xmlns:qtimetadata')&.children
+        end
+
+        def source_url_qti_metadata?
+          if @node.at_xpath('.//xmlns:qtimetadata').present?
+            source_url_label = qti_metadata_children.children.find { |node| node.text == 'source_url' }
+            source_url_label.present?
+          else
+            false
+          end
+        end
+
+        def source_url
+          @source_url ||= begin
+            if source_url_qti_metadata?
+              source_url_label = qti_metadata_children.children.find do |node|
+                node.text == 'source_url'
+              end
+              source_url_label&.next&.text
+            end
+          end
+        end
+
+        def orientation
+          @orientation ||= begin
+            presentation = @node.at_xpath('.//xmlns:presentation')
+            return 'left' if presentation.blank?
+            presentation.at_xpath('.//xmlns:material')&.attributes&.[]('orientation')&.value || 'left'
+          end
+        end
       end
     end
   end

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

@@ -31,6 +31,10 @@ module Qti
           end
         end
 
+        def parent_stimulus_item_ident
+          nil
+        end
+
         def interaction_model
           @interaction_model ||= begin
             V2::Models::Interactions.interaction_model(@doc, self)

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

@@ -25,6 +25,18 @@ module Qti
         def stimulus_type
           'text'
         end
+
+        def instructions
+          nil
+        end
+
+        def source_url
+          nil
+        end
+
+        def orientation
+          'left'
+        end
       end
     end
   end

data/lib/qti/version.rb

@@ -1,3 +1,3 @@
 module Qti
-  VERSION = '2.14.0'.freeze
+  VERSION = '2.15.2'.freeze
 end

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

@@ -0,0 +1,44 @@
+<?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">
+  <assessment ident="i1e5e0d6fba7342e63ae43afe9863070d" title="Quiz.text">
+    <qtimetadata>
+      <qtimetadatafield>
+        <fieldlabel>cc_maxattempts</fieldlabel>
+        <fieldentry>1</fieldentry>
+      </qtimetadatafield>
+    </qtimetadata>
+    <section ident="root_section">
+      <item ident="d74b47a4abeeed159e030bfecbcecea2" title="some title" instructions="some instructions">
+        <itemmetadata>
+          <qtimetadata>
+            <qtimetadatafield>
+              <fieldlabel>question_type</fieldlabel>
+              <fieldentry>text_only_question</fieldentry>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>points_possible</fieldlabel>
+              <fieldentry>0.0</fieldentry>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>original_answer_ids</fieldlabel>
+              <fieldentry/>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>assessment_question_identifierref</fieldlabel>
+              <fieldentry>9f47365e112840d80a79a960b1b0b6a7</fieldentry>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>source_url</fieldlabel>
+              <fieldentry>https://sourceurl.com</fieldentry>
+            </qtimetadatafield>
+          </qtimetadata>
+        </itemmetadata>
+        <presentation>
+          <material orientation="top">
+            <mattext texttype="text/html">&lt;p&gt;stimulus content&lt;/p&gt;</mattext>
+          </material>
+        </presentation>
+      </item>
+    </section>
+  </assessment>
+</questestinterop>

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

@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<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 ident="7f805e79bec484e9075115f05b2042fa" title="nq q with stimulus with attached question">
+    <qtimetadata>
+      <qtimetadatafield>
+        <fieldlabel>cc_maxattempts</fieldlabel>
+        <fieldentry>1</fieldentry>
+      </qtimetadatafield>
+    </qtimetadata>
+    <section ident="root_section">
+      <item ident="6e2618d0f5e795a363f1eefec748fb68" title="stimulus title" instructions="some instructions">
+        <itemmetadata>
+          <qtimetadata>
+            <qtimetadatafield>
+              <fieldlabel>question_type</fieldlabel>
+              <fieldentry>text_only_question</fieldentry>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>points_possible</fieldlabel>
+              <fieldentry>0.0</fieldentry>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>original_answer_ids</fieldlabel>
+              <fieldentry/>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>assessment_question_identifierref</fieldlabel>
+              <fieldentry>8efb1df4dc2fb1048a7f349a3165f28d</fieldentry>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>source_url</fieldlabel>
+              <fieldentry>https://sourceurl.com</fieldentry>
+            </qtimetadatafield>
+          </qtimetadata>
+        </itemmetadata>
+        <presentation>
+          <material orientation="top">
+            <mattext texttype="text/html">&lt;p&gt;some content&lt;/p&gt;</mattext>
+          </material>
+        </presentation>
+      </item>
+      <item ident="bace7f0cffb532a21d2de194c68edeac" title="Child multiple choice question">
+        <itemmetadata>
+          <qtimetadata>
+            <qtimetadatafield>
+              <fieldlabel>question_type</fieldlabel>
+              <fieldentry>multiple_choice_question</fieldentry>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>points_possible</fieldlabel>
+              <fieldentry>1.0</fieldentry>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>original_answer_ids</fieldlabel>
+              <fieldentry>210e9a21-bf55-4472-97d7-1ddb973f4cea,ada66409-0d31-4e5f-b67b-8e33f66c8299,3b6679be-071a-46ca-a79f-6e019cd65af7,3a4658ed-c0ad-40cd-b8d8-627f87f9bcf0</fieldentry>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>assessment_question_identifierref</fieldlabel>
+              <fieldentry>5d040aba22c641e4c3ff7480aed7b1e2</fieldentry>
+            </qtimetadatafield>
+            <qtimetadatafield>
+              <fieldlabel>parent_stimulus_item_ident</fieldlabel>
+              <fieldentry>6e2618d0f5e795a363f1eefec748fb68</fieldentry>
+            </qtimetadatafield>
+          </qtimetadata>
+        </itemmetadata>
+        <presentation>
+          <material>
+            <mattext texttype="text/html">&lt;p&gt;the answer is letter A&lt;/p&gt;</mattext>
+          </material>
+          <response_lid ident="response1" rcardinality="Single">
+            <render_choice>
+              <response_label ident="210e9a21-bf55-4472-97d7-1ddb973f4cea">
+                <material>
+                  <mattext texttype="text/html">&lt;p&gt;A&lt;/p&gt;</mattext>
+                </material>
+              </response_label>
+              <response_label ident="ada66409-0d31-4e5f-b67b-8e33f66c8299">
+                <material>
+                  <mattext texttype="text/html">&lt;p&gt;B&lt;/p&gt;</mattext>
+                </material>
+              </response_label>
+              <response_label ident="3b6679be-071a-46ca-a79f-6e019cd65af7">
+                <material>
+                  <mattext texttype="text/html">&lt;p&gt;C&lt;/p&gt;</mattext>
+                </material>
+              </response_label>
+              <response_label ident="3a4658ed-c0ad-40cd-b8d8-627f87f9bcf0">
+                <material>
+                  <mattext texttype="text/html">&lt;p&gt;D&lt;/p&gt;</mattext>
+                </material>
+              </response_label>
+            </render_choice>
+          </response_lid>
+        </presentation>
+        <resprocessing>
+          <outcomes>
+            <decvar maxvalue="100" minvalue="0" varname="SCORE" vartype="Decimal"/>
+          </outcomes>
+          <respcondition continue="No">
+            <conditionvar>
+              <varequal respident="response1">210e9a21-bf55-4472-97d7-1ddb973f4cea</varequal>
+            </conditionvar>
+            <setvar action="Set" varname="SCORE">100</setvar>
+          </respcondition>
+        </resprocessing>
+      </item>
+    </section>
+  </assessment>
+</questestinterop>

data/spec/lib/qti/sanitizer_spec.rb

@@ -54,5 +54,14 @@ describe Qti::Sanitizer do
 
       expect(sanitizer.clean(html)).to include 'target="_blank"'
     end
+
+    it 'allows style attributes on iframe' do
+      html = '<iframe style="width: 523px; height: 294px; display: inline-block;"></iframe>'
+
+      expect(sanitizer.clean(html)).to include 'style'
+      expect(sanitizer.clean(html)).to include 'width: 523px;'
+      expect(sanitizer.clean(html)).to include 'height: 294px;'
+      expect(sanitizer.clean(html)).to include 'display: inline-block;'
+    end
   end
 end

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

@@ -93,6 +93,28 @@ describe Qti::V1::Models::AssessmentItem do
       end
     end
 
+    describe '#parent_stimulus_item_ident' do
+      let(:file_path) { File.join('spec', 'fixtures', 'items_1.2', 'stimulus_with_child_item.xml') }
+      let(:test_object) { Qti::V1::Models::Assessment.from_path!(file_path) }
+      let(:assessment_item_refs) { test_object.assessment_items }
+
+      context 'when it does not contain parent_stimulus_item_ident metadata' do
+        let(:loaded_class) { described_class.new(assessment_item_refs[0]) }
+
+        it 'returns nil' do
+          expect(loaded_class.parent_stimulus_item_ident).to be_nil
+        end
+      end
+
+      context 'when it contains parent_stimulus_item_ident metadata' do
+        let(:loaded_class) { described_class.new(assessment_item_refs[1]) }
+
+        it 'returns the parent_stimulus_item_ident value' do
+          expect(loaded_class.parent_stimulus_item_ident).to eq '6e2618d0f5e795a363f1eefec748fb68'
+        end
+      end
+    end
+
     describe '#scoring_data_structs' do
       it 'grabs the rcardinality and scoring data value' do
         struct = loaded_class.send(:scoring_data_structs)

data/spec/lib/qti/v1/models/stimulus_item_spec.rb

@@ -50,4 +50,36 @@ describe Qti::V1::Models::StimulusItem do
   it 'returns correct stimulus_type' do
     expect(loaded_class.stimulus_type).to eq('text')
   end
+
+  context 'when the stimulus item was generated by New Quizzes' do
+    let(:file_path) { File.join('spec', 'fixtures', 'items_1.2', 'stimulus.xml') }
+    let(:test_object) { Qti::V1::Models::Assessment.from_path!(file_path) }
+    let(:stimulus_item) { test_object.create_stimulus(test_object.assessment_items.first) }
+
+    {
+      source_url: 'https://sourceurl.com',
+      instructions: 'some instructions',
+      orientation: 'top'
+    }.each do |key, value|
+      it "returns the correct #{key}" do
+        expect(stimulus_item.send(key)).to eq(value)
+      end
+    end
+  end
+
+  context 'when the stimulus item was not generated by New Quizzes' do
+    let(:file_path) { File.join('spec', 'fixtures', 'items_1.2', 'text.no.question.xml') }
+    let(:test_object) { Qti::V1::Models::Assessment.from_path!(file_path) }
+    let(:stimulus_item) { test_object.create_stimulus(test_object.assessment_items.first) }
+
+    {
+      source_url: nil,
+      instructions: nil,
+      orientation: 'left'
+    }.each do |key, value|
+      it "returns the correct #{key}" do
+        expect(stimulus_item.send(key)).to eq(value)
+      end
+    end
+  end
 end

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

@@ -28,6 +28,10 @@ describe Qti::V2::Models::AssessmentItem do
       expect(loaded_class.points_possible).to eq nil
     end
 
+    it 'falls back to nil parent_stimulus_item_ident value' do
+      expect(loaded_class.parent_stimulus_item_ident).to eq nil
+    end
+
     it 'grabs the type and scoring data value' do
       struct = loaded_class.send(:scoring_data_structs)
       expect(struct.first.values).to eq 'ChoiceA'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qti
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.2
 platform: ruby
 authors:
 - Adrian Diaz
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -417,6 +417,8 @@ files:
 - spec/fixtures/items_1.2/ordering.xml
 - spec/fixtures/items_1.2/question_group.xml
 - spec/fixtures/items_1.2/single_fib.xml
+- spec/fixtures/items_1.2/stimulus.xml
+- spec/fixtures/items_1.2/stimulus_with_child_item.xml
 - spec/fixtures/items_1.2/text.no.question.xml
 - spec/fixtures/items_1.2/true_false.xml
 - spec/fixtures/items_1.2/upload.xml
@@ -726,7 +728,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: QTI 1.2 and 2.1 import and export models
@@ -775,6 +777,8 @@ test_files:
 - spec/fixtures/items_1.2/ordering.xml
 - spec/fixtures/items_1.2/question_group.xml
 - spec/fixtures/items_1.2/single_fib.xml
+- spec/fixtures/items_1.2/stimulus.xml
+- spec/fixtures/items_1.2/stimulus_with_child_item.xml
 - spec/fixtures/items_1.2/text.no.question.xml
 - spec/fixtures/items_1.2/true_false.xml
 - spec/fixtures/items_1.2/upload.xml