moodle2cc 0.2.31 → 0.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 454c08c2f88ab86fe2036e22d82db441706aaca7
-  data.tar.gz: c9b8432e8e060b7519b76bb4c8493e7820e594f5
+  metadata.gz: 84458c72175d199565c6a5bfc146137b3b37c13b
+  data.tar.gz: 35fc6d255908a4bb61e5c9b88680849604d435ff
 SHA512:
-  metadata.gz: 71ac2bb459b06db08c18b752c2475962b3dc1d7fdcb46aa68f9a49bc0c75ef882d3f4794a4a2c0cc09e5e6465d30b1ab7a076c21a5213ed6dce3281dc97a5b64
-  data.tar.gz: 3ed60f392be83ef7a59d930ff92205e15bdd130c99f9a9e1c8ed3b0f004218a188bbb385bf29aa6db90054e3a974bba53af481ae6f7c98b8c6392f0c505b571b
+  metadata.gz: 7987922081107f961e132a778d6f1027dcf6ca5d999a01e54ca4883b40cc7b4c9dc42684c5a816b127dd799c0c9caca83028686d741b52777e2901143fdb3df1
+  data.tar.gz: b42092f99be42df4685309c839000be17458dc30042fdf6118705deae2a19e5e0bbe958c51bee6cd4c6eeba32bbd670b5e671da99bf58acf1e58870c273b79a1

data/lib/moodle2cc/canvas_cc/assignment_writer.rb

@@ -43,6 +43,7 @@ module Moodle2CC::CanvasCC
           xml.automatic_peer_reviews assignment.automatic_peer_reviews unless assignment.automatic_peer_reviews.nil?
           xml.grade_group_students_individually assignment.grade_group_students_individually unless assignment.grade_group_students_individually.nil?
           xml.muted assignment.muted unless assignment.muted.nil?
+          xml.external_tool_url assignment.external_tool_url unless assignment.external_tool_url.nil?
         }
       end.to_xml
       File.open(File.join(assignment_dir, Moodle2CC::CanvasCC::Models::Assignment::ASSIGNMENT_SETTINGS_FILE), 'w') { |f| f.write(xml) }

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

@@ -3,7 +3,7 @@ module Moodle2CC::CanvasCC::Models
     attr_accessor :identifier, :title, :body, :due_at, :lock_at, :unlock_at, :all_day_date, :peer_reviews_due_at,
                   :assignment_group_identifier_ref, :workflow_state, :points_possible, :grading_type, :all_day,
                   :submission_types, :position, :peer_review_count, :peer_reviews_assigned, :peer_reviews,
-                  :automatic_peer_reviews, :grade_group_students_individually, :muted
+                  :automatic_peer_reviews, :grade_group_students_individually, :muted, :external_tool_url
 
     LAR_TYPE = 'associatedcontent/imscc_xmlv1p1/learning-application-resource'
     ASSIGNMENT_SETTINGS_FILE = 'assignment_settings.xml'

data/lib/moodle2cc/moodle2/extractor.rb

@@ -173,8 +173,17 @@ module Moodle2CC::Moodle2
     end
 
     def parse_lti_links(work_dir, course)
-      if lti_links = Parsers::LtiParser.new(work_dir).parse
-        course.lti_links = lti_links
+      if lti_items = Parsers::LtiParser.new(work_dir).parse
+        course.assignments ||= []
+        course.lti_links ||= []
+        lti_items.each do |item|
+          case item
+          when Models::Lti
+            course.lti_links << item
+          when Models::Assignment
+            course.assignments << item
+          end
+        end
       end
     end
 

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

@@ -5,6 +5,7 @@ module Moodle2CC::Moodle2::Models
                   :grade, :time_modified, :completion_submit, :require_submission_statement, :team_submission,
                   :require_all_team_members_submit, :team_submission_grouping_id, :blind_marking, :reveal_identities,
                   :online_text_submission, :file_submission, :max_file_size_submission, :max_files_submission,
-                  :submission_comments, :feedback_comments, :feedback_files, :offline_grading_worksheet, :visible
+                  :submission_comments, :feedback_comments, :feedback_files, :offline_grading_worksheet, :visible,
+                  :external_tool_url
   end
 end

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

@@ -1,3 +1,4 @@
+require 'byebug'
 module Moodle2CC::Moodle2
   class Parsers::LtiParser
     include Parsers::ParserHelper
@@ -17,17 +18,30 @@ module Moodle2CC::Moodle2
     private
 
     def parse_lti(dir)
-      lti = Models::Lti.new
+      model = nil
       activity_dir = File.join(@backup_dir, dir)
       File.open(File.join(activity_dir, LTI_XML)) do |f|
         lti_xml = Nokogiri::XML(f)
-        lti.id        = lti_xml.at_xpath('/activity/lti/@id').value
-        lti.module_id = lti_xml.at_xpath('/activity/@moduleid').value
-        lti.name      = parse_text(lti_xml, '/activity/lti/name')
-        lti.url       = parse_text(lti_xml, '/activity/lti/toolurl')
+        points = parse_text(lti_xml, '/activity/lti/grade')
+        if points && points.to_i > 0
+          model = Models::Assignment.new
+          model.id        = lti_xml.at_xpath('/activity/lti/@id').value
+          model.module_id = lti_xml.at_xpath('/activity/@moduleid').value
+          model.name      = parse_text(lti_xml, '/activity/lti/name')
+          model.intro     = parse_text(lti_xml, "/activity/lti/intro")
+          model.intro_format = parse_text(lti_xml, "/activity/lti/introformat")
+          model.grade     = points
+          model.external_tool_url = parse_text(lti_xml, '/activity/lti/toolurl')
+        else
+          model = Models::Lti.new
+          model.id        = lti_xml.at_xpath('/activity/lti/@id').value
+          model.module_id = lti_xml.at_xpath('/activity/@moduleid').value
+          model.name      = parse_text(lti_xml, '/activity/lti/name')
+          model.url       = parse_text(lti_xml, '/activity/lti/toolurl')
+        end
       end
-      parse_module(activity_dir, lti)
-      lti
+      parse_module(activity_dir, model)
+      model
     end
 
 

data/lib/moodle2cc/moodle2converter/assignment_converter.rb

@@ -12,6 +12,7 @@ module Moodle2CC::Moodle2Converter
       canvas_assignment.lock_at = Time.at(Integer(moodle_assignment.cut_off_date)) if moodle_assignment.cut_off_date
       canvas_assignment.unlock_at = Time.at(Integer(moodle_assignment.allow_submissions_from_date)) if moodle_assignment.allow_submissions_from_date
       canvas_assignment.workflow_state = workflow_state(moodle_assignment.visible)
+      canvas_assignment.external_tool_url = moodle_assignment.external_tool_url
       points = Integer(moodle_assignment.grade)
       if points > 0 || scale = moodle_grading_scales[-1 * points] # moodle uses negative numbers for grading scale ids
         if scale && scale.count == 2
@@ -23,6 +24,7 @@ module Moodle2CC::Moodle2Converter
         end
         canvas_assignment.submission_types << 'online_text_entry' if moodle_assignment.online_text_submission == '1'
         canvas_assignment.submission_types << 'online_upload' if moodle_assignment.file_submission == '1'
+        canvas_assignment.submission_types << 'external_tool' if moodle_assignment.external_tool_url && moodle_assignment.external_tool_url.length > 0
       else
         canvas_assignment.grading_type = 'not_graded'
         canvas_assignment.submission_types << 'not_graded'

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.31"
+  VERSION = "0.2.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.31
+  version: 0.2.32
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip