qti 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e53f243da494ee925b59209d0dd07bb4a2cabe94
-  data.tar.gz: 824890bebce7299bf5d4acfb11a8499354452965
+  metadata.gz: ba499677e0990dbf44bf87be25231b89857bb35c
+  data.tar.gz: b96d68fb28cf9bf91a71d2442caebbfb687bfb4c
 SHA512:
-  metadata.gz: 60fb5c2db7b83bc57183d633f95d1929aa6601975eb796c87f5e9a84ca378d68f645468c4d280717ae715030e699cce580037c5f6f572e6aa846a9407489537f
-  data.tar.gz: 8879e659c17e6e7cc0c4400eacabcc594b2964dca2ce45175a84b320ce92c2621d99277b3a755b11a3a7d09a1fcda1544d67c9fdbc374b21b066a38763d07b9b
+  metadata.gz: 04a5855e97432a00fd6d5e24200622eaf2b9625201c23129026e99254a250d378c19f668222d2be6a3dec7d8f4ac59ddd061c1acff73cfc9e96eb84712b8ad22
+  data.tar.gz: 8d31f22322d9e9e441880aa747332cf4e4a8796f1b0ed3cfcc4193ca3b9de9292e90b490048ddd7641d68cd6e717c4554a69b90c531aefb6e1121b2bba867973

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

@@ -41,11 +41,7 @@ module Qti
           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?
-                stem_blank(index, stem_item.attributes['ident'].value)
-              else
-                stem_text(index, stem_item.children.text)
-              end
+              qti_stem_item(index, stem_item)
             end
           end
 
@@ -113,6 +109,14 @@ module Qti
           def scoring_data_case(node)
             node.attributes['case']&.value || 'no'
           end
+
+          def qti_stem_item(index, stem_item)
+            if stem_item.xpath('./xmlns:render_fib').present?
+              stem_blank(index, stem_item.attributes['ident'].value)
+            else
+              stem_text(index, sanitize_content!(stem_item.children.text))
+            end
+          end
         end
       end
     end

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

@@ -32,12 +32,7 @@ module Qti
           def variables
             varlist = @node.at_xpath('.//xmlns:vars')
             varlist.xpath('.//xmlns:var').map do |vnode|
-              {
-                name: vnode.attributes['name']&.value,
-                min: vnode.at_xpath('.//xmlns:min').text,
-                max: vnode.at_xpath('.//xmlns:max').text,
-                precision: vnode.attributes['scale']&.value
-              }
+              variable_def(vnode)
             end
           end
 
@@ -70,6 +65,15 @@ module Qti
               }
             end
           end
+
+          def variable_def(var_node)
+            {
+              name: var_node.attributes['name']&.value,
+              min: var_node.at_xpath('.//xmlns:min').text&.to_f,
+              max: var_node.at_xpath('.//xmlns:max').text&.to_f,
+              precision: var_node.attributes['scale']&.value&.to_i
+            }
+          end
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Qti
   module V1
     module Models
-      class StimulusItem
+      class StimulusItem < Qti::V1::Models::Base
         def initialize(ref_node)
           @node = ref_node
         end
@@ -18,8 +18,7 @@ module Qti
           @body ||= begin
             presentation = @node.at_xpath('.//xmlns:presentation')
             return nil if presentation.blank?
-            mattext = presentation.at_xpath('.//xmlns:mattext')
-            mattext&.text
+            sanitize_content!(presentation.at_xpath('.//xmlns:mattext')&.text)
           end
         end
 

data/lib/qti/version.rb

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

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

@@ -209,7 +209,6 @@ describe Qti::V1::Models::Interactions::FillBlankInteraction do
     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

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

@@ -47,7 +47,7 @@ describe Qti::V1::Models::Interactions::FormulaInteraction do
 
     let(:item_title) { '<div><p>What number is [x]</p></div>' }
 
-    let(:variables) { [{ name: 'x', min: '1.0', max: '10.0', precision: '0' }] }
+    let(:variables) { [{ name: 'x', min: 1.0, max: 10.0, precision: 0 }] }
 
     include_examples 'scoring_data_structs'
     include_examples 'reading_formulas'
@@ -68,8 +68,8 @@ describe Qti::V1::Models::Interactions::FormulaInteraction do
     let(:item_title) { '<div><p>[x] + [y]</p></div>' }
 
     let(:variables) do
-      [{ name: 'x', min: '1.0', max: '10.0', precision: '0' },
-       { name: 'y', min: '1.0', max: '10.0', precision: '0' }]
+      [{ name: 'x', min: 1.0, max: 10.0, precision: 0 },
+       { name: 'y', min: 1.0, max: 10.0, precision: 0 }]
     end
 
     include_examples 'scoring_data_structs'
@@ -91,10 +91,10 @@ describe Qti::V1::Models::Interactions::FormulaInteraction do
     let(:item_title) { '<div><p>[n][x] + [m][y]</p></div>' }
 
     let(:variables) do
-      [{ name: 'y', min: '1.0', max: '10.0', precision: '2' },
-       { name: 'x', min: '1.0', max: '10.0', precision: '2' },
-       { name: 'n', min: '1.0', max: '10.0', precision: '2' },
-       { name: 'm', min: '1.0', max: '10.0', precision: '2' }]
+      [{ name: 'y', min: 1.0, max: 10.0, precision: 2 },
+       { name: 'x', min: 1.0, max: 10.0, precision: 2 },
+       { name: 'n', min: 1.0, max: 10.0, precision: 2 },
+       { name: 'm', min: 1.0, max: 10.0, precision: 2 }]
     end
 
     include_examples 'scoring_data_structs'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qti
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Hannah Bottalla
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport