pages_core 3.6.2 → 3.7.0

data/app/controllers/pages_core/admin_controller.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 # All admin controllers inherit Admin::AdminController, which provides layout,
 # authorization and other common code for the Admin set of controllers.
 module PagesCore
   class AdminController < ::ApplicationController
+    include PagesCore::Admin::PersistentParams
+
     protect_from_forgery with: :exception
 
     before_action :set_i18n_locale
     before_action :require_authentication
-    before_action :restore_persistent_params
-    after_action :save_persistent_params
 
     layout "admin"
 
@@ -36,29 +38,14 @@ module PagesCore
     # If not, renders the login screen.
     def require_authentication
       return if logged_in?
+
       if User.count < 1
-        redirect_to(new_admin_user_url) && return
+        redirect_to(new_admin_user_url)
       else
-        redirect_to(login_admin_users_url) && return
+        redirect_to(login_admin_users_url)
       end
     end
 
-    # Loads persistent params from user model and merges with session.
-    def restore_persistent_params
-      return unless current_user && current_user.persistent_data?
-      session[:persistent_params] ||= {}
-      session[:persistent_params] = current_user.persistent_data.merge(
-        session[:persistent_params]
-      )
-    end
-
-    # Saves persistent params from session to User model if applicable.
-    def save_persistent_params
-      return unless current_user && session[:persistent_params]
-      current_user.persistent_data = session[:persistent_params]
-      current_user.save
-    end
-
     def secure_compare(compare, other)
       return false unless compare && other
       return false unless compare.bytesize == other.bytesize
@@ -69,52 +56,5 @@ module PagesCore
       other.each_byte { |byte| res |= byte ^ l.shift }
       res.zero?
     end
-
-    # --- HELPERS ---
-
-    # Add a stylesheet
-    def add_stylesheet(css_file)
-      @admin_stylesheets ||= []
-      @admin_stylesheets << "admin/#{css_file}"
-    end
-
-    def persistent_params(namespace)
-      session[:persistent_params] ||= {}
-      session[:persistent_params][namespace] ||= {}
-      session[:persistent_params][namespace]
-    end
-
-    def coerce_persistent_param(value)
-      case value
-      when "true"
-        true
-      when "false"
-        false
-      else
-        value
-      end
-    end
-
-    # Get a persistent param
-    def persistent_param(key, default = nil, options = {})
-      key = key.to_s
-      namespace = options[:namespace] || self.class.to_s
-
-      value = coerce_persistent_param(
-        if params.key?(key)
-          params[key]
-        elsif persistent_params(namespace).key?(key)
-          persistent_params(namespace)[key]
-        else
-          default
-        end
-      )
-
-      if !value.nil? || options[:preserve_nil]
-        persistent_params(namespace)[key.to_s] = value
-      end
-
-      value
-    end
   end
 end

data/app/controllers/pages_core/attachments_controller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module PagesCore
   class AttachmentsController < ::ApplicationController
     before_action :verify_signed_params
     before_action :find_attachment, only: %i[show download]
 
-    caches_page :show
+    static_cache :show, permanent: true
 
     def show
       send_attachment
@@ -20,12 +22,14 @@ module PagesCore
     end
 
     def send_attachment(disposition: "inline")
-      if stale?(etag: @attachment, last_modified: @attachment.updated_at)
-        send_data(@attachment.data,
-                  filename: @attachment.filename,
-                  type: @attachment.content_type,
-                  disposition: disposition)
+      unless stale?(etag: @attachment, last_modified: @attachment.updated_at)
+        return
       end
+
+      send_data(@attachment.data,
+                filename: @attachment.filename,
+                type: @attachment.content_type,
+                disposition: disposition)
     end
 
     def verify_signed_params

data/app/controllers/pages_core/base_controller.rb

@@ -1,41 +1,35 @@
+# frozen_string_literal: true
+
 module PagesCore
   class BaseController < ActionController::Base
     include PagesCore::Authentication
-    include PagesCore::DomainBasedCache
     include PagesCore::ErrorRenderer
+    include PagesCore::ErrorReporting
     include PagesCore::ProcessTitler
     include PagesCore::PoliciesHelper
+    include PagesCore::StaticCacheController
 
-    before_action :set_locale, :configure_error_reporting
+    before_action :set_locale
     after_action :set_content_language_header
 
     protected
 
-    # Configures additional report data if Sentry is installed
-    def configure_error_reporting
-      return unless Object.const_defined?("Raven")
-      if logged_in?
-        Raven.user_context(user_id: current_user.id,
-                           user_email: current_user.email)
-      else
-        Raven.user_context({})
-      end
-      Raven.tags_context(locale: locale)
-      Raven.extra_context(params: params.to_unsafe_h)
+    def append_info_to_payload(payload)
+      super
+      payload[:remote_ip] = request.remote_ip
+      payload.merge!(current_user_context)
     end
 
     # Sets @locale from params[:locale], with I18n.default_locale as fallback
     def set_locale
-      legacy_locales = {
-        "nor" => "nb",
-        "eng" => "en"
-      }
+      legacy_locales = { "nor" => "nb", "eng" => "en" }
       @locale = params[:locale] || I18n.default_locale.to_s
       @locale = legacy_locales[@locale] if legacy_locales[@locale]
     end
 
     def set_content_language_header
       return unless locale
+
       headers["Content-Language"] = locale.to_s
     end
   end

data/app/controllers/pages_core/frontend/page_files_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module Frontend
     class PageFilesController < ::FrontendController
@@ -6,9 +8,11 @@ module PagesCore
       before_action :find_page_file, only: %i[show]
 
       def show
-        if stale?(etag: @page_file, last_modified: @page_file.updated_at)
-          redirect_to attachment_path(@page_file.attachment)
+        unless stale?(etag: @page_file, last_modified: @page_file.updated_at)
+          return
         end
+
+        redirect_to attachment_path(@page_file.attachment)
       end
 
       private

data/app/controllers/pages_core/frontend/pages_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module Frontend
     class PagesController < ::FrontendController
@@ -13,7 +15,7 @@ module PagesCore
       before_action :find_page, only: %i[show preview]
       before_action :require_page, only: %i[show preview]
       before_action :canonicalize_url, only: [:show]
-      after_action :cache_page_request, only: %i[index show]
+      static_cache :index, :show
 
       def index
         respond_to do |format|
@@ -45,11 +47,8 @@ module PagesCore
         return if request.path == canonical_path(@page)
         # Don't canonicalize if any unknown params are present
         return if (params.keys - %w[controller action path locale id]).any?
-        redirect_to(canonical_path(@page), status: :moved_permanently)
-      end
 
-      def disable_page_cache!
-        @page_cache_disabled = true
+        redirect_to(canonical_path(@page), status: :moved_permanently)
       end
 
       def render(*args)
@@ -80,20 +79,13 @@ module PagesCore
         template = page_template(@page)
         run_template_actions_for(template, @page)
         return if @already_rendered
-        render template: "pages/templates/#{template}"
-      end
 
-      # Cache pages by hand. This is dirty, but it works.
-      def cache_page_request
-        return if @page_cache_disabled || !PagesCore.config(:page_cache)
-        return if response.status&.to_i != 200
-        return unless @page && @locale
-
-        self.class.cache_page(response.body, request.path)
+        render template: "pages/templates/#{template}"
       end
 
       def find_page_by_path
         return unless params[:path]
+
         @page = PagePath.get(locale, params[:path]).try(&:page)
       end
 
@@ -103,7 +95,7 @@ module PagesCore
       end
 
       def render_published_page(page)
-        if page && page.published?
+        if page&.published?
           @page = page
           render_page
         else
@@ -113,11 +105,13 @@ module PagesCore
 
       def redirect_page(page)
         return false unless page.redirects?
+
         redirect_to(page.redirect_path(locale: locale))
       end
 
       def require_page
         return if @page
+
         render_error 404
       end
     end

data/app/controllers/pages_core/frontend_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Abstract controller for all frontend controllers.
 module PagesCore
   class FrontendController < ::ApplicationController
@@ -32,6 +34,7 @@ module PagesCore
       I18n.locale = locale_param
     rescue I18n::InvalidLocale
       raise if Rails.application.config.consider_all_requests_local
+
       render_error 404
     end
   end

data/app/controllers/pages_core/images_controller.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module PagesCore
   class ImagesController < ::ApplicationController
     include DynamicImage::Controller
 
-    caches_page :show, :uncropped, :original
+    static_cache :show, :uncropped, :original, permanent: true
 
     private
 

data/app/controllers/pages_core/sitemaps_controller.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module PagesCore
   class SitemapsController < ::ApplicationController
     include PagesCore::PagePathHelper
-    caches_page :show
+    static_cache :show
 
     def show
       @entries = formatted_entries
@@ -42,13 +44,13 @@ module PagesCore
 
     def pages
       ([Page.root.try(:localize, I18n.default_locale)] +
-        locales.flat_map do |locale|
-          Page.published.localized(locale)
-        end).compact.uniq
+       locales.flat_map do |locale|
+         Page.published.localized(locale).includes(:parent)
+       end).compact.uniq
     end
 
     def page_record_url(record)
-      if record == Page.root && record.locale == I18n.default_locale
+      if record == root_page && record.locale == I18n.default_locale
         root_url
       else
         page_url(record.locale, record)
@@ -68,5 +70,9 @@ module PagesCore
     def records
       pages
     end
+
+    def root_page
+      @root_page ||= Page.root
+    end
   end
 end

data/app/controllers/sessions_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SessionsController < ::ApplicationController
   def create
     user = find_user(params[:username], params[:password])

data/app/formatters/pages_core/html_formatter.rb

@@ -1,9 +1,7 @@
+# frozen_string_literal: true
+
 module PagesCore
   class HtmlFormatter
-    include ActionView::Helpers::AssetTagHelper
-    include PagesCore::ImagesHelper
-    include Rails.application.routes.url_helpers
-
     class << self
       def to_html(string, options = {})
         new(string, options).to_html
@@ -16,12 +14,9 @@ module PagesCore
     end
 
     def to_html
-      string = parse_images(parse_files(parse_attachments(@string)))
-      if @options[:shorten] && string.length > @options[:shorten]
-        string = string[0..@options[:shorten]] + "..."
-      end
+      string = shorten(parse_images(parse_files(parse_attachments(@string))))
       string += " #{@options[:append]}" if @options[:append]
-      RedCloth.new(string).to_html.html_safe
+      fix_markup(RedCloth.new(string).to_html).html_safe
     end
 
     private
@@ -34,31 +29,6 @@ module PagesCore
       /\[file:([\d,]+)\]/
     end
 
-    def image_expression
-      /\[image:(\d+)([^\]]*)?\]/
-    end
-
-    def embed_image(id, size:, class_name:, link:)
-      image = Image.find(id).localize(I18n.locale)
-      class_name = ["image", image_class_name(image), class_name].compact
-      image_tag = dynamic_image_tag(image,
-                                    size: size, crop: false, upscale: false)
-      content_tag(:figure,
-                  (link ? link_to(image_tag, link) : image_tag) +
-                  image_caption(image),
-                  class: class_name)
-    rescue ActiveRecord::RecordNotFound
-      nil
-    end
-
-    def embed_image_size(str)
-      if str =~ /size="(\d*x\d*)"/
-        Regexp.last_match(1)
-      else
-        "2000x2000"
-      end
-    end
-
     def find_attachment(id)
       Attachment.find(id).localize(I18n.locale)
     rescue ActiveRecord::RecordNotFound
@@ -85,6 +55,10 @@ module PagesCore
          .compact
     end
 
+    def fix_markup(str)
+      Nokogiri::HTML.fragment(str).to_html
+    end
+
     def parse_attachments(string)
       string.gsub(attachment_expression).each do |str|
         PagesCore.config.attachment_embedder.new(
@@ -101,40 +75,16 @@ module PagesCore
       end
     end
 
-    def parse_image(str)
-      id = str.match(image_expression)[1]
-      options = str.match(image_expression)[2]
-      class_name = (Regexp.last_match(1) if options =~ /class="([\s\-\w]+)"/)
-      link = (Regexp.last_match(1) if options =~ /link="([^"]+)"/)
-      embed_image(id,
-                  size: embed_image_size(options),
-                  class_name: class_name,
-                  link: link)
-    end
-
     def parse_images(string)
-      string.gsub(image_expression).each do |str|
-        parse_image(str)
-      end
+      PagesCore::ImageEmbedder.new(string).embed
     end
 
-    def image_caption(image)
-      return unless image.caption?
-      content_tag(:figcaption, image.caption)
-    end
-
-    def image_class_name(image)
-      if image.size.x == image.size.y
-        "square"
-      elsif image.size.x > image.size.y
-        "landscape"
-      else
-        "portrait"
+    def shorten(string)
+      unless @options[:shorten] && string.length > @options[:shorten]
+        return string
       end
-    end
 
-    def link_to(content, href)
-      content_tag(:a, content, href: href)
+      "#{string[0..@options[:shorten]]}..."
     end
   end
 end