sitepress-server 2.0.0.beta10 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 745fe817bb47d178b9346c2448c1ac9444e1372a53e1d13d7309b1d3d7023d47
-  data.tar.gz: 2d5e03cb231faf1c40b7dc47e5de3a56cd04e6ab35155233d9ef37b8c6162f4d
+  metadata.gz: f3fa4d51dbfb27ea33c3c0dcff41cc7b53cb3b5bfcbee4b51648bfa9b1ce2241
+  data.tar.gz: 52a6aa42781d8d1870501157e882a5b42e5c4aaba573afaed53d1ed8e32fa9ca
 SHA512:
-  metadata.gz: 97ffaba70f6e897bbcf0946255ee240cd952f3b55223164cd445f850d82791b53e6fd72f306d37aaee3c10055e5bdcd956ba89c5ee6102e820aa335b985ba71c
-  data.tar.gz: 2a84e307d94d257d7a2d95a0a9ccacae23854e08d1772c499ab9d06db325b545cc6408a906d7a6fec2c3631b1c66810584a94b36da78661662c6180340dd148a
+  metadata.gz: 24e340fc32128491b9e9384476c377dd488bcf5f825f66af32b21c9b0f6c007113513e987094530cedae94cbb27466cbf88a2781f8c1c36b29fd97722fe7fada
+  data.tar.gz: 3890401d7d843ebd7128297680801383035452522c6142a510207d3b7e006015a67c3c68bbb506fc81c9f7cce391d4e9d6373a942328b9ee775dbcea5ca20cb4

data/lib/sitepress/server.rb

@@ -9,6 +9,16 @@ Bundler.require(*Rails.groups)
 # Configure the rails application.
 module Sitepress
   class Server < Rails::Application
+    # Control whether or not to display friendly error reporting messages
+    # in Sitepress. The development server turns this on an handles exception,
+    # while the compile and other environments would likely have this disabled.
+    config.enable_sitepress_error_reporting = false
+
+    # When in a development environment, we'll want to reload the site between
+    # requests so we can see the latest changes; otherwise, load the site once
+    # and we're done.
+    config.enable_site_reloading = false
+
     # Paths unique to Sitepress
     config.root = File.join(File.dirname(__FILE__), "../../rails")
 
@@ -18,9 +28,11 @@ module Sitepress
 
     config.secret_key_base = SecureRandom.uuid    # Rails won't start without this
 
-    # Setup routes
-    routes.append { root to: "site#show" }
-    routes.append { get "*resource_path", controller: "site", action: "show", as: :page, format: false }
+    # Setup routes. The `constraints` key is set to `nil` so the `SiteController` can
+    # treat a page not being found as an exception, which it then handles. If the constraint
+    # was set to the default, Sitepress would hand off routing back to rails if something isn't
+    # found and fail silently.
+    routes.append { sitepress_pages root: true, controller: "site", constraints: nil }
 
     # A logger without a formatter will crash when Sprockets is enabled.
     logger           = ActiveSupport::Logger.new(STDOUT)
@@ -48,4 +60,4 @@ module Sitepress
 end
 
 # Load the SassC template handler if SassC is installed as part of this stand-alone server.
-require_relative "sass_template_handlers" if defined? SassC::Engine
+require_relative "sass_template_handlers" if defined? SassC::Engine

data/rails/app/controllers/site_controller.rb

@@ -1,22 +1,13 @@
 class SiteController < ApplicationController
-  DEFAULT_SITE_LAYOUT = "layouts/layout".freeze
-
-  # Control whether or not to display friendly error reporting messages
-  # in Sitepress. The development server turns this on an handles exception,
-  # while the compile and other environments would likely have this disabled.
-  class_attribute :enable_sitepress_error_reporting, default: false
+  include Sitepress::SitePages
 
-  # When in a development environment, we'll want to reload the site between
-  # requests so we can see the latest changes; otherwise, load the site once
-  # and we're done.
-  class_attribute :enable_site_reloading, default: false
+  DEFAULT_SITE_LAYOUT = "layouts/layout".freeze
 
   # 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
-
-  include Sitepress::SitePages
+  rescue_from Sitepress::ResourceNotFoundError, with: :page_not_found
 
   layout :site_layout
 
@@ -28,23 +19,26 @@ class SiteController < ApplicationController
   def sitepress_error(exception)
     raise exception unless has_error_reporting_enabled?
 
-    @title = "Sitepress error in #{current_page.asset.path}".html_safe
+    @title = "Error in resource #{current_page.asset.path}".html_safe
     @exception = exception
     render "error", layout: "sitepress", status: :internal_server_error
   end
 
   def page_not_found(exception)
     raise exception unless has_error_reporting_enabled?
+    not_found
+  end
 
-    @title = "Sitepress page #{params[:resource_path].inspect} not found"
-    render "page_not_found", layout: "sitepress", status: :not_found
+  def not_found
+    @title = "Could not find resource at #{request.path}"
+    render "not_found", layout: "sitepress", status: :not_found
   end
 
   def has_error_reporting_enabled?
-    self.class.enable_sitepress_error_reporting
+    Sitepress::Server.config.enable_sitepress_error_reporting
   end
 
   def reload_site?
-    self.class.enable_site_reloading
+    Sitepress::Server.config.enable_site_reloading
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-server
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta10
+  version: 3.0.1
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-23 00:00:00.000000000 Z
+date: 2022-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta10
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta10
+        version: 3.0.1
 description:
 email:
 - bradgessler@gmail.com
@@ -54,7 +54,7 @@ files:
 - rails/app/helpers/application_helper.rb
 - rails/app/views/layouts/sitepress.html.erb
 - rails/app/views/site/error.html.erb
-- rails/app/views/site/page_not_found.html.erb
+- rails/app/views/site/not_found.html.erb
 - rails/public/_sitepress/images/logo.svg
 - rails/public/_sitepress/stylesheets/site.css
 - sitepress-server.gemspec
@@ -73,11 +73,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Sitepress rack app for stand-alone of embedded usage.