pages_core 3.7.0 → 3.8.3

data/db/migrate/20210210235200_create_search_documents.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class CreateSearchDocuments < ActiveRecord::Migration[6.0]
+  def change
+    create_table :search_documents do |t|
+      t.references :searchable, polymorphic: true, index: true, null: false
+      t.string :locale, null: false
+
+      t.text :name
+      t.text :description
+      t.text :content
+      t.text :tags
+      t.boolean :published, null: false, default: true
+      t.timestamps
+      t.datetime :record_updated_at, null: false
+
+      t.index %i[searchable_type searchable_id locale],
+              name: :search_documents_unique_index,
+              unique: true
+
+      # Tsvector index
+      t.string :tsv_config, null: false, default: "simple_unaccent"
+      t.tsvector :tsv
+      t.index :tsv, using: :gin
+
+      # Trigram index
+      t.index :name,
+              name: :search_documents_trgm_idx,
+              using: :gin,
+              opclass: { title: :gin_trgm_ops }
+    end
+
+    reversible do |dir|
+      dir.up do
+        ActiveRecord::Base.connection.execute <<-SQL.squish
+          DROP FUNCTION IF EXISTS tsvector_search_documents_trigger;
+          CREATE FUNCTION tsvector_search_documents_trigger()
+            RETURNS trigger AS $$
+            begin
+              new.tsv :=
+                setweight(to_tsvector(new.tsv_config::regconfig,
+                                      coalesce(new.name, '')), 'A') ||
+                setweight(to_tsvector(new.tsv_config::regconfig,
+                                      coalesce(new.description, '')), 'B') ||
+                setweight(to_tsvector(new.tsv_config::regconfig,
+                                      coalesce(new.content, '')), 'C') ||
+                setweight(to_tsvector(new.tsv_config::regconfig,
+                                      coalesce(new.tags, '')), 'B');
+              return new;
+            end
+            $$ LANGUAGE plpgsql;
+
+          DROP TRIGGER IF EXISTS tsvector_search_documents_update
+            ON search_documents;
+
+          CREATE TRIGGER tsvector_search_documents_update
+            BEFORE INSERT OR UPDATE
+            ON search_documents FOR EACH ROW EXECUTE PROCEDURE
+            tsvector_search_documents_trigger();
+        SQL
+
+        # Index all pages
+        PagesCore::SearchableDocument::Indexer.index_all!(Page)
+      end
+      dir.down do
+        ActiveRecord::Base.connection.execute <<-SQL.squish
+          DROP TRIGGER IF EXISTS tsvector_search_documents_update
+            ON search_documents;
+          DROP FUNCTION IF EXISTS tsvector_search_documents_trigger;
+        SQL
+      end
+    end
+  end
+end

data/lib/pages_core/engine.rb

@@ -27,7 +27,7 @@ module PagesCore
     # Enable asset precompilation
     initializer :assets do |_config|
       Rails.application.config.assets.precompile += %w[
-        pages/admin.js
+        pages_core/admin-dist.js
         pages/admin.css
         pages/errors.css
         pages/favicon.gif
@@ -38,10 +38,6 @@ module PagesCore
       ]
     end
 
-    initializer :enable_recursive_serialization do |_app|
-      ActiveModelSerializers.config.default_includes = "**"
-    end
-
     initializer :handle_exceptions do |app|
       app.config.exceptions_app = app.routes
       ActionDispatch::ExceptionWrapper.rescue_responses.merge!(

data/lib/pages_core/templates/block_configuration.rb

@@ -11,7 +11,7 @@ module PagesCore
       end
 
       def large?
-        small? ? false : true
+        !small?
       end
     end
   end

data/lib/pages_core/templates/configuration_handler.rb

@@ -49,7 +49,7 @@ module PagesCore
         value = false if value == :disabled
         stack = [stack] unless stack.is_a?(Enumerable)
         partial_hash = stack.reverse.inject(value) do |hash, key|
-          Hash[key => hash]
+          { key => hash }
         end
         @configuration = @configuration.deep_merge(partial_hash)
         value

data/lib/pages_core/version.rb

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

data/lib/pages_core.rb

@@ -17,12 +17,11 @@ require "action_mailer"
 
 # Gems
 require "actionpack/page_caching"
-require "active_model_serializers"
 require "acts_as_list"
+require "alba"
 require "bcrypt"
-require "coffee-script"
 require "country_select"
-require "delayed_job"
+require "delayed_job_active_record"
 require "dis"
 require "dynamic_image"
 require "healthcheck"
@@ -30,6 +29,7 @@ require "localizable_model"
 require "lograge"
 require "nokogiri"
 require "json"
+require "pg_search"
 require "progress_bar"
 require "rails_i18n"
 require "RedCloth"
@@ -42,8 +42,6 @@ require "will_paginate/view_helpers/action_view"
 
 # Assets
 require "font-awesome-rails"
-require "jquery-ui-rails"
-require "jquery/rails/engine"
 require "react-rails"
 
 # Pages

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

@@ -51,13 +51,6 @@ module PagesCore
           File.join("app/assets/stylesheets/components/base.scss")
         )
       end
-
-      def create_application_js
-        template(
-          "application.js.erb",
-          File.join("app/assets/javascripts/application.js")
-        )
-      end
     end
   end
 end

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

@@ -12,7 +12,7 @@ PagesCore::Templates.configure do |config|
         "Headline",
         size: :field,
         description: "The main statement, usually largest and boldest, " \
-          "describing the main story."
+                     "describing the main story."
       )
       block.excerpt(
         "Standfirst",
@@ -22,7 +22,7 @@ PagesCore::Templates.configure do |config|
       block.boxout(
         "Boxout",
         description: "Part of the page, usually background info or facts " \
-          "related to the article."
+                     "related to the article."
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.3
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -136,20 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !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: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
   requirement: !ruby/object:Gem::Requirement
@@ -165,19 +179,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: active_model_serializers
+  name: alba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.12
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.12
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -224,14 +238,14 @@ dependencies:
   name: dynamic_image
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -262,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg_search
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: progress_bar
   requirement: !ruby/object:Gem::Requirement
@@ -322,16 +350,16 @@ dependencies:
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -346,20 +374,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -374,20 +388,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -402,20 +402,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: uglifier
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -430,20 +416,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: react-rails
   requirement: !ruby/object:Gem::Requirement
@@ -537,6 +509,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/assets/builds/pages_core/admin-dist.js
 - app/assets/images/pages/admin/drag-icon.png
 - app/assets/images/pages/admin/icon.png
 - app/assets/images/pages/admin/image-editor-bg.png
@@ -549,38 +522,6 @@ files:
 - app/assets/images/pages/admin/warning-icon.gif
 - app/assets/images/pages/favicon.gif
 - app/assets/images/pages/feed-icon-14x14.png
-- app/assets/javascripts/pages/admin.jsx
-- app/assets/javascripts/pages/admin/components.jsx
-- app/assets/javascripts/pages/admin/components/attachment.jsx
-- app/assets/javascripts/pages/admin/components/attachment_editor.jsx
-- app/assets/javascripts/pages/admin/components/attachments.jsx
-- app/assets/javascripts/pages/admin/components/date_range_select.jsx
-- app/assets/javascripts/pages/admin/components/drag_uploader.jsx
-- app/assets/javascripts/pages/admin/components/editable_image.jsx
-- app/assets/javascripts/pages/admin/components/file_upload_button.jsx
-- app/assets/javascripts/pages/admin/components/focal_point.jsx
-- app/assets/javascripts/pages/admin/components/grid_image.jsx
-- app/assets/javascripts/pages/admin/components/image_editor.jsx
-- app/assets/javascripts/pages/admin/components/image_grid.jsx
-- app/assets/javascripts/pages/admin/components/image_uploader.jsx
-- app/assets/javascripts/pages/admin/components/modal.jsx
-- app/assets/javascripts/pages/admin/components/modal_store.jsx
-- app/assets/javascripts/pages/admin/components/page_dates.jsx
-- app/assets/javascripts/pages/admin/components/page_files.jsx
-- app/assets/javascripts/pages/admin/components/page_images.jsx
-- app/assets/javascripts/pages/admin/components/page_tree.jsx
-- app/assets/javascripts/pages/admin/components/page_tree_node.jsx
-- app/assets/javascripts/pages/admin/components/page_tree_store.jsx
-- app/assets/javascripts/pages/admin/components/rich_text_area.jsx
-- app/assets/javascripts/pages/admin/components/rich_text_toolbar.jsx
-- app/assets/javascripts/pages/admin/components/toast.jsx
-- app/assets/javascripts/pages/admin/components/toast_store.jsx
-- app/assets/javascripts/pages/admin/features/content_tabs.jsx
-- app/assets/javascripts/pages/admin/features/edit_page.jsx
-- app/assets/javascripts/pages/admin/features/rich_text.jsx
-- app/assets/javascripts/pages/admin/features/tag_editor.jsx
-- app/assets/javascripts/pages/admin/lib/tree.jsx
-- app/assets/javascripts/pages/login_form.jsx
 - app/assets/stylesheets/pages/admin.scss
 - app/assets/stylesheets/pages/admin/components/archive.scss
 - app/assets/stylesheets/pages/admin/components/attachments.scss
@@ -598,6 +539,7 @@ files:
 - app/assets/stylesheets/pages/admin/components/page_tree.scss
 - app/assets/stylesheets/pages/admin/components/pagination.scss
 - app/assets/stylesheets/pages/admin/components/sidebar.scss
+- app/assets/stylesheets/pages/admin/components/tabs.scss
 - app/assets/stylesheets/pages/admin/components/tag_editor.scss
 - app/assets/stylesheets/pages/admin/components/textarea.scss
 - app/assets/stylesheets/pages/admin/components/toast.scss
@@ -670,6 +612,60 @@ files:
 - app/helpers/pages_core/meta_tags_helper.rb
 - app/helpers/pages_core/open_graph_tags_helper.rb
 - app/helpers/pages_core/page_path_helper.rb
+- app/javascript/admin-dist.js
+- app/javascript/components.js
+- app/javascript/components/Attachments.jsx
+- app/javascript/components/Attachments/Attachment.jsx
+- app/javascript/components/Attachments/AttachmentEditor.jsx
+- app/javascript/components/Attachments/Placeholder.jsx
+- app/javascript/components/DateRangeSelect.jsx
+- app/javascript/components/EditableImage.jsx
+- app/javascript/components/FileUploadButton.jsx
+- app/javascript/components/ImageCropper.jsx
+- app/javascript/components/ImageCropper/FocalPoint.jsx
+- app/javascript/components/ImageCropper/Image.jsx
+- app/javascript/components/ImageCropper/Toolbar.jsx
+- app/javascript/components/ImageCropper/useCrop.js
+- app/javascript/components/ImageEditor.jsx
+- app/javascript/components/ImageEditor/Form.jsx
+- app/javascript/components/ImageGrid.jsx
+- app/javascript/components/ImageGrid/DragElement.jsx
+- app/javascript/components/ImageGrid/FilePlaceholder.jsx
+- app/javascript/components/ImageGrid/GridImage.jsx
+- app/javascript/components/ImageGrid/Placeholder.jsx
+- app/javascript/components/ImageUploader.jsx
+- app/javascript/components/Modal.jsx
+- app/javascript/components/PageDates.jsx
+- app/javascript/components/PageFiles.jsx
+- app/javascript/components/PageImages.jsx
+- app/javascript/components/PageTree.jsx
+- app/javascript/components/PageTreeDraggable.jsx
+- app/javascript/components/PageTreeNode.jsx
+- app/javascript/components/RichTextArea.jsx
+- app/javascript/components/RichTextToolbarButton.jsx
+- app/javascript/components/TagEditor.jsx
+- app/javascript/components/TagEditor/AddTagForm.jsx
+- app/javascript/components/TagEditor/Tag.jsx
+- app/javascript/components/Toast.jsx
+- app/javascript/components/drag.js
+- app/javascript/components/drag/draggedOrder.js
+- app/javascript/components/drag/useDragCollection.js
+- app/javascript/components/drag/useDragUploader.js
+- app/javascript/components/drag/useDraggable.js
+- app/javascript/controllers/EditPageController.js
+- app/javascript/controllers/LoginController.js
+- app/javascript/controllers/MainController.js
+- app/javascript/controllers/PageOptionsController.js
+- app/javascript/features/RichText.jsx
+- app/javascript/hooks.js
+- app/javascript/index.js
+- app/javascript/lib/Tree.js
+- 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
@@ -685,10 +681,12 @@ files:
 - app/models/concerns/pages_core/page_model/localizable.rb
 - app/models/concerns/pages_core/page_model/pathable.rb
 - app/models/concerns/pages_core/page_model/redirectable.rb
+- app/models/concerns/pages_core/page_model/searchable.rb
 - app/models/concerns/pages_core/page_model/sortable.rb
 - app/models/concerns/pages_core/page_model/status.rb
 - app/models/concerns/pages_core/page_model/templateable.rb
 - app/models/concerns/pages_core/page_model/tree.rb
+- app/models/concerns/pages_core/searchable_document.rb
 - app/models/concerns/pages_core/sweepable.rb
 - app/models/concerns/pages_core/taggable.rb
 - app/models/image.rb
@@ -703,6 +701,7 @@ files:
 - app/models/page_path.rb
 - app/models/password_reset_token.rb
 - app/models/role.rb
+- app/models/search_document.rb
 - app/models/tag.rb
 - app/models/tagging.rb
 - app/models/user.rb
@@ -712,15 +711,15 @@ files:
 - app/policies/page_policy.rb
 - app/policies/policy.rb
 - app/policies/user_policy.rb
-- app/serializers/admin/attachment_serializer.rb
-- app/serializers/admin/image_serializer.rb
-- app/serializers/admin/page_file_serializer.rb
-- app/serializers/admin/page_image_serializer.rb
-- app/serializers/page_export_serializer.rb
-- app/serializers/page_file_export_serializer.rb
-- app/serializers/page_image_export_serializer.rb
-- app/serializers/page_image_serializer.rb
-- app/serializers/page_serializer.rb
+- app/resources/admin/attachment_resource.rb
+- app/resources/admin/image_resource.rb
+- app/resources/admin/page_file_resource.rb
+- app/resources/admin/page_image_resource.rb
+- app/resources/export/attachment_resource.rb
+- app/resources/export/page_image_resource.rb
+- app/resources/export/page_resource.rb
+- app/resources/page_image_resource.rb
+- app/resources/page_resource.rb
 - app/services/pages_core/create_user_service.rb
 - app/services/pages_core/destroy_invite_service.rb
 - app/services/pages_core/invite_service.rb
@@ -732,6 +731,7 @@ files:
 - app/views/admin/pages/_edit_images.html.erb
 - app/views/admin/pages/_edit_metadata.html.erb
 - app/views/admin/pages/_edit_options.html.erb
+- app/views/admin/pages/_form.html.erb
 - app/views/admin/pages/_list_item.html.erb
 - app/views/admin/pages/deleted.html.erb
 - app/views/admin/pages/edit.html.erb
@@ -759,13 +759,17 @@ files:
 - app/views/errors/_generic_help.html.erb
 - app/views/feeds/pages.rss.builder
 - app/views/layouts/admin.html.erb
-- app/views/layouts/admin/_analytics.html.erb
 - app/views/layouts/admin/_header.html.erb
+- app/views/layouts/admin/_page_header.html.erb
 - app/views/layouts/errors.html.erb
+- app/views/pages_core/_google_analytics.html.erb
 - app/views/sitemaps/show.xml.builder
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20111219033112_create_pages_tables.rb
+- db/migrate/20180625154059_enable_search_extensions.rb
+- db/migrate/20210209151400_create_search_configurations.rb
+- db/migrate/20210210235200_create_search_documents.rb
 - lib/pages_core.rb
 - lib/pages_core/admin_menu_item.rb
 - lib/pages_core/archive_finder.rb
@@ -795,7 +799,6 @@ files:
 - lib/pages_core/templates/template_configuration.rb
 - lib/pages_core/version.rb
 - lib/rails/generators/pages_core/frontend/frontend_generator.rb
-- lib/rails/generators/pages_core/frontend/templates/application.js.erb
 - lib/rails/generators/pages_core/frontend/templates/application.scss.erb
 - lib/rails/generators/pages_core/frontend/templates/base.scss.erb
 - lib/rails/generators/pages_core/frontend/templates/breakpoints.scss.erb
@@ -826,8 +829,6 @@ files:
 - lib/tasks/pages/export.rake
 - lib/tasks/pages/page_paths.rake
 - template.rb
-- vendor/assets/javascripts/ReactCrop.min.js
-- vendor/assets/javascripts/reflux.min.js
 - vendor/assets/stylesheets/ReactCrop.css
 homepage: ''
 licenses: []
@@ -847,7 +848,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Pages Core