effective_pages 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56bbdfa9406cb66a2fc4171e85e118038d339b056555a33fbc105880397772c7
-  data.tar.gz: a5bf336957ac12e9cb39a4e20be9f649cf89fa5a2be0dabb17638db7fd4efde2
+  metadata.gz: ccfde3b643933010d2ed2b254f381eda959b5d057cf9e30ab1cb1e2ed57adfaf
+  data.tar.gz: 5021c6f8feb8dfddc5f32ae1e076c976f7fc15408d0c69db25ae37e8c40da834
 SHA512:
-  metadata.gz: ceef3c2528eefddfbfdc15c03c36b4f9f1b77b4cd8c4ff8ed683f6bdd1c8fdbd034d3138b24de88840d2cc93d1a6302629884187ceb4ddacc1c8ce1e2e4834dc
-  data.tar.gz: dc8d257ad150d15d2fd9d4784ed3a22dfc7b353544dd0f723f5d356bb463d92aa6cf29229be251bc576222c0eeed2e3dca5ac17c6a28cba3690735f78bf647d6
+  metadata.gz: 70284db9597483e1ff7117056a18c282c7c822c372a6f5d1826e1d01ad4fbdba6603385e584c64040b0e2a0702590f3427d258837a38829cdbf340e5650ee613
+  data.tar.gz: f0f64d3c8739c2aeefb511cbbd1b6fd505728e7608f06684c020c68781d0baf005b753919da9b0ed2cdaad0dcc637d5016d43ac3c7750e12344a7464a6b26678

data/app/controllers/admin/pages_controller.rb

@@ -14,5 +14,9 @@ module Admin
     submit :save, 'Save and View', redirect: -> { effective_pages.page_path(resource) }
     submit :save, 'Duplicate', only: :edit, redirect: -> { effective_posts.new_admin_page_path(duplicate_id: resource.id) }
 
+    def permitted_params
+      params.require(:effective_page).permit!
+    end
+
   end
 end

data/app/controllers/effective/pages_controller.rb

@@ -1,7 +1,5 @@
 module Effective
   class PagesController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise) && EffectiveResources.authenticate_user
-
     include Effective::CrudController
 
     def show
@@ -10,9 +8,11 @@ module Effective
 
       @page = @pages.find(params[:id])
 
-      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)
+      if @page.authenticate_user? || @page.roles.present?
+        authenticate_user!
+      end
 
+      raise Effective::AccessDenied.new('Access Denied', :show, @page) unless @page.roles_permit?(current_user)
       EffectiveResources.authorize!(self, :show, @page)
 
       @page_title = @page.title
@@ -29,7 +29,7 @@ module Effective
       end
 
       template = File.join(EffectivePages.pages_path, @page.template)
-      layout = (@page.layout.presence || resource_layout)
+      layout = File.join(EffectivePages.layouts_path, @page.layout)
 
       render(template, layout: layout, locals: { page: @page })
     end

data/app/models/effective/page.rb

@@ -2,13 +2,17 @@ module Effective
   class Page < ActiveRecord::Base
     attr_accessor :current_user
 
-    acts_as_slugged
+    # These parent / children are for the menu as well
+    belongs_to :menu_parent, class_name: 'Effective::Page', optional: true
+
+    has_many :menu_children, -> { Effective::Page.menuable }, class_name: 'Effective::Page',
+      foreign_key: :menu_parent_id, inverse_of: :menu_parent
 
-    log_changes if respond_to?(:log_changes)
     acts_as_role_restricted
+    acts_as_slugged
+    has_many_rich_texts
 
-    has_rich_text :body
-    has_many :menu_items, as: :menuable, dependent: :destroy
+    log_changes if respond_to?(:log_changes)
 
     self.table_name = EffectivePages.pages_table_name.to_s
 
@@ -22,7 +26,15 @@ module Effective
       template          :string
 
       slug              :string
+
       roles_mask        :integer
+      authenticate_user :boolean
+
+      # Menu stuff
+      menu              :boolean
+      menu_name         :string
+      menu_url          :string
+      menu_position     :integer
 
       timestamps
     end
@@ -32,11 +44,20 @@ module Effective
 
     validates :template, presence: true
 
+    # validates :menu_name, if: -> { menu? },
+    #   presence: true, inclusion: { in: EffectivePages.menus }
+
+    # validates :menu_position, if: -> { menu? },
+    #   presence: true, uniqueness: { scope: [:menu_name, :menu_parent_id] }
+
     scope :drafts, -> { where(draft: true) }
     scope :published, -> { where(draft: false) }
     scope :sorted, -> { order(:title) }
     scope :except_home, -> { where.not(title: 'Home') }
 
+    scope :menuable, -> { where(menu: true).order(:menu_position) }
+    scope :for_menu, -> (name) { menuable.where(menu_name: name) }
+
     def to_s
       title
     end

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

@@ -18,12 +18,11 @@
   = f.text_field :meta_description, hint: "A one or two sentence summary of this page. Appears on Google search results underneath the page title.", input_html: { maxlength: 150 }
 
   = render partial: '/admin/pages/additional_fields', locals: { page: page, form: f, f: f }
-
-  = f.rich_text_area :body, hint: 'The main body of your page'
+  = render partial: '/admin/pages/rich_texts', locals: { page: page, form: f, f: f }
 
   = f.check_box :draft, label: 'Save this page as a draft. It will not be accessible on the website.'
 
-  - if defined?(EffectiveRoles) and f.object.respond_to?(:roles) && EffectivePages.use_effective_roles
+  - if EffectivePages.use_effective_roles
     = render partial: '/admin/pages/roles', locals: { page: page, form: f, f: f }
 
   = effective_submit(f)

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

@@ -0,0 +1,2 @@
+= f.rich_text_area :rich_text_body, hint: 'The main body of your page'
+= f.rich_text_area :rich_text_sidebar, hint: 'The sidebar content of your page'

data/config/effective_pages.rb

@@ -3,8 +3,8 @@ 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 menu names a page can belong to
+  config.menus = [:main, :footer]
 
   # The directory where your page templates live
   # Any files in this directory will be automatically available when

data/config/routes.rb

@@ -1,9 +1,3 @@
-class EffectivePagesConstraint
-  def self.matches?(request)
-    Effective::Page.find(request.path_parameters[:id] || '/').present? rescue false
-  end
-end
-
 EffectivePages::Engine.routes.draw do
   namespace :admin do
     resources :pages, except: [:show]
@@ -11,7 +5,9 @@ EffectivePages::Engine.routes.draw do
   end
 
   scope module: 'effective' do
-    get '*id', to: 'pages#show', constraints: EffectivePagesConstraint, as: :page
+    match '*id', to: 'pages#show', via: :get, as: :page, constraints: lambda { |req|
+      Effective::Page.find_by_slug_or_id(req.path_parameters[:id] || '/').present?
+    }
   end
 end
 

data/db/migrate/01_create_effective_pages.rb.erb

@@ -4,13 +4,21 @@ class CreateEffectivePages < ActiveRecord::Migration[4.2]
       t.string :title
       t.string :meta_description
 
-      t.boolean :draft, :default => false
+      t.boolean :draft, default: false
 
-      t.string :layout, :default => 'application'
+      t.string :layout, default: 'application'
       t.string :template
 
       t.string :slug
-      t.integer :roles_mask, :default => 0
+
+      t.boolean :authenticate_user, default: false
+      t.integer :roles_mask, default: 0
+
+      t.integer :menu_parent_id
+      t.boolean :menu, default: true
+      t.string :menu_name
+      t.string :menu_url
+      t.integer :menu_position
 
       t.datetime :updated_at
       t.datetime :created_at

data/lib/effective_pages.rb

@@ -12,7 +12,7 @@ module EffectivePages
       :site_og_image, :site_og_image_width, :site_og_image_height,
       :site_title, :site_title_suffix, :fallback_meta_description,
       :silence_missing_page_title_warnings, :silence_missing_meta_description_warnings, :silence_missing_canonical_url_warnings,
-      :use_effective_roles, :authenticate_user, :menu, :layout
+      :use_effective_roles, :menus, :menu, :layout
     ]
   end
 
@@ -39,10 +39,4 @@ module EffectivePages
     end.compact.sort
   end
 
-  def self.permitted_params
-    @permitted_params ||= [
-      :title, :meta_description, :draft, :layout, :template, :slug, roles: []
-    ]
-  end
-
 end

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,6 +95,7 @@ files:
 - app/views/admin/menus/show.html.haml
 - app/views/admin/pages/_additional_fields.html.haml
 - app/views/admin/pages/_form.html.haml
+- app/views/admin/pages/_rich_texts.html.haml
 - app/views/admin/pages/_roles.html.haml
 - config/effective_pages.rb
 - config/routes.rb