canvas_sync 0.17.41 → 0.17.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfa9a724751a0d163496133f4c928f1ccfca544413d668ef045bb30178dd37fc
-  data.tar.gz: c6107cc707e8474dc23e429760b276d0f91f5e482860cd870b4069279bcc9120
+  metadata.gz: 7d7516d1ed3059c0c62d1f1ac058841dd289aca1ff8007576be2b0d823def9b7
+  data.tar.gz: 39fc2b3ade4599edaec6282b1db7b45f8cb81817573d7f35e7de1377624b1474
 SHA512:
-  metadata.gz: 6750a83429e8004c6c1a46079e349c63b5b14abd6ccc35f33117f74d791030708acd9918fe45f2a78f7da9bb0f07a5f3d2a1cd8990eabceb46541d430ae13719
-  data.tar.gz: 104ef9be9f7dab34e823f9705595ed4ee411b2ac1ef9a92fd04e4e42861997ccf7d85705765b65c3bad833bb25fa1409fb32354a2d816cd1034f05a94a0e90d1
+  metadata.gz: '0978316cfc1c66f2411d1fe00b3c9375a4032b8b6be49d63807fb596bc07f25367fe013e3e5bbba32085e0ebf9a4bfcd977c19c5e20a11c41bf02de0da40bd2a'
+  data.tar.gz: 7496829655356548947c2782a024c76370f9d1f74ac6b96b17d2df2c4afd177f5e43be6d0b60b1cee79955e15ba5a387e002c784bcc0dde2ee48b3bae7f61783

data/lib/canvas_sync/engine.rb

@@ -8,6 +8,7 @@ module CanvasSync
     initializer "canvas_sync.safe_yaml_classes" do |app|
       app.config.active_record.yaml_column_permitted_classes ||= []
       app.config.active_record.yaml_column_permitted_classes |= [Symbol, ActiveSupport::HashWithIndifferentAccess]
+      ActiveRecord::Base.yaml_column_permitted_classes |= app.config.active_record.yaml_column_permitted_classes
     rescue
     end
 
@@ -40,12 +41,14 @@ module CanvasSync
 
       require 'panda_pal'
 
-      def canvas_sync_client(account_id = nil)
-        Bearcat::Client.new(
-          prefix: current_organization.canvas_url,
-          token: current_organization.canvas_api_token,
-          master_rate_limit: (Rails.env.production? && !!defined?(Redis) && ENV['REDIS_URL'].present?),
-        )
+      class ::Object
+        def canvas_sync_client(account_id = nil)
+          Bearcat::Client.new(
+            prefix: current_organization.canvas_url,
+            token: current_organization.canvas_api_token,
+            master_rate_limit: (Rails.env.production? && !!defined?(Redis) && ENV['REDIS_URL'].present?),
+          )
+        end
       end
     rescue LoadError
     end

data/lib/canvas_sync/jobs/begin_sync_chain_job.rb

@@ -6,12 +6,16 @@ module CanvasSync
       def perform(chain_definition, globals = {})
         @globals = globals
 
+        if globals[:updated_after] == nil && Rails.env.development?
+          globals[:updated_after] = false
+        end
+
         if globals[:updated_after] == false
           globals[:updated_after] = nil
         elsif !globals[:updated_after].present? || globals[:updated_after] == true
           last_batch = SyncBatch.where(status: 'completed', batch_genre: genre).last
           globals[:full_sync_every] ||= "sunday/2"
-          globals[:updated_after] = last_batch&.started_at&.iso8601
+          globals[:updated_after] = ((last_batch.started_at - 1.day).iso8601 rescue nil)
         end
 
         # Refuse to run syncs of the same genre if there is a running full sync

data/lib/canvas_sync/jobs/report_processor_job.rb

@@ -26,7 +26,7 @@ module CanvasSync
       def download(report_name, report_url)
         Dir.mktmpdir do |dir|
           file_path = "#{dir}/#{report_name}"
-          IO.copy_stream(open(report_url), file_path)
+          IO.copy_stream(URI.open(report_url), file_path)
           yield file_path
         end
       end

data/lib/canvas_sync/jobs/report_starter.rb

@@ -35,7 +35,11 @@ module CanvasSync
 
       protected
 
-      def merge_report_params(options, params={}, term_scope: true)
+      # Ruby 3 changed how kwargs are handled. _kw_placeholder allows for backwards compatibility
+      # In Ruby 2, merge_report_params(options, params) would parse as merge_report_params(options, params={}, **params) (wtf?), so
+      # merge_report_params(options, params, {}) is used. That doesn't work in Ruby 3.
+      # In order to maintain compatibility with 2 and with any apps, this oddness is needed
+      def merge_report_params(options, params={}, _kw_placeholder=nil, term_scope: true)
         term_scope = options[:canvas_term_id] || batch_context[:canvas_term_id] if term_scope == true
         if term_scope.present?
           params[:enrollment_term_id] = term_scope

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.41".freeze
+  VERSION = "0.17.43".freeze
 end