moodle2cc 0.2.7 → 0.2.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2Q2ZTc4YzA1YTkwZDA5Y2VlMmEyMDBlODFhZDMwOTM1YTc0ZGI0ZQ==
+  data.tar.gz: !binary |-
+    ODZkNTJlZGZkYjJkMzdiNGQzZGFhNmM2N2Y3YWE4MGE2NjU5NjdhOQ==
+SHA512:
+  metadata.gz: !binary |-
+    MDFkYWJhYjY2YWU1ZWE1MDVmN2I4YjI5ZWQ1YjhhM2E2Nzc2MDhiNjBhZTc5
+    YzhlYzk5YjUyZDI5YzY3ZWY2ZWRkM2U0M2IzNTAzYTY1MDBhY2QzYjY4MTgz
+    ODE4ZGQxZWJjYzIxNmY2N2VjY2Q0M2Y1MzM4NDVkMDg5MzViNTM=
+  data.tar.gz: !binary |-
+    YzFmYjIyYWNhNWY3OWM2NTJiMTAyNGViZjEzMTU3Mjg4OTBlMzVkYjRhNTRm
+    MWRiMjQxZWZiMTVjZTZlNTU5NDgzMjRlNzlhNjFhYWQ1M2ZmMzFlNzYwNWRi
+    NjA3MDNmOTRmYmE5MjE5YTU5YWU4NzVlYjYxMjE0YWVjODVlYTg=

data/Changelog

@@ -1,3 +1,6 @@
+2014-05-27 Version 0.2.8
+  * Improve handling of missing and external file references
+
 2014-05-09 Version 0.2.7
   * Convert File path tokens in questions and answers
   * Improve assignment gradint_type conversion

data/lib/moodle2cc/migrator.rb

@@ -3,6 +3,8 @@ require 'zip'
 module Moodle2CC
   class Migrator
 
+    attr_accessor :last_error
+
     MOODLE_1_9 = '1.9'
     MOODLE_2 = '2'
 
@@ -18,6 +20,7 @@ module Moodle2CC
     end
 
     def migrate
+      @last_error = nil
       case moodle_version
         when MOODLE_1_9
           migrate_moodle_1_9
@@ -25,6 +28,7 @@ module Moodle2CC
           migrate_moodle_2
       end
     rescue StandardError => error
+      @last_error = error
       Moodle2CC::Logger.add_warning 'error migrating content', error
     end
 

data/lib/moodle2cc/moodle2/extractor.rb

@@ -32,7 +32,7 @@ module Moodle2CC::Moodle2
         parse_labels(work_dir, course)
         parse_external_urls(work_dir, course)
         parse_resources(work_dir, course)
-        collect_files_for_resources(course.files, course.resources)
+        collect_files_for_resources(course)
         collect_activities_for_sections(course.sections, course.activities)
         yield course
       end
@@ -57,8 +57,10 @@ module Moodle2CC::Moodle2
     end
 
     def parse_files(work_dir, course)
-      if files = Moodle2CC::Moodle2::Parsers::FileParser.new(work_dir).parse
+      if result = Moodle2CC::Moodle2::Parsers::FileParser.new(work_dir).parse
+        files, missing_files = result
         course.files += files
+        course.missing_files += missing_files
       end
     end
 
@@ -153,12 +155,39 @@ module Moodle2CC::Moodle2
       end
     end
 
-    def collect_files_for_resources(files, resources)
+    def collect_files_for_resources(course)
       files_hash = {}
-      files.each{ |file| files_hash[file.id] = file }
-      resources.each do |resource|
+      course.files.each{ |file| files_hash[file.id] = file }
+
+      translated_resources = []
+      course.resources.each do |resource|
         file_id = resource.file_ids.find{|id| files_hash.key?(id)}
         resource.file = files_hash[file_id]
+        if resource.file.nil? && translate_missing_file_reference(resource, course)
+          translated_resources << resource
+        end
+      end
+
+      translated_resources.each do |resource|
+        course.resources.delete(resource)
+      end
+    end
+
+    def translate_missing_file_reference(resource, course)
+      # turn missing external files to external urls
+      if missing_file = course.missing_files.detect{|f| resource.file_ids.include?(f.id)}
+        if missing_file.reference =~ /\"url\"[^\"]*\"([^\"]*)\"/
+          url = $1.to_s
+          if url.start_with?("http")
+            ext_url = Moodle2CC::Moodle2::Models::ExternalUrl.new
+            ext_url.id = resource.id
+            ext_url.module_id = resource.module_id
+            ext_url.name = resource.name
+            ext_url.external_url = url
+            course.external_urls << ext_url
+            return true
+          end
+        end
       end
     end
 

data/lib/moodle2cc/moodle2/models/course.rb

@@ -4,11 +4,12 @@ module Moodle2CC::Moodle2::Models
                   :course_id, :show_grades, :sections, :files, :pages, :forums, :assignments,
                   :books, :folders, :question_categories, :quizzes, :glossaries,
                   :labels, :resources, :external_urls, :choices, :questionnaires,
-                  :feedbacks, :wikis, :grading_scales
+                  :feedbacks, :wikis, :grading_scales, :missing_files
 
     def initialize
       @sections = []
       @files = []
+      @missing_files = []
       @pages = []
       @forums = []
       @assignments = []

data/lib/moodle2cc/moodle2/parsers/file_parser.rb

@@ -14,6 +14,7 @@ module Moodle2CC::Moodle2::Parsers
       xml = Nokogiri::XML(File.read(File.join(@work_dir, FILES_XML)))
       file_nodes = xml./('files/file')
       files = []
+      missing_files = []
       file_nodes.each do |node|
         file = Moodle2CC::Moodle2::Models::Moodle2File.new
         file.id = node.at_xpath('@id').value
@@ -38,9 +39,13 @@ module Moodle2CC::Moodle2::Parsers
         file.repository_id = parse_text(node, 'repositoryid')
         file.reference = parse_text(node, 'reference')
         file.file_location = File.join(@work_dir, FILES_DIR, file.content_hash[0..1], file.content_hash)
-        files << file if file.file_size > 0
+        if file.file_size > 0 && File.exists?(file.file_location)
+          files << file
+        else
+          missing_files << file
+        end
       end
-      files
+      [files, missing_files]
     end
 
   end

data/lib/moodle2cc/moodle2converter/section_converter.rb

@@ -54,7 +54,7 @@ module Moodle2CC
           module_item.identifierref = module_item.identifier
           module_item.url = moodle_activity.external_url.gsub(/\s/, '%20')
         elsif moodle_activity.is_a? Moodle2::Models::Resource
-          module_item.identifierref = moodle_activity.file.content_hash
+          module_item.identifierref = moodle_activity.file.content_hash if moodle_activity.file
         else
           module_item.identifierref = generate_unique_identifier_for_activity(moodle_activity)
         end

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/spec/moodle2cc/moodle2/extractor_spec.rb

@@ -92,7 +92,7 @@ module Moodle2CC::Moodle2
 
     it 'parses files' do
       file = Models::Moodle2File.new
-      Parsers::FileParser.any_instance.stub(:parse).and_return([file])
+      Parsers::FileParser.any_instance.stub(:parse).and_return([[file], []])
       extractor.extract {}
       expect(course.files).to eq [file]
     end

data/spec/moodle2cc/moodle2/parsers/file_parser_spec.rb

@@ -5,7 +5,7 @@ module Moodle2CC::Moodle2::Parsers
 
     it 'should parse files' do
       file_parser = FileParser.new(fixture_path(File.join('moodle2', 'backup')))
-      files = file_parser.parse
+      files, missing_files = file_parser.parse
       file = files.find{|f| f.id == '29'}
       expect(file.id).to eq('29')
       expect(file.content_hash).to eq('a0f324310c8d8dd9c79458986c4322f5a060a1d9')

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.7
-  prerelease: 
+  version: 0.2.8
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: happymapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -80,7 +71,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -96,7 +85,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,7 +99,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -120,7 +106,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -128,7 +113,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -136,7 +120,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -144,7 +127,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -152,7 +134,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,7 +141,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -168,7 +148,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -176,7 +155,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -184,7 +162,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -192,7 +169,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -200,7 +176,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -208,7 +183,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -216,7 +190,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -224,7 +197,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -232,7 +204,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -828,27 +799,26 @@ files:
 homepage: https://github.com/instructure/moodle2cc
 licenses:
 - AGPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Migrates Moodle backup ZIP to IMS Common Cartridge package
 test_files:
 - spec/moodle2cc/canvas_cc/assessment_writer_spec.rb