canvas_cc 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00a8e65390d41cd471d721eaace37d095f02853b
-  data.tar.gz: dfb6fe7cd316dfd180ac885a71231944cedd254b
+  metadata.gz: 1353f996dbae51f90ef66a15ea6710bb7fd26243
+  data.tar.gz: cfacb8d84b95dcd767c7bcba8a6e3a75c5d1d5b3
 SHA512:
-  metadata.gz: b7d132358fe8e2890e9be96d7d6213fc898b086141a935e9ac4b3056e991f9bbceb4ea01f6e826d059729b8a5af01282c6bb89b4ef4b295eb8b68aba371dcc72
-  data.tar.gz: 960548089f8c5e7593ff4b7a9bff02bf40e67d058c0279331d9b1732e6cd2d52a2e02e67843697b9ffdb7aabdf0e8ff2ba52e80c2e0564e15e3c32a53f001728
+  metadata.gz: c7c5d8081b0e86c1d9cc6217b955af3f72b766f9cb5bdcb9d6a566f2e46d9df29d49b560d7fa0b4d59b3eadf6276da5b430f0900b55423f5a05025a52b6c8603
+  data.tar.gz: da0c4c112c27771d15d961b4ccdfae4715f160bf07ca372f5103ef2cac74e1018fc4785e391924fa89118f98bf15f154df81b5a1761eff5278ba6d13f3e6b3b2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    canvas_cc (0.0.8)
+    canvas_cc (0.0.11)
       builder
       happymapper
       nokogiri

data/lib/canvas_cc/canvas_cc/file_upload_question_writer.rb

@@ -0,0 +1,19 @@
+module CanvasCc::CanvasCC
+  class FileUploadQuestionWriter < QuestionWriter
+
+    register_writer_type 'file_upload_question'
+
+    private
+
+    def self.write_question_item_xml(node, question)
+      node.item(:title => question.title, :ident => question.identifier) do |item_node|
+        write_qti_metadata(item_node, question)
+        item_node.presentation do |presentation_node|
+          presentation_node.material do |material_node|
+            material_node.mattext(question.material, :texttype => 'text/html')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/canvas_cc/canvas_cc/models/question.rb

@@ -3,7 +3,8 @@ module CanvasCc::CanvasCC::Models
     QTI_META_ATTRIBUTES = [:question_type, :points_possible, :assessment_question_identifierref]
     STANDARD_QUESTION_TYPES = ['essay_question', 'fill_in_multiple_blanks_question',
                                'multiple_choice_question', 'multiple_answers_question',
-                               'short_answer_question', 'text_only_question', 'true_false_question']
+                               'short_answer_question', 'text_only_question', 'true_false_question',
+                               'file_upload_question']
 
     attr_accessor :identifier, :original_identifier, :title, :material, :answers, :general_feedback,
     :general_incorrect_feedback, :general_correct_feedback, *QTI_META_ATTRIBUTES

data/lib/canvas_cc/canvas_cc/multiple_blanks_question_writer.rb

@@ -7,7 +7,7 @@ module CanvasCc::CanvasCC
     def self.write_responses(presentation_node, question)
       resp_idents = question.answers.map{|a| a.resp_ident}.uniq
       resp_idents.each do |resp_ident|
-        presentation_node.response_lid(:ident => resp_ident) do |response_node|
+        presentation_node.response_lid(:ident => resp_ident, :rcardinality => 'Single') do |response_node|
           response_node.render_choice do |choice_node|
             question.answers.select{|a| a.resp_ident == resp_ident}.each do |answer|
               choice_node.response_label(:ident => answer.id) do |label_node|
@@ -35,7 +35,7 @@ module CanvasCc::CanvasCC
 
       # Scores
       question.answers.each do |answer|
-        processing_node.respcondition() do |condition_node|
+        processing_node.respcondition(:continue => 'No') do |condition_node|
           condition_node.conditionvar do |var_node|
             var_node.varequal answer.id, :respident => answer.resp_ident
           end
@@ -44,8 +44,5 @@ module CanvasCc::CanvasCC
       end
     end
 
-    # def self.write_additional_nodes(item_node, question)
-    #   write_standard_answer_feedbacks(item_node, question)
-    # end
   end
 end

data/lib/canvas_cc/canvas_cc/question_writer.rb

@@ -147,3 +147,4 @@ require_relative 'numerical_question_writer'
 require_relative 'short_answer_question_writer'
 require_relative 'text_only_question_writer'
 require_relative 'true_false_question_writer'
+require_relative 'file_upload_question_writer'

data/lib/canvas_cc/version.rb

@@ -1,3 +1,3 @@
 module CanvasCc
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/canvas_cc.rb

@@ -66,6 +66,7 @@ module CanvasCc
     autoload :ShortAnswerQuestionWriter, 'canvas_cc/canvas_cc/short_answer_question_writer'
     autoload :TextOnlyQuestionWriter, 'canvas_cc/canvas_cc/text_only_question_writer'
     autoload :TrueFalseQuestionWriter, 'canvas_cc/canvas_cc/true_false_question_writer'
+    autoload :FileUploadQuestionWriter, 'canvas_cc/canvas_cc/file_upload_question_writer'
 
     autoload :QuestionBankWriter, 'canvas_cc/canvas_cc/question_bank_writer'
     autoload :QuestionGroupWriter, 'canvas_cc/canvas_cc/question_group_writer'

data/spec/moodle2cc/canvas_cc/file_upload_question_writer_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module CanvasCc::CanvasCC
+  describe FileUploadQuestionWriter do
+
+    let(:question) { CanvasCc::CanvasCC::Models::Question.create('file_upload_question')}
+
+    it 'creates the question item xml for a file upload question' do
+      question.identifier = 4200
+      question.title = 'hello title'
+      question.general_feedback = 'feedbacks'
+      question.material = 'this is the material'
+
+      xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |node|
+        QuestionWriter.write_question(node, question)
+      end.doc
+
+      expect(xml.at_xpath('item/@ident').value).to eq question.identifier.to_s
+      expect(xml.at_xpath('item/@title').value).to eq question.title
+      expect(xml.at_xpath("item/itemmetadata/qtimetadata/qtimetadatafield[fieldlabel=\"question_type\" and fieldentry=\"#{question.question_type}\"]")).to_not be_nil
+    end
+  end
+end

data/spec/moodle2cc/canvas_cc/multiple_answers_question_writer_spec.rb

@@ -29,7 +29,7 @@ module CanvasCc::CanvasCC
       xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |node|
         QuestionWriter.write_question(node, question)
       end.doc
-      
+
       expect(xml.at_xpath('item/@ident').value).to eq question.identifier.to_s
       expect(xml.at_xpath('item/@title').value).to eq question.title
       expect(xml.at_xpath("item/itemmetadata/qtimetadata/qtimetadatafield[fieldlabel=\"question_type\" and fieldentry=\"#{question.question_type}\"]")).to_not be_nil
@@ -47,7 +47,7 @@ module CanvasCc::CanvasCC
       expect(condition.at_xpath("conditionvar/and/not/varequal[@respident=\"response1\" and text()=\"#{answer2.id}\"]")).not_to be_nil
       expect(condition.at_xpath("conditionvar/and/varequal[@respident=\"response1\" and text()=\"#{answer3.id}\"]")).not_to be_nil
 
-      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer1.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer1.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/plain\"]")
       expect(feedback.text).to eq answer1.feedback
     end
   end

data/spec/moodle2cc/canvas_cc/multiple_blanks_question_writer_spec.rb

@@ -46,22 +46,6 @@ module CanvasCc::CanvasCC
       expect(response.attributes['ident'].value).to eq 'response2'
       expect(response.at_xpath("render_choice/response_label[@ident=\"#{answer2.id}\"]/material/mattext[@texttype=\"text/html\" and text()=\"#{answer2.answer_text}\"]")).not_to be_nil
 
-      # Feedback
-      condition = xml.at_xpath("item/resprocessing/respcondition[@continue=\"Yes\"]/conditionvar/varequal[@respident=\"response1\" and text()=\"#{answer1.id}\"]/../..")
-      expect(condition).not_to be_nil
-      feedback = condition.at_xpath("displayfeedback[@feedbacktype=\"Response\" and @linkrefid=\"#{answer1.id}_fb\"]")
-      expect(feedback).not_to be_nil
-
-      condition = xml.at_xpath("item/resprocessing/respcondition[@continue=\"Yes\"]/conditionvar/varequal[@respident=\"response2\" and text()=\"#{answer2.id}\"]/../..")
-      expect(condition).not_to be_nil
-      feedback = condition.at_xpath("displayfeedback[@feedbacktype=\"Response\" and @linkrefid=\"#{answer2.id}_fb\"]")
-      expect(feedback).not_to be_nil
-
-      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer1.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
-      expect(feedback.text).to eq answer1.feedback
-      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer2.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
-      expect(feedback.text).to eq answer2.feedback
-
       # Conditions
       condition = xml.at_xpath("item/resprocessing/respcondition[@continue=\"No\"]/conditionvar/varequal[@respident=\"response1\" and text()=\"#{answer1.id}\"]/../..")
       expect(condition).not_to be_nil
@@ -74,4 +58,4 @@ module CanvasCc::CanvasCC
       expect(setvar).not_to be_nil
     end
   end
-end
+end

data/spec/moodle2cc/canvas_cc/multiple_choice_question_writer_spec.rb

@@ -49,9 +49,9 @@ module CanvasCc::CanvasCC
       feedback = condition.at_xpath("displayfeedback[@feedbacktype=\"Response\" and @linkrefid=\"#{answer2.id}_fb\"]")
       expect(feedback).not_to be_nil
 
-      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer1.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer1.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/plain\"]")
       expect(feedback.text).to eq answer1.feedback
-      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer2.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer2.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/plain\"]")
       expect(feedback.text).to eq answer2.feedback
 
       # Conditions
@@ -66,4 +66,4 @@ module CanvasCc::CanvasCC
       expect(setvar).not_to be_nil
     end
   end
-end
+end

data/spec/moodle2cc/canvas_cc/question_writer_spec.rb

@@ -100,7 +100,7 @@ module CanvasCc::CanvasCC
 
       general_feedback = xml.at_xpath('item/itemfeedback[@ident="general_fb"]')
       expect(general_feedback).to_not be_nil
-      expect(general_feedback.at_xpath('flow_mat/material/mattext[@texttype="text/html"]').text).to eq question.general_feedback
+      expect(general_feedback.at_xpath('flow_mat/material/mattext[@texttype="text/plain"]').text).to eq question.general_feedback
     end
 
     it 'writes standard answer feedback if called' do
@@ -113,7 +113,7 @@ module CanvasCc::CanvasCC
         QuestionWriter.write_question(node, question)
       end.doc
 
-      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/plain\"]")
       expect(feedback.text).to eq answer.feedback
     end
 
@@ -126,4 +126,4 @@ module CanvasCc::CanvasCC
     end
 
   end
-end
+end

data/spec/moodle2cc/canvas_cc/short_answer_question_writer_spec.rb

@@ -43,8 +43,8 @@ module CanvasCc::CanvasCC
       feedback = condition.at_xpath("displayfeedback[@feedbacktype=\"Response\" and @linkrefid=\"#{answer.id}_fb\"]")
       expect(feedback).to_not be_nil
 
-      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/plain\"]")
       expect(feedback.text).to eq answer.feedback
     end
   end
-end
+end

data/spec/moodle2cc/canvas_cc/true_false_question_writer_spec.rb

@@ -52,11 +52,11 @@ module CanvasCc::CanvasCC
       setvar = condition.at_xpath('setvar[@varname="SCORE" and @action="Set" and text()="0"]')
       expect(setvar).not_to be_nil
 
-      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{true_answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{true_answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/plain\"]")
       expect(feedback.text).to eq true_answer.feedback
 
-      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{false_answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{false_answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/plain\"]")
       expect(feedback.text).to eq false_answer.feedback
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_cc
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -261,6 +261,7 @@ files:
 - lib/canvas_cc/canvas_cc/discussion_writer.rb
 - lib/canvas_cc/canvas_cc/essay_question_writer.rb
 - lib/canvas_cc/canvas_cc/file_meta_writer.rb
+- lib/canvas_cc/canvas_cc/file_upload_question_writer.rb
 - lib/canvas_cc/canvas_cc/ims_manifest_generator.rb
 - lib/canvas_cc/canvas_cc/matching_question_writer.rb
 - lib/canvas_cc/canvas_cc/models/answer.rb
@@ -325,6 +326,7 @@ files:
 - spec/moodle2cc/canvas_cc/discussion_writer_spec.rb
 - spec/moodle2cc/canvas_cc/essay_question_writer_spec.rb
 - spec/moodle2cc/canvas_cc/file_meta_writer_spec.rb
+- spec/moodle2cc/canvas_cc/file_upload_question_writer_spec.rb
 - spec/moodle2cc/canvas_cc/ims_manifest_generator_spec.rb
 - spec/moodle2cc/canvas_cc/matching_question_writer_spec.rb
 - spec/moodle2cc/canvas_cc/models/assessment_spec.rb
@@ -430,6 +432,7 @@ test_files:
 - spec/moodle2cc/canvas_cc/discussion_writer_spec.rb
 - spec/moodle2cc/canvas_cc/essay_question_writer_spec.rb
 - spec/moodle2cc/canvas_cc/file_meta_writer_spec.rb
+- spec/moodle2cc/canvas_cc/file_upload_question_writer_spec.rb
 - spec/moodle2cc/canvas_cc/ims_manifest_generator_spec.rb
 - spec/moodle2cc/canvas_cc/matching_question_writer_spec.rb
 - spec/moodle2cc/canvas_cc/models/assessment_spec.rb