sitepress-rails 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 768e64a38091a5087d3abd0ba5b1447828bb495f134b2cdcea072a1d77ccf706
-  data.tar.gz: 34a4630e81bcf65f6b77f2ef0cfaca5ee0d2fa1ad56fad90fa4f67622b64bd02
+  metadata.gz: a19ae6fa84afd56632baf90af377e18dbe8374abf482622bd7830a1ed489e8d1
+  data.tar.gz: 86a015c072a56d17595588c5d6bd547e264054a5ed2c752dfdc0e2c07c058dcf
 SHA512:
-  metadata.gz: 614aa9ad23721a172cbcb77f054936a3c388cc03f6fa8664188ddd7402500bc6e1e8cf796010d60181c11821d23e19aa86ab2357f8834a8a0043a260b5a8cbd5
-  data.tar.gz: 3ee5f14a5ce1baae00c0ad6fbff3c6410e540acd5d1dc3d78791dd5fe6b78ea459bed95466d6de08dc301cc26b123a03a6d5a0df17f3a88051aaf80cfd3eb6d7
+  metadata.gz: e218c3abb19c61323938b506b8613bfac2e721e4dd62330c72ab19531110e73d1e3cd49812244a9a183911634b956c2a7c17006b9fe1e412fb6bf7dab05df351
+  data.tar.gz: 07c3d578d2bb4749f8087c7bb6958e3bc8d7e79d50b553a05f5d38f302aa1434629f19fca12a59b4a1503f8cafd29a3b3e33515339f20591c2a2c0425acb189a

data/lib/sitepress/engine.rb

@@ -54,11 +54,8 @@ module Sitepress
         app.config.cache_classes
       end
 
-      # 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
+      config.to_prepare do
+        Sitepress::Path.handler_extensions = ActionView::Template::Handlers.extensions
       end
     end
 

data/lib/sitepress/rails.rb

@@ -11,7 +11,6 @@ module Sitepress
     autoload :Controller,             "sitepress/renderers/controller"
     autoload :Server,                 "sitepress/renderers/server"
   end
-  autoload :Rendition,                "sitepress/rendition"
   autoload :RouteConstraint,          "sitepress/route_constraint"
   module BuildPaths
     autoload :RootPath,               "sitepress/build_paths/root_path"

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

@@ -17,7 +17,7 @@ module Sitepress
     included do
       rescue_from Sitepress::ResourceNotFound, with: :resource_not_found
       helper Sitepress::Engine.helpers
-      helper_method :current_page, :site, :page_rendition
+      helper_method :current_page, :site
       around_action :ensure_site_reload
     end
 
@@ -43,56 +43,12 @@ module Sitepress
       end
     end
 
-    # Renders the markup within a resource that can be rendered.
-    def page_rendition(resource, layout: nil)
-      Rendition.new(resource).tap do |rendition|
-        rendition.layout = layout
-        pre_render rendition
-      end
-    end
-
     # If a resource has a handler (e.g. erb, haml, etc.) we use the Rails renderer to
     # process templates, layouts, partials, etc. To keep the whole rendering process
     # 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)
-      # 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
-
-      # Now we finally render the output of the processed rendition to the client.
-      post_render rendition
-    end
-
-    # This is where the actual rendering happens for the page source in Rails.
-    def pre_render(rendition)
-      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.
-    # For example, the user may use Nokogiri to parse static HTML pages and hook it into the asset pipeline.
-    # They may also use tools like `HTMLPipeline` to process links from a markdown renderer.
-    def process_rendition(rendition)
-      # Do nothing unless the user extends this method.
-    end
-
-    # Send the inline rendered, post-processed string into the Rails rendering method that actually sends
-    # the output to the end-user as a web response.
-    def post_render(rendition)
-      render body: rendition.output, content_type: rendition.mime_type
+      render resource, layout: resource_layout(resource)
     end
 
     # A reference to the current resource that's being requested.
@@ -155,40 +111,14 @@ 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(resource)
-      private_layout_method = self.method(:_layout)
-      layout =
-        if Rails.version >= "6"
-          private_layout_method.call lookup_context, resource_rails_formats(resource)
-        elsif Rails.version >= "5"
-          private_layout_method.call resource_rails_formats(resource)
+    def resource_layout(resource)
+      resource.data.fetch "layout" do
+        case template = _layout(lookup_context, resource.node.formats)
+        when ActionView::Template
+          template.virtual_path
         else
-          private_layout_method.call
+          template
         end
-
-      if layout.instance_of? String # Rails 4 and 5 return a string from above.
-        layout
-      elsif layout # Rails 3 and older return an object that gives us a file name
-        File.basename(layout.identifier).split('.').first
-      else
-        # If none of the conditions are met, then no layout was
-        # specified, so nil is returned.
-        nil
-      end
-    end
-
-    # Rails 5 requires an extension, like `:html`, to resolve a template. This
-    # 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 resource_rails_formats(resource)
-      node_formats = resource.node.formats
-      supported_formats = node_formats & Mime::EXTENSION_LOOKUP.keys
-
-      if supported_formats.empty?
-        DEFAULT_PAGE_RAILS_FORMATS
-      else
-        supported_formats.map?(&:to_sym)
       end
     end
 

data/rails/lib/generators/sitepress/controller/templates/controllers/site_controller.rb

@@ -3,15 +3,4 @@ class SiteController < Sitepress::SiteController
   def show
     render_resource current_resource
   end
-
-  protected
-
-  # This is to be used by end users if they need to do any post-processing on the rendering page.
-  # For example, the user may use Nokogiri to parse static HTML pages and hook it into the asset pipeline.
-  # They may also use tools like `HTMLPipeline` to process links from a markdown renderer.
-  #
-  # For example, the rendition could be modified via `Nokogiri::HTML5::DocumentFragment(rendition)`.
-  def process_rendition(rendition)
-    # Do nothing unless the user extends this method.
-  end
 end

data/sitepress-rails.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.test_files = Dir["spec/**/*"]
 
-  rails_version      = ">= 6.0"
+  rails_version      = ">= 7.0"
 
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "pry"