canvas_cc 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 264c090f7083b73806e3acc5ee49f0eeec3763ad
-  data.tar.gz: e01ea50a290a1e76d31670c4654cceb2a3e1be78
+  metadata.gz: a3f44e66afb42cf6f9156946b38420e4c729ca21
+  data.tar.gz: f4f282b47c9c7208764b71614558610872f36333
 SHA512:
-  metadata.gz: dd7eed758043656a86beffa5bcbfefce5f4e3b377667975b918ab0848cb10090a8e6709c7571e9e0022fddba01ae431b4f7987634f73907a1d0970f4abbc9c47
-  data.tar.gz: af43ed7b18a23ec2ccada816f515082a439c36435eee77ac46d371a4e739b0c37642d1263ee3f147ec4d67c61bf011a7e22a349a1696f740e11629ac3fcb4e54
+  metadata.gz: 7420ba56aacb50814f262a657f8a74ed8e7ea9b0932456fbaaf7b903a5fc874b458519df4cca77eaa956ff85d34d0aa4d86f385b2566389b31c392968199b997
+  data.tar.gz: dd9832a21cdda71a94ce045b9318d8f5dc5e4f34f4f6ffe4e540b0bd137bfbd168f883f14ced8304f7e0ac6285d1175b74f67847a1410190c5cfbf6c6a0001a2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    canvas_cc (0.0.18)
+    canvas_cc (0.0.22)
       builder
       happymapper
       nokogiri
@@ -42,16 +42,16 @@ GEM
       rspec (>= 2.14, < 4.0)
     happymapper (0.4.1)
       libxml-ruby (~> 2.0)
-    libxml-ruby (2.7.0)
+    libxml-ruby (2.8.0)
     listen (2.7.9)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    mini_portile (0.6.1)
+    mini_portile (0.6.2)
     minitest (5.4.1)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -61,7 +61,7 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdiscount (2.1.7.1)
+    rdiscount (2.1.8)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
@@ -70,7 +70,7 @@ GEM
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.2)
-    rubyzip (1.1.6)
+    rubyzip (1.1.7)
     slop (3.6.0)
     thor (0.19.1)
     timers (1.1.0)

data/lib/canvas_cc/canvas_cc/numerical_question_writer.rb

@@ -16,7 +16,7 @@ module CanvasCc::CanvasCC
       question.answers.each do |answer|
         tolerance = question.tolerances[answer.id]
         processing_node.respcondition(:continue => 'No') do |condition_node|
-          if answer.answer_text && !answer.answer_text.empty?
+          if answer.answer_text && !answer.answer_text.to_s.empty?
             condition_node.conditionvar do |var_node|
               var_node.or do |or_node|
                 or_node.varequal answer.answer_text, :respident => 'response1'

data/lib/canvas_cc/canvas_cc/question_writer.rb

@@ -83,7 +83,7 @@ module CanvasCc::CanvasCC
         item_node.itemfeedback(:ident => 'general_fb') do |fb_node|
           fb_node.flow_mat do |flow_node|
             flow_node.material do |material_node|
-              material_node.mattext(question.general_feedback, :texttype => 'text/plain')
+              material_node.mattext(question.general_feedback, :texttype => 'text/html')
             end
           end
         end
@@ -93,7 +93,7 @@ module CanvasCc::CanvasCC
         item_node.itemfeedback(:ident => 'general_correct_fb') do |fb_node|
           fb_node.flow_mat do |flow_node|
             flow_node.material do |material_node|
-              material_node.mattext(question.general_correct_feedback, :texttype => 'text/plain')
+              material_node.mattext(question.general_correct_feedback, :texttype => 'text/html')
             end
           end
         end
@@ -103,7 +103,7 @@ module CanvasCc::CanvasCC
         item_node.itemfeedback(:ident => 'general_incorrect_fb') do |fb_node|
           fb_node.flow_mat do |flow_node|
             flow_node.material do |material_node|
-              material_node.mattext(question.general_incorrect_feedback, :texttype => 'text/plain')
+              material_node.mattext(question.general_incorrect_feedback, :texttype => 'text/html')
             end
           end
         end
@@ -121,7 +121,7 @@ module CanvasCc::CanvasCC
         item_node.itemfeedback(:ident => "#{answer.id}_fb") do |feedback_node|
           feedback_node.flow_mat do |flow_node|
             flow_node.material do |material_node|
-              material_node.mattext answer.feedback, :texttype => 'text/plain'
+              material_node.mattext answer.feedback, :texttype => 'text/html'
             end
           end
         end

data/lib/canvas_cc/version.rb

@@ -1,3 +1,3 @@
 module CanvasCc
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/spec/moodle2cc/canvas_cc/multiple_answers_question_writer_spec.rb

@@ -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/plain\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer1.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
       expect(feedback.text).to eq answer1.feedback
     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/plain\"]")
+      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/plain\"]")
+      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

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/plain"]').text).to eq question.general_feedback
+      expect(general_feedback.at_xpath('flow_mat/material/mattext[@texttype="text/html"]').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/plain\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
       expect(feedback.text).to eq answer.feedback
     end
 

data/spec/moodle2cc/canvas_cc/short_answer_question_writer_spec.rb

@@ -43,7 +43,7 @@ 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/plain\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
       expect(feedback.text).to eq answer.feedback
     end
   end

data/spec/moodle2cc/canvas_cc/true_false_question_writer_spec.rb

@@ -52,10 +52,10 @@ 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/plain\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{true_answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
       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/plain\"]")
+      feedback = xml.at_xpath("item/itemfeedback[@ident=\"#{false_answer.id}_fb\"]/flow_mat/material/mattext[@texttype=\"text/html\"]")
       expect(feedback.text).to eq false_answer.feedback
     end
   end

metadata

@@ -1,223 +1,223 @@
 --- !ruby/object:Gem::Specification
 name: canvas_cc
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: happymapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 description: Create Canvas CC compatible file
@@ -410,17 +410,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Create Canvas CC compatible file
@@ -506,4 +506,3 @@ test_files:
 - test/unit/logger_test.rb
 - test/unit/migrator_test.rb
 - test/unit/resource_factory_test.rb
-has_rdoc: