effective_pages 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64d6ac4c034e7b55034c50c15f907f937110daa117af3bb2579547fd1da3a4c3
-  data.tar.gz: 61b61f6a912e821e77c07298723f8864c4fc6669e4f5719f8a6c98190bd4164b
+  metadata.gz: 4c9f8085e8926499de3786ac923688c20ca98ac0961fa91d46918dc4061684af
+  data.tar.gz: 96520c4452017a88c201c7d37378f57a421ae6f7ddefe5dc22803589d4768d38
 SHA512:
-  metadata.gz: 4b5eb44075781cf1a5790e7e5cf7b24af4ed58fb849e4270c5be20c3a51069ccea30ff0327c29aa0f6464f0282cd53b79d2568499627511cdb19b0fefe737e54
-  data.tar.gz: 0ad912da27c0cb8b7b3c625fd9e1d90025290fa987b3db6a4f1385d843972d1fa8a59287d4061ddd21ef441a94ca81634764d9125084520d9d351f18ec8f6d13
+  metadata.gz: 953b7b048450e900a145d65611f06b2b53ecfa8437470d48cc6c7a438d7736a892032da7b3592073cc0f01c3f10942efd980ed53556e40438724ef96e3b753e4
+  data.tar.gz: 1ee0ed1d174602c4c91f009f1e29bb79deb67b6bf39474ae47cdcc55b2b8efc5fa85377e05b2461abb901ccf07a0047d1164ad8a7114bb0ac9e522eb37327539

data/README.md

@@ -11,11 +11,11 @@ Built ontop of effective_regions and effective_ckeditor.
 
 ## effective_pages 2.0
 
-This is the 2.0 series of effective_pages.
+This is the 2.0 / bootstrap4 series of effective_pages.
 
 This requires Twitter Bootstrap 4 and Rails 5.1+
 
-Please check out [bootstrap3 branch](https://github.com/code-and-effect/effective_datatables/tree/bootstrap3) for more information using this gem with Bootstrap 3.
+Please check out [bootstrap3 branch](https://github.com/code-and-effect/effective_pages/tree/bootstrap3) for more information using this gem with Bootstrap 3.
 
 
 ## Getting Started
@@ -250,5 +250,3 @@ MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Bonus points for test coverage
 6. Create new Pull Request
-
-

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,17 +11,18 @@ 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
+      @canonical_url = effective_pages.page_url(@page)
 
       if EffectivePages.authorized?(self, :admin, :effective_pages)
         flash.now[:warning] = [
           'Hi Admin!',
           ('You are viewing a hidden page.' unless @page.published?),
           'Click here to',
-          ("<a href='#{effective_regions.edit_path(effective_pages.page_path(@page))}' class='alert-link'>edit page content</a> or" unless admin_edit?),
+          ("<a href='#{effective_regions.edit_path(effective_pages.page_path(@page))}' class='alert-link' data-no-turbolink='true' data-turbolinks='false'>edit page content</a> or" unless admin_edit?),
           ("<a href='#{effective_pages.edit_admin_page_path(@page)}' class='alert-link'>edit page settings</a>.")
         ].compact.join(' ')
       end

data/app/helpers/effective_pages_helper.rb

@@ -2,7 +2,7 @@ module EffectivePagesHelper
 
   def effective_pages_body_classes
     [
-      params[:controller].parameterize,
+      params[:controller].to_s.parameterize,
       params[:action],
       ((user_signed_in? ? 'signed-in'.freeze : 'not-signed-in'.freeze) rescue nil),
       (@page.template rescue nil),
@@ -39,14 +39,18 @@ module EffectivePagesHelper
       ]
 
       if EffectivePages.site_og_image_width.present?
-        tags << tag(:meta, property: 'og:image:width', content: EffectivePages.site_og_image_width) 
+        tags << tag(:meta, property: 'og:image:width', content: EffectivePages.site_og_image_width)
       end
 
       if EffectivePages.site_og_image_height.present?
-        tags << tag(:meta, property: 'og:image:height', content: EffectivePages.site_og_image_height) 
+        tags << tag(:meta, property: 'og:image:height', content: EffectivePages.site_og_image_height)
       end
     end
 
+    if effective_pages_canonical_url.present?
+      tags << tag(:link, rel: 'canonical', href: effective_pages_canonical_url)
+    end
+
     tags.compact.join("\n").html_safe
   end
 
@@ -70,6 +74,14 @@ module EffectivePagesHelper
     truncate((@meta_description || EffectivePages.fallback_meta_description).to_s, length: 150)
   end
 
+  def effective_pages_canonical_url
+    unless @canonical_url.present? || EffectivePages.silence_missing_canonical_url_warnings
+      Rails.logger.error("WARNING: (effective_pages) Expected @canonical_url to be present. Please assign a @canonical_url variable in your controller action.")
+    end
+
+    @canonical_url
+  end
+
   def effective_pages_og_type
     @effective_pages_og_type || 'website'
   end

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/menus/show.html.haml

@@ -7,7 +7,7 @@
         All menu editing may be done from the fullscreen editor. Just drag and drop menu items.
     .col-sm-6
       %p.text-right
-        = link_to "Edit #{@menu}", effective_regions.edit_path('/'), class: 'btn btn-primary', 'data-no-turbolink': true, target: '_blank'
+        = link_to "Edit #{@menu}", effective_regions.edit_path('/'), class: 'btn btn-primary', 'data-no-turbolink': true, 'data-turbolinks': false, target: '_blank'
 
 - if defined?(EffectiveRoles)
   %h2 Menu Items

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, target: '_blank'
-  = dropdown_link_to 'View', effective_pages.page_path(page), 'data-no-turbolink': true, 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
@@ -37,6 +40,8 @@ EffectivePages.setup do |config|
   # Turn off missing meta page title and meta description warnings
   config.silence_missing_page_title_warnings = false
   config.silence_missing_meta_description_warnings = false
+  config.silence_missing_canonical_url_warnings = false
+
 
   # Display the effective roles 'choose roles' input when an admin creates a new post
   config.use_effective_roles = false

data/lib/effective_pages.rb

@@ -23,8 +23,10 @@ module EffectivePages
 
   mattr_accessor :silence_missing_page_title_warnings
   mattr_accessor :silence_missing_meta_description_warnings
-  
+  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.5'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,7 +132,7 @@ homepage: https://github.com/code-and-effect/effective_pages
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +147,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.2
+signing_key:
 specification_version: 4
 summary: Content pages for your rails app
 test_files: []