qti 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a0c13169b2a41c3d077eee5defae52d8cf5d60e
-  data.tar.gz: dff7cff54e6307c3f7d0700b85c208ad6e0e95b6
+  metadata.gz: '09f2878d599a454231899fde41beea26c04f38fc'
+  data.tar.gz: aa579b1c9d7637e0498824eed23fca4fb1d3279d
 SHA512:
-  metadata.gz: f7ca63b2d84bc3be43df780a89b27f873b9423e371e8f3c759d4557cb63b90b42f7e8b3629bc23f9c1f9ca5790a75d73d2c30141f399f7ba68125866fa32c7e8
-  data.tar.gz: 9a837ed2ff4f71e487784fceba65e054ea1db1007846c83f8c6158877d1df4482414bb8e2b244fea21f6f46c0dfa12b1169d5cdad186fc3eb618b682ca29ab55
+  metadata.gz: 1b2c438cf24947f35333a90d39a3a833d91edbea2defbe5ab5617a97625cda7a5c730af612ad7ed2e56165e5bd682e558d6c78e465e4f6e7f6e2f3fb26b97551
+  data.tar.gz: 1db85799a68254f20845f51477bb21cb73a0e4855665022413ecb382e44f857999fba6b73e4a2490e7289bd5fab51298a6c8d58da54e6c6d23e1181b1b3dcf21

data/lib/qti/models/assessment_meta.rb

@@ -0,0 +1,154 @@
+require 'qti/v1/models/base'
+
+module Qti
+  module Models
+    class AssessmentMeta < Qti::Models::Base
+      def title
+        sanitize_content!(tag_under_quiz('title'))
+      end
+
+      def description
+        sanitize_content!(tag_under_quiz('description'))
+      end
+
+      def shuffle_answers
+        tag_under_quiz('shuffle_answers')
+      end
+
+      def shuffle_answers?
+        string_true?(shuffle_answers)
+      end
+
+      def hide_results
+        tag_under_quiz('hide_results')
+      end
+
+      def scoring_policy
+        tag_under_quiz('scoring_policy')
+      end
+
+      def quiz_type
+        tag_under_quiz('quiz_type')
+      end
+
+      def points_possible_raw
+        tag_under_quiz('points_possible')
+      end
+
+      def points_possible
+        points_possible_raw.to_f
+      end
+
+      def show_correct_anwers
+        tag_under_quiz('show_correct_answers')
+      end
+
+      def anonymous_submissions
+        tag_under_quiz('anonymous_submissions')
+      end
+
+      def anonymous_submissions?
+        string_true?(anonymous_submissions)
+      end
+
+      def could_be_locked
+        tag_under_quiz('could_be_locked')
+      end
+
+      def could_be_locked?
+        string_true?(could_be_locked)
+      end
+
+      def allowed_attempts_raw
+        tag_under_quiz('allowed_attempts')
+      end
+
+      def allowed_attempts
+        allowed_attempts_raw.to_i
+      end
+
+      def one_question_at_a_time
+        tag_under_quiz('one_question_at_a_time')
+      end
+
+      def one_question_at_a_time?
+        one_question_at_a_time == 'true'
+      end
+
+      def cant_go_back
+        tag_under_quiz('cant_go_back')
+      end
+
+      def cant_go_back?
+        string_true?(cant_go_back)
+      end
+
+      def available
+        tag_under_quiz('available')
+      end
+
+      def available?
+        string_true?(available)
+      end
+
+      def one_time_results
+        tag_under_quiz('one_time_results')
+      end
+
+      def one_time_results?
+        string_true?(one_time_results)
+      end
+
+      def show_correct_answers_last_attempt
+        tag_under_quiz('show_correct_answers_last_attempt')
+      end
+
+      def show_correct_answers_last_attempt?
+        string_true?(show_correct_answers_last_attempt)
+      end
+
+      def only_visible_to_overreides
+        tag_under_quiz('only_visible_to_overrides')
+      end
+
+      def only_visible_to_overrides?
+        string_true?(only_visible_to_overrides)
+      end
+
+      def module_locked
+        tag_under_quiz('module_locked')
+      end
+
+      def module_locked?
+        string_true?(module_locked)
+      end
+
+      private
+
+      def tag_under_quiz(tag)
+        @doc.xpath("//xmlns:quiz/xmlns:#{tag}")&.first&.content
+      end
+
+      def string_true?(value)
+        value&.casecmp('true')&.zero?
+      end
+    end
+
+    module AssessmentMetaBase
+      delegate :title, :description,
+        :shuffle_answers?, :scoring_policy, :points_possible,
+        :hide_results, :quiz_type, :anonymous_submissions?,
+        :could_be_locked?, :allowed_attempts, :one_question_at_a_time?,
+        :cant_go_back?, :available?, :one_time_results?,
+        :show_correct_answers_attempt?, :only_visible_to_overrides?,
+        :module_locked?,
+        to: :@canvas_meta_data, prefix: :canvas, allow_nil: true
+
+      alias canvas_instructions canvas_description
+
+      def canvas_meta_data(meta_data)
+        @canvas_meta_data ||= meta_data
+      end
+    end
+  end
+end

data/lib/qti/models/manifest.rb

@@ -1,4 +1,5 @@
 require 'qti/v1/models/base'
+require 'qti/models/assessment_meta'
 require 'qti/v1/models/assessment'
 require 'qti/v2/models/assessment_test'
 require 'qti/v2/models/non_assessment_test'
@@ -51,13 +52,15 @@ module Qti
         return embedded_non_assessment if identifier == EMBEDDED_NON_ASSESSMENT_ID
         rsc_ver = xpath_with_single_check(xpath_xmlns_resource("[@identifier='#{identifier}']"))&.[](:type)
         raise_unsupported unless rsc_ver
-        builder = assessment_class_from_version(rsc_ver)
-        raise_unsupported unless builder
-        builder.from_path!(remap_href_path(asset_resource_for(identifier, rsc_ver)), @package_root)
+        assessment_from(rsc_ver, identifier)
       end
 
-      def assessment_class_from_version(version)
-        ASSESSMENT_CLASSES[version.split('/').first]
+      def assessment_from(version, identifier)
+        builder = ASSESSMENT_CLASSES[version.split('/').first]
+        raise_unsupported unless builder
+        assessment = builder.from_path!(remap_href_path(asset_resource_for(identifier, version)), @package_root)
+        assessment.canvas_meta_data(canvas_meta_data_for(identifier))
+        assessment
       end
 
       def asset_resource_for(identifier, qti_type)
@@ -65,6 +68,18 @@ module Qti
         xmlns_resource(base_xpath + '/@href') || xmlns_resource(base_xpath + '/xmlns:file/@href')
       end
 
+      def dependency_id(identifier)
+        xmlns_resource("[@identifier='#{identifier}']/xmlns:dependency/@identifierref")
+      end
+
+      def canvas_meta_data_for(identifier)
+        dep_id = dependency_id(identifier)
+        meta_file = xmlns_resource(
+          "[@identifier='#{dep_id}']/xmlns:file[#{xpath_endswith('@href', 'assessment_meta.xml')}]/@href"
+        )
+        return Qti::Models::AssessmentMeta.from_path!(File.join(@package_root, meta_file)) if meta_file
+      end
+
       def xmlns_resource(type)
         xpath_with_single_check(xpath_xmlns_resource(type))&.content
       end
@@ -81,12 +96,15 @@ module Qti
         "//xmlns:resources/xmlns:resource#{type}"
       end
 
+      def xpath_endswith(tag, tail)
+        "substring(#{tag}, string-length(#{tag}) - string-length('#{tail}') + 1) = '#{tail}'"
+      end
+
       def rtype_predicate(ver, rsc_type)
         # XPath 2.0 supports ends-with, which is what substring is doing here.
         # It also support regex matching with matches.
         # We only have XPath 1.0 available.
-        cc_match = "starts-with(@type, '#{ver}') and " \
-          "substring(@type, string-length(@type) - string-length('#{rsc_type}') + 1) = '#{rsc_type}'"
+        cc_match = "starts-with(@type, '#{ver}') and " + xpath_endswith('@type', rsc_type)
         qti_match = "@type='#{ver}'"
         "#{qti_match} or (#{cc_match})"
       end

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

@@ -1,9 +1,11 @@
 require 'qti/v1/models/base'
+require 'qti/models/assessment_meta'
 
 module Qti
   module V1
     module Models
       class Assessment < Qti::V1::Models::Base
+        include Qti::Models::AssessmentMetaBase
         def title
           @title ||= xpath_with_single_check('.//xmlns:assessment/@title')&.content || File.basename(@path, '.xml')
         end

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

@@ -24,7 +24,7 @@ module Qti
             node.xpath('.//xmlns:var_set').map do |anode|
               {
                 inputs: vars_at_node(anode),
-                output: anode.at_xpath('.//xmlns:answer').text
+                output: anode.at_xpath('.//xmlns:answer')&.text&.to_f
               }
             end
           end
@@ -66,7 +66,7 @@ module Qti
             parent_node.xpath('.//xmlns:var').map do |vnode|
               {
                 name: vnode.attributes['name']&.value,
-                value: vnode.text
+                value: vnode.text&.to_f
               }
             end
           end

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

@@ -1,9 +1,11 @@
 require 'qti/v2/models/base'
+require 'qti/models/assessment_meta'
 
 module Qti
   module V2
     module Models
       class AssessmentTest < Qti::V2::Models::Base
+        include Qti::Models::AssessmentMetaBase
         def title
           @title ||= xpath_with_single_check('//xmlns:assessmentTest/@title')&.content || File.basename(@path, '.xml')
         end

data/lib/qti/version.rb

@@ -1,3 +1,3 @@
 module Qti
-  VERSION = '0.9.16'.freeze
+  VERSION = '0.9.17'.freeze
 end

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

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    qti (0.9.16)
+    qti (0.9.17)
       actionview (>= 4.2.0)
       activesupport (>= 4.2.9, < 5.2)
       dry-struct (~> 0.2.1)
@@ -114,7 +114,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
     rubyzip (1.2.1)
-    sanitize (4.6.4)
+    sanitize (4.6.5)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
@@ -146,4 +146,4 @@ DEPENDENCIES
   wwtd (~> 1.3)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/spec/gemfiles/nokogiri-1.8.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    qti (0.9.16)
+    qti (0.9.17)
       actionview (>= 4.2.0)
       activesupport (>= 4.2.9, < 5.2)
       dry-struct (~> 0.2.1)
@@ -114,7 +114,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
     rubyzip (1.2.1)
-    sanitize (4.6.4)
+    sanitize (4.6.5)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
@@ -146,4 +146,4 @@ DEPENDENCIES
   wwtd (~> 1.3)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/spec/gemfiles/rails-4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    qti (0.9.16)
+    qti (0.9.17)
       actionview (>= 4.2.0)
       activesupport (>= 4.2.9, < 5.2)
       dry-struct (~> 0.2.1)
@@ -165,7 +165,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
     rubyzip (1.2.1)
-    sanitize (4.6.4)
+    sanitize (4.6.5)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
@@ -205,4 +205,4 @@ DEPENDENCIES
   wwtd (~> 1.3)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/spec/gemfiles/rails-5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    qti (0.9.16)
+    qti (0.9.17)
       actionview (>= 4.2.0)
       activesupport (>= 4.2.9, < 5.2)
       dry-struct (~> 0.2.1)
@@ -168,7 +168,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
     rubyzip (1.2.1)
-    sanitize (4.6.4)
+    sanitize (4.6.5)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
@@ -211,4 +211,4 @@ DEPENDENCIES
   wwtd (~> 1.3)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

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

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+context 'Canvas Assessment Meta Data' do
+  let(:fixtures_path) { File.join('spec', 'fixtures') }
+  let(:file_path) { File.join(fixtures_path, qti_file) }
+  let(:assessment) { Qti::Importer.new(file_path).test_object }
+
+  shared_examples 'loads canvas meta data' do
+    it 'creates a vaild assessment' do
+      expect(assessment).to be_kind_of(assessment_type)
+      expect(assessment.canvas_title).to eq(title)
+      expect(assessment.canvas_description).to eq(instructions)
+      expect(assessment.canvas_instructions).to eq(instructions)
+      expect(assessment.canvas_points_possible).to eq(points_possible)
+      expect(assessment.canvas_one_question_at_a_time?).to eq(oqaat)
+      expect(assessment.canvas_allowed_attempts).to eq(allowed_attempts)
+      expect(assessment.canvas_hide_results).to eq(hide_results)
+      expect(assessment.canvas_quiz_type).to eq(quiz_type)
+      expect(assessment.canvas_anonymous_submissions?).to eq(anon_submissions)
+      expect(assessment.canvas_could_be_locked?).to eq(could_be_locked)
+      expect(assessment.canvas_cant_go_back?).to eq(nobacktracking)
+      expect(assessment.canvas_available?).to eq(available)
+      expect(assessment.canvas_one_time_results?).to eq(one_time_results)
+      expect(assessment.canvas_scoring_policy).to eq(scoring_policy)
+      expect(assessment.canvas_shuffle_answers?).to eq(shuffle_answers)
+    end
+  end
+
+  describe 'in a QTI 1.2 container' do
+    let(:qti_file) { 'test_qti_1.2_canvas' }
+    let(:assessment_type) { Qti::V1::Models::Assessment }
+    let(:title) { 'WIJsfijdi' }
+    let(:instructions) { '<p>sdvsv</p>' }
+    let(:points_possible) { 4.0 }
+    let(:oqaat) { false }
+    let(:allowed_attempts) { 1 }
+    let(:hide_results) { nil }
+    let(:quiz_type) { 'assignment' }
+    let('anon_submissions') { false }
+    let(:could_be_locked) { false }
+    let(:nobacktracking) { false }
+    let(:available) { true }
+    let(:one_time_results) { false }
+    let(:scoring_policy) { 'keep_highest' }
+    let(:shuffle_answers) { false }
+
+    include_examples('loads canvas meta data')
+  end
+
+  describe 'in a Common Cartridge container' do
+    let(:qti_file) { 'test_imscc_canvas' }
+    let(:assessment_type) { Qti::V1::Models::Assessment }
+    let(:title) { 'Quiz #1' }
+    let(:instructions) { '' }
+    let(:points_possible) { 1.0 }
+    let(:oqaat) { false }
+    let(:allowed_attempts) { 1 }
+    let(:hide_results) { '' }
+    let(:quiz_type) { 'assignment' }
+    let('anon_submissions') { false }
+    let(:could_be_locked) { false }
+    let(:nobacktracking) { false }
+    let(:available) { true }
+    let(:one_time_results) { false }
+    let(:scoring_policy) { 'keep_highest' }
+    let(:shuffle_answers) { false }
+
+    include_examples('loads canvas meta data')
+  end
+end

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

@@ -38,7 +38,7 @@ describe Qti::V1::Models::Interactions::FormulaInteraction do
   context 'Simple Formula' do
     let(:file_path) { File.join(fixtures_path, 'formula.xml') }
 
-    let(:scoring_data_values) { %w[9.0 9.0 6.0 2.0 3.0] }
+    let(:scoring_data_values) { [9.0, 9.0, 6.0, 2.0, 3.0] }
 
     let(:answer_tolerance) { '0' }
     let(:margin_of_error) { { margin: '0', margin_type: 'absolute' } }
@@ -58,7 +58,7 @@ describe Qti::V1::Models::Interactions::FormulaInteraction do
   context 'Multiple variable formula' do
     let(:file_path) { File.join(fixtures_path, 'formula_mvar.xml') }
 
-    let(:scoring_data_values) { %w[16.0 7.0 14.0 5.0 7.0 14.0 11.0 7.0 20.0 13.0] }
+    let(:scoring_data_values) { [16.0, 7.0, 14.0, 5.0, 7.0, 14.0, 11.0, 7.0, 20.0, 13.0] }
 
     let(:answer_tolerance) { '0' }
     let(:margin_of_error) { { margin: '0', margin_type: 'absolute' } }
@@ -81,7 +81,7 @@ describe Qti::V1::Models::Interactions::FormulaInteraction do
   context 'Multiple Formula Steps' do
     let(:file_path) { File.join(fixtures_path, 'formula_mform.xml') }
 
-    let(:scoring_data_values) { %w[82.58 23.72 39.75 46.25 41.03] }
+    let(:scoring_data_values) { [82.58, 23.72, 39.75, 46.25, 41.03] }
 
     let(:answer_tolerance) { '10%' }
     let(:margin_of_error) { { margin: '10', margin_type: 'percent' } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qti
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - Hannah Bottalla
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -288,6 +288,7 @@ files:
 - lib/qti/content_packaging/outcome_declaration.rb
 - lib/qti/content_packaging/simple_choice.rb
 - lib/qti/exporter.rb
+- lib/qti/models/assessment_meta.rb
 - lib/qti/models/base.rb
 - lib/qti/models/manifest.rb
 - lib/qti/v1/models/assessment.rb
@@ -1209,6 +1210,7 @@ files:
 - spec/gemfiles/sanitize-4.5.gemfile.lock
 - spec/lib/qti/assessment_item_exporter_spec.rb
 - spec/lib/qti/exporter_spec.rb
+- spec/lib/qti/models/assessment_meta_spec.rb
 - spec/lib/qti/models/base_spec.rb
 - spec/lib/qti/models/manifest_spec.rb
 - spec/lib/qti/v1/models/assessment_item_spec.rb
@@ -2147,6 +2149,7 @@ test_files:
 - spec/gemfiles/sanitize-4.5.gemfile.lock
 - spec/lib/qti/assessment_item_exporter_spec.rb
 - spec/lib/qti/exporter_spec.rb
+- spec/lib/qti/models/assessment_meta_spec.rb
 - spec/lib/qti/models/base_spec.rb
 - spec/lib/qti/models/manifest_spec.rb
 - spec/lib/qti/v1/models/assessment_item_spec.rb