canvas_sync 0.17.6 → 0.17.7.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f6a868c0dd531a98b7999e7c132f75edb211856dd84ef5519e47b4634a0001
-  data.tar.gz: e305790ec6923cea6eabc085b67105b3ac6f66ea3f5eaf35083d3bfb552a5558
+  metadata.gz: dce8b98794dc361c339eee16174fd5444df5e59b20a556de679d6308557a0285
+  data.tar.gz: 661f36b657c10a887cb8f1b7fc20af78e2790ed0ea08f2d1ead09d2a0118751e
 SHA512:
-  metadata.gz: fd34b80603ecaf90040446cb998e4ce7f33e4ed28c29436aee0ad5a017119d1187b0dbc7961f4300a542a97cef7af051428ba30ced733c68c085b609fcb4c225
-  data.tar.gz: e8227d369bbf5fab0f4bf8b4fcb90310a197986fa1a8f85c56689ab521ec9abfcc59ff6b4601b66a50742873aa1f98e969038f62ca1dca19a568e081a8f3e14a
+  metadata.gz: 8b952769ecfdb561ae22be39168614aa69a1d93eea3811ac4809e5b605a807887dc97db1af64acd140be0399b4a73f0d61076d645f0ebacee772370e27880d91
+  data.tar.gz: 60ccba0f231646e5b3634c16c525ca3fda187cf454ed91c0aabe93d2121a2a9a423c43fdac91019262a2129b1f3741af98fa3a6854b16e1a9e0445ff2c2c305c

data/lib/canvas_sync/job_batches/chain_builder.rb

@@ -56,12 +56,11 @@ module CanvasSync
           placement = kwargs.keys[0]
           relative_to = kwargs.values[0]
 
-          matching_jobs = find_matching_jobs(relative_to)
+          matching_jobs = find_matching_jobs(relative_to).to_a
           raise "Could not find a \"#{relative_to}\" job in the chain" if matching_jobs.count == 0
           raise "Found multiple \"#{relative_to}\" jobs in the chain" if matching_jobs.count > 1
 
-          relative_job, sub_index = matching_jobs[0]
-          parent_job = find_parent_job(relative_job)
+          relative_job, parent_job, sub_index = matching_jobs[0]
           needed_parent_type = placement == :with ? ConcurrentBatchJob : SerialBatchJob
 
           chain = self.class.get_chain_parameter(parent_job)
@@ -91,7 +90,7 @@ module CanvasSync
         raise "Found multiple \"#{sub_type}\" jobs in the chain" if matching_jobs.count > 1
         return nil if matching_jobs.count == 0
 
-        new(matching_jobs[0])
+        new(matching_jobs[0][0])
       end
 
       def normalize!(job_def = self.base_job)
@@ -108,9 +107,7 @@ module CanvasSync
 
       # Legacy Support
       def merge_options(job, options)
-        matching_jobs = find_matching_jobs(job)
-
-        matching_jobs.each do |j|
+        find_matching_jobs(job).each do |j, parent, index|
           j[:options] ||= {}
           j[:options].deep_merge!(options)
         end
@@ -124,9 +121,9 @@ module CanvasSync
         sub_jobs = self.class.get_chain_parameter(parent_job)
         sub_jobs.each_with_index do |sub_job, i|
           if sub_job[:job].to_s == search_job.to_s
-            yield [parent_job, i]
-          elsif self.class._job_type_definitions[sub_job[:job]]
-            find_matching_jobs(search_job) { |item| yield item }
+            yield [sub_job, parent_job, i]
+          elsif self.class._job_type_definitions[sub_job[:job].to_s]
+            find_matching_jobs(search_job, sub_job) { |item| yield item }
           end
         end
       end
@@ -163,7 +160,7 @@ module CanvasSync
 
         def get_chain_parameter(job_def, raise_error: true)
           unless _job_type_definitions[job_def[:job].to_s].present?
-            raise "Job Type #{base_job[:job].to_s} does not accept a sub-chain" if raise_error
+            raise "Job Type #{job_def[:job].to_s} does not accept a sub-chain" if raise_error
             return nil
           end
 

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.6".freeze
+  VERSION = "0.17.7.beta1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.17.6
+  version: 0.17.7.beta1
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -644,9 +644,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: