moodle2cc 0.1.0 → 0.1.1

data/lib/moodle2cc/cc/web_link.rb

@@ -7,7 +7,7 @@ module Moodle2CC::CC
 
     def initialize(mod)
       super
-      @url = mod.reference
+      @url = mod.reference.to_s.strip
     end
 
     def self.create_resource_key(mod)

data/lib/moodle2cc/logger.rb

@@ -0,0 +1,19 @@
+module Moodle2CC
+  class Logger
+    def self.logger
+      Thread.current[:__moodle2cc_logger__] || ::Logger.new(STDOUT)
+    end
+
+    def self.logger=(logger)
+      Thread.current[:__moodle2cc_logger__] = logger
+    end
+
+    def self.add_warning(message, exception)
+      if logger.respond_to? :add_warning
+        logger.add_warning(message, exception)
+      elsif logger.respond_to? :warn
+        logger.warn "#{message}\n    #{exception.message}\n"
+      end
+    end
+  end
+end

data/lib/moodle2cc/migrator.rb

@@ -4,6 +4,7 @@ module Moodle2CC
       @source = source
       @destination = destination
       @format = options['format'] || 'cc'
+      Moodle2CC::Logger.logger = options['logger'] || ::Logger.new(STDOUT)
       raise(Moodle2CC::Error, "'#{@source}' does not exist") unless File.exists?(@source)
       raise(Moodle2CC::Error, "'#{@destination}' is not a directory") unless File.directory?(@destination)
       raise(Moodle2CC::Error, "'#{@format}' is not a valid format. Please use 'cc' or 'canvas'.") unless ['cc', 'canvas'].include?(@format)
@@ -14,6 +15,8 @@ module Moodle2CC
       backup = Moodle2CC::Moodle::Backup.read @source
       @converter = @converter_class.new backup, @destination
       @converter.convert
+    rescue StandardError => error
+      Moodle2CC::Logger.add_warning 'error migrating content', error
     end
 
     def imscc_path

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/moodle2cc.rb

@@ -1,13 +1,15 @@
-require 'uri'
+require 'builder'
 require 'cgi'
-require 'ostruct'
-require 'fileutils'
 require 'erb'
+require 'fileutils'
 require 'happymapper'
-require 'builder'
+require 'logger'
 require 'nokogiri'
+require 'ostruct'
+require 'uri'
 
 require 'moodle2cc/error'
+require 'moodle2cc/logger'
 require 'moodle2cc/migrator'
 
 module Moodle2CC

data/test/unit/cc/web_link_test.rb

@@ -36,6 +36,13 @@ class TestUnitCCWebLink < MiniTest::Unit::TestCase
     assert_equal "http://en.wikipedia.org/wiki/Einstein", web_link.url
   end
 
+  def test_it_strips_whitespace_from_url
+    @mod.reference = " http://en.wikipedia.org/wiki/Einstein "
+
+    web_link = Moodle2CC::CC::WebLink.new @mod
+    assert_equal "http://en.wikipedia.org/wiki/Einstein", web_link.url
+  end
+
   def test_it_has_an_identifier
     @mod.id = 123
 

data/test/unit/logger_test.rb

@@ -0,0 +1,33 @@
+require 'minitest/autorun'
+require 'moodle2cc'
+require 'stringio'
+
+class TestUnitLogger < MiniTest::Unit::TestCase
+  class MyLogger
+    attr_accessor :message, :exception
+
+    def add_warning(message, exception)
+      @message   = message
+      @exception = exception
+    end
+  end
+
+  def test_it_logs_a_warning
+    stdout = StringIO.new
+    Moodle2CC::Logger.logger = ::Logger.new(stdout)
+    ex = StandardError.new 'Kablooey!!!'
+    Moodle2CC::Logger.add_warning 'got an error', ex
+    assert_match /got an error/, stdout.string
+    assert_match /Kablooey!!!/, stdout.string
+  end
+
+  def test_it_adds_a_warning
+    my_logger = MyLogger.new
+    Moodle2CC::Logger.logger = my_logger
+    ex  = StandardError.new 'Kablooey!!!'
+    msg = 'got an error'
+    Moodle2CC::Logger.add_warning msg, ex
+    assert_equal msg, my_logger.message
+    assert_equal ex, my_logger.exception
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: moodle2cc
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Christopher Durtschi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-24 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
@@ -213,6 +213,7 @@ files:
 - lib/moodle2cc/cc/wiki.rb
 - lib/moodle2cc/cli.rb
 - lib/moodle2cc/error.rb
+- lib/moodle2cc/logger.rb
 - lib/moodle2cc/migrator.rb
 - lib/moodle2cc/moodle/backup.rb
 - lib/moodle2cc/moodle/course.rb
@@ -256,6 +257,7 @@ files:
 - test/unit/cc/web_content_test.rb
 - test/unit/cc/web_link_test.rb
 - test/unit/cc/wiki_test.rb
+- test/unit/logger_test.rb
 - test/unit/migrator_test.rb
 - test/unit/moodle/backup_test.rb
 - test/unit/moodle/course_test.rb
@@ -331,6 +333,7 @@ test_files:
 - test/unit/cc/web_content_test.rb
 - test/unit/cc/web_link_test.rb
 - test/unit/cc/wiki_test.rb
+- test/unit/logger_test.rb
 - test/unit/migrator_test.rb
 - test/unit/moodle/backup_test.rb
 - test/unit/moodle/course_test.rb