effective_pages 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 215d1a7ca112ac8f5f799b186fa6fab449340ea338e77da1676cb5c4745fff0c
-  data.tar.gz: 6332e9e8799752a6ff3d93117fb7f0b10b78ef3691e6b62faccf73a76e4da587
+  metadata.gz: b298b87af43901b5d92f8bcb5cf504fa4d3c713f1b64814a45791d491d1b5d81
+  data.tar.gz: c6306cc6b24c38e9155ae875db90c2c16745a48fcf4da456653011fdff364b44
 SHA512:
-  metadata.gz: 3c2329ad44abe3d85007d94e4e76e487a9b2decda4e4ea91f9f7c61676a576ac20b6a77dc7b1b1481904903611152e024b3b7aadcd9ea1a9767ac91d9b7a8c85
-  data.tar.gz: fb1f224d1b1696c7f4bacbc9a0563760d1d7e4727a9d35b9cc842cae1ebeb5f87e453fa59ed2ff66dc2b8e8bc01c4baa1998838e277fbd066a7ff65777ad9f51
+  metadata.gz: dcd50073b96b4ded0b1e15c67187e8f9fe92936562df620cbdb2f600adeb4d5f36ccbe7a19bf7e1dcc81ab1ae7e8b62c09b83c2e9e888872bb17402f5326103d
+  data.tar.gz: fe88e46fd6782778b8b2ea2283ca91c4f223bcd8b998f78ef234f94a11c26098634af5ef309caf0efd481cfd3b1f6af3193c6b829bb1af182995f754a1256d4d

data/app/controllers/admin/menus_controller.rb

@@ -45,8 +45,8 @@ module Admin
     private
 
     def authorize_effective_menus!
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, action_name.to_sym, @menu || Effective::Menu)
+      EffectivePages.authorize!(self, :admin, :effective_pages)
+      EffectivePages.authorize!(self, action_name.to_sym, @menu || Effective::Menu)
     end
 
     def menu_params

data/app/controllers/admin/pages_controller.rb

@@ -101,8 +101,8 @@ module Admin
     private
 
     def authorize_effective_pages!
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, action_name.to_sym, @page|| Effective::Page)
+      EffectivePages.authorize!(self, :admin, :effective_pages)
+      EffectivePages.authorize!(self, action_name.to_sym, @page || Effective::Page)
     end
 
     def page_params

data/app/controllers/effective/pages_controller.rb

@@ -1,5 +1,7 @@
 module Effective
   class PagesController < ApplicationController
+    before_action(:authenticate_user!) if EffectivePages.authenticate_user # Devise
+
     def show
       @pages = Effective::Page.all
       @pages = @pages.published unless EffectivePages.authorized?(self, :admin, :effective_pages)
@@ -9,7 +11,7 @@ module Effective
       raise ActiveRecord::RecordNotFound unless @page.present? # Incase .find() isn't raising it
       raise Effective::AccessDenied.new('Access Denied', :show, @page) unless @page.roles_permit?(current_user)
 
-      EffectivePages.authorized?(self, :show, @page)
+      EffectivePages.authorize!(self, :show, @page)
 
       @page_title = @page.title
       @meta_description = @page.meta_description

data/app/models/effective/page.rb

@@ -42,6 +42,14 @@ module Effective
       !draft?
     end
 
+    def content
+      region(:content).content
+    end
+
+    def content=(input)
+      region(:content).content = input
+    end
+
     # Returns a duplicated post object, or throws an exception
     def duplicate!
       Page.new(attributes.except('id', 'updated_at', 'created_at')).tap do |page|
@@ -60,7 +68,3 @@ module Effective
   end
 
 end
-
-
-
-

data/app/views/admin/pages/_actions.html.haml

@@ -1,7 +1,11 @@
 = dropdown(variation: :dropleft) do
-  = dropdown_link_to 'Edit', effective_pages.edit_admin_page_path(page)
-  = dropdown_link_to 'Edit Content', effective_regions.edit_path(page), 'data-no-turbolink': true, 'data-turbolinks': false, target: '_blank'
-  = dropdown_link_to 'View', effective_pages.page_path(page), 'data-no-turbolink': true, 'data-turbolinks': false, target: '_blank'
+  - if EffectivePages.authorized?(self, :edit, page)
+    = dropdown_link_to 'Edit', effective_pages.edit_admin_page_path(page)
+    = dropdown_link_to 'Edit Content', effective_regions.edit_path(page), 'data-no-turbolink': true, 'data-turbolinks': false, target: '_blank'
 
-  = dropdown_link_to "Delete #{page}", effective_pages.admin_page_path(page),
-    data: { method: :delete, confirm: "Really delete #{page}?" }
+  - if EffectivePages.authorized?(self, :show, page)
+    = dropdown_link_to 'View', effective_pages.page_path(page), 'data-no-turbolink': true, 'data-turbolinks': false, target: '_blank'
+
+  - if EffectivePages.authorized?(self, :destroy, page)
+    = dropdown_link_to "Delete #{page}", effective_pages.admin_page_path(page),
+      data: { method: :delete, confirm: "Really delete #{page}?" }

data/config/effective_pages.rb

@@ -3,6 +3,9 @@ EffectivePages.setup do |config|
   config.menus_table_name = :menus
   config.menu_items_table_name = :menu_items
 
+  # Call devise authenticate_user! as a before_action on Effective::Pages#show
+  config.authenticate_user = false
+
   # The directory where your page templates live
   # Any files in this directory will be automatically available when
   # creating/editting an Effective::Page from the Admin screens

data/lib/effective_pages.rb

@@ -26,6 +26,7 @@ module EffectivePages
   mattr_accessor :silence_missing_canonical_url_warnings
 
   mattr_accessor :use_effective_roles
+  mattr_accessor :authenticate_user
 
   mattr_accessor :menu
   mattr_accessor :authorization_method

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '2.0.8'.freeze
+  VERSION = '2.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails