alchemy-json_api 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebad1c20790bcb1426adbae64d0ed2083b3c9e6ee65744600016411cd62082b6
-  data.tar.gz: 5b0e2ae68275c4b523318c2b4bde1e89ff9f1a5507bfd61af37df4fa13a9c943
+  metadata.gz: e8800ea751939b672e2361001cffe2d0da220a6ee61b25c6728c0e0a8db3ca9b
+  data.tar.gz: b9a7baa74ef2e0336aa91ad20f03ef26cb8f85c258caa1faf0b8a0c03d665a6f
 SHA512:
-  metadata.gz: 1dda52e430cabb4b9082b82bef691bd1b6265c52830c1f7ccf118035801b4b6c742edbd97c49c887439a46c02c3f9fe3f4d213a036e521472170c2a00d08bcea
-  data.tar.gz: 8561bc959fada0966457c3b8f92269cf5413dd7f4a3adda9f85224c14bb3eafd83f192755cf01af5e9ce456f621025c11a1d3a075aecb68325e62f5af390ade8
+  metadata.gz: 3bbefcf52e8b02cad76158b312945bc1a818df8427b658898073bd7cdb8ef09a8d594bb33db0b0d5bcd2a4a9a7b4bd532d2d14a5c5c59f65cd8bbb880394232b
+  data.tar.gz: e4a795e0ac64b11930b10d1f582339326f79b9695863930aa69856e93c8ff41f76341710e13dad70074b85fc4a99453605d2725585525c1816fcda19f877c3af

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 < PagesController
+        private
+
+        def page_scope
+          page_scope_with_includes(page_version: :draft_version).layoutpages
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Alchemy
+  module JsonApi
+    module Admin
+      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
+        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 { |p| Alchemy::JsonApi::Page.new(p) }
+          jsonapi_paginate(pages) do |paginated|
             render jsonapi: paginated
           end
         end
       end
 
       def show
-        render jsonapi: @page
+        render jsonapi: Alchemy::JsonApi::Page.new(@page)
       end
 
       private
@@ -26,7 +28,7 @@ module Alchemy
 
         {
           pagination: pagination.presence,
-          total: page_scope.count
+          total: page_scope.count,
         }.compact
       end
 
@@ -47,18 +49,31 @@ module Alchemy
         page_scope_with_includes.contentpages
       end
 
-      def page_scope_with_includes
+      def page_scope_with_includes(page_version: :public_version)
         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 => {
+                  elements: [
+                    :nested_elements,
+                    { contents: { essence: :ingredient_association } },
+                  ],
+                },
+              },
+            ]
+          )
       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
         else
-          ::Alchemy::JsonApi::Page.published
+          Alchemy::Page.published
         end
       end
 

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

@@ -1,35 +1,28 @@
 module Alchemy
   module JsonApi
-    class Page < BaseRecord
-      self.table_name = "alchemy_pages"
-
-      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)
-        }
+    class Page < SimpleDelegator
+      def initialize(page, page_version: :public_version)
+        @page_version = page.public_send(page_version)
+        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
@@ -42,8 +35,11 @@ module Alchemy
 
       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/page_serializer.rb

@@ -18,6 +18,10 @@ 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
 
       # All public elements of this page regardless of if they are fixed or nested.

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-03-05 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,34 +0,0 @@
-module Alchemy
-  module JsonApi
-    class Element < BaseRecord
-      include Alchemy::Logger
-      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