alchemy-json_api 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c6090af6d711e4a909628207f0b5f7d916944c60a8482b5b7ff958a38633d73
-  data.tar.gz: 4e70e1de9b2ab1a68ce359c32973deac67a0965ade5021a7cf398ea29bf83a82
+  metadata.gz: b099850c244a74a544ab7d649f40faee72d021abee257d55ae9061e55c594dfd
+  data.tar.gz: '029e828a551ab68cdc8d1e48d26135ddc43bda3c3aca7565012ed55e40b1f1f8'
 SHA512:
-  metadata.gz: 56d2a3623ad9e3a8585d5487f94f08c3d4a31f17a177f300252056eec68f5f4223eb86f32eca26238c5d52ecc6481a39d845b8082ea3d5cb4daec2fc25004a92
-  data.tar.gz: 30ca7d8ca1e07d9e924e395ee42c0d4cbf693180052a70f003ccd592267564c2e701aea50462f24f659aad8f39c687d42fa90f05da2633ce2c90a82228a9a3c0
+  metadata.gz: d9f1c8b7b5e8996ea8edc83d30aecb780d5ff782530f09e8aaf43fc2a38b01e34867e79fc52bac2ecb4be6e5cc5b6ce6cbd2b478fa1d294574d56ebebfe4cd2c
+  data.tar.gz: 4f7efea149006aad79e341939bfa946fa5e87939315eefdfff8ef22f3e4d83b4f9b9a480b4ba058497b1a8f85c3729a2453fd956dff9570debbe384ccfb846cb

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

@@ -10,15 +10,10 @@ module Alchemy
 
         jsonapi_filter(page_scope, allowed) do |filtered_pages|
           @pages = filtered_pages.result
-          if stale?(last_modified: @pages.maximum(:published_at), etag: @pages.max_by(&:cache_key)&.cache_key)
-            # Only load pages with all includes when browser cache is stale
-            jsonapi_filter(page_scope_with_includes, allowed) do |filtered|
-              # decorate with our page model that has a eager loaded elements collection
-              filtered_pages = filtered.result.map { |page| api_page(page) }
-              jsonapi_paginate(filtered_pages) do |paginated|
-                render jsonapi: paginated
-              end
-            end
+          if !@pages.all?(&:cache_page?)
+            render_pages_json(allowed) && return
+          elsif stale?(last_modified: @pages.maximum(:published_at), etag: @pages.max_by(&:cache_key)&.cache_key)
+            render_pages_json(allowed)
           end
         end
 
@@ -26,6 +21,10 @@ module Alchemy
       end
 
       def show
+        if !@page.cache_page?
+          render(jsonapi: api_page(load_page)) && return
+        end
+
         if stale?(last_modified: last_modified_for(@page), etag: @page.cache_key)
           # Only load page with all includes when browser cache is stale
           render jsonapi: api_page(load_page)
@@ -36,6 +35,17 @@ module Alchemy
 
       private
 
+      def render_pages_json(allowed)
+        # Only load pages with all includes when browser cache is stale
+        jsonapi_filter(page_scope_with_includes, allowed) do |filtered|
+          # decorate with our page model that has a eager loaded elements collection
+          filtered_pages = filtered.result.map { |page| api_page(page) }
+          jsonapi_paginate(filtered_pages) do |paginated|
+            render jsonapi: paginated
+          end
+        end
+      end
+
       def cache_duration
         ENV.fetch("ALCHEMY_JSON_API_CACHE_DURATION", 3).to_i.hours
       end

data/lib/alchemy/json_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A JSONAPI compliant API for AlchemyCMS