alchemy-json_api 0.2.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf27f9f29046c7ad0e2d417d3c9cca5e0d58d59c7bc729119d76f37adeaa4b28
-  data.tar.gz: 697deefd22185ca5df6811f9687129e34c33e445feacae02f71fd045f5e96830
+  metadata.gz: 117c65c9f829b02d27cc3bc000c9a9f796816c4c7d5a99fb191752d3f0a4c6d2
+  data.tar.gz: 1a51fb6c7d8ed4987c2393f37acbf6f4d601ffa4e2c11a9a0af415624c17e938
 SHA512:
-  metadata.gz: 9d6fc09988a259d084f4e34440985dbe85122c191342bf7b4b722b559f1e3d9500ffd7ab3e6e4c32748a946305ca5b96fc0ff13fcb9236d73626b57116e8bf70
-  data.tar.gz: 139fc4a4b1e17957dd1cddad50a6f26601e773adb5b83b41a0fb2234cddc58d6f9aa24f24000f00607fa64cee0d3e7304105f396204c9c72fcd50c500e1d3460
+  metadata.gz: 448e55aac748eda835d9341b784e28907fa5159251974ff1a2cf12d365a7f1cdcd892d8565ef4c1fcdc0fa74ab27de0273e20d7fbf1dc0955f7009fd7f73c8c2
+  data.tar.gz: d6ede97400574f3e02aac76adb72923dc5aae7f1979dea08302d59d2c8ec6aa2500d972b26cf39daec98deb10f1ce8e2811f2b09060939260faa4f26a4e8992e

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/controllers/alchemy/json_api/pages_controller.rb

@@ -34,12 +34,11 @@ module Alchemy
       end
 
       def load_page_by_id
-        page_scope.find_by(id: params[:id])
+        page_scope.find_by(id: params[:path])
       end
 
       def load_page_by_urlname
-        # The route param is called :id although it might be a string
-        page_scope.find_by(urlname: params[:id])
+        page_scope.find_by(urlname: params[:path])
       end
 
       def page_scope

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

@@ -1,25 +1,28 @@
 # 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
+      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,30 +1,31 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
-require "alchemy/json_api/link_helper"
 
-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,32 +1,33 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
-require "alchemy/json_api/link_helper"
 
-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
 
-    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

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

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

@@ -1,40 +1,41 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
-require "alchemy/json_api/link_helper"
 
-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

@@ -18,6 +18,7 @@ module Alchemy
       belongs_to :language
 
       has_many :elements
+      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/config/routes.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 Alchemy::JsonApi::Engine.routes.draw do
-  resources :pages, only: [:show, :index]
-  resources :layout_pages, only: [:show, :index]
+  resources :pages, only: [:index]
+  get "pages/*path" => "pages#show", as: :page
+  resources :layout_pages, only: [:index]
+  get "layout_pages/*path" => "layout_pages#show", as: :layout_page
 end

data/lib/alchemy/json_api/test_support/essence_serializer_behaviour.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+RSpec.shared_examples "an essence serializer" do
+  describe "attributes" do
+    subject { serializer.serializable_hash[:data][:attributes] }
+
+    it "has the right keys and values" do
+      expect(subject).to have_key(:ingredient)
+    end
+  end
+
+  describe "relationships" do
+    subject { serializer.serializable_hash[:data][:relationships] }
+
+    it "has the right keys and values" do
+      expect(subject[:element]).to eq(data: { id: essence.element.id.to_s, type: :element })
+    end
+  end
+end

data/lib/alchemy/json_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Martin Meyerhoff
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 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
@@ -114,6 +128,7 @@ files:
 - app/serializers/alchemy/json_api/essence_html_serializer.rb
 - app/serializers/alchemy/json_api/essence_link_serializer.rb
 - app/serializers/alchemy/json_api/essence_node_serializer.rb
+- app/serializers/alchemy/json_api/essence_page_serializer.rb
 - app/serializers/alchemy/json_api/essence_picture_serializer.rb
 - app/serializers/alchemy/json_api/essence_richtext_serializer.rb
 - app/serializers/alchemy/json_api/essence_select_serializer.rb
@@ -125,14 +140,14 @@ files:
 - lib/alchemy/json_api.rb
 - lib/alchemy/json_api/engine.rb
 - lib/alchemy/json_api/essence_serializer.rb
-- lib/alchemy/json_api/link_helper.rb
+- lib/alchemy/json_api/test_support/essence_serializer_behaviour.rb
 - lib/alchemy/json_api/version.rb
 - lib/tasks/alchemy/json_api_tasks.rake
 homepage: https://github.com/AlchemyCMS/alchemy-json_api
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A JSONAPI compliant API for AlchemyCMS
 test_files: []

data/lib/alchemy/json_api/link_helper.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-module Alchemy
-  module JsonApi
-    module LinkHelper
-      def alchemy_link(path_base, object)
-        return unless object
-
-        if Rails.application.routes.default_url_options[:host]
-          Alchemy::Engine.routes.url_helpers.public_send("#{path_base}_url", object)
-        else
-          Alchemy::Engine.routes.url_helpers.public_send("#{path_base}_path", object)
-        end
-      end
-    end
-  end
-end