sitepress-rails 0.1.28 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eae4ad0f9f5c9a8b159c1234f159dc1aeddae525
-  data.tar.gz: 02fbd0cb3d2287fb20483ac1e3fd7cc3e0c4555c
+SHA256:
+  metadata.gz: c381546d35f924553bfea7fb8b6f13d0d903bb02b28149474ac24c77f6f48a8e
+  data.tar.gz: df348b473e9450ee82817b56593cc9e4195733f5fc434fc91a4e928a2c793c2e
 SHA512:
-  metadata.gz: 41ae4d6e3b5c2cef6bf6bf3706fe7cebbf15c846ff1569161f19e0404dbde39260c62f396acedb4844890c0ec9fa879cb009f7d3f467665ac977a225483c7615
-  data.tar.gz: 6c2b4a5c61b7b2aae1821d8496fa5ed20ca48e73c17384cf5f67269a9781b763393a84463da1aee56c78ecbad6aba20c39249f78c8c4a9ae9bb8e15bc007ce49
+  metadata.gz: cdad1a1fac1fa2545c5ad611893bee0b0711dac139822ee58a4faef224d27c2b7501a48a4f38865cd4bece4bbffc5ecbb1ee0a6aa702a5fc40049dd7e20a82c8
+  data.tar.gz: dac978e29a5abeab9733e926a613ea8c156c7ba5a79a78509ce37a9ec16112377e390172ba367a70123fb5fff87ae7b450ef725dcd80226243c400af2fd8dd32

data/README.md

@@ -22,10 +22,16 @@ Then mount the engine into your `config/routes.rb` file:
 mount Sitepress::Engine => "/"
 ```
 
-Then add pages to the `app/views/pages` directory:
+Create the `app/content/pages` in your rails project:
 
 ```bash
-$ echo "<h1>Hello</h1><p>It is <%= Time.now %> o'clock</p>" > app/views/pages/hello.html.erb
+$ mkdir -p app/content/pages
+```
+
+Then add pages to the `app/content/pages` directory:
+
+```bash
+$ echo "<h1>Hello</h1><p>It is <%= Time.now %> o'clock</p>" > app/content/pages/hello.html.erb
 ```
 
 Point your browser to `http://127.0.0.1:3000/hello` and if all went well you should see the page you just created.

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

@@ -7,12 +7,16 @@ module Sitepress
     # 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
@@ -21,14 +25,15 @@ module Sitepress
 
     protected
     def render_page(page)
-      render inline: page.body,
-        type: page.asset.template_extensions.last,
-        layout: page.data.fetch("layout", controller_layout),
-        content_type: page.mime_type.to_s
+      if page.renderable?
+        render_text_resource page
+      else
+        send_binary_resource page
+      end
     end
 
     def current_page
-      @_current_page ||= find_resource
+      @current_page ||= find_resource
     end
 
     def site
@@ -40,6 +45,24 @@ module Sitepress
     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.
@@ -53,30 +76,47 @@ module Sitepress
       end
     end
 
-    # Default finder of the resource for the current controller context.###
+    # 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[:resource_path]
+      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
-      # Rails 4 and 5 expose the `_layout` via methods with different arity. Since
-      # I don't want to hard code the version, I'm detecting arity and hoping that Rails 6
-      # doesn't break this approach. If it does I'll probably have to get into the business
-      # of version detection.
       private_layout_method = self.method(:_layout)
-      layout = if private_layout_method.arity == 1 # Rails 5
-        private_layout_method.call current_page_rails_formats
-      else # Rails 4
-        private_layout_method.call
-      end
+      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
-      else # Rails 3 and older return an object that gives us a file name
+      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
 

data/app/controllers/sitepress/site_controller.rb

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

data/config/routes.rb

@@ -2,6 +2,11 @@ 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

data/lib/sitepress/build_paths/directory_index_path.rb

@@ -0,0 +1,12 @@
+module Sitepress
+  module BuildPaths
+    # In many cases, you'll want to serve up `pages/blah.html.haml` as `/blah` on
+    # hosts like S3. To achieve this effect, we have to compile `pages/blah.html.haml`
+    # to a folder with the filename `index.html`, so the final path would be `/blah/index.html`
+    class DirectoryIndexPath < IndexPath
+      def path_with_default_format
+        File.join(node.name, "#{node.default_name}.#{format}")
+      end
+    end
+  end
+end

data/lib/sitepress/build_paths/index_path.rb

@@ -0,0 +1,20 @@
+module Sitepress
+  module BuildPaths
+    # Compiles pages directly from `/pages/blah.html.haml` to `/blah.html`. Handles root `index`
+    # pages too, mainly grabbing the root, which doesn't have a name in the node, to the default_name
+    # of the node, which is usually `index`.
+    class IndexPath < RootPath
+      def path_without_format
+        node.name
+      end
+
+      def path_with_format
+        "#{node.name}.#{format}"
+      end
+
+      def path_with_default_format
+        path_with_format
+      end
+    end
+  end
+end

data/lib/sitepress/build_paths/root_path.rb

@@ -0,0 +1,40 @@
+module Sitepress
+  module BuildPaths
+    # Compiles pages directly from `/pages/blah.html.haml` to `/blah.html`. Handles root `index`
+    # pages too, mainly grabbing the root, which doesn't have a name in the node, to the default_name
+    # of the node, which is usually `index`.
+    class RootPath
+      attr_reader :resource
+
+      extend Forwardable
+      def_delegators :resource, :node, :format
+
+      def initialize(resource)
+        @resource = resource
+      end
+
+      def path
+        if format.nil?
+          path_without_format
+        elsif format == node.default_format
+          path_with_default_format
+        elsif format
+          path_with_format
+        end
+      end
+
+      protected
+      def path_without_format
+        node.default_name
+      end
+
+      def path_with_format
+        "#{node.default_name}.#{format}"
+      end
+
+      def path_with_default_format
+        path_with_format
+      end
+    end
+  end
+end

data/lib/sitepress/compiler.rb

@@ -0,0 +1,68 @@
+require "pathname"
+require "fileutils"
+
+module Sitepress
+  # Compile all resources from a Sitepress site into static pages.
+  class Compiler
+    include FileUtils
+
+    class ResourceCompiler
+      attr_reader :resource
+
+      def initialize(resource)
+        @resource = resource
+      end
+
+      def compilation_path
+        File.join(*resource.lineage, compilation_filename)
+      end
+
+      # Compiled assets have a slightly different filename for assets, especially the root node.
+      def compilation_filename(path_builder: BuildPaths::DirectoryIndexPath, root_path_builder: BuildPaths::RootPath)
+        path_builder = resource.node.root? ? root_path_builder : path_builder
+        path_builder.new(resource).path
+      end
+
+      def render(page)
+        Renderers::Server.new(resource).render
+      end
+    end
+
+    attr_reader :site
+
+    def initialize(site:, stdout: $stdout)
+      @site = site
+      @stdout = stdout
+    end
+
+    # Iterates through all pages and writes them to disk
+    def compile(target_path:)
+      target_path = Pathname.new(target_path)
+      mkdir_p target_path
+      cache_resources = @site.cache_resources
+      @stdout.puts "Compiling #{@site.root_path.expand_path}"
+
+      begin
+        @site.cache_resources = true
+        @site.resources.each do |resource|
+          compiler = ResourceCompiler.new(resource)
+          path = target_path.join(compiler.compilation_path)
+          mkdir_p path.dirname
+          if resource.renderable?
+            @stdout.puts "  Rendering #{path}"
+            File.open(path.expand_path, "w"){ |f| f.write compiler.render(resource) }
+          else
+            @stdout.puts "  Copying #{path}"
+            FileUtils.cp resource.asset.path, path.expand_path
+          end
+        rescue => e
+          @stdout.puts "Error compiling #{resource.inspect}"
+          raise
+        end
+        @stdout.puts "Successful compilation to #{target_path.expand_path}"
+      ensure
+        @site.cache_resources = cache_resources
+      end
+    end
+  end
+end

data/lib/sitepress/engine.rb

@@ -1,28 +1,51 @@
+require "rails/engine"
+
 module Sitepress
   class Engine < ::Rails::Engine
-    config.before_configuration do |app|
-      Sitepress.configure do |config|
-        app.paths["app/helpers"].push config.site.root_path.join("helpers")
-        app.paths["app/assets"].push config.site.root_path.join("assets")
-        app.paths["app/views"].push config.site.root_path
-      end
+    # 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`.
+      "config/site.rb"                      # When Sitepress is launched embedded in Rails project.
+    ]
 
-      # Setup concerns paths for Rails 4 (doesn't automatically populate)
-      concerns_path = "app/controllers/concerns"
-      unless app.paths.keys.include?(concerns_path)
-        app.paths.add(concerns_path)
-      end
+    # Load the `config/site.rb` file so users can configure Sitepress.
+    initializer :load_sitepress_file, before: :set_sitepress_paths do
+      site_file = paths["config/site.rb"].existent.first
+      load site_file if site_file
+    end
+
+    # Load paths from `Sitepress#site` into rails so it can render views, helpers, etc. properly.
+    initializer :set_sitepress_paths, before: :set_autoload_paths do |app|
+      app.paths["app/helpers"].push site.helpers_path.expand_path
+      app.paths["app/views"].push site.root_path.expand_path
+      app.paths["app/views"].push site.pages_path.expand_path
     end
 
-    initializer "sitepress.configure" do |app|
-      Sitepress.configure do |config|
-        config.parent_engine = app
-        config.cache_resources = app.config.cache_classes
+    # Configure sprockets paths for the site.
+    initializer :set_asset_paths, before: :append_assets_path do |app|
+      manifest_file = sitepress_configuration.manifest_file_path.expand_path
+
+      if manifest_file.exist?
+        app.paths["app/assets"].push site.assets_path.expand_path
+        app.config.assets.precompile << manifest_file.to_s
+      else
+        Rails.logger.warn "WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at #{manifest_file.to_s.inspect}."
       end
     end
 
-    initializer "sitepress.middleware" do |app|
-      app.middleware.use Sitepress::Middleware::RequestCache, site: Sitepress.site
+    # Configure Sitepress with Rails settings.
+    initializer :configure_sitepress do |app|
+      sitepress_configuration.parent_engine = app
+      sitepress_configuration.cache_resources = app.config.cache_classes
+    end
+
+    private
+    def sitepress_configuration
+      Sitepress.configuration
+    end
+
+    def site
+      sitepress_configuration.site
     end
   end
 end

data/lib/sitepress/rails.rb

@@ -1,19 +1,21 @@
 require "sitepress-core"
 
 module Sitepress
-  # Contains singletons for rails and some configuration data.
-  Configuration = Struct.new(:site, :routes, :parent_engine)
-
-  # Rescued by ActionController to display page not found error.
-  PageNotFoundError = Class.new(StandardError)
-
+  autoload :Compiler,                 "sitepress/compiler"
   autoload :RailsConfiguration,       "sitepress/rails_configuration"
   autoload :RouteConstraint,          "sitepress/route_constraint"
-  module Extensions
-    autoload :RailsRequestPaths,      "sitepress/extensions/rails_request_paths"
-    autoload :PartialsRemover,        "sitepress/extensions/partials_remover"
-    autoload :IndexRequestPath,       "sitepress/extensions/index_request_path"
+  module Renderers
+    autoload :Controller,             "sitepress/renderers/controller"
+    autoload :Server,                 "sitepress/renderers/server"
   end
+  module BuildPaths
+    autoload :RootPath,               "sitepress/build_paths/root_path"
+    autoload :IndexPath,              "sitepress/build_paths/index_path"
+    autoload :DirectoryIndexPath,     "sitepress/build_paths/directory_index_path"
+  end
+
+  # Rescued by ActionController to display page not found error.
+  PageNotFoundError = Class.new(StandardError)
 
   # Make site available via Sitepress.site from Rails app.
   def self.site

data/lib/sitepress/rails_configuration.rb

@@ -6,13 +6,13 @@ module Sitepress
     # Store in ./app/content by default.
     DEFAULT_SITE_ROOT = "app/content".freeze
 
-    attr_accessor :site, :parent_engine, :routes, :cache_resources
+    attr_accessor :routes
+    attr_writer :site, :parent_engine
 
     # Delegates configuration points into the Sitepress site.
     extend Forwardable
     def_delegators :site, :cache_resources, :cache_resources=, :cache_resources?
 
-    # Set defaults.
     def initialize
       self.routes = true
     end
@@ -22,10 +22,12 @@ module Sitepress
     end
 
     def site
-      @site ||= Site.new(root_path: default_root).tap do |site|
-        site.resources_pipeline << Extensions::PartialsRemover.new
-        site.resources_pipeline << Extensions::RailsRequestPaths.new
-      end
+      @site ||= Site.new(root_path: default_root)
+    end
+
+    # Location of Sprockets manifest file
+    def manifest_file_path
+      site.assets_path.join("config/manifest.js")
     end
 
     private