qti 2.6.2 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1efc6d4685a9ee4de6bd99f210c19cc58d192b62eb7a826625cd73c982d5d72f
-  data.tar.gz: 36be4ac43a818860c0d76f22f233d8ece3d27bb4d2add350535892452426da46
+  metadata.gz: 01dd841b1a9215aeaddf4e9211f7e2327544067afa5fb2e24a58186f7c035115
+  data.tar.gz: b4d688f36fb284da0ba8168463b667eb59bf612b2750ef50650230dcc129e2bb
 SHA512:
-  metadata.gz: eff97a9889ad795c323771b45358bd76561329ea12788813dbe833934354ba5c79e09fb5f1bbb0b02eb5b694d3ba8131af2ea20d8a426a624a38954daa13a29a
-  data.tar.gz: 7a9258aa3bf9c5707e15df8fe8d5e59e805e4545218f351464a181177b973cfba2808d9bcd8549ab046da08f7ce0c75fb5b42a9193f37e109bd5d05a6e6cdb2f
+  metadata.gz: 301bfa283539d68e2feca734a9aa97046c2604c5eedc8f656e217cdbd90949d3ddf88dcdda39ecbb1c19dde68d0b51c5f582aa9b33c3f79995109e921126dbe2
+  data.tar.gz: 880e9ce56fe47276d833ab1b19d1f6b30646cf5a641ddce0f7e6468bb9922b05ccfd5ff140b413f7e8698c532798ade8fa50262a37e93231cfef5af5b3417ae8

data/README.md

@@ -80,8 +80,8 @@ cached, making additional runs significantly faster.
 Individual spec runs can be started like so:
 
 ```bash
-docker-compose run --rm app /bin/bash -l -c \
-  "BUNDLE_GEMFILE=spec/gemfiles/rails-6.0.gemfile rvm-exec 2.5 rspec"
+docker-compose run --rm app bash -lc \
+  "BUNDLE_GEMFILE=spec/gemfiles/rails-6.1.gemfile rvm-exec 2.7 rspec"
 ```
 
 If you'd like to mount your git checkout within the docker container running

data/lib/qti/exporter.rb

@@ -7,7 +7,7 @@ module Qti
       @assessment_test = assessment_test
       @package_root_path = args[:package_root_path] || '.'
       @exported_file_path =
-        File.join(File.expand_path('..', package_root_path), File.basename(export_file_name)) + '.zip'
+        "#{File.join(File.expand_path('..', package_root_path), File.basename(export_file_name))}.zip"
     end
 
     def export
@@ -167,12 +167,10 @@ module Qti
 
     def add_all_files(zipfile, package_root_path)
       Dir["#{package_root_path}/**/**"].each do |file|
-        begin
-          entry = file.sub(package_root_path + '/', '')
-          zipfile.add(entry, file)
-        rescue Zip::EntryExistsError
-          logger.info("#{file} already exists")
-        end
+        entry = file.sub("#{package_root_path}/", '')
+        zipfile.add(entry, file)
+      rescue Zip::EntryExistsError
+        logger.info("#{file} already exists")
       end
     end
   end

data/lib/qti/models/base.rb

@@ -1,19 +1,22 @@
 module Qti
   class ParseError < StandardError; end
+
   class SpecificationViolation < StandardError; end
+
   class UnsupportedSchema < StandardError; end
 
   module Models
     class Base
       attr_reader :doc, :path, :package_root, :resource
       attr_accessor :manifest
+
       delegate :metadata, to: :@resource, allow_nil: true
 
       def sanitize_content!(html)
         sanitizer.clean(html)
       end
 
-      def self.from_path!(path, package_root = nil, resource = nil)
+      def self.from_path!(path, package_root: nil, resource: nil)
         new(path: path, package_root: package_root, resource: resource)
       end
 
@@ -82,7 +85,8 @@ module Qti
       def package_root=(package_root)
         @package_root = package_root
         return unless @package_root
-        @package_root = Pathname.new(@package_root).cleanpath.to_s + '/'
+
+        @package_root = "#{Pathname.new(@package_root).cleanpath}/"
       end
 
       def relative_path

data/lib/qti/models/manifest.rb

@@ -24,7 +24,8 @@ module Qti
         builder = ASSESSMENT_CLASSES[version.split('/').first]
         raise_unsupported unless builder
         rsc = resource_for(identifier, version)
-        assessment = builder.from_path!(remap_href_path(asset_resource_for(rsc)), @package_root, rsc)
+        assessment = builder.from_path!(remap_href_path(asset_resource_for(rsc)), package_root: @package_root,
+                                                                                  resource: rsc)
         assessment.canvas_meta_data(rsc.canvas_metadata)
         assessment
       end
@@ -46,7 +47,7 @@ module Qti
       end
 
       def embedded_non_assessment
-        Qti::V2::Models::NonAssessmentTest.from_path!(@path, @package_root)
+        Qti::V2::Models::NonAssessmentTest.from_path!(@path, package_root: @package_root)
       end
     end
   end

data/lib/qti/models/resource.rb

@@ -91,7 +91,7 @@ module Qti
         Resource.new(resource_node(base_xpath), self)
       end
 
-      def assessment_identifiers(embedded_as_assessment = true)
+      def assessment_identifiers(embedded_as_assessment: true)
         id_list = identifier_list('/assessment')
         return id_list + [EMBEDDED_NON_ASSESSMENT_ID] if embedded_as_assessment && embedded_non_assessment?
         id_list
@@ -109,13 +109,16 @@ module Qti
           doc = load_asset_resource(rsc_path)
 
           # There are other types, but all we support right now are object banks...
-          Qti::V1::Models::ObjectBank.from_path!(rsc_path, @package_root, rsc) unless doc.search('objectbank').empty?
+          unless doc.search('objectbank').empty?
+            Qti::V1::Models::ObjectBank.from_path!(rsc_path, package_root: @package_root,
+                                                             resource: rsc)
+          end
         end.reject(&:nil?)
       end
 
       def objectbanks
         load_associated_content.select do |c|
-          c.class == Qti::V1::Models::ObjectBank
+          c.instance_of?(Qti::V1::Models::ObjectBank)
         end
       end
 

data/lib/qti/sanitizer.rb

@@ -93,7 +93,7 @@ module Qti
       path = remap_href_path(node[:data])
       if path
         case node[:type]
-        when %r{^image\/}
+        when %r{^image/}
           return replace_with_image(node, node[:data])
         when 'text/html'
           return replace_with_html(node, path)

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

@@ -2,8 +2,8 @@ module Qti
   module V1
     module Models
       class AssessmentItem < Qti::V1::Models::Base
-        attr_reader :doc
-        attr_reader :resource
+        attr_reader :doc, :resource
+
         delegate :metadata, to: :@resource
 
         def initialize(item, package_root = nil, resource = nil)

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

@@ -56,11 +56,10 @@ module Qti
         end
 
         def self.get_matches(node, parent, classlist)
-          matches = classlist.each_with_object([]) do |interaction_class, result|
+          classlist.each_with_object([]) do |interaction_class, result|
             match = interaction_class.matches(node, parent)
             result << match if match
           end
-          matches
         end
       end
     end

data/lib/qti/v1/models/numerics/exact_match.rb

@@ -3,10 +3,6 @@ module Qti
     module Models
       module Numerics
         class ExactMatch < ScoringBase
-          def initialize(scoring_node)
-            super(scoring_node)
-          end
-
           def scoring_data
             return unless valid?
             Struct.new(

data/lib/qti/v1/models/numerics/margin_error.rb

@@ -3,10 +3,6 @@ module Qti
     module Models
       module Numerics
         class MarginError < ScoringBase
-          def initialize(scoring_node)
-            super(scoring_node)
-          end
-
           def scoring_data
             return unless valid?
             Struct.new(

data/lib/qti/v1/models/numerics/precision.rb

@@ -5,10 +5,6 @@ module Qti
         class Precision < ScoringBase
           include ActionView::Helpers::NumberHelper
 
-          def initialize(scoring_node)
-            super(scoring_node)
-          end
-
           def scoring_data
             return unless equal_node && gt_node && lte_node
             Struct.new(

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

@@ -4,6 +4,7 @@ module Qti
       module Numerics
         class ScoringData
           class UnsupportedNumreicType < StandardError; end
+
           def initialize(node)
             @scoring_node = ScoringNode.new(node)
           end

data/lib/qti/v1/models/numerics/within_range.rb

@@ -3,10 +3,6 @@ module Qti
     module Models
       module Numerics
         class WithinRange < ScoringBase
-          def initialize(scoring_node)
-            super(scoring_node)
-          end
-
           def scoring_data
             return unless valid?
             Struct.new(

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

@@ -38,6 +38,10 @@ module Qti
           selection&.xpath('xmlns:sourcebank_ref')&.text
         end
 
+        def sourcebank_export_id
+          selection&.xpath('xmlns:sourcebank_export_id')&.text
+        end
+
         def points_per_item
           selection.xpath('xmlns:selection_extension/xmlns:points_per_item')&.text&.to_f
         end

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

@@ -31,7 +31,8 @@ module Qti
         end
 
         def create_assessment_item(ref)
-          item = Qti::V2::Models::AssessmentItem.from_path!(ref[:path], @package_root, ref[:resource])
+          item = Qti::V2::Models::AssessmentItem.from_path!(ref[:path], package_root: @package_root,
+                                                                        resource: ref[:resource])
           item.manifest = manifest
           item
         end

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

@@ -6,7 +6,7 @@ module Qti
     module Models
       module Interactions
         class MatchInteraction < BaseInteraction
-          extend Forwardable
+          extend ::Forwardable
 
           attr_reader :implementation
 

data/lib/qti/version.rb

@@ -1,3 +1,3 @@
 module Qti
-  VERSION = '2.6.2'.freeze
+  VERSION = '2.7.1'.freeze
 end

data/lib/qti.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/module/delegation'
 require 'dry-struct'
 require 'find'
+require 'forwardable'
 require 'mathml2latex'
 require 'nokogiri'
 require 'pathname'
@@ -14,8 +15,8 @@ require 'zip'
 
 module Qti
   class Importer
-    attr_reader :package_root
-    attr_reader :assessment_id
+    attr_reader :package_root, :assessment_id
+
     delegate :assessment_identifiers, to: :@manifest
     delegate :question_bank_identifiers, to: :@manifest
 
@@ -39,7 +40,7 @@ module Qti
     def self.manifest(path)
       mpath = manifest_path(path)
       package_root = File.dirname(mpath)
-      manifest = Qti::Models::Manifest.from_path!(mpath, package_root = package_root)
+      manifest = Qti::Models::Manifest.from_path!(mpath, package_root: package_root)
       [mpath, package_root, manifest]
     end
 

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

@@ -16,6 +16,7 @@
               <points_per_item>1.0</points_per_item>
             </selection_extension>
             <sourcebank_ref>sourcebank_reference_uuid</sourcebank_ref>
+            <sourcebank_export_id>sourcebank_export_id_test</sourcebank_export_id>
           </selection>
         </selection_ordering>
         <item ident="i09d4a5492a38a5b4d1533b8fdbdf7376" title="Question">

data/spec/gemfiles/{rails-5.1.gemfile → rails-6.1.gemfile}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '../../'
 
-gem 'rails', '~> 5.1.4'
+gem 'rails', '~> 6.1.0'

data/spec/lib/qti/models/base_spec.rb

@@ -118,7 +118,7 @@ describe Qti::Models::Base do
       context 'with explicit package root' do
         let(:package_root) { File.join('spec', 'fixtures', 'test_qti_2.2') }
         let(:item_path) { File.join(package_root, 'true-false', 'true-false.xml') }
-        let(:item) { described_class.from_path!(item_path, package_root) }
+        let(:item) { described_class.from_path!(item_path, package_root: package_root) }
 
         it 'allows safe .. hrefs' do
           expect do
@@ -135,7 +135,7 @@ describe Qti::Models::Base do
 
       context 'with nil package root' do
         let(:item_path) { File.join('spec', 'fixtures', 'test_qti_2.2', 'true-false', 'true-false.xml') }
-        let(:item) { described_class.from_path!(item_path, nil) }
+        let(:item) { described_class.from_path!(item_path, package_root: nil) }
 
         it 'rejects .. hrefs' do
           expect do

data/spec/lib/qti/v1/models/question_group_spec.rb

@@ -8,6 +8,7 @@ describe Qti::V1::Models::QuestionGroup do
     expect(loaded_class.title).to eq('Group 1 (1/4)')
     expect(loaded_class.identifier).to eq('i4663897607358cfba8636ed6127b9466')
     expect(loaded_class.sourcebank_ref).to eq('sourcebank_reference_uuid')
+    expect(loaded_class.sourcebank_export_id).to eq('sourcebank_export_id_test')
     expect(loaded_class.items.count).to eq(4)
     expect(loaded_class.selection_number).to eq(1)
     expect(loaded_class.points_per_item).to eq(1)

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

@@ -84,9 +84,9 @@ describe Qti::V2::Models::AssessmentItem do
 
   #   it 'removes the passage from the item_body' do
   #     item = test_object.create_assessment_item(item_ref)
-  # rubocop:disable AsciiComments
+  # rubocop:disable Style/AsciiComments
   #     expect(item.item_body).not_to include '¡El equipo de hockey te necesita!'
-  # rubocop:enable AsciiComments
+  # rubocop:enable Style/AsciiComments
   #   end
   # end
 end

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

@@ -87,9 +87,9 @@ describe Qti::V2::Models::AssessmentTest do
   #       'passages', '0cfd5cf7-2c91-4b35-a57a-9f5d1709f68f.html'
   #     )
   #     stimulus = loaded_class.create_stimulus(stimulus_path)
-  # rubocop:disable AsciiComments
+  # rubocop:disable Style/AsciiComments
   #     expect(stimulus.title).to eq '¡El equipo de hockey te necesita!'
-  # rubocop:enable AsciiComments
+  # rubocop:enable Style/AsciiComments
   #   end
   # end
 end

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

@@ -11,17 +11,17 @@
 #   end
 
 #   it 'has the title' do
-# rubocop:disable AsciiComments
+# rubocop:disable Style/AsciiComments
 #     expect(loaded_class.title).to eq '¡El equipo de hockey te necesita!'
-# rubocop:enable AsciiComments
+# rubocop:enable Style/AsciiComments
 #   end
 
 #   it 'has sanitized item_body' do
 #     expect(loaded_class.body).to include '<div'
 #     expect(loaded_class.body).to include 'Listen to the audio passage.'
-# rubocop:disable AsciiComments
+# rubocop:disable Style/AsciiComments
 #     expect(loaded_class.body).to include '¡'
-# rubocop:enable AsciiComments
+# rubocop:enable Style/AsciiComments
 #   end
 
 #   it 'has the identifier used to identify it in manifest file' do

data/spec/lib/qti_spec.rb

@@ -40,8 +40,8 @@ describe Qti::Importer do
 
       it 'sets the path and package root properly' do
         item = importer.create_assessment_item(importer.assessment_item_refs.first)
-        expect(item.path).to eq file_path + '/quiz.xml'
-        expect(item.package_root).to eq file_path + '/'
+        expect(item.path).to eq "#{file_path}/quiz.xml"
+        expect(item.package_root).to eq "#{file_path}/"
       end
     end
 
@@ -64,7 +64,7 @@ describe Qti::Importer do
         ref = importer.assessment_item_refs.first
         item = importer.create_assessment_item(ref)
         expect(item.path).to eq ref[:path]
-        expect(item.package_root).to eq file_path + '/'
+        expect(item.package_root).to eq "#{file_path}/"
         expect(item.manifest).not_to be_nil
       end
     end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'byebug'
 
 # Limit coverage reporting to one build:
-if /^2\.6/ =~ RUBY_VERSION && /rails-6\.0/ =~ ENV['BUNDLE_GEMFILE']
+if /^2\.7/ =~ RUBY_VERSION && /rails-6\.1/ =~ ENV['BUNDLE_GEMFILE']
   require 'simplecov'
 
   SimpleCov.start do
@@ -16,7 +16,7 @@ end
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'qti'
 
-Dir['./spec/support/**/*.rb'].each { |f| require f }
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: qti
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.1
 platform: ruby
 authors:
 - Hannah Bottalla
 - Robinson Rodríguez
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -17,40 +17,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -183,14 +183,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -225,14 +225,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +275,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-description: 
+description:
 email:
 - hannah@instructure.com
 - rrodriguez-bd@instructure.com
@@ -613,9 +627,9 @@ files:
 - spec/fixtures/with_banks/non_cc_assessments/g9a20cf3af178b54e4792cbe992f65790.xml.qti
 - spec/fixtures/with_banks/non_cc_assessments/gab22de457404cb5cf022078f1e4da75e.xml.qti
 - spec/fixtures/with_banks/non_cc_assessments/gf3edf8167be16b3a65a00ca923132b07.xml.qti
-- spec/gemfiles/rails-5.1.gemfile
 - spec/gemfiles/rails-5.2.gemfile
 - spec/gemfiles/rails-6.0.gemfile
+- spec/gemfiles/rails-6.1.gemfile
 - spec/lib/qti/assessment_item_exporter_spec.rb
 - spec/lib/qti/exporter_spec.rb
 - spec/lib/qti/models/assessment_meta_spec.rb
@@ -670,7 +684,7 @@ homepage: https://github.com/instructure/qti
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -678,15 +692,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: QTI 1.2 and 2.1 import and export models
 test_files:
@@ -965,9 +979,9 @@ test_files:
 - spec/fixtures/with_banks/non_cc_assessments/g9a20cf3af178b54e4792cbe992f65790.xml.qti
 - spec/fixtures/with_banks/non_cc_assessments/gab22de457404cb5cf022078f1e4da75e.xml.qti
 - spec/fixtures/with_banks/non_cc_assessments/gf3edf8167be16b3a65a00ca923132b07.xml.qti
-- spec/gemfiles/rails-5.1.gemfile
 - spec/gemfiles/rails-5.2.gemfile
 - spec/gemfiles/rails-6.0.gemfile
+- spec/gemfiles/rails-6.1.gemfile
 - spec/lib/qti/assessment_item_exporter_spec.rb
 - spec/lib/qti/exporter_spec.rb
 - spec/lib/qti/models/assessment_meta_spec.rb