qti 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfeec2b8ec42ba21144f13b05013cef1425a5d99
-  data.tar.gz: 6b20f7589d8e8d44f36448ccc082a255bc135e4a
+  metadata.gz: 01a0bd0d6fce73ea49a9c058590efc645ae1f07b
+  data.tar.gz: 13814e907f52035e0ea02b49be9cff41b93f0220
 SHA512:
-  metadata.gz: d6b744f2d7082e7f3c48c7f09db372752ccc6be1561ae7b10822fe8e7b6df6e11cb6ccdf4486e3c9ce5e5a9ad41c5a08e59aeda07ac343832ad1ed29b0f2b78d
-  data.tar.gz: e1c594853172503d51e918dca051f8e4162a780da4a3c5d1933ffeed8fd773889e125743ddcb6876252c9f0e3bb325a7150d5047ee97c698a75b0ea1485209ad
+  metadata.gz: c1375ddeb630a3563154ec29c8e41130e14b9c5885a46388348f270523fe040e81ec57793af37e7d9d9bdf09ae3965dada0a2b3dda31b1d66b29b5e68be25337
+  data.tar.gz: 6317d241aa748eb3e8543ad79b3d0d11975f828cc63818338858141cab27831a6f8a918bca3fbcde70ebeea60e481a8b6d30791966c374597261263301f35ce5

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

@@ -6,22 +6,29 @@ module Qti
   module V1
     module Models
       module Interactions
+        ALL_CLASSES = constants.map { |c| const_get(c) }.freeze
+        ORDERED_CLASSES = [CanvasMultipleDropdownInteraction, FormulaInteraction, NumericInteraction].freeze
+        FALLBACK_CLASSES = [StringInteraction].freeze
         # This one finds the correct parsing model based on the provided xml node
         def self.interaction_model(node, parent)
-          ordered_classes = [CanvasMultipleDropdownInteraction, FormulaInteraction, NumericInteraction]
-          ordered_classes.each do |interaction_class|
-            match = interaction_class.matches(node, parent)
-            return match if match
-          end
+          matches = Interactions.get_matches(node, parent, ORDERED_CLASSES)
+          return matches.first unless matches.empty?
+
+          subclasses = ALL_CLASSES - ORDERED_CLASSES - FALLBACK_CLASSES
 
-          subclasses = constants.map { |c| const_get(c) } - ordered_classes
+          matches = Interactions.get_matches(node, parent, subclasses)
+          matches = Interactions.get_matches(node, parent, FALLBACK_CLASSES) if matches.empty?
 
-          matches = subclasses.each_with_object([]) do |interaction_class, result|
+          raise UnsupportedSchema if matches.size != 1
+          matches.first
+        end
+
+        def self.get_matches(node, parent, classlist)
+          matches = classlist.each_with_object([]) do |interaction_class, result|
             match = interaction_class.matches(node, parent)
             result << match if match
           end
-          raise UnsupportedSchema if matches.size != 1
-          matches.first
+          matches
         end
       end
     end

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

@@ -6,16 +6,26 @@ module Qti
           # This will know if a class matches
           def self.matches(node, parent)
             return false if node.at_xpath('.//xmlns:respcondition[@continue!="Yes"]/*/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'
+
+            match, answers = FillBlankInteraction.match_and_answers(node)
+            return false if answers.blank?
+            return false if match.blank? || match.attributes['fibtype']&.value == 'Decimal'
             new(node, parent)
           end
 
+          def self.match_and_answers(node)
+            if BaseInteraction.canvas_multiple_fib?(node)
+              return [
+                node.at_xpath('.//xmlns:response_lid'),
+                node.xpath('.//xmlns:response_label')
+              ]
+            end
+            [
+              node.at_xpath('.//xmlns:render_fib'),
+              node.xpath('.//xmlns:respcondition/xmlns:setvar/../xmlns:conditionvar/xmlns:varequal')
+            ]
+          end
+
           def canvas_multiple_fib?
             BaseInteraction.canvas_multiple_fib?(@node)
           end
@@ -90,9 +100,9 @@ module Qti
 
           def answer_nodes
             if canvas_multiple_fib?
-              @node.xpath('.//xmlns:response_label')
+              node.xpath('.//xmlns:response_label')
             else
-              @node.xpath('.//xmlns:respcondition/xmlns:setvar/../xmlns:conditionvar/xmlns:varequal')
+              node.xpath('.//xmlns:respcondition/xmlns:setvar/../xmlns:conditionvar/xmlns:varequal')
             end
           end
 

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

@@ -5,8 +5,6 @@ module Qti
         class StringInteraction < BaseInteraction
           # This will know if a class matches
           def self.matches(node, parent)
-            return false unless node.xpath('.//xmlns:respcondition[@continue!="Yes"]/*/xmlns:other').present?
-
             matches = node.xpath('.//xmlns:render_fib')
             return false if matches.empty?
             new(node, parent)

data/lib/qti/version.rb

@@ -1,3 +1,3 @@
 module Qti
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qti
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Hannah Bottalla
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport