moodle2cc 0.1.7 → 0.1.8

data/Changelog

@@ -1,3 +1,7 @@
+2013-07-02 Version 0.1.8
+    * Improved question image conversion by putting it in its own p tag
+		* Added support for hsuforum content
+
 2013-06-27 Version 0.1.7
     * Include question images when converting to QTI
 		* Added travis setup for happiness

data/lib/moodle2cc/canvas/question.rb

@@ -116,7 +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 = material + image_html(question.image) unless question.image.nil? || question.image.strip == ''
       material = RDiscount.new(material).to_html if question.format == 4 # markdown
       @material = material
 
@@ -471,7 +471,7 @@ module Moodle2CC::Canvas
 
     def image_html(image)
       image = image.strip
-      %{<img src="#{WEB_CONTENT_TOKEN}/#{image}" alt="#{image}"/>}
+      %{<p><img src="#{WEB_CONTENT_TOKEN}/#{image}" alt="#{image}"/></p>}
     end
   end
 end

data/lib/moodle2cc/resource_factory.rb

@@ -15,7 +15,7 @@ class Moodle2CC::ResourceFactory
       when 'html', 'text'
         @namespace.const_get(:WebContent).new(mod)
       end
-    when 'forum'
+    when 'forum', 'hsuforum'
       @namespace.const_get(:DiscussionTopic).new(mod, position)
     when 'quiz', 'questionnaire', 'choice'
       @namespace.const_get(:Assessment).new(mod, position)

data/lib/moodle2cc/version.rb

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

data/test/fixtures/moodle_backup/moodle.xml

@@ -528,6 +528,26 @@
         <BLOCKAFTER>0</BLOCKAFTER>
         <BLOCKPERIOD>0</BLOCKPERIOD>
       </MOD>
+      <MOD>
+        <ID>766</ID>
+        <MODTYPE>hsuforum</MODTYPE>
+        <TYPE>news</TYPE>
+        <NAME>Announcements</NAME>
+        <INTRO>General news and announcements</INTRO>
+        <ASSESSED>0</ASSESSED>
+        <ASSESSTIMESTART>0</ASSESSTIMESTART>
+        <ASSESSTIMEFINISH>0</ASSESSTIMEFINISH>
+        <MAXBYTES>0</MAXBYTES>
+        <SCALE>0</SCALE>
+        <FORCESUBSCRIBE>1</FORCESUBSCRIBE>
+        <TRACKINGTYPE>1</TRACKINGTYPE>
+        <RSSTYPE>0</RSSTYPE>
+        <RSSARTICLES>0</RSSARTICLES>
+        <TIMEMODIFIED>1338472516</TIMEMODIFIED>
+        <WARNAFTER>0</WARNAFTER>
+        <BLOCKAFTER>0</BLOCKAFTER>
+        <BLOCKPERIOD>0</BLOCKPERIOD>
+      </MOD>
       <MOD>
         <ID>654</ID>
         <MODTYPE>label</MODTYPE>

data/test/unit/canvas/question_test.rb

@@ -125,7 +125,7 @@ class TestUnitCanvasQuestion < MiniTest::Unit::TestCase
     @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
+    assert_equal %{How much is [a] + [b] ?<p><img src="$IMS_CC_FILEBASE$/test.jpg" alt="test.jpg"/></p>}, question.material
   end
 
   def test_it_converts_markdown_text_to_html_material
@@ -403,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 %{<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
+    assert_equal %{How much is [a] + [b] ?<p><img src="$IMS_CC_FILEBASE$/test.jpg" alt="test.jpg"/></p>}, xml.root.xpath('presentation/material/mattext[@texttype="text/html"]').text
 
     # Score
     outcome = xml.root.xpath('resprocessing/outcomes/decvar').first

data/test/unit/moodle/mod_test.rb

@@ -24,47 +24,47 @@ class TestUnitMoodleMod < MiniTest::Unit::TestCase
   end
 
   def test_it_has_all_the_mods
-    assert_equal 14, @mods.length
+    assert_equal 15, @mods.length
   end
 
   def test_it_has_an_id
-    assert_equal 987, @mods[0].id
+    assert_equal 987, @mods.find{|m| m.id == 987}.id
   end
 
   def test_it_has_an_var1
-    assert_equal 0, @mods[0].var1
+    assert_equal 0, @mods.find{|m| m.id == 987}.var1
   end
 
   def test_it_has_an_var2
-    assert_equal 1, @mods[0].var2
+    assert_equal 1, @mods.find{|m| m.id == 987}.var2
   end
 
   def test_it_has_an_var3
-    assert_equal 2, @mods[0].var3
+    assert_equal 2, @mods.find{|m| m.id == 987}.var3
   end
 
   def test_it_has_an_var4
-    assert_equal 3, @mods[0].var4
+    assert_equal 3, @mods.find{|m| m.id == 987}.var4
   end
 
   def test_it_has_an_var5
-    assert_equal 4, @mods[0].var5
+    assert_equal 4, @mods.find{|m| m.id == 987}.var5
   end
 
   def test_it_has_a_mod_type
-    assert_equal "assignment", @mods[0].mod_type
+    assert_equal "assignment", @mods.find{|m| m.id == 987}.mod_type
   end
 
   def test_it_has_a_type
-    assert_equal "file", @mods[1].type
+    assert_equal "file", @mods.find{|m| m.id == 876}.type
   end
 
   def test_it_has_a_name
-    assert_equal "Create a Rails site", @mods[0].name
+    assert_equal "Create a Rails site", @mods.find{|m| m.id == 987}.name
   end
 
   def test_it_has_a_description
-    assert_equal "<h1>Hello World</h1>", @mods[0].description
+    assert_equal "<h1>Hello World</h1>", @mods.find{|m| m.id == 987}.description
   end
 
   def test_it_has_a_summary
@@ -72,23 +72,23 @@ class TestUnitMoodleMod < MiniTest::Unit::TestCase
   end
 
   def test_it_has_content
-    assert_equal "Section 1", @mods[3].content
+    assert_equal "Section 1", @mods.find{|m| m.id == 654}.content
   end
 
   def test_it_has_an_assignment_type
-    assert_equal "offline", @mods[0].assignment_type
+    assert_equal "offline", @mods.find{|m| m.id == 987}.assignment_type
   end
 
   def test_it_has_a_resubmit
-    assert_equal false, @mods[0].resubmit
+    assert_equal false, @mods.find{|m| m.id == 987}.resubmit
   end
 
   def test_it_has_a_prevent_late
-    assert_equal true, @mods[0].prevent_late
+    assert_equal true, @mods.find{|m| m.id == 987}.prevent_late
   end
 
   def test_it_has_a_grade
-    assert_equal 5, @mods[0].grade
+    assert_equal 5, @mods.find{|m| m.id == 987}.grade
   end
 
   def test_it_has_number_of_attachments
@@ -120,23 +120,23 @@ class TestUnitMoodleMod < MiniTest::Unit::TestCase
   end
 
   def test_it_has_a_time_due
-    assert_equal 1355356740, @mods[0].time_due
+    assert_equal 1355356740, @mods.find{|m| m.id == 987}.time_due
   end
 
   def test_it_has_a_time_available
-    assert_equal 1355314332, @mods[0].time_available
+    assert_equal 1355314332, @mods.find{|m| m.id == 987}.time_available
   end
 
   def test_it_has_a_reference
-    assert_equal "http://en.wikipedia.org/wiki/Einstein", @mods[1].reference
+    assert_equal "http://en.wikipedia.org/wiki/Einstein", @mods.find{|m| m.id == 876}.reference
   end
 
   def test_it_has_an_intro
-    assert_equal "General news and announcements", @mods[2].intro
+    assert_equal "General news and announcements", @mods.find{|m| m.id == 765}.intro
   end
 
   def test_it_has_alltext
-    assert_equal "<p><strong> Instructor Resources </strong></p>", @mods[4].alltext
+    assert_equal "<p><strong> Instructor Resources </strong></p>", @mods.find{|m| m.id == 543}.alltext
   end
 
   def test_it_has_text
@@ -290,7 +290,7 @@ class TestUnitMoodleMod < MiniTest::Unit::TestCase
   end
 
   def test_it_has_section_mods
-    assert_equal @course.sections.first.mods[1], @mods[0].section_mod
+    assert_equal @course.sections.first.mods[1], @mods.find{|m| m.id == 987}.section_mod
   end
 
   def test_it_has_a_grade_item

data/test/unit/resource_factory_test.rb

@@ -40,6 +40,13 @@ class TestUnitCCResource < MiniTest::Unit::TestCase
 
     resource = @canvas_factory.get_resource_from_mod(mod)
     assert_kind_of Moodle2CC::Canvas::DiscussionTopic, resource
+
+    mod = @backup.course.mods.find { |m| m.mod_type == "hsuforum" }
+    resource = @cc_factory.get_resource_from_mod(mod)
+    assert_kind_of Moodle2CC::CC::DiscussionTopic, resource
+
+    resource = @canvas_factory.get_resource_from_mod(mod)
+    assert_kind_of Moodle2CC::Canvas::DiscussionTopic, resource
   end
 
   def test_it_can_get_web_content_resource_from_text_resource

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip