canvas_sync 0.23.5 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e083877d02dc44935f54e5d2fccdfe250cc4ea8e54bf6d005bf8fee9f1caa49
-  data.tar.gz: 955285ef809a3f76ed5ce77e011a2d6424e48719f1c5c067402e789bf81463ad
+  metadata.gz: 3391d91c2c45a7bbd04099137bfc94d896b703407c71b8b04c71b0e586bd4219
+  data.tar.gz: 581742ed82c4b5cdfcbd8d2c0c7ef2d97ab6c86833aebceeb4cd1bdab881aea1
 SHA512:
-  metadata.gz: 258a68a06ca68447954540e6426b252d50b37107f8299cbc1b0a69f5badc6b65946b9733e49cff4f8da4e8620637b921e0ed29bbfc5160c60c2c0f1225d7881a
-  data.tar.gz: 838081131c50f00e0750bbbdaf87fe713d51bd56a763ddf4624b8e4b2e7aaec59f87afc78197d7ff6c13135d9a4be32529c9fc8cc5abd75315dc1268c7544029
+  metadata.gz: 8dd6fb7e8585626f31564edd76f67227e306bc4d29449f154c197d3ef289ca69d2c7371659b4a479854e9a57f0f9c3a61e68a275370a965da0f192bb97c747e8
+  data.tar.gz: a31a167d26a44df1837038db87d9584c5f7f0e2964f142c34f08efc353a2cb2f713cf8002df681d79237ece0540f97eb35d2ab9eef931033bc1e264d847c9e15

data/Rakefile

@@ -9,11 +9,9 @@ task default: :spec
 desc 'This updates the models and migrations used by the testing Rails Dummy app and should be run whenever those are updated.'
 task :update_test_schema do
   puts "Updating test models and migration files..."
-  stream_command("spec/dummy/bin/rails generate canvas_sync:install --models all --force")
+  stream_command("cd spec/internal/; bin/rails generate canvas_sync:install --models all --force")
   puts "Updating live event files..."
-  stream_command("spec/dummy/bin/rails generate canvas_sync:install_live_events --events all --force")
-  puts "Updating the test database and schema..."
-  stream_command("cd spec/dummy; bundle exec rake db:drop; bundle exec rake db:create; bundle exec rake db:migrate")
+  stream_command("cd spec/internal/; bin/rails generate canvas_sync:install_live_events --events all --force")
 end
 
 def stream_command(cmd)

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.23.5".freeze
+  VERSION = "0.24.0".freeze
 end

data/lib/canvas_sync.rb

@@ -15,8 +15,7 @@ require "canvas_sync/jobs/report_processor_job"
 require "canvas_sync/batch_processor"
 require "canvas_sync/config"
 
-require "canvas_sync/job_batches/batch"
-require "canvas_sync/job_uniqueness/job_uniqueness"
+require "joblin"
 
 Dir[File.dirname(__FILE__) +  "/canvas_sync/jobs/*.rb"].each { |file| require file }
 Dir[File.dirname(__FILE__) +  "/canvas_sync/processors/*.rb"].each { |file| require file }
@@ -25,6 +24,9 @@ Dir[File.dirname(__FILE__) +  "/canvas_sync/generators/*.rb"].each { |file| requ
 Dir[File.dirname(__FILE__) +  "/canvas_sync/concerns/**/*.rb"].each { |file| require file }
 
 module CanvasSync
+  JobBatches = Joblin::Batching
+  JobUniqueness = Joblin::Uniqueness
+
   SUPPORTED_MODELS = %w[
     users
     pseudonyms
@@ -367,8 +369,8 @@ module CanvasSync
       @logger
     end
 
-    def redis(*args, &blk)
-      JobBatches::Batch.redis(*args, &blk)
+    def redis(&blk)
+      ::Bearcat.redis(&blk)
     end
 
     def redis_prefix

data/spec/canvas_sync/canvas_sync_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe CanvasSync do
           :args => [
             [
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[
                   [
                     {:job=>"CanvasSync::Jobs::SyncProvisioningReportJob", :options=>{:models=>["users"], :b=>2}},
@@ -66,7 +66,7 @@ RSpec.describe CanvasSync do
             :job => "CanvasSync::Jobs::BeginSyncChainJob",
             :args => [[
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[
                   [
                     {:job=>"CanvasSync::Jobs::SyncProvisioningReportJob", :options=>{:models=>["users"]}},
@@ -97,7 +97,7 @@ RSpec.describe CanvasSync do
             :job => "CanvasSync::Jobs::BeginSyncChainJob",
             :args => [[
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[[
                   {:job=>"CanvasSync::Jobs::SyncProvisioningReportJob", :options=>{:models=>["users"]}},
                   {
@@ -124,7 +124,7 @@ RSpec.describe CanvasSync do
             :job => "CanvasSync::Jobs::BeginSyncChainJob",
             :args => [[
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[[
                   {:job=>"CanvasSync::Jobs::SyncRolesJob", :options=>{}},
                   {
@@ -151,7 +151,7 @@ RSpec.describe CanvasSync do
             :job => "CanvasSync::Jobs::BeginSyncChainJob",
             :args => [[
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[[
                   {:job=>"CanvasSync::Jobs::SyncRolesJob", :options=>{}},
                   {
@@ -176,7 +176,7 @@ RSpec.describe CanvasSync do
             :job => "CanvasSync::Jobs::BeginSyncChainJob",
             :args => [[
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[[
                   {:job=>"CanvasSync::Jobs::SyncRolesJob", :options=>{:show_inherited=>true}},
                   {
@@ -204,7 +204,7 @@ RSpec.describe CanvasSync do
             :job => "CanvasSync::Jobs::BeginSyncChainJob",
             :args => [[
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[[
                   {:job=>"CanvasSync::Jobs::SyncAdminsJob", :options=>{}},
                   {
@@ -231,7 +231,7 @@ RSpec.describe CanvasSync do
             :job => "CanvasSync::Jobs::BeginSyncChainJob",
             :args => [[
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[[
                   {:job=>"CanvasSync::Jobs::SyncAdminsJob", :options=>{}},
                   {
@@ -259,7 +259,7 @@ RSpec.describe CanvasSync do
             :job => "CanvasSync::Jobs::BeginSyncChainJob",
             :args => [[
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[[
                   {:job=>"CanvasSync::Jobs::SyncProvisioningReportJob", :options=>{:models=>["users"]}},
                   {
@@ -290,7 +290,7 @@ RSpec.describe CanvasSync do
             :job => "CanvasSync::Jobs::BeginSyncChainJob",
             :args => [[
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[[
                   {:job=>"CanvasSync::Jobs::SyncProvisioningReportJob", :options=>{:models=>["users"]}},
                   {
@@ -321,7 +321,7 @@ RSpec.describe CanvasSync do
             :job => "CanvasSync::Jobs::BeginSyncChainJob",
             :args => [[
               {
-                :job=>"CanvasSync::JobBatches::ConcurrentBatchJob",
+                :job=>"Joblin::Batching::ConcurrentBatchJob",
                 :args=>[[
                   {:job=>"CanvasSync::Jobs::SyncProvisioningReportJob", :options=>{:models=>["users"]}},
                   {

data/spec/canvas_sync/live_events/process_event_job_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 
 RSpec.describe CanvasSync::LiveEvents::ProcessEventJob do
   before(:all) do
+    LiveEvents::UserEvent
     User.include(CanvasSync::Concerns::LiveEventSync)
   end
 

data/spec/{dummy → internal}/app/models/application_record.rb

@@ -1,3 +1,4 @@
 class ApplicationRecord < ActiveRecord::Base
+  # primary_abstract_class
   self.abstract_class = true
 end

data/spec/{dummy → internal}/app/models/course.rb

@@ -45,7 +45,6 @@ class Course < ApplicationRecord
   }, -> (api) { api.course(canvas_id) })
   # }, -> (api) { api.course(canvas_id, { include: ['public_description'] }) })
 
-
   scope :active, -> { where(workflow_state: 'active') }
 
   scope :current, -> {

data/spec/internal/bin/rails

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+Bundler.require :default, :development
+
+Combustion.path = '.'
+Combustion.initialize! :all
+require 'rails/commands'

data/spec/internal/config/database.yml

@@ -0,0 +1,5 @@
+test:
+  database: canvas-sync-test
+  adapter: postgresql
+  encoding: unicode
+  pool: 15

data/spec/internal/config/routes.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Rails.application.routes.draw do
+  # Add your own routes here, or remove this file if you don't have need for it.
+end

data/spec/internal/config/storage.yml

@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: tmp/storage

data/spec/{dummy/db/migrate/20190927204545_create_roles.rb → internal/db/migrate/20250912205147_create_roles.rb}

@@ -9,10 +9,10 @@
 class CreateRoles < ActiveRecord::Migration[5.1]
   def change
     create_table :roles do |t|
-      t.integer :canvas_id, null: false
+      t.bigint :canvas_id, null: false
       t.string :label
       t.string :base_role_type
-      t.integer :canvas_account_id
+      t.bigint :canvas_account_id
       t.string :workflow_state
       t.json :permissions
 

data/spec/internal/db/schema.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+ActiveRecord::Schema.define do
+  # Set up any tables you need to exist for your test suite that don't belong
+  # in migrations.
+end

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
 ENV["RAILS_ENV"] ||= 'test'
 ENV['REDIS_URL'] ||= 'redis://localhost:6379/9'
 
-require File.expand_path("../dummy/config/environment.rb", __FILE__)
-# Rails::Generators.invoke("canvas_sync:install", ["--models", "all"], destination_root: Rails.root)
 require "bundler/setup"
+Bundler.require :default, :development
+
+Combustion::Application.configure do
+  config.enable_reloading = true # Required for with_model
+end
+Combustion.initialize! :active_record, :active_job
+
 require 'rspec/rails'
 require 'spec_helper'
 require 'factory_bot_rails'
@@ -27,8 +32,7 @@ Sidekiq::Testing.server_middleware do |chain|
 end
 
 Dir[File.dirname(__FILE__) + "/job_batching/support/**/*.rb"].each {|f| require f }
-
-ActiveRecord::Migration.maintain_test_schema!
+Dir[File.dirname(__FILE__) + "/factories/**/*.rb"].each {|f| require f }
 
 RSpec.configure do |config|
   config.extend WithModel