alchemy-json_api 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe4670c3c86dc4038be27367e22edf73b08771a8821897f7ff09155edeeac2b
-  data.tar.gz: 6df10ac401188dcc94e927569bc6b9fd1303b19b03a46738e296fd35cdd34619
+  metadata.gz: d820e87bf877fa770b6145ca3e2e50b907bb673d917a416723ad13b3edb72158
+  data.tar.gz: 907f95e93d6bbe7bcd57e64b768d86ad459dd7fb5fd957692e16eaf251369be0
 SHA512:
-  metadata.gz: c537c5b7007113d5da441a755e1f138805782223015e50da29fe7c73476abdbd45b760dcb5088ad1ef2e866435d4439602d0ee71f90ce16c250376b948016b0e
-  data.tar.gz: '08e1e57a768cbcae7332257f97766175b9bf5b4d8520dd8fa0904d4b296a933154eeb3f0e7d7e0f4ce2dd06641153350d008671cebb3fd072f98d9185c7bb32c'
+  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,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/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/lib/alchemy/json_api/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-json_api
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Martin Meyerhoff
@@ -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