pages_core 3.6.0 → 3.8.0

data/app/{assets/javascripts/pages/admin/lib/tree.jsx → javascript/lib/Tree.js}

@@ -1,55 +1,56 @@
 /*
-   Based on
-
-   js-tree by Wang Zuo
-   https://github.com/wangzuo/js-tree
-
-   react-ui-tree
-   https://github.com/pqx/react-ui-tree
-
-   The MIT License (MIT)
-
-   Copyright (c) 2015 Wang Zuo
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-
-   Copyright (c) 2015 pqx Limited
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
- */
-class Tree {
+  Based on
+
+  js-tree by Wang Zuo
+  https://github.com/wangzuo/js-tree
+
+  react-ui-tree
+  https://github.com/pqx/react-ui-tree
+
+  The MIT License (MIT)
+
+  Copyright (c) 2015 Wang Zuo
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+
+  Copyright (c) 2015 pqx Limited
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+export default class Tree {
   constructor(obj) {
     this.cnt = 1;
     this.obj = obj || { children: [] };
@@ -63,7 +64,7 @@ class Tree {
     var self = this;
 
     var index = { id: startId, node: obj };
-    indexes[this.cnt + ''] = index;
+    indexes[this.cnt + ""] = index;
     this.cnt++;
 
     if (obj.children && obj.children.length) {
@@ -72,7 +73,7 @@ class Tree {
 
     function walk(objs, parent) {
       var children = [];
-      objs.forEach(function(obj, i) {
+      objs.forEach(function(obj) {
         var index = {};
         index.id = self.cnt;
         index.node = obj;
@@ -81,7 +82,7 @@ class Tree {
           index.parent = parent.id;
         }
 
-        indexes[self.cnt + ''] = index;
+        indexes[self.cnt + ""] = index;
         children.push(self.cnt);
         self.cnt++;
 
@@ -92,7 +93,7 @@ class Tree {
       parent.children = children;
 
       children.forEach(function(id, i) {
-        var index = indexes[id + ''];
+        var index = indexes[id + ""];
         if (i > 0) {
           index.prev = children[i - 1];
         }
@@ -106,7 +107,7 @@ class Tree {
   }
 
   getIndex(id) {
-    var index = this.indexes[id + ''];
+    var index = this.indexes[id + ""];
     if (index) {
       return index;
     }
@@ -117,7 +118,7 @@ class Tree {
     del(index);
 
     function del(index) {
-      delete self.indexes[index.id + ''];
+      delete self.indexes[index.id + ""];
       if (index.children && index.children.length) {
         index.children.forEach(function(child) {
           del(self.getIndex(child));
@@ -259,13 +260,13 @@ class Tree {
     var obj = this.remove(fromId);
     var index = null;
 
-    if (placement === 'before') {
+    if (placement === "before") {
       index = this.insertBefore(obj, toId);
-    } else if (placement === 'after') {
+    } else if (placement === "after") {
       index = this.insertAfter(obj, toId);
-    } else if(placement === 'prepend') {
+    } else if(placement === "prepend") {
       index = this.prepend(obj, toId);
-    } else if(placement === 'append') {
+    } else if(placement === "append") {
       index = this.append(obj, toId);
     }
 
@@ -276,7 +277,7 @@ class Tree {
 
   getParent(id) {
     var indexes = this.indexes;
-    if (indexes.hasOwnProperty(id)) {
+    if (Object.prototype.hasOwnProperty.call(indexes, id)) {
       return this.getIndex(indexes[id].parent);
     }
   }
@@ -284,7 +285,7 @@ class Tree {
   getNodeByTop(top) {
     var indexes = this.indexes;
     for(var id in indexes) {
-      if (indexes.hasOwnProperty(id)) {
+      if (Object.prototype.hasOwnProperty.call(indexes, id)) {
         if(indexes[id].top === top) {
           return indexes[id];
         }

data/app/javascript/lib/copyToClipboard.js

@@ -0,0 +1,13 @@
+export function copySupported () {
+  return document.queryCommandSupported &&
+    document.queryCommandSupported("copy");
+}
+
+export default function copyToClipboard (str) {
+  const el = document.createElement("textarea");
+  el.value = str;
+  document.body.appendChild(el);
+  el.select();
+  document.execCommand("copy");
+  document.body.removeChild(el);
+}

data/app/javascript/lib/readyHandler.js

@@ -0,0 +1,22 @@
+let readyHandlers = [];
+
+const handleState = () => {
+  if (["interactive", "complete"].indexOf(document.readyState) > -1) {
+    while(readyHandlers.length > 0) {
+      (readyHandlers.shift())();
+    }
+  }
+};
+
+class ReadyHandler {
+  constructor () {
+    document.onreadystatechange = handleState;
+  }
+
+  ready (handler) {
+    readyHandlers.push(handler);
+    handleState();
+  }
+}
+
+export default new ReadyHandler();

data/app/javascript/lib/request.js

@@ -0,0 +1,36 @@
+export function csrfToken() {
+  return document.querySelector("[name=csrf-token]").content;
+}
+
+function jsonFetchOptions() {
+  return({ method: "POST",
+           headers: { "Content-Type": "application/json; charset=utf-8",
+                      "X-CSRF-Token": csrfToken() } });
+}
+
+export async function postJson(url, data) {
+  const options = { ...jsonFetchOptions(), method: "POST" };
+  if (data) {
+    options.body = JSON.stringify(data);
+  }
+  const response = await fetch(url, options);
+  return response.json();
+}
+
+export async function putJson(url, data) {
+  const options = { ...jsonFetchOptions(), method: "PUT" };
+  if (data) {
+    options.body = JSON.stringify(data);
+  }
+  const response = await fetch(url, options);
+  return response.json();
+}
+
+export async function post(url, data) {
+  const response = await fetch(url, {
+    method: "POST",
+    body: data,
+    headers: { "X-CSRF-Token": csrfToken() }
+  });
+  return response.json();
+}

data/app/jobs/pages_core/autopublish_job.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module PagesCore
-  class AutopublishJob < ActiveJob::Base
+  class AutopublishJob < ApplicationJob
     queue_as :pages_core
 
     def perform

data/app/jobs/pages_core/sweep_cache_job.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module PagesCore
-  class SweepCacheJob < ActiveJob::Base
+  class SweepCacheJob < ApplicationJob
     queue_as :pages_core
 
     def perform
-      PagesCore::CacheSweeper.sweep!
+      PagesCore::StaticCache.handler.sweep_now!
     end
   end
 end

data/app/mailers/admin_mailer.rb

@@ -1,17 +1,7 @@
-class AdminMailer < ActionMailer::Base
-  default from: proc { "\"Pages\" <support@anyone.no>" }
+# frozen_string_literal: true
 
-  def error_report(error_report, from, description)
-    @error_report = error_report
-    @from = from
-    @description = description
-    short_message = @error_report[:message].gsub(/[\s\n]+/, " ")[0..80]
-    mail(
-      to:      "system+error@anyone.no",
-      from:    "\"Error reports\" <system+error@anyone.no>",
-      subject: "[#{PagesCore.config(:site_name)}] Error: #{short_message}"
-    )
-  end
+class AdminMailer < ApplicationMailer
+  default from: proc { "\"Pages\" <support@anyone.no>" }
 
   def password_reset(user, url)
     @user = user
@@ -26,7 +16,7 @@ class AdminMailer < ActionMailer::Base
     @invite = invite
     @url = url
     mail(
-      to:      @invite.email,
+      to: @invite.email,
       subject: "#{PagesCore.config(:site_name)} has invited you to Pages"
     )
   end

data/app/models/attachment.rb

@@ -1,4 +1,6 @@
-class Attachment < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Attachment < ApplicationRecord
   include Dis::Model
   include PagesCore::Sweepable
 
@@ -25,12 +27,12 @@ class Attachment < ActiveRecord::Base
 
     def formats
       {
-        "audio/mpeg"      => :mp3,
-        "image/gif"       => :gif,
-        "image/jpeg"      => :jpg,
-        "image/jpg"       => :jpg,
-        "image/pjpeg"     => :jpg,
-        "image/png"       => :png,
+        "audio/mpeg" => :mp3,
+        "image/gif" => :gif,
+        "image/jpeg" => :jpg,
+        "image/jpg" => :jpg,
+        "image/pjpeg" => :jpg,
+        "image/png" => :png,
         "application/pdf" => :pdf
       }
     end
@@ -52,7 +54,7 @@ class Attachment < ActiveRecord::Base
 
   def filename_extension
     if filename_extension?
-      filename.match(/\.([^\.]+)$/)[1]
+      filename.match(/\.([^.]+)$/)[1]
     else
       ""
     end

data/app/models/autopublisher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Autopublisher
   class << self
     def run!(_options = {})
@@ -13,6 +15,7 @@ class Autopublisher
 
     def queue!
       return unless queued_pages.any?
+
       PagesCore::AutopublishJob
         .set(wait_until: queued_pages.first.published_at)
         .perform_later

data/app/models/category.rb

@@ -1,4 +1,6 @@
-class Category < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Category < ApplicationRecord
   has_many :page_categories, dependent: :destroy
   has_many :pages, through: :page_categories
   validates :name, presence: true

data/app/models/concerns/pages_core/has_roles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module HasRoles
     extend ActiveSupport::Concern

data/app/models/concerns/pages_core/humanizable_param.rb

@@ -1,17 +1,20 @@
+# frozen_string_literal: true
+
 module PagesCore
   module HumanizableParam
     include ActiveSupport::Inflector
     extend ActiveSupport::Concern
 
     def humanized_param(slug)
-      return id.to_s unless slug && slug.present?
+      return id.to_s unless slug&.present?
+
       "#{id}-" + transliterate(slug)
                  .downcase
-                 .gsub(/[\[\{]/, "(")
-                 .gsub(/[\]\}]/, ")")
-                 .gsub(/[^[[:alnum:]]()\-]+/, "-")
-                 .gsub(/[\-]{2,}/, "-")
-                 .gsub(/(^\-|\-$)/, "")
+                 .gsub(/[\[{]/, "(")
+                 .gsub(/}\]/, ")")
+                 .gsub(/[^[[:alnum:]]()-]+/, "-")
+                 .gsub(/-{2,}/, "-")
+                 .gsub(/(^-|-$)/, "")
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     module Attachments

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     module Autopublishable

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     module DatedPage
@@ -14,25 +16,21 @@ module PagesCore
       module ClassMethods
       end
 
-      # Finds the page's next sibling by date. Returns nil if there isn't one.
+      # Finds the page's next sibling by date. Returns nil if there
+      # isn't one.
       def next_sibling_by_date
-        siblings = siblings_by_date
-        return unless siblings.any?
-
-        siblings[(siblings.to_a.index(self) + 1)...siblings.length]
-          .try(&:first)
+        siblings_by_date.where("starts_at >= ?", starts_at)&.first
       end
 
-      # Finds the page's previous sibling by date. Returns nil if there isn't one.
+      # Finds the page's previous sibling by date. Returns nil if
+      # there isn't one.
       def previous_sibling_by_date
-        siblings = siblings_by_date
-        return unless siblings.any?
-
-        siblings[0...siblings.to_a.index(self)].try(&:last)
+        siblings_by_date.where("starts_at < ?", starts_at)&.last
       end
 
       def upcoming?
         return false unless ends_at?
+
         ends_at > Time.zone.now
       end
 
@@ -53,6 +51,8 @@ module PagesCore
 
       def siblings_by_date
         siblings.reorder("starts_at ASC, pages.id DESC")
+                .where
+                .not(id: id)
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     module Images
@@ -6,7 +8,9 @@ module PagesCore
       included do
         belongs_to_image :image, optional: true
         belongs_to_image :meta_image, class_name: "Image", optional: true
-        has_many :page_images, -> { order("position") }, inverse_of: :page
+        has_many :page_images, -> { order("position") },
+                 inverse_of: :page,
+                 dependent: :destroy
         has_many(
           :images,
           -> { where(page_images: { primary: false }).order("position") },
@@ -16,7 +20,9 @@ module PagesCore
         after_save :update_primary_image
 
         accepts_nested_attributes_for :page_images,
-                                      reject_if: proc { |a| a["image_id"].blank? },
+                                      reject_if: proc { |a|
+                                                   a["image_id"].blank?
+                                                 },
                                       allow_destroy: true
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     module Localizable

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     module Pathable
@@ -6,43 +8,32 @@ module PagesCore
       included do
         has_many :page_paths, dependent: :destroy
 
-        validates :path_segment, format: { with: /\A[[[:alnum:]]\-_]*\z/ }
+        validates :path_segment, format: { with: /\A[[[:alnum:]]-_]*\z/ }
         validate :path_segment_cannot_be_routable
         before_validation :ensure_no_path_segment_on_deletion
         after_save :ensure_path_segment
         after_save :associate_page_path
       end
 
-      def full_path(last_segment = nil)
-        last_segment ||= path_segment
-        return nil unless full_path?(last_segment)
-        if parent
-          [parent.full_path, last_segment].join("/")
-        else
-          last_segment
-        end
+      def full_path
+        generate_full_path
       end
 
-      def full_path?(last_segment = nil)
-        last_segment ||= path_segment
-        if parent
-          parent.full_path? && last_segment.present?
-        else
-          last_segment.present?
-        end
+      def full_path?
+        path_segment.present? && pathable?
       end
 
       def ensure_path_segment
         return if deleted? || path_segment? || !name?
-        if path_collision?(generated_path_segment)
-          update path_segment: "#{generated_path_segment}-#{id}"
-        else
-          update path_segment: generated_path_segment
-        end
+
+        segment = generated_path_segment
+        segment = "#{segment}-#{id}" if path_collision?(segment)
+        update(path_segment: segment)
       end
 
       def pathable?
         return true unless parent
+
         parent.full_path?
       end
 
@@ -50,18 +41,27 @@ module PagesCore
 
       def associate_page_path
         return if deleted? || !full_path?
+
         PagePath.build(self)
       end
 
       def ensure_no_path_segment_on_deletion
         return unless deleted?
+
         self.path_segment = nil
       end
 
+      def generate_full_path(last_segment = nil)
+        last_segment ||= path_segment
+        return nil unless last_segment.present? && pathable?
+
+        [parent&.full_path, last_segment].compact.join("/")
+      end
+
       def generated_path_segment
-        transliterated_name.gsub(/[^[[:alnum:]]\-_]+/, "-")
-                           .gsub(/[\-]{2,}/, "-")
-                           .gsub(/(^\-|\-$)/, "")
+        transliterated_name.gsub(/[^[[:alnum:]]-_]+/, "-")
+                           .gsub(/-{2,}/, "-")
+                           .gsub(/(^-|-$)/, "")
                            .mb_chars
                            .downcase
       end
@@ -81,12 +81,13 @@ module PagesCore
 
       def path_collision?(path_segment)
         sibling_path_segments.include?(path_segment) ||
-          page_path_matches_routes?(full_path(path_segment))
+          page_path_matches_routes?(generate_full_path(path_segment))
       end
 
       def path_segment_cannot_be_routable
         return unless full_path?
         return unless page_path_matches_routes?(full_path)
+
         errors.add(:path_segment, "can't match an existing URL")
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PageModel
     class InvalidRedirectUrl < StandardError; end
@@ -8,7 +10,6 @@ module PagesCore
       included do
         validates(:redirect_to,
                   format: { with: %r{\A(/|https?://).+\z},
-                            allow_nil: true,
                             allow_blank: true })
       end
 
@@ -24,6 +25,7 @@ module PagesCore
             unless value.is_a?(String) || value.is_a?(Symbol)
               raise InvalidRedirectUrl, "must be a string or a symbol"
             end
+
             path.gsub!("/:#{key}", "/#{value}")
           end
         end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module PageModel
+    module Searchable
+      extend ActiveSupport::Concern
+
+      def search_document_attributes
+        super.merge(
+          published: published?,
+          name: name,
+          description: try(&:meta_description?) ? meta_description : excerpt,
+          # content: "",
+          tags: tag_names.join(" ")
+        )
+      end
+    end
+  end
+end