alchemy-json_api 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf27f9f29046c7ad0e2d417d3c9cca5e0d58d59c7bc729119d76f37adeaa4b28
-  data.tar.gz: 697deefd22185ca5df6811f9687129e34c33e445feacae02f71fd045f5e96830
+  metadata.gz: 3046cd47b8e5d362917e2c8b595bc25c338e4bdf94a71dabb21794c1aabf913a
+  data.tar.gz: 0670ad88fa25050738ce80692e1004b8b0016b3c25df8596f76fe0b054ed4e51
 SHA512:
-  metadata.gz: 9d6fc09988a259d084f4e34440985dbe85122c191342bf7b4b722b559f1e3d9500ffd7ab3e6e4c32748a946305ca5b96fc0ff13fcb9236d73626b57116e8bf70
-  data.tar.gz: 139fc4a4b1e17957dd1cddad50a6f26601e773adb5b83b41a0fb2234cddc58d6f9aa24f24000f00607fa64cee0d3e7304105f396204c9c72fcd50c500e1d3460
+  metadata.gz: 9d48b6c6692e7330db7daeaedc03c177a89ec55225f0f3c96145fd42f7eccf972cc757a47120279f3cf34dffdb3b92aba9b8974a420743a7c0f2f35454fd5f68
+  data.tar.gz: 9071f12da6fe44f21971cb85d53890691f0702f73396ec2e5ef08e7d6439d601aaa6625815c1a6867f15c25cdd23f1c69af67d1111769368df2d2b902e602407

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/essence_file_serializer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
-require "alchemy/json_api/link_helper"
 
 module Alchemy::JsonApi
   class EssenceFileSerializer

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
-require "alchemy/json_api/link_helper"
 
 module Alchemy::JsonApi
   class EssenceNodeSerializer

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require "alchemy/json_api/essence_serializer"
+
+module Alchemy::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

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "alchemy/json_api/essence_serializer"
-require "alchemy/json_api/link_helper"
 
 module Alchemy::JsonApi
   class EssencePictureSerializer

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.3.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.3.0
 platform: ruby
 authors:
 - Martin Meyerhoff
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -114,6 +114,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 +126,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
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+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