RubyGems - moodle2cc - Versions diffs - 0.2.12 → 0.2.14 - Mend

moodle2cc 0.2.12 → 0.2.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +8 -8
data/Changelog +4 -0
data/lib/moodle2cc/canvas_cc/discussion_writer.rb +1 -0
data/lib/moodle2cc/migrator.rb +11 -3
data/lib/moodle2cc/moodle/backup.rb +30 -11
data/lib/moodle2cc/moodle2/extractor.rb +46 -30
data/lib/moodle2cc/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjc0NjgzNjkxN2FjNjQ2OGRhMjEwMjk2YTY2MmZjMzQ3MGVmZWFhOA==
+    M2Y3OTY0ZjhjMzNjMzJlZjkwNTFmYTk1OGYyMjg4MjZhODg5ZjQyNQ==
   data.tar.gz: !binary |-
-    ZDc0ZDYyZWIzMzQ1YjJhZTA0NzRhOTI1MjU3YzkzZjZlYzM2OGUzZg==
+    YjAwZWRlNzc4ZTdhMWJmYTVjNTlkZGMwMTY0OGFjOTRhN2UxODM5MA==
 SHA512:
   metadata.gz: !binary |-
-    NTgwNWQxMGQwY2NlNTE1YjBiMDM1YTM0MGE5ZjQ1YjMyOTU2Nzg1NTAxNmZl
-    MGFkNWZjYWVkYWUzYjJkN2Y3MjI3NTJjMWE3NzQxY2IyYWUyMDQyMmVmMDRm
-    OTdmMzczYTg5M2U4NWIxNTI0NjRlMjM5YjM5NWE2ZTIyM2NjNjk=
+    NDUzZGI4MTk4ZTlmM2JiMWVlNjZlODdmYTZmODY2M2ZhNWRkNDJjY2ViOGY4
+    MjU3ZjJiOTIxMmUyMThkYmY5NGQwODZmYzU4ZjcxYjM4NGZkMTU0YmJkNzUz
+    MDliMjkzNDJkNDFlNmRhOGJiNzM5YzI5MzUxNzJjODU2YWUxOTY=
   data.tar.gz: !binary |-
-    ZmIxOTkxMDAyNWNhMTk3YmU1MDk1Y2UzNzQ1OTg0MWQ4NzVjOWYwMjJhYzI0
-    NWM1ZWYzZDgyNjM2ODIwZjNjYmM5ZmU5ODg5Njc4MTdiM2M2ZDg5MWVkYzM1
-    NjI0NmUyOTJhYTEwNzMyNTgwZmM3OTM2NjM5MDYzMjk2YzU4YTU=
+    Y2I0N2FkMzg5OWI3OTBmNzkyYzIxYTYxNTQzZTVmZmY3YjIyYWY0MTAzNGQ1
+    NjQxMjc1NGNhODliNzQzNDdkMWZjYzc5NTU5NGUzOWEzM2MxMzg4NTM2ZWVj
+    YTI0MDBlNzU2NzZiZmY4Y2RmNWUzYTY2MDNmYzc5ZDdjNDRjYjY=

data/Changelog CHANGED Viewed

@@ -1,3 +1,7 @@
+2014-07-21 Version 0.2.14
+  * Internal refactor to import from folders instead of zip files
+  * Minor fix for exporting discussion topics in Moodle 2
 2014-07-15 Version 0.2.12
   * Minor encoding fix for Moodle 1.9

data/lib/moodle2cc/canvas_cc/discussion_writer.rb CHANGED Viewed

@@ -43,6 +43,7 @@ module Moodle2CC::CanvasCC
           xml.type 'topic'
           xml.discussion_type discussion.discussion_type
           xml.require_initial_post discussion.require_initial_post
+          xml.workflow_state discussion.workflow_state
         }
       end.to_xml
       File.open(File.join(@work_dir, meta_resource.href), 'w') { |f| f.write(xml) }

data/lib/moodle2cc/migrator.rb CHANGED Viewed

@@ -50,12 +50,20 @@ module Moodle2CC
     private
     def moodle_version
-      Zip::File.open(@source) do |zipfile|
-        if zipfile.find_entry('moodle_backup.xml')
+      if File.directory?(@source)
+        if File.exists?(File.join(@source, 'moodle_backup.xml'))
           MOODLE_2
-        elsif zipfile.find_entry('moodle.xml')
+        elsif File.exists?(File.join(@source, 'moodle.xml'))
           MOODLE_1_9
         end
+      else
+        Zip::File.open(@source) do |zipfile|
+          if zipfile.find_entry('moodle_backup.xml')
+            MOODLE_2
+          elsif zipfile.find_entry('moodle.xml')
+            MOODLE_1_9
+          end
+        end
       end
     end

data/lib/moodle2cc/moodle/backup.rb CHANGED Viewed

@@ -4,30 +4,49 @@ module Moodle2CC::Moodle
   class Backup
     include HappyMapper
-    attr_accessor :backup_file, :files
+    attr_accessor :backup_path, :files
     tag 'MOODLE_BACKUP'
     has_one :info, Info
     has_one :course, Course
-    def self.read(backup_file)
-      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? }.
-          map { |e| e.name.sub('course_files/', '') }.sort
-        backup
+    def self.read(backup_path)
+      xml = nil
+      files = nil
+      if File.directory?(backup_path)
+        xml = File.read(File.join(backup_path, "moodle.xml"))
+        files = Dir["#{backup_path}/**/*"].select { |e| e =~ /^course_files/ && !File.directory?(e) }.
+              map { |e| e.sub('course_files/', '') }.sort
+      else
+        Zip::File.open(backup_path) do |zipfile|
+          xml = zipfile.read("moodle.xml")
+          files = zipfile.entries.select { |e| e.name =~ /^course_files/ && !e.directory? }.
+            map { |e| e.name.sub('course_files/', '') }.sort
+        end
       end
+      backup = parse(xml)
+      backup.backup_path = backup_path
+      backup.files = files
+      backup
     end
     def copy_files_to(dir)
-      Zip::File.open(@backup_file) do |zipfile|
+      if File.directory?(@backup_path)
         @files.each do |file|
           destination_file = File.join(dir, file)
           FileUtils.mkdir_p(File.dirname(destination_file))
           File.open(destination_file, 'wb') do |f|
-            f.write zipfile.read("course_files/#{file}")
+            f.write File.read(File.join(@backup_path, "course_files/#{file}"))
+          end
+        end
+      else
+        Zip::File.open(@backup_path) do |zipfile|
+          @files.each do |file|
+            destination_file = File.join(dir, file)
+            FileUtils.mkdir_p(File.dirname(destination_file))
+            File.open(destination_file, 'wb') do |f|
+              f.write zipfile.read("course_files/#{file}")
+            end
           end
         end
       end

data/lib/moodle2cc/moodle2/extractor.rb CHANGED Viewed

@@ -5,47 +5,63 @@ module Moodle2CC::Moodle2
     MOODLE_BACKUP_XML = 'moodle_backup.xml'
-    def initialize(zip_path)
-      @zip_path = zip_path
+    def initialize(backup_path)
+      @backup_path = backup_path
     end
     def extract
-      Dir.mktmpdir do |work_dir|
-        extract_zip(work_dir)
-        course = Moodle2CC::Moodle2::Parsers::CourseParser.new(work_dir).parse
-        parse_sections(work_dir, course)
-        parse_files(work_dir, course)
-        parse_pages(work_dir, course)
-        parse_forums(work_dir, course)
-        parse_assignments(work_dir, course)
-        parse_books(work_dir, course)
-        parse_folders(work_dir, course)
-        parse_wikis(work_dir, course)
-        parse_question_categories(work_dir, course)
-        parse_quizzes(work_dir, course)
-        parse_choices(work_dir, course)
-        parse_feedbacks(work_dir, course)
-        parse_questionnaires(work_dir, course)
-        parse_glossaries(work_dir, course)
-        parse_labels(work_dir, course)
-        parse_external_urls(work_dir, course)
-        parse_resources(work_dir, course)
-        collect_files_for_resources(course)
-        collect_activities_for_sections(course.sections, course.activities)
+      if File.directory?(@backup_path) # it's already extracted
+        course = extract_course(@backup_path)
         yield course
+      else
+        Dir.mktmpdir do |work_dir|
+          extract_zip(work_dir)
+          course = extract_course(work_dir)
+          yield course
+        end
       end
     end
     private
+    def extract_course(work_dir)
+      course = Moodle2CC::Moodle2::Parsers::CourseParser.new(work_dir).parse
+      parse_sections(work_dir, course)
+      parse_files(work_dir, course)
+      parse_pages(work_dir, course)
+      parse_forums(work_dir, course)
+      parse_assignments(work_dir, course)
+      parse_books(work_dir, course)
+      parse_folders(work_dir, course)
+      parse_wikis(work_dir, course)
+      parse_question_categories(work_dir, course)
+      parse_quizzes(work_dir, course)
+      parse_choices(work_dir, course)
+      parse_feedbacks(work_dir, course)
+      parse_questionnaires(work_dir, course)
+      parse_glossaries(work_dir, course)
+      parse_labels(work_dir, course)
+      parse_external_urls(work_dir, course)
+      parse_resources(work_dir, course)
+      collect_files_for_resources(course)
+      collect_activities_for_sections(course.sections, course.activities)
+      course
+    end
     def extract_zip(work_dir)
-      Zip::File.open(@zip_path) do |zip_file|
-        zip_file.each do |f|
+      if File.directory?(@backup_path)
+        Dir["#{@backup_path}/**/*"].each do |f_path|
           f_path=File.join(work_dir, f.name)
-          FileUtils.mkdir_p(File.dirname(f_path))
-          zip_file.extract(f, f_path) unless File.exist?(f_path)
+        end
+      else
+        Zip::File.open(@backup_path) do |zip_file|
+          zip_file.each do |f|
+            f_path=File.join(work_dir, f.name)
+            FileUtils.mkdir_p(File.dirname(f_path))
+            zip_file.extract(f, f_path) unless File.exist?(f_path)
+          end
         end
       end
     end

data/lib/moodle2cc/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.12"
+  VERSION = "0.2.14"
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.14
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip