RubyGems - qti - Versions diffs - 0.9.7 → 0.9.8 - Mend

qti 0.9.7 → 0.9.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

checksums.yaml +4 -4
data/lib/qti/v1/models/choices/fill_blank_choice.rb +4 -0
data/lib/qti/v1/models/interactions/base_interaction.rb +6 -0
data/lib/qti/v1/models/interactions/fill_blank_interaction.rb +75 -8
data/lib/qti/v1/models/interactions/match_interaction.rb +1 -0
data/lib/qti/v1/models/scoring_data.rb +2 -2
data/lib/qti/version.rb +1 -1
data/spec/fixtures/items_1.2/canvas_multiple_fib.xml +77 -0
data/spec/gemfiles/nokogiri-1.6.gemfile.lock +127 -0
data/spec/gemfiles/nokogiri-1.8.gemfile.lock +18 -18
data/spec/gemfiles/rails-4.2.gemfile.lock +204 -0
data/spec/gemfiles/rails-5.0.gemfile.lock +210 -0
data/spec/gemfiles/rails-5.1.gemfile.lock +210 -0
data/spec/gemfiles/sanitize-4.2.gemfile.lock +127 -0
data/spec/gemfiles/sanitize-4.5.gemfile.lock +127 -0
data/spec/lib/qti/v1/models/interactions/fill_blank_interaction_spec.rb +34 -1
metadata +17 -3

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aabd1fcd54402b41afeebc7bc69be6c86390a52
-  data.tar.gz: c2bed919eed81aeba3b0cb8f753c79f5d0f68be6
+  metadata.gz: b0b2571404f88af47659de553891bc760d1ee13f
+  data.tar.gz: 8e68acc2256a603807a42b04ad34277e92f92225
 SHA512:
-  metadata.gz: afeb012f7304d7952fe6f615eb8ddc74ab202f18ea9dcf012a3180d7b5ddbdd73c034eea72887c77382b49cc33d2bd558b6bfc209faa44d4d0fcf4ac2a7c16a6
-  data.tar.gz: 2ebe901bb7779a0cd972b54ad7108f59847361e47ae6c8964ba96dd10a707686174cfc719adf0ded99d0e5324a733442fee69b9a1a0ac91c4c1a4ca8123345ed
+  metadata.gz: 9f939252ce6df39c30b75757648bb5350397a8e8e1f81584f906b15ab00578e48f8ddfea4bbba47e53c5a8862a796137ee65dd17a29ec64f3f942d0b50789821
+  data.tar.gz: 6c068d7a32c9d741e3f2f9f7a5f18541b6d4ece8f774409989aca382e57d4aa3c68dd57c0522698bb0fe7086e6ede024b8db3bd7aa2c67173b0474f5e4687dfc

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

@@ -15,6 +15,10 @@ module Qti
                             @node.attributes['ident']&.value
           end
+          def parent_identifier
+            @parent_identifier ||= @node.parent.parent.attributes['ident']&.value
+          end
           def item_body
             @item_body ||= begin
               node = @node.dup

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

@@ -9,6 +9,12 @@ module Qti
             false
           end
+          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"
+          end
           def initialize(node, parent)
             @node = node
             copy_paths_from_item(parent)

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

@@ -3,16 +3,64 @@ module Qti
     module Models
       module Interactions
         class FillBlankInteraction < BaseInteraction
+          CANVAS_REGEX = /(\[.+?\])/.freeze
           # This will know if a class matches
           def self.matches(node, parent)
-            return false if node.xpath('.//xmlns:other').present?
-            matches = node.xpath('.//xmlns:render_fib')
-            return false if matches.empty? ||
-              matches.first.attributes['fibtype']&.value == 'Decimal'
+            return false if node.at_xpath('.//xmlns:other').present?
+            match = if BaseInteraction.canvas_multiple_fib?(node)
+                node.at_xpath('.//xmlns:response_lid')
+              else
+                node.at_xpath('.//xmlns:render_fib')
+              end
+            return false if match.blank? ||
+              match.attributes['fibtype']&.value == 'Decimal'
             new(node, parent)
           end
+          def canvas_multiple_fib?
+            BaseInteraction.canvas_multiple_fib?(@node)
+          end
           def stem_items
+            if canvas_multiple_fib?
+              canvas_stem_items
+            else
+              qti_stem_items
+            end
+          end
+          def canvas_stem_items
+            @response_lid_nodes = node.xpath('.//xmlns:response_lid')
+            item_prompt = node.at_xpath('.//xmlns:mattext').text
+            item_prompt_words = item_prompt.split(CANVAS_REGEX)
+            item_prompt_words.map.with_index do |stem_item, index|
+              if stem_item.match CANVAS_REGEX
+                @response_lid_nodes.children.map do |response_lid_node|
+                  if stem_item.include?(response_lid_node.text)
+                    @blank_id = response_lid_node.parent.attributes['ident']&.value
+                  end
+                end
+                {
+                  id: "stem_#{index}",
+                  position: index + 1,
+                  type: 'blank',
+                  blank_id: @blank_id
+                }
+              else
+                {
+                  id: "stem_#{index}",
+                  position: index + 1,
+                  type: 'text',
+                  value: stem_item
+                }
+              end
+            end
+          end
+          def qti_stem_items
             stem_item_nodes = node.xpath('.//xmlns:presentation').children
             stem_item_nodes.map.with_index do |stem_item, index|
               if stem_item.xpath('./xmlns:render_fib').present?
@@ -38,8 +86,22 @@ module Qti
           end
           def blanks
+            if node.at_xpath('.//xmlns:render_choice').present?
+              canvas_blanks
+            else
+              qti_standard_blanks
+            end
+          end
+          def canvas_blanks
+            node.xpath('.//xmlns:response_label').map do |blank|
+              { id: blank.attributes['ident']&.value }
+            end
+          end
+          def qti_standard_blanks
             node.xpath('.//xmlns:response_str').map do |blank|
-              { id: blank.attributes['ident'].value }
+              { id: blank.attributes['ident']&.value }
             end
           end
@@ -54,8 +116,9 @@ module Qti
               ScoringData.new(
                 value_node.content,
                 rcardinality,
-                id: value_node.attributes['respident']&.value,
-                case: value_node.attributes['case']&.value || 'no'
+                id: value_node.attributes['respident']&.value || value_node.attributes['ident']&.value,
+                case: value_node.attributes['case']&.value || 'no',
+                parent_identifier: value_node.parent.parent.attributes['ident']&.value,
               )
             end
           end
@@ -68,7 +131,11 @@ module Qti
           end
           def answer_nodes
-            @node.xpath('.//xmlns:varequal')
+            if canvas_multiple_fib?
+              @node.xpath('.//xmlns:response_label')
+            else
+              @node.xpath('.//xmlns:varequal')
+            end
           end
         end
       end

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

@@ -4,6 +4,7 @@ module Qti
       module Interactions
         class MatchInteraction < BaseInteraction
           def self.matches(node, parent)
+            return false if canvas_multiple_fib?(node)
             matches = node.xpath('.//xmlns:response_lid')
             return false if matches.count <= 1
             new(node, parent)

data/lib/qti/v1/models/scoring_data.rb CHANGED

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

data/lib/qti/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Qti
-  VERSION = '0.9.7'.freeze
+  VERSION = '0.9.8'.freeze
 end

data/spec/fixtures/items_1.2/canvas_multiple_fib.xml ADDED

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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="i54cc67bc8ce2e7d19edd187803a28f7d" title="Fill in Multiple Blanks">
+    <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>i110040ca4c30b713a4a98bcf21907ff7</fieldentry>
+        </qtimetadatafield>
+      </qtimetadata>
+    </itemmetadata>
+    <presentation>
+      <material>
+        <mattext texttype="text/html">&lt;div&gt;&lt;p&gt;&lt;span&gt;Roses are [color1], violets are [color2]&lt;/span&gt;&lt;/p&gt;&lt;/div&gt;</mattext>
+      </material>
+      <response_lid ident="response_color1">
+        <material>
+          <mattext>color1</mattext>
+        </material>
+        <render_choice>
+          <response_label ident="9799">
+            <material>
+              <mattext texttype="text/plain">red</mattext>
+            </material>
+          </response_label>
+          <response_label ident="5231">
+            <material>
+              <mattext texttype="text/plain">Red</mattext>
+            </material>
+          </response_label>
+        </render_choice>
+      </response_lid>
+      <response_lid ident="response_color2">
+        <material>
+          <mattext>color2</mattext>
+        </material>
+        <render_choice>
+          <response_label ident="5939">
+            <material>
+              <mattext texttype="text/plain">blue</mattext>
+            </material>
+          </response_label>
+          <response_label ident="6364">
+            <material>
+              <mattext texttype="text/plain">Blue</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_color1">9799</varequal>
+        </conditionvar>
+        <setvar varname="SCORE" action="Add">50.00</setvar>
+      </respcondition>
+      <respcondition>
+        <conditionvar>
+          <varequal respident="response_color2">5939</varequal>
+        </conditionvar>
+        <setvar varname="SCORE" action="Add">50.00</setvar>
+      </respcondition>
+    </resprocessing>
+  </item>
+</questestinterop>

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

@@ -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 CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    qti (0.9.7)
+    qti (0.9.8)
       activesupport (>= 4.2.9, < 5.2)
       dry-struct (~> 0.2.1)
       dry-types (~> 0.12.0)
@@ -61,29 +61,29 @@ GEM
       mini_portile2 (~> 2.3.0)
     nokogumbo (1.4.13)
       nokogiri
-    parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
+    parallel (1.12.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
     powerpack (0.1.1)
-    pry (0.11.3)
+    pry (0.11.1)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (2.2.2)
       rake
     rake (0.9.6)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    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.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.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)
@@ -91,7 +91,7 @@ GEM
       rainbow (>= 2.2.2, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.8.3)
     rubyzip (1.2.1)
     sanitize (4.5.0)
       crass (~> 1.0.2)
@@ -125,4 +125,4 @@ DEPENDENCIES
   wwtd (~> 1.3)
 BUNDLED WITH
-   1.16.0
+   1.15.4