moodle2cc 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efde84072c49c29d27500a5561765dfc44e6efd1
-  data.tar.gz: 0d4dccad78f1b425c6a2a8a07909370d8eb14648
+  metadata.gz: c3daa9082b4bd5b84e073f3f7df0aaa7bf2e6a41
+  data.tar.gz: 03628a247d0dac408fa3652352562cedd58364d9
 SHA512:
-  metadata.gz: 4bd0763399e9e6ccf748452a816760ee551f449d50104996b59c724215c08b329bb91417c122c7d0eeb6d5de0cb2577da1b96c317cd4dbb9c71d36ccd077b75b
-  data.tar.gz: f5a6678f1079198e8d70dbd43f134a619f9ac88395dd12015ba83bb852745c11cf2d66a28027a6b57cc737565b22ad70147929f99902c4dca1c33f7252b751f3
+  metadata.gz: fb774702ba2892c3bd20bff77f9b4b34f9a315934c1453918a6bd0576f266c0ade005f265240ad470264e71b6270f9ad6554e79960a45b5af6f9a957b56e7cdc
+  data.tar.gz: 530689ba43c0dd8b4d7a65065cc6019a54267d4524570e434d8da3d99837c31d0ab03ec5c2224e7985b5195b1bec04461b44a5ba9b9626a70078e91e94fd054c

data/Changelog

@@ -1,3 +1,6 @@
+2014-04-09 Version 0.2.4
+    * Fix Moodle book conversion for titles and order
+
 2014-04-09 Version 0.2.3
     * Add converting of HSU forums
 

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

@@ -34,6 +34,7 @@ module Moodle2CC::Moodle2::Parsers
       end
       parse_module(activity_dir, book)
 
+      book.chapters.sort_by!{|c| c.pagenum.to_i}
       book
     end
 

data/lib/moodle2cc/moodle2converter/book_converter.rb

@@ -19,10 +19,13 @@ module Moodle2CC
         page
       end
 
-      if moodle_book.intro
+      if moodle_book.intro && moodle_book.intro.length > 0
         page = create_page(moodle_book.name)
         page.identifier = generate_unique_identifier_for_book_intro(moodle_book)
         page.body = moodle_book.intro
+        if pages.any?{|p| page.title == p.title}
+          page.title = "#{page.title} (Introduction)"
+        end
         pages.unshift(page)
       end
 
@@ -32,7 +35,7 @@ module Moodle2CC
     def convert_to_module_items(moodle_book)
       module_items = []
       module_items << create_title(moodle_book)
-      module_items << create_introduction(moodle_book) if moodle_book.intro
+      module_items << create_introduction(moodle_book) if moodle_book.intro && moodle_book.intro.length > 0
       module_items += moodle_book.chapters.map { |chapter| create_chapter(chapter) }
       module_items
     end

data/lib/moodle2cc/moodle2converter/converter_helper.rb

@@ -30,7 +30,7 @@ module Moodle2CC
     }
 
     def generate_unique_resource_path(base_path, readable_name, file_extension = 'html')
-      file_name_suffix = readable_name ? readable_name.downcase.strip.gsub(/\s/, '-') : ''
+      file_name_suffix = readable_name ? CGI::escape(readable_name.downcase.strip.gsub(/\s/, '-')) : ''
       ext = file_extension ? ".#{file_extension}" : ''
       File.join(base_path, generate_unique_identifier(), "#{file_name_suffix}#{ext}")
     end

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

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

@@ -29,7 +29,7 @@ describe Moodle2CC::Moodle2::Parsers::BookParser do
 
   it "sets subchapter to true for subchapters" do
     book = subject.parse.first
-    chapter = book.chapters[1]
+    chapter = book.chapters.detect{|c| c.id == "2"}
     expect(chapter.subchapter).to be_true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Christopher Durtschi