canvas_cc 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df4b07c232a5a8159af168cb34204e147620d55a
-  data.tar.gz: f4c0a1d7f7c7f63c41a5f1fdc850823b416c93ee
+  metadata.gz: a7080470c3965daa5b415a043fbcd609737efed7
+  data.tar.gz: b327a4abf7c6915f5d3c3c8b694a4d4bf8044102
 SHA512:
-  metadata.gz: 2f959882d3e30073bbfc74a970cea56790b66d08ed18f77680400a4c2e6baef0e87024990680fd5a7860b4500df5ec0c5c27ba2cf55c4e961dec8c9d5248dc4a
-  data.tar.gz: 41eea0cc5c0ab5c8803bb613ab9860a4d554110d4e753978311de63af73242dbfe34cfd214cff8b8b2b4051dd37e7dbcb6cd3ffb32d339f4fdaeb5b7a5e2719d
+  metadata.gz: 2a406d76c71573444ad107ffec8f56f3e18ff58aa54d08775f94233b207132d2448cad1881d916c5da9eeda9e446df47d43ebf933c670223cb597f3a832ea6a8
+  data.tar.gz: 07d4d35fd462129363d1f0e67c2c0b0771e1ae483b6c041fa070dd87d6f1289975f22e2609b870bf3f137df79d93165ed1cbe3fc50414dbc4df069d13524c0cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    canvas_cc (0.0.7)
+    canvas_cc (0.0.8)
       builder
       happymapper
       nokogiri
@@ -49,10 +49,10 @@ GEM
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    mini_portile (0.6.0)
+    mini_portile (0.6.1)
     minitest (5.4.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)

data/lib/canvas_cc/canvas_cc/matching_question_writer.rb

@@ -19,6 +19,15 @@ module CanvasCc::CanvasCC
                 end
               end
             end
+
+            next unless question.distractors
+            question.distractors.each do |distractor|
+              choice_node.response_label(:ident => Digest::MD5.hexdigest(distractor)) do |label_node|
+                label_node.material do |material_node|
+                  material_node.mattext(distractor, :texttype => 'text/plain')
+                end
+              end
+            end
           end
         end
       end
@@ -34,10 +43,30 @@ module CanvasCc::CanvasCC
           end
           condition_node.setvar "%.2f" % score, :varname => 'SCORE', :action => 'Add'
         end
+
+        next unless match.has_key?(:answer_feedback) && match[:answer_feedback].length > 0
+        processing_node.respcondition do |condition_node|
+          condition_node.conditionvar do |var_node|
+            var_node.not do |not_node|
+              not_node.varequal match[:id], :respident => "response_#{match[:id]}"
+            end
+          end
+          condition_node.displayfeedback :linkrefid => "#{match[:id]}_fb", :feedbacktype => 'Response'
+        end
       end
     end
 
     def self.write_additional_nodes(item_node, question)
+      question.matches.each do |match|
+        next unless match.has_key?(:answer_feedback) && match[:answer_feedback].length > 0
+        item_node.itemfeedback(:ident => "#{match[:id]}_fb") do |feedback_node|
+          feedback_node.flow_mat do |flow_node|
+            flow_node.material do |material_node|
+              material_node.mattext match[:answer_feedback], :texttype => 'text/plain'
+            end
+          end
+        end
+      end
     end
   end
-end
+end

data/lib/canvas_cc/canvas_cc/models/matching_question.rb

@@ -2,6 +2,6 @@ module CanvasCc::CanvasCC::Models
   class MatchingQuestion < Question
     register_question_type 'matching_question'
 
-    attr_accessor :matches
+    attr_accessor :matches, :distractors
   end
-end
+end

data/lib/canvas_cc/version.rb

@@ -1,3 +1,3 @@
 module CanvasCc
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/moodle2cc/canvas_cc/matching_question_writer_spec.rb

@@ -10,9 +10,10 @@ module CanvasCc::CanvasCC
       question.title = 'its over nine thousannnd'
       question.general_feedback = 'ur totes awesome'
       question.material = 'this is a question, or is it?'
+      question.distractors = %w(distractor1 distractor2)
 
-      match1 = {:id => '1', :question_text => 'qtext', :question_text_format => '1', :answer_text => 'answer1'}
-      match2 = {:id => '2', :question_text => 'qtext2', :question_text_format => '1', :answer_text => 'answer2'}
+      match1 = {:id => '1', :question_text => 'qtext', :question_text_format => '1', :answer_text => 'answer1', :answer_feedback => 'good'}
+      match2 = {:id => '2', :question_text => 'qtext2', :question_text_format => '1', :answer_text => 'answer2', :answer_feedback => 'bad'}
       question.matches = [match1, match2]
 
       xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |node|
@@ -27,11 +28,15 @@ module CanvasCc::CanvasCC
       expect(response.at_xpath('material/mattext[@texttype="text/plain"]').text).to eq match1[:question_text]
       expect(response.at_xpath("render_choice/response_label[@ident=\"#{match1[:id]}\"]/material/mattext").text).to eq match1[:answer_text]
       expect(response.at_xpath("render_choice/response_label[@ident=\"#{match2[:id]}\"]/material/mattext").text).to eq match2[:answer_text]
+      expect(response.at_xpath("render_choice/response_label[@ident=\"#{Digest::MD5.hexdigest(question.distractors[0])}\"]/material/mattext").text).to eq question.distractors[0]
+      expect(response.at_xpath("render_choice/response_label[@ident=\"#{Digest::MD5.hexdigest(question.distractors[1])}\"]/material/mattext").text).to eq question.distractors[1]
 
       response = xml.at_xpath("item/presentation/response_lid[@ident=\"response_#{match2[:id]}\"]")
       expect(response.at_xpath('material/mattext[@texttype="text/plain"]').text).to eq match2[:question_text]
       expect(response.at_xpath("render_choice/response_label[@ident=\"#{match1[:id]}\"]/material/mattext").text).to eq match1[:answer_text]
       expect(response.at_xpath("render_choice/response_label[@ident=\"#{match2[:id]}\"]/material/mattext").text).to eq match2[:answer_text]
+      expect(response.at_xpath("render_choice/response_label[@ident=\"#{Digest::MD5.hexdigest(question.distractors[0])}\"]/material/mattext").text).to eq question.distractors[0]
+      expect(response.at_xpath("render_choice/response_label[@ident=\"#{Digest::MD5.hexdigest(question.distractors[1])}\"]/material/mattext").text).to eq question.distractors[1]
 
       condition = xml.at_xpath("item/resprocessing/respcondition/conditionvar[varequal=\"#{match1[:id]}\"]/..")
       expect(condition.at_xpath("conditionvar/varequal[@respident=\"response_#{match1[:id]}\"]")).not_to be_nil
@@ -40,12 +45,21 @@ module CanvasCc::CanvasCC
       expect(set_var.attributes['action'].value).to eq 'Add'
       expect(set_var.text).to eq '50.00'
 
+      condition = xml.at_xpath("item/resprocessing/respcondition/conditionvar/not[varequal=\"#{match1[:id]}\"]/..")
+      expect(condition.at_xpath("not/varequal[@respident=\"response_#{match1[:id]}\"]")).not_to be_nil
+      expect(condition.at_xpath("not/varequal[@respident=\"response_#{match1[:id]}\"]").text).to eq("1")
+
       condition = xml.at_xpath("item/resprocessing/respcondition/conditionvar[varequal=\"#{match2[:id]}\"]/..")
       expect(condition.at_xpath("conditionvar/varequal[@respident=\"response_#{match2[:id]}\"]")).not_to be_nil
       set_var = condition.at_xpath('setvar')
       expect(set_var.attributes['varname'].value).to eq 'SCORE'
       expect(set_var.attributes['action'].value).to eq 'Add'
       expect(set_var.text).to eq '50.00'
+
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{match1[:id]}_fb\"]/flow_mat/material/mattext[@texttype=\"text/plain\"]")
+      expect(feedback.text).to eq match1[:answer_feedback]
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{match2[:id]}_fb\"]/flow_mat/material/mattext[@texttype=\"text/plain\"]")
+      expect(feedback.text).to eq match2[:answer_feedback]
     end
   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
-
+       debugger
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_cc
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip