coalescing_panda 5.2.2 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ff79a0045d9ce6d7bc441835775dc872f1257c3a9e958ce9760b7cc45166bf9
-  data.tar.gz: 2069483ad4e45877780af43c0b2210db63bca59fd7060912528d8131fd13de7f
+  metadata.gz: e7878b0105e3d3ef6115420ad4fa3c2131677bf1ad567255105d5bf441da48f6
+  data.tar.gz: '0965adc240c9d7a787c279308ea9b52d8397ac92cef557cbb9941f5016bae29e'
 SHA512:
-  metadata.gz: b092c17ec0fce72c4f64e602b9a58cf28793174b9a37d7e1386b6c6d77626ea99e8fa92e5d4af0b0cd9a7a816ff21f0e270765b466a598992e481e1731314dc5
-  data.tar.gz: 34a4160773bc6c60a7ae6cbe860ecbc5e5a16ee693b84a539baadb5dcd4097406a838a3c4625bb90447558200456c21accf1a6bf401b8a25dc15d62fef22fd54
+  metadata.gz: f6c496be1722e5de4afa2f423cf2d4c8e1a94e781a3f0b3b0dac918f5f28ea9c0a69ca1962b14c49fe33034513f30a80cd07e6b282a7b61c2175559f77d7367a
+  data.tar.gz: ddc3b0768499c4c0b1ac33ba9f173cff4444bb30c3253bec37a2f85e530121fab0e28ab4fb56baa66f70078750a96eff15cb6b2968fe9246f0f9a2f03e057c7b

data/app/models/coalescing_panda/assignment.rb

@@ -1,8 +1,8 @@
 module CoalescingPanda
   class Assignment < ActiveRecord::Base
     belongs_to :course, foreign_key: :coalescing_panda_course_id, class_name: 'CoalescingPanda::Course'
-    belongs_to :assignment_group, foreign_key: :coalescing_panda_assignment_group_id, class_name: 'CoalescingPanda::AssignmentGroup'
-    belongs_to :group_category, foreign_key: :coalescing_panda_group_category_id, class_name: 'CoalescingPanda::GroupCategory'
+    belongs_to :assignment_group, foreign_key: :coalescing_panda_assignment_group_id, class_name: 'CoalescingPanda::AssignmentGroup', optional: true
+    belongs_to :group_category, foreign_key: :coalescing_panda_group_category_id, class_name: 'CoalescingPanda::GroupCategory', optional: true
     has_many :submissions, foreign_key: :coalescing_panda_assignment_id, class_name: 'CoalescingPanda::Submission', dependent: :destroy
 
     delegate :account, to: :course

data/app/models/coalescing_panda/workers/account_miner.rb

@@ -20,7 +20,7 @@ class CoalescingPanda::Workers::AccountMiner
     else
       batch = account.canvas_batches.create(context: account, status: "Queued")
     end
-    batch.update_attributes(options: options)
+    batch.update(options: options)
     batch
   end
 
@@ -35,18 +35,18 @@ class CoalescingPanda::Workers::AccountMiner
     end
 
     begin
-      batch.update_attributes(status: "Started", percent_complete: 0)
+      batch.update(status: "Started", percent_complete: 0)
       index = 1
       SUPPORTED_MODELS.each do |model_key|
         next unless options.include?(model_key)
         process_api_data(model_key.to_sym)
         percent_complete = (index/(options.count.nonzero? || 1).to_f * 100).round(1)
-        batch.update_attributes(percent_complete: percent_complete)
+        batch.update(percent_complete: percent_complete)
         index += 1
       end
-      batch.update_attributes(status: "Completed", percent_complete: 100)
+      batch.update(status: "Completed", percent_complete: 100)
     rescue => e
-      batch.update_attributes(status: "Error", message: e.message)
+      batch.update(status: "Error", message: e.message)
     end
   end
   handle_asynchronously :start
@@ -55,7 +55,7 @@ class CoalescingPanda::Workers::AccountMiner
     return true unless account.settings[:canvas_download_interval].present?
     return true unless last_completed_batch = account.canvas_batches.where(context: account, status: 'Completed').order('updated_at ASC').first
     should_download = last_completed_batch.updated_at < Time.zone.now - account.settings[:canvas_download_interval].minutes
-    batch.update_attributes(status: 'Canceled') unless should_download
+    batch.update(status: 'Canceled') unless should_download
     should_download
   end
 

data/app/models/coalescing_panda/workers/course_miner.rb

@@ -26,7 +26,7 @@ class CoalescingPanda::Workers::CourseMiner
     else
       batch = account.canvas_batches.create(context: course, status: "Queued")
     end
-    batch.update_attributes(options: options)
+    batch.update(options: options)
     batch
   end
 
@@ -41,18 +41,18 @@ class CoalescingPanda::Workers::CourseMiner
     end
 
     begin
-      batch.update_attributes(status: "Started", percent_complete: 0)
+      batch.update(status: "Started", percent_complete: 0)
       index = 1
       SUPPORTED_MODELS.each do |model_key|
         next unless options.include?(model_key)
         process_api_data(model_key.to_sym)
         percent_complete = (index/(options.count.nonzero? || 1).to_f * 100).round(1)
-        batch.update_attributes(percent_complete: percent_complete)
+        batch.update(percent_complete: percent_complete)
         index += 1
       end
-      batch.update_attributes(status: "Completed", percent_complete: 100)
+      batch.update(status: "Completed", percent_complete: 100)
     rescue => e
-      batch.update_attributes(status: "Error", message: e.message)
+      batch.update(status: "Error", message: e.message)
     end
   end
   handle_asynchronously :start
@@ -61,7 +61,7 @@ class CoalescingPanda::Workers::CourseMiner
     return true unless account.settings[:canvas_download_interval].present?
     return true unless last_completed_batch = account.canvas_batches.where(context: course, status: 'Completed').order('updated_at ASC').first
     should_download = last_completed_batch.updated_at < Time.zone.now - account.settings[:canvas_download_interval].minutes
-    batch.update_attributes(status: 'Canceled') unless should_download
+    batch.update(status: 'Canceled') unless should_download
     should_download
   end
 
@@ -285,7 +285,7 @@ class CoalescingPanda::Workers::CourseMiner
   def delete_object(object, hard_delete = false, field = 'workflow_state')
     if @options.include?(:soft_delete) && !hard_delete
       begin
-        object.update_attributes(field.to_sym => 'deleted')
+        object.update(field.to_sym => 'deleted')
       rescue => e
         Rails.logger.error("Error deleting with soft delete, attempting hard")
         delete_object(object, true)

data/app/views/coalescing_panda/canvas_batches/_canvas_batch_flash.html.haml

@@ -1,4 +1,4 @@
 - if current_batch.present?
-  - path = CoalescingPanda::Engine.routes.url_helpers.canvas_batch_path(current_batch) + "?encrypted_session_key=#{encrypted_session_key}"
-  - clear_path = CoalescingPanda::Engine.routes.url_helpers.clear_batch_session_path + "?encrypted_session_key=#{encrypted_session_key}"
+  - path = CoalescingPanda::Engine.routes.url_helpers.canvas_batch_path(current_batch)
+  - clear_path = CoalescingPanda::Engine.routes.url_helpers.clear_batch_session_path
   #batch-progress{data: {batch: current_batch.try(:to_json), url: path, clear_path: clear_path} }

data/lib/coalescing_panda/controller_helpers.rb

@@ -208,7 +208,7 @@ module CoalescingPanda
     # when using coalescing_panda.xyz_url (The Engine Prefix is not included)
     # I believe https://github.com/rails/rails/issues/34452 is the same issue
     def resolve_coalescing_panda_url(key)
-      key = key.to_s[0...-4] if key.to_s.ends_with?('_url')
+      key = key.to_s[0...-4] if key.to_s.end_with?('_url')
       resolved_path = coalescing_panda.send(:"#{key}_path")
       cpurl = coalescing_panda_url
       cppath = URI.parse(cpurl).path

data/lib/coalescing_panda/engine.rb

@@ -3,7 +3,6 @@ require_relative './secure_headers'
 
 module CoalescingPanda
   class Engine < ::Rails::Engine
-    config.autoload_once_paths += Dir["#{config.root}/lib/**/"]
     isolate_namespace CoalescingPanda
 
     config.generators do |g|
@@ -19,6 +18,14 @@ module CoalescingPanda
       end
     end
 
+    initializer 'coalescing_panda.zeitwerk' do |app|
+      Rails.autoloaders.each do |autoloader|
+        autoloader.inflector.inflect(
+          'json_with_indifferent_access' => 'JSONWithIndifferentAccess'
+        )
+      end
+    end
+
     initializer 'coalescing_panda.app_controller' do |app|
       OAUTH_10_SUPPORT = true
       ActiveSupport.on_load(:action_controller) do

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '5.2.2'
+  VERSION = '5.3.0'
 end

data/lib/coalescing_panda.rb

@@ -9,6 +9,10 @@ require 'sass-rails'
 require 'coffee-rails'
 require 'p3p'
 require 'delayed_job_active_record'
+require "zeitwerk"
+
+loader = Zeitwerk::Loader.for_gem
+loader.setup
 
 module CoalescingPanda
   class LtiNavigationInUse < StandardError;end
@@ -63,3 +67,5 @@ module CoalescingPanda
   end
 
 end
+
+loader.eager_load

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/models/coalescing_panda/workers/account_miner_spec.rb

@@ -73,7 +73,7 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
 
     it 'should return a started batch if one exists' do
       batch = worker.setup_batch
-      batch.update_attributes(status: 'Started')
+      batch.update(status: 'Started')
       batch = worker.setup_batch
       expect(batch.status).to eq 'Started'
     end

data/spec/models/coalescing_panda/workers/course_miner_spec.rb

@@ -273,7 +273,7 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
 
     it 'should return a started batch if one exists' do
       batch = worker.setup_batch
-      batch.update_attributes(status: 'Started')
+      batch.update(status: 'Started')
       batch = worker.setup_batch
       expect(batch.status).to eq 'Started'
     end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.3.0
 platform: ruby
 authors:
 - Nathan Mills
 - Cody Tanner
 - Jake Sorce
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11
+        version: 6.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11
+        version: 6.1.7
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bearcat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.3'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.15
 - !ruby/object:Gem::Dependency
   name: zip-zip
   requirement: !ruby/object:Gem::Requirement
@@ -410,7 +424,35 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+- !ruby/object:Gem::Dependency
+  name: loofah
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.19.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.19.1
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+description: 
 email:
 - nathanm@instructure.com
 - ctanner@instructure.com
@@ -512,6 +554,7 @@ files:
 - spec/controllers/coalescing_panda/oauth2_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -579,7 +622,7 @@ files:
 homepage: http://www.instructure.com
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -595,7 +638,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Canvas LTI and OAUTH2 mountable engine
 test_files:
@@ -634,6 +677,7 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/config/application.rb
 - spec/dummy/config/initializers/lti_initializer.rb