canvas_cc 0.0.42 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fad0be6edd74df25edd4dd33cdc97a40ca57211
-  data.tar.gz: 72d538146fbfa958e7bbea6d6c4b1dc1c4332fee
+  metadata.gz: 6ad82972f08397f9faf11929d9442bc229d9f817
+  data.tar.gz: 6be99b31764b811bd89b739c00d1e4b67bf565c0
 SHA512:
-  metadata.gz: 809ae2b6cd456ecb6c21e5ef26b502ab684d8b96c59ecd2b36258917eb5728c252e53bdb0b7d8430a6c51a393c4e0d49a050549f57daa585e0d74122f1a88227
-  data.tar.gz: 6356f5c497501ce794b02cc554f4bac903169c0b5e2107a8226c49d8583925505d2a7f0790141daef79bc206b5442d3ce2a094aa2217cf83a9f594d606d24de5
+  metadata.gz: 525aab2d4db0598f8b45140c89bfc02798de7844a754bc499bd801532a331100061fca6d8f721c2d5fa37aca4cc15b35bd675108c72254221ad974c49f93479c
+  data.tar.gz: 2ebb17f5ab29be4aada38b3caf5eb3379ef48c39daaebbe68007091c61a4e490f95a9a9de367acc562e9df5047df2d7befa9db2f041ff87b755754509d642485

data/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

data/canvas_cc.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "rubyzip", '>=1.0.0'
+  spec.add_runtime_dependency "rubyzip", '~> 1.2.1'
   spec.add_runtime_dependency "happymapper"
   spec.add_runtime_dependency "builder"
   spec.add_runtime_dependency "thor"
@@ -27,12 +27,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "rspec", "~> 2"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-bundler"
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler"
 end

data/lib/canvas_cc/canvas_cc/discussion_writer.rb

@@ -41,7 +41,7 @@ module CanvasCc::CanvasCC
           xml.topic_id discussion_resource.identifier
           xml.title discussion.title
           xml.position discussion.position
-          xml.type 'topic'
+          xml.type discussion.type || 'topic'
           xml.discussion_type discussion.discussion_type
           xml.require_initial_post discussion.require_initial_post
           xml.pinned discussion.pinned

data/lib/canvas_cc/canvas_cc/grading_standard_writer.rb

@@ -8,7 +8,7 @@ module CanvasCc::CanvasCC
     end
 
     def write
-      return unless @grading_standards.present?
+      return if @grading_standards.empty?
       xml = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
         write_grading_standards(xml) do |xml|
           @grading_standards.each do |gs|

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

@@ -1,7 +1,7 @@
 module CanvasCc::CanvasCC::Models
   class Discussion
     attr_accessor :identifier, :title, :text, :discussion_type, :workflow_state, :require_initial_post,
-                  :assignment, :position, :pinned, :lock_at, :delayed_post_at
+                  :assignment, :position, :pinned, :lock_at, :delayed_post_at, :type
     DISCUSSION_ID_POSTFIX = '_DISCUSSION'
     DISCUSSION_META_POSTFIX = '_meta'
     IMSDT_TYPE = 'imsdt_xmlv1p1'

data/lib/canvas_cc/version.rb

@@ -1,3 +1,3 @@
 module CanvasCc
-  VERSION = "0.0.42"
+  VERSION = "0.0.43"
 end

data/spec/moodle2cc/canvas_cc/assessment_writer_spec.rb

@@ -12,7 +12,7 @@ module CanvasCc::CanvasCC
     end
 
     it 'raises an error unless question references are first resolved' do
-      expect { subject.write }.to raise_exception
+      expect { subject.write }.to raise_exception("need to resolve questions references")
     end
 
     it 'creates the assessment meta file' do
@@ -90,8 +90,8 @@ module CanvasCc::CanvasCC
       assessment.items = [question]
 
       QuestionWriter.register_writer_type(nil)
-      QuestionWriter.stub(:write_responses)
-      QuestionWriter.stub(:write_response_conditions)
+      allow(QuestionWriter).to receive(:write_responses)
+      allow(QuestionWriter).to receive(:write_response_conditions)
 
       subject.write
 

data/spec/moodle2cc/canvas_cc/assignment_group_writer_spec.rb

@@ -19,7 +19,7 @@ module CanvasCc::CanvasCC
 
       valid_schema = File.read(fixture_path(File.join('common_cartridge', 'schema', 'cccv1p0.xsd')))
       xsd = Nokogiri::XML::Schema(valid_schema)
-      expect(xsd.validate(xml)).to be_true
+      expect(xsd.validate(xml)).to be_truthy
     end
 
     it 'adds assignment group' do

data/spec/moodle2cc/canvas_cc/canvas_export_writer_spec.rb

@@ -19,8 +19,8 @@ module CanvasCc::CanvasCC
       path = File.join(tmpdir,
                        CartridgeCreator::COURSE_SETTINGS_DIR,
                        CanvasExportWriter::CANVAS_EXPORT_FILE)
-      expect(File.exist?(path)).to be_true
+      expect(File.exist?(path)).to be_truthy
     end
 
   end
-end
+end

data/spec/moodle2cc/canvas_cc/cartridge_creator_spec.rb

@@ -12,19 +12,19 @@ module CanvasCc::CanvasCC
       course.title = 'My Course'
       course.canvas_modules << Models::CanvasModule.new
 
-      CanvasExportWriter.any_instance.stub(:write)
-      CourseSyllabusWriter.any_instance.stub(:write)
-      GradingStandardWriter.any_instance.stub(:write)
-      CourseSettingWriter.any_instance.stub(:write)
-      ModuleMetaWriter.any_instance.stub(:write)
-      ImsManifestGenerator.any_instance.stub(:write)
-      FileMetaWriter.any_instance.stub(:write)
-      PageWriter.any_instance.stub(:write)
-      DiscussionWriter.any_instance.stub(:write)
-      AssignmentWriter.any_instance.stub(:write)
-      QuestionBankWriter.any_instance.stub(:write)
-      OutcomeWriter.any_instance.stub(:write)
-      RubricWriter.any_instance.stub(:write)
+      allow_any_instance_of(CanvasExportWriter).to receive(:write)
+      allow_any_instance_of(CourseSyllabusWriter).to receive(:write)
+      allow_any_instance_of(GradingStandardWriter).to receive(:write)
+      allow_any_instance_of(CourseSettingWriter).to receive(:write)
+      allow_any_instance_of(ModuleMetaWriter).to receive(:write)
+      allow_any_instance_of(ImsManifestGenerator).to receive(:write)
+      allow_any_instance_of(FileMetaWriter).to receive(:write)
+      allow_any_instance_of(PageWriter).to receive(:write)
+      allow_any_instance_of(DiscussionWriter).to receive(:write)
+      allow_any_instance_of(AssignmentWriter).to receive(:write)
+      allow_any_instance_of(QuestionBankWriter).to receive(:write)
+      allow_any_instance_of(OutcomeWriter).to receive(:write)
+      allow_any_instance_of(RubricWriter).to receive(:write)
     end
 
     after :each do
@@ -35,7 +35,7 @@ module CanvasCc::CanvasCC
      FileMetaWriter, PageWriter, DiscussionWriter, AssignmentWriter, QuestionBankWriter, OutcomeWriter, RubricWriter].each do |klass|
       it "writes #{klass}" do
         writer_double = double(write: nil)
-        klass.stub(:new).and_return(writer_double)
+        allow(klass).to receive(:new).and_return(writer_double)
         subject.create(tmpdir)
         expect(writer_double).to have_received(:write)
       end

data/spec/moodle2cc/canvas_cc/course_setting_writer_spec.rb

@@ -20,7 +20,7 @@ module CanvasCc::CanvasCC
 
       valid_schema = File.read(fixture_path(File.join('common_cartridge', 'schema', 'cccv1p0.xsd')))
       xsd = Nokogiri::XML::Schema(valid_schema)
-      expect(xsd.validate(xml)).to be_true
+      expect(xsd.validate(xml)).to be_truthy
     end
 
     it 'applies settings to xml' do
@@ -44,4 +44,4 @@ module CanvasCc::CanvasCC
     end
 
   end
-end
+end

data/spec/moodle2cc/canvas_cc/file_meta_writer_spec.rb

@@ -17,7 +17,7 @@ module CanvasCc::CanvasCC
 
     it 'xml contains the correct schema' do
       meta_writer = writer(file, nil)
-      meta_writer.stub(:copy_files) { nil }
+      allow(meta_writer).to receive(:copy_files) { nil }
       xml = write_xml(meta_writer)
       assert_xml_schema(xml)
     end
@@ -28,7 +28,7 @@ module CanvasCc::CanvasCC
         file.file_path = 'sample.txt'
         write_xml(writer(file, nil))
         path = File.join(tmpdir, Models::CanvasFile::WEB_RESOURCES, 'sample.txt')
-        expect(File.exist?(path)).to be_true
+        expect(File.exist?(path)).to be_truthy
       end
     end
 

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

@@ -34,8 +34,8 @@ describe CanvasCc::CanvasCC::Models::Assessment do
   it_behaves_like 'it has an attribute for', :items
 
   it 'returns both resources' do
-    subject.stub(:cc_assessment_resource) {:cc_resource}
-    subject.stub(:canvas_assessment_resource) {:canvas_resource}
+    allow(subject).to receive(:cc_assessment_resource) {:cc_resource}
+    allow(subject).to receive(:canvas_assessment_resource) {:canvas_resource}
     expect(subject.resources).to eq [:cc_resource, :canvas_resource]
   end
 

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

@@ -26,7 +26,7 @@ describe CanvasCc::CanvasCC::Models::Assignment do
   it_behaves_like 'it has an attribute for', :omit_from_final_grade
 
   it 'creates a resource' do
-    subject.stub(:assignment_resource) {:assignment_resource}
+    allow(subject).to receive(:assignment_resource) {:assignment_resource}
     expect(subject.resources).to eq [:assignment_resource]
   end
 

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

@@ -10,8 +10,8 @@ module CanvasCc::CanvasCC::Models
     it_behaves_like 'it has an attribute for', :workflow_state
 
     it 'creates resource' do
-      subject.stub(:discussion_resource) { :discussion_resource }
-      subject.stub(:meta_resource) { :meta_resource }
+      allow(subject).to receive(:discussion_resource) { :discussion_resource }
+      allow(subject).to receive(:meta_resource) { :meta_resource }
       expect(subject.resources).to eq [:discussion_resource, :meta_resource]
     end
 

data/spec/moodle2cc/canvas_cc/question_bank_writer_spec.rb

@@ -15,8 +15,8 @@ module CanvasCc::CanvasCC
       question.identifier = 42
 
       QuestionWriter.register_writer_type(nil)
-      QuestionWriter.stub(:write_responses)
-      QuestionWriter.stub(:write_response_conditions)
+      allow(QuestionWriter).to receive(:write_responses)
+      allow(QuestionWriter).to receive(:write_response_conditions)
 
       question_bank.identifier = 'qb_id'
       question_bank.title = 'Bank title'

data/spec/moodle2cc/canvas_cc/question_writer_spec.rb

@@ -26,7 +26,7 @@ module CanvasCc::CanvasCC
     end
 
     it 'registers a question type for writing' do
-      FooBarWriter.stub(:write_question_item_xml)
+      allow(FooBarWriter).to receive(:write_question_item_xml)
       Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |node|
         QuestionWriter.write_question(node, question)
       end
@@ -40,7 +40,7 @@ module CanvasCc::CanvasCC
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |node|
           QuestionWriter.write_question(node, question)
         end
-      }.to raise_exception
+      }.to raise_exception("Unknown question writer type: nonexistenttype")
     end
 
     it 'writes item metadata' do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: canvas_cc
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: happymapper
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -224,16 +224,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 description: Create Canvas CC compatible file
 email:
 - pseng@instructure.com
@@ -241,8 +241,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -453,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Create Canvas CC compatible file

data/Gemfile.lock

@@ -1,92 +0,0 @@
-PATH
-  remote: .
-  specs:
-    canvas_cc (0.0.38)
-      builder
-      happymapper
-      nokogiri
-      rdiscount
-      rubyzip (>= 1.0.0)
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.3)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    coderay (1.1.0)
-    columnize (0.8.9)
-    debugger-linecache (1.2.0)
-    diff-lcs (1.2.5)
-    ffi (1.9.3)
-    formatador (0.2.5)
-    guard (2.6.1)
-      formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-bundler (2.0.0)
-      bundler (~> 1.0)
-      guard (~> 2.2)
-    guard-minitest (2.3.2)
-      guard (~> 2.0)
-      minitest (>= 3.0)
-    guard-rspec (4.3.1)
-      guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
-    happymapper (0.4.1)
-      libxml-ruby (~> 2.0)
-    libxml-ruby (2.9.0)
-    listen (2.7.9)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    method_source (0.8.2)
-    mini_portile2 (2.2.0)
-    minitest (5.4.1)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (10.3.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rdiscount (2.2.0.1)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
-    rubyzip (1.2.1)
-    slop (3.6.0)
-    thor (0.19.1)
-    timers (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.5)
-  byebug
-  canvas_cc!
-  guard
-  guard-bundler
-  guard-minitest
-  guard-rspec
-  minitest
-  pry
-  rake
-  rspec (~> 2)