qti 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9278a5814a878f23f53159c3adb0c64e7d7a8e69
-  data.tar.gz: 8892e930ffbf68ef68b5f08fddd5ed3fa63f34da
+  metadata.gz: 26dd56f6f4a742de61725175a7e2dbbcf3510a04
+  data.tar.gz: 98a18ecd7e9afadd74dae4ba93311eee8e159cca
 SHA512:
-  metadata.gz: 25f42764b0ac0109aa2ab6edf7e3e814fd4150b94b195684f856acaa6faaa859712287a6262141352456b1e341e6d1caef0e037fdfce476d2742cc67d53f3203
-  data.tar.gz: e3cda7d07238a30879125895ef9b73bb1283d2776803ace6489e5226e0ddd736ebf09321e8f65a7fe5cb01a1783ba8a01d0ddb9476be4724b8b34a79d07146b2
+  metadata.gz: 535479a70f5ef7db7c65562676cd49ace6cd463d5898de543c7406f09d884b4829408a55ea3afaadf52fcdc0c4ed744a5cfeea48aebe5d15d284599ae0c6ef0f
+  data.tar.gz: d1e56b2caef825ae13ad66d50a4e616ffdc6f89b69ad6830b9cb6459a08ffcd072071fe5675c0cb09a9483c9c87c31cfeecface4446aa49ac3e32c69be06a5a2

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

@@ -17,7 +17,8 @@ module Qti
           @item_body ||= begin
             node = @doc.dup
             presentation = node.at_xpath('.//xmlns:presentation')
-            prompt = presentation.at_xpath('.//xmlns:mattext').to_html
+            mattext = presentation.at_xpath('.//xmlns:mattext')
+            prompt = return_inner_content!(mattext)
             sanitize_content!(prompt)
           end
         end

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

@@ -7,6 +7,14 @@ module Qti
         def qti_version
           1
         end
+
+        def return_inner_content!(node)
+          if node.child.cdata? || node.inner_html.include?('&gt' || '&lt')
+            node.text
+          else
+            node.inner_html
+          end
+        end
       end
     end
   end

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

@@ -18,7 +18,8 @@ module Qti
           def item_body
             @item_body ||= begin
               node = @node.dup
-              sanitize_content!(node.to_html)
+              inner_content = return_inner_content!(node)
+              sanitize_content!(inner_content)
             end
           end
         end

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

@@ -17,7 +17,8 @@ module Qti
           def item_body
             @item_body ||= begin
               node = @node.dup
-              sanitize_content!(node.to_html)
+              inner_content = return_inner_content!(node)
+              sanitize_content!(inner_content)
             end
           end
         end

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

@@ -17,7 +17,9 @@ module Qti
 
           def questions
             node.xpath('.//xmlns:response_lid').map do |lid_node|
-              item_body = sanitize_content!(lid_node.at_xpath('.//xmlns:mattext').to_html)
+              mattext = lid_node.at_xpath('.//xmlns:mattext')
+              inner_content = return_inner_content!(mattext)
+              item_body = sanitize_content!(inner_content)
               { id: lid_node.attributes['ident'].value, itemBody: item_body }
             end
           end

data/lib/qti/version.rb

@@ -1,3 +1,3 @@
 module Qti
-  VERSION = '0.9.2'.freeze
+  VERSION = '0.9.3'.freeze
 end

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

@@ -3,7 +3,9 @@
   <item ident="if15fb877c2cde9a14437aa7429360ac6" title="First Essay">
     <presentation>
       <material>
-        <mattext texttype="text/html">Here is an essay question</mattext>
+         <mattext texttype="text/html">
+            &lt;div&gt;&lt;p&gt;Here is an essay question.&lt;/p&gt;&lt;/div&gt;
+         </mattext>
       </material>
       <response_str ident="response1" rcardinality="Single">
         <render_fib>

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

@@ -11,7 +11,7 @@
     </itemmetadata>
     <presentation>
       <material>
-        <mattext texttype="text/html">Match the statements with the correct type of microscope</mattext>
+        <mattext texttype="text/html"><div><strong>Match the statements with the correct type of microscope</strong></div></mattext>
       </material>
       <response_lid ident="question_1" rcardinality="Single">
         <material>

data/spec/gemfiles/nokogiri-1.6.gemfile.lock

@@ -0,0 +1,127 @@
+PATH
+  remote: ../..
+  specs:
+    qti (0.9.3)
+      activesupport (>= 4.2.9, < 5.2)
+      dry-struct (~> 0.2.1)
+      dry-types (~> 0.12.0)
+      nokogiri (>= 1.6.8, < 1.9)
+      rubyzip (~> 1.2)
+      sanitize (>= 4.2.0, < 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    ast (2.3.0)
+    byebug (9.1.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    dry-configurable (0.7.0)
+      concurrent-ruby (~> 1.0)
+    dry-container (0.6.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.3.4)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.2.0)
+    dry-logic (0.4.2)
+      dry-container (~> 0.2, >= 0.2.6)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-struct (0.2.1)
+      dry-configurable (~> 0.1)
+      dry-equalizer (~> 0.2)
+      dry-types (~> 0.9, >= 0.9.0)
+      ice_nine (~> 0.11)
+    dry-types (0.12.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1)
+      dry-container (~> 0.3)
+      dry-core (~> 0.2, >= 0.2.1)
+      dry-equalizer (~> 0.2)
+      dry-logic (~> 0.4, >= 0.4.2)
+      inflecto (~> 0.0.0, >= 0.0.2)
+    i18n (0.8.6)
+    ice_nine (0.11.2)
+    inflecto (0.0.2)
+    json (2.1.0)
+    method_source (0.9.0)
+    mini_portile2 (2.1.0)
+    minitest (5.10.3)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogumbo (1.4.13)
+      nokogiri
+    parallel (1.12.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    pry (0.11.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rainbow (2.2.2)
+      rake
+    rake (0.9.6)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rubocop (0.50.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.3)
+    rubyzip (1.2.1)
+    sanitize (4.5.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.4.4)
+      nokogumbo (~> 1.4.1)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.3.0)
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.15)
+  byebug (~> 9.0)
+  nokogiri (~> 1.6.8)
+  pry (~> 0)
+  qti!
+  rake (~> 0)
+  rspec (~> 3.6)
+  rspec-mocks (~> 3.6)
+  rubocop (~> 0.50.0)
+  simplecov (~> 0)
+  wwtd (~> 1.3)
+
+BUNDLED WITH
+   1.15.4

data/spec/gemfiles/nokogiri-1.8.gemfile.lock

@@ -0,0 +1,127 @@
+PATH
+  remote: ../..
+  specs:
+    qti (0.9.3)
+      activesupport (>= 4.2.9, < 5.2)
+      dry-struct (~> 0.2.1)
+      dry-types (~> 0.12.0)
+      nokogiri (>= 1.6.8, < 1.9)
+      rubyzip (~> 1.2)
+      sanitize (>= 4.2.0, < 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    ast (2.3.0)
+    byebug (9.1.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    dry-configurable (0.7.0)
+      concurrent-ruby (~> 1.0)
+    dry-container (0.6.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.3.4)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.2.0)
+    dry-logic (0.4.2)
+      dry-container (~> 0.2, >= 0.2.6)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-struct (0.2.1)
+      dry-configurable (~> 0.1)
+      dry-equalizer (~> 0.2)
+      dry-types (~> 0.9, >= 0.9.0)
+      ice_nine (~> 0.11)
+    dry-types (0.12.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1)
+      dry-container (~> 0.3)
+      dry-core (~> 0.2, >= 0.2.1)
+      dry-equalizer (~> 0.2)
+      dry-logic (~> 0.4, >= 0.4.2)
+      inflecto (~> 0.0.0, >= 0.0.2)
+    i18n (0.8.6)
+    ice_nine (0.11.2)
+    inflecto (0.0.2)
+    json (2.1.0)
+    method_source (0.9.0)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    nokogumbo (1.4.13)
+      nokogiri
+    parallel (1.12.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    pry (0.11.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rainbow (2.2.2)
+      rake
+    rake (0.9.6)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rubocop (0.50.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.3)
+    rubyzip (1.2.1)
+    sanitize (4.5.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.4.4)
+      nokogumbo (~> 1.4.1)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.3.0)
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.15)
+  byebug (~> 9.0)
+  nokogiri (~> 1.8.1)
+  pry (~> 0)
+  qti!
+  rake (~> 0)
+  rspec (~> 3.6)
+  rspec-mocks (~> 3.6)
+  rubocop (~> 0.50.0)
+  simplecov (~> 0)
+  wwtd (~> 1.3)
+
+BUNDLED WITH
+   1.15.4

data/spec/gemfiles/rails-4.2.gemfile.lock

@@ -0,0 +1,204 @@
+PATH
+  remote: ../..
+  specs:
+    qti (0.9.3)
+      activesupport (>= 4.2.9, < 5.2)
+      dry-struct (~> 0.2.1)
+      dry-types (~> 0.12.0)
+      nokogiri (>= 1.6.8, < 1.9)
+      rubyzip (~> 1.2)
+      sanitize (>= 4.2.0, < 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.9)
+      activesupport (= 4.2.9)
+      globalid (>= 0.3.0)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
+      arel (~> 6.0)
+    activesupport (4.2.9)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.4)
+    ast (2.3.0)
+    builder (3.2.3)
+    byebug (9.1.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    dry-configurable (0.7.0)
+      concurrent-ruby (~> 1.0)
+    dry-container (0.6.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.3.4)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.2.0)
+    dry-logic (0.4.2)
+      dry-container (~> 0.2, >= 0.2.6)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-struct (0.2.1)
+      dry-configurable (~> 0.1)
+      dry-equalizer (~> 0.2)
+      dry-types (~> 0.9, >= 0.9.0)
+      ice_nine (~> 0.11)
+    dry-types (0.12.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1)
+      dry-container (~> 0.3)
+      dry-core (~> 0.2, >= 0.2.1)
+      dry-equalizer (~> 0.2)
+      dry-logic (~> 0.4, >= 0.4.2)
+      inflecto (~> 0.0.0, >= 0.0.2)
+    erubis (2.7.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.6)
+    ice_nine (0.11.2)
+    inflecto (0.0.2)
+    json (2.1.0)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    nokogumbo (1.4.13)
+      nokogiri
+    parallel (1.12.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    pry (0.11.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rack (1.6.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.9)
+      actionmailer (= 4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      activemodel (= 4.2.9)
+      activerecord (= 4.2.9)
+      activesupport (= 4.2.9)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.9)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rainbow (2.2.2)
+      rake
+    rake (0.9.6)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rubocop (0.50.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.3)
+    rubyzip (1.2.1)
+    sanitize (4.5.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.4.4)
+      nokogumbo (~> 1.4.1)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.3.0)
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.15)
+  byebug (~> 9.0)
+  pry (~> 0)
+  qti!
+  rails (~> 4.2.9)
+  rake (~> 0)
+  rspec (~> 3.6)
+  rspec-mocks (~> 3.6)
+  rubocop (~> 0.50.0)
+  simplecov (~> 0)
+  wwtd (~> 1.3)
+
+BUNDLED WITH
+   1.15.4