pages_core 3.6.0 → 3.8.0

data/app/models/tag.rb

@@ -1,7 +1,10 @@
-class Tag < ActiveRecord::Base
+# frozen_string_literal: true
+
+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") }
 
@@ -11,6 +14,7 @@ class Tag < ActiveRecord::Base
       tags = (taggable.tags.sorted + pinned.sorted).uniq
 
       return tags unless tags.count < limit
+
       tags + suggestions(taggable, tags, limit)[0...(limit - tags.length)]
     end
 
@@ -26,14 +30,13 @@ class Tag < ActiveRecord::Base
 
     def suggestions(taggable, tags, limit)
       suggestions = taggable_suggestions(taggable, limit).to_a
-      if suggestions.length < limit
-        suggestions += all_suggestions(limit)
-      end
-      suggestions.reject { |t| tags.include?(t) }.uniq[0...(limit)]
+      suggestions += all_suggestions(limit) if suggestions.length < limit
+      suggestions.reject { |t| tags.include?(t) }.uniq[0...limit]
     end
 
     def taggable_suggestions(taggable, limit)
-      all_suggestions(limit).where("taggings.taggable_type = ?", taggable.class)
+      all_suggestions(limit)
+        .where(taggings: { taggable_type: taggable.class.to_s })
     end
 
     def all_suggestions(limit)

data/app/models/tagging.rb

@@ -1,6 +1,8 @@
-class Tagging < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Tagging < ApplicationRecord
   belongs_to :tag
-  belongs_to :taggable, polymorphic: true
+  belongs_to :taggable, polymorphic: true, touch: true
 
   validates :taggable_id, presence: true
   validates :taggable_type, presence: true

data/app/models/user.rb

@@ -1,4 +1,6 @@
-class User < ActiveRecord::Base
+# frozen_string_literal: true
+
+class User < ApplicationRecord
   include PagesCore::HasRoles
 
   attr_accessor :password, :confirm_password
@@ -21,9 +23,7 @@ class User < ActiveRecord::Base
 
   serialize :persistent_data
 
-  validates :username,
-            presence: true,
-            uniqueness: { case_sensitive: false }
+  validates :username, presence: true, uniqueness: { case_sensitive: false }
 
   validates :name, presence: true
 
@@ -63,6 +63,7 @@ class User < ActiveRecord::Base
 
   def authenticate!(password)
     return false unless can_login? && valid_password?(password)
+
     rehash_password!(password) if password_needs_rehash?
     true
   end
@@ -73,6 +74,7 @@ class User < ActiveRecord::Base
 
   def mark_active!
     return if last_login_at && last_login_at > 10.minutes.ago
+
     update(last_login_at: Time.now.utc)
   end
 
@@ -81,7 +83,7 @@ class User < ActiveRecord::Base
   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
@@ -92,6 +94,7 @@ class User < ActiveRecord::Base
 
   def confirm_password_must_match
     return if password.blank? || password == confirm_password
+
     errors.add(:confirm_password, "does not match")
   end
 

data/app/policies/invite_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class InvitePolicy < Policy
   def index?
     true

data/app/policies/page_file_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PageFilePolicy < Policy
   def index?
     true

data/app/policies/page_image_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PageImagePolicy < Policy
   def index?
     true

data/app/policies/page_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PagePolicy < Policy
   def index?
     true

data/app/policies/policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Policy
   module DefaultPolicy
     def index

data/app/policies/user_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UserPolicy < Policy
   def index?
     true

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

@@ -1,28 +1,31 @@
+# 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
 
     private
 
     def localized_attribute(attr)
-      object.locales.each_with_object({}) do |locale, hash|
-        hash[locale] = object.localize(locale).send(attr)
+      object.locales.index_with do |locale|
+        object.localize(locale).send(attr)
       end
     end
   end

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

@@ -1,27 +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",
@@ -29,7 +31,7 @@ module Admin
       )
     end
 
-    def cropped_url
+    attribute :cropped_url do
       dynamic_image_path(
         object,
         size: "1200x1200",
@@ -38,7 +40,7 @@ module Admin
       )
     end
 
-    def uncropped_url
+    attribute :uncropped_url do
       uncropped_dynamic_image_path(
         object,
         size: "2000x2000",
@@ -49,8 +51,8 @@ module Admin
     private
 
     def localized_attribute(attr)
-      object.locales.each_with_object({}) do |locale, hash|
-        hash[locale] = object.localize(locale).send(attr)
+      object.locales.index_with do |locale|
+        object.localize(locale).send(attr)
       end
     end
   end

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/resources/admin/page_image_resource.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Admin
+  class PageImageResource
+    include Alba::Resource
+
+    attributes :id, :page_id, :image_id, :position, :primary
+    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,35 +1,29 @@
-class PageImageSerializer < ActiveModel::Serializer
+# frozen_string_literal: true
+
+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
-
-  def name
-    object.image.name
-  end
+  attributes :id, :image_id, :primary
 
-  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/create_user_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   class CreateUserService
     attr_reader :attributes, :invite
@@ -8,8 +10,8 @@ module PagesCore
     end
 
     class << self
-      def call(*attrs)
-        new(*attrs).call
+      def call(attrs, invite: nil)
+        new(attrs, invite: invite).call
       end
     end
 
@@ -28,6 +30,7 @@ module PagesCore
 
     def invite_attributes
       return {} unless invite
+
       { role_names: invite.role_names,
         creator: invite.user,
         activated: true }

data/app/services/pages_core/destroy_invite_service.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module PagesCore
+  class DestroyInviteService
+    attr_reader :invite
+
+    def initialize(invite:)
+      @invite = invite
+    end
+
+    class << self
+      def call(invite:)
+        new(invite: invite).call
+      end
+    end
+
+    def call
+      Invite.transaction do
+        invite.destroy
+        PagesCore::PubSub.publish(:destroy_invite, invite: invite)
+        invite
+      end
+    end
+  end
+end

data/app/services/pages_core/invite_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   class InviteService
     include Rails.application.routes.url_helpers
@@ -12,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/images/show.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.extract!(
   @image, :id, :filename, :content_type, :content_hash,
   :content_length, :colorspace, :real_width, :real_height, :crop_width,

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 }) %>

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

@@ -27,18 +27,7 @@
     Will fall back to the primary image if absent.
     Recommended size is at least 1200x630.
   </p>
-  <% if @page.meta_image %>
-    <p>
-      <%= dynamic_image_tag @page.meta_image, size: "250x" %>
-      <br>
-      <%= link_to("Delete image",
-                  delete_meta_image_admin_page_path(@locale, @page),
-                  method: "delete",
-                  class: "delete",
-                  data: { confirm: "Are you sure?" }) %>
-    </p>
-  <% end %>
-  <%= f.file_field :meta_image %>
+  <%= f.image_uploader :meta_image %>
 </div>
 
 <% @page.template_config.metadata_blocks do |block_name, block_options| %>