canvas_sync 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ef8df28c558a21b5843f195f807b091efcc2cd0
-  data.tar.gz: '0549a9d1691f509116fbc136552b6ed2847ee8e1'
+  metadata.gz: 4cb4e4d83e146469a152b7582f9dff23adbf57e5
+  data.tar.gz: 7ac7ec7146259a6099093c63134a070af1656a07
 SHA512:
-  metadata.gz: d4712ea7567083b38968a4256e419546e126466886f1b81898bb018943f01c4471c326f5364d65e390b79ccc8fd26f8240868784847fce9f7748f082e4ed8fe2
-  data.tar.gz: ccd1e2beecb5651f511616ac56848e9282b108188831ca7ee811723ae7d14fadc736fe1a5bc605b7bde9aa3ad82804aaf711a7716718e29a6bc3cae322b0d8f5
+  metadata.gz: 1b98e4574ce7bce06cfba710c003fe8e8b4bf48b3f84326307d099bc9ab80136384c367ef4913e85a80331e4f0a855e41c40ea89e5cb4f30dec7af9e81c7585e
+  data.tar.gz: d572b58ae50eab9287e04972f79a72f0619cb25623a8615d4c2e55f93f58d54c9232e5371ffce4d844405380fb8c7e4e4d5706909f88f730d75878ddab10280a

data/lib/canvas_sync/jobs/report_checker.rb

@@ -11,29 +11,30 @@ module CanvasSync
       # @param options [Hash] hash of options that will be passed to the job processor
       # @return [nil]
       def perform(job_chain, report_name, report_id, processor, options)
-        report_status = CanvasSync.get_canvas_sync_client(job_chain[:global_options]).report_status('self', report_name, report_id)
+        account_id = options[:account_id] || job_chain[:global_options][:account_id] || 'self'
+        report_status = CanvasSync.get_canvas_sync_client(job_chain[:global_options]).report_status(account_id, report_name, report_id)
 
         case report_status['status'].downcase
-          when 'complete'
-            CanvasSync::Jobs::ReportProcessorJob.perform_later(
+        when 'complete'
+          CanvasSync::Jobs::ReportProcessorJob.perform_later(
               job_chain,
               report_name,
               report_status['attachment']['url'],
               processor,
               options
-            )
-          when 'error', 'deleted'
-            message = "Report failed to process; status was #{report_status} for report_name: #{report_name}, report_id: #{report_id}"
-            Rails.logger.error(message)
-            raise message
-          else
-            CanvasSync::Jobs::ReportChecker.set(wait: report_checker_wait_time)
+          )
+        when 'error', 'deleted'
+          message = "Report failed to process; status was #{report_status} for report_name: #{report_name}, report_id: #{report_id}"
+          Rails.logger.error(message)
+          raise message
+        else
+          CanvasSync::Jobs::ReportChecker.set(wait: report_checker_wait_time)
               .perform_later(
-                job_chain,
-                report_name,
-                report_id,
-                processor,
-                options
+                  job_chain,
+                  report_name,
+                  report_id,
+                  processor,
+                  options
               )
         end
       end

data/lib/canvas_sync/jobs/report_processor_job.rb

@@ -15,10 +15,7 @@ module CanvasSync
       def perform(job_chain, report_name, report_url, processor, options)
         @job_log.update_attributes(job_class: processor)
         download(report_name, report_url) do |file_path|
-          options = options.merge({
-            legacy_support: job_chain[:global_options][:legacy_support],
-            account_id: job_chain[:global_options][:account_id]
-          })
+          options = job_chain[:global_options].merge(options)
           processor.constantize.process(file_path, options)
         end
 

data/lib/canvas_sync/jobs/report_starter.rb

@@ -9,14 +9,15 @@ module CanvasSync
       # @param options [Hash] hash of options that will be passed to the job processor
       # @return [nil]
       def perform(job_chain, report_name, report_params, processor, options)
-        report = CanvasSync.get_canvas_sync_client(job_chain[:global_options]).start_report('self', report_name, report_params)
+        account_id = options[:account_id] || job_chain[:global_options][:account_id] || 'self'
+        report = CanvasSync.get_canvas_sync_client(job_chain[:global_options]).start_report(account_id, report_name, report_params)
 
         CanvasSync::Jobs::ReportChecker.set(wait: report_checker_wait_time).perform_later(
-          job_chain,
-          report_name,
-          report['id'],
-          processor,
-          options
+            job_chain,
+            report_name,
+            report['id'],
+            processor,
+            options
         )
       end
     end

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler