canvas_sync 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 792fd9d830f8f82a41f33582487638b3bbb2dbf5
-  data.tar.gz: dda6faccb4e9c3377a74d182ac9538ae7bc5ed27
+  metadata.gz: d67da42a99163681e0b38c654370ebe31e8fcb76
+  data.tar.gz: 7ec74a8b1bbbac7878db5b4c81a1d0944acb7c74
 SHA512:
-  metadata.gz: 5d48237b5c4de288a01cd4c4645c097b35175255c492de9e9729efde69d9adad1884e12f5a9c2b0a47c059c54885f940dff451299130562f8215722f0b682ee5
-  data.tar.gz: 0eaafea6e753ed585495fb0f2b049e8c0f4c9c67824c3e9ee84a61c7b6e119d1fa36f990f32f3fe94b78629fdf714be5ea960a3e491ec7f190bac1b8b8d5a7a4
+  metadata.gz: e78e38fcc9e151c21d0b562a12cdae647b474aaf13eaa980be2dcbcafa4e45b2a37943d0d2ed4b893fe839927cc61a167d60dbdb3b4af0ed6f49be22f7abdea9
+  data.tar.gz: 2e1bb5e9523491efd415f947340fc9bbf37b49f07c5d2afcb27f9ec5a9da639f47dff83ef372bdfd546fb842f4fca48b0b7f3928ba776dd51b15ad4c1f15f60e

data/lib/canvas_sync/jobs/sync_provisioning_report_job.rb

@@ -7,26 +7,24 @@ module CanvasSync
       #   will be started for each term in that scope. :models should be an array of
       #   models to sync.
       def perform(job_chain, options)
-        @job_chain = job_chain
-
         if options[:term_scope]
           Term.send(options[:term_scope]).find_each do |term|
-            # Deep copy the options so each report gets the correct term id passed into
+            # Deep copy the job_chain so each report gets the correct term id passed into
             # its options with no side effects
-            duped_options = Marshal.load(Marshal.dump(options))
-            duped_options[:canvas_term_id] = term.canvas_term_id
-            start_report(report_params(options, term.canvas_term_id), duped_options)
+            duped_job_chain = Marshal.load(Marshal.dump(job_chain))
+            duped_job_chain[:options][:canvas_term_id] = term.canvas_term_id
+            start_report(report_params(options, term.canvas_term_id), duped_job_chain, options)
           end
         else
-          start_report(report_params(options), options)
+          start_report(report_params(options), job_chain, options)
         end
       end
 
       private
 
-      def start_report(report_params, options)
+      def start_report(report_params, job_chain, options)
         CanvasSync::Jobs::ReportStarter.perform_later(
-          @job_chain,
+          job_chain,
           'proservices_provisioning_csv',
           report_params,
           CanvasSync::Processors::ProvisioningReportProcessor.to_s,

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/canvas_sync/jobs/sync_provisioning_report_job_spec.rb

@@ -2,15 +2,20 @@ require 'spec_helper'
 
 RSpec.describe CanvasSync::Jobs::SyncProvisioningReportJob do
   describe '#perform' do
+    let(:job_chain) { {jobs: [], options: {}} }
+
     context 'a term scope is specified' do
       let!(:active_term_1) { FactoryGirl.create(:term) }
       let!(:active_term_2) { FactoryGirl.create(:term) }
       let!(:inactive_term_1) { FactoryGirl.create(:term, workflow_state: 'inactive') }
 
       it 'enqueues a ReportStarter for a provisioning report for the specified models for each term' do
+        expected_job_chain = Marshal.load(Marshal.dump(job_chain))
+        expected_job_chain[:options][:canvas_term_id] = active_term_1.canvas_term_id
+
         expect(CanvasSync::Jobs::ReportStarter).to receive(:perform_later)
           .with(
-            [],
+            expected_job_chain,
             'proservices_provisioning_csv',
             {
               "parameters[include_deleted]" => true,
@@ -19,12 +24,15 @@ RSpec.describe CanvasSync::Jobs::SyncProvisioningReportJob do
               "parameters[enrollment_term_id]" => active_term_1.canvas_term_id
             },
             CanvasSync::Processors::ProvisioningReportProcessor.to_s,
-            { models: ['users', 'courses'], term_scope: 'active', canvas_term_id: active_term_1.canvas_term_id }
+            { models: ['users', 'courses'], term_scope: 'active' }
           )
 
+        expected_job_chain_2 = Marshal.load(Marshal.dump(job_chain))
+        expected_job_chain_2[:options][:canvas_term_id] = active_term_2.canvas_term_id
+
         expect(CanvasSync::Jobs::ReportStarter).to receive(:perform_later)
           .with(
-            [],
+            expected_job_chain_2,
             'proservices_provisioning_csv',
             {
               "parameters[include_deleted]" => true,
@@ -33,11 +41,11 @@ RSpec.describe CanvasSync::Jobs::SyncProvisioningReportJob do
               "parameters[enrollment_term_id]" => active_term_2.canvas_term_id
             },
             CanvasSync::Processors::ProvisioningReportProcessor.to_s,
-            { models: ['users', 'courses'], term_scope: 'active', canvas_term_id: active_term_2.canvas_term_id }
+            { models: ['users', 'courses'], term_scope: 'active' }
           )
 
         CanvasSync::Jobs::SyncProvisioningReportJob.perform_now(
-          [],
+          job_chain,
           { models: ['users', 'courses'], term_scope: 'active' }
         )
       end
@@ -47,7 +55,7 @@ RSpec.describe CanvasSync::Jobs::SyncProvisioningReportJob do
       it 'enqueues a single ReportStarter for a provisioning report across all terms for the specified models' do
         expect(CanvasSync::Jobs::ReportStarter).to receive(:perform_later)
           .with(
-            [],
+            job_chain,
             'proservices_provisioning_csv',
             {
               "parameters[include_deleted]" => true,
@@ -59,7 +67,7 @@ RSpec.describe CanvasSync::Jobs::SyncProvisioningReportJob do
           )
 
         CanvasSync::Jobs::SyncProvisioningReportJob.perform_now(
-          [],
+          job_chain,
           { models: ['users', 'courses'] }
         )
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler