alchemy-json_api 0.3.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3046cd47b8e5d362917e2c8b595bc25c338e4bdf94a71dabb21794c1aabf913a
-  data.tar.gz: 0670ad88fa25050738ce80692e1004b8b0016b3c25df8596f76fe0b054ed4e51
+  metadata.gz: 280355f5754df05ef965218bd9a35fb6f83b654dc534b2fce7cc903c47422fc2
+  data.tar.gz: 8ad2aa010faba09069bddb9d466d602d1dbc5c34ce052d82e96187c7bb2daa7b
 SHA512:
-  metadata.gz: 9d48b6c6692e7330db7daeaedc03c177a89ec55225f0f3c96145fd42f7eccf972cc757a47120279f3cf34dffdb3b92aba9b8974a420743a7c0f2f35454fd5f68
-  data.tar.gz: 9071f12da6fe44f21971cb85d53890691f0702f73396ec2e5ef08e7d6439d601aaa6625815c1a6867f15c25cdd23f1c69af67d1111769368df2d2b902e602407
+  metadata.gz: 80bd161a6f0b2ff1a9f5d393aad8f2d628a6177cf41443d23f0fa8638a66189600a9f43f71e3b7205ca94a9af00b937a0ecf7645e29ea512132a714fe1a4a6bb
+  data.tar.gz: a71c19f108eff5b51468687ad628173aa32e2e08e0b471c939582f289cea7009690451a7eff0e1a3c2e94724fbd5c52bcd0f4f70a449a80b4d6b3b10ba0a21c3

data/Rakefile

@@ -26,3 +26,11 @@ task :test_setup do
     exit($?.exitstatus) unless $?.success?
   end
 end
+
+require "github_changelog_generator/task"
+require "alchemy/json_api/version"
+GitHubChangelogGenerator::RakeTask.new(:changelog) do |config|
+  config.user = "AlchemyCMS"
+  config.project = "alchemy-json_api"
+  config.future_release = "v#{Alchemy::JsonApi::VERSION}"
+end

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

@@ -7,6 +7,23 @@ module Alchemy
       include JSONAPI::Errors
       include JSONAPI::Filtering
       include JSONAPI::Pagination
+
+      private
+
+      def render_jsonapi_internal_server_error(exception)
+        log_error(exception)
+        super
+      end
+
+      def log_error(exception)
+        logger = Rails.logger
+        return unless logger
+
+        message = +"\n#{exception.class} (#{exception.message}):\n"
+        message << exception.annotated_source_code.to_s if exception.respond_to?(:annotated_source_code)
+        message << "  " << exception.backtrace.join("\n  ")
+        logger.fatal("#{message}\n\n")
+      end
     end
   end
 end

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

@@ -1,25 +1,29 @@
 # frozen_string_literal: true
-module Alchemy::JsonApi
-  class ElementSerializer
-    include FastJsonapi::ObjectSerializer
-    attributes(
-      :position,
-      :created_at,
-      :updated_at,
-    )
-    attribute :element_type, &:name
-    belongs_to :parent_element, record_type: :element, serializer: self
+module Alchemy
+  module JsonApi
+    class ElementSerializer
+      include FastJsonapi::ObjectSerializer
+      attributes(
+        :name,
+        :fixed,
+        :position,
+        :created_at,
+        :updated_at,
+      )
+      belongs_to :parent_element, record_type: :element, serializer: self
 
-    belongs_to :page
-    has_many :essences, polymorphic: true do |element|
-      element.contents.map(&:essence)
-    end
+      belongs_to :page, record_type: :page, serializer: PageSerializer
+
+      has_many :essences, polymorphic: true do |element|
+        element.contents.map(&:essence)
+      end
 
-    has_many :nested_elements, record_type: :element, serializer: self
+      has_many :nested_elements, record_type: :element, serializer: self
 
-    with_options if: ->(_, params) { params[:admin] == true } do
-      attribute :tag_list
-      attribute :display_name, &:display_name_with_preview_text
+      with_options if: ->(_, params) { params[:admin] == true } do
+        attribute :tag_list
+        attribute :display_name, &:display_name_with_preview_text
+      end
     end
   end
 end

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

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssenceBooleanSerializer
-    include EssenceSerializer
+module Alchemy
+  module JsonApi
+    class EssenceBooleanSerializer
+      include EssenceSerializer
+    end
   end
 end

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

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssenceDateSerializer
-    include EssenceSerializer
+module Alchemy
+  module JsonApi
+    class EssenceDateSerializer
+      include EssenceSerializer
+    end
   end
 end

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

@@ -1,29 +1,31 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssenceFileSerializer
-    include EssenceSerializer
+module Alchemy
+  module JsonApi
+    class EssenceFileSerializer
+      include EssenceSerializer
 
-    attribute :link_title, &:title
+      attribute :link_title, &:title
 
-    attribute :ingredient, &:attachment_url
+      attribute :ingredient, &:attachment_url
 
-    with_options if: proc { |essence| essence.attachment.present? } do
-      attribute :attachment_name do |essence|
-        essence.attachment.name
-      end
+      with_options if: proc { |essence| essence.attachment.present? } do
+        attribute :attachment_name do |essence|
+          essence.attachment.name
+        end
 
-      attribute :attachment_file_name do |essence|
-        essence.attachment.file_name
-      end
+        attribute :attachment_file_name do |essence|
+          essence.attachment.file_name
+        end
 
-      attribute :attachment_mime_type do |essence|
-        essence.attachment.file_mime_type
-      end
+        attribute :attachment_mime_type do |essence|
+          essence.attachment.file_mime_type
+        end
 
-      attribute :attachment_file_size do |essence|
-        essence.attachment.file_size
+        attribute :attachment_file_size do |essence|
+          essence.attachment.file_size
+        end
       end
     end
   end

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

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssenceHtmlSerializer
-    include EssenceSerializer
+module Alchemy
+  module JsonApi
+    class EssenceHtmlSerializer
+      include EssenceSerializer
+    end
   end
 end

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

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssenceLinkSerializer
-    include EssenceSerializer
-    attributes(
-      :link_title,
-      :link_target,
-    )
+module Alchemy
+  module JsonApi
+    class EssenceLinkSerializer
+      include EssenceSerializer
+      attributes(
+        :link_title,
+        :link_target,
+      )
+    end
   end
 end

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

@@ -1,31 +1,33 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssenceNodeSerializer
-    include EssenceSerializer
+module Alchemy
+  module JsonApi
+    class EssenceNodeSerializer
+      include EssenceSerializer
 
-    attribute :ingredient do |essence|
-      essence&.node&.name
-    end
+      attribute :ingredient do |essence|
+        essence&.node&.name
+      end
 
-    belongs_to :node
+      belongs_to :node, record_type: :node, serializer: NodeSerializer
 
-    with_options if: proc { |essence| essence.node.present? } do
-      attribute :name do |essence|
-        essence.node.name
-      end
+      with_options if: proc { |essence| essence.node.present? } do
+        attribute :name do |essence|
+          essence.node.name
+        end
 
-      attribute :link_url do |essence|
-        essence.node.url
-      end
+        attribute :link_url do |essence|
+          essence.node.url
+        end
 
-      attribute :link_title do |essence|
-        essence.node.title
-      end
+        attribute :link_title do |essence|
+          essence.node.title
+        end
 
-      attribute :link_nofollow do |essence|
-        essence.node.nofollow
+        attribute :link_nofollow do |essence|
+          essence.node.nofollow
+        end
       end
     end
   end

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

@@ -1,22 +1,24 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssencePageSerializer
-    include EssenceSerializer
+module Alchemy
+  module JsonApi
+    class EssencePageSerializer
+      include EssenceSerializer
 
-    attribute :ingredient do |essence|
-      essence.page&.url_path
-    end
+      attribute :ingredient do |essence|
+        essence.page&.url_path
+      end
 
-    attribute :page_name do |essence|
-      essence.page&.name
-    end
+      attribute :page_name do |essence|
+        essence.page&.name
+      end
 
-    attribute :page_url do |essence|
-      essence.page&.url_path
-    end
+      attribute :page_url do |essence|
+        essence.page&.url_path
+      end
 
-    has_one :page, record_type: :page, serializer: PageSerializer
+      has_one :page, record_type: :page, serializer: PageSerializer
+    end
   end
 end

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

@@ -1,39 +1,41 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssencePictureSerializer
-    include EssenceSerializer
+module Alchemy
+  module JsonApi
+    class EssencePictureSerializer
+      include EssenceSerializer
 
-    attributes(
-      :title,
-      :caption,
-      :link_title,
-      :link_target,
-    )
-    attribute :ingredient, &:picture_url
-    attribute :alt_text, &:alt_tag
-    attribute :link_url, &:link
+      attributes(
+        :title,
+        :caption,
+        :link_title,
+        :link_target,
+      )
+      attribute :ingredient, &:picture_url
+      attribute :alt_text, &:alt_tag
+      attribute :link_url, &:link
 
-    with_options if: proc { |essence| essence.picture.present? } do
-      attribute :image_dimensions do |essence|
-        essence.sizes_from_string(essence.render_size)
-      end
+      with_options if: proc { |essence| essence.picture.present? } do
+        attribute :image_dimensions do |essence|
+          essence.sizes_from_string(essence.render_size)
+        end
 
-      attribute :image_name do |essence|
-        essence.picture.name
-      end
+        attribute :image_name do |essence|
+          essence.picture.name
+        end
 
-      attribute :image_file_name do |essence|
-        essence.picture.image_file_name
-      end
+        attribute :image_file_name do |essence|
+          essence.picture.image_file_name
+        end
 
-      attribute :image_mime_type do |essence|
-        "image/#{essence.picture.image_file_format}"
-      end
+        attribute :image_mime_type do |essence|
+          "image/#{essence.picture.image_file_format}"
+        end
 
-      attribute :image_file_size do |essence|
-        essence.picture.image_file_size
+        attribute :image_file_size do |essence|
+          essence.picture.image_file_size
+        end
       end
     end
   end

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

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssenceRichtextSerializer
-    include EssenceSerializer
-    attributes(
-      :body,
-      :stripped_body,
-    )
+module Alchemy
+  module JsonApi
+    class EssenceRichtextSerializer
+      include EssenceSerializer
+      attributes(
+        :body,
+        :stripped_body,
+      )
+    end
   end
 end

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

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssenceSelectSerializer
-    include EssenceSerializer
+module Alchemy
+  module JsonApi
+    class EssenceSelectSerializer
+      include EssenceSerializer
+    end
   end
 end

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

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
 
-module Alchemy::JsonApi
-  class EssenceTextSerializer
-    include EssenceSerializer
-    attributes(
-      :body,
-      :link_title,
-      :link_target,
-    )
-    attribute :link_url, &:link
+module Alchemy
+  module JsonApi
+    class EssenceTextSerializer
+      include EssenceSerializer
+      attributes(
+        :body,
+        :link_title,
+        :link_target,
+      )
+      attribute :link_url, &:link
+    end
   end
 end

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

@@ -15,9 +15,10 @@ module Alchemy
         :updated_at,
       )
 
-      belongs_to :language
+      belongs_to :language, record_type: :language, serializer: LanguageSerializer
 
-      has_many :elements
+      has_many :elements, record_type: :element, serializer: ElementSerializer
+      has_many :fixed_elements, record_type: :element, serializer: ElementSerializer
 
       has_many :all_elements, record_type: :element, serializer: ElementSerializer do |page|
         page.all_elements.select { |e| e.public? && !e.trashed? }

data/lib/alchemy/json_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
   requirement: !ruby/object:Gem::Requirement