panda_pal 5.15.1.beta2 → 5.15.1.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bccb0af3b5fde8625ec6005b16d8264e1f21df5bb38a317c2a860c69d80a2288
-  data.tar.gz: 7118ce4073237a09f89f0e724e5dc10ef355e1e51abbcb5be86ce530016c1599
+  metadata.gz: cc92de1f76650accfff8d4ecc7de8ce545f3e544d145cee1b96625b10dfa7344
+  data.tar.gz: 8a981b6f9106d445cbb6c133a3aa992ab268c74eb63c1bedcecab7874c0ccfde
 SHA512:
-  metadata.gz: 056f0b2030a2464851ca8761537602bf1d132b68fed4f9d0ed047020052f4cb7a96e2ac07c6e07d605fa1bf903b75e8139eb9bcbbc807f71b8b9d92258ea4eff
-  data.tar.gz: '0515690ad2446026702ca536e98a745a1a450f498922613024aea7541c8f9b4658608b3d3086cc50b166cd04c92de1a37bad6153aee2abc8a1050aba301c8d87'
+  metadata.gz: 73669c16287ed12c5a371549bb093b3e9ad815dd25d646fb46770be776fd30ae956ba5205cbbc9f26dd7358d50595fa30ba6a078b601ceb4d535902f331c9360
+  data.tar.gz: 9715f5c8c0a7c3ca84e690a337aec8cb41961a32afb1f7caa749c2d67ed0822422d508ced453d7309efd12f3d0f6d10a39c7ffa187a75061fdb947bc35a08784

data/app/controllers/panda_pal/api_call_controller.rb

@@ -1,8 +1,7 @@
 require 'jwt'
-require_dependency "panda_pal/application_controller"
 
 module PandaPal
-  class ApiCallController < ApplicationController
+  class ApiCallController < PandaPalController
     rescue_from StandardError do |err|
       render json: { status: 'error' }, status: 500
     end

data/app/controllers/panda_pal/lti_controller.rb

@@ -1,6 +1,4 @@
-require_dependency "panda_pal/application_controller"
-
 module PandaPal
-  class LtiController < ApplicationController
+  class LtiController < PandaPalController
   end
 end

data/app/controllers/panda_pal/lti_v1_p0_controller.rb

@@ -1,7 +1,5 @@
-require_dependency "panda_pal/application_controller"
-
 module PandaPal
-  class LtiV1P0Controller < ApplicationController
+  class LtiV1P0Controller < PandaPalController
     if Rails.version < '5.0'
       skip_before_action :verify_authenticity_token
     else

data/app/controllers/panda_pal/lti_v1_p3_controller.rb

@@ -1,7 +1,5 @@
-require_dependency "panda_pal/application_controller"
-
 module PandaPal
-  class LtiV1P3Controller < ApplicationController
+  class LtiV1P3Controller < PandaPalController
     if Rails.version < '5.0'
       skip_before_action :verify_authenticity_token
     else

data/app/controllers/panda_pal/{application_controller.rb → panda_pal_controller.rb}

@@ -1,5 +1,5 @@
 module PandaPal
-  class ApplicationController < ActionController::Base
+  class PandaPalController < ActionController::Base
     around_action :share_controller_on_thread
 
     def share_controller_on_thread

data/config/initializers/apartment.rb

@@ -10,25 +10,29 @@ require "apartment/adapters/postgresql_adapter"
 module Apartment
   SHARD_PREFIXES = ["SHARD_DB", "HEROKU_POSTGRESQL"]
 
-  def self.shard_configurations
-    $shard_configurations ||= begin
-      shard_to_env = {}
+  class << self
+    def_delegators :connection_class, :connected?
 
-      base_config = ActiveRecord::Base.configurations.find_db_config(Rails.env).configuration_hash
+    def shard_configurations
+      $shard_configurations ||= begin
+        shard_to_env = {}
 
-      ENV.keys.each do |k|
-        m = /^(#{SHARD_PREFIXES.join("|")})_(\w+)_URL$/.match(k)
-        next unless m
+        base_config = ActiveRecord::Base.configurations.find_db_config(Rails.env).configuration_hash
 
-        url = ENV[k]
-        shardcfg = ActiveRecord::Base.configurations.resolve(url).configuration_hash
-        shardcfg = base_config.merge(shardcfg || {})
-        shard_to_env[m[2].downcase] = shardcfg
-      end
+        ENV.keys.each do |k|
+          m = /^(#{SHARD_PREFIXES.join("|")})_(\w+)_URL$/.match(k)
+          next unless m
+
+          url = ENV[k]
+          shardcfg = ActiveRecord::Base.configurations.resolve(url).configuration_hash
+          shardcfg = base_config.merge(shardcfg || {})
+          shard_to_env[m[2].downcase] = shardcfg
+        end
 
-      shard_to_env.freeze unless Rails.env.test?
+        shard_to_env.freeze unless Rails.env.test?
 
-      shard_to_env
+        shard_to_env
+      end
     end
   end
 
@@ -120,14 +124,12 @@ module Apartment
 
         raise ActiveRecord::StatementInvalid, "PandaPal/Apartment Mutli-DB support does not currently support DB roles" if ActiveRecord::Base.current_role != ActiveRecord::Base.default_role
 
-        unless ActiveRecord::Base.connected?
-          Apartment.establish_connection multi_tenantify(tenant, false)
-          Apartment.connection.verify!
-        end
-
+        shard, schema = Apartment::Tenant.split_tenant(@current)
+        Apartment.establish_connection(multi_tenantify(tenant, false)) unless shard == "default" || Apartment.connected?
+        Apartment.connection.verify!
         Apartment.connection.enable_query_cache! if query_cache_enabled
 
-        raise ActiveRecord::StatementInvalid, "Could not find schema for tenant #{tenant} (#{tenant_schemas.inspect})" unless schema_exists?(tenant_schemas)
+        raise ActiveRecord::StatementInvalid, "Could not find schema for tenant \"#{tenant}\": (#{tenant_schemas.inspect})" unless schema_exists?(tenant_schemas)
 
         Apartment.connection.schema_search_path = full_search_path
       rescue *rescuable_exceptions => e
@@ -150,6 +152,14 @@ module Apartment
           schema
         end
       end
+
+      def raise_schema_connect_to_new(tenant, exception)
+        shard, schema = Tenant.split_tenant(tenant)
+        raise TenantNotFound, <<~EXCEPTION_MESSAGE
+          Could not set search path to schemas, they may be invalid: "#{schema}" #{full_search_path}.
+          Original error: #{exception.class}: #{exception}
+        EXCEPTION_MESSAGE
+      end
     end
   end
 
@@ -181,7 +191,7 @@ module Apartment
             #   to effectively disable this patch for that model.
             if (adapter = Thread.current[:apartment_adapter]) && adapter.is_a?(Apartment::Adapters::PostgresMultiDBSchemaAdapter) && !adapter.is_excluded_model?(self)
               shard, schema = Apartment::Tenant.split_tenant(adapter.current)
-              return "#{shard}" unless shard == "default"
+              return "apt:#{shard}" unless shard == "default"
             end
 
             pre_apartment_current_shard
@@ -210,7 +220,7 @@ Apartment.configure do |config|
       shard_configurations = Apartment.shard_configurations
 
       PandaPal::Organization.all.to_a.each_with_object({}) do |org, hash|
-        shard = org.shard || "default"
+        shard = org.shard.to_s || "default"
         hash[org.tenant_name] = shard == "default" ? base_config : shard_configurations[shard.downcase]
       end
     else

data/lib/panda_pal/engine.rb

@@ -1,3 +1,4 @@
+require 'rails'
 require 'apartment'
 require 'ims/lti'
 require 'attr_encrypted'

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.15.1.beta2"
+  VERSION = "5.15.1.beta4"
 end

data/panda_pal.gemspec

@@ -29,18 +29,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'json-jwt'
   s.add_dependency 'jwt'
   s.add_dependency 'httparty'
-
-  s.add_development_dependency "rails", "~> 7.0"
-  s.add_development_dependency 'pg'
-  s.add_development_dependency 'sidekiq', "< 7.0"
-  s.add_development_dependency 'sidekiq-scheduler'
-  s.add_development_dependency 'ros-apartment', '~> 3.0'
-  s.add_development_dependency 'ros-apartment-sidekiq', '~> 1.2'
-  s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'factory_girl_rails'
-
-  s.add_development_dependency "redis", ">=4.2", "< 5.0"
-
-  # TODO See https://github.com/mikel/mail/issues/1489
-  s.add_development_dependency "mail", "2.7.1"
 end

data/spec/controllers/panda_pal/api_call_controller_spec.rb

@@ -1,27 +1,25 @@
-require 'rails_helper'
+require 'spec_helper'
 
-module PandaPal
-  RSpec.describe ApiCallController, type: :controller do
-    let!(:api_call) { ApiCall.create!(logic: '"#{p[:foo]}_bar"') }
+RSpec.describe PandaPal::ApiCallController, type: :controller do
+  let!(:api_call) { PandaPal::ApiCall.create!(logic: '"#{p[:foo]}_bar"') }
 
-    def json_body
-      JSON.parse(response.body)
-    end
+  def json_body
+    JSON.parse(response.body)
+  end
 
-    describe "#call" do
-      it "calls the function with parameters" do
-        get :call, params: { token: api_call.jwt_token, foo: 'bar', use_route: 'panda_pal' }
-        expect(response).to be_successful
-        expect(json_body["status"]).to eq 'ok'
-        expect(json_body["result"]).to eq 'bar_bar'
-      end
+  describe "#call" do
+    it "calls the function with parameters" do
+      get :call, params: { token: api_call.jwt_token, foo: 'bar', use_route: 'panda_pal' }
+      expect(response).to be_successful
+      expect(json_body["status"]).to eq 'ok'
+      expect(json_body["result"]).to eq 'bar_bar'
+    end
 
-      it "fails given a bad JWT" do
-        get :call, params: { token: "bad.jwt.token", foo: 'bar', use_route: 'panda_pal' }
-        expect(response).not_to be_successful
-        expect(json_body["status"]).to eq 'error'
-        expect(json_body["error"]).to eq 'Invalid JWT'
-      end
+    it "fails given a bad JWT" do
+      get :call, params: { token: "bad.jwt.token", foo: 'bar', use_route: 'panda_pal' }
+      expect(response).not_to be_successful
+      expect(json_body["status"]).to eq 'error'
+      expect(json_body["error"]).to eq 'Invalid JWT'
     end
   end
 end

data/spec/core/apartment_multidb_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe PandaPal::Organization, type: :model do
   context "across multiple DBs" do

data/spec/factories/panda_pal_organizations.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :panda_pal_organization, class: 'PandaPal::Organization' do
     name { SecureRandom.hex }
     key { SecureRandom.hex }

data/spec/factories/panda_pal_sessions.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :panda_pal_session, class: 'PandaPal::Session' do
-    session_secret "MyString"
-    organization nil
-    data "MyText"
+    session_secret { "MyString" }
+    organization { nil }
+    data { "MyText" }
   end
 end

data/spec/{dummy → internal}/config/database.yml

@@ -1,5 +1,5 @@
-
 default: &default
+  database: panda-pal-test
   adapter: postgresql
   encoding: unicode
   # For details on connection pooling, see Rails configuration guide
@@ -9,10 +9,6 @@ default: &default
   password: <%= ENV.fetch("DB_PASSWORD", "") %>
   host: <%= ENV.fetch("DB_ADDRESS", "localhost") %>
 
-development:
-  <<: *default
-  database: panda_pal_development
-
 test:
   test1:
     <<: *default
@@ -20,10 +16,3 @@ test:
   test2:
     <<: *default
     database: panda_pal_test2
-
-production:
-  <<: *default
-  host: <%= ENV.fetch('DB_ADDRESS', 'localhost') %>
-  database: panda_pal_production
-  username: <%= ENV.fetch("DB_USERNAME", "panda_pal_specs_postgres_user") %>
-  password: <%= ENV.fetch("DB_PASSWORD", 'panda_pal_specs_postgres_password') %>

data/spec/{dummy → internal}/config/routes.rb

@@ -1,4 +1,5 @@
-Rails.application.routes.draw do
+# frozen_string_literal: true
 
+Rails.application.routes.draw do
   mount PandaPal::Engine => "/panda_pal"
 end

data/spec/internal/config/storage.yml

@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: /Users/eknapp/code/panda_pal/tmp/storage

data/spec/internal/db/schema.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+ActiveRecord::Schema.define do
+  # Set up any tables you need to exist for your test suite that don't belong
+  # in migrations.
+end

data/spec/models/panda_pal/api_call_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 module PandaPal
   RSpec.describe ApiCall, type: :model do

data/spec/models/panda_pal/organization/settings_validation_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 module PandaPal
   PandaPal::Organization

data/spec/models/panda_pal/organization/task_scheduling_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 module PandaPal
   PandaPal::Organization

data/spec/models/panda_pal/organization_spec.rb

@@ -1,15 +1,15 @@
-require 'rails_helper'
+require 'spec_helper'
 
 module PandaPal
   RSpec.describe Organization, type: :model do
     it 'creates a schema upon creation' do
-      expect(Apartment::Tenant).to receive(:create)
+      expect(Apartment::Tenant).to receive(:create).and_call_original
       create :panda_pal_organization
     end
 
     it 'deletes a schema upon deletion' do
-      expect(Apartment::Tenant).to receive(:create)
-      expect(Apartment::Tenant).to receive(:drop)
+      expect(Apartment::Tenant).to receive(:create).and_call_original
+      expect(Apartment::Tenant).to receive(:drop).and_call_original
       org = create :panda_pal_organization
       org.destroy
     end

data/spec/models/panda_pal/session_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 module PandaPal
   RSpec.describe Session, type: :model do

data/spec/spec_helper.rb

@@ -1,19 +1,40 @@
-ENV["RAILS_ENV"] ||= 'test'
+# ENV["RAILS_ENV"] ||= 'test'
 
+require 'bundler'
+Bundler.require :default, :development
+
+Combustion.initialize! :active_record, :active_job, :action_controller
+
+require 'sidekiq'
+require 'sidekiq/rails'
 require 'sidekiq/testing'
 require 'sidekiq-scheduler'
 
-require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'nokogiri'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
+
+require "panda_pal/spec_helper"
 
-ActiveRecord::Migration.maintain_test_schema!
 ActiveRecord::Schema.verbose = false
 
+Dir[File.dirname(__FILE__) + "/factories/**/*.rb"].each {|f| require f }
+
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include PandaPal::SpecHelper
+  config.include FactoryBot::Syntax::Methods
+
+  config.before(:each) do
+    allow_any_instance_of(PandaPal::Organization).to receive(:create_schema).and_wrap_original do |m, *args|
+      org = m.receiver
+      m.call(*args)
+      org.switch_tenant do
+        Combustion::Database::LoadSchema.call
+        Combustion::Database::Migrate.call
+      end
+    end
+  end
 
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
@@ -45,6 +66,34 @@ RSpec.configure do |config|
     }
   end
 
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_paths |= [
+    "#{::Rails.root}/spec/fixtures"
+  ]
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin