Merge pull request #67 from epimorphics/spike/puma-stats-partial

Task: Release v.1.9.9
epimorphics · Sep 17, 2024 · 0e29305 · 0e29305
2 parents 7888e3a + bd11924
commit 0e29305
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ applications.
 
 ## Changes
 
+## 1.9.9 - 2024-09
+
+- (Jon) Moved the `puma stats` haml to it's own partial as well as added the
+  `puma stats` partial to the footer of the application template. This will
+  allow the `puma stats` output to be displayed on the HMLR apps that use this
+  gem. The `puma stats` output will only be displayed in development mode.
+
 ## 1.9.8 - 2024-09
 
 - (Jon) Implemented the dependabot PR #55 to update jquery-rails requirement

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -49,3 +49,4 @@
           = render partial: "shared/feedback"
 
     = render partial: "shared/footer"
+    = render partial: "shared/puma_stats" if Rails.env.development?
diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml
@@ -30,8 +30,3 @@
       = succeed(':') do
         = I18n.t('common.footer.application_release')
       = Version::VERSION
-    - if Rails.env.development?
-      %pre
-        [puma stats:
-        = JSON.pretty_generate(JSON.parse(Puma.stats, symbolize_names: true))
-        , time: #{Time.now}]
diff --git a/app/views/shared/_puma_stats.html.haml b/app/views/shared/_puma_stats.html.haml
@@ -0,0 +1,5 @@
+
+%div
+  %pre
+    %code
+      = "[#{JSON.pretty_generate(puma_stats: JSON.parse(Puma.stats), time: Time.now)}]"
diff --git a/lib/lr_common_styles/version.rb b/lib/lr_common_styles/version.rb
@@ -3,7 +3,7 @@
 module LrCommonStyles
   MAJOR = 1
   MINOR = 9
-  PATCH = 8
+  PATCH = 9
   SUFFIX = nil # nil or 'rc' or 'beta' or 'alpha' for pre-release versions
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && "-#{SUFFIX}"}"
 end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,3 +49,4 @@
		= render partial: "shared/feedback"

		= render partial: "shared/footer"
		= render partial: "shared/puma_stats" if Rails.env.development?