panda_pal 5.13.1 → 5.13.2.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1abce4e925e36c353a2985ec394d6cd3663a81023cecc9f40b7844cb6a6cfe58
-  data.tar.gz: 902fa5a2ad91c17df04f1c248a12d8db0bb32cab382b080ac6c1cce2071582e9
+  metadata.gz: d3353ec5d316b6281d3f36aae115be6b05b45e49b2ff5619e16bfdf81f68e2cd
+  data.tar.gz: 60f5538f2b3059154609a957f0da4d05155cb7661252c2fe22feabda54160a19
 SHA512:
-  metadata.gz: d0e4eeca5d559276222b43c3738af1be4c5c2516092eecaef8b2f389dfc0549671a2081d3e38596c8d2e31c12cc89aaa1af3bd2789ab7815a7aa95ac4e598e8a
-  data.tar.gz: c8dd6a0afa0655cd0568fe21f3d41329ea5071c3794968c0399a39067607d484636a5ed0f97c4650852862ec97549a64b3f10082406249b3f1928fc173f4601f
+  metadata.gz: b90632ccc8ddc83f8b151967306e6d079f71735c5838e3a0c74096fbecf9fff42a89aa0eb6dc6fd5ef7bac0297dbbe0c72b37caf29d021179c18c631571f6b11
+  data.tar.gz: 2325cc99407ad3ead97e00eeb6988c525176222efb4343388506ed1ace6dac1a49d2ddb219ac47946eefc5076b90609c6bdc5ad0d4f694e16ef4939cc112fc50

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

@@ -149,6 +149,14 @@ module PandaPal
             code << "\n"
           end
 
+          if PandaPal::Organization.column_names.include?("shard")
+            code << "# " if persisted?
+            cur_shard = self.shard || "default"
+            valid_shards = Apartment.shard_configurations.keys
+            code << "shard: \"#{self.shard}\", # #{valid_shards.join(" | ")}"
+            code << "\n"
+          end
+
           code << "settings: "
           code << PandaPal::Organization.generate_settings_ruby(value: settings)
           code << ",\n"

data/config/initializers/apartment.rb

@@ -14,12 +14,16 @@ module Apartment
     $shard_configurations ||= begin
       shard_to_env = {}
 
+      base_config = Apartment.connection_config
+
       ENV.keys.each do |k|
         m = /^(#{SHARD_PREFIXES.join("|")})_(\w+)_URL$/.match(k)
         next unless m
 
         url = ENV[k]
-        shard_to_env[m[2].downcase] = ActiveRecord::Base.configurations.resolve(url).configuration_hash
+        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?
@@ -220,6 +224,7 @@ Rails.application.config.middleware.use Apartment::Elevators::Generic, lambda {
     PandaPal::Organization.find_by(name: match[1]).try(:tenant_name)
   elsif request.path.start_with?('/rails/active_storage/blobs/')
     PandaPal::Organization.find_by(id: request.params['organization_id']).try(:tenant_name)
+    # TODO Always check params[organization_id]?
   end
 }
 

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.13.1"
+  VERSION = "5.13.2.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.13.1
+  version: 5.13.2.beta1
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails