alchemy-json_api 0.7.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe4670c3c86dc4038be27367e22edf73b08771a8821897f7ff09155edeeac2b
-  data.tar.gz: 6df10ac401188dcc94e927569bc6b9fd1303b19b03a46738e296fd35cdd34619
+  metadata.gz: bf4587d53cdd7cc5122e9cfff386da6534132339134bbe77d45261fae3355e25
+  data.tar.gz: d04f9543b7906bec3ed4960340a3b94ce0e24b9220a2ac039b136d81c5bada01
 SHA512:
-  metadata.gz: c537c5b7007113d5da441a755e1f138805782223015e50da29fe7c73476abdbd45b760dcb5088ad1ef2e866435d4439602d0ee71f90ce16c250376b948016b0e
-  data.tar.gz: '08e1e57a768cbcae7332257f97766175b9bf5b4d8520dd8fa0904d4b296a933154eeb3f0e7d7e0f4ce2dd06641153350d008671cebb3fd072f98d9185c7bb32c'
+  metadata.gz: d0b6a8b5911435aba0ab48c23e6a88b5b47d3133be15077b7862e072a8ac5238676407a504acec855c8aae98c84fb68e8e34e9e795464067c4be9039b8e3030e
+  data.tar.gz: edb82694d23e2404ae6711c98600707f54e09d49e239b7334b8dea8baab966ebc071d49f6c38302d4231ab19b283f8b6969b1aa9467c81e6cd6eaabc57e198dd

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,6 +3,7 @@ module Alchemy
   module JsonApi
     class BaseController < ::ApplicationController
       include Alchemy::ControllerActions
+      include Alchemy::AbilityHelper
       include JSONAPI::Fetching
       include JSONAPI::Errors
       include JSONAPI::Filtering

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

@@ -4,8 +4,12 @@ module Alchemy
     class LayoutPagesController < JsonApi::PagesController
       private
 
+      def base_page_scope
+        Page.all
+      end
+
       def page_scope
-        base_page_scope.layoutpages
+        page_scope_with_includes.layoutpages
       end
     end
   end

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

@@ -42,16 +42,24 @@ module Alchemy
       end
 
       def page_scope
-        base_page_scope.contentpages
+        page_scope_with_includes.contentpages
       end
 
-      def base_page_scope
-        ::Alchemy::Page.
+      def page_scope_with_includes
+        base_page_scope.
           with_language(Language.current).
-          published.
           preload(language: {nodes: [:parent, :page]}, all_elements: [:parent_element, :nested_elements, { contents: { essence: :ingredient_association } }])
       end
 
+      def base_page_scope
+        # cancancan is not able to merge our complex AR scopes for logged in users
+        if can?(:edit_content, Page)
+          Page.all
+        else
+          Page.published
+        end
+      end
+
       def jsonapi_serializer_class(_resource, _is_collection)
         ::Alchemy::JsonApi::PageSerializer
       end

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

@@ -2,7 +2,8 @@
 module Alchemy
   module JsonApi
     class ElementSerializer
-      include FastJsonapi::ObjectSerializer
+      include JSONAPI::Serializer
+
       attributes(
         :name,
         :fixed,
@@ -15,7 +16,7 @@ module Alchemy
       belongs_to :page, record_type: :page, serializer: ::Alchemy::JsonApi::PageSerializer
 
       has_many :essences, polymorphic: true do |element|
-        element.contents.map(&:essence)
+        element.contents.reject { |c| !!c.try(:deprecated?) }.map!(&:essence)
       end
 
       has_many :nested_elements, record_type: :element, serializer: self

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

@@ -2,7 +2,8 @@
 module Alchemy
   module JsonApi
     class LanguageSerializer
-      include FastJsonapi::ObjectSerializer
+      include JSONAPI::Serializer
+
       attributes(
         :name,
         :language_code,

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

@@ -2,7 +2,7 @@
 module Alchemy
   module JsonApi
     class NodeSerializer
-      include FastJsonapi::ObjectSerializer
+      include JSONAPI::Serializer
 
       attributes :name
       attribute :link_url, &:url

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

@@ -2,7 +2,8 @@
 module Alchemy
   module JsonApi
     class PageSerializer
-      include FastJsonapi::ObjectSerializer
+      include JSONAPI::Serializer
+
       attributes(
         :name,
         :urlname,
@@ -21,7 +22,7 @@ module Alchemy
       has_many :fixed_elements, record_type: :element, serializer: ::Alchemy::JsonApi::ElementSerializer
 
       has_many :all_elements, record_type: :element, serializer: ::Alchemy::JsonApi::ElementSerializer do |page|
-        page.all_elements.select { |e| e.public? && !e.trashed? }
+        page.all_elements.select { |e| e.public? && !e.trashed? && !e.try(:deprecated?) }
       end
 
       with_options if: ->(_, params) { params[:admin] == true } do

data/lib/alchemy/json_api/essence_serializer.rb

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

data/lib/alchemy/json_api/version.rb

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

metadata

@@ -1,57 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Martin Meyerhoff
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: fast_jsonapi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: jsonapi.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +139,7 @@ homepage: https://github.com/AlchemyCMS/alchemy-json_api
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +154,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: []