pages_core 3.15.3 → 3.15.5

data/db/migrate/20240917142300_add_skip_index_to_pages.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSkipIndexToPages < ActiveRecord::Migration[7.2]
+  def change
+    add_column :pages, :skip_index, :boolean, null: false, default: false
+  end
+end

data/lib/pages_core/engine.rb

@@ -2,11 +2,7 @@
 
 module PagesCore
   class Engine < Rails::Engine
-    # config.autoload_paths += Dir["#{config.root}/lib/"]
-    # config.autoload_paths += Dir["#{config.root}/lib/pages_core/**/"]
-    # config.eager_load_paths += Dir["#{config.root}/lib/pages_core/**/"]
-
-    initializer :factory_bot_definitions do |app|
+    initializer "pages_core.factory_bot" do |app|
       path = File.expand_path("../../spec/factories", __dir__)
 
       if defined?(FactoryBotRails)
@@ -16,7 +12,7 @@ module PagesCore
       end
     end
 
-    initializer :append_migrations do |app|
+    initializer "pages_core.migrations" do |app|
       unless app.root.to_s.match root.to_s
         config.paths["db/migrate"].expanded.each do |expanded_path|
           app.config.paths["db/migrate"] << expanded_path
@@ -24,9 +20,10 @@ module PagesCore
       end
     end
 
-    # Enable asset precompilation
-    initializer :assets do |_config|
-      Rails.application.config.assets.precompile += %w[
+    initializer "pages_core.sprockets" do |app|
+      next unless Object.const_defined?("Sprockets::Railtie")
+
+      app.config.assets.precompile += %w[
         pages_core/admin-dist.js
         pages_core/admin.css
         pages_core/mailer.css
@@ -40,14 +37,14 @@ module PagesCore
       ]
     end
 
-    initializer :handle_exceptions do |app|
+    initializer "pages_core.rescue_response" do |app|
       app.config.exceptions_app = app.routes
       ActionDispatch::ExceptionWrapper.rescue_responses.merge!(
         "PagesCore::NotAuthorized" => :forbidden
       )
     end
 
-    initializer :healthcheck do |_app|
+    initializer "pages_core.healthcheck" do |_app|
       Healthcheck.configure do |config|
         config.success = 200
         config.error = 503
@@ -66,7 +63,7 @@ module PagesCore
       end
     end
 
-    initializer :lograge do |app|
+    initializer "pages_core.lograge" do |app|
       app.config.lograge.enabled = true if ENV["ENABLE_LOGRAGE"]
       app.config.lograge.formatter = Lograge::Formatters::Json.new
       app.config.lograge.ignore_actions =
@@ -82,11 +79,12 @@ module PagesCore
       end
     end
 
-    # React configuration
-    initializer :react do |app|
-      app.config.react.jsx_transform_options = {
-        harmony: true
-      }
+    initializer "pages_core.deprecator" do |app|
+      app.deprecators[:pages_core] = PagesCore.deprecator
+    end
+
+    initializer "pages_core.sitemap" do |_app|
+      PagesCore::Sitemap.register { |loc| pages_sitemap_url(loc, format: :xml) }
     end
   end
 end

data/lib/pages_core/sitemap.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "builder"
+
+module PagesCore
+  class Sitemap
+    attr_reader :entries
+
+    def initialize(&)
+      @entries = {}
+      yield(self) if block_given?
+    end
+
+    class << self
+      def register(url = nil, &block)
+        sitemaps << url unless url.nil?
+        sitemaps << block unless block.nil?
+      end
+
+      def sitemaps
+        @sitemaps ||= []
+      end
+    end
+
+    def add(url, options = {})
+      entries[url] = options
+    end
+
+    def to_xml
+      xml = Builder::XmlMarkup.new
+      xml.instruct!
+      xml.urlset(xmlns: "http://www.sitemaps.org/schemas/sitemap/0.9") do |doc|
+        entries.each do |url, opts|
+          xml_entry(doc, url, opts)
+        end
+      end
+    end
+
+    private
+
+    def format_time(timestamp)
+      if timestamp.is_a?(Date)
+        timestamp.strftime("%Y-%m-%d")
+      else
+        timestamp.strftime("%Y-%m-%dT%H:%M:%S#{timestamp.formatted_offset}")
+      end
+    end
+
+    def xml_entry(doc, entry_url, opts = {})
+      doc.url do |url|
+        url.loc(entry_url)
+        url.lastmod(format_time(opts[:lastmod])) if opts[:lastmod]
+        url.changefreq opts[:changefreq] if opts[:changefreq]
+        url.priority opts[:priority] if opts[:priority]
+      end
+    end
+  end
+end

data/lib/pages_core/templates/configuration_proxy.rb

@@ -8,15 +8,15 @@ module PagesCore
         @parent = parent
       end
 
-      def method_missing(method_name, *args, &block)
+      def method_missing(method_name, *, &block)
         if @parent && block
           @callback.call(@parent, method_name, block)
         elsif @parent
-          @callback.call(@parent, method_name, *args)
+          @callback.call(@parent, method_name, *)
         elsif block
           @callback.call(method_name, block)
         else
-          @callback.call(method_name, *args)
+          @callback.call(method_name, *)
         end
       end
 

data/lib/pages_core.rb

@@ -6,7 +6,6 @@ require "fileutils"
 require "find"
 require "open-uri"
 require "pathname"
-require "ostruct"
 
 # Rails
 require "rails"
@@ -35,7 +34,6 @@ require "rails_i18n"
 require "RedCloth"
 require "rotp"
 require "rqrcode"
-require "sass-rails"
 require "typhoeus"
 require "will_paginate"
 
@@ -58,6 +56,7 @@ require "pages_core/extensions"
 require "pages_core/page_path_constraint"
 require "pages_core/pages_plugin"
 require "pages_core/pub_sub"
+require "pages_core/sitemap"
 require "pages_core/templates"
 require "pages_core/version"
 
@@ -69,6 +68,10 @@ module PagesCore
       VERSION
     end
 
+    def deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new("3.17", "PagesCore")
+    end
+
     def plugin_root
       Pathname.new(File.dirname(__FILE__)).join("..").expand_path
     end
@@ -77,10 +80,10 @@ module PagesCore
       yield configuration if block_given?
     end
 
-    def configuration(key = nil, *args)
+    def configuration(key = nil, *)
       @configuration ||= PagesCore::Configuration::Pages.new
       if key
-        @configuration.send(key, *args)
+        @configuration.send(key, *)
       else
         @configuration
       end

data/lib/rails/generators/pages_core/frontend/frontend_generator.rb

@@ -47,10 +47,10 @@ module PagesCore
       end
 
       def install_js_dependencies
-        run("yarn add autoprefixer cssnano normalize.css postcss " \
+        run("pnpm add autoprefixer cssnano normalize.css postcss " \
             "postcss-calc postcss-cli postcss-import " \
             "postcss-import-ext-glob postcss-mixins postcss-preset-env " \
-            "postcss-url")
+            "postcss-image-inliner")
       end
 
       def configure_postcss

data/lib/rails/generators/pages_core/frontend/templates/application.html.erb

@@ -1,12 +1,20 @@
 <!doctype html>
 <%= tag.html(lang: locale) do %>
-  <%= head_tag do %>
-    <%# default_meta_image "/images/facebook-share.png" %>
+  <head>
+    <%= document_title_tag %>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <%= pages_meta_tags(@page) %>
+    <%= csrf_meta_tags unless static_cached? %>
+    <%= csp_meta_tag unless static_cached? %>
+
+    <%= yield :head %>
+
+    <%= tag.link(rel: "manifest", href: pwa_manifest_path(format: :json)) %>
+    <%= feed_tags %>
     <%= stylesheet_link_tag "application" %>
     <%= javascript_include_tag "application" %>
-    <%= feed_tags %>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-  <% end %>
+  </head>
   <body>
     <% if Rails.env.development? %>
       <div class="grid-overlay"></div>

data/lib/rails/generators/pages_core/frontend/templates/postcss.config.js

@@ -2,16 +2,12 @@ module.exports = {
   plugins: [
     require("postcss-import-ext-glob"),
     require("postcss-import"),
-    require("postcss-url")(
-      { filter: "**/*.svg",
-        url: "inline",
-        basePath: "../images" }
-    ),
+    require("postcss-image-inliner")({ assetPaths: ["app/assets/images"] }),
     require("postcss-mixins"),
     require("postcss-simple-vars"),
     require("postcss-preset-env")({ stage: 1 }),
     require("postcss-calc")({ precision: 10 }),
     require("autoprefixer"),
     require("postcss-discard-duplicates")
-  ],
+  ]
 };

data/lib/rails/generators/pages_core/frontend/templates/stylesheets/components/base.css

@@ -1,4 +1,6 @@
-*, *:before, *:after {
+*,
+*:before,
+*:after {
   box-sizing: border-box;
 }
 

data/lib/rails/generators/pages_core/frontend/templates/stylesheets/config.css

@@ -1,5 +1,4 @@
-$breakpoint-mobile-small: 479;
+$breakpoint-mobile: 767;
 
-@custom-media --tablet screen and (max-width: 991px);
+@custom-media --medium screen and (max-width: 1100px);
 @custom-media --mobile screen and (max-width: 767px);
-@custom-media --mobile-small screen and (max-width: $(breakpoint-mobile-small)px);

data/lib/rails/generators/pages_core/frontend/templates/stylesheets/global/animation.css

@@ -1,5 +1,5 @@
 :root {
   --ease-out: cubic-bezier(0.165, 0.84, 0.44, 1);
-  --ease-out-back: cubic-bezier(.35,1.47,.64,1);
+  --ease-out-back: cubic-bezier(0.35, 1.47, 0.64, 1);
   scroll-behavior: smooth;
 }

data/lib/rails/generators/pages_core/frontend/templates/stylesheets/global/colors.css

@@ -1,11 +1,11 @@
 :root {
   --black: #000000;
   --white: #ffffff;
-  --blue:  #0000ff;
+  --blue: #0000ff;
 
-  --background-color:  var(--white);
-  --text-color:        var(--black);
-  --link-color:        var(--blue);
+  --background-color: var(--white);
+  --text-color: var(--black);
+  --link-color: var(--blue);
 }
 
 body {
@@ -13,6 +13,7 @@ body {
   color: var(--text-color);
 }
 
-a, a:visited {
+a,
+a:visited {
   color: var(--link-color);
 }

data/lib/rails/generators/pages_core/frontend/templates/stylesheets/global/fonts.css

@@ -2,5 +2,5 @@
 @font-face { font-family: "Example";
              font-style: normal;
              font-weight: 300;
-             src: url("Example-Regular.woff") format("woff"); }
+             src: url("/Example-Regular.woff") format("woff"); }
 */

data/lib/rails/generators/pages_core/frontend/templates/stylesheets/global/grid.css

@@ -15,7 +15,7 @@
   --gutter: 2rem;
   --outer-padding: 2rem;
 
-  @media (--tablet) {
+  @media (--medium) {
     //--columns: 9;
     --gutter: 1.5rem;
     --outer-padding: 1.5rem;
@@ -31,9 +31,10 @@
   }
 
   --column-width: calc(
-    (100% -
-     ((var(--gutter) * (var(--columns) - 1)) + (var(--outer-padding) * 2))) /
-    var(--columns)
+    (
+        100% -
+          ((var(--gutter) * (var(--columns) - 1)) + (var(--outer-padding) * 2))
+      ) / var(--columns)
   );
 
   /* @mixin grid-limit 1400px; */
@@ -44,8 +45,10 @@
 }
 
 .grid-overlay--active {
-  --grid-overlay-width: var(--grid-limit,
-                            calc(100% - (var(--outer-padding) * 2)));
+  --grid-overlay-width: var(
+    --grid-limit,
+    calc(100% - (var(--outer-padding) * 2))
+  );
   display: block;
   position: fixed;
   z-index: 9000;

data/lib/rails/generators/pages_core/frontend/templates/stylesheets/global/typography.css

@@ -10,37 +10,36 @@
 }
 
 @define-mixin font-scale-base {
-  --font-scale-coeff: calc((var(--font-scale-to) - var(--font-scale-from)) /
-                           ((var(--font-scale-end) / 100) -
-                            (var(--font-scale-start) / 100)));
+  --font-scale-coeff: calc(
+    (var(--font-scale-to) - var(--font-scale-from)) /
+      (var(--font-scale-end) - var(--font-scale-start))
+  );
 
-  font-size: calc(calc((var(--font-scale-from) -
-                        (var(--font-scale-start) / 100) *
-                        var(--font-scale-coeff)) /
-                       16) * 1rem +
-                  var(--font-scale-coeff) * 1vw);
+  font-size: calc(
+    (var(--font-scale-from) - var(--font-scale-start) * var(--font-scale-coeff)) /
+      16 * 1rem + var(--font-scale-coeff) * 1vw
+  );
 }
 
 @define-mixin font-scale $from, $to, $start, $end {
   --font-scale-from: $from;
   --font-scale-to: $to;
-  --font-scale-start: $start;
-  --font-scale-end: $end;
+  --font-scale-start: calc($start / 100);
+  --font-scale-end: calc($end / 100);
 }
 
-
 /* ---- Definitions -------------------------------------------------------- */
 
 :root {
   --font-sans: Helvetica, sans-serif;
 
-  --font-larger:   500     2.0rem/1.1 var(--font-sans);
-  --font-large:    500     1.5rem/1.1 var(--font-sans);
-  --font-medium:   500     1.5rem/1.1 var(--font-sans);
-  --font-normal:   normal 1.25rem/1.1 var(--font-sans);
-  --font-small:    normal  1.0rem/1.1 var(--font-sans);
+  --font-larger: 500 2rem/1.1 var(--font-sans);
+  --font-large: 500 1.5rem/1.1 var(--font-sans);
+  --font-medium: 500 1.5rem/1.1 var(--font-sans);
+  --font-normal: normal 1.25rem/1.1 var(--font-sans);
+  --font-small: normal 1rem/1.1 var(--font-sans);
 
-  @media (--tablet) {
+  @media (--medium) {
     /*
     --font-larger:   500     1.5rem/1.1 var(--font-sans);
     --font-large:    500     1.5rem/1.1 var(--font-sans);
@@ -49,17 +48,16 @@
   }
 }
 
-
 /* ---- Font scale --------------------------------------------------------- */
 
 html {
   @mixin font-scale-base;
   @mixin font-scale 16, 18, 1440, 1920;
   @media screen and (max-width: 1440px) {
-    @mixin font-scale 14, 16, $breakpoint-mobile-small, 1440;
+    @mixin font-scale 14, 16, $breakpoint-mobile, 1440;
   }
-  @media (--mobile-small) {
-    @mixin font-scale 12, 16, 1, $breakpoint-mobile-small;
+  @media (--mobile) {
+    @mixin font-scale 12, 16, 1, $breakpoint-mobile;
   }
 }
 
@@ -68,20 +66,38 @@ body {
   font-size: 100%;
 }
 
-
 /* ---- Rules -------------------------------------------------------------- */
 
-h1, h2, h3, h4, h5, h6, p, ul, ol {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+ul,
+ol {
   margin: 1rem 0rem;
   @mixin child-margins;
 }
 
-h1, h2, h3, h4, h5, h6, p, ul, ol,
-figcaption, blockquote {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+ul,
+ol,
+figcaption,
+blockquote {
   max-width: 60ch;
 }
 
-ul, ol, blockquote {
+ul,
+ol,
+blockquote {
   margin-top: 2rem;
   margin-bottom: 2rem;
   @mixin child-margins;

data/lib/rails/generators/pages_core/install/templates/application_controller.rb

@@ -2,10 +2,4 @@
 
 class ApplicationController < PagesCore::BaseController
   # Put frontend specific code in frontend_controller.rb
-
-  helper :all # include all helpers, all the time
-
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
 end

data/lib/rails/generators/pages_core/rspec/templates/rails_helper.rb

@@ -31,7 +31,7 @@ require "shoulda-matchers"
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-Dir[Rails.root.join("spec/support/**/*.rb")].each do |f|
+Rails.root.glob("spec/support/**/*.rb").each do |f|
   require f
 end