moodle2cc 0.1.10 → 0.1.11

data/Changelog

@@ -1,3 +1,7 @@
+2014-01-21 Version 0.1.11
+    * files with associated text/html content are now made into
+		  html pages with that text and a link to the file
+
 2013-08-15 Version 0.1.10
     * improve multiple dropdown question handling
 

data/lib/moodle2cc/cc/converter.rb

@@ -28,7 +28,7 @@ module Moodle2CC::CC
         create_manifest
       end
       create_web_resources
-      Zip::ZipFile.open(imscc_tmp_path, Zip::ZipFile::CREATE) do |zipfile|
+      Zip::File.open(imscc_tmp_path, Zip::File::CREATE) do |zipfile|
         Dir["#{@export_dir}/**/*"].each do |file|
           zipfile.add(file.sub(@export_dir + '/', ''), file)
         end

data/lib/moodle2cc/cc/web_content.rb

@@ -10,6 +10,13 @@ module Moodle2CC::CC
       @rel_path = File.join(CC_WIKI_FOLDER, "#{file_slug(@title)}.html")
       body = mod.alltext
       body = mod.content || '' if body.nil? || body.length == 0
+      if body.nil? || body.length == 0 && mod.summary
+        body = mod.summary
+        url = mod.reference.to_s.strip
+        unless url.gsub(%r{http(s)?://}, '').length == 0
+          body += %(<p><a href="#{CGI.escapeHTML(url)}" title="#{CGI.escapeHTML(@title)}">#{@title}</a></p>)
+        end
+      end
       @body = convert_file_path_tokens(body)
     end
 

data/lib/moodle2cc/moodle/backup.rb

@@ -1,4 +1,4 @@
-require 'zip/zipfilesystem'
+require 'zip'
 
 module Moodle2CC::Moodle
   class Backup
@@ -11,8 +11,8 @@ module Moodle2CC::Moodle
     has_one :course, Course
 
     def self.read(backup_file)
-      Zip::ZipFile.open(backup_file) do |zipfile|
-        xml = zipfile.file.read("moodle.xml")
+      Zip::File.open(backup_file) do |zipfile|
+        xml = zipfile.read("moodle.xml")
         backup = parse xml
         backup.backup_file = backup_file
         backup.files = zipfile.entries.select { |e| e.name =~ /^course_files/ && !e.directory? }.
@@ -22,14 +22,12 @@ module Moodle2CC::Moodle
     end
 
     def copy_files_to(dir)
-      Zip::ZipFile.open(@backup_file) do |zipfile|
+      Zip::File.open(@backup_file) do |zipfile|
         @files.each do |file|
-          zipfile.file.open("course_files/#{file}") do |zip|
-            destination_file = File.join(dir, file)
-            FileUtils.mkdir_p(File.dirname(destination_file))
-            File.open(destination_file, 'w') do |f|
-              f.write zip.read
-            end
+          destination_file = File.join(dir, file)
+          FileUtils.mkdir_p(File.dirname(destination_file))
+          File.open(destination_file, 'w') do |f|
+            f.write zipfile.read("course_files/#{file}")
           end
         end
       end

data/lib/moodle2cc/resource_factory.rb

@@ -11,7 +11,11 @@ class Moodle2CC::ResourceFactory
     when 'resource'
       case mod.type
       when 'file'
-        @namespace.const_get(:WebLink).new(mod)
+        if mod.summary && mod.summary.length > 0
+          @namespace.const_get(:WebContent).new(mod)
+        else
+          @namespace.const_get(:WebLink).new(mod)
+        end
       when 'html', 'text'
         @namespace.const_get(:WebContent).new(mod)
       end

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/test/test_helper.rb

@@ -1,9 +1,10 @@
-require 'zip/zipfilesystem'
+require 'zip'
 
 module TestHelper
   def create_moodle_backup_zip(backup_name='moodle_backup')
     moodle_backup_path = File.expand_path("../../../test/tmp/#{backup_name}.zip", __FILE__)
-    Zip::ZipFile.open(moodle_backup_path, Zip::ZipFile::CREATE) do |zipfile|
+    Zip::File.open(moodle_backup_path, Zip::File::CREATE) do |zipfile|
+      zipfile.remove("moodle.xml") if zipfile.find_entry("moodle.xml")
       zipfile.add("moodle.xml", File.expand_path("../../../test/fixtures/#{backup_name}/moodle.xml", __FILE__))
       zipfile.mkdir("course_files")
       zipfile.mkdir("course_files/folder")
@@ -24,13 +25,13 @@ module TestHelper
   end
 
   def get_imsmanifest_xml
-    Zip::ZipFile.open(@converter.imscc_path) do |zipfile|
+    Zip::File.open(@converter.imscc_path) do |zipfile|
       xml = Nokogiri::XML(zipfile.read("imsmanifest.xml"))
     end
   end
 
   def get_imscc_file(file)
-    Zip::ZipFile.open(@converter.imscc_path) do |zipfile|
+    Zip::File.open(@converter.imscc_path) do |zipfile|
       zipfile.read(file)
     end
   end

data/moodle2cc.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Migrates Moodle backup ZIP to IMS Common Cartridge package}
   gem.homepage      = "https://github.com/instructure/moodle2cc"
 
-  gem.add_runtime_dependency "rubyzip"
+  gem.add_runtime_dependency "rubyzip", '~> 1.0.0'
   gem.add_runtime_dependency "happymapper"
   gem.add_runtime_dependency "builder"
   gem.add_runtime_dependency "thor"

data/test/fixtures/moodle_backup/moodle.xml

@@ -502,7 +502,7 @@
         <NAME>About Your Instructor</NAME>
         <TYPE>file</TYPE>
         <REFERENCE>http://en.wikipedia.org/wiki/Einstein</REFERENCE>
-        <SUMMARY></SUMMARY>
+        <SUMMARY>Sometimes these include a summary</SUMMARY>
         <ALLTEXT></ALLTEXT>
         <POPUP>resizable=1,scrollbars=1,directories=1,location=1,menubar=1,toolbar=1,status=1,width=1024,height=768</POPUP>
         <OPTIONS></OPTIONS>

data/test/unit/canvas/converter_test.rb

@@ -23,7 +23,7 @@ class TestUnitCCConverter < MiniTest::Unit::TestCase
   end
 
   def test_it_creates_imsmanifest_xml
-    Zip::ZipFile.open(@converter.imscc_path) do |zipfile|
+    Zip::File.open(@converter.imscc_path) do |zipfile|
       assert zipfile.find_entry("imsmanifest.xml")
     end
   end

data/test/unit/canvas/web_content_test.rb

@@ -34,4 +34,13 @@ class TestUnitCanvasWebContent < MiniTest::Unit::TestCase
     assert_equal 'i6447ff05ab6e342a42302007a6e3bcb4', xml.root.xpath('identifierref').text
   end
 
+  def test_it_creates_web_content_item_from_link_with_summary
+    mod = @backup.course.mods.find { |m| m.mod_type == "resource" &&
+        (!m.summary.nil? && m.summary.length != 0)}
+    mod.type = 'file'
+    web_content = Moodle2CC::Canvas::WebContent.new mod
+
+    assert web_content.body.include?(mod.reference)
+    assert web_content.body.include?(mod.summary)
+  end
 end

data/test/unit/cc/converter_test.rb

@@ -23,7 +23,7 @@ class TestUnitCCConverter < MiniTest::Unit::TestCase
   end
 
   def test_it_creates_imsmanifest_xml
-    Zip::ZipFile.open(@converter.imscc_path) do |zipfile|
+    Zip::File.open(@converter.imscc_path) do |zipfile|
       assert zipfile.find_entry("imsmanifest.xml")
     end
   end

data/test/unit/resource_factory_test.rb

@@ -69,8 +69,18 @@ class TestUnitCCResource < MiniTest::Unit::TestCase
     assert_kind_of Moodle2CC::Canvas::WebContent, resource
   end
 
+  def test_it_can_get_web_content_resource_from_file_resource_with_summary
+    mod = @backup.course.mods.find { |m| m.mod_type == "resource" && (!m.summary.nil? && m.summary.length != 0)}
+    mod.type = 'file'
+    resource = @cc_factory.get_resource_from_mod(mod)
+    assert_kind_of Moodle2CC::CC::WebContent, resource
+
+    resource = @canvas_factory.get_resource_from_mod(mod)
+    assert_kind_of Moodle2CC::Canvas::WebContent, resource
+  end
+
   def test_it_can_get_web_link_resource
-    mod = @backup.course.mods.find { |m| m.mod_type == "resource" }
+    mod = @backup.course.mods.find { |m| m.mod_type == "resource" && (m.summary.nil? || m.summary.length == 0) }
     mod.type = 'file'
     resource = @cc_factory.get_resource_from_mod(mod)
     assert_kind_of Moodle2CC::CC::WebLink, resource

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -11,24 +11,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: happymapper
   requirement: !ruby/object:Gem::Requirement