moodle2cc 0.1.6 → 0.1.7

data/.travis.yml

@@ -0,0 +1,6 @@
+nguage: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.3"
+  - "2.0.0"
+script: bundle exec rake

data/Changelog

@@ -0,0 +1,40 @@
+2013-06-27 Version 0.1.7
+    * Include question images when converting to QTI
+		* Added travis setup for happiness
+
+2012-12-07 Version 0.1.6
+    * Added Changelog
+    * Don't error out when trying to reference non-existent quiz question
+
+2012-08-20 Version 0.1.5
+
+    * Readme improvements
+        * Listed todo items for complete Common Cartridge conversion support
+    * Added assignment conversion to plain CC
+    * Added wiki page conversion to plain CC
+
+2012-08-15 Version 0.1.4
+
+    * More robust URI parsing
+
+2012-08-06 Version 0.1.3
+
+    * Fix external link and attachment references
+    * Fix ordering of module items
+
+
+2012-08-03 Version 0.1.2
+
+    * Add quiz support
+    * Better handle wiki titles and summaries
+
+
+2012-07-26 Version 0.1.1
+
+    * Fix extra whitespace errors
+    * Add ability to inject logger during conversion process 
+
+
+2012-7-24 Version 0.1.0
+
+    * Initial release

data/lib/moodle2cc/canvas/question.rb

@@ -116,6 +116,7 @@ module Moodle2CC::Canvas
       material = question.text
       material = question.content || '' if material.nil?
       material = material.gsub(/\{(.*?)\}/, '[\1]')
+      material = image_html(question.image) + material unless question.image.nil? || question.image.strip == ''
       material = RDiscount.new(material).to_html if question.format == 4 # markdown
       @material = material
 
@@ -467,5 +468,10 @@ module Moodle2CC::Canvas
       return 100 if fraction.nil?
       (100 * fraction).to_i
     end
+
+    def image_html(image)
+      image = image.strip
+      %{<img src="#{WEB_CONTENT_TOKEN}/#{image}" alt="#{image}"/>}
+    end
   end
 end

data/lib/moodle2cc/moodle/question.rb

@@ -80,6 +80,7 @@ module Moodle2CC::Moodle
     element :position, Integer, :tag => 'POSITION'
     element :type, String, :tag => 'QTYPE'
     element :type_id, Integer, :tag => 'TYPE_ID'
+    element :image, String, :tag => 'IMAGE'
     has_many :numericals, Numerical
     has_many :answers, Answer
     has_many :calculations, Calculation

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/{test → lib/test}/test_helper.rb

@@ -2,13 +2,13 @@ require 'zip/zipfilesystem'
 
 module TestHelper
   def create_moodle_backup_zip(backup_name='moodle_backup')
-    moodle_backup_path = File.expand_path("../tmp/#{backup_name}.zip", __FILE__)
+    moodle_backup_path = File.expand_path("../../../test/tmp/#{backup_name}.zip", __FILE__)
     Zip::ZipFile.open(moodle_backup_path, Zip::ZipFile::CREATE) do |zipfile|
-      zipfile.add("moodle.xml", File.expand_path("../fixtures/#{backup_name}/moodle.xml", __FILE__))
+      zipfile.add("moodle.xml", File.expand_path("../../../test/fixtures/#{backup_name}/moodle.xml", __FILE__))
       zipfile.mkdir("course_files")
       zipfile.mkdir("course_files/folder")
-      zipfile.add("course_files/test.txt", File.expand_path("../fixtures/#{backup_name}/course_files/test.txt", __FILE__))
-      zipfile.add("course_files/folder/test.txt", File.expand_path("../fixtures/#{backup_name}/course_files/folder/test.txt", __FILE__))
+      zipfile.add("course_files/test.txt", File.expand_path("../../../test/fixtures/#{backup_name}/course_files/test.txt", __FILE__))
+      zipfile.add("course_files/folder/test.txt", File.expand_path("../../../test/fixtures/#{backup_name}/course_files/folder/test.txt", __FILE__))
     end
     moodle_backup_path
   end
@@ -18,7 +18,7 @@ module TestHelper
     converter_class = format == 'cc' ? Moodle2CC::CC::Converter : Moodle2CC::Canvas::Converter
     @backup_path = create_moodle_backup_zip(backup_name)
     @backup = Moodle2CC::Moodle::Backup.read @backup_path
-    @export_dir = File.expand_path("../tmp", __FILE__)
+    @export_dir = File.expand_path("../../../test/tmp", __FILE__)
     @converter = converter_class.new @backup, @export_dir
     @converter.convert
   end
@@ -36,7 +36,7 @@ module TestHelper
   end
 
   def clean_tmp_folder
-    Dir[File.expand_path("../tmp/*", __FILE__)].each do |file|
+    Dir[File.expand_path("../../../test/tmp/*", __FILE__)].each do |file|
       FileUtils.rm_r file
     end
   end

data/test/fixtures/moodle_backup/moodle.xml

@@ -249,7 +249,7 @@
             <NAME>Basic Arithmetic</NAME>
             <QUESTIONTEXT>How much is {a} + {b} ?</QUESTIONTEXT>
             <QUESTIONTEXTFORMAT>1</QUESTIONTEXTFORMAT>
-            <IMAGE></IMAGE>
+            <IMAGE>test.jpg</IMAGE>
             <GENERALFEEDBACK>This should be easy</GENERALFEEDBACK>
             <DEFAULTGRADE>1</DEFAULTGRADE>
             <PENALTY>0.1</PENALTY>

data/test/unit/canvas/question_test.rb

@@ -12,6 +12,7 @@ class TestUnitCanvasQuestion < MiniTest::Unit::TestCase
     convert_moodle_backup 'canvas'
     @mod = @backup.course.mods.find { |mod| mod.mod_type == 'quiz' }
     @question = @mod.questions.first
+    @question.image = nil
   end
 
   def teardown
@@ -120,6 +121,13 @@ class TestUnitCanvasQuestion < MiniTest::Unit::TestCase
     assert_equal "How much is [a] + [b] ?", question.material
   end
 
+  def test_it_adds_image_tag_to_material
+    @question.text = "How much is {a} + {b} ?"
+    @question.image = "test.jpg"
+    question = Moodle2CC::Canvas::Question.new @question
+    assert_equal %{<img src="$IMS_CC_FILEBASE$/test.jpg" alt="test.jpg"/>How much is [a] + [b] ?}, question.material
+  end
+
   def test_it_converts_markdown_text_to_html_material
     @question.text = "This is **bold** and this is _italic_"
     @question.format = 4 # markdown
@@ -381,6 +389,7 @@ class TestUnitCanvasQuestion < MiniTest::Unit::TestCase
   end
 
   def test_it_creates_item_xml
+    @question.image = 'test.jpg'
     question = Moodle2CC::Canvas::Question.new @question
     node = Builder::XmlMarkup.new
     xml = Nokogiri::XML(question.create_item_xml(node))
@@ -394,7 +403,7 @@ class TestUnitCanvasQuestion < MiniTest::Unit::TestCase
     assert xml.root.xpath('itemmetadata/qtimetadata/qtimetadatafield[fieldlabel="points_possible" and fieldentry="1"]').first, 'does not have meta data for points possible'
     assert xml.root.xpath('itemmetadata/qtimetadata/qtimetadatafield[fieldlabel="assessment_question_identifierref" and fieldentry="i04823ed56ffd4fd5f9c21db0cf25be6c"]').first, 'does not have meta data for assessment_question_identifierref'
 
-    assert_equal 'How much is [a] + [b] ?', xml.root.xpath('presentation/material/mattext[@texttype="text/html"]').text
+    assert_equal %{<img src="$IMS_CC_FILEBASE$/test.jpg" alt="test.jpg"/>How much is [a] + [b] ?}, xml.root.xpath('presentation/material/mattext[@texttype="text/html"]').text
 
     # Score
     outcome = xml.root.xpath('resprocessing/outcomes/decvar').first

data/test/unit/moodle/question_test.rb

@@ -41,6 +41,10 @@ class TestUnitMoodleQuestion < MiniTest::Unit::TestCase
     assert_equal 'How much is {a} + {b} ?', @calculated_question.text
   end
 
+  def test_it_has_image
+    assert_equal 'test.jpg', @calculated_question.image
+  end
+
   def test_it_has_a_format
     assert_equal 1, @calculated_question.format
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -200,6 +200,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- Changelog
 - Gemfile
 - Guardfile
 - LICENSE
@@ -252,6 +254,9 @@ files:
 - lib/moodle2cc/moodle/section.rb
 - lib/moodle2cc/resource_factory.rb
 - lib/moodle2cc/version.rb
+- lib/test/test_helper.rb
+- lib/test/test_question_helper.rb
+- lib/test/test_wiki_helper.rb
 - moodle2cc.gemspec
 - test/acceptance/migrator_test.rb
 - test/fixtures/cc.imscc
@@ -261,9 +266,6 @@ files:
 - test/fixtures/moodle_backup_random_questions/course_files/folder/test.txt
 - test/fixtures/moodle_backup_random_questions/course_files/test.txt
 - test/fixtures/moodle_backup_random_questions/moodle.xml
-- test/test_helper.rb
-- test/test_question_helper.rb
-- test/test_wiki_helper.rb
 - test/tmp/.gitkeep
 - test/unit/canvas/assessment_test.rb
 - test/unit/canvas/assignment_test.rb
@@ -319,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Migrates Moodle backup ZIP to IMS Common Cartridge package
@@ -332,9 +334,6 @@ test_files:
 - test/fixtures/moodle_backup_random_questions/course_files/folder/test.txt
 - test/fixtures/moodle_backup_random_questions/course_files/test.txt
 - test/fixtures/moodle_backup_random_questions/moodle.xml
-- test/test_helper.rb
-- test/test_question_helper.rb
-- test/test_wiki_helper.rb
 - test/tmp/.gitkeep
 - test/unit/canvas/assessment_test.rb
 - test/unit/canvas/assignment_test.rb
@@ -370,4 +369,3 @@ test_files:
 - test/unit/moodle/question_test.rb
 - test/unit/moodle/section_test.rb
 - test/unit/resource_factory_test.rb
-has_rdoc: