alchemy-json_api 0.4.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea47ab9f8a57a02051be3608bc9e9522278c4141df1faa904a58f523b288e0f5
-  data.tar.gz: 26f82508a2ec37ec8545b3d2bb3d7430285b58a8187659f140a945057dbfc329
+  metadata.gz: 1fe4670c3c86dc4038be27367e22edf73b08771a8821897f7ff09155edeeac2b
+  data.tar.gz: 6df10ac401188dcc94e927569bc6b9fd1303b19b03a46738e296fd35cdd34619
 SHA512:
-  metadata.gz: b48a6480ca4015eed8e7d4bc0a391e573bde8ed56a56c9024c8fbe2b54aa52f0de198c9975fc828ee5e50dd9ff21aa8b1f595fe0c914111c2ac073e95a722c7f
-  data.tar.gz: e4c64ff707b456b459d3301f8d45118682f58b0e992ea6bda62d9db5b5edee3a66becc3feb0a6bdaf8136f76baeda73b20da367101f11615b6b67df724354b4e
+  metadata.gz: c537c5b7007113d5da441a755e1f138805782223015e50da29fe7c73476abdbd45b760dcb5088ad1ef2e866435d4439602d0ee71f90ce16c250376b948016b0e
+  data.tar.gz: '08e1e57a768cbcae7332257f97766175b9bf5b4d8520dd8fa0904d4b296a933154eeb3f0e7d7e0f4ce2dd06641153350d008671cebb3fd072f98d9185c7bb32c'

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

@@ -4,14 +4,16 @@ module Alchemy
     class ElementSerializer
       include FastJsonapi::ObjectSerializer
       attributes(
+        :name,
+        :fixed,
         :position,
         :created_at,
         :updated_at,
       )
-      attribute :element_type, &:name
       belongs_to :parent_element, record_type: :element, serializer: self
 
-      belongs_to :page
+      belongs_to :page, record_type: :page, serializer: ::Alchemy::JsonApi::PageSerializer
+
       has_many :essences, polymorphic: true do |element|
         element.contents.map(&:essence)
       end

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

@@ -10,7 +10,7 @@ module Alchemy
         essence&.node&.name
       end
 
-      belongs_to :node
+      belongs_to :node, record_type: :node, serializer: ::Alchemy::JsonApi::NodeSerializer
 
       with_options if: proc { |essence| essence.node.present? } do
         attribute :name do |essence|

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

@@ -18,7 +18,7 @@ module Alchemy
         essence.page&.url_path
       end
 
-      has_one :page, record_type: :page, serializer: PageSerializer
+      has_one :page, record_type: :page, serializer: ::Alchemy::JsonApi::PageSerializer
     end
   end
 end

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

@@ -10,13 +10,13 @@ module Alchemy
         :locale,
       )
 
-      has_many :menu_items, record_type: :node, serializer: NodeSerializer, object_method_name: :nodes, id_method_name: :node_ids
+      has_many :menu_items, record_type: :node, serializer: ::Alchemy::JsonApi::NodeSerializer, object_method_name: :nodes, id_method_name: :node_ids
 
-      has_many :menus, record_type: :node, serializer: NodeSerializer do |language|
+      has_many :menus, record_type: :node, serializer: ::Alchemy::JsonApi::NodeSerializer do |language|
         language.nodes.select { |n| n.parent.nil? }
       end
       has_many :pages
-      has_one :root_page, record_type: :page, serializer: PageSerializer
+      has_one :root_page, record_type: :page, serializer: ::Alchemy::JsonApi::PageSerializer
 
       with_options if: ->(_, params) { params[:admin] == true } do
         attribute :created_at

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

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

data/lib/alchemy/json_api/essence_serializer.rb

@@ -4,7 +4,7 @@ module Alchemy
     module EssenceSerializer
       def self.included(klass)
         klass.include FastJsonapi::ObjectSerializer
-        klass.has_one :element, record_type: :element, serializer: ElementSerializer do |essence|
+        klass.has_one :element, record_type: :element, serializer: ::Alchemy::JsonApi::ElementSerializer do |essence|
           essence.content.element
         end
         klass.attributes :ingredient

data/lib/alchemy/json_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.2
 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