moodle2cc 0.2.26 → 0.2.27

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjBmYzFhMDg1ODIyM2ExMWFkN2NhZjg5MDYxNzY2OTY0MWQ0MmM3Ng==
+    NjcyYjEyNjE5MjdkYjJiMzdjZjVhMjk4Mjc2YjRjOTUwMTc3NmY2Nw==
   data.tar.gz: !binary |-
-    NmZlYzczODI0NjE5OWNjNmFkZjExNDhiYTEyOTlmMGFlMWMwOGQ3Mw==
+    Y2YyNTg2OTU0ZDhhM2IwNDUzNDhlZjdjMDU0MmIzMTc3MjBmZDI3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    YWUxNGFmMmQ0NjNhZGQ5ZjE4NzZmMGZmNzJkZTM2ZGMzMDllMTFmZWQxZGUz
-    NTYzNDgzOTk2MGU5MTBkY2E0NGYyODQyZTYyYzkxMWMwMTZjNGE4MmI3MWU1
-    OWExMWE5NzFhYzFkMjEzNjdiOTEzMGFmYTgyMWE5NWMwYmJiOWY=
+    ZWI4MDBjMGQxMGI1OWIzNzg2YzIyMDExYmQ0Njc3YjQ0YTA0MmNjMjk0Mzg4
+    ZjE4MjU2MzYzYjJmNGZmOWFhNzhhODZjZjA2MzVmMjEwYzRlYzdkYjZmOTE2
+    MzYyZGMyNDFiZDU0MDhjZDE4ZmY1ZmE5YzAzMmFkMzkxNGIwZjM=
   data.tar.gz: !binary |-
-    MzY5OGU4MjM4NzI4OTFjYTMwNjNlNTM1NTg5MTVlY2FjZTNjNzViZTA0ZTAz
-    ODk2MjljMTQ1ZDMxZDBkNDRhNTkwYTI2MDZhNjlkZmQwNjIzYmI0ZmEwOWEz
-    ZDI5NTQwZjRmZDMyNjAyMGE0NjgwZWU0NDhjNTMzZTEyMTA4ZWQ=
+    NDc5ZGM4NTlmYzVmODVlMWEyMzg4MDM5NzA5NTM1NWQzNGZhOTQyZDYxOWVi
+    ZWI2OTQzYmE3OGRlYTNmZTNlNGZmNTA1ZWRkNGUyNmQ0YWFjYWE2YjY4ZTZm
+    MWFjOWU4N2RkMzVjYTE5ZmYwMmM4YzZiYmRiMTk4ZTcxOGJhMDg=

data/Changelog

@@ -1,3 +1,6 @@
+2015-10-21 Version 0.2.27
+  * Handles duplicated wiki names better in Moodle 2 packages
+
 2015-09-23 Version 0.2.26
   * Handles duplicated ids better in Moodle 2 packages
 

data/lib/moodle2cc/canvas_cc/models/page.rb

@@ -26,7 +26,6 @@ module Moodle2CC::CanvasCC::Models
 
     def page_name= name
       @title = name
-      @href = "#{WIKI_CONTENT}/#{self.class.convert_name_to_url(name)}.html"
     end
 
     def self.convert_name_to_url(name)

data/lib/moodle2cc/moodle2converter/converter_helper.rb

@@ -58,18 +58,18 @@ module Moodle2CC
 
     def generate_unique_identifier_for(id, suffix = nil)
       unique_id = "m2#{Digest::MD5.hexdigest(id.to_s)}#{suffix}"
-      @@ids ||= Set.new
-      if @@ids.include?(unique_id)
+      id_set = Moodle2Converter::Migrator.unique_id_set
+      if id_set.include?(unique_id)
         # i was under the impression that moodle ids would be unique themselves
         # but i have been apparently misinformed
         original_id = unique_id
         index = 0
-        while @@ids.include?(unique_id)
+        while id_set.include?(unique_id)
           index += 1
           unique_id = "#{original_id}#{index}"
         end
       end
-      @@ids << unique_id
+      id_set << unique_id
       unique_id
     end
 

data/lib/moodle2cc/moodle2converter/label_converter.rb

@@ -29,8 +29,6 @@ module Moodle2CC
         canvas_page.workflow_state = workflow_state(moodle_label.visible)
         canvas_page.editing_roles = CanvasCC::Models::Page::EDITING_ROLE_TEACHER
         canvas_page.body = moodle_label.intro
-        canvas_page.href = generate_unique_resource_path(CanvasCC::Models::Page::WIKI_CONTENT,
-           Moodle2CC::CanvasCC::Models::Page.convert_name_to_url(canvas_page.title))
         pages << canvas_page
       end
       pages

data/lib/moodle2cc/moodle2converter/migrator.rb

@@ -4,6 +4,7 @@ module Moodle2CC::Moodle2Converter
     include ConverterHelper
 
     def initialize(source_file, output_dir)
+      self.class.clear_unique_id_set!
       @extractor = Moodle2CC::Moodle2::Extractor.new(source_file)
       @output_dir = output_dir
     end
@@ -29,6 +30,10 @@ module Moodle2CC::Moodle2Converter
         cc_course.pages += convert_labels(moodle_course.labels)
         cc_course.pages += convert_glossaries(moodle_course)
 
+        cc_course.pages.each do |canvas_page|
+          canvas_page.href = generate_unique_resource_path(Moodle2CC::CanvasCC::Models::Page::WIKI_CONTENT, canvas_page.title)
+        end
+
         cc_course.canvas_modules += convert_sections(moodle_course.sections)
 
         resolve_duplicate_page_titles!(cc_course)
@@ -189,5 +194,13 @@ module Moodle2CC::Moodle2Converter
       end
       [Float::INFINITY]
     end
+
+    def self.clear_unique_id_set!
+      @unique_id_set = Set.new
+    end
+
+    def self.unique_id_set
+      @unique_id_set ||= Set.new
+    end
   end
 end

data/lib/moodle2cc/moodle2converter/section_converter.rb

@@ -31,8 +31,6 @@ module Moodle2CC
       canvas_page.workflow_state = workflow_state(moodle_section.visible)
       canvas_page.editing_roles = CanvasCC::Models::Page::EDITING_ROLE_TEACHER
       canvas_page.body = moodle_section.summary
-      canvas_page.href = generate_unique_resource_path(CanvasCC::Models::Page::WIKI_CONTENT, Moodle2CC::CanvasCC::Models::Page.convert_name_to_url("#{moodle_section.name}-summary"))
-
       canvas_page
     end
 

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.26"
+  VERSION = "0.2.27"
 end

data/spec/moodle2cc/canvas_cc/models/page_spec.rb

@@ -18,16 +18,18 @@ module Moodle2CC::CanvasCC::Models
       expect(page.identifier).to eq 3
     end
 
-    it "sets the wiki_dir, and title" do
+    it "sets the title" do
       page.page_name = 'My Page Name'
-      expect(page.href).to eq 'wiki_content/my-page-name.html'
       expect(page.title).to eq 'My Page Name'
     end
 
+    it "converts names to urls" do
+      expect(page.class.convert_name_to_url('My Page Name')).to eq 'my-page-name'
+    end
+
     it "truncates urls that are too long" do
-      page.page_name = 'a' * 500
-      expected = "wiki_content/#{'a' * Moodle2CC::CanvasCC::Models::Page::MAX_URL_LENGTH}.html"
-      expect(page.href).to eq expected
+      expected = "#{'a' * Moodle2CC::CanvasCC::Models::Page::MAX_URL_LENGTH}"
+      expect(page.class.convert_name_to_url('a' * 500)).to eq expected
     end
 
   end

data/spec/moodle2cc/canvas_cc/page_writer_spec.rb

@@ -13,6 +13,7 @@ describe Moodle2CC::CanvasCC::PageWriter do
     page.identifier = 'my_id'
     page.workflow_state = 'active'
     page.body = '<h2>This is the body</h2>'
+    page.href = "testhref.html"
     page.editing_roles = 'teachers'
     page.page_name ='My Page Title'
     writer.write

data/spec/moodle2cc/moodle2converter/label_converter_spec.rb

@@ -50,8 +50,6 @@ module Moodle2CC
 
     describe '#convert_to_pages' do
       it 'converts a moodle label with intro content to a page' do
-        subject.stub(:generate_unique_identifier) { 'some_random_id' }
-
         moodle_label.id = '1'
         moodle_label.name = 'label title'
         moodle_label.intro = '<div>hey look i also have html content</div>'
@@ -67,7 +65,6 @@ module Moodle2CC
         expect(page.title).to eq 'label title'
         expect(page.editing_roles).to eq CanvasCC::Models::Page::EDITING_ROLE_TEACHER
         expect(page.body).to eq moodle_label.intro
-        expect(page.href).to end_with("label-title.html")
       end
 
       it 'does not convert a plain moodle label to a page' do

data/spec/moodle2cc/moodle2converter/migrator_spec.rb

@@ -6,7 +6,7 @@ module Moodle2CC
     let(:canvas_course) { CanvasCC::Models::Course.new }
 
     let(:moodle_course) { Moodle2CC::Moodle2::Models::Course.new }
-    let(:canvas_page) { Moodle2CC::CanvasCC::Models::Page.new }
+    let(:canvas_page) { p = Moodle2CC::CanvasCC::Models::Page.new; p.title = "sometitle"; p }
     let(:canvas_discussion) {Moodle2CC::CanvasCC::Models::Discussion.new}
     let(:canvas_assignment) {Moodle2CC::CanvasCC::Models::Assignment.new}
     let(:canvas_assessment) {Moodle2CC::CanvasCC::Models::Assessment.new}
@@ -55,8 +55,10 @@ module Moodle2CC
       it 'converts pages' do
         moodle_course.pages = [:page1, :page2]
         Moodle2Converter::PageConverter.any_instance.stub(:convert).and_return(canvas_page)
+        migrator.stub(:generate_unique_identifier).and_return('some_random_id')
         migrator.migrate
         expect(canvas_course.pages.compact).to eq [canvas_page, canvas_page]
+        expect(canvas_course.pages.first.href).to eq 'wiki_content/some_random_id/sometitle.html'
       end
 
       it 'converts wikis' do

data/spec/moodle2cc/moodle2converter/section_converter_spec.rb

@@ -42,7 +42,6 @@ module Moodle2CC
 
     describe '#convert_to_summary_page' do
       it 'converts the section summary to a page' do
-        subject.stub(:generate_unique_identifier).and_return('some_random_id')
         moodle_section.name = 'Name'
         moodle_section.summary = 'Summary Content'
         moodle_section.visible = true
@@ -55,7 +54,6 @@ module Moodle2CC
         expect(page.workflow_state).to eq 'active'
         expect(page.editing_roles).to eq 'teachers'
         expect(page.body).to eq 'Summary Content'
-        expect(page.href).to eq 'wiki_content/some_random_id/name-summary.html'
       end
     end
 

data/spec/spec_helper.rb

@@ -2,6 +2,12 @@ require 'rspec'
 require 'moodle2cc'
 Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
 
+RSpec.configure do |c|
+  c.after :each do
+    Moodle2CC::Moodle2Converter::Migrator.clear_unique_id_set!
+  end
+end
+
 def fixture_path(path)
   File.join(File.expand_path("../../test/fixtures", __FILE__), path)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.26
+  version: 0.2.27
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip