panda_pal 5.4.3 → 5.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b038d3fd4f84638f9417835e011bebc4ea9840dbc5cde8ac3c24f1ad35481f93
-  data.tar.gz: 1afcd3f8d819b6bb3139e0ccd7659ed854e75b108f6f78e8c7ed2c3d9a6d22a2
+  metadata.gz: 47e93c2f05e4078784f066642ed837e56c60cab9d342a2b9cd0d5e72192a248c
+  data.tar.gz: 4bd5d5e668b0a6a4cd069234170d460bfc44bdd80bc2b0b872b1f00cdbe77339
 SHA512:
-  metadata.gz: ec23ec83ae5d5f58ed67836b1126ea4387cb2cf36da0b3f9f6d2efc7c331c7be2229e1573c17c2a6d78deea9b5ad42a4a610273b62d9ed4e27feb8f6b9881403
-  data.tar.gz: 90f8fbca45c8b5555a6506cc42f50bbc034caaa97554f84a0ecf06e4cf87b761b83476cfff51a80e90e6ecb33d06998275954edec50355a2db479854beca35e1
+  metadata.gz: 67905790789c0a503b453c09abd1255d7b4720a313cc60be816db7cf58806e878b52933eb749f346b78291780d17632bb6cabed66581426614a3e4b5f999b653
+  data.tar.gz: 913aa637b83f0de8d664dfbb811ce379a61c4fae6cc7c64c79eab9f95c167b0428fff77bb83bb3faed8880d129605f5026a085f1f62960b7755176c1df392972

data/app/controllers/panda_pal/application_controller.rb

@@ -1,4 +1,12 @@
 module PandaPal
   class ApplicationController < ActionController::Base
+    around_action :share_controller_on_thread
+
+    def share_controller_on_thread
+      Thread.current[:controller] = self
+      yield
+    ensure
+      Thread.current[:controller] = nil
+    end
   end
 end

data/app/lib/panda_pal/launch_url_helpers.rb

@@ -17,10 +17,24 @@ module PandaPal
       end
     end
 
+    def self.url_for(options)
+      request = Thread.current[:controller]&.request
+      host = "#{request.scheme}://#{request.host_with_port}"
+      if options.is_a?(Symbol)
+        Rails.application.routes.url_helpers.send(options, host: host)
+      else
+        options[:host] ||= host
+        Rails.application.routes.url_helpers.url_for(options)
+      end
+    end
+
     def self.normalize_lti_launch_desc(opts)
       opts = opts.dup
       opts.delete(:route_helper_key)
       opts.delete(:auto_launch)
+      opts.each do |k, v|
+        opts[k] = v.call if v.is_a?(Proc)
+      end
       opts
     end
 

data/app/models/panda_pal/organization.rb

@@ -49,6 +49,10 @@ module PandaPal
       end
     end
 
+    def self.current
+      find_by_name(Apartment::Tenant.current)
+    end
+
     PandaPal.resolved_extensions_for(self).each do |ext|
       include ext
     end

data/app/models/panda_pal/organization_concerns/task_scheduling.rb

@@ -99,6 +99,7 @@ module PandaPal
             'queue' => desc[:queue],
             'class' => ScheduledTaskExecutor.to_s,
             'args' => [name, desc[:key]],
+            'enabled' => !Rails.env.development?,
           }
         end
         schedule
@@ -198,13 +199,19 @@ module PandaPal
 
           Apartment::Tenant.switch(org.name) do
             if worker.is_a?(Proc)
-              org.instance_exec(&worker)
+              return org.instance_exec(&worker)
             elsif worker.is_a?(Symbol)
-              org.send(worker)
+              return org.send(worker)
             elsif worker.is_a?(String)
-              worker.constantize.perform_async
-            elsif worker.is_a?(Class)
-              worker.perform_async
+              worker = worker.constantize
+            end
+
+            if worker.is_a?(Class)
+              if worker.respond_to?(:perform_async)
+                worker.perform_async
+              else
+                worker.perform_later
+              end
             end
           end
         end

data/lib/panda_pal/helpers.rb

@@ -2,5 +2,4 @@ module PandaPal::Helpers
   require_relative 'helpers/controller_helper'
   require_relative 'helpers/route_helper'
   require_relative 'helpers/secure_headers'
-  require_relative 'helpers/ability_mixin'
 end

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.4.3"
+  VERSION = "5.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.4.3
+  version: 5.4.6
 platform: ruby
 authors:
 - Instructure ProServe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,7 +202,6 @@ files:
 - 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
@@ -227,7 +226,6 @@ files:
 - lib/panda_pal.rb
 - lib/panda_pal/engine.rb
 - lib/panda_pal/helpers.rb
-- lib/panda_pal/helpers/ability_mixin.rb
 - lib/panda_pal/helpers/controller_helper.rb
 - lib/panda_pal/helpers/route_helper.rb
 - lib/panda_pal/helpers/secure_headers.rb
@@ -266,8 +264,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,47 +300,45 @@ signing_key:
 specification_version: 4
 summary: LTI mountable engine
 test_files:
+- spec/rails_helper.rb
+- spec/models/panda_pal/organization_spec.rb
+- spec/models/panda_pal/session_spec.rb
+- spec/models/panda_pal/organization/settings_validation_spec.rb
+- spec/models/panda_pal/organization/task_scheduling_spec.rb
 - spec/spec_helper.rb
-- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/public/422.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/404.html
+- spec/dummy/public/500.html
+- spec/dummy/Rakefile
 - spec/dummy/app/views/layouts/application.html.erb
-- 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/bin/bundle
-- spec/dummy/bin/rails
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/javascripts/application.js
 - 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/config/application.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/filter_parameter_logging.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.ru
-- spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
-- 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/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/README.rdoc
-- 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/dummy/config.ru
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/bin/rails
 - spec/factories/panda_pal_organizations.rb
-- spec/rails_helper.rb
+- spec/factories/panda_pal_sessions.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/helpers/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