alchemy-json_api 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97db79acd9c6dfb19a865b855f4fe4849fda6ed306684aebc0006f6e8a0c491a
-  data.tar.gz: 3863316005bf0fa85f03a2605ef6f0e295e3115b7cb17f9dd4de9e866a2b50a6
+  metadata.gz: ec8c154e4f6ac5ba72d6d96b39a60475acf9b0d411d3a4e2d34c81fc271d1489
+  data.tar.gz: c0cc273e02b2038e5462428fa1f7d0960be37ccf8225abd76af7343ca4f76ec0
 SHA512:
-  metadata.gz: 8c52e8ec6c28505682e6469990e4b24c6eb365de7f8ddc05b5b8d0e1a4831e7852e7bb502e95c475ac19af4bafd4402148a0693cdacb7f0f1be715b891b686aa
-  data.tar.gz: 554481f252201637ce0daf5ca3429fd456c0ec82b34928dc9f0f959f4f4aaee7ee85923f5a9151548725130d6a5a21c03bc2a2e108163ad16e8a60c5a68b259c
+  metadata.gz: 2f0ebd08816a2d97347555eaf114735b429ec7c1e2592f9c1ff0b652be9f0799c782489987eac5d3142d5f5246ac6f02375460d62931ef4cfcca4f8a3e9ad809
+  data.tar.gz: '08c7a5e5570c995b3495844bcceb9a145173cb3e224fce0051a5b672eae408aee58850e1b612fb25051c0896c571365481daabe28d7e4766b62742e1b0363e34'

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

@@ -5,7 +5,7 @@ module Alchemy
       private
 
       def base_page_scope
-        Page.all
+        ::Alchemy::JsonApi::Page.all
       end
 
       def page_scope

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

@@ -50,7 +50,7 @@ module Alchemy
       def page_scope_with_includes
         base_page_scope.
           with_language(Language.current).
-          preload(language: { nodes: [:parent, :page] }, all_elements: { contents: { essence: :ingredient_association } })
+          preload(language: { nodes: [:parent, :page, :children] }, all_elements: { contents: { essence: :ingredient_association } })
       end
 
       def base_page_scope

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

@@ -12,14 +12,14 @@ module Alchemy
       scope :available, -> { where(public: true).where.not(position: nil) }
 
       def parent_element
-        page.elements.detect do |element|
+        page.all_elements.detect do |element|
           element.id == parent_element_id
         end
       end
 
       def nested_elements
         @_nested_elements ||= begin
-          page.elements.select do |element|
+          page.all_elements.select do |element|
             element.parent_element_id == id
           end
         end

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

@@ -23,17 +23,13 @@ module Alchemy
       # The top level public, non-fixed elements of this page that - if present -
       # contains their nested_elements.
       def elements
-        @_elements ||= all_elements.select do |element|
-          !element.fixed? || element.parent_element_id.nil?
-        end
+        @_elements ||= first_level_elements.reject(&:fixed?)
       end
 
       # The top level public, fixed elements of this page that - if present -
       # contains their nested_elements.
       def fixed_elements
-        @_fixed_elements ||= all_elements.select do |element|
-          element.fixed? || element.parent_element_id.nil?
-        end
+        @_fixed_elements ||= first_level_elements.select(&:fixed?)
       end
 
       def element_ids
@@ -43,6 +39,12 @@ module Alchemy
       def fixed_element_ids
         @_fixed_element_ids ||= fixed_elements.map(&:id)
       end
+
+      private
+
+      def first_level_elements
+        @_first_level_elements ||= all_elements.reject(&:parent_element_id)
+      end
     end
   end
 end

data/lib/alchemy/json_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms