pages_core 3.9.0 → 3.10.1

data/app/assets/stylesheets/pages/admin/controllers/pages.scss

@@ -9,6 +9,12 @@
   background-image: image-url("pages/admin/drag-icon.png");
 }
 
+td.drag-handle {
+  float: none;
+  background-repeat: no-repeat;
+  background-position: right 0px top 50%;
+}
+
 .page-list {
   float: left;
   list-style-type:  none;

data/app/controllers/admin/categories_controller.rb

@@ -19,7 +19,7 @@ module Admin
     def create
       @category = Category.create(category_params)
       if @category.valid?
-        flash[:notice] = "New category created"
+        flash[:notice] = t("pages_core.categories_controller.created")
         redirect_to admin_pages_url(@locale)
       else
         render action: :new
@@ -30,7 +30,7 @@ module Admin
 
     def update
       if @category.update(category_params)
-        flash[:notice] = "Category was updated"
+        flash[:notice] = t("pages_core.categories_controller.updated")
         redirect_to admin_pages_url(@locale)
       else
         render action: :edit
@@ -39,7 +39,7 @@ module Admin
 
     def destroy
       @category.destroy
-      flash[:notice] = "Category was deleted"
+      flash[:notice] = t("pages_core.categories_controller.deleted")
       redirect_to admin_pages_url(@locale)
     end
 

data/app/controllers/admin/invites_controller.rb

@@ -61,7 +61,7 @@ module Admin
       @invite = Invite.find_by(id: params[:id])
       return if @invite && secure_compare(@invite.token, params[:token])
 
-      flash[:notice] = "This invite is no longer valid."
+      flash[:notice] = t("pages_core.invite_expired")
       redirect_to(login_admin_users_url) && return
     end
 

data/app/controllers/admin/pages_controller.rb

@@ -52,7 +52,7 @@ module Admin
       if @page.update(page_params)
         @page.categories = param_categories
         respond_with_page(@page) do
-          flash[:notice] = "Your changes were saved"
+          flash[:notice] = t("pages_core.changes_saved")
           redirect_to edit_admin_page_url(@locale, @page)
         end
       else

data/app/controllers/admin/password_resets_controller.rb

@@ -9,13 +9,13 @@ module Admin
     layout "admin"
 
     def create
-      @user = find_user_by_email(params[:username])
+      @user = find_user_by_email(params[:email])
       if @user
         @password_reset_token = @user.password_reset_tokens.create
         deliver_password_reset(@user, @password_reset_token)
-        flash[:notice] = "An email with further instructions has been sent"
+        flash[:notice] = t("pages_core.password_reset.sent")
       else
-        flash[:notice] = "Couldn't find a user with that email address"
+        flash[:notice] = t("pages_core.password_reset.not_found")
       end
       redirect_to login_admin_users_url
     end
@@ -29,7 +29,7 @@ module Admin
       if user_params[:password].present? && @user.update(user_params)
         @password_reset_token.destroy
         authenticate!(@user)
-        flash[:notice] = "Your password has been changed"
+        flash[:notice] = t("pages_core.password_reset.changed")
         redirect_to login_admin_users_url
       else
         render action: :show
@@ -50,7 +50,7 @@ module Admin
     def find_user_by_email(email)
       return unless email
 
-      User.login_name(params[:username])
+      User.find_by_email(params[:email])
     end
 
     def user_params
@@ -70,7 +70,7 @@ module Admin
 
       return if valid_token?(@password_reset_token)
 
-      flash[:notice] = "Invalid password reset request"
+      flash[:notice] = t("pages_core.password_reset.invalid_request")
       redirect_to(login_admin_users_url) && return
     end
 
@@ -78,7 +78,7 @@ module Admin
       return unless @password_reset_token.expired?
 
       @password_reset_token.destroy
-      flash[:notice] = "Your password reset link has expired"
+      flash[:notice] = t("pages_core.password_reset.expired")
       redirect_to(login_admin_users_url)
     end
   end

data/app/controllers/admin/users_controller.rb

@@ -95,7 +95,7 @@ module Admin
     def require_no_users
       return unless User.any?
 
-      flash[:error] = "Account holder already exists"
+      flash[:error] = t("pages_core.account_holder_exists")
       redirect_to(admin_users_url)
     end
   end

data/app/controllers/concerns/pages_core/error_reporting.rb

@@ -11,6 +11,8 @@ module PagesCore
     protected
 
     def configure_sentry_context
+      return if Rails.env.test?
+
       if Object.const_defined?("Sentry")
         Sentry.set_user(current_user_context)
         Sentry.set_tags(locale: params[:locale] || I18n.default_locale.to_s)

data/app/controllers/concerns/pages_core/ranged_response.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module RangedResponse
+    extend ActiveSupport::Concern
+
+    def send_ranged_data(data, options = {})
+      response.header["Content-Length"] = data.length
+      response.header["Accept-Ranges"] = "bytes"
+
+      content_range_headers(data.length) if ranged_request?
+
+      send_data(ranged_data(data),
+                options.merge(status: ranged_request? ? 206 : 200))
+    end
+
+    private
+
+    def content_range(length)
+      Rack::Utils.byte_ranges(request.headers, length)[0]
+    end
+
+    def content_range_headers(size)
+      bytes = content_range(size)
+      response.header["Content-Length"] = bytes.end - bytes.begin + 1
+      response.header["Content-Range"] =
+        "bytes #{bytes.begin}-#{bytes.end}/#{size}"
+    end
+
+    def ranged_data(data)
+      return data unless ranged_request?
+
+      data[content_range(data.length)]
+    end
+
+    def ranged_request?
+      request.headers["HTTP_RANGE"]
+    end
+  end
+end

data/app/controllers/pages_core/attachments_controller.rb

@@ -2,6 +2,8 @@
 
 module PagesCore
   class AttachmentsController < ::ApplicationController
+    include PagesCore::RangedResponse
+
     before_action :verify_signed_params
     before_action :find_attachment, only: %i[show download]
 
@@ -26,10 +28,10 @@ module PagesCore
         return
       end
 
-      send_data(@attachment.data,
-                filename: @attachment.filename,
-                type: @attachment.content_type,
-                disposition: disposition)
+      send_ranged_data(@attachment.data,
+                       filename: @attachment.filename,
+                       type: @attachment.content_type,
+                       disposition: disposition)
     end
 
     def verify_signed_params

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

@@ -109,7 +109,7 @@ module PagesCore
       def redirect_page(page)
         return false unless page.redirects?
 
-        redirect_to(page.redirect_path(locale: locale))
+        redirect_to(page.redirect_path(locale: locale), allow_other_host: true)
       end
 
       def require_page

data/app/controllers/sessions_controller.rb

@@ -2,27 +2,26 @@
 
 class SessionsController < ::ApplicationController
   def create
-    user = find_user(params[:username], params[:password])
+    user = find_user(params[:email], params[:password])
     authenticate!(user) if user
 
     if logged_in?
       redirect_to admin_default_url
     else
-      flash[:notice] = "The provided email address and password combination " \
-                       "was not valid"
+      flash[:notice] = t("pages_core.invalid_login")
       redirect_to login_admin_users_url
     end
   end
 
   def destroy
-    flash[:notice] = "You have been logged out"
+    flash[:notice] = t("pages_core.logged_out")
     deauthenticate!
     redirect_to login_admin_users_url
   end
 
   protected
 
-  def find_user(username, password)
-    User.authenticate(username, password: password) if username && password
+  def find_user(email, password)
+    User.authenticate(email, password: password) if email && password
   end
 end

data/app/javascript/components/ImageEditor/Form.jsx

@@ -90,7 +90,7 @@ Form.propTypes = {
   caption: PropTypes.object,
   image: PropTypes.object,
   locale: PropTypes.string,
-  locales: PropTypes.array,
+  locales: PropTypes.object,
   setLocale: PropTypes.func,
   save: PropTypes.func,
   showCaption: PropTypes.bool,

data/app/javascript/components/ImageGrid.jsx

@@ -249,7 +249,7 @@ export default function ImageGrid(props) {
 ImageGrid.propTypes = {
   attribute: PropTypes.string,
   locale: PropTypes.string,
-  locales: PropTypes.array,
+  locales: PropTypes.object,
   records: PropTypes.array,
   enablePrimary: PropTypes.bool,
   primaryAttribute: PropTypes.string,

data/app/mailers/admin_mailer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AdminMailer < ApplicationMailer
-  default from: proc { "\"Pages\" <support@anyone.no>" }
+  default from: proc { "\"Pages\" <no-reply@anyone.no>" }
 
   def password_reset(user, url)
     @user = user

data/app/models/attachment.rb

@@ -67,7 +67,7 @@ class Attachment < ApplicationRecord
   # Includes a timestamp fingerprint in the URL param, so
   # that rendered images can be cached indefinitely.
   def to_param
-    [id, updated_at.utc.to_s(cache_timestamp_format)].join("-")
+    [id, updated_at.utc.to_fs(cache_timestamp_format)].join("-")
   end
 
   private

data/app/models/concerns/pages_core/page_model/pathable.rb

@@ -107,7 +107,7 @@ module PagesCore
         siblings.reject { |p| p == self }
                 .map { |p| p.localize(locale) }
                 .map(&:path_segment)
-                .reject(&:blank?)
+                .compact_blank
       end
     end
   end

data/app/models/invite.rb

@@ -8,8 +8,6 @@ class Invite < ApplicationRecord
 
   before_validation :ensure_token
 
-  validates :user_id, presence: true
-
   validates :email,
             presence: true,
             format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i },

data/app/models/page_category.rb

@@ -3,5 +3,4 @@
 class PageCategory < ApplicationRecord
   belongs_to :page
   belongs_to :category
-  validates :page_id, :category_id, presence: true
 end

data/app/models/page_exporter.rb

@@ -74,7 +74,7 @@ class PageExporter
 
   def page_file_name(page)
     [page.path_segment,
-     page.to_param[0..250]].reject(&:blank?).first
+     page.to_param[0..250]].compact_blank.first
   end
 
   def page_path_segment(page)
@@ -95,6 +95,6 @@ class PageExporter
 
   def write_file(path, data)
     FileUtils.mkdir_p(File.dirname(path))
-    File.open(path, "wb") { |fh| fh.write(data) }
+    File.binwrite(path, data)
   end
 end

data/app/models/password_reset_token.rb

@@ -5,8 +5,6 @@ class PasswordResetToken < ApplicationRecord
   before_create :ensure_token
   before_create :ensure_expiration
 
-  validates :user_id, presence: true
-
   scope :active,  -> { where("expires_at >= ?", Time.now.utc) }
   scope :expired, -> { where("expires_at < ?", Time.now.utc) }
 

data/app/models/tagging.rb

@@ -4,10 +4,8 @@ class Tagging < ApplicationRecord
   belongs_to :tag
   belongs_to :taggable, polymorphic: true, touch: true
 
-  validates :taggable_id, presence: true
   validates :taggable_type, presence: true
   validates :tag_id,
-            presence: true,
             uniqueness: { scope: %i[taggable_type taggable_id] }
 
   def self.tagged_class(taggable)

data/app/models/user.rb

@@ -23,8 +23,6 @@ class User < ApplicationRecord
 
   serialize :persistent_data
 
-  validates :username, presence: true, uniqueness: { case_sensitive: false }
-
   validates :name, presence: true
 
   validates :email,
@@ -37,7 +35,6 @@ class User < ApplicationRecord
 
   validate :confirm_password_must_match
 
-  before_validation :ensure_username
   before_validation :hash_password
   before_create :ensure_first_user_has_all_roles
 
@@ -47,18 +44,13 @@ class User < ApplicationRecord
 
   class << self
     def authenticate(email, password:)
-      user = User.login_name(email)
+      user = User.find_by_email(email)
       user if user.try { |u| u.authenticate!(password) }
     end
 
     def find_by_email(str)
       find_by("LOWER(email) = ?", str.to_s.downcase)
     end
-
-    # Finds a user by either username or email address.
-    def login_name(string)
-      find_by(username: string.to_s) || find_by_email(string)
-    end
   end
 
   def authenticate!(password)
@@ -102,10 +94,6 @@ class User < ApplicationRecord
     BCrypt::Password.create(password)
   end
 
-  def ensure_username
-    self.username ||= email
-  end
-
   def ensure_first_user_has_all_roles
     return if User.any?
 

data/app/views/admin/users/login.html.erb

@@ -19,7 +19,7 @@
     <%= form_tag session_path do %>
       <p>
         <label>Email address</label>
-        <%= text_field_tag :username, '' %>
+        <%= text_field_tag :email, '' %>
       </p>
       <p>
         <label>Password</label>
@@ -54,7 +54,7 @@
         and we'll send you a link where you can reset your password.
       </p>
       <p>
-        <%= text_field_tag :username, '' %>
+        <%= text_field_tag :email, '' %>
       </p>
       <p>
         <button type="submit">

data/app/views/admin/users/new_password.html.erb

@@ -13,7 +13,7 @@
 </div>
 <%= form_tag(reset_password_admin_users_path, method: :post) do %>
   <p>
-    <%= text_field_tag :username, '', size: 32 %>
+    <%= text_field_tag :email, '', size: 32 %>
     <%= submit_tag "Find" %>
   </p>
 </form>

data/app/views/admin_mailer/invite.text.erb

@@ -5,5 +5,3 @@ Welcome!
 Click the link below to create your account and get started.
 
 <%= @url %>
-
-If you have any further trouble, please don't hesitate in contacting us by sending us an email at support@anyone.no (or simply by replying to this message).

data/app/views/admin_mailer/password_reset.text.erb

@@ -9,5 +9,3 @@ If you want to reset your password, please click the following link:
 This will take you to a web page where you can set a new password of your choosing. The link will expire in 24 hours.
 
 If you do not want to change your password, please ignore this email.
-
-If you have any further trouble, please don't hesitate in contacting us by sending us an email at support@anyone.no (or simply by replying to this message).

data/app/views/feeds/pages.rss.builder

@@ -23,7 +23,7 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
           end
         end
         xml.guid page_url(@locale, item, only_path: false)
-        xml.pubDate item.published_at.to_formatted_s(:rfc822)
+        xml.pubDate item.published_at.to_fs(:rfc822)
         xml.tag!("dc:creator", item.author.name)
         if item.image
           xml.enclosure(

data/config/locales/en.yml

@@ -1,3 +1,4 @@
+---
 en:
   date:
     formats:
@@ -16,40 +17,65 @@ en:
       user:
         email: Email address
         image: Profile picture
+  pages_core:
+    account_holder_exists: Account holder already exists
+    categories_controller:
+      created: New category created
+      deleted: Category was deleted
+      updated: Category was updated
+    changes_saved: Your changes were saved
+    invalid_login: >
+      The provided email address and password combination was not valid
+    invite_expired: This invite is no longer valid.
+    logged_out: You have been logged out
+    password_reset:
+      changed: Your password has been changed
+      expired: Your password reset link has expired
+      invalid_request: Invalid password reset request
+      not_found: Couldn't find a user with that email address
+      sent: An email with further instructions has been sent
   templates:
     default:
       blocks:
         name:
           name: Name
-          description: "This is the name of the page, and it will also be the
-            name of the link to this page."
+          description: >
+            This is the name of the page, and it will also be the name
+            of the link to this page.
         body:
           name: Body
           description: ""
         headline:
           name: Headline
-          description: "Optional, use if the headline should differ from the
-            page name."
+          description: >
+            Optional, use if the headline should differ from the page
+            name.
         excerpt:
           name: Standfirst
           description: An introductory paragraph before the start of the body.
         boxout:
           name: Boxout
-          description: "Part of the page, usually background info or facts
-            related to the article."
+          description: >
+            Part of the page, usually background info or facts related
+            to the article.
         meta_title:
           name: Title
-          description: "Document title. Will fall back to the page name if
-            empty. Recommended length: Up to 56 characters."
+          description: >
+            Document title. Will fall back to the page name if empty.
+            Recommended length: Up to 56 characters.
         meta_description:
           name: Description
-          description: "Description for search engines. Will fall back to
-            Standfirst if empty. Recommended length: Up to 156 characters."
+          description: >
+            Description for search engines. Will fall back to
+            Standfirst if empty. Recommended length: Up to 156
+            characters.
         open_graph_title:
           name: Open Graph Title
-          description: "Page title for Facebook sharing. Will fall back to the
-            document title."
+          description: >
+            Page title for Facebook sharing. Will fall back to the
+            document title.
         open_graph_description:
           name: Open Graph Description
-          description: "Description for Facebook sharing. Will fall back to
-            Description or Standfirst if empty."
+          description: >
+            Description for Facebook sharing. Will fall back to
+            Description or Standfirst if empty.

data/db/migrate/20220615160300_remove_username.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveUsername < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :users, :username, :string
+  end
+end

data/lib/pages_core/static_cache/page_cache_handler.rb

@@ -35,7 +35,7 @@ module PagesCore
       private
 
       def cache_root
-        Rails.root.join("public")
+        Rails.public_path
       end
 
       def clear_directory(path)

data/lib/pages_core/static_cache.rb

@@ -14,13 +14,17 @@ module PagesCore
       private
 
       def default_handler
-        if ENV["VARNISH_URL"]
-          return PagesCore::StaticCache::VarnishHandler.new(ENV["VARNISH_URL"])
-        end
+        return varnish_handler if ENV["VARNISH_URL"]
 
         # PagesCore::StaticCache::NullHandler.new
         PagesCore::StaticCache::PageCacheHandler.new
       end
+
+      def varnish_handler
+        PagesCore::StaticCache::VarnishHandler.new(
+          ENV.fetch("VARNISH_URL", nil)
+        )
+      end
     end
   end
 end

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

@@ -8,48 +8,48 @@ module PagesCore
 
       def create_layout
         copy_file(
-          "layout.html.erb",
+          "application.html.erb",
           File.join("app/views/layouts/application.html.erb")
         )
       end
 
-      def create_application_scss
-        template(
-          "application.scss.erb",
-          File.join("app/assets/stylesheets/application.scss")
-        )
-      end
-
-      def remove_application_css
-        remove_file("app/assets/stylesheets/application.css")
+      def create_css_framework
+        ["application.sass.scss",
+         "config.scss",
+         "components/base.scss",
+         "framework/breakpoints.scss",
+         "framework/clearfix.scss",
+         "framework/grid.scss",
+         "framework/grid_overlay.scss",
+         "framework/fonts.scss",
+         "global/colors.scss",
+         "global/typography.scss",
+         "vendor/normalize.css"].each do |f|
+          template("stylesheets/#{f}", File.join("app/assets/stylesheets/#{f}"))
+        end
       end
 
-      def create_normalize_css
-        template(
-          "normalize.css.erb",
-          File.join("vendor/assets/stylesheets/normalize.css")
-        )
+      def create_js_framework
+        ["lib/ResponsiveEmbeds.js",
+         "lib/GridOverlay.js"].each do |f|
+          template("javascript/#{f}", File.join("app/javascript/#{f}"))
+        end
+
+        append_to_file "app/javascript/application.js" do
+          <<~JS
+            // Responsive embeds
+            import ResponsiveEmbeds from "./lib/ResponsiveEmbeds";
+            ResponsiveEmbeds.start();
+
+            // Grid overlay
+            import GridOverlay from "./lib/GridOverlay";
+            GridOverlay.start();
+          JS
+        end
       end
 
-      def create_breakpoints_css
-        template(
-          "breakpoints.scss.erb",
-          File.join("app/assets/stylesheets/mixins/breakpoints.scss")
-        )
-      end
-
-      def create_clearfix_css
-        template(
-          "clearfix.scss.erb",
-          File.join("app/assets/stylesheets/mixins/clearfix.scss")
-        )
-      end
-
-      def create_base_css
-        template(
-          "base.scss.erb",
-          File.join("app/assets/stylesheets/components/base.scss")
-        )
+      def remove_application_css
+        remove_file("app/assets/stylesheets/application.css")
       end
     end
   end