panda_pal 5.4.0 → 5.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f9acd1140343a82865441f59754c28df08780876b234cad3f7cbfdaa8a1261
-  data.tar.gz: 33c8718d1171d76b38ba8e77793de352bacc03f1f7c6fa2da31e2f69b412e609
+  metadata.gz: 3ec5567515a06e761a0cb06597380d4a10a9454f58f903466f5871757323dc7c
+  data.tar.gz: 418a9fe6dc99d53b6775b65c425db8c8c02aadf0adb2d92673934094bc26f3d7
 SHA512:
-  metadata.gz: c68e57f0abcd6e2f46a22f15757294c0b9002039a61e7e66cda233edcf2cf0a26eda9247520f163b37ce3b9c56f1be2b09705fe59fa031c2be70d0065db60e49
-  data.tar.gz: 87c0bb93619507cd6e90c7b3dd1726a5522e6ceb0eaa7ee898c836953080c7ec941e7ddda489e6482d55388c582a61915018730dba7c4f845bf73b2a572c135d
+  metadata.gz: 067dbe50e329437ada560115134fe992b3522e4bf971e73c9a22a375dd3803e5aa4897b1cf4af66fc1e31d8f905233d601a910cadaca740cd0a21a8c5d495831
+  data.tar.gz: 1d5ffae5cd2f7a884799a23ae73e5d3935d2f64ff1397dc506a364c34de916e317f1098de64549f5e1c15fd033090a31646f171e3b779dcb45006a7251741460

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

@@ -160,7 +160,7 @@ module PandaPal
       private
 
       def unschedule_tasks(new_task_keys = nil)
-        current_schedules = Sidekiq.get_schedule.select { |k,v| k.starts_with?("org:#{name}-") }
+        current_schedules = Sidekiq.get_schedule.select { |k,v| k.start_with?("org:#{name}-") }
         del_tasks = current_schedules.keys
         del_tasks -= new_task_keys if new_task_keys
         del_tasks.each do |k|
@@ -198,13 +198,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/config/initializers/apartment.rb

@@ -12,7 +12,7 @@ end
 Rails.application.config.middleware.use Apartment::Elevators::Generic, lambda { |request|
   if match = request.path.match(/\/(?:orgs?|organizations?)\/(\d+)/)
     PandaPal::Organization.find_by(id: match[1]).try(:name)
-  elsif request.path.starts_with?('/rails/active_storage/blobs/')
+  elsif request.path.start_with?('/rails/active_storage/blobs/')
     PandaPal::Organization.find_by(id: request.params['organization_id']).try(:name)
   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"
+  VERSION = "5.4.4"
 end

data/lib/panda_pal.rb

@@ -91,7 +91,7 @@ module PandaPal
 
   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 = "#{self.to_s}::#{type}" unless type.start_with?('::') || type.start_with?(self.to_s)
     type
   end
 

data/panda_pal.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">= 4.2"
   s.add_dependency 'ros-apartment', '~> 2.2'
-  s.add_dependency 'pg', '>= 0.20', '< 1.0.0'
   s.add_dependency 'ims-lti', '~> 1.2.4'
   s.add_dependency 'browser', '2.5.0'
   s.add_dependency 'attr_encrypted', '~> 3.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.4
 platform: ruby
 authors:
 - Instructure ProServe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,26 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.20'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.20'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: ims-lti
   requirement: !ruby/object:Gem::Requirement
@@ -222,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
@@ -286,8 +265,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
@@ -324,47 +301,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/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