alchemy-json_api 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75009d101abaf01259e6cedae35acc22f02168d0714e6a3eda87e280361d3b91
-  data.tar.gz: f40dd94a84033d62409e3c4fffd261ec03ed1193017f8b6baf90bb2d2aec9ae8
+  metadata.gz: d820e87bf877fa770b6145ca3e2e50b907bb673d917a416723ad13b3edb72158
+  data.tar.gz: 907f95e93d6bbe7bcd57e64b768d86ad459dd7fb5fd957692e16eaf251369be0
 SHA512:
-  metadata.gz: 9b326f105a93d6752282112615888ee3e86bf72c5486a3ad77547fb9dae664bcbf3325ee902b04d192b96dacc5bd60935ed37bc827874f72bc2522a48a890e0f
-  data.tar.gz: 55149b58ba90ef71688029b1f13ca2789ae00ae5b230989e670ae05a41c2b58df17ce2210429dbef3393f6304c663730f20bf9fc69440a90871c06dabe39a425
+  metadata.gz: c1119df682cb6a9cb82447da59a3f24afc59c7dad9fb44c65dd8a16dbfdc74826ebab74d65e2b697e2fc7117519d71d8dafc149b71f035f32b7da4be02edce03
+  data.tar.gz: 0d83f06aa5aeeaf44712096197324bab31be452196d795504ee2ec0b3d34006de68b41ce20c3ad6a2fff84251d13184a953d165b7cf06b32b9c9df7849f5d24d

data/Rakefile

@@ -21,6 +21,7 @@ task :test_setup do
       export RAILS_ENV=test && \
       bin/rake db:environment:set db:drop && \
       bin/rake railties:install:migrations && \
+      bin/rails g alchemy:devise:install --force && \
       bin/rake db:migrate
     SETUP
     exit($?.exitstatus) unless $?.success?

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

@@ -3,12 +3,28 @@ module Alchemy
   module JsonApi
     class BaseController < ::ApplicationController
       include Alchemy::ControllerActions
+      include Alchemy::AbilityHelper
       include JSONAPI::Fetching
-      if Rails.env.production?
-        include JSONAPI::Errors
-      end
+      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

@@ -46,9 +46,14 @@ module Alchemy
       end
 
       def base_page_scope
-        ::Alchemy::Page.
+        # cancancan is not able to merge our complex AR scopes for logged in users
+        if can?(:edit_content, Page)
+          pages = Page.all
+        else
+          pages = Page.accessible_by(current_ability, :index)
+        end
+        pages.
           with_language(Language.current).
-          published.
           preload(language: {nodes: [:parent, :page]}, all_elements: [:parent_element, :nested_elements, { contents: { essence: :ingredient_association } }])
       end
 

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

@@ -12,7 +12,8 @@ module Alchemy
       )
       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,12 +15,12 @@ module Alchemy
         :updated_at,
       )
 
-      belongs_to :language
+      belongs_to :language, record_type: :language, serializer: ::Alchemy::JsonApi::LanguageSerializer
 
-      has_many :elements
-      has_many :fixed_elements, record_type: :element, serializer: ElementSerializer
+      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.5.0"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A JSONAPI compliant API for AlchemyCMS