sitepress-rails 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c381546d35f924553bfea7fb8b6f13d0d903bb02b28149474ac24c77f6f48a8e
-  data.tar.gz: df348b473e9450ee82817b56593cc9e4195733f5fc434fc91a4e928a2c793c2e
+  metadata.gz: 308a11e4d4472d626fb4f81581085c06e6ae98b2334f0540c314fd000be6a6c4
+  data.tar.gz: 5fcea186abadb31c9ca5d33b392dc6b5b197c7514421f5a07857d253ef34d051
 SHA512:
-  metadata.gz: cdad1a1fac1fa2545c5ad611893bee0b0711dac139822ee58a4faef224d27c2b7501a48a4f38865cd4bece4bbffc5ecbb1ee0a6aa702a5fc40049dd7e20a82c8
-  data.tar.gz: dac978e29a5abeab9733e926a613ea8c156c7ba5a79a78509ce37a9ec16112377e390172ba367a70123fb5fff87ae7b450ef725dcd80226243c400af2fd8dd32
+  metadata.gz: f1fa2ccd305669f776a95e9723fa4aede892ecfce34801481761278da67eeccaf12e056e07b256a81dbf2d253d09a6810f1bb906b09c54a79723a3e24de56967
+  data.tar.gz: 1744e9291b6a268a196baaf57a2f208ddbb59b5ce62839b41bda20ee87debcacd7fa30d224a434a6c55878c7fa68ad74e1845cd21f3fbeb05bbc71937847e454

data/lib/sitepress/engine.rb

@@ -2,6 +2,9 @@ require "rails/engine"
 
 module Sitepress
   class Engine < ::Rails::Engine
+    # Set the root of the engine to the gems rails directory.
+    config.root = File.expand_path("../../rails", __dir__)
+
     # Set the path for the site configuration file.
     paths.add "config/site.rb", with: [
       File.expand_path("./config/site.rb"), # When Sitepress is launched via `sitepress server`.

data/spec/dummy/log/test.log

@@ -3048,3 +3048,4 @@ WARNING: Sitepress could not enable Sprockets because it could not find a manife
 WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
 WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
 WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
+WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -117,9 +117,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/controllers/concerns/sitepress/site_pages.rb
-- app/controllers/sitepress/site_controller.rb
-- config/routes.rb
 - lib/sitepress-rails.rb
 - lib/sitepress/build_paths/directory_index_path.rb
 - lib/sitepress/build_paths/index_path.rb

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

@@ -1,138 +0,0 @@
-module Sitepress
-  # Serves up Sitepress site pages in a rails application. This is mixed into the
-  # Sitepress::SiteController, but may be included into other controllers for static
-  # page behavior.
-  module SitePages
-    # Rails 5 requires a format to be given to the private layout method
-    # to return the path to the layout.
-    DEFAULT_PAGE_RAILS_FORMATS = [:html].freeze
-
-    # Default root path of resources.
-    ROOT_RESOURCE_PATH = "".freeze
-
-    extend ActiveSupport::Concern
-
-    included do
-      rescue_from Sitepress::PageNotFoundError, with: :page_not_found
-      helper Sitepress::Engine.helpers
-      helper_method :current_page, :site
-      before_action :append_relative_partial_path, only: :show
-    end
-
-    def show
-      render_page current_page
-    end
-
-    protected
-    def render_page(page)
-      if page.renderable?
-        render_text_resource page
-      else
-        send_binary_resource page
-      end
-    end
-
-    def current_page
-      @current_page ||= find_resource
-    end
-
-    def site
-      Sitepress.site
-    end
-
-    def page_not_found(e)
-      raise ActionController::RoutingError, e.message
-    end
-
-    private
-    def append_relative_partial_path
-      append_view_path current_page.asset.path.dirname
-    end
-
-    def render_text_resource(resource)
-      with_sitepress_render_cache do
-        render inline: resource.body,
-          type: resource.asset.template_extensions.last,
-          layout: resource.data.fetch("layout", controller_layout),
-          content_type: resource.mime_type.to_s
-      end
-    end
-
-    def send_binary_resource(resource)
-      send_file resource.asset.path,
-        disposition: :inline,
-        type: resource.mime_type.to_s
-    end
-
-    # Sitepress::PageNotFoundError is handled in the default Sitepress::SiteController
-    # with an execption that Rails can use to display a 404 error.
-    def get(path)
-      resource = site.resources.get(path)
-      if resource.nil?
-        # TODO: Display error in context of Reources class root.
-        raise Sitepress::PageNotFoundError, "No such page: #{path}"
-      else
-        resource
-      end
-    end
-
-    # 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
-      get params.fetch(:resource_path, ROOT_RESOURCE_PATH)
-    end
-
-    # When development environments disable the cache, we still want to turn it
-    # on during rendering so that view doesn't rebuild the site on each call.
-    def with_sitepress_render_cache(&block)
-      cache_resources = site.cache_resources
-      begin
-        site.cache_resources = true
-        yield
-      ensure
-        site.cache_resources = cache_resources
-        site.clear_resources_cache unless site.cache_resources
-      end
-    end
-
-    # 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
-      private_layout_method = self.method(:_layout)
-      layout =
-        if Rails.version >= "6"
-          private_layout_method.call lookup_context, current_page_rails_formats
-        elsif Rails.version >= "5"
-          private_layout_method.call current_page_rails_formats
-        else
-          private_layout_method.call
-        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 current_page_rails_formats
-      extensions = current_page.node.formats.extensions
-      supported_extensions = extensions & Mime::EXTENSION_LOOKUP.keys
-
-      if supported_extensions.empty?
-        DEFAULT_PAGE_RAILS_FORMATS
-      else
-        supported_extensions.map?(&:to_sym)
-      end
-    end
-  end
-end

data/app/controllers/sitepress/site_controller.rb

@@ -1,7 +0,0 @@
-module Sitepress
-  class SiteController < ActionController::Base
-    # Extracted into a module because other controllers may need
-    # to be capable of serving Sitepress pages.
-    include Sitepress::SitePages
-  end
-end

data/config/routes.rb

@@ -1,12 +0,0 @@
-Sitepress.configuration.parent_engine.routes.draw do
-  if Sitepress.configuration.routes
-    constraints Sitepress::RouteConstraint.new do
-      get "*resource_path", controller: "sitepress/site", action: "show", as: :page, format: false
-      if has_named_route? :root
-        Rails.logger.warn 'Sitepress tried to configure `root to: "sitepress/site#show"`, but a root route was already defined.'
-      else
-        root to: "sitepress/site#show"
-      end
-    end
-  end
-end