panda_pal 5.4.0.beta7 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac49d577cb992331095d1b740e3fb93cf2db47f84cbce2c31a06f9693a8e310f
-  data.tar.gz: baa5c0e8ce65e510badbc1fbdb11488fd1d642a3d062ef4d6516e52e473fdd64
+  metadata.gz: 682c93cece4f79d9c12499c2ef13e31ac9492d1f96640717915c07f1944318de
+  data.tar.gz: 782c6bac9411aaa23d0a6d34ac0914e5a241b8b872582acff995bec51f8abfb9
 SHA512:
-  metadata.gz: ff14fe4000b3045cda74165143a546b0f1eef774bb04392ad1c1b23913bf31bcee169cd05e9924fe96cd026198399d00c5a83b1badfac7ecf1b50baa5853181a
-  data.tar.gz: d9bc76487caae1258dc4825345c35fb846d96da1c0d966b375d63c3e964bbe128b1f1ad56cfdca22c9bca1d27b9be58495039b5997f32c4fb5816e78ae1a5b8a
+  metadata.gz: '0454692740709dc1be385443d5928631b87a9420a5a7666d7ef97ce18c55ff3776e3c3062ba1dfa2a236b69346b41c6139fa066a852faeb2aa667d0181c37317'
+  data.tar.gz: 699eff3766812c8bd3482df79e44a9f198865b2f556a92164496c22bfbfb4fb6e331c061e62467098e1c5ea7a495c591e54c37512944048e9226b3b9af30d083

data/{lib → app/jobs}/panda_pal/jobs/grade_passback_job.rb

@@ -4,10 +4,10 @@ module PandaPal::Jobs
   class GradePassbackFailure < StandardError; end
 
   class GradePassbackJob < ActiveJob::Base
-    sidekiq_options retry: 5
-
     attr_accessor :organization, :opts
 
+    sidekiq_options(retry: 5) if respond_to?(:sidekiq_options)
+
     # Required values for opts: passback_guid, passback_url, score AND/OR total_score.
     # Possible values for opts: cdata_text, text, url, submitted_at, lti_launch_url.
     # passback_guid is sent in launch params as 'lis_result_sourcedid'.

data/app/models/panda_pal/organization.rb

@@ -49,6 +49,10 @@ module PandaPal
       end
     end
 
+    PandaPal.resolved_extensions_for(self).each do |ext|
+      include ext
+    end
+
     private
 
     def create_schema

data/lib/panda_pal.rb

@@ -13,6 +13,7 @@ module PandaPal
   @@lti_properties = {}
   @@lti_environments = {}
   @@lti_custom_params = {}
+  @@extensions = {}
   @@lti_private_key = nil
 
   def self.lti_options= lti_options
@@ -70,8 +71,30 @@ module PandaPal
     @@lti_private_key = k
   end
 
+  def self.register_extension(type, modul)
+    type = normalize_ext_type(type)
+    @@extensions[type] ||= []
+    @@extensions[type] << modul.to_s
+  end
+
+  def self.extensions_for(type)
+    (@@extensions[normalize_ext_type(type)] || []).uniq
+  end
+
+  def self.resolved_extensions_for(type)
+    extensions_for(type).map do |ext|
+      ext.safe_constantize
+    end.compact
+  end
+
   private
 
+  def self.normalize_ext_type(type)
+    type = type.to_s
+    type = "#{self.to_s}::#{type}" unless type.starts_with?('::') || type.starts_with?(self.to_s)
+    type
+  end
+
   def self.validate_pandapal_config!
     errors = []
     validate_lti_navigation(errors)
@@ -89,3 +112,5 @@ module PandaPal
     errors
   end
 end
+
+PandaPal.register_extension 'Organization', '::OrganizationExtension'

data/lib/panda_pal/engine.rb

@@ -43,6 +43,10 @@ module PandaPal
       ActiveSupport.on_load(:active_record) do
         if defined?(Sidekiq) && Sidekiq.server? && PandaPal::Organization.respond_to?(:sync_schedules)
           PandaPal::Organization.sync_schedules
+
+          ActiveSupport::Reloader.to_prepare do
+            PandaPal::Organization.sync_schedules
+          end
         end
       end
     end

data/lib/panda_pal/helpers/session_replacement.rb

@@ -5,8 +5,11 @@ module PandaPal::Helpers
     extend ActiveSupport::Concern
 
     included do
-      helper_method :link_nonce, :current_session, :current_session_data
-      helper_method :link_with_session_to, :url_with_session, :session_url_for
+      # ActionController::API does not use views, so helper_method would not be defined
+      unless name == "ActionController::API"
+        helper_method :link_nonce, :current_session, :current_session_data
+        helper_method :link_with_session_to, :url_with_session, :session_url_for
+      end
 
       prepend_around_action :monkeypatch_flash
       prepend_around_action :auto_save_session

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.4.0.beta7"
+  VERSION = "5.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.4.0.beta7
+  version: 5.4.1
 platform: ruby
 authors:
 - Instructure ProServe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -198,7 +198,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - pseng@instructure.com
 executables: []
@@ -218,10 +218,10 @@ files:
 - app/controllers/panda_pal/lti_v1_p0_controller.rb
 - app/controllers/panda_pal/lti_v1_p3_controller.rb
 - app/helpers/panda_pal/application_helper.rb
+- app/jobs/panda_pal/jobs/grade_passback_job.rb
 - app/lib/lti_xml/base_platform.rb
 - app/lib/lti_xml/bridge_platform.rb
 - app/lib/lti_xml/canvas_platform.rb
-- app/lib/panda_pal/batch_processor.rb
 - app/lib/panda_pal/launch_url_helpers.rb
 - app/lib/panda_pal/lti_jwt_validator.rb
 - app/lib/panda_pal/misc_helper.rb
@@ -244,14 +244,12 @@ files:
 - db/migrate/20171205183457_encrypt_organization_settings.rb
 - db/migrate/20171205194657_remove_old_organization_settings.rb
 - lib/panda_pal.rb
-- lib/panda_pal/ability_mixin.rb
 - lib/panda_pal/engine.rb
 - lib/panda_pal/helpers.rb
 - lib/panda_pal/helpers/controller_helper.rb
 - lib/panda_pal/helpers/route_helper.rb
 - lib/panda_pal/helpers/secure_headers.rb
 - lib/panda_pal/helpers/session_replacement.rb
-- lib/panda_pal/jobs/grade_passback_job.rb
 - lib/panda_pal/plugins.rb
 - lib/panda_pal/version.rb
 - lib/tasks/panda_pal_tasks.rake
@@ -286,8 +284,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -304,7 +300,7 @@ homepage: http://instructure.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -315,56 +311,54 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: LTI mountable engine
 test_files:
-- spec/spec_helper.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/README.rdoc
+- spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environment.rb
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
 - spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
-- spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
+- spec/dummy/db/schema.rb
+- spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
-- spec/dummy/public/404.html
-- spec/dummy/db/schema.rb
-- spec/dummy/log/test.log
-- spec/dummy/log/development.log
-- spec/dummy/README.rdoc
+- spec/dummy/public/favicon.ico
+- spec/factories/panda_pal_organizations.rb
+- spec/factories/panda_pal_sessions.rb
 - spec/models/panda_pal/organization/settings_validation_spec.rb
 - spec/models/panda_pal/organization/task_scheduling_spec.rb
-- spec/models/panda_pal/session_spec.rb
 - spec/models/panda_pal/organization_spec.rb
-- spec/factories/panda_pal_sessions.rb
-- spec/factories/panda_pal_organizations.rb
+- spec/models/panda_pal/session_spec.rb
 - spec/rails_helper.rb
+- spec/spec_helper.rb

data/app/lib/panda_pal/batch_processor.rb

@@ -1,41 +0,0 @@
-module PandaPal
-  # An array that "processes" after so many items are added.
-  #
-  # Example Usage:
-  #   batches = BatchProcessor.new(of: 1000) do |batch|
-  #     # Process the batch somehow
-  #   end
-  #   enumerator_of_some_kind.each { |item| batches << item }
-  #   batches.flush
-  class BatchProcessor
-    attr_reader :batch_size
-
-    def initialize(of: 1000, &blk)
-      @batch_size = of
-      @block = blk
-      @current_batch = []
-    end
-
-    def <<(item)
-      @current_batch << item
-      process_batch if @current_batch.count >= batch_size
-    end
-
-    def add_all(items)
-      items.each do |i|
-        self << i
-      end
-    end
-
-    def flush
-      process_batch if @current_batch.present?
-    end
-
-    protected
-
-    def process_batch
-      @block.call(@current_batch)
-      @current_batch = []
-    end
-  end
-end

data/lib/panda_pal/ability_mixin.rb

@@ -1,85 +0,0 @@
-module PandaPal
-  module AbilityMixin
-    extend ActiveSupport::Concern
-
-    class_methods do
-      def self.role_permissions(labels)
-        roles = find_roles_by_label(labels)
-
-        if Rails.env.test? && roles.count == 0 && (labels || []).include?('Administrator')
-          return Hash.new(true)
-        end
-
-        final = {}
-        roles.find_each do |role|
-          role.permissions.each do |perm_name, perm|
-            final[perm_name] = false if final[perm_name].nil?
-            final[perm_name] = true if perm['enabled'] == true
-          end
-        end
-        final
-      end
-
-      def self.find_roles_by_label(labels)
-        raise "PandaPal AbilityMixin's support for Roles and Permissions requires that Roles be synced by CanvasSync" unless defined?(Role)
-
-        built_ins = []
-        labels = labels.split(',') if labels.is_a?(String)
-        custom_labels = Array(labels).reject do |l|
-          if role_is_default?(l)
-            built_ins << l
-          elsif l == 'Account Admin'
-            built_ins << 'AccountMembership'
-          else
-            next
-          end
-          true
-        end
-        Role.where(workflow_state: 'built_in', base_role_type: built_ins)
-            .or(Role.where.not(workflow_state: 'built_in').where(label: custom_labels))
-      end
-
-      def self.role_is_default?(role)
-        %w[TeacherEnrollment TaEnrollment StudentEnrollment DesignerEnrollment ObserverEnrollment].include? role
-      end
-    end
-
-    def is_lti_launch?
-      @controller.current_session.present?
-    end
-
-    def panda_pal_session
-      @panda_pal_session ||= @controller.current_session&.data || {}
-    end
-
-    def rails_session
-      @rails_session ||= @controller.session
-    end
-
-    def launch_params
-      @launch_params ||= panda_pal_session[:launch_params] || {}
-    end
-
-    # Roles and Permissions
-    def lti_roles
-      @lti_roles ||= LTIRoles::RoleManager.new(launch_params['ext_roles'] || '')
-    end
-
-    def canvas_permissions
-      panda_pal_session[:canvas_permissions] ||= self.class.role_permissions(launch_params['custom_canvas_role'])
-    end
-
-    def canvas_role_labels
-      labels = launch_params['custom_canvas_role']
-      labels.is_a?(String) ? labels.split(',') : []
-    end
-
-    def canvas_roles
-      self.class.find_roles_by_label(canvas_role_labels)
-    end
-
-    def launch_role_ids
-      panda_pal_session[:launch_role_ids] ||= canvas_roles.map(&:canvas_id)
-    end
-  end
-end

data/spec/dummy/log/development.log

@@ -1,56 +0,0 @@
-   (1.2ms)  DROP DATABASE IF EXISTS "panda_pal_development"
-   (0.2ms)  DROP DATABASE IF EXISTS "panda_pal_test"
-   (82.9ms)  CREATE TABLE "schema_migrations" ("version" character varying NOT NULL PRIMARY KEY)
-   (11.8ms)  CREATE TABLE "ar_internal_metadata" ("key" character varying NOT NULL PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
-   (0.3ms)  SELECT pg_try_advisory_lock(7878782013693407355);
-   (2.8ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-  ActiveRecord::InternalMetadata Load (2.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.2ms)  BEGIN
-  SQL (3.2ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "development"], ["created_at", "2020-04-30 16:44:35.134620"], ["updated_at", "2020-04-30 16:44:35.134620"]]
-   (0.6ms)  COMMIT
-   (0.3ms)  SELECT pg_advisory_unlock(7878782013693407355)
-   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-   (211.6ms)  DROP DATABASE IF EXISTS "panda_pal_development"
-   (247.6ms)  DROP DATABASE IF EXISTS "panda_pal_test"
-  SQL (0.4ms)  CREATE EXTENSION IF NOT EXISTS "plpgsql"
-   (8.5ms)  DROP TABLE IF EXISTS "panda_pal_organizations" CASCADE
-   (14.4ms)  CREATE TABLE "panda_pal_organizations" ("id" bigserial primary key, "name" character varying, "key" character varying, "secret" character varying, "canvas_account_id" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "salesforce_id" character varying, "encrypted_settings" text, "encrypted_settings_iv" character varying)
-   (2.5ms)  CREATE UNIQUE INDEX  "index_panda_pal_organizations_on_key" ON "panda_pal_organizations"  ("key")
-   (2.6ms)  CREATE UNIQUE INDEX  "index_panda_pal_organizations_on_name" ON "panda_pal_organizations"  ("name")
-   (0.2ms)  DROP TABLE IF EXISTS "panda_pal_sessions" CASCADE
-   (6.5ms)  CREATE TABLE "panda_pal_sessions" ("id" bigserial primary key, "session_key" character varying, "data" text, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "panda_pal_organization_id" integer)
-   (1.9ms)  CREATE  INDEX  "index_panda_pal_sessions_on_panda_pal_organization_id" ON "panda_pal_sessions"  ("panda_pal_organization_id")
-   (2.5ms)  CREATE UNIQUE INDEX  "index_panda_pal_sessions_on_session_key" ON "panda_pal_sessions"  ("session_key")
-   (3.5ms)  CREATE TABLE "schema_migrations" ("version" character varying NOT NULL PRIMARY KEY)
-   (1.4ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES (20171205194657)
-   (47.2ms)  CREATE TABLE "ar_internal_metadata" ("key" character varying NOT NULL PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
-  ActiveRecord::InternalMetadata Load (1.0ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.4ms)  BEGIN
-  SQL (0.4ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "development"], ["created_at", "2020-04-30 17:00:14.956327"], ["updated_at", "2020-04-30 17:00:14.956327"]]
-   (0.5ms)  COMMIT
-  ActiveRecord::InternalMetadata Load (0.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.1ms)  BEGIN
-   (0.2ms)  COMMIT
-  SQL (0.4ms)  CREATE EXTENSION IF NOT EXISTS "plpgsql"
-   (0.3ms)  DROP TABLE IF EXISTS "panda_pal_organizations" CASCADE
-   (52.5ms)  CREATE TABLE "panda_pal_organizations" ("id" bigserial primary key, "name" character varying, "key" character varying, "secret" character varying, "canvas_account_id" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "salesforce_id" character varying, "encrypted_settings" text, "encrypted_settings_iv" character varying)
-   (2.4ms)  CREATE UNIQUE INDEX  "index_panda_pal_organizations_on_key" ON "panda_pal_organizations"  ("key")
-   (1.9ms)  CREATE UNIQUE INDEX  "index_panda_pal_organizations_on_name" ON "panda_pal_organizations"  ("name")
-   (0.2ms)  DROP TABLE IF EXISTS "panda_pal_sessions" CASCADE
-   (6.0ms)  CREATE TABLE "panda_pal_sessions" ("id" bigserial primary key, "session_key" character varying, "data" text, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "panda_pal_organization_id" integer)
-   (1.8ms)  CREATE  INDEX  "index_panda_pal_sessions_on_panda_pal_organization_id" ON "panda_pal_sessions"  ("panda_pal_organization_id")
-   (1.8ms)  CREATE UNIQUE INDEX  "index_panda_pal_sessions_on_session_key" ON "panda_pal_sessions"  ("session_key")
-   (4.8ms)  CREATE TABLE "schema_migrations" ("version" character varying NOT NULL PRIMARY KEY)
-   (0.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-   (4.0ms)  INSERT INTO "schema_migrations" (version) VALUES (20171205194657)
-   (6.5ms)  CREATE TABLE "ar_internal_metadata" ("key" character varying NOT NULL PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
-  ActiveRecord::InternalMetadata Load (2.5ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.1ms)  BEGIN
-  SQL (5.0ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "development"], ["created_at", "2020-04-30 17:00:15.126316"], ["updated_at", "2020-04-30 17:00:15.126316"]]
-   (0.4ms)  COMMIT
-  ActiveRecord::InternalMetadata Load (0.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.2ms)  BEGIN
-   (0.1ms)  COMMIT