qti 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e8424c7b1aa08d8050b0ed6fb82a8bfee2e7273
-  data.tar.gz: 3c2364dbb089fe7d93ba4f371694f022c09aa483
+  metadata.gz: 7543c5147bd92cd202829811e0f16d1c886ed2e5
+  data.tar.gz: c7c3d6d77a201a55d2dfaf4c04d01aa555e70bfa
 SHA512:
-  metadata.gz: 47aa300244b6eb1b7bb9da7a195d14a5d504116806afdd7ef2272d764b2069446e4940df10f853954e5349b1438b4028458353aa75c868a13ffbe378d2159af5
-  data.tar.gz: efb24fab172368a48d0e52a6e8375cd7961e476b054382819b90a89df3fbf8ab6f83f1853b85cd9f89f0adb0acaa41d3e0082543556210fe8f9cdd61e134577f
+  metadata.gz: 8b64ab839a19673eba4f2400a704a613abc8bb2ab9c6dead2b2f0780eb974916133a55c2d5171ab6af0e9540612af6f759922404ca9a12ad39fe4966deddd638
+  data.tar.gz: 372e4dc9624c533bb6566944cfb676b6a463d67fdef2bdb3649639e01d6ae1d99da4369c55dc66b45cb63c5ec8317b9f441ca698ae27893e6919bb312052c76d

data/lib/qti/models/base.rb

@@ -23,6 +23,14 @@ module Qti
         Sanitize.fragment(html, sanitize_config)
       end
 
+      def object_tag_transformer
+        lambda do |env|
+          return unless env[:node_name] == 'object'
+          return if env[:is_whitelisted] || !env[:node].element?
+          replace_object_node(env[:node])
+        end
+      end
+
       def remap_unknown_tags_transformer
         lambda do |env|
           node_name = env[:node_name]
@@ -37,8 +45,11 @@ module Qti
         end
       end
 
-      def sanitize_config
-        Sanitize::Config::RELAXED.merge transformers: remap_unknown_tags_transformer
+      def sanitize_config(import_objects: true)
+        transformers = []
+        transformers << object_tag_transformer if import_objects
+        transformers << remap_unknown_tags_transformer
+        Sanitize::Config::RELAXED.merge transformers: transformers
       end
 
       def self.from_path!(path, package_root = nil)
@@ -90,6 +101,42 @@ module Qti
         return unless @package_root
         @package_root = Pathname.new(@package_root).cleanpath.to_s + '/'
       end
+
+      def set_paths_from_item(other_item)
+        @package_root = other_item.package_root
+        @path = other_item.path
+      end
+
+      def replace_object_node(node)
+        path = remap_href_path(node[:data])
+        if path
+          case node[:type]
+          when /^image\//
+            return replace_with_image(node, node[:data])
+          when "text/html"
+            return replace_with_html(node, path)
+          end
+        end
+        # remove unrecognized or invalid objects from the sanitized document
+        node.unlink
+      end
+
+      def replace_with_image(node, src)
+        node.name = 'img'
+        node[:src] = src
+      end
+
+      def replace_with_html(node, path)
+        begin
+          content = File.read(path)
+          html_content = Sanitize.fragment(content, sanitize_config(import_objects: false))
+          node.name = 'div'
+          node.add_child(Nokogiri::HTML.fragment(html_content))
+        rescue StandardError => e
+          warn "failed to import html object #{path}: #{e.message}"
+          node.unlink
+        end
+      end
     end
   end
 end

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

@@ -17,7 +17,7 @@ module Qti
           @item_body ||= begin
             node = @doc.dup
             presentation = node.at_xpath('.//xmlns:presentation')
-            prompt = presentation.at_xpath('.//xmlns:mattext').content
+            prompt = presentation.at_xpath('.//xmlns:mattext').to_html
             sanitize_content!(prompt)
           end
         end
@@ -65,7 +65,7 @@ module Qti
 
         def interaction_model
           @interaction_model ||= begin
-            V1::Models::Interactions.interaction_model(@doc)
+            V1::Models::Interactions.interaction_model(@doc, self)
           end
         end
 

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

@@ -5,8 +5,9 @@ module Qti
     module Models
       module Choices
         class FillBlankChoice < Qti::V1::Models::Base
-          def initialize(node)
+          def initialize(node, parent)
             @node = node
+            set_paths_from_item(parent)
           end
 
           def identifier
@@ -17,7 +18,7 @@ module Qti
           def item_body
             @item_body ||= begin
               node = @node.dup
-              sanitize_content!(node.content.squish)
+              sanitize_content!(node.to_html)
             end
           end
         end

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

@@ -5,8 +5,9 @@ module Qti
     module Models
       module Choices
         class LogicalIdentifierChoice < Qti::V1::Models::Base
-          def initialize(node)
+          def initialize(node, parent)
             @node = node
+            set_paths_from_item(parent)
           end
 
           def identifier
@@ -16,7 +17,7 @@ module Qti
           def item_body
             @item_body ||= begin
               node = @node.dup
-              sanitize_content!(node.content.strip.gsub(/\s+/, ' '))
+              sanitize_content!(node.to_html)
             end
           end
         end

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

@@ -5,12 +5,13 @@ module Qti
         class BaseInteraction < Qti::V1::Models::Base
           attr_reader :node
 
-          def self.matches(node)
+          def self.matches(node, parent)
             false
           end
 
-          def initialize(node)
+          def initialize(node, parent)
             @node = node
+            set_paths_from_item(parent)
           end
 
           def shuffled?

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

@@ -4,21 +4,17 @@ module Qti
       module Interactions
         class ChoiceInteraction < BaseInteraction
           # This will know if a class matches
-          def self.matches(node)
+          def self.matches(node, parent)
             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
+            new(node, parent)
           end
 
           def answers
             @answers ||= answer_nodes.map do |node|
-              V1::Models::Choices::LogicalIdentifierChoice.new(node)
+              V1::Models::Choices::LogicalIdentifierChoice.new(node, self)
             end
           end
 

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

@@ -4,15 +4,11 @@ module Qti
       module Interactions
         class FillBlankInteraction < BaseInteraction
           # This will know if a class matches
-          def self.matches(node)
+          def self.matches(node, parent)
             return false if node.xpath('.//xmlns:other').present?
             matches = node.xpath('.//xmlns:render_fib')
             return false if matches.empty?
-            new(node)
-          end
-
-          def initialize(node)
-            @node = node
+            new(node, parent)
           end
 
           def stem_items
@@ -44,7 +40,7 @@ module Qti
 
           def answers
             @answers ||= answer_nodes.map do |node|
-              V1::Models::Choices::FillBlankChoice.new(node)
+              V1::Models::Choices::FillBlankChoice.new(node, self)
             end
           end
 

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

@@ -3,21 +3,21 @@ module Qti
     module Models
       module Interactions
         class MatchInteraction < BaseInteraction
-          def self.matches(node)
+          def self.matches(node, parent)
             matches = node.xpath('.//xmlns:response_lid')
             return false if matches.count <= 1
-            new(node)
+            new(node, parent)
           end
 
           def answers
             @answers ||= answer_nodes.map do |node|
-              V1::Models::Choices::LogicalIdentifierChoice.new(node)
+              V1::Models::Choices::LogicalIdentifierChoice.new(node, self)
             end
           end
 
           def questions
             node.xpath('.//xmlns:response_lid').map do |lid_node|
-              item_body = sanitize_content!(lid_node.at_xpath('.//xmlns:mattext').text)
+              item_body = sanitize_content!(lid_node.at_xpath('.//xmlns:mattext').to_html)
               { id: lid_node.attributes['ident'].value, itemBody: item_body }
             end
           end

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

@@ -4,12 +4,12 @@ module Qti
       module Interactions
         class OrderingInteraction < ChoiceInteraction
           # This will know if a class matches
-          def self.matches(node)
+          def self.matches(node, parent)
             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)
+            new(node, parent)
           end
 
           def scoring_data_structs

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

@@ -4,15 +4,11 @@ module Qti
       module Interactions
         class StringInteraction < BaseInteraction
           # This will know if a class matches
-          def self.matches(node)
+          def self.matches(node, parent)
             return false unless node.xpath('.//xmlns:other').present?
             matches = node.xpath('.//xmlns:render_fib')
             return false if matches.empty?
-            new(matches.first)
-          end
-
-          def initialize(node)
-            @node = node
+            new(matches.first, parent)
           end
 
           private

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

@@ -6,12 +6,12 @@ module Qti
     module Models
       module Interactions
         # This one finds the correct parsing model based on the provided xml node
-        def self.interaction_model(node)
+        def self.interaction_model(node, parent)
           subclasses = constants.map { |c| const_get(c) }
 
           # Check for matches
           matches = subclasses.each_with_object([]) do |interaction_class, result|
-            match = interaction_class.matches(node)
+            match = interaction_class.matches(node, parent)
             result << match if match
           end
           raise UnsupportedSchema if matches.size != 1

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

@@ -39,7 +39,7 @@ module Qti
 
         def interaction_model
           @interaction_model ||= begin
-            V2::Models::Interactions.interaction_model(@doc)
+            V2::Models::Interactions.interaction_model(@doc, self)
           end
         end
 

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

@@ -6,8 +6,9 @@ module Qti
       module Choices
         class GapMatchChoice < Qti::V2::Models::Base
           PROHIBITED_NODE_NAMES = 'feedbackInline'.freeze
-          def initialize(node)
+          def initialize(node, parent)
             @node = node
+            set_paths_from_item(parent)
           end
 
           def identifier
@@ -18,7 +19,7 @@ module Qti
             @item_body ||= begin
               node = @node.dup
               node.children.filter(PROHIBITED_NODE_NAMES).each(&:unlink)
-              sanitize_content!(node.content.strip.gsub(/\s+/, ' '))
+              sanitize_content!(node.to_html)
             end
           end
         end

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

@@ -7,8 +7,9 @@ module Qti
         class SimpleChoice < Qti::V2::Models::Base
           PROHIBITED_NODE_NAMES = %w(feedbackInline).join(',').freeze
 
-          def initialize(node)
+          def initialize(node, parent)
             @node = node
+            set_paths_from_item(parent)
           end
 
           def identifier
@@ -19,7 +20,7 @@ module Qti
             @item_body ||= begin
               node = @node.dup
               node.children.filter(PROHIBITED_NODE_NAMES).map(&:unlink)
-              sanitize_content!(node.content.strip.gsub(/\s+/, ' '))
+              sanitize_content!(node.to_html)
             end
           end
         end

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

@@ -9,8 +9,9 @@ module Qti
             false
           end
 
-          def initialize(node)
+          def initialize(node, parent)
             @node = node
+            set_paths_from_item(parent)
           end
 
           def shuffled?

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

@@ -5,9 +5,9 @@ module Qti
     module Models
       module Interactions
         class CategorizationInteraction < MatchInteraction
-          def self.matches(node)
+          def self.matches(node, parent)
             if use_match_interaction_implementation?(node)
-              new(node, MatchItemTagProcessors::MatchInteractionTagProcessor)
+              new(node, parent, MatchItemTagProcessors::MatchInteractionTagProcessor)
             else
               false
             end

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

@@ -3,17 +3,17 @@ module Qti
     module Models
       module Interactions
         class ChoiceInteraction < BaseInteraction
-          def self.matches(node)
+          def self.matches(node, parent)
             matches = node.xpath('.//xmlns:choiceInteraction')
             return false if matches.empty?
 
             raise Qti::UnsupportedSchema if matches.size > 1
-            new(matches.first)
+            new(matches.first, parent)
           end
 
           def answers
             @answers ||= answer_nodes.map do |node|
-              V2::Models::Choices::SimpleChoice.new(node)
+              V2::Models::Choices::SimpleChoice.new(node, self)
             end
           end
 

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

@@ -4,12 +4,12 @@ module Qti
       module Interactions
         class ExtendedTextInteraction < BaseInteraction
           # This will know if a class matches
-          def self.matches(node)
+          def self.matches(node, parent)
             matches = node.xpath('.//xmlns:extendedTextInteraction')
             return false if matches.empty?
 
             raise Qti::UnsupportedSchema if matches.size > 1
-            new(matches.first)
+            new(matches.first, parent)
           end
 
           # not used yet

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

@@ -3,14 +3,10 @@ module Qti
     module Models
       module Interactions
         class GapMatchInteraction < BaseInteraction
-          def self.matches(node)
+          def self.matches(node, parent)
             matches = node.xpath('.//xmlns:gapMatchInteraction')
             return false if matches.count != 1
-            new(node)
-          end
-
-          def initialize(node)
-            @node = node
+            new(node, parent)
           end
 
           def shuffled?
@@ -86,7 +82,7 @@ module Qti
 
           def answers
             @answers ||= answer_nodes.map do |node|
-              V2::Models::Choices::GapMatchChoice.new(node)
+              V2::Models::Choices::GapMatchChoice.new(node, self)
             end
           end
 

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

@@ -10,9 +10,9 @@ module Qti
 
           attr_reader :implementation
 
-          def initialize(node, implementation)
-            super(node)
-            @implementation = implementation.new(node)
+          def initialize(node, parent, implementation)
+            super(node, parent)
+            @implementation = implementation.new(node, parent)
           end
 
           def_delegators :@implementation, :answers, :questions, :shuffled?
@@ -21,7 +21,7 @@ module Qti
             implementation.scoring_data_structs
           end
 
-          def self.matches(node)
+          def self.matches(node, parent)
             implementation =
               if use_associate_interaction_implementation?(node)
                 MatchItemTagProcessors::AssociateInteractionTagProcessor
@@ -30,7 +30,7 @@ module Qti
               end
 
             return false unless implementation.present?
-            new(node, implementation)
+            new(node, parent, implementation)
           end
 
           def self.use_associate_interaction_implementation?(node)

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

@@ -28,7 +28,7 @@ module Qti
             end
 
             def answers
-              answer_nodes.map { |node| Choices::SimpleAssociableChoice.new(node) }
+              answer_nodes.map { |node| Choices::SimpleAssociableChoice.new(node, self) }
             end
 
             def scoring_data_structs

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

@@ -24,7 +24,7 @@ module Qti
             end
 
             def answers
-              answer_nodes.map { |node| Choices::SimpleAssociableChoice.new(node) }
+              answer_nodes.map { |node| Choices::SimpleAssociableChoice.new(node, self) }
             end
 
             def scoring_data_structs

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

@@ -5,10 +5,10 @@ module Qti
     module Models
       module Interactions
         class OrderingInteraction < ChoiceInteraction
-          def self.matches(node)
+          def self.matches(node, parent)
             match = node.at_xpath('.//xmlns:orderInteraction')
             return false unless match.present?
-            new(node)
+            new(node, parent)
           end
 
           def shuffled?

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

@@ -4,12 +4,12 @@ module Qti
       module Interactions
         class ShortTextInteraction < BaseInteraction
           # This will know if a class matches
-          def self.matches(node)
+          def self.matches(node, parent)
             matches = node.xpath('.//xmlns:textEntryInteraction')
             return false if matches.empty?
 
             raise Qti::UnsupportedSchema if matches.size > 1
-            new(matches.first)
+            new(matches.first, parent)
           end
         end
       end

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

@@ -6,10 +6,10 @@ module Qti
     module Models
       module Interactions
         # This one finds the correct parsing model based on the provided xml node
-        def self.interaction_model(node)
+        def self.interaction_model(node, parent)
           # Check for matches
           matches = subclasses.each_with_object([]) do |interaction_class, result|
-            match = interaction_class.matches(node)
+            match = interaction_class.matches(node, parent)
             result << match if match
           end
 

data/spec/fixtures/no_assessment_XML/59ee7c9d-e6cc-4d0c-b545-258e20b1a244.html

@@ -0,0 +1,5 @@
+<p>Listen to the musical example. &nbsp;</p> 
+<p><a shape="rect" href="objects/83+Track+83.mp3">83Track83.mp3</a></p> 
+<p>Which written notation matches what is heard?&nbsp;&nbsp;&nbsp;</p> 
+<p></p> 
+<p>&nbsp;</p>

data/spec/fixtures/no_assessment_XML/59ee7c9d-e6cc-4d0c-b545-258e20b1a244.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assessmentItem adaptive="false" identifier="choice" timeDependent="false" title="02-1303010-00046" 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_v2p1.xsd">
+  <responseDeclaration baseType="identifier" cardinality="single" identifier="RESPONSE">
+    <correctResponse>
+      <value>A</value>
+    </correctResponse>
+  </responseDeclaration>
+  <outcomeDeclaration baseType="identifier" cardinality="single" identifier="FEEDBACK" normalMaximum="1">
+    <defaultValue>
+      <value>1</value>
+    </defaultValue>
+  </outcomeDeclaration>
+  <itemBody>
+    <div>
+      <object data="59ee7c9d-e6cc-4d0c-b545-258e20b1a244.html" type="text/html"/>
+    </div>
+    <choiceInteraction maxChoices="1" responseIdentifier="RESPONSE" shuffle="false">
+      <simpleChoice identifier="A">
+        <object data="59ee7c9d-e6cc-4d0c-b545-258e20b1a244_choice_A.html" type="text/html"/>
+        <feedbackInline identifier="A" outcomeIdentifier="FEEDBACK" showHide="show">Key - This is the correct answer because the pitches in this answer are exactly what was played on the stem audio.</feedbackInline>
+      </simpleChoice>
+      <simpleChoice identifier="B">
+        <object data="some_image.jpg" type="image/jpeg"></object>
+      </simpleChoice>
+    </choiceInteraction>
+    <rubricBlock view="scorer">
+      <div/>
+    </rubricBlock>
+  </itemBody>
+  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/match_correct"/>
+</assessmentItem>

data/spec/fixtures/no_assessment_XML/59ee7c9d-e6cc-4d0c-b545-258e20b1a244_choice_A.html

@@ -0,0 +1,3 @@
+<p>test to ensure this stuff gets sanitized.</p>
+<object data="ridiculous_cycle_attempt" type="text/html"></object>
+<script>alert('pwn3d!')</script>

data/spec/lib/qti/v1/models/choices/fill_blank_choice_spec.rb

@@ -6,7 +6,7 @@ describe Qti::V1::Models::Choices::FillBlankChoice do
     let(:file_path) { File.join(fixtures_path, 'items_1.2', 'fib.xml') }
     let(:test_object) { Qti::V1::Models::Assessment.from_path!(file_path) }
     let(:nodes) { test_object.assessment_items }
-    let(:choices) { nodes.map { |node| described_class.new(node) } }
+    let(:choices) { nodes.map { |node| described_class.new(node, test_object) } }
 
     it 'returns the right identifier' do
       expect(choices.map(&:identifier)).to eq %w(FIB_STR)

data/spec/lib/qti/v1/models/choices/logical_identifier_choice_spec.rb

@@ -6,7 +6,7 @@ describe Qti::V1::Models::Choices::LogicalIdentifierChoice do
     let(:file_path) { File.join(fixtures_path, 'items_1.2', 'choice.xml') }
     let(:test_object) { Qti::V1::Models::Assessment.from_path!(file_path) }
     let(:nodes) { test_object.assessment_items }
-    let(:choices) { nodes.map { |node| described_class.new(node) } }
+    let(:choices) { nodes.map { |node| described_class.new(node, test_object) } }
 
     it 'returns the right identifier' do
       expect(choices.map(&:identifier)).to eq %w(QUE_1003 QUE_1007 QUE_1022)

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

@@ -12,9 +12,10 @@ describe Qti::V1::Models::Interactions::BaseInteraction do
   end
 
   let(:node) { Nokogiri.XML(doc, &:noblanks) }
+  let(:assessment) { double(path: 'dummy/blah', package_root: 'dummy') }
 
   it 'returns "Single" rcardinality by default' do
-    interaction = described_class.new(node)
+    interaction = described_class.new(node, assessment)
     expect(interaction.rcardinality).to eq 'Single'
   end
 end

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

@@ -4,7 +4,7 @@ describe Qti::V1::Models::Interactions::ChoiceInteraction do
   let(:fixtures_path) { File.join('spec', 'fixtures', 'items_1.2') }
   let(:test_object) { Qti::V1::Models::Assessment.from_path!(file_path) }
   let(:assessment_item_refs) { test_object.assessment_items }
-  let(:loaded_class) { described_class.new(assessment_item_refs.first) }
+  let(:loaded_class) { described_class.new(assessment_item_refs.first, test_object) }
 
   shared_examples_for 'shuffled?' do
     it 'returns shuffle setting' do

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

@@ -4,7 +4,7 @@ describe Qti::V1::Models::Interactions::FillBlankInteraction do
   let(:fixtures_path) { File.join('spec', 'fixtures', 'items_1.2') }
   let(:test_object) { Qti::V1::Models::Assessment.from_path!(file_path) }
   let(:assessment_item_refs) { test_object.assessment_items }
-  let(:loaded_class) { described_class.new(assessment_item_refs.first) }
+  let(:loaded_class) { described_class.new(assessment_item_refs.first, test_object) }
 
   shared_examples_for 'shuffled?' do
     it 'returns shuffle setting' do
@@ -64,7 +64,8 @@ describe Qti::V1::Models::Interactions::FillBlankInteraction do
 
   describe '#scoring_data_structs' do
     let(:nodexml) { double }
-    subject { described_class.new(nodexml) }
+    let(:test_object) { double(package_root: 'dummy', path: 'dummy/blah') }
+    subject { described_class.new(nodexml, test_object) }
 
     it "returns 'no' as case default value" do
       allow(nodexml).to receive(:at_xpath)

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

@@ -4,7 +4,7 @@ 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) }
+  subject { described_class.new(item, assessment) }
 
   it 'returns shuffle setting' do
     expect(subject.shuffled?).to eq false
@@ -20,7 +20,7 @@ describe Qti::V1::Models::Interactions::MatchInteraction do
 
   describe '.matches' do
     it 'matches the item in file' do
-      expect(described_class.matches(item)).to be_truthy
+      expect(described_class.matches(item, assessment)).to be_truthy
     end
   end
 

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

@@ -4,17 +4,17 @@ describe Qti::V1::Models::Interactions::OrderingInteraction do
   let(:file) { File.join('spec', 'fixtures', 'items_1.2', 'ordering.xml') }
   let(:assessment) { Qti::V1::Models::Assessment.from_path!(file) }
   let(:item) { assessment.assessment_items.first }
-  subject { described_class.new(item) }
+  subject { described_class.new(item, assessment) }
 
   describe '.matches' do
     it 'matches the item in file' do
-      expect(described_class.matches(item)).to be_truthy
+      expect(described_class.matches(item, assessment)).to be_truthy
     end
   end
 
   describe '#scoring_data_structs' do
     it 'grabs scoring data value for ordering questions' do
-      assessment_item = described_class.new(assessment.assessment_items.first)
+      assessment_item = described_class.new(assessment.assessment_items.first, assessment)
       expect(assessment_item.scoring_data_structs.map(&:values)).to eq %w(A B E D C)
     end
   end

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

@@ -4,7 +4,7 @@ describe Qti::V1::Models::Interactions::StringInteraction do
   let(:fixtures_path) { File.join('spec', 'fixtures', 'items_1.2') }
   let(:test_object) { Qti::V1::Models::Assessment.from_path!(file_path) }
   let(:assessment_item_refs) { test_object.assessment_items }
-  let(:loaded_class) { described_class.new(assessment_item_refs.first) }
+  let(:loaded_class) { described_class.new(assessment_item_refs.first, test_object) }
 
   context 'essay.xml' do
     let(:file_path) { File.join(fixtures_path, 'essay.xml') }

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

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe Qti::V2::Models::Choices::GapMatchChoice do
   context 'choice.xml' do
+    let(:item) { double(package_root: 'dummy', path: 'dummy/blah') }
     let(:io) {  File.read(File.join('spec', 'fixtures', 'items_2.1', 'gap_match.xml')) }
     let(:nodes) { Nokogiri::XML(io).xpath('//xmlns:gapText') }
 
-    let(:choices) { nodes.map { |node| described_class.new(node) } }
+    let(:choices) { nodes.map { |node| described_class.new(node, item) } }
 
     it 'returns the right identifier' do
       expect(choices.map(&:identifier)).to eq %w(W Sp Su A)

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

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
 describe Qti::V2::Models::Choices::SimpleAssociableChoice do
+  let(:item) { double(package_root: 'dummy', path: 'dummy/blah') }
   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) } }
+  let(:choices) { nodes.map { |node| described_class.new(node, item) } }
 
   it 'returns the expected attributes' do
     expected_attrs = [

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

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe Qti::V2::Models::Choices::SimpleChoice do
   context 'choice.xml' do
+    let(:item) { double(package_root: 'dummy', path: 'dummy/blah') }
     let(:io) {  File.read(File.join('spec', 'fixtures', 'items_2.1', 'Example02-feedbackInline.xml')) }
     let(:nodes) { Nokogiri::XML(io).xpath('//xmlns:simpleChoice') }
 
-    let(:choices) { nodes.map { |node| described_class.new(node) } }
+    let(:choices) { nodes.map { |node| described_class.new(node, item) } }
 
     it 'returns the right identifier' do
       expect(choices.map(&:identifier)).to eq %w(true false)

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

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe Qti::V2::Models::Interactions::ChoiceInteraction do
   context 'choice.xml' do
+    let(:item) { double(package_root: 'dummy', path: 'dummy/blah') }
     let(:io) { File.read(File.join('spec', 'fixtures', 'items_2.1', 'choice.xml')) }
     let(:node) { Nokogiri::XML(io).at_xpath('//xmlns:choiceInteraction') }
 
-    let(:loaded_class) { described_class.new(node) }
+    let(:loaded_class) { described_class.new(node, item) }
 
     it 'returns shuffle setting' do
       expect(loaded_class.shuffled?).to eq true

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

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe Qti::V2::Models::Interactions::ExtendedTextInteraction do
   context 'essay.xml' do
+    let(:item) { double(package_root: 'dummy', path: 'dummy/blah') }
     let(:io) { File.read(File.join('spec', 'fixtures', 'items_2.1', 'essay.xml')) }
     let(:node) { Nokogiri::XML(io).at_xpath('//xmlns:extendedTextInteraction') }
 
-    let(:loaded_class) { described_class.new(node) }
+    let(:loaded_class) { described_class.new(node, item) }
 
     it 'returns shuffle setting' do
       expect(loaded_class.shuffled?).to eq false

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

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 describe Qti::V2::Models::Interactions::GapMatchInteraction do
   context 'gap_match.xml' do
+    let(:item) { double(package_root: 'dummy', path: 'dummy/blah') }
     let(:io) { File.read(File.join('spec', 'fixtures', 'items_2.1', 'gap_match.xml')) }
     let(:node) { Nokogiri::XML(io) }
-    let(:loaded_class) { described_class.new(node) }
+    let(:loaded_class) { described_class.new(node, item) }
 
     let(:expected_stem_items) {[
       {type: "text",

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

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Qti::V2::Models::Interactions::OrderingInteraction do
   let(:file) { File.join('spec', 'fixtures', 'items_2.1', 'order.xml') }
   let(:item) { Qti::V2::Models::AssessmentItem.from_path!(file) }
-  subject { described_class.new(item.doc) }
+  subject { described_class.new(item.doc, item) }
 
   describe '.matches' do
     it 'matches the item in file' do
-      expect(described_class.matches(item.doc)).to be_truthy
+      expect(described_class.matches(item.doc, item)).to be_truthy
     end
   end
 

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

@@ -16,7 +16,7 @@ describe Qti::V2::Models::Interactions::ShortTextInteraction do
         node = double('Nokogiri::XML::Document')
         matches = [double('Nokogiri::XML::Element'), double('Nokogiri::XML::Element')]
         allow(node).to receive(:xpath).with('.//xmlns:textEntryInteraction').and_return(matches)
-        expect{described_class.matches(node)}.to raise_error(Qti::UnsupportedSchema)
+        expect{described_class.matches(node, assessment_item)}.to raise_error(Qti::UnsupportedSchema)
       end
     end
   end

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

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Qti::V2::Models::AssessmentItem do
+  context "object element" do
+    let(:path) { File.join('spec', 'fixtures', 'no_assessment_XML', '59ee7c9d-e6cc-4d0c-b545-258e20b1a244.xml') }
+    let(:loaded_class) { described_class.from_path!(path) }
+
+    it 'loads an AssessmentItem XML file containing object elements' do
+      expect { loaded_class.item_body }.not_to raise_error
+    end
+
+    it 'imports html objects' do
+      body = loaded_class.item_body
+      expect(body).to include 'Listen to the musical example'
+    end
+
+    it 'sanitizes imported html' do
+      body = loaded_class.interaction_model.answers.first.item_body
+      expect(body).to include 'test to ensure this stuff gets sanitized'
+      expect(body).not_to include '<script>'
+    end
+
+    it 'converts image objects' do
+      body = loaded_class.interaction_model.answers.last.item_body
+      expect(body).to include '<img src="some_image.jpg">'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qti
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Hannah Bottalla
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -357,6 +357,9 @@ files:
 - spec/fixtures/no_assessment_XML/1c7db4f7-e933-4296-8979-963480422832_choice_B.html
 - spec/fixtures/no_assessment_XML/1c7db4f7-e933-4296-8979-963480422832_choice_C.html
 - spec/fixtures/no_assessment_XML/1c7db4f7-e933-4296-8979-963480422832_choice_D.html
+- spec/fixtures/no_assessment_XML/59ee7c9d-e6cc-4d0c-b545-258e20b1a244.html
+- spec/fixtures/no_assessment_XML/59ee7c9d-e6cc-4d0c-b545-258e20b1a244.xml
+- spec/fixtures/no_assessment_XML/59ee7c9d-e6cc-4d0c-b545-258e20b1a244_choice_A.html
 - spec/fixtures/no_assessment_XML/a4f3621a-195c-4847-a72c-69388250a078.html
 - spec/fixtures/no_assessment_XML/a4f3621a-195c-4847-a72c-69388250a078.xml
 - spec/fixtures/no_assessment_XML/a4f3621a-195c-4847-a72c-69388250a078_choice_A.html
@@ -484,6 +487,7 @@ files:
 - spec/lib/qti/v2/models/interactions/ordering_interaction_spec.rb
 - spec/lib/qti/v2/models/interactions/short_text_interaction_spec.rb
 - spec/lib/qti/v2/models/non_assessment_test_spec.rb
+- spec/lib/qti/v2/models/object_element_spec.rb
 - spec/lib/qti/v2/models/stimulus_item_spec.rb
 - spec/lib/qti_spec.rb
 - spec/spec_helper.rb
@@ -507,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: QTI 1.2 and 2.1 import and export models
@@ -620,6 +624,9 @@ test_files:
 - spec/fixtures/no_assessment_XML/1c7db4f7-e933-4296-8979-963480422832_choice_B.html
 - spec/fixtures/no_assessment_XML/1c7db4f7-e933-4296-8979-963480422832_choice_C.html
 - spec/fixtures/no_assessment_XML/1c7db4f7-e933-4296-8979-963480422832_choice_D.html
+- spec/fixtures/no_assessment_XML/59ee7c9d-e6cc-4d0c-b545-258e20b1a244.html
+- spec/fixtures/no_assessment_XML/59ee7c9d-e6cc-4d0c-b545-258e20b1a244.xml
+- spec/fixtures/no_assessment_XML/59ee7c9d-e6cc-4d0c-b545-258e20b1a244_choice_A.html
 - spec/fixtures/no_assessment_XML/a4f3621a-195c-4847-a72c-69388250a078.html
 - spec/fixtures/no_assessment_XML/a4f3621a-195c-4847-a72c-69388250a078.xml
 - spec/fixtures/no_assessment_XML/a4f3621a-195c-4847-a72c-69388250a078_choice_A.html
@@ -747,6 +754,7 @@ test_files:
 - spec/lib/qti/v2/models/interactions/ordering_interaction_spec.rb
 - spec/lib/qti/v2/models/interactions/short_text_interaction_spec.rb
 - spec/lib/qti/v2/models/non_assessment_test_spec.rb
+- spec/lib/qti/v2/models/object_element_spec.rb
 - spec/lib/qti/v2/models/stimulus_item_spec.rb
 - spec/lib/qti_spec.rb
 - spec/spec_helper.rb