canvas_sync 0.12.0 → 0.13.0

data/spec/dummy/app/models/account.rb

@@ -7,11 +7,17 @@
 
 
 class Account < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
+  # include CanvasSync::Concerns::Account::Ancestry # Add support for the ancestry Gem
 
   validates :canvas_id, uniqueness: true, presence: true
 
   has_many :admins, primary_key: :canvas_id, foreign_key: :canvas_account_id
+  belongs_to :canvas_parent, class_name: 'Account', optional: true,
+                             primary_key: :canvas_id, foreign_key: :canvas_parent_account_id
+  has_many :sub_accounts, class_name: 'Account',
+                          primary_key: :canvas_id, foreign_key: :canvas_parent_account_id
 
   api_syncable({
     name: :name,

data/spec/dummy/app/models/admin.rb

@@ -7,7 +7,8 @@
 
 
 class Admin < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
   belongs_to :account, primary_key: :canvas_id, foreign_key: :canvas_account_id, optional: true

data/spec/dummy/app/models/assignment.rb

@@ -7,7 +7,8 @@
 
 
 class Assignment < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
   belongs_to :context, polymorphic: true, optional: true, primary_key: :canvas_id, foreign_key: :canvas_context_id, foreign_type: :canvas_context_type

data/spec/dummy/app/models/assignment_group.rb

@@ -7,7 +7,8 @@
 
 
 class AssignmentGroup < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
   belongs_to :course, primary_key: :canvas_id, foreign_key: :canvas_course_id, optional: true

data/spec/dummy/app/models/context_module.rb

@@ -10,7 +10,8 @@
 #   1 - Module is a reserved word in Rails and you can't call a model a Module
 #   2 - Canvas calls them ContextModules
 class ContextModule < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   belongs_to :context, polymorphic: true, optional: true, primary_key: :canvas_id, foreign_key: :canvas_context_id, foreign_type: :canvas_context_type
   has_many :context_module_items, primary_key: :canvas_id, foreign_key: :canvas_context_module_id

data/spec/dummy/app/models/context_module_item.rb

@@ -7,7 +7,8 @@
 
 
 class ContextModuleItem < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   belongs_to :context_module, primary_key: :canvas_id, foreign_key: :canvas_context_module_id, optional: true
   belongs_to :content, polymorphic: true, optional: true, primary_key: :canvas_id, foreign_key: :canvas_content_id, foreign_type: :canvas_content_type

data/spec/dummy/app/models/course.rb

@@ -7,7 +7,8 @@
 
 
 class Course < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
   belongs_to :term, foreign_key: :canvas_term_id, primary_key: :canvas_id, optional: true
@@ -16,7 +17,7 @@ class Course < ApplicationRecord
   has_many :assignments, as: :context, primary_key: :canvas_id, foreign_key: :canvas_context_id, foreign_type: :canvas_context_type
   has_many :submissions, primary_key: :canvas_id, foreign_key: :canvas_course_id
   has_many :assignment_groups, primary_key: :canvas_id, foreign_key: :canvas_course_id
-  
+
   api_syncable({
     sis_id: :sis_course_id,
     course_code: :course_code,

data/spec/dummy/app/models/enrollment.rb

@@ -7,7 +7,8 @@
 
 
 class Enrollment < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
   belongs_to :user, primary_key: :canvas_id, foreign_key: :canvas_user_id, optional: true

data/spec/dummy/app/models/role.rb

@@ -7,7 +7,8 @@
 
 
 class Role < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
   has_many :admins, foreign_key: :canvas_role_id, primary_key: :canvas_id

data/spec/dummy/app/models/section.rb

@@ -7,7 +7,8 @@
 
 
 class Section < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
   belongs_to :course, primary_key: :canvas_id, foreign_key: :canvas_course_id, optional: true

data/spec/dummy/app/models/submission.rb

@@ -7,7 +7,8 @@
 
 
 class Submission < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
   belongs_to :assignment, primary_key: :canvas_id, foreign_key: :canvas_assignment_id, optional: true

data/spec/dummy/app/models/term.rb

@@ -7,7 +7,8 @@
 
 
 class Term < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
   has_many :courses, foreign_key: :canvas_term_id, primary_key: :canvas_id

data/spec/dummy/app/models/user.rb

@@ -7,7 +7,8 @@
 
 
 class User < ApplicationRecord
-  include CanvasSync::ApiSyncable
+  include CanvasSync::Record
+  include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
   has_many :enrollments, primary_key: :canvas_id, foreign_key: :canvas_user_id

data/spec/dummy/config/application.rb

@@ -1,6 +1,17 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+require 'rails'
+require 'active_record/railtie'
+# require 'active_storage/engine'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'action_mailer/railtie'
+require 'active_job/railtie'
+# require 'action_cable/engine'
+# require 'action_mailbox/engine'
+# require 'action_text/engine'
+require 'rails/test_unit/railtie'
+# require 'sprockets/railtie'
 
 Bundler.require(*Rails.groups)
 require "canvas_sync"

data/spec/dummy/config/database.yml

@@ -1,25 +1,25 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-#
+
 default: &default
   adapter: postgresql
-  pool: 5
-  timeout: 5000
+  encoding: unicode
+  # For details on connection pooling, see Rails configuration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
+  pool: <%= ENV.fetch("DB_POOL_SIZE", nil) || (ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i + 10) %>
+  username: <%= ENV.fetch("DB_USERNAME", "") %>
+  password: <%= ENV.fetch("DB_PASSWORD", "") %>
+  host: <%= ENV.fetch("DB_ADDRESS", "localhost") %>
 
 development:
   <<: *default
   database: canvas_sync_development
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   <<: *default
   database: canvas_sync_test
 
 production:
   <<: *default
+  host: <%= ENV.fetch('DB_ADDRESS', 'localhost') %>
   database: canvas_sync_production
+  username: <%= ENV.fetch("DB_USERNAME", "canvas_sync_specs_postgres_user") %>
+  password: <%= ENV.fetch("DB_PASSWORD", 'canvas_sync_specs_postgres_password') %>

data/spec/dummy/config/environments/development.rb

@@ -25,16 +25,16 @@ Rails.application.configure do
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = true
+  # config.assets.debug = true
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
-  config.assets.digest = true
+  # config.assets.digest = true
 
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
+  # config.assets.raise_runtime_errors = true
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true

data/spec/dummy/config/initializers/assets.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+# Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -322,6 +322,10 @@ files:
 - db/migrate/20190916154829_add_fork_count_to_canvas_sync_job_logs.rb
 - lib/canvas_sync.rb
 - lib/canvas_sync/api_syncable.rb
+- lib/canvas_sync/class_callback_executor.rb
+- lib/canvas_sync/concerns/account/ancestry.rb
+- lib/canvas_sync/concerns/api_syncable.rb
+- lib/canvas_sync/concerns/legacy_columns.rb
 - lib/canvas_sync/config.rb
 - lib/canvas_sync/engine.rb
 - lib/canvas_sync/generators/install_generator.rb
@@ -367,10 +371,12 @@ files:
 - lib/canvas_sync/importers/bulk_importer.rb
 - lib/canvas_sync/importers/legacy_importer.rb
 - lib/canvas_sync/job.rb
+- lib/canvas_sync/job_chain.rb
 - lib/canvas_sync/jobs/fork_gather.rb
 - lib/canvas_sync/jobs/report_checker.rb
 - lib/canvas_sync/jobs/report_processor_job.rb
 - lib/canvas_sync/jobs/report_starter.rb
+- lib/canvas_sync/jobs/sync_accounts_job.rb
 - lib/canvas_sync/jobs/sync_admins_job.rb
 - lib/canvas_sync/jobs/sync_assignment_groups_job.rb
 - lib/canvas_sync/jobs/sync_assignments_job.rb
@@ -391,6 +397,7 @@ files:
 - lib/canvas_sync/processors/provisioning_report_processor.rb
 - lib/canvas_sync/processors/report_processor.rb
 - lib/canvas_sync/processors/submissions_processor.rb
+- lib/canvas_sync/record.rb
 - lib/canvas_sync/sidekiq_job.rb
 - lib/canvas_sync/version.rb
 - spec/canvas_sync/canvas_sync_spec.rb