sitepress-rails 5.0.0.beta3 → 5.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443c3d5ccdfa98e1b995ae899d3d8e20dd7ffb4c98a8d5700be29384847e838d
-  data.tar.gz: a7664658ced9775dbbde217f0247933851edbbbebb6c2cd5ca8d1e893163f2fd
+  metadata.gz: 520f12ebb471b2c8bef53404dc4938f12637f90929f6a89b6b405845e559cf33
+  data.tar.gz: ea78740263ce5ca251797554191b85e3db15f61fb58276a38b9dd2bfbfb182b9
 SHA512:
-  metadata.gz: e092de737d65d1e5eca7eefedcdf1f1129af9872e1fdca7418c5bf0b9192fe9fd71c885698779fe120f958c1e525f734a1fd919b3e457646354bbc3eb78e8e25
-  data.tar.gz: 3eab694d5c52e70410f9f2dde9421e31f5a329aed6f83bd5d447df29df2b9b870cef72a128627810fc7552277f071d88b59aae3b0803a9436826ced73e16fab0
+  metadata.gz: a747326ecbf65fdd35c79cbe0b534f4944a483f948b6cfe35e5969f8fa6889cfc885723cb1795a0c839482b4da7fffe9e049502002beb20aeb1b1e5ed9888bc5
+  data.tar.gz: 5d672444a44805361af25604a082bed879217f63f341a5ced5cba09ab85697d6d003ef6f420d6a43bd34fbaf48d13b943ede6b6e8860bbf4499686fdbeccf35a

data/README.md

@@ -31,13 +31,13 @@ You can serve any number of Sitepress sites from one Rails app — for example a
 
 ```ruby
 # 1. config/initializers/sitepress.rb — register the site at boot
-Sitepress.sites << Sitepress::Site.new(root_path: "app/sitepress/admin_docs")
+Sitepress.sites << Sitepress::Site.new(root_path: "app/content/admin_docs")
 ```
 
 ```ruby
 # 2. app/controllers/admin/docs_controller.rb — bind it to a controller
 class Admin::DocsController < Sitepress::SiteController
-  self.site = Sitepress.sites.fetch("app/sitepress/admin_docs")
+  self.site = Sitepress.sites.fetch("app/content/admin_docs")
 
   layout "admin"
   before_action :require_admin
@@ -63,7 +63,7 @@ A typo in the path string fails loud at controller class load:
 
 ```
 NotFoundError: No Sitepress site registered at "app/contnet".
-Registered: ["app/sitepress/admin_docs"]
+Registered: ["app/content/admin_docs"]
 ```
 
 **Why three pieces and not one?** Boot ordering forces it. Zeitwerk needs helper / model paths registered before its eager-load pass, which happens before the first request — that's what `Sitepress.sites <<` does and it's the only piece that *has* to live in an initializer. The controller binding (`self.site = ...`) is just `class_attribute` plus a writer that `prepend_view_path`s the site's view directories onto *this controller's* lookup chain (so multi-site view lookups stay local — no global ActionView pollution). Routes own the URL → controller binding, with the mount path read from the surrounding `scope`/`namespace`.
@@ -73,7 +73,7 @@ The same site can be referenced by more than one controller — a public reader
 ### Generator
 
 ```bash
-bin/rails generate sitepress:site app/sitepress/admin_docs
+bin/rails generate sitepress:site app/content/admin_docs
 ```
 
 Scaffolds the content directory tree (`pages/`, `helpers/`, `models/`, `assets/`), a stub index template, a controller subclass with `self.site = Sitepress.sites.fetch(...)` already filled in, and either creates or appends to `config/initializers/sitepress.rb` with the registration line. Pass `--mount-at=/admin/docs` to also inject a `scope` block into `config/routes.rb`; without the flag, the generator just prints the routes line for you to paste.
@@ -84,7 +84,7 @@ Compilation is split into single-site and multi-site forms so single-site users
 
 - `rake sitepress:compile` — compiles the configured default site only.
 - `rake sitepress:sites:compile` — compiles every registered site (default + `Sitepress.sites`) to `tmp/sitepress/<basename>`. Each site lives in its own subdirectory so two sites never collide on output.
-- `rake "sitepress:sites:compile[app/sitepress/admin_docs]"` — compiles a single registered site by `root_path`. Raises `Sitepress::NotFoundError` listing registered paths if no match.
+- `rake "sitepress:sites:compile[app/content/admin_docs]"` — compiles a single registered site by `root_path`. Raises `Sitepress::NotFoundError` listing registered paths if no match.
 - `rake sitepress:sites` — lists the configured default site and everything in `Sitepress.sites`.
 
 Two env vars adjust the compile tasks:

data/lib/sitepress/rails.rb

@@ -42,10 +42,10 @@ module Sitepress
   # apps. See `Sitepress::Sites` for the full API; the common usage is:
   #
   #   # config/initializers/sitepress.rb
-  #   Sitepress.sites << Sitepress::Site.new(root_path: "app/sitepress/admin_docs")
+  #   Sitepress.sites << Sitepress::Site.new(root_path: "app/content/admin_docs")
   #
   #   # somewhere later (e.g. a controller class body)
-  #   Sitepress.sites.fetch("app/sitepress/admin_docs")
+  #   Sitepress.sites.fetch("app/content/admin_docs")
   def self.sites
     configuration.sites
   end

data/lib/sitepress/route_constraint.rb

@@ -10,7 +10,7 @@ module Sitepress
   #     via `class_attribute :site` and have routing pick it up:
   #
   #       class Admin::DocsController < Sitepress::SiteController
-  #         self.site = Sitepress.sites.fetch("app/sitepress/admin_docs")
+  #         self.site = Sitepress.sites.fetch("app/content/admin_docs")
   #       end
   #
   # `path_prefix` is the URL prefix the route is mounted under (e.g.

data/lib/sitepress/sites.rb

@@ -9,10 +9,10 @@ module Sitepress
   # forms or between `<<` and a non-chaining `add`.
   #
   #   # config/initializers/sitepress.rb
-  #   Sitepress.sites << Sitepress::Site.new(root_path: "app/sitepress/admin_docs")
+  #   Sitepress.sites << Sitepress::Site.new(root_path: "app/content/admin_docs")
   #
   #   # somewhere later
-  #   Sitepress.sites.fetch("app/sitepress/admin_docs")    # => Sitepress::Site
+  #   Sitepress.sites.fetch("app/content/admin_docs")    # => Sitepress::Site
   #   Sitepress.sites.fetch("nope")                        # => raises NotFoundError
   #   Sitepress.sites.each { |site| ... }
   #

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

@@ -57,7 +57,7 @@ module Sitepress
       # the standard Rails way:
       #
       #   class Admin::DocsController < Sitepress::SiteController
-      #     self.site = Sitepress.sites.fetch("app/sitepress/admin_docs")
+      #     self.site = Sitepress.sites.fetch("app/content/admin_docs")
       #   end
       #
       # `class_attribute` gives us a normal class-level reader/writer

data/rails/lib/generators/sitepress/site/USAGE

@@ -10,17 +10,17 @@ Description:
     from the path's basename.
 
 Example:
-    bin/rails generate sitepress:site app/sitepress/admin_docs
+    bin/rails generate sitepress:site app/content/admin_docs
 
     This will create:
-        app/sitepress/admin_docs/pages/index.html.erb
-        app/sitepress/admin_docs/helpers/.keep
-        app/sitepress/admin_docs/models/.keep
-        app/sitepress/admin_docs/assets/.keep
+        app/content/admin_docs/pages/index.html.erb
+        app/content/admin_docs/helpers/.keep
+        app/content/admin_docs/models/.keep
+        app/content/admin_docs/assets/.keep
         app/controllers/admin_docs_controller.rb
 
     And add to config/initializers/sitepress.rb:
-        Sitepress.sites << Sitepress::Site.new(root_path: "app/sitepress/admin_docs")
+        Sitepress.sites << Sitepress::Site.new(root_path: "app/content/admin_docs")
 
     You'll need to mount the controller in config/routes.rb manually —
     the generator prints the line to copy.

data/rails/lib/generators/sitepress/site/site_generator.rb

@@ -3,7 +3,7 @@ require "rails/generators/base"
 module Sitepress
   # Scaffolds a new Sitepress site for multi-site Rails apps. Usage:
   #
-  #   bin/rails generate sitepress:site app/sitepress/admin_docs
+  #   bin/rails generate sitepress:site app/content/admin_docs
   #
   # See the USAGE file for the full description.
   class SiteGenerator < Rails::Generators::Base
@@ -11,7 +11,7 @@ module Sitepress
 
     argument :root_path,
       type: :string,
-      desc: "Path the site lives at on disk, relative to Rails root (e.g. app/sitepress/admin_docs)"
+      desc: "Path the site lives at on disk, relative to Rails root (e.g. app/content/admin_docs)"
 
     class_option :mount_at,
       type: :string,

data/spec/dummy/app/controllers/secondary_controller.rb

@@ -1,3 +1,3 @@
 class SecondaryController < Sitepress::SiteController
-  self.site = Sitepress.sites.fetch(Rails.root.join("app/sitepress/secondary").to_s)
+  self.site = Sitepress.sites.fetch(Rails.root.join("app/content/secondary").to_s)
 end

data/spec/dummy/config/initializers/sitepress.rb

@@ -1,7 +1,7 @@
 # Multi-site registration for the dummy app's integration test.
-# Register a "secondary" site rooted at app/sitepress/secondary so the
+# Register a "secondary" site rooted at app/content/secondary so the
 # end-to-end multi-site spec can hit it through a real Rails request
 # cycle.
 Sitepress.sites << Sitepress::Site.new(
-  root_path: Rails.root.join("app/sitepress/secondary")
+  root_path: Rails.root.join("app/content/secondary")
 )