rails-pg-extras 5.4.3 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2613f00de9126d3f00845b6c2c7281081171c802b6d9d4617905d4628a8073f
-  data.tar.gz: f291d8ec0126a57439f1fbcce1c3d7bfff0b3f18c24fd4586ffdba1e83141b1b
+  metadata.gz: 7a02d3f90a286c80e215584b471293e8f2aaaaf33a56c56ca42e938d763b08dd
+  data.tar.gz: 6326377418830e39a9105347a61e65837e64c1c80e390faa661a98468d6ad565
 SHA512:
-  metadata.gz: 338538334bba07ef85d48d9bd0520c62297841c8ff344a17ec2cd9c04b6262c7365280322f3815a31a2acd5eaa4aba9d69693f676c11ab93e4d7bf2c5a1a1b04
-  data.tar.gz: 01cd4471d8870a830b8bcd424fead5ab0d33019f69f3fa3d3ad4ed716d4e232deeecf11a1d35a10bb529edb707c30bd6dba0c22563abdaa2dd0f5877f0921d64
+  metadata.gz: 4f89bd2d2b48f6cc82d9b0663e8d8a02f317d6aa4cc1052f0b123a126abf4bb5286068f1844b82a78c49b5b3fc835331fe16c7488ebc7ecd3b00bbdfeefcfe62
+  data.tar.gz: 33fdf43584ee3b879c2497ff28fe90f6494bbdadb77732692805cd99c25ec569d8ce94ff0839a4a255d92c36a5015df2b2f623cc04a8bd1d86dacd4306a45a09

data/.gitattributes

@@ -0,0 +1,2 @@
+assets/* linguist-vendored
+

data/README.md

@@ -135,7 +135,7 @@ You can enable UI using a Rails engine by adding the following code in `config/r
   mount RailsPgExtras::Web::Engine, at: 'pg_extras'
 ```
 
-You can enable HTTP basic auth by specifying `RAILS_PG_EXTRAS_USER` and `RAILS_PG_EXTRAS_PASSWORD` variables. Authentication is mandatory unless you specify `RAILS_PG_EXTRAS_PUBLIC_DASHBOARD=true` or setting `RailsPgExtras.configuration.public_dashboard` to `true`.
+You can enable HTTP basic auth by specifying `Rails.application.credentials.pg_extras.user` (or `RAILS_PG_EXTRAS_USER`) and `Rails.application.credentials.pg_extras.user` (or `RAILS_PG_EXTRAS_PASSWORD`) values. Authentication is mandatory unless you specify `RAILS_PG_EXTRAS_PUBLIC_DASHBOARD=true` or set `RailsPgExtras.configuration.public_dashboard = true`.
 
 You can configure available web actions in `config/initializers/rails_pg_extras.rb`:
 

data/app/controllers/rails_pg_extras/web/application_controller.rb

@@ -14,14 +14,27 @@ module RailsPgExtras::Web
 
     ACTIONS = %i[kill_all pg_stat_statements_reset add_extensions]
 
-    if ENV["RAILS_PG_EXTRAS_USER"].present? && ENV["RAILS_PG_EXTRAS_PASSWORD"].present?
-      http_basic_authenticate_with name: ENV.fetch("RAILS_PG_EXTRAS_USER"), password: ENV.fetch("RAILS_PG_EXTRAS_PASSWORD")
+    user = get_user
+    password = get_password
+
+    if user.present? && password.present?
+      http_basic_authenticate_with name: user, password: password
     end
 
     def validate_credentials!
-      if (ENV["RAILS_PG_EXTRAS_USER"].blank? || ENV["RAILS_PG_EXTRAS_PASSWORD"].blank?) && !RailsPgExtras.configuration.public_dashboard
+      if (get_user.blank? || get_password.blank?) && RailsPgExtras.configuration.public_dashboard != true
         raise "Missing credentials for rails-pg-extras dashboard! If you want to enable public dashboard please set RAILS_PG_EXTRAS_PUBLIC_DASHBOARD=true"
       end
     end
+
+    private
+
+    def get_user
+      Rails.application.try(:credentials).try(:pg_extras).try(:user) || ENV["RAILS_PG_EXTRAS_USER"]
+    end
+
+    def get_password
+      Rails.application.try(:credentials).try(:pg_extras).try(:password) || ENV["RAILS_PG_EXTRAS_PASSWORD"]
+    end
   end
 end

data/lib/rails-pg-extras.rb

@@ -152,7 +152,15 @@ module RailsPgExtras
 
   def self.connection
     if (db_url = ENV["RAILS_PG_EXTRAS_DATABASE_URL"])
-      ActiveRecord::Base.establish_connection(db_url).connection
+      connector = ActiveRecord::Base.establish_connection(db_url)
+
+      if connector.respond_to?(:connection)
+        connector.connection
+      elsif connector.respond_to?(:lease_connection)
+        connector.lease_connection
+      else
+        raise "Unsupported connector: #{connector.class}"
+      end
     else
       ActiveRecord::Base.connection
     end

data/lib/rails_pg_extras/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsPgExtras
-  VERSION = "5.4.3"
+  VERSION = "5.5.0"
 end

data/lib/rails_pg_extras/web/engine.rb

@@ -5,7 +5,7 @@ module RailsPgExtras::Web
     isolate_namespace RailsPgExtras::Web
     config.middleware.use ActionDispatch::Flash
     initializer "static assets" do |app|
-      app.middleware.insert_before(::ActionDispatch::Static, ::ActionDispatch::Static, "#{RailsPgExtras::Web::Engine.root}/assets")
+      app.middleware.insert_before(0, ::ActionDispatch::Static, "#{RailsPgExtras::Web::Engine.root}/assets")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-pg-extras
 version: !ruby/object:Gem::Version
-  version: 5.4.3
+  version: 5.5.0
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-pg-extras
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: 5.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: 5.5.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - Gemfile
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Rails PostgreSQL performance database insights