moodle2cc 0.1.2 → 0.1.3

data/lib/moodle2cc/canvas/web_link.rb

@@ -5,8 +5,7 @@ module Moodle2CC::Canvas
     def create_module_meta_item_elements(item_node)
       item_node.identifierref @identifier
 
-      uri = URI.parse(@url)
-      if uri.scheme
+      if @external_link
         item_node.url @url
         item_node.content_type 'ExternalUrl'
       else

data/lib/moodle2cc/cc/converter.rb

@@ -106,24 +106,25 @@ module Moodle2CC::CC
     end
 
     def create_resources(resources_node)
+      resources = []
       @moodle_backup.course.mods.each_with_index do |mod, index|
-        resource = @resource_factory.get_resource_from_mod(mod, index)
-        if resource
-          resource.create_resource_node(resources_node)
-          resource.create_files(@export_dir)
-        end
+        resources << @resource_factory.get_resource_from_mod(mod, index)
       end
-
       @moodle_backup.files.each do |file|
-        href = File.join(WEB_RESOURCES_FOLDER, file)
-        resources_node.resource(
-          :type => WEBCONTENT,
-          :identifier => create_key(href, 'resource_'),
-          :href => href
-        ) do |resource_node|
-          resource_node.file(:href => href)
+        unless resources.find { |r| r.respond_to?(:url) && r.url == file }
+          mod = Moodle2CC::Moodle::Mod.new
+          mod.mod_type = 'resource'
+          mod.type = 'file'
+          mod.reference = file
+          mod.course = @moodle_backup.course
+          resources << @resource_factory.get_resource_from_mod(mod)
         end
       end
+
+      resources.compact.each do |resource|
+        resource.create_resource_node(resources_node)
+        resource.create_files(@export_dir)
+      end
     end
 
     def create_web_resources

data/lib/moodle2cc/cc/web_link.rb

@@ -3,27 +3,44 @@ module Moodle2CC::CC
     include CCHelper
     include Resource
 
-    attr_accessor :url
+    attr_accessor :url, :external_link, :href
 
     def initialize(mod)
       super
       @url = mod.reference.to_s.strip
+      @external_link = self.class.external_link?(mod)
+      @href = @external_link ? "#{@identifier}.xml" : File.join(WEB_RESOURCES_FOLDER, @url)
+      @identifier = create_key(@href, 'resource_') unless @external_link
     end
 
     def self.create_resource_key(mod)
-      if !URI.parse(mod.reference).scheme
+      unless external_link?(mod)
         create_key(File.join(WEB_RESOURCES_FOLDER, mod.reference), 'resource_')
       else
         super
       end
     end
 
+    def self.external_link?(mod)
+      !!URI.parse(mod.reference.strip).scheme
+    end
+
     def create_resource_node(resources_node)
-      resources_node.resource(
-        :type => WEB_LINK,
-        :identifier => identifier
-      ) do |resource_node|
-        resource_node.file(:href => "#{identifier}.xml")
+      if @external_link
+        resources_node.resource(
+          :type => WEB_LINK,
+          :identifier => identifier
+        ) do |resource_node|
+          resource_node.file(:href => href)
+        end
+      else
+        resources_node.resource(
+          :type => WEBCONTENT,
+          :href => href,
+          :identifier => identifier
+        ) do |resource_node|
+          resource_node.file(:href => href)
+        end
       end
     end
 
@@ -32,6 +49,7 @@ module Moodle2CC::CC
     end
 
     def create_xml(export_dir)
+      return unless @external_link
       path = File.join(export_dir, "#{identifier}.xml")
       FileUtils.mkdir_p(File.dirname(path))
       File.open(path, 'w') do |file|

data/lib/moodle2cc/resource_factory.rb

@@ -9,9 +9,10 @@ class Moodle2CC::ResourceFactory
     when 'assignment', 'workshop'
       @namespace.const_get(:Assignment).new(mod, position)
     when 'resource'
-      if mod.type == 'file'
+      case mod.type
+      when 'file'
         @namespace.const_get(:WebLink).new(mod)
-      elsif mod.type == 'html'
+      when 'html', 'text'
         @namespace.const_get(:WebContent).new(mod)
       end
     when 'forum'

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/unit/cc/converter_test.rb

@@ -156,12 +156,14 @@ class TestUnitCCConverter < MiniTest::Unit::TestCase
     assert_equal 'webcontent', resource.attributes['type'].value
     assert_equal 'web_resources/folder/test.txt', resource.attributes['href'].value
     assert resource.xpath('xmlns:file[@href="web_resources/folder/test.txt"]').first
+    assert_equal 1, xml.search('file[href="web_resources/folder/test.txt"]').count
 
     resource = xml.xpath('//xmlns:manifest/xmlns:resources/xmlns:resource[@identifier="ib98bb8ec201a97840ae4ed4bb40207c0"]').first
     assert resource, 'resources does not exist for "web_resources/test.txt" file'
     assert_equal 'webcontent', resource.attributes['type'].value
     assert_equal 'web_resources/test.txt', resource.attributes['href'].value
     assert resource.xpath('xmlns:file[@href="web_resources/test.txt"]').first
+    assert_equal 1, xml.search('file[href="web_resources/test.txt"]').count
   end
 
   def test_it_deletes_all_files_except_imscc

data/test/unit/cc/web_link_test.rb

@@ -43,14 +43,42 @@ class TestUnitCCWebLink < MiniTest::Unit::TestCase
     assert_equal "http://en.wikipedia.org/wiki/Einstein", web_link.url
   end
 
-  def test_it_has_an_identifier
+  def test_it_converts_external_link
+    @mod.reference = "http://en.wikipedia.org/wiki/Einstein"
+    web_link = Moodle2CC::CC::WebLink.new @mod
+    assert_equal true, web_link.external_link
+
+    @mod.reference = "files/myfile.txt"
+    web_link = Moodle2CC::CC::WebLink.new @mod
+    assert_equal false, web_link.external_link
+  end
+
+  def test_if_converts_href
+    @mod.reference = "http://en.wikipedia.org/wiki/Einstein"
+    web_link = Moodle2CC::CC::WebLink.new @mod
+    assert_equal "#{web_link.identifier}.xml", web_link.href
+
+    @mod.reference = "files/myfile.txt"
+    web_link = Moodle2CC::CC::WebLink.new @mod
+    assert_equal 'web_resources/files/myfile.txt', web_link.href
+  end
+
+  def test_it_has_an_identifier_for_external_link
     @mod.id = 123
 
     web_link = Moodle2CC::CC::WebLink.new @mod
     assert_equal 'iecc4b622fbc1adf8b8a2085e0974ac7d', web_link.identifier
   end
 
-  def test_it_creates_resource_in_imsmanifest
+  def test_it_has_an_identifier_for_local_file
+    @mod.reference = "files/myfile.txt"
+
+    web_link = Moodle2CC::CC::WebLink.new @mod
+    assert_equal 'i5cfabae035bff8857137d83c2a067809', web_link.identifier
+  end
+
+  def test_it_creates_resource_in_imsmanifest_for_external_link
+    @mod.reference = "http://en.wikipedia.org/wiki/Einstein"
     web_link = Moodle2CC::CC::WebLink.new @mod
     node = Builder::XmlMarkup.new
     xml = Nokogiri::XML(web_link.create_resource_node(node))
@@ -64,6 +92,22 @@ class TestUnitCCWebLink < MiniTest::Unit::TestCase
     assert file
   end
 
+  def test_it_creates_resource_in_imsmanifest_for_local_file
+    @mod.reference = "files/myfile.txt"
+    web_link = Moodle2CC::CC::WebLink.new @mod
+    node = Builder::XmlMarkup.new
+    xml = Nokogiri::XML(web_link.create_resource_node(node))
+
+    resource = xml.xpath('resource').first
+    assert resource
+    assert_equal 'webcontent', resource.attributes['type'].value
+    assert_equal 'web_resources/files/myfile.txt', resource.attributes['href'].value
+    assert_equal 'i5cfabae035bff8857137d83c2a067809', resource.attributes['identifier'].value
+
+    file = resource.xpath('file[@href="web_resources/files/myfile.txt"]').first
+    assert file
+  end
+
   def test_it_creates_xml
     @mod.id = 123
     @mod.name = "About Your Instructor"
@@ -83,4 +127,13 @@ class TestUnitCCWebLink < MiniTest::Unit::TestCase
     assert_equal "About Your Instructor", xml.xpath('xmlns:webLink/xmlns:title').text
     assert xml.xpath('xmlns:webLink/xmlns:url[@href="http://en.wikipedia.org/wiki/Einstein"]').first
   end
+
+  def test_it_does_not_create_xml_for_local_files
+    @mod.reference = "files/myfile.txt"
+
+    tmp_dir = File.expand_path('../../../tmp', __FILE__)
+    web_link = Moodle2CC::CC::WebLink.new @mod
+    web_link.create_xml(tmp_dir)
+    refute File.exists?(File.join(tmp_dir, "#{web_link.identifier}.xml")), 'xml file was created for local file'
+  end
 end

data/test/unit/resource_factory_test.rb

@@ -42,7 +42,17 @@ class TestUnitCCResource < MiniTest::Unit::TestCase
     assert_kind_of Moodle2CC::Canvas::DiscussionTopic, resource
   end
 
-  def test_it_can_get_web_content_resource
+  def test_it_can_get_web_content_resource_from_text_resource
+    mod = @backup.course.mods.find { |m| m.mod_type == "resource" }
+    mod.type = 'text'
+    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_content_resource_from_html_resource
     mod = @backup.course.mods.find { |m| m.mod_type == "resource" }
     mod.type = 'html'
     resource = @cc_factory.get_resource_from_mod(mod)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: moodle2cc
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Christopher Durtschi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-03 00:00:00 Z
+date: 2012-08-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip