pages_core 3.7.0 → 3.8.3

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

@@ -4,25 +4,27 @@ module PagesCore
   module Taggable
     extend ActiveSupport::Concern
 
+    attr_accessor :new_tags
+
     included do
       has_many :taggings,
                as: :taggable,
                dependent: :destroy,
                inverse_of: :taggable
       has_many :tags, through: :taggings
+      after_save :update_taggings
     end
 
     module ClassMethods
       def tagged_with(*tags)
-        all
-          .includes(:tags)
-          .where(tags: { name: Tag.parse(tags) })
-          .references(:tags)
+        all.includes(:tags)
+           .where(tags: { name: Tag.parse(tags) })
+           .references(:tags)
       end
     end
 
     def serialized_tags
-      tags.order("name ASC").map(&:name).to_json
+      tag_names.to_json
     end
 
     def serialized_tags=(json)
@@ -30,12 +32,11 @@ module PagesCore
     end
 
     def tag_with(*list)
-      Tag.transaction do
-        taggings.destroy_all
-        Tag.parse(list).each do |name|
-          Tag.find_or_create_by(name: name).on(self)
-        end
-      end
+      @new_tags = Tag.parse(list)
+    end
+
+    def tag_with!(*list)
+      update(tag_list: list)
     end
 
     def tag_list=(tag_list)
@@ -47,7 +48,21 @@ module PagesCore
     end
 
     def tag_names
-      tags.map(&:name).sort
+      @new_tags || tags.by_name.map(&:name)
+    end
+
+    private
+
+    def update_taggings
+      return unless new_tags
+
+      Tag.transaction do
+        taggings.includes(:tag).where.not(tag: { name: new_tags }).destroy_all
+        new_tags.map { |n| Tag.find_or_create_by(name: n) }
+                .each { |t| taggings.create(tag: t) }
+      end
+
+      @new_tags = nil
     end
   end
 end

data/app/models/page.rb

@@ -2,6 +2,7 @@
 
 class Page < ApplicationRecord
   include PagesCore::HumanizableParam
+  include PagesCore::SearchableDocument
   include PagesCore::Sweepable
   include PagesCore::Taggable
 
@@ -12,6 +13,7 @@ class Page < ApplicationRecord
   include PagesCore::PageModel::Localizable
   include PagesCore::PageModel::Pathable
   include PagesCore::PageModel::Redirectable
+  include PagesCore::PageModel::Searchable
   include PagesCore::PageModel::Sortable
   include PagesCore::PageModel::Status
   include PagesCore::PageModel::Tree

data/app/models/page_exporter.rb

@@ -29,7 +29,7 @@ class PageExporter
   end
 
   def export_files(page)
-    path = page_path(page).join("files")
+    path = page_path(page).join("attachments")
     page.attachments.each do |file|
       write_file(
         path.join([file.content_hash, file.filename].join("-")),
@@ -57,7 +57,7 @@ class PageExporter
   end
 
   def export_page_json(path, page)
-    json = PageExportSerializer.new(page).to_json
+    json = Export::PageResource.new(page).serialize
     write_file(path.join("page.#{page.locale}.json"), json)
     write_file(path.join("page.#{page.locale}.yml"), JSON.parse(json).to_yaml)
   end

data/app/models/page_image.rb

@@ -6,8 +6,6 @@ class PageImage < ApplicationRecord
   belongs_to :page
   belongs_to_image :image
 
-  validates :page_id, presence: true
-
   accepts_nested_attributes_for :image
   validates_associated :image
 

data/app/models/role.rb

@@ -11,7 +11,7 @@ class Role < ApplicationRecord
     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"
+                             "but a role by that name already exists"
       else
         roles << OpenStruct.new(
           name: name.to_s,

data/app/models/search_document.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+class SearchDocument < ApplicationRecord
+  include PgSearch::Model
+
+  belongs_to :searchable, polymorphic: true
+
+  validates :locale, presence: true
+
+  before_validation :configure_dictionary,
+                    :inherit_updated_at
+
+  scope :published, -> { where(published: true) }
+
+  pg_search_scope :full_text_search_scope, lambda { |query, dictionary|
+    { against: %i[name description content tags],
+      using: { tsearch: { prefix: true,
+                          dictionary: dictionary,
+                          tsvector_column: "tsv" },
+               trigram: { only: %i[name] } },
+      ignoring: :accents,
+      order_within_rank: "search_documents.record_updated_at DESC",
+      query: query }
+  }
+
+  class << self
+    def results
+      select(:searchable_id, :searchable_type, :locale)
+        .map(&:localized_searchable)
+    end
+
+    def search(query, locale: nil)
+      locale ||= I18n.locale
+      where(locale: locale)
+        .includes(:searchable)
+        .full_text_search_scope(query, search_configuration(locale))
+    end
+
+    def search_configuration(locale)
+      search_configurations[locale&.to_sym] || "simple_unaccent"
+    end
+
+    def search_configurations
+      # These are the dictionaries PostgreSQL 12 ships with.
+      # Also available in PostgreSQL 13: el: "greek_unaccent",
+      { ar: "arabic_unaccent", da: "danish_unaccent", nl: "dutch_unaccent",
+        en: "english_unaccent", fi: "finnish_unaccent", fr: "french_unaccent",
+        de: "german_unaccent", hu: "hungarian_unaccent",
+        id: "indonesian_unaccent", ga: "irish_unaccent", it: "italian_unaccent",
+        lt: "lithuanian_unaccent", ne: "nepali_unaccent",
+        nb: "norwegian_unaccent", pt: "portuguese_unaccent",
+        rm: "romanian_unaccent", ru: "russian_unaccent", es: "spanish_unaccent",
+        sv: "swedish_unaccent", ta: "tamil_unaccent", tr: "turkish_unaccent" }
+    end
+  end
+
+  def localized_searchable
+    return searchable unless searchable.respond_to?(:localize)
+
+    searchable.localize(locale)
+  end
+
+  private
+
+  def configure_dictionary
+    self.tsv_config = self.class.search_configuration(locale)
+  end
+
+  def inherit_updated_at
+    self.record_updated_at = searchable.updated_at
+  end
+end

data/app/models/tag.rb

@@ -4,6 +4,7 @@ class Tag < ApplicationRecord
   include PagesCore::HumanizableParam
   has_many :taggings, dependent: :destroy
 
+  scope :by_name, -> { order("name ASC") }
   scope :pinned, -> { where(pinned: true) }
   scope :sorted, -> { order("pinned DESC, name ASC") }
 

data/app/models/user.rb

@@ -83,7 +83,7 @@ class User < ApplicationRecord
   end
 
   def online?
-    last_login_at && last_login_at > 15.minutes.ago ? true : false
+    last_login_at && last_login_at > 15.minutes.ago
   end
 
   def realname

data/app/{serializers/admin/attachment_serializer.rb → resources/admin/attachment_resource.rb}

@@ -1,22 +1,23 @@
 # frozen_string_literal: true
 
 module Admin
-  class AttachmentSerializer < ActiveModel::Serializer
+  class AttachmentResource
+    include Alba::Resource
     include Rails.application.routes.url_helpers
     include PagesCore::AttachmentsHelper
 
     attributes :id, :filename, :content_type, :content_hash, :content_length,
-               :name, :description, :created_at, :updated_at, :url
+               :created_at, :updated_at
 
-    def name
+    attribute :name do
       localized_attribute(:name)
     end
 
-    def description
+    attribute :description do
       localized_attribute(:description)
     end
 
-    def url
+    attribute :url do
       attachment_path(object)
     end
 

data/app/{serializers/admin/image_serializer.rb → resources/admin/image_resource.rb}

@@ -1,29 +1,29 @@
 # frozen_string_literal: true
 
 module Admin
-  class ImageSerializer < ActiveModel::Serializer
+  class ImageResource
+    include Alba::Resource
     include Rails.application.routes.url_helpers
     include DynamicImage::Helper
 
     attributes :id, :filename, :content_type, :content_hash, :content_length,
                :colorspace, :real_width, :real_height, :crop_width,
                :crop_height, :crop_start_x, :crop_start_y, :crop_gravity_x,
-               :crop_gravity_y, :alternative, :caption, :created_at, :updated_at
-    attributes :cropped_url, :uncropped_url, :original_url, :thumbnail_url
+               :crop_gravity_y, :created_at, :updated_at
 
-    def alternative
+    attribute :alternative do
       localized_attribute(:alternative)
     end
 
-    def caption
+    attribute :caption do
       localized_attribute(:caption)
     end
 
-    def original_url
+    attribute :original_url do
       original_dynamic_image_path(object)
     end
 
-    def thumbnail_url
+    attribute :thumbnail_url do
       dynamic_image_path(
         object,
         size: "500x",
@@ -31,7 +31,7 @@ module Admin
       )
     end
 
-    def cropped_url
+    attribute :cropped_url do
       dynamic_image_path(
         object,
         size: "1200x1200",
@@ -40,7 +40,7 @@ module Admin
       )
     end
 
-    def uncropped_url
+    attribute :uncropped_url do
       uncropped_dynamic_image_path(
         object,
         size: "2000x2000",

data/app/resources/admin/page_file_resource.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Admin
+  class PageFileResource
+    include Alba::Resource
+
+    attributes :id, :page_id, :attachment_id, :position
+    one :attachment, resource: Admin::AttachmentResource
+  end
+end

data/app/{serializers/admin/page_image_serializer.rb → resources/admin/page_image_resource.rb}

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 module Admin
-  class PageImageSerializer < ActiveModel::Serializer
+  class PageImageResource
+    include Alba::Resource
+
     attributes :id, :page_id, :image_id, :position, :primary
-    has_one :image, serializer: Admin::ImageSerializer
+    one :image, resource: Admin::ImageResource
   end
 end

data/app/resources/export/attachment_resource.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Export
+  class AttachmentResource
+    include Alba::Resource
+
+    attributes :id, :filename, :content_type, :content_length, :content_hash,
+               :created_at, :updated_at
+  end
+end

data/app/resources/export/page_image_resource.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Export
+  class PageImageResource
+    include Alba::Resource
+
+    attributes :primary
+
+    attribute :id do
+      object.image.id
+    end
+
+    attribute :name do
+      object.image.name
+    end
+
+    attribute :alternative do
+      object.image.alternative
+    end
+
+    attribute :caption do
+      object.image.caption
+    end
+
+    attribute :content_hash do
+      object.image.content_hash
+    end
+
+    attribute :content_type do
+      object.image.content_type
+    end
+
+    attribute :filename do
+      object.image.filename
+    end
+
+    attribute :size do
+      object.image.crop_size
+    end
+
+    attribute :created_at do
+      object.image.created_at
+    end
+  end
+end

data/app/resources/export/page_resource.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Export
+  class PageResource
+    include Alba::Resource
+
+    attributes :id, :locale
+    attributes(*PagesCore::Templates::TemplateConfiguration.all_blocks)
+    attributes :created_at, :published_at, :pinned, :template, :redirect_to,
+               :starts_at, :ends_at, :all_day
+
+    has_many :attachments, resource: Export::AttachmentResource
+
+    attribute :author_name do
+      object&.author&.name
+    end
+
+    attribute :path do
+      object.full_path || object.to_param
+    end
+
+    attribute :image do
+      image_resource(object.page_images.where(primary: true).try(:first))
+    end
+
+    attribute :images do
+      object.page_images.map { |image| image_resource(image) }
+    end
+
+    attribute :status do
+      object.status_label
+    end
+
+    private
+
+    def image_resource(image)
+      return nil unless image
+
+      Export::PageImageResource.new(image)
+    end
+  end
+end

data/app/{serializers/page_image_serializer.rb → resources/page_image_resource.rb}

@@ -1,37 +1,29 @@
 # frozen_string_literal: true
 
-class PageImageSerializer < ActiveModel::Serializer
+class PageImageResource
+  include Alba::Resource
   include Rails.application.routes.url_helpers
   include DynamicImage::Helper
 
-  attributes :id, :image_id, :primary, :filename
-  attributes :alternative, :caption, :created_at, :url
+  attributes :id, :image_id, :primary
 
-  def name
-    object.image.name
-  end
-
-  def alternative
+  attribute :alternative do
     object.image.alternative
   end
 
-  def caption
+  attribute :caption do
     object.image.caption
   end
 
-  def filename
+  attribute :filename do
     object.image.filename
   end
 
-  def size
-    object.image.crop_size
-  end
-
-  def created_at
+  attribute :created_at do
     object.image.created_at
   end
 
-  def url
+  attribute :url do
     dynamic_image_path(
       object.image,
       size: "2000x2000",

data/app/resources/page_resource.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class PageResource
+  include Alba::Resource
+
+  attributes :id, :parent_page_id, :locale
+  attributes(*PagesCore::Templates::TemplateConfiguration.all_blocks)
+  attributes :published_at, :pinned
+
+  attribute :param do
+    object.to_param
+  end
+
+  attribute :image do
+    image_resource(object.page_images.where(primary: true).try(:first))
+  end
+
+  attribute :images do
+    object.page_images.map { |image| image_resource(image) }
+  end
+
+  attribute :pages do
+    object.pages.map { |p| PageResource.new(p) }
+  end
+
+  private
+
+  def image_resource(image)
+    return nil unless image
+
+    PageImageResource.new(image)
+  end
+end

data/app/services/pages_core/destroy_invite_service.rb

@@ -9,8 +9,8 @@ module PagesCore
     end
 
     class << self
-      def call(*attrs)
-        new(*attrs).call
+      def call(invite:)
+        new(invite: invite).call
       end
     end
 

data/app/services/pages_core/invite_service.rb

@@ -14,8 +14,8 @@ module PagesCore
     end
 
     class << self
-      def call(*attrs)
-        new(*attrs).call
+      def call(attrs, user:, host:, protocol: "http")
+        new(attrs, user: user, host: host, protocol: protocol).call
       end
     end
 

data/app/views/admin/pages/_edit_content.html.erb

@@ -9,7 +9,7 @@
                         all_day: @page.all_day }) %>
 <% end %>
 
-<% if !@page.new_record? && @page.template_config.value(:tags) %>
+<% if @page.template_config.value(:tags) %>
   <div class="field">
     <label>
       Tags

data/app/views/admin/pages/_edit_files.html.erb

@@ -1,8 +1,4 @@
 <%= react_component("PageFiles",
                     locale: @locale,
                     locales: PagesCore.config.locales,
-                    csrf_token: form_authenticity_token,
-                    records: ActiveModel::Serializer::CollectionSerializer.new(
-                      @page.files,
-                      serializer: Admin::PageFileSerializer
-                    )) %>
+                    records: @page.files.map { |pf| Admin::PageFileResource.new(pf).to_hash }) %>

data/app/views/admin/pages/_edit_images.html.erb

@@ -1,8 +1,4 @@
 <%= react_component("PageImages",
                     locale: @locale,
                     locales: PagesCore.config.locales,
-                    csrf_token: form_authenticity_token,
-                    records: ActiveModel::Serializer::CollectionSerializer.new(
-                      @page.page_images,
-                      serializer: Admin::PageImageSerializer
-                    )) %>
+                    records: @page.page_images.map { |pi| Admin::PageImageResource.new(pi).to_hash }) %>