pages_core 3.8.1 → 3.9.1

data/app/controllers/admin/images_controller.rb

@@ -23,7 +23,7 @@ module Admin
     def update
       @image.update(image_params)
       respond_to do |format|
-        format.json { render action: :show }
+        format.json { render_image_json(@image) }
       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/javascript/components/Attachments/Attachment.jsx

@@ -2,8 +2,8 @@ import React from "react";
 import PropTypes from "prop-types";
 import copyToClipboard from "../../lib/copyToClipboard";
 import AttachmentEditor from "./AttachmentEditor";
-import ModalStore from "../ModalStore";
-import ToastStore from "../ToastStore";
+import ModalStore from "../../stores/ModalStore";
+import ToastStore from "../../stores/ToastStore";
 
 import { useDraggable } from "../drag";
 

data/app/javascript/components/Attachments/AttachmentEditor.jsx

@@ -1,8 +1,8 @@
 import React, { useState } from "react";
 import PropTypes from "prop-types";
 import copyToClipboard, { copySupported } from "../../lib/copyToClipboard";
-import ModalStore from "../ModalStore";
-import ToastStore from "../ToastStore";
+import ModalStore from "../../stores/ModalStore";
+import ToastStore from "../../stores/ToastStore";
 import { putJson } from "../../lib/request";
 
 export default function AttachmentEditor(props) {

data/app/javascript/components/EditableImage.jsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import PropTypes from "prop-types";
 import ImageEditor from "./ImageEditor";
-import ModalStore from "./ModalStore";
+import ModalStore from "../stores/ModalStore";
 
 export default function EditableImage(props) {
   const [image, setImage] = useState(props.image);

data/app/javascript/components/FileUploadButton.jsx

@@ -1,49 +1,42 @@
-import React from "react";
+import React, { useRef } from "react";
 import PropTypes from "prop-types";
 
-export default class FileUploadButton extends React.Component {
-  constructor(props) {
-    super(props);
-    this.inputRef = React.createRef();
-    this.handleChange = this.handleChange.bind(this);
-    this.triggerDialog = this.triggerDialog.bind(this);
-  }
+export default function FileUploadButton(props) {
+  const inputRef = useRef();
 
-  handleChange(evt) {
+  const handleChange = (evt) => {
     let fileList = evt.target.files;
     let files = [];
     for (var i = 0; i < fileList.length; i++) {
       files.push(fileList[i]);
     }
     if (files.length > 0) {
-      this.props.callback(files);
+      props.callback(files);
     }
-  }
+  };
 
-  render() {
-    return (
-      <div className="upload-button">
-        <span>
-          Drag and drop {this.props.type || "file"}
-          {this.props.multiple && "s"} here, or
-          {this.props.multiline && <br />}
-          <button onClick={this.triggerDialog}>
-            choose a file
-          </button>
-        </span>
-        <input type="file"
-               onChange={this.handleChange}
-               ref={this.inputRef}
-               style={{ display: "none" }}
-               multiple={this.props.multiple || false} />
-      </div>
-    );
-  }
-
-  triggerDialog(evt) {
+  const triggerDialog = (evt) => {
     evt.preventDefault();
-    this.inputRef.current.click();
-  }
+    inputRef.current.click();
+  };
+
+  return (
+    <div className="upload-button">
+      <span>
+        Drag and drop {props.type || "file"}
+        {props.multiple && "s"} here, or
+        {props.multiline && <br />}
+        <button onClick={triggerDialog}>
+          choose a file
+        </button>
+      </span>
+      <input type="file"
+             onChange={handleChange}
+             ref={inputRef}
+             style={{ display: "none" }}
+             multiple={props.multiple || false} />
+    </div>
+  );
 }
 
 FileUploadButton.propTypes = {

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

@@ -1,7 +1,7 @@
 import React from "react";
 import PropTypes from "prop-types";
-import ModalStore from "../ModalStore";
-import ToastStore from "../ToastStore";
+import ModalStore from "../../stores/ModalStore";
+import ToastStore from "../../stores/ToastStore";
 import copyToClipboard, { copySupported } from "../../lib/copyToClipboard";
 
 export default function Form(props) {

data/app/javascript/components/ImageEditor.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import PropTypes from "prop-types";
-import ModalStore from "./ModalStore";
+import ModalStore from "../stores/ModalStore";
 import { putJson } from "../lib/request";
 
 import ImageCropper, { useCrop, cropParams } from "./ImageCropper";

data/app/javascript/components/ImageGrid/GridImage.jsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import copyToClipboard from "../../lib/copyToClipboard";
 import EditableImage from "../EditableImage";
-import ToastStore from "../ToastStore";
+import ToastStore from "../../stores/ToastStore";
 import Placeholder from "./Placeholder";
 
 import { useDraggable } from "../drag";

data/app/javascript/components/ImageGrid.jsx

@@ -4,7 +4,7 @@ import FileUploadButton from "./FileUploadButton";
 import DragElement from "./ImageGrid/DragElement";
 import FilePlaceholder from "./ImageGrid/FilePlaceholder";
 import GridImage from "./ImageGrid/GridImage";
-import ToastStore from "./ToastStore";
+import ToastStore from "../stores/ToastStore";
 import { post } from "../lib/request";
 
 import { createDraggable,

data/app/javascript/components/ImageUploader.jsx

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import PropTypes from "prop-types";
 import EditableImage from "./EditableImage";
 import FileUploadButton from "./FileUploadButton";
-import ToastStore from "./ToastStore";
+import ToastStore from "../stores/ToastStore";
 import { post } from "../lib/request";
 
 function getFiles(dt) {

data/app/javascript/components/Modal.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import ModalStore from "./ModalStore";
+import ModalStore from "../stores/ModalStore";
 
 export default class Modal extends React.Component {
   constructor(props) {

data/app/javascript/components/Toast.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
-import ToastStore from "./ToastStore";
+import ToastStore from "../stores/ToastStore";
 
 export default class Toast extends React.Component {
   constructor(props) {

data/app/javascript/components.js

@@ -1,6 +1,7 @@
 export { default as Attachments } from "./components/Attachments";
 export { default as DateRangeSelect } from "./components/DateRangeSelect";
 export { default as EditableImage } from "./components/EditableImage";
+export { default as FileUploadButton } from "./components/FileUploadButton";
 export { default as ImageCropper } from "./components/ImageCropper";
 export { default as ImageGrid } from "./components/ImageGrid";
 export { default as ImageUploader } from "./components/ImageUploader";

data/app/javascript/index.js

@@ -31,6 +31,7 @@ export default function startPages () {
 
 export * from "./components";
 export * from "./hooks";
+export * from "./stores";
 
 export * from "./lib/request.js";
 export { default as copyToClipboard,

data/app/javascript/stores.js

@@ -0,0 +1,2 @@
+export { default as ModalStore } from "./stores/ModalStore";
+export { default as ToastStore } from "./stores/ToastStore";

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/role.rb

@@ -7,17 +7,15 @@ class Role < ApplicationRecord
             uniqueness: { scope: :user_id },
             inclusion: { in: proc { Role.roles.map(&:name) } }
 
+  RoleDefinition = Struct.new(:name, :description, :default)
+
   class << self
     def define(name, description, default: false)
       if roles.map(&:name).include?(name.to_s)
         raise ArgumentError, "Tried to define role :#{role}, " \
                              "but a role by that name already exists"
       else
-        roles << OpenStruct.new(
-          name: name.to_s,
-          description: description,
-          default: default
-        )
+        roles << RoleDefinition.new(name.to_s, description, default)
       end
     end
 
@@ -39,21 +37,13 @@ class Role < ApplicationRecord
       return [] unless File.exist?(config_file)
 
       YAML.load_file(config_file).map do |key, opts|
-        OpenStruct.new(name: key.to_s,
-                       description: opts["description"],
-                       default: opts["default"])
+        RoleDefinition.new(key.to_s, opts["description"], opts["default"])
       end
     end
 
     def default_roles
-      [
-        OpenStruct.new(
-          name: "users", description: "Can manage users", default: false
-        ),
-        OpenStruct.new(
-          name: "pages", description: "Can manage pages", default: true
-        )
-      ]
+      [RoleDefinition.new("users", "Can manage users", false),
+       RoleDefinition.new("pages", "Can manage pages", true)]
     end
   end
 

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/lib/pages_core/cache_sweeper.rb

@@ -16,15 +16,6 @@ module PagesCore
         disable(&block)
         PagesCore::StaticCache.handler.sweep!
       end
-
-      def config
-        ActiveSupport::Deprecation.warn(
-          "PagesCore::CacheSweeper.config is no longer used."
-        )
-        configuration = OpenStruct.new(patterns: [])
-        yield configuration if block_given?
-        configuration
-      end
     end
 
     self.enabled ||= true

data/lib/pages_core/configuration/base.rb

@@ -5,12 +5,14 @@ module PagesCore
     class Base
       class InvalidConfigurationKey < StandardError; end
 
+      SettingStruct = Struct.new(:type, :default)
+
       def self.settings
         @settings ||= {}
       end
 
       def self.setting(key, type, default = nil)
-        settings[key] = OpenStruct.new(type: type, default: default)
+        settings[key] = SettingStruct.new(type, default)
 
         define_method key do |*args|
           args.any? ? set(key, *args) : get(key)

data/lib/pages_core/pub_sub.rb

@@ -4,9 +4,8 @@ module PagesCore
   module PubSub
     class << self
       def publish(name, payload = {})
-        payload_struct = OpenStruct.new(payload)
         subscribers.select { |s| s.name == name }
-                   .each { |s| s.call(payload_struct) }
+                   .each { |s| s.call(payload) }
       end
 
       def subscribe(name, &block)

data/lib/pages_core/version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 module PagesCore
-  VERSION = "3.8.1" unless PagesCore.const_defined?("VERSION")
+  unless PagesCore.const_defined?("VERSION")
+    VERSION = File.read(File.expand_path("../../VERSION", __dir__)).strip
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.9.1
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.1
+- !ruby/object:Gem::Dependency
+  name: semantic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +140,16 @@ dependencies:
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -495,6 +509,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- VERSION
 - app/assets/builds/pages_core/admin-dist.js
 - app/assets/images/pages/admin/drag-icon.png
 - app/assets/images/pages/admin/icon.png
@@ -621,7 +636,6 @@ files:
 - app/javascript/components/ImageGrid/Placeholder.jsx
 - app/javascript/components/ImageUploader.jsx
 - app/javascript/components/Modal.jsx
-- app/javascript/components/ModalStore.jsx
 - app/javascript/components/PageDates.jsx
 - app/javascript/components/PageFiles.jsx
 - app/javascript/components/PageImages.jsx
@@ -634,7 +648,6 @@ files:
 - app/javascript/components/TagEditor/AddTagForm.jsx
 - app/javascript/components/TagEditor/Tag.jsx
 - app/javascript/components/Toast.jsx
-- app/javascript/components/ToastStore.jsx
 - app/javascript/components/drag.js
 - app/javascript/components/drag/draggedOrder.js
 - app/javascript/components/drag/useDragCollection.js
@@ -651,6 +664,9 @@ files:
 - app/javascript/lib/copyToClipboard.js
 - app/javascript/lib/readyHandler.js
 - app/javascript/lib/request.js
+- app/javascript/stores.js
+- app/javascript/stores/ModalStore.jsx
+- app/javascript/stores/ToastStore.jsx
 - app/jobs/pages_core/autopublish_job.rb
 - app/jobs/pages_core/sweep_cache_job.rb
 - app/mailers/admin_mailer.rb
@@ -817,7 +833,8 @@ files:
 - vendor/assets/stylesheets/ReactCrop.css
 homepage: ''
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -833,7 +850,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Pages Core