sitepress-rails 4.0.2 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d982983be98080c0cfe1f61ab6664347e9ae387335222f751c04138b5cc3ba25
-  data.tar.gz: 63bd4f4ba8d058e07c0bceb90919180f41a5248c7ec9d318a1737a38b93f2b24
+  metadata.gz: e52a5129966fa3d7c603ae1ba2eecc190a5253341f727c1f50f63b091ca0f719
+  data.tar.gz: a2d1edec8406017193c328df2f79ad3c1e6a71b929071a0f7ba90fa7c3ba44f3
 SHA512:
-  metadata.gz: a19381871e14383c5b65d87a3cec2ea99564b23fb148b1c4c0a8c5b11552f996804dab72b5203a88581c06a350a3d187a9cc4e696e280f87d1049034bae52796
-  data.tar.gz: 5fce88a50329238576a40cc21c796f3c873947be86d3e1ba536265075a0b9adb099fa0723dbff0efa5aa28c462a183e2e54f9f12b582ab342ad89a6400338be0
+  metadata.gz: 03f239c1317da796ba12e152f41c242859ec254cca06591a848997de3ced52ff48176ee628eb4f89d51400e39d6108a7a575cf26d58a4f6f6adc10a1c5a44b7c
+  data.tar.gz: 6cfad8a7a9938ed295bcf8f2982ae6b6d61e792132e5bc44228ea756ed3c5682384d7a180b89ce4a974565d3e27c16b2bed097a49dde31ff008ae2763b6852e8

data/lib/sitepress/engine.rb

@@ -45,13 +45,21 @@ module Sitepress
     # Configure Sitepress with Rails settings.
     initializer :configure_sitepress do |app|
       sitepress_configuration.parent_engine = app
-      # Reloads entire site between requests for development environments
-      sitepress_configuration.cache_resources = app.config.cache_classes
-    end
+      # Reloads entire site between requests for development environments.
+      sitepress_configuration.cache_resources = if app.config.respond_to? :enable_reloading?
+        # Rails 7.1 changed the name of this setting to enable_reloading, so check if that exist and use it.
+        app.config.enable_reloading?
+      else
+        # Rails 7.0.x and lower all use this method to check if reloading is enabled.
+        app.config.cache_classes
+      end
 
-    config.after_initialize do
-      # Set the templates extensions (e.g. erb, haml) so that Sitepress can parse paths.
-      Sitepress::Path.handler_extensions = ActionView::Template::Handlers.extensions
+      # Setup Sitepress to handle Rails extensions.
+      ActiveSupport.on_load(:action_view) do
+        ActiveSupport.on_load(:after_initialize) do
+          Sitepress::Path.handler_extensions = ActionView::Template::Handlers.extensions
+        end
+      end
     end
 
     private

data/lib/sitepress/routing_mapper.rb

@@ -8,11 +8,11 @@ module ActionDispatch::Routing
     ROUTE_GLOB_KEY = "/*resource_path".freeze
 
     # Hook up all the Sitepress pages
-    def sitepress_pages(controller: DEFAULT_CONTROLLER, action: DEFAULT_ACTION, root: false, constraints: Sitepress::RouteConstraint.new)
+    def sitepress_pages(controller: DEFAULT_CONTROLLER, action: DEFAULT_ACTION, root: false, constraints: Sitepress::RouteConstraint.new, as: :page)
       get ROUTE_GLOB_KEY,
         controller: controller,
         action: action,
-        as: :page,
+        as: as,
         format: false,
         constraints: constraints
 

data/rails/app/controllers/concerns/sitepress/site_pages.rb

@@ -18,14 +18,13 @@ module Sitepress
       rescue_from Sitepress::ResourceNotFound, with: :resource_not_found
       helper Sitepress::Engine.helpers
       helper_method :current_page, :site, :page_rendition
-      before_action :append_relative_partial_path, only: :show
-      around_action :ensure_site_reload, only: :show
+      around_action :ensure_site_reload
     end
 
     # Public method that is primarily called by Rails to display the page. This should
     # be hooked up to the Rails routes file.
     def show
-      render_resource current_resource
+      render_resource requested_resource
     end
 
     protected
@@ -35,6 +34,9 @@ module Sitepress
     # file and serve it up.
     def render_resource(resource)
       if resource.renderable?
+        # Set this as our "top-level" resource. We might change it again in the pre-render
+        # method to deal with rendering resources inside of resources.
+        @current_resource = resource
         render_resource_with_handler resource
       else
         send_binary_resource resource
@@ -54,7 +56,10 @@ module Sitepress
     # contained in a way that the end user can override, we coupled the resource, source
     # and output within a `Rendition` object so that it may be processed via hooks.
     def render_resource_with_handler(resource)
-      rendition = page_rendition(resource, layout: controller_layout)
+      # Add the resource path to the view path so that partials can be rendered
+      append_relative_partial_path resource
+
+      rendition = page_rendition(resource, layout: controller_layout(resource))
 
       # Fire a callback in the controller in case anybody needs it.
       process_rendition rendition
@@ -65,9 +70,16 @@ module Sitepress
 
     # This is where the actual rendering happens for the page source in Rails.
     def pre_render(rendition)
-      rendition.output = render_to_string inline: rendition.source,
-        type: rendition.handler,
-        layout: rendition.layout
+      original_resource = @current_resource
+      begin
+        # This sets the `current_page` and `current_resource` variable equal to the given resource.
+        @current_resource = rendition.resource
+        rendition.output = render_to_string inline: rendition.source,
+          type: rendition.handler,
+          layout: rendition.layout
+      ensure
+        @current_resource = original_resource
+      end
     end
 
     # This is to be used by end users if they need to do any post-processing on the rendering page.
@@ -84,9 +96,8 @@ module Sitepress
     end
 
     # A reference to the current resource that's being requested.
-    def current_resource
-      @current_resource ||= find_resource
-    end
+    attr_reader :current_resource
+
     # In templates resources are more naturally thought of as pages, so we call it `current_page` from
     # there and from the controller.
     alias :current_page :current_resource
@@ -108,8 +119,8 @@ module Sitepress
     private
     # This makes it possible to render partials from the current resource with relative
     # paths. Without this the paths would have to be absolute.
-    def append_relative_partial_path
-      append_view_path current_resource.asset.path.dirname
+    def append_relative_partial_path(resource)
+      append_view_path resource.asset.path.dirname
     end
 
     def send_binary_resource(resource)
@@ -132,7 +143,7 @@ module Sitepress
 
     # Default finder of the resource for the current controller context. If the :resource_path
     # isn't present, then its probably the root path so grab that.
-    def find_resource
+    def requested_resource
       get resource_request_path
     end
 
@@ -144,13 +155,13 @@ module Sitepress
     # Returns the current layout for the inline Sitepress renderer. This is
     # exposed via some really convoluted private methods inside of the various
     # versions of Rails, so I try my best to hack out the path to the layout below.
-    def controller_layout
+    def controller_layout(resource)
       private_layout_method = self.method(:_layout)
       layout =
         if Rails.version >= "6"
-          private_layout_method.call lookup_context, current_resource_rails_formats
+          private_layout_method.call lookup_context, resource_rails_formats(resource)
         elsif Rails.version >= "5"
-          private_layout_method.call current_resource_rails_formats
+          private_layout_method.call resource_rails_formats(resource)
         else
           private_layout_method.call
         end
@@ -170,8 +181,8 @@ module Sitepress
     # method returns the intersection of the formats Rails supports from Mime::Types
     # and the current page's node formats. If nothing intersects, HTML is returned
     # as a default.
-    def current_resource_rails_formats
-      node_formats = current_resource.node.formats
+    def resource_rails_formats(resource)
+      node_formats = resource.node.formats
       supported_formats = node_formats & Mime::EXTENSION_LOOKUP.keys
 
       if supported_formats.empty?