moodle2cc 0.1.1 → 0.1.2

data/test/unit/canvas/wiki_test.rb

@@ -46,7 +46,7 @@ class TestUnitCanvasWiki < MiniTest::Unit::TestCase
 
     assert_equal 'item', xml.root.name
     assert_equal 'i7b382ae83ddb7cc9be1a12e517088bc4', xml.root.attributes['identifier'].value
-    assert_equal "My Wiki", xml.root.xpath('title').text
+    assert_equal "My wiki", xml.root.xpath('title').text
     assert_equal '5', xml.root.xpath('position').text
     assert_equal '', xml.root.xpath('new_tab').text
     assert_equal '0', xml.root.xpath('indent').text

data/test/unit/cc/converter_test.rb

@@ -101,7 +101,7 @@ class TestUnitCCConverter < MiniTest::Unit::TestCase
     assert_equal 'Week 1', item.xpath('xmlns:title').text
   end
 
-  def test_imsmanifest_does_not_create_item_for_invisible_sections
+  def test_imsmanifest_does_not_create_item_for_sections_with_no_modules
     xml = get_imsmanifest_xml
 
     item = xml.xpath('//xmlns:manifest/xmlns:organizations/xmlns:organization/xmlns:item/xmlns:item[@identifier="i9a57aafbbb5993c28a89c2e363e97f87"]').first
@@ -113,11 +113,17 @@ class TestUnitCCConverter < MiniTest::Unit::TestCase
 
     item = xml.xpath('//xmlns:manifest/xmlns:organizations/xmlns:organization/xmlns:item/xmlns:item[1]/xmlns:item[1]').first
     assert item
+    assert_equal "i09cb85ba0baf2ffee6aef5f2249dea69", item.attributes['identifier'].value
+    assert_equal "i3b3b3e626c91e725614a6ce837b6de34", item.attributes['identifierref'].value
+    assert_equal 'This is the Syllabus', item.xpath('xmlns:title').text
+
+    item = xml.xpath('//xmlns:manifest/xmlns:organizations/xmlns:organization/xmlns:item/xmlns:item[1]/xmlns:item[2]').first
+    assert item
     assert_equal "i10241816e5909d8e76da003b2814c6a4", item.attributes['identifier'].value
     assert_equal "i6b162484accdf6081cea43b39219d129", item.attributes['identifierref'].value
     assert_equal 'Create a Rails site', item.xpath('xmlns:title').text
 
-    item = xml.xpath('//xmlns:manifest/xmlns:organizations/xmlns:organization/xmlns:item/xmlns:item[1]/xmlns:item[2]').first
+    item = xml.xpath('//xmlns:manifest/xmlns:organizations/xmlns:organization/xmlns:item/xmlns:item[1]/xmlns:item[3]').first
     assert item
     assert_equal "i966437b815a49aad86a356bc8aa8f24a", item.attributes['identifier'].value
     assert_equal "i15aaccec404aa2ad557108a689bbba8f", item.attributes['identifierref'].value
@@ -125,11 +131,17 @@ class TestUnitCCConverter < MiniTest::Unit::TestCase
 
     item = xml.xpath('//xmlns:manifest/xmlns:organizations/xmlns:organization/xmlns:item/xmlns:item[2]/xmlns:item[1]').first
     assert item
+    assert_equal "i66b491d95b61e87f7ae71445a82a4d22", item.attributes['identifier'].value
+    assert_equal "idfd13c979a2bde97c18a4bcb51752001", item.attributes['identifierref'].value
+    assert_equal 'Week 1 Summary', item.xpath('xmlns:title').text
+
+    item = xml.xpath('//xmlns:manifest/xmlns:organizations/xmlns:organization/xmlns:item/xmlns:item[2]/xmlns:item[2]').first
+    assert item
     assert_equal "ie8e11ad7a1b32660f6aeaf94948faa22", item.attributes['identifier'].value
     assert_equal "if7091ac80f57e45c757345555327b248", item.attributes['identifierref'].value
     assert_equal 'Announcements', item.xpath('xmlns:title').text
 
-    item = xml.xpath('//xmlns:manifest/xmlns:organizations/xmlns:organization/xmlns:item/xmlns:item[2]/xmlns:item[2]').first
+    item = xml.xpath('//xmlns:manifest/xmlns:organizations/xmlns:organization/xmlns:item/xmlns:item[2]/xmlns:item[3]').first
     assert item
     assert_equal "ifcf0624ce811c812c749c53f3c914f20", item.attributes['identifier'].value
     assert_equal "iddbfacadb16c78a584f81538cd53cc72", item.attributes['identifierref'].value

data/test/unit/cc/question_test.rb

@@ -18,7 +18,6 @@ class TestUnitCCQuestion < MiniTest::Unit::TestCase
     clean_tmp_folder
   end
 
-
   def test_it_converts_id
     @question.id = 989
     question = Moodle2CC::CC::Question.new @question
@@ -31,6 +30,12 @@ class TestUnitCCQuestion < MiniTest::Unit::TestCase
     assert_equal "Basic Arithmetic", question.title
   end
 
+  def test_it_converts_title_with_escaped_html
+    @question.name = "the &lt;div&gt; tag"
+    question = Moodle2CC::Canvas::Question.new @question
+    assert_equal "the <div> tag", question.title
+  end
+
   def test_it_has_an_identifier_based_on_id
     @question.id = 989
     @question.instance_id = nil

data/test/unit/cc/wiki_test.rb

@@ -60,7 +60,7 @@ class TestUnitCCWiki < MiniTest::Unit::TestCase
     wiki = Moodle2CC::CC::Wiki.new @mod
     assert_equal 1, wiki.pages.length
 
-    assert_equal 'My Wiki', wiki.pages[0].title
+    assert_equal 'My wiki', wiki.pages[0].title
     assert_equal 'This is the summary', wiki.pages[0].body
     assert_equal 'wiki_content/my-wiki.html', wiki.pages[0].href
     assert_equal 'ib87fd4bafae6f3e3ee7dadb65b0e45a3', wiki.pages[0].identifier

data/test/unit/moodle/mod_test.rb

@@ -24,7 +24,7 @@ class TestUnitMoodleMod < MiniTest::Unit::TestCase
   end
 
   def test_it_has_all_the_mods
-    assert_equal 11, @mods.length
+    assert_equal 14, @mods.length
   end
 
   def test_it_has_an_id
@@ -290,7 +290,7 @@ class TestUnitMoodleMod < MiniTest::Unit::TestCase
   end
 
   def test_it_has_section_mods
-    assert_equal @course.sections.first.mods.first, @mods[0].section_mod
+    assert_equal @course.sections.first.mods[1], @mods[0].section_mod
   end
 
   def test_it_has_a_grade_item

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_a_format
+    assert_equal 1, @calculated_question.format
+  end
+
   def test_it_has_general_feedback
     assert_equal 'This should be easy', @calculated_question.general_feedback
   end

data/test/unit/moodle/section_test.rb

@@ -22,7 +22,7 @@ class TestUnitMoodleSection < MiniTest::Unit::TestCase
   end
 
   def test_it_has_all_the_sections
-    assert_equal 3, @sections.length
+    assert_equal 4, @sections.length
   end
 
   def test_it_has_an_id
@@ -46,30 +46,47 @@ class TestUnitMoodleSection < MiniTest::Unit::TestCase
   end
 
   def test_mods_have_an_id
-    assert 11111, @section.mods.first.id
+    assert 11111, @section.mods[1].id
   end
 
   def test_mods_have_an_instance_id
-    assert 987, @section.mods.first.instance_id
+    assert 987, @section.mods[1].instance_id
   end
 
   def test_mods_have_an_indent
-    assert_equal 0, @section.mods[0].indent
+    assert_equal 0, @section.mods[1].indent
   end
 
   def test_mods_have_a_visibility
-    assert_equal true, @section.mods[0].visible
+    assert_equal true, @section.mods[1].visible
   end
 
   def test_mods_have_instances
-    assert_equal @course.mods.first.id, @section.mods.first.instance.id
+    assert_equal @course.mods.first.id, @section.mods[1].instance.id
   end
 
   def test_mods_have_added
-    assert_equal 1338410699, @section.mods.first.added
+    assert_equal 1338410699, @section.mods[1].added
   end
 
   def test_mods_have_a_mod_type
-    assert_equal 'assignment', @section.mods.first.mod_type
+    assert_equal 'assignment', @section.mods[1].mod_type
+  end
+
+  def test_first_mod_is_label_from_summary
+    mod = @section.mods.first
+    assert_equal "section_summary_mod_#{@section.id}", mod.id
+    assert_equal "section_summary_instance_#{@section.id}", mod.instance_id
+    assert_equal 'summary', mod.mod_type
+    assert_equal 0, mod.indent
+    assert_equal true, mod.visible
+    assert_equal @section, mod.section
+
+    instance = mod.instance
+    assert_equal mod, instance.section_mod
+    assert_equal "section_summary_instance_#{@section.id}", instance.id
+    assert_equal 'summary', instance.mod_type
+    assert_equal "This is the Syllabus", instance.name
+    assert_equal "<h1>This is the Syllabus</h1>", instance.content
   end
 end

data/test/unit/resource_factory_test.rb

@@ -80,6 +80,15 @@ class TestUnitCCResource < MiniTest::Unit::TestCase
     assert_kind_of Moodle2CC::Canvas::Label, resource
   end
 
+  def test_it_can_get_label_resource_from_summary_mod
+    mod = @backup.course.mods.find { |m| m.mod_type == "summary" }
+    resource = @cc_factory.get_resource_from_mod(mod)
+    assert_kind_of Moodle2CC::CC::Label, resource
+
+    resource = @canvas_factory.get_resource_from_mod(mod)
+    assert_kind_of Moodle2CC::Canvas::Label, resource
+  end
+
   def test_it_can_get_web_content_resource_from_label_mod_with_img_tag
     mod = @backup.course.mods.find { |m| m.mod_type == "label" }
     mod.content = %(<img src="http://image.com/image.jpg" />")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: moodle2cc
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Christopher Durtschi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 Z
+date: 2012-08-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
@@ -90,7 +90,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rdiscount
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -101,10 +101,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: rake
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -118,7 +118,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: guard
+  name: minitest
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -132,7 +132,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: guard-bundler
+  name: guard
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -146,7 +146,7 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: guard-minitest
+  name: guard-bundler
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -159,6 +159,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: guard-minitest
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: Migrates Moodle backup ZIP to IMS Common Cartridge package
 email: 
 - christopher.durtschi@gmail.com
@@ -189,6 +203,7 @@ files:
 - lib/moodle2cc/canvas/label.rb
 - lib/moodle2cc/canvas/question.rb
 - lib/moodle2cc/canvas/question_bank.rb
+- lib/moodle2cc/canvas/question_group.rb
 - lib/moodle2cc/canvas/resource.rb
 - lib/moodle2cc/canvas/templates/assignment.html.erb
 - lib/moodle2cc/canvas/templates/syllabus.html.erb
@@ -231,6 +246,9 @@ files:
 - test/fixtures/moodle_backup/course_files/folder/test.txt
 - test/fixtures/moodle_backup/course_files/test.txt
 - test/fixtures/moodle_backup/moodle.xml
+- 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
@@ -242,6 +260,7 @@ files:
 - test/unit/canvas/discussion_topic_test.rb
 - test/unit/canvas/label_test.rb
 - test/unit/canvas/question_bank_test.rb
+- test/unit/canvas/question_group_test.rb
 - test/unit/canvas/question_test.rb
 - test/unit/canvas/web_content_test.rb
 - test/unit/canvas/web_link_test.rb
@@ -307,6 +326,9 @@ test_files:
 - test/fixtures/moodle_backup/course_files/folder/test.txt
 - test/fixtures/moodle_backup/course_files/test.txt
 - test/fixtures/moodle_backup/moodle.xml
+- 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
@@ -318,6 +340,7 @@ test_files:
 - test/unit/canvas/discussion_topic_test.rb
 - test/unit/canvas/label_test.rb
 - test/unit/canvas/question_bank_test.rb
+- test/unit/canvas/question_group_test.rb
 - test/unit/canvas/question_test.rb
 - test/unit/canvas/web_content_test.rb
 - test/unit/canvas/web_link_test.rb