canvas_sync 0.18.9 → 0.18.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 490c7e8d4a1b61e5bd17dd938a0387f68718789bb05ad8c071d1a7dca83374ac
-  data.tar.gz: 06e933489bb8fd39f8af4a2c8498032faf7edf064a1df5cf882659823fa0f597
+  metadata.gz: 911b4fffbc2c21c25f32b45c0c90419dddcef40497b63c5d5757ec0e12544e36
+  data.tar.gz: 90377a8facd25b77726ab82754a50c7aa3a9851c1012801496e19d6258ea7275
 SHA512:
-  metadata.gz: 43fb1c9a539c970093c742ef2dd8cb1737a46f3b47ed1958b25fb3e3703ca3195677024d62d438d101ac913a53dbd86291fdaa3bd290c78e0b318064f6c27ddf
-  data.tar.gz: a08e7076c32de83470a32d2238ed0ac77055d3afa65411c0663330803e58b7edf2c9fa6a3b121c2835ec2347a23c40499248d35199c83de3f99347c71d7e77c9
+  metadata.gz: 5186a70509b324acdd5e8a8e023fdfb9503b7e899894938944632759eeb0bf362cd467f30700f3d8ba02a0ee06476c7646b83acf34ea3eeae5d0375a518d1096
+  data.tar.gz: 11812e324c87f8055baaade4a36a822b090b66c95691521a32eb89855c51ceddeaee417f87aae9f5b5c5401c1fe3a6433d102b4a5d9948f5278835ce71f8530d

data/lib/canvas_sync/concerns/ability_helper.rb

@@ -21,7 +21,7 @@ module CanvasSync::Concerns
     end
 
     def get_lti_cust_param(key)
-      nkey = key.gsub(/^custom_/, '')
+      nkey = key.to_s.gsub(/^custom_/, '')
 
       launch_params.dig("https://purl.imsglobal.org/spec/lti/claim/custom", nkey) || launch_params[nkey] || launch_params["custom_#{nkey}"]
     end

data/lib/canvas_sync/job_batches/chain_builder.rb

@@ -98,6 +98,10 @@ module CanvasSync
         end
       end
 
+      def empty?
+        self.class.get_chain_parameter(self).empty?
+      end
+
       def get_sub_chain(sub_type)
         matching_jobs = find_matching_jobs(sub_type).to_a
         raise "Found multiple \"#{sub_type}\" jobs in the chain" if matching_jobs.count > 1

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.18.9".freeze
+  VERSION = "0.18.10".freeze
 end

data/lib/canvas_sync.rb

@@ -170,9 +170,6 @@ module CanvasSync
       # General provisioning jobs (not term-scoped)
       ##############################
 
-      # Terms are always synced regardless of the models option
-      models -= ['terms']
-
       # Accounts, users, roles, and admins cannot be scoped to term
       try_add_model_job.call('accounts')
 
@@ -194,9 +191,10 @@ module CanvasSync
       # Per-term provisioning jobs
       ###############################
 
+      term_parent_chain = current_chain
+
       per_term_chain = JobBatches::ChainBuilder.new(model_job_map[:terms])
       per_term_chain.params[:term_scope] = term_scope
-      current_chain << per_term_chain
       current_chain = per_term_chain
 
       term_scoped_models.each do |mdl|
@@ -207,6 +205,11 @@ module CanvasSync
         generate_provisioning_jobs(models, options)
       )
 
+      # Skip syncing terms if not required
+      unless current_chain.empty? || (models & ['terms']).present?
+        term_parent_chain << per_term_chain
+      end
+
       ###############################
       # Wrap it all up
       ###############################