heroku_error_pages 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcbc58c8c09a48ecfc080524888410620dd4c0e56e35cb37efb29398e814d7d4
-  data.tar.gz: dc633286704481c7a6c1b111f0c2b0231c6528b35ed2f32574ecedb6fdc096a1
+  metadata.gz: 8d0d64ddb46d74b54d79d049e8f2dd750716764bac20ccae63f2f862cff2bca3
+  data.tar.gz: 8e38951b360be3e1410c18510688b94e68d621d6b3271b2feb868ffa5acdbc23
 SHA512:
-  metadata.gz: e718a4161a2ebc3d01596981fe636abc1fa7d1a49124593fac8a1d3fe1460eb70fde2a764e4f5c5a6dcfca2d754fa80b2609c558fbc1fea3fe72809619afa4ea
-  data.tar.gz: bd8a9ac179af8087514b18fee7fced133a79c4eed86afbfcb16669cce4b6c53266452f15b42bcf7f9ba30e37c78adda387bb313cf0861be78bb4dc7b26387574
+  metadata.gz: a2acff799e9ee551dabe2eebca7487525e93536529ca800c135c4b3e228a366db0f07cb7567f29f7e72b86fd77e193374edef8db5529c5d669b718be2fbd730a
+  data.tar.gz: a687320e52b1f8fed12b233f16afbfefbfdd1365e0d7bba79d59441ca538ec91057da45e39b54de8626e1cc7c79e4f43d67db777028a9c418aba852e375a9dd1

data/README.md

@@ -32,12 +32,11 @@ HerokuErrorPages.configure do |config|
 
   # at least one page must be configured
   config.configure_error_page(
-    s3_path: 'application_error.html', # where the html will be stored in your S3 bucket
     template: 'errors/show', # the Rails template to render
     assigns: { # optional, any variables to assign to the template
       status: :internal_server_error
     },
-    controller: ErrorsController # optional, defaults to ActionController::Base
+    layout: 'public' # optional, defaults to 'application'
   )
 
   config.configure_maintenance_page(

data/lib/heroku_error_pages/config.rb

@@ -11,21 +11,19 @@ module HerokuErrorPages
       @aws_region = "us-east-1"
     end
 
-    def configure_error_page(s3_path:, template:, assigns: nil, controller: nil)
+    def configure_error_page(template:, assigns: nil, layout: nil)
       @error_page = PageConfig.new(
-        s3_path: s3_path,
         template: template,
         assigns: assigns,
-        controller: controller
+        layout: layout
       )
     end
 
-    def config_maintenance_page(s3_path:, template:, assigns: nil, controller: nil)
+    def configure_maintenance_page(template:, assigns: nil, layout: nil)
       @maintenance_page = PageConfig.new(
-        s3_path: s3_path,
         template: template,
         assigns: assigns,
-        controller: controller
+        layout: layout
       )
     end
   end

data/lib/heroku_error_pages/page_config.rb

@@ -2,13 +2,12 @@
 
 module HerokuErrorPages
   class PageConfig
-    attr_accessor :s3_path, :template, :assigns, :controller
+    attr_accessor :template, :assigns, :layout
 
-    def initialize(s3_path:, template:, assigns:, controller:)
-      @s3_path = s3_path
+    def initialize(template:, assigns:, layout:)
       @template = template
       @assigns = assigns || {}
-      @controller = controller || ActionController::Base
+      @layout = layout || "application"
     end
   end
 end

data/lib/heroku_error_pages/renderer.rb

@@ -4,14 +4,14 @@ module HerokuErrorPages
   class Renderer
     class << self
       def render_html(page_config)
-        new(page_config.template, page_config.assigns, page_config.controller).html
+        new(page_config.template, page_config.assigns, page_config.layout).html
       end
     end
 
-    def initialize(template, assigns, controller)
+    def initialize(template, assigns, layout)
       @template = template
       @assigns = assigns
-      @controller = controller
+      @layout = layout
     end
 
     def html
@@ -20,14 +20,15 @@ module HerokuErrorPages
 
     private
 
-    attr_reader :template, :assigns, :controller
+    attr_reader :template, :assigns, :layout
 
     def generate_html
-      controller = Class.new(controller) do
+      controller = Class.new(ActionController::Base) do
         self.asset_host = nil
+        self.relative_url_root = "/#{HerokuErrorPages::S3_PREFIX}"
       end
 
-      controller.render(template: template, assigns: assigns)
+      controller.render(template: template, assigns: assigns, layout: layout)
     end
   end
 end

data/lib/heroku_error_pages/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HerokuErrorPages
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/heroku_error_pages.rb

@@ -6,8 +6,13 @@ require_relative "heroku_error_pages/page_config"
 require_relative "heroku_error_pages/railtie"
 require_relative "heroku_error_pages/renderer"
 require_relative "heroku_error_pages/public_asset"
+require "aws-sdk-s3"
 
 module HerokuErrorPages
+  S3_PREFIX = "heroku_error_pages"
+  ERROR_PAGE = "error_page.html"
+  MAINTENANCE_PAGE = "maintenance_page.html"
+
   class << self
     def config
       @config ||= Config.new
@@ -28,19 +33,22 @@ module HerokuErrorPages
         region: config.aws_region
       )
 
-      deploy_page(config.error_page, s3_client)
-      deploy_page(config.maintenance_page, s3_client)
+      deploy_page(config.error_page, s3_client, "error_page.html")
+      deploy_page(config.maintenance_page, s3_client, "maintenance_page.html")
       deploy_public_assets(s3_client)
     end
 
     private
 
-    def deploy_page(page_config, s3_client)
+    def deploy_page(page_config, s3_client, page_name)
       return if page_config.nil?
 
-      s3_object = Aws::S3::Object.new(config.s3_bucket_name, page_config.s3_path, client: s3_client)
+      s3_object = Aws::S3::Object.new(
+        config.s3_bucket_name,
+        "#{S3_PREFIX}/#{page_name}",
+        client: s3_client
+      )
       s3_object.put(
-        acl: "public-read",
         body: Renderer.render_html(page_config),
         content_type: "text/html"
       )
@@ -48,13 +56,16 @@ module HerokuErrorPages
 
     def deploy_public_assets(s3_client)
       PublicAsset.all.each do |public_asset|
-        s3_absolute_path = "#{config.s3_bucket_name}/#{public_asset.relative_path}"
+        s3_absolute_path = "#{config.s3_bucket_name}/#{S3_PREFIX}/#{public_asset.relative_path}"
         Rails.logger.info "Uploading #{public_asset.absolute_path} to #{s3_absolute_path}"
 
-        s3_object = Aws::S3::Object.new(config.s3_bucket_name, public_asset.relative_path, client: s3_client)
+        s3_object = Aws::S3::Object.new(
+          config.s3_bucket_name,
+          "#{S3_PREFIX}/#{public_asset.relative_path}",
+          client: s3_client
+        )
         s3_object.upload_file(
           public_asset.absolute_path,
-          acl: "public-read",
           content_type: public_asset.mime_type
         )
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: heroku_error_pages
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jaco Pretorius
 bindir: exe
 cert_chain: []
-date: 2025-04-18 00:00:00.000000000 Z
+date: 2025-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3