moodle2cc 0.2.16 → 0.2.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2MyZjI2MDhmODI3YmRkZTg5NWQ4YjgzZjRhZWU0NDUzYTViYWExNg==
+    MmUyNmJjNWUxYzEwOGRiYTBlNDljMTc3ZjNlMWQyY2Y0ZjA1MTAxNQ==
   data.tar.gz: !binary |-
-    MTA3YWYwMjI1YjEwODZmZWU4NzI4NmEwZTZlMjhkODUwZjI4MjYxZA==
+    NjE0OWI3Y2JlNGI3ZjJhNmJlOThkOGU0YWJlNTI5NzZjMzE2MGUwYQ==
 SHA512:
   metadata.gz: !binary |-
-    NGE2YmFhZjJkNDUyMzNhZGI2OWE5MjYwMDRhZmU5ZDIxNTJhZjBlNzAwMmI4
-    MmUyYTIyYWRiNjAxOTFlN2IwNjNmMTU5Yzc3ZTlmZGRkMzNjNTAxMGZjZDNl
-    OTRkN2VlZjhkOTE2YTI3NDU0NjFhODhiNGE1Zjk3NjM0NDA0NTQ=
+    NjU4NmEzZTA5ZDJlNzRiOTJmZjlkMzVkMThiNmViNTVhNzZlNzcwNzhmNDhm
+    OWFjOTRlNjI4Y2I0N2UwYzViMWJkZmJlNWI2YzJmOGViNTFhOTVjMjk0Y2Ni
+    OTkwMWZiOTNjMTcwNzZjOTczMTdjM2M0NDAxZDM5Y2ZlYjMxZmI=
   data.tar.gz: !binary |-
-    OGYyMmYyZGFmOTQ0NTY3ODk4Mzk5NjAxN2Y3MDZmZTZmNWRjNmY0ZjBjY2Rl
-    ODhiNDJiYzE2ZmRhYTIzY2Y4MDgwMjgwMTAxODU3NTBmNmIxYzMwYzRkNjc3
-    MDZhMGQ0OGUzNGQ1NGIxNTlmYjg2OWNlMzI3ZTRmYzA1NWM0ZTk=
+    NzBiNTk5OWMxYmExYmM2NTdmNGQwOGUwZWUxNGE5YzI2YzFkZDA3OWQxZDA2
+    NTdiZDFlMTkxMmZkNjRiZWM1MjFiMmEzNzA5OTE4N2QwMDE0NzZkYjY2ZmFl
+    MGI0NWNjYzRjZDhhYjcxOWFiZTRjYjFlOWFhNTNhZjZhZGE3NWE=

data/Changelog

@@ -1,3 +1,6 @@
+2015-03-04 Version 0.2.17
+  * Add grading information to discussion topics
+
 2014-09-17 Version 0.2.16
   * Add choices to yes/no questionnaire questions
 

data/lib/moodle2cc/canvas_cc/discussion_writer.rb

@@ -44,6 +44,14 @@ module Moodle2CC::CanvasCC
           xml.discussion_type discussion.discussion_type
           xml.require_initial_post discussion.require_initial_post
           xml.workflow_state discussion.workflow_state
+          if discussion.points_possible
+            xml.assignment('identifier' => "#{meta_resource.identifier}_assignment" ) do |a|
+              a.title discussion.title
+              a.submission_types 'discussion_topic'
+              a.grading_type 'points'
+              a.points_possible discussion.points_possible
+            end
+          end
         }
       end.to_xml
       File.open(File.join(@work_dir, meta_resource.href), 'w') { |f| f.write(xml) }

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

@@ -1,6 +1,6 @@
 module Moodle2CC::CanvasCC::Models
   class Discussion
-    attr_accessor :identifier, :title, :text, :discussion_type, :workflow_state, :require_initial_post
+    attr_accessor :identifier, :title, :text, :discussion_type, :workflow_state, :require_initial_post, :points_possible
     DISCUSSION_ID_POSTFIX = '_DISCUSSION'
     DISCUSSION_META_POSTFIX = '_meta'
     IMSDT_TYPE = 'imsdt_xmlv1p1'

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

@@ -4,7 +4,7 @@ module Moodle2CC::Moodle2::Models
     attr_accessor :id, :module_id, :type, :name, :intro, :intro_format, :assessed, :assess_time_start, :assess_time_finish, :scale,
                   :max_bytes, :max_attachments, :force_subsscribe, :tracking_type, :rss_type, :rss_articles,
                   :time_modified, :warn_after, :block_after, :block_period, :completion_discussions, :completion_replies,
-                  :completion_posts, :visible
+                  :completion_posts, :visible, :points_possible
 
   end
 end

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

@@ -46,6 +46,15 @@ module Moodle2CC::Moodle2::Parsers
         forum.completion_replies = parse_text(forum_xml, "/activity/#{module_name}/completionreplies")
         forum.completion_posts = parse_text(forum_xml, "/activity/#{module_name}/completionposts")
       end
+      grade_file = File.join(activity_dir, "grades.xml")
+      if File.exists?(grade_file)
+        File.open(grade_file) do |f|
+          grade_xml = Nokogiri::XML(f)
+          if node = grade_xml.at_xpath("activity_gradebook/grade_items/grade_item/grademax")
+            forum.points_possible = node.text
+          end
+        end
+      end
       parse_module(activity_dir, forum)
       forum
     end

data/lib/moodle2cc/moodle2converter/discussion_converter.rb

@@ -11,6 +11,10 @@ module Moodle2CC::Moodle2Converter
       discussion.discussion_type = 'threaded'
       discussion.workflow_state = workflow_state(forum.visible)
       discussion.require_initial_post = (forum.type == 'qanda')
+
+      points = forum.points_possible.to_i
+      discussion.points_possible = points if points > 0
+
       discussion
     end
 

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 end

data/spec/moodle2cc/canvas_cc/discussion_writer_spec.rb

@@ -25,6 +25,7 @@ describe Moodle2CC::CanvasCC::DiscussionWriter do
     discussion.title = 'Discussion Title'
     discussion.text = '<p>discussion_text</p>'
     discussion.discussion_type = 'threaded'
+    discussion.points_possible = 99
     writer.write
     xml = Nokogiri::XML(File.read(File.join(work_dir, discussion.meta_resource.href)))
     expect(xml.at_xpath('xmlns:topicMeta/@identifier').value).to eq('discussion_id_meta')
@@ -33,6 +34,7 @@ describe Moodle2CC::CanvasCC::DiscussionWriter do
     expect(xml.%('topicMeta/type').text).to eq 'topic'
     expect(xml.%('topicMeta/position').text).to eq ''
     expect(xml.%('topicMeta/discussion_type').text).to eq 'threaded'
+    expect(xml.%('topicMeta/assignment/points_possible').text).to eq '99'
   end
 
 end

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

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Moodle2CC::Moodle2::Parsers::ForumParser do
   subject(:parser) { Moodle2CC::Moodle2::Parsers::ForumParser.new(fixture_path(File.join('moodle2', 'backup')))}
 
-
   it 'parses a moodle forum' do
     forums = parser.parse
     expect(forums.count).to eq 2
@@ -32,6 +31,7 @@ describe Moodle2CC::Moodle2::Parsers::ForumParser do
     expect(forum.completion_replies).to eq '0'
     expect(forum.completion_posts).to eq '0'
     expect(forum.visible).to eq true
+    expect(forum.points_possible).to eq "42"
   end
 
 

data/test/fixtures/moodle2/backup/activities/hsuforum_1/grades.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <activity_gradebook>
   <grade_items>
+    <grade_item>
+      <grademax>42</grademax>
+    </grade_item>
   </grade_items>
   <grade_letters>
   </grade_letters>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -822,7 +822,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Migrates Moodle backup ZIP to IMS Common Cartridge package