alchemy-json_api 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8800ea751939b672e2361001cffe2d0da220a6ee61b25c6728c0e0a8db3ca9b
-  data.tar.gz: b9a7baa74ef2e0336aa91ad20f03ef26cb8f85c258caa1faf0b8a0c03d665a6f
+  metadata.gz: 00a9cfebbdb1f42b95a9b199bb23b5690ba65ff21b14a95e260beff9dafe1d1e
+  data.tar.gz: 0ce06ce3e137b56e40f5c8c08d895eb5f2eca7cc0936ed07c07cc2d6352530e5
 SHA512:
-  metadata.gz: 3bbefcf52e8b02cad76158b312945bc1a818df8427b658898073bd7cdb8ef09a8d594bb33db0b0d5bcd2a4a9a7b4bd532d2d14a5c5c59f65cd8bbb880394232b
-  data.tar.gz: e4a795e0ac64b11930b10d1f582339326f79b9695863930aa69856e93c8ff41f76341710e13dad70074b85fc4a99453605d2725585525c1816fcda19f877c3af
+  metadata.gz: 87723e7055f3968a0a1d75b6d133e2fc0a3a8efeb5b61e222771e91c673e9313052a3e154280a01c2beaa9f49144c90da9ecb6d05282987943ea2e9d06b0de7b
+  data.tar.gz: c2694da5d297f1acbbb16ed9a59858e5c84504091d430e82019e77aaae14549cb9b6e4d59ceee0a38b03e37f98162ea4881d2518e387b074cdd02e3c38bf8a1b

data/app/controllers/alchemy/json_api/admin/layout_pages_controller.rb

@@ -2,11 +2,11 @@
 module Alchemy
   module JsonApi
     module Admin
-      class LayoutPagesController < PagesController
+      class LayoutPagesController < JsonApi::Admin::PagesController
         private
 
         def page_scope
-          page_scope_with_includes(page_version: :draft_version).layoutpages
+          page_scope_with_includes.layoutpages
         end
       end
     end

data/app/controllers/alchemy/json_api/admin/pages_controller.rb

@@ -5,14 +5,10 @@ module Alchemy
       class PagesController < JsonApi::PagesController
         prepend_before_action { authorize! :edit_content, Alchemy::Page }
 
-        def show
-          render jsonapi: Alchemy::JsonApi::Page.new(@page, page_version: :draft_version)
-        end
-
         private
 
-        def page_scope
-          page_scope_with_includes(page_version: :draft_version).contentpages
+        def page_version_type
+          :draft_version
         end
       end
     end

data/app/controllers/alchemy/json_api/pages_controller.rb

@@ -10,7 +10,7 @@ module Alchemy
 
         jsonapi_filter(page_scope, allowed) do |filtered|
           # decorate with our page model that has a eager loaded elements collection
-          pages = filtered.result.map { |p| Alchemy::JsonApi::Page.new(p) }
+          pages = filtered.result.map { |page| api_page(page) }
           jsonapi_paginate(pages) do |paginated|
             render jsonapi: paginated
           end
@@ -18,7 +18,7 @@ module Alchemy
       end
 
       def show
-        render jsonapi: Alchemy::JsonApi::Page.new(@page)
+        render jsonapi: api_page(@page)
       end
 
       private
@@ -49,7 +49,7 @@ module Alchemy
         page_scope_with_includes.contentpages
       end
 
-      def page_scope_with_includes(page_version: :public_version)
+      def page_scope_with_includes
         base_page_scope.
           where(language: Language.current).
           includes(
@@ -57,7 +57,7 @@ module Alchemy
               :legacy_urls,
               { language: { nodes: [:parent, :children, { page: { language: { site: :languages } } }] } },
               {
-                page_version => {
+                page_version_type => {
                   elements: [
                     :nested_elements,
                     { contents: { essence: :ingredient_association } },
@@ -68,12 +68,20 @@ module Alchemy
           )
       end
 
+      def page_version_type
+        :public_version
+      end
+
+      def api_page(page)
+        Alchemy::JsonApi::Page.new(page, page_version_type: page_version_type)
+      end
+
       def base_page_scope
         # cancancan is not able to merge our complex AR scopes for logged in users
         if can?(:edit_content, ::Alchemy::Page)
-          Alchemy::Page.all
+          Alchemy::Page.all.joins(page_version_type)
         else
-          Alchemy::Page.published
+          Alchemy::Page.published.joins(page_version_type)
         end
       end
 

data/app/models/alchemy/json_api/page.rb

@@ -1,8 +1,11 @@
 module Alchemy
   module JsonApi
     class Page < SimpleDelegator
-      def initialize(page, page_version: :public_version)
-        @page_version = page.public_send(page_version)
+      attr_reader :page_version_type, :page_version
+
+      def initialize(page, page_version_type: :public_version)
+        @page_version_type = page_version_type
+        @page_version = page.public_send(page_version_type)
         super(page)
       end
 
@@ -33,13 +36,17 @@ module Alchemy
         @_fixed_element_ids ||= fixed_elements.map(&:id)
       end
 
+      def ancestor_ids
+        @_ancestor_ids ||= ancestors.map(&:id)
+      end
+
       private
 
       def element_repository
-        return Alchemy::ElementsRepository.none unless @page_version
+        return Alchemy::ElementsRepository.none unless page_version
 
         # Need to use select here, otherwise rails would not eager load the elements correctly
-        Alchemy::ElementsRepository.new(@page_version.elements.select(&:public))
+        Alchemy::ElementsRepository.new(page_version.elements.select(&:public))
       end
     end
   end

data/app/serializers/alchemy/json_api/essence_richtext_serializer.rb

@@ -7,6 +7,7 @@ module Alchemy
       include EssenceSerializer
       attributes(
         :body,
+        :sanitized_body,
         :stripped_body,
       )
     end

data/app/serializers/alchemy/json_api/page_serializer.rb

@@ -24,6 +24,12 @@ module Alchemy
 
       belongs_to :language, record_type: :language, serializer: ::Alchemy::JsonApi::LanguageSerializer
 
+      has_many :ancestors, record_type: :page, serializer: self do |page|
+        page.ancestors.map do |ancestor|
+          Alchemy::JsonApi::Page.new(ancestor, page_version_type: page.page_version_type)
+        end
+      end
+
       # All public elements of this page regardless of if they are fixed or nested.
       # Used for eager loading and should be used as the +include+ parameter of your query
       has_many :all_elements, record_type: :element, serializer: ELEMENT_SERIALIZER

data/lib/alchemy/json_api/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Alchemy
   module JsonApi
-    VERSION = "0.13.0"
+    VERSION = "0.14.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Martin Meyerhoff
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -156,7 +156,7 @@ homepage: https://github.com/AlchemyCMS/alchemy-json_api
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,8 +171,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A JSONAPI compliant API for AlchemyCMS
 test_files: []