sitepress-server 3.1.4 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18596923541141f76f1965a039fce7305b4fa4d2c5c9e5f2bb8e0df04c4da594
-  data.tar.gz: 34fb27d144cfe4f257f5eaa679de2ad201c53b3c83c8ff81427dea12636473f1
+  metadata.gz: 8bbd5935814e243c594d88c8fc30c4af990d113b5cde6295f0266b0991db8145
+  data.tar.gz: 9c48864666c0a6472e7c4ea53ed0174ada5680961e60035d94443bda1e7591dc
 SHA512:
-  metadata.gz: 381c176c181e94085dd4d14fdab1df991807cde702bad301c5db53064018adfc15ca529085782388947c45e44def35c2b952ea5735885394db2aed47c3d24024
-  data.tar.gz: e341b6aac2c6be8b3a8743e2a54f491f822ac03bfe50dec37092bace6c41e64236a66410ee73dcf2346c6296dfd506a580546681f8621dd8bc28082d03fae207
+  metadata.gz: 2676271389e1fc4b98477702794405bedf90b97a82f9c00e9691b818a64b6f0d698c406a9512559c969c1f7500b7091fda5a0da435f3428297bc277ff1cf6545
+  data.tar.gz: 95ffecabbb21ef937e2f2efadc0a12e319985233e99e6087bdca6d365cf73d06832025afc4fa5e484834c18754b242959a00c4325f1e2294fff83eaf501b9a8a

data/rails/app/controllers/site_controller.rb

@@ -6,7 +6,8 @@ class SiteController < ApplicationController
   # This `rescue_from` order is important; it must come before the
   # `include Sitepress::SitePages` statement; otherwise exceptions
   # won't be properly handled.
-  rescue_from Exception, with: :sitepress_error
+  rescue_from Exception, with: :standard_error
+  rescue_from ActionView::Template::Error, with: :action_view_template_error
   rescue_from Sitepress::ResourceNotFoundError, with: :page_not_found
 
   layout :site_layout
@@ -16,12 +17,20 @@ class SiteController < ApplicationController
     DEFAULT_SITE_LAYOUT if template_exists? DEFAULT_SITE_LAYOUT
   end
 
-  def sitepress_error(exception)
+  def standard_error(exception)
+    render_exception(template: "standard_error", exception: exception)
+  end
+
+  def action_view_template_error(exception)
+    render_exception(template: "action_template_error", exception: exception)
+  end
+
+  def render_exception(template:, exception:)
     raise exception unless has_error_reporting_enabled?
 
     @title = "Error in resource #{current_page.asset.path}".html_safe
     @exception = exception
-    render "error", layout: "sitepress", status: :internal_server_error
+    render template, layout: "sitepress", status: :internal_server_error
   end
 
   def page_not_found(exception)

data/rails/app/views/site/standard_error.html.erb

@@ -0,0 +1,29 @@
+<h2><%= @exception.class %>: <%= @exception.message %> in <%= current_page.asset.path %></h2>
+<h3>Source</h3>
+
+<code>
+  <pre><%= current_page.asset.path %></pre>
+</code>
+
+<h3>Backtrace</h3>
+<code>
+  <pre><%= @exception.backtrace.join("\n") %></pre>
+</code>
+
+<h3>Resources</h3>
+<table>
+  <thead>
+    <th>Request path</th>
+    <th>Asset path</th>
+    <th>Media type</th>
+  </thead>
+  <tbody>
+    <% site.resources.each do |resource| %>
+      <tr>
+        <td><%= link_to resource.request_path, resource.request_path %></td>
+        <td><%= resource.asset.path %></td>
+        <td><%= resource.asset.mime_type %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-server
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.2.1
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.1
 description:
 email:
 - bradgessler@gmail.com
@@ -53,8 +53,9 @@ files:
 - rails/app/controllers/site_controller.rb
 - rails/app/helpers/application_helper.rb
 - rails/app/views/layouts/sitepress.html.erb
-- rails/app/views/site/error.html.erb
+- rails/app/views/site/action_template_error.html.erb
 - rails/app/views/site/not_found.html.erb
+- rails/app/views/site/standard_error.html.erb
 - rails/public/_sitepress/images/logo.svg
 - rails/public/_sitepress/stylesheets/site.css
 - sitepress-server.gemspec
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Sitepress rack app for stand-alone of embedded usage.