alchemy-json_api 0.21.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4f9847b4b3ba3f36b06e079974f16b12a7469513edc62a819669da8acd05d9a
-  data.tar.gz: 9c3586a4aa8c5fb04aab2fd3bcfd9e535ef2e91b44fee242a8a2dd9e30ec92cc
+  metadata.gz: b099850c244a74a544ab7d649f40faee72d021abee257d55ae9061e55c594dfd
+  data.tar.gz: '029e828a551ab68cdc8d1e48d26135ddc43bda3c3aca7565012ed55e40b1f1f8'
 SHA512:
-  metadata.gz: 4a097ebe662c11540dda9e3233549fe471cb19c17694dc8ba74577e789ca949b86439a2b488461bfc8355041575f7a8c8527b024a9d7e45448c5a91ecadb37de
-  data.tar.gz: b8413c86022ec12c4193e8914ff2ad5c29fb0353409364eb445fbd78950d07c180a2c970138cf226eb40c328ac195fe1d8694b554cd1d5d0ead25841b6c3c4ae
+  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/app/serializers/alchemy/json_api/essence_picture_serializer.rb

@@ -33,6 +33,27 @@ module Alchemy
           }
         end
 
+        attribute :srcset do |essence|
+          essence.content.settings.fetch(:srcset, []).map do |src|
+            case src
+            when Hash
+              url = essence.picture_url(src)
+              size = src[:size]
+            else
+              url = essence.picture_url(size: src)
+              size = src
+            end
+            width, height = size.split("x", 2)
+
+            {
+              url: url,
+              desc: "#{width}w",
+              width: width,
+              height: height,
+            }
+          end
+        end
+
         attribute :image_name do |essence|
           essence.picture.name
         end

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

@@ -39,6 +39,27 @@ module Alchemy
           }
         end
 
+        attribute :srcset do |ingredient|
+          ingredient.settings.fetch(:srcset, []).map do |src|
+            case src
+            when Hash
+              url = ingredient.picture_url(src)
+              size = src[:size]
+            else
+              url = ingredient.picture_url(size: src)
+              size = src
+            end
+            width, height = size.split("x", 2)
+
+            {
+              url: url,
+              desc: "#{width}w",
+              width: width,
+              height: height,
+            }
+          end
+        end
+
         attribute :image_name do |ingredient|
           ingredient.picture.name
         end

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

@@ -9,6 +9,7 @@ module Alchemy
       attributes(
         :name,
         :urlname,
+        :url_path,
         :page_layout,
         :title,
         :language_code,

data/lib/alchemy/json_api/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Alchemy
   module JsonApi
-    VERSION = "0.21.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.21.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-17 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