qti 2.9.2 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2dc18241493cc73026c3aa2c51534c22d8b880b4e5405659b875e03354c4164
-  data.tar.gz: 19381b84fe5cff67721722d8329ad82399a7cd75bd1ae6a972b566b594b9ec97
+  metadata.gz: 4ae3526adbf70df2b7523f98526a3b9f7afd575ec1787d77cd434857b1e017a9
+  data.tar.gz: 76a12f92afbeda2ab3da260bc6cb8d5633ea731d38659c924662177fdb81e771
 SHA512:
-  metadata.gz: cbe4b4ea5336f9f76e219c5045f3182f9fa1ea18372dd796cb7ecb43bf4787633d1692e28d505c35231c62d6432c9691826fdda1cabdb3543afb991731dc8ebf
-  data.tar.gz: 18c96ba1be32ba9fdbdc90dc8678668395ac723f26c76283182f2e597318ab8844071c5908d5ea0638ad61e02362e8079a6da7d51c0c527abc283cdb0a2e4732
+  metadata.gz: a95ea76601e38f46c327770bea336a02c5762bee4ea88afc41587aea2cfd640de4f9aecdf5f404a724d97f49758a43fc35f8fe281abcf151a3c412581f8d00ac
+  data.tar.gz: f5be814d3d040ce676fda735fd8f9816f563b89526ac8750ba02061477d07bee26f98b59198290feb569caf391502f1b4ffa51da73e44b79ce17f042ccec7fd9

data/lib/qti/content_packaging/assessment_item.rb

@@ -1,12 +1,22 @@
 module Qti
   module ContentPackaging
     class AssessmentItem < Dry::Struct
-      constructor_type :schema
+      transform_keys(&:to_sym)
+
+      transform_types do |type|
+        if type.default?
+          type.constructor do |value|
+            value.nil? ? Dry::Types::Undefined : value
+          end
+        else
+          type
+        end
+      end
 
       attribute :identifier, Types::Strict::String
       attribute :title, Types::Strict::String
       attribute :interaction, ContentPackaging::ChoiceInteraction
-      attribute :response, Types::Strict::Array.of(String) | Types::Strict::String
+      attribute :response, Types::Strict::Array.of(Types::Strict::String) | Types::Strict::String
     end
   end
 end

data/lib/qti/content_packaging/assessment_test.rb

@@ -1,8 +1,17 @@
 module Qti
   module ContentPackaging
     class AssessmentTest < Dry::Struct
-      constructor_type :schema
+      transform_keys(&:to_sym)
 
+      transform_types do |type|
+        if type.default?
+          type.constructor do |value|
+            value.nil? ? Dry::Types::Undefined : value
+          end
+        else
+          type
+        end
+      end
       attribute :identifier, Types::Strict::String
       attribute :title, Types::Strict::String
       attribute :items, Types::Strict::Array.of(ContentPackaging::AssessmentItem)

data/lib/qti/content_packaging/choice_interaction.rb

@@ -1,8 +1,17 @@
 module Qti
   module ContentPackaging
     class ChoiceInteraction < Dry::Struct
-      constructor_type :schema
+      transform_keys(&:to_sym)
 
+      transform_types do |type|
+        if type.default?
+          type.constructor do |value|
+            value.nil? ? Dry::Types::Undefined : value
+          end
+        else
+          type
+        end
+      end
       attribute :prompt, Types::Strict::String
       attribute :shuffle, Types::Strict::Bool.default(false)
       attribute :maxChoices, Types::Coercible::Integer

data/lib/qti/content_packaging/outcome_declaration.rb

@@ -1,8 +1,17 @@
 module Qti
   module ContentPackaging
     class OutcomeDeclaration < Dry::Struct
-      constructor_type :schema
+      transform_keys(&:to_sym)
 
+      transform_types do |type|
+        if type.default?
+          type.constructor do |value|
+            value.nil? ? Dry::Types::Undefined : value
+          end
+        else
+          type
+        end
+      end
       attribute :identifier, Types::Strict::String
       attribute :baseType, Types::Strict::String
       attribute :cardinality, Types::Strict::String

data/lib/qti/content_packaging/simple_choice.rb

@@ -1,8 +1,17 @@
 module Qti
   module ContentPackaging
     class SimpleChoice < Dry::Struct
-      constructor_type :schema
+      transform_keys(&:to_sym)
 
+      transform_types do |type|
+        if type.default?
+          type.constructor do |value|
+            value.nil? ? Dry::Types::Undefined : value
+          end
+        else
+          type
+        end
+      end
       attribute :body, Types::Strict::String
       attribute :identifier, Types::Strict::String
       attribute :fixed, Types::Strict::Bool.default(true)

data/lib/qti/content_packaging.rb

@@ -1,7 +1,7 @@
 module Qti
   module ContentPackaging
     module Types
-      include Dry::Types.module
+      include Dry.Types()
     end
   end
 end

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

@@ -9,20 +9,23 @@ module Qti
             item_prompt.split(CANVAS_REGEX).map.with_index do |stem_item, index|
               if canvas_fib_response_ids.include?(stem_item)
                 # Strip the brackets before searching
-                stem_blank(index, stem_item[1..-2])
+                value = stem_item[1..-2]
+                blank_id = blank_id(value)
+                blank_name = blank_value(blank_id) || value
+                stem_blank(index, blank_id, blank_name)
               else
                 stem_text(index, stem_item)
               end
             end
           end
 
-          def stem_blank(index, value)
+          def stem_blank(index, blank_id, blank_name)
             {
               id: "stem_#{index}",
               position: index + 1,
               type: 'blank',
-              blank_id: blank_id(value),
-              blank_name: value
+              blank_id: blank_id,
+              blank_name: blank_name
             }
           end
 
@@ -40,6 +43,11 @@ module Qti
             canvas_blank_id(stem_item)
           end
 
+          def blank_value(blank_id)
+            blank = canvas_fib_responses.find { |response| response[:id] == blank_id }
+            blank&.dig(:choices, 0, :item_body)
+          end
+
           def canvas_custom_fitb?
             @canvas_custom_fitb ||= BaseInteraction.canvas_custom_fitb?(@node)
           end

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

@@ -112,7 +112,10 @@ module Qti
 
           def qti_stem_item(index, stem_item)
             if stem_item.xpath('./xmlns:render_fib').present?
-              stem_blank(index, stem_item.attributes['ident'].value)
+              blank_id = stem_item.attributes['ident'].value
+              blank_answer = answers.find { |answer| answer.identifier == blank_id }
+              blank_name = blank_answer&.item_body || blank_id
+              stem_blank(index, blank_id, blank_name)
             else
               stem_text(index, sanitize_content!(stem_item.children.text))
             end

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

@@ -4,6 +4,10 @@ module Qti
       class NonAssessmentTest < Qti::V2::Models::AssessmentTest
         include Qti::Models::ResourceGroup
 
+        QTIV2_TITLE_PATHS = [
+          "//*[local-name()='title' and namespace-uri()='http://ltsc.ieee.org/xsd/LOM']/*[local-name()='string']/text()"
+        ].freeze
+
         def assessment_items
           # Return the xml files we should be parsing
           @assessment_items ||= begin
@@ -21,6 +25,14 @@ module Qti
           href = xpath_with_single_check("//xmlns:resource[@identifier='#{dependencies.first}']/@href")
           remap_href_path(href)
         end
+
+        def title
+          @title ||= begin
+            QTIV2_TITLE_PATHS.map do |path|
+              xpath_with_single_check(path)&.content
+            end.compact.first
+          end || super
+        end
       end
     end
   end

data/lib/qti/version.rb

@@ -1,3 +1,3 @@
 module Qti
-  VERSION = '2.9.2'.freeze
+  VERSION = '2.10.0'.freeze
 end

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

@@ -19,11 +19,11 @@
     </itemmetadata>
     <presentation>
       <material>
-        <mattext texttype="text/html">&lt;div&gt;&lt;p&gt;Bird, bird, bird, bird is the [word]&lt;/p&gt;&lt;/div&gt;</mattext>
+        <mattext texttype="text/html">&lt;div&gt;&lt;p&gt;Bird, bird, bird, bird is the [blank1]&lt;/p&gt;&lt;/div&gt;</mattext>
       </material>
-      <response_lid ident="response_word">
+      <response_lid ident="response_blank1">
         <material>
-          <mattext>word</mattext>
+          <mattext>blank1</mattext>
         </material>
         <render_choice>
           <response_label ident="3537">

data/spec/fixtures/no_assessment_xml/imsmanifest.xml

@@ -7,6 +7,13 @@ identifier="non-assessment-item">
     <metadata>
        <schema>QTIv2.2 Package</schema>
        <schemaversion>1.0.0</schemaversion>
+       <lom xmlns="http://ltsc.ieee.org/xsd/LOM">
+          <general>
+             <title>
+                <string>1027TestTitle12</string>
+             </title>
+          </general>
+       </lom>
     </metadata>
     <organizations/>
     <resources>

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

@@ -12,11 +12,11 @@ describe Qti::V1::Models::Interactions::BaseFillBlankInteraction do
 
   context 'canvas_stem_items' do
     let(:file_path) { File.join(fixtures_path, 'canvas_multiple_fib_as_single.xml') }
-    let(:simple_prompt) { 'fill in the [blank]' }
+    let(:simple_prompt) { 'fill in the [blank1]' }
     let(:simple_expected) do
       [
         { id: 'stem_0', position: 1, type: 'text', value: 'fill in the ' },
-        { id: 'stem_1', position: 2, type: 'text', value: '[blank]' }
+        { id: 'stem_1', position: 2, type: 'blank', blank_id: 'response_blank1', blank_name: 'word' }
       ]
     end
     let(:embedded_prompt) { '[[embedded] [groups]]' }
@@ -92,7 +92,7 @@ describe Qti::V1::Models::Interactions::BaseFillBlankInteraction do
     let(:expected_blanks) do
       [
         {
-          id: 'response_word',
+          id: 'response_blank1',
           choices:
           [
             { id: '3537', item_body: 'word', position: 2 }

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

@@ -44,9 +44,9 @@ describe Qti::V1::Models::Interactions::CanvasMultipleDropdownInteraction do
     let(:expected_stem_items) do
       [
         { id: 'stem_0', position: 1, type: 'text', value: '<div><p>Roses are ' },
-        { id: 'stem_1', position: 2, type: 'blank', blank_id: 'response_color1', blank_name: 'color1' },
+        { id: 'stem_1', position: 2, type: 'blank', blank_id: 'response_color1', blank_name: 'red' },
         { id: 'stem_2', position: 3, type: 'text', value: ', violets are ' },
-        { id: 'stem_3', position: 4, type: 'blank', blank_id: 'response_color2', blank_name: 'color2' },
+        { id: 'stem_3', position: 4, type: 'blank', blank_id: 'response_color2', blank_name: 'blue' },
         { id: 'stem_4', position: 5, type: 'text', value: '.</p></div>' }
       ]
     end

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

@@ -47,7 +47,7 @@ describe Qti::V1::Models::Interactions::FillBlankInteraction do
     let(:expected_stem_items) do
       [
         { id: 'stem_0', position: 1, type: 'text', value: '<div><p>Chicago is in what state?</p></div>' },
-        { id: 'stem_1', position: 2, type: 'blank', blank_id: 'response1', blank_name: 'response1' }
+        { id: 'stem_1', position: 2, type: 'blank', blank_id: 'response1', blank_name: 'Illinois' }
       ]
     end
 
@@ -72,9 +72,9 @@ describe Qti::V1::Models::Interactions::FillBlankInteraction do
     let(:expected_stem_items) do
       [
         { id: 'stem_0', position: 1, type: 'text', value: '<div><p><span>Roses are ' },
-        { id: 'stem_1', position: 2, type: 'blank', blank_id: 'response_color1', blank_name: 'color1' },
+        { id: 'stem_1', position: 2, type: 'blank', blank_id: 'response_color1', blank_name: 'red' },
         { id: 'stem_2', position: 3, type: 'text', value: ', violets are ' },
-        { id: 'stem_3', position: 4, type: 'blank', blank_id: 'response_color2', blank_name: 'color2' },
+        { id: 'stem_3', position: 4, type: 'blank', blank_id: 'response_color2', blank_name: 'blue' },
         { id: 'stem_4', position: 5, type: 'text', value: '</span></p></div>' }
       ]
     end
@@ -102,11 +102,11 @@ describe Qti::V1::Models::Interactions::FillBlankInteraction do
       [
         { id: 'stem_0', position: 1, type: 'text', value: 'Fill-in-the blanks in this text from Richard III: ' },
         { id: 'stem_1', position: 2, type: 'text', value: 'Now is the ' },
-        { id: 'stem_2', position: 3, type: 'blank', blank_id: 'FIB01', blank_name: 'FIB01' },
+        { id: 'stem_2', position: 3, type: 'blank', blank_id: 'FIB01', blank_name: 'Winter' },
         { id: 'stem_3', position: 4, type: 'text', value: ' of our discontent made glorious ' },
-        { id: 'stem_4', position: 5, type: 'blank', blank_id: 'FIB02', blank_name: 'FIB02' },
+        { id: 'stem_4', position: 5, type: 'blank', blank_id: 'FIB02', blank_name: 'Summer' },
         { id: 'stem_5', position: 6, type: 'text', value: ' by these sons of ' },
-        { id: 'stem_6', position: 7, type: 'blank', blank_id: 'FIB03', blank_name: 'FIB03' }
+        { id: 'stem_6', position: 7, type: 'blank', blank_id: 'FIB03', blank_name: 'York' }
       ]
     end
 
@@ -165,11 +165,11 @@ describe Qti::V1::Models::Interactions::FillBlankInteraction do
       [
         { id: 'stem_0', position: 1, type: 'text', value: 'Fill-in-the blanks in this text from Richard III: ' },
         { id: 'stem_1', position: 2, type: 'text', value: 'Now is the ' },
-        { id: 'stem_2', position: 3, type: 'blank', blank_id: 'FIB01', blank_name: 'FIB01' },
+        { id: 'stem_2', position: 3, type: 'blank', blank_id: 'FIB01', blank_name: 'Winter' },
         { id: 'stem_3', position: 4, type: 'text', value: ' of our discontent made glorious ' },
-        { id: 'stem_4', position: 5, type: 'blank', blank_id: 'FIB02', blank_name: 'FIB02' },
+        { id: 'stem_4', position: 5, type: 'blank', blank_id: 'FIB02', blank_name: 'Summer' },
         { id: 'stem_5', position: 6, type: 'text', value: ' by these sons of ' },
-        { id: 'stem_6', position: 7, type: 'blank', blank_id: 'FIB03', blank_name: 'FIB03' }
+        { id: 'stem_6', position: 7, type: 'blank', blank_id: 'FIB03', blank_name: 'York' }
       ]
     end
 
@@ -195,7 +195,7 @@ describe Qti::V1::Models::Interactions::FillBlankInteraction do
     let(:expected_stem_items) do
       [
         { id: 'stem_0', position: 1, type: 'text', value: '<div><p>Bird, bird, bird, bird is the ' },
-        { id: 'stem_1', position: 2, type: 'blank', blank_id: 'response_word', blank_name: 'word' },
+        { id: 'stem_1', position: 2, type: 'blank', blank_id: 'response_blank1', blank_name: 'word' },
         { id: 'stem_2', position: 3, type: 'text', value: '</p></div>' }
       ]
     end

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

@@ -11,11 +11,16 @@ describe Qti::V2::Models::NonAssessmentTest do
     it 'expects at least one assement item' do
       expect(loaded_class.assessment_items.count)
     end
+
+    it 'imports title' do
+      expect(loaded_class.title).to eq(title)
+    end
   end
 
   describe '2.2' do
     let(:path) { File.join(fixtures_path, 'no_assessment_xml', 'imsmanifest.xml') }
     let(:loaded_class) { described_class.from_path!(path) }
+    let(:title) { '1027TestTitle12' }
 
     include_examples 'loading_a_non-assessment'
   end
@@ -23,6 +28,7 @@ describe Qti::V2::Models::NonAssessmentTest do
   describe 'package_shared' do
     let(:path) { File.join(fixtures_path, 'package_shared', 'imsmanifest.xml') }
     let(:loaded_class) { described_class.from_path!(path) }
+    let(:title) { 'imsmanifest' }
 
     include_examples 'loading_a_non-assessment'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qti
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.10.0
 platform: ruby
 authors:
 - Adrian Diaz
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: mathml2latex
   requirement: !ruby/object:Gem::Requirement
@@ -701,7 +701,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: QTI 1.2 and 2.1 import and export models