alchemy-json_api 0.12.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec8c154e4f6ac5ba72d6d96b39a60475acf9b0d411d3a4e2d34c81fc271d1489
-  data.tar.gz: c0cc273e02b2038e5462428fa1f7d0960be37ccf8225abd76af7343ca4f76ec0
+  metadata.gz: 369f587874aab63134861d26c9b1babfc0d0ba7d25a981bd2a977bf00d847b48
+  data.tar.gz: 3e3e10d5862df03767a538fe785b17d67d88a1e02151fa0a6b67b45370876960
 SHA512:
-  metadata.gz: 2f0ebd08816a2d97347555eaf114735b429ec7c1e2592f9c1ff0b652be9f0799c782489987eac5d3142d5f5246ac6f02375460d62931ef4cfcca4f8a3e9ad809
-  data.tar.gz: '08c7a5e5570c995b3495844bcceb9a145173cb3e224fce0051a5b672eae408aee58850e1b612fb25051c0896c571365481daabe28d7e4766b62742e1b0363e34'
+  metadata.gz: 7f7b3074e7c9e446e22c12f8f8fffe64a2548ede87af8a22515efe53edc9060e2446d8cf9e2bd4511941158920e55e9cce5478b876fe4e9438d2d63d60df8cb6
+  data.tar.gz: c68a930b025975095291d0cf53d8f7cbba2a65e309ac4a0d24ef2db5966b4bc157cc35f199c2f69c3c2e8503de20517f19594a6ef3afac12f82eb124373ee170

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module Alchemy
+  module JsonApi
+    module Admin
+      class LayoutPagesController < JsonApi::Admin::PagesController
+        private
+
+        def page_scope
+          page_scope_with_includes.layoutpages
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module Alchemy
+  module JsonApi
+    module Admin
+      class PagesController < JsonApi::PagesController
+        prepend_before_action { authorize! :edit_content, Alchemy::Page }
+
+        private
+
+        def page_version_type
+          :draft_version
+        end
+      end
+    end
+  end
+end

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

@@ -9,6 +9,11 @@ module Alchemy
       include JSONAPI::Filtering
       include JSONAPI::Pagination
 
+      rescue_from(
+        CanCan::AccessDenied,
+        with: :render_jsonapi_unauthorized,
+      )
+
       private
 
       def render_jsonapi_internal_server_error(exception)
@@ -25,6 +30,11 @@ module Alchemy
         message << "  " << exception.backtrace.join("\n  ")
         logger.fatal("#{message}\n\n")
       end
+
+      def render_jsonapi_unauthorized(exception)
+        error = { status: "401", title: Rack::Utils::HTTP_STATUS_CODES[401] }
+        render jsonapi_errors: [error], status: :unauthorized
+      end
     end
   end
 end

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

@@ -4,10 +4,6 @@ module Alchemy
     class LayoutPagesController < JsonApi::PagesController
       private
 
-      def base_page_scope
-        ::Alchemy::JsonApi::Page.all
-      end
-
       def page_scope
         page_scope_with_includes.layoutpages
       end

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

@@ -9,14 +9,16 @@ module Alchemy
         allowed = [:page_layout]
 
         jsonapi_filter(page_scope, allowed) do |filtered|
-          jsonapi_paginate(filtered.result) do |paginated|
+          # decorate with our page model that has a eager loaded elements collection
+          pages = filtered.result.map { |page| api_page(page) }
+          jsonapi_paginate(pages) do |paginated|
             render jsonapi: paginated
           end
         end
       end
 
       def show
-        render jsonapi: @page
+        render jsonapi: api_page(@page)
       end
 
       private
@@ -26,7 +28,7 @@ module Alchemy
 
         {
           pagination: pagination.presence,
-          total: page_scope.count
+          total: page_scope.count,
         }.compact
       end
 
@@ -49,16 +51,37 @@ module Alchemy
 
       def page_scope_with_includes
         base_page_scope.
-          with_language(Language.current).
-          preload(language: { nodes: [:parent, :page, :children] }, all_elements: { contents: { essence: :ingredient_association } })
+          where(language: Language.current).
+          includes(
+            [
+              :legacy_urls,
+              { language: { nodes: [:parent, :children, { page: { language: { site: :languages } } }] } },
+              {
+                page_version_type => {
+                  elements: [
+                    :nested_elements,
+                    { contents: { essence: :ingredient_association } },
+                  ],
+                },
+              },
+            ]
+          )
+      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::JsonApi::Page.all
+          Alchemy::Page.all.joins(page_version_type)
         else
-          ::Alchemy::JsonApi::Page.published
+          Alchemy::Page.published.joins(page_version_type)
         end
       end
 

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

@@ -1,35 +1,31 @@
 module Alchemy
   module JsonApi
-    class Page < BaseRecord
-      self.table_name = "alchemy_pages"
+    class Page < SimpleDelegator
+      attr_reader :page_version_type, :page_version
 
-      belongs_to :language, class_name: "Alchemy::Language"
-
-      has_many :all_elements,
-        -> { available.order(:position) },
-        class_name: "Alchemy::JsonApi::Element",
-        inverse_of: :page
-
-      scope :published, -> {
-          where("#{table_name}.public_on <= :time AND " \
-                "(#{table_name}.public_until IS NULL " \
-                "OR #{table_name}.public_until >= :time)", time: Time.current)
-        }
+      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
 
-      scope :contentpages, -> { where(layoutpage: false) }
-      scope :layoutpages, -> { where(layoutpage: true) }
-      scope :with_language, ->(language_id) { where(language_id: language_id) }
+      # All elements including nested and fixed elements
+      def all_elements
+        @_all_elements ||= element_repository
+      end
 
-      # The top level public, non-fixed elements of this page that - if present -
-      # contains their nested_elements.
+      # Not nested unfixed top level elements
       def elements
-        @_elements ||= first_level_elements.reject(&:fixed?)
+        @_elements ||= element_repository.not_nested.unfixed
       end
 
-      # The top level public, fixed elements of this page that - if present -
-      # contains their nested_elements.
+      # Not nested fixed top level elements
       def fixed_elements
-        @_fixed_elements ||= first_level_elements.select(&:fixed?)
+        @_fixed_elements ||= element_repository.not_nested.fixed
+      end
+
+      def all_element_ids
+        @_all_element_ids ||= all_elements.map(&:id)
       end
 
       def element_ids
@@ -40,10 +36,17 @@ module Alchemy
         @_fixed_element_ids ||= fixed_elements.map(&:id)
       end
 
+      def ancestor_ids
+        @_ancestor_ids ||= ancestors.map(&:id)
+      end
+
       private
 
-      def first_level_elements
-        @_first_level_elements ||= all_elements.reject(&:parent_element_id)
+      def element_repository
+        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))
       end
     end
   end

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

@@ -16,10 +16,6 @@ module Alchemy
         !!element.definition[:deprecated]
       end
 
-      belongs_to :parent_element, record_type: :element, serializer: self
-
-      belongs_to :page, record_type: :page, serializer: ::Alchemy::JsonApi::PageSerializer
-
       has_many :essences, polymorphic: true do |element|
         element.contents.map(&:essence)
       end

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

@@ -18,7 +18,19 @@ module Alchemy
 
       with_options if: proc { |essence| essence.picture.present? } do
         attribute :image_dimensions do |essence|
-          essence.sizes_from_string(essence.render_size)
+          sizes = essence.content.settings[:size]&.split("x", 2)&.map(&:to_i) || [
+            essence.image_file_width,
+            essence.image_file_height,
+          ]
+
+          ratio = essence.image_file_width.to_f / essence.image_file_height
+          width = sizes[0].zero? ? sizes[1] * ratio : sizes[0]
+          height = sizes[1].zero? ? sizes[0] / ratio : sizes[1]
+
+          {
+            width: width,
+            height: height,
+          }
         end
 
         attribute :image_name do |essence|

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

@@ -18,8 +18,18 @@ module Alchemy
         :updated_at,
       )
 
+      attribute :legacy_urls do |page|
+        page.legacy_urls.map(&:urlname)
+      end
+
       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/config/routes.rb

@@ -4,4 +4,10 @@ Alchemy::JsonApi::Engine.routes.draw do
   get "pages/*path" => "pages#show", as: :page
   resources :layout_pages, only: [:index]
   get "layout_pages/*path" => "layout_pages#show", as: :layout_page
+
+  namespace :admin do
+    get "pages/*path" => "pages#show", as: :page
+    resources :layout_pages, only: [:index]
+    get "layout_pages/*path" => "layout_pages#show", as: :layout_page
+  end
 end

data/lib/alchemy/json_api/test_support/essence_serializer_behaviour.rb

@@ -11,6 +11,15 @@ RSpec.shared_examples "an essence serializer" do
     context "a deprecated content" do
       let(:content) { FactoryBot.create(:alchemy_content, name: "intro", element: element) }
 
+      before do
+        expect(content).to receive(:definition).at_least(:once) do
+          {
+            name: "intro",
+            deprecated: true,
+          }
+        end
+      end
+
       it "has deprecated attribute set to true" do
         expect(subject[:deprecated]).to eq(true)
       end

data/lib/alchemy/json_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.a
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.a
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -124,10 +124,11 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/controllers/alchemy/json_api/admin/layout_pages_controller.rb
+- app/controllers/alchemy/json_api/admin/pages_controller.rb
 - app/controllers/alchemy/json_api/base_controller.rb
 - app/controllers/alchemy/json_api/layout_pages_controller.rb
 - app/controllers/alchemy/json_api/pages_controller.rb
-- app/models/alchemy/json_api/element.rb
 - app/models/alchemy/json_api/page.rb
 - app/serializers/alchemy/json_api/element_serializer.rb
 - app/serializers/alchemy/json_api/essence_boolean_serializer.rb

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

@@ -1,33 +0,0 @@
-module Alchemy
-  module JsonApi
-    class Element < BaseRecord
-      include Alchemy::Element::Definitions
-      include Alchemy::Element::ElementContents
-
-      self.table_name = "alchemy_elements"
-
-      belongs_to :page, class_name: "Alchemy::JsonApi::Page", inverse_of: :all_elements
-      has_many :contents, class_name: "Alchemy::Content", inverse_of: :element
-
-      scope :available, -> { where(public: true).where.not(position: nil) }
-
-      def parent_element
-        page.all_elements.detect do |element|
-          element.id == parent_element_id
-        end
-      end
-
-      def nested_elements
-        @_nested_elements ||= begin
-          page.all_elements.select do |element|
-            element.parent_element_id == id
-          end
-        end
-      end
-
-      def nested_element_ids
-        nested_elements.map(&:id)
-      end
-    end
-  end
-end