effective_pages 2.0.8 → 3.0.2

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

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

data/app/views/effective/pages/_menu.html.haml

@@ -0,0 +1,20 @@
+- raise('expected a menu') unless menu.present?
+- menu = menu.to_s
+
+- Effective::Page.for_menu_root(menu).each do |page|
+  - next unless EffectiveResources.authorized?(self, :show, page)
+  - next if (page.authenticate_user || page.roles.present?) && current_user.blank?
+  - next if page.roles.present? && !current_user.roles.include?(page.roles)
+
+  - menu_children = page.menu_children.select { |page| page.menu_name == menu }
+
+  - if menu_children.blank?
+    = nav_link_to(page, page.menu_url.presence || effective_pages.page_path(page))
+  - else
+    = nav_dropdown(page.to_s) do
+      - ([page] + menu_children).each do |page|
+        - next unless EffectiveResources.authorized?(self, :show, page)
+        - next if (page.authenticate_user || page.roles.present?) && current_user.blank?
+        - next if page.roles.present? && !current_user.roles.include?(page.roles)
+
+        = nav_link_to(page, page.menu_url.presence || effective_pages.page_path(page))

data/config/effective_pages.rb

@@ -1,13 +1,18 @@
 EffectivePages.setup do |config|
   config.pages_table_name = :pages
-  config.menus_table_name = :menus
-  config.menu_items_table_name = :menu_items
+
+  # 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
   # creating/editting an Effective::Page from the Admin screens
   # Relative to app/views/
-  config.pages_path = '/effective/pages/'
+  config.pages_path = 'effective/pages/'
+
+  # The directory where your layouts live
+  # Relative to app/views/
+  config.layouts_path = 'layouts/'
 
   # Excluded Pages
   # Any page templates from the above directory that should be excluded
@@ -39,44 +44,10 @@ EffectivePages.setup do |config|
   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
 
-  # Authorization Method
-  #
-  # This method is called by all controller actions with the appropriate action and resource
-  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
-  #
-  # Use via Proc (and with CanCan):
-  # config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) }
-  #
-  # Use via custom method:
-  # config.authorization_method = :my_authorization_method
-  #
-  # And then in your application_controller.rb:
-  #
-  # def my_authorization_method(action, resource)
-  #   current_user.is?(:admin)
-  # end
-  #
-  # Or disable the check completely:
-  # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) && resource.roles_permit?(current_user) } # CanCanCan
-  # Use effective_roles:  resource.roles_permit?(current_user)
-
   # Layout Settings
-  # Configure the Layout per controller, or all at once
-
-  # The layout for the EffectivePages admin screen
-  config.layout = {
-    :admin => 'application'
-  }
-
-  # All effective_page menu options
-  config.menu = {
-    :apply_active_class => true,  # Add an .active class to the appropriate li item based on current page url
-    :maxdepth => 2                # 2 by default, strict bootstrap3 doesnt support dropdowns in your dropdowns
-  }
+  # config.layout = { admin: 'admin' }
 
 end

data/config/routes.rb

@@ -1,23 +1,20 @@
-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]
+    resources :menus, only: [:index]
   end
 
-  scope :module => 'effective' do
-    get '*id', to: 'pages#show', constraints: EffectivePagesConstraint, as: :page
+  scope module: 'effective' do
+    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
 
 # Automatically mount the engine as an append
 Rails.application.routes.append do
   unless Rails.application.routes.routes.find { |r| r.name == 'effective_pages' }
-    mount EffectivePages::Engine => '/', :as => 'effective_pages'
+    mount EffectivePages::Engine => '/', as: 'effective_pages'
   end
 end
 

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

@@ -4,49 +4,31 @@ 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: false
+      t.string :menu_name
+      t.string :menu_url
+      t.integer :menu_position
 
       t.datetime :updated_at
       t.datetime :created_at
     end
-    add_index <%= @pages_table_name %>, :slug, :unique => true
-
-    create_table <%= @menus_table_name %> do |t|
-      t.string      :title
-      t.timestamps
-    end
-
-    create_table <%= @menu_items_table_name %> do |t|
-      t.integer       :menu_id
 
-      t.integer       :menuable_id
-      t.string        :menuable_type
-
-      t.string        :title
-
-      t.string        :url
-      t.string        :special
-
-      t.string        :classes
-      t.boolean       :new_window, :default => false
-      t.integer       :roles_mask, :default => nil
-
-      t.integer       :lft
-      t.integer       :rgt
-    end
-    add_index <%= @menu_items_table_name %>, :lft
+    add_index <%= @pages_table_name %>, :slug, :unique => true
   end
 
   def self.down
     drop_table <%= @pages_table_name %>
-    drop_table <%= @menus_table_name %>
-    drop_table <%= @menu_items_table_name %>
   end
 
 end

data/lib/effective_pages.rb

@@ -1,86 +1,42 @@
 require 'effective_datatables'
-require 'effective_regions'
+require 'effective_resources'
 require 'effective_roles'
 require 'effective_pages/engine'
 require 'effective_pages/version'
 
 module EffectivePages
-  mattr_accessor :pages_table_name
-  mattr_accessor :menus_table_name
-  mattr_accessor :menu_items_table_name
-
-  mattr_accessor :pages_path
-  mattr_accessor :excluded_pages
-  mattr_accessor :excluded_layouts
-
-  mattr_accessor :site_og_image
-  mattr_accessor :site_og_image_width
-  mattr_accessor :site_og_image_height
-
-  mattr_accessor :site_title
-  mattr_accessor :site_title_suffix
-  mattr_accessor :fallback_meta_description
-
-  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 :menu
-  mattr_accessor :authorization_method
-  mattr_accessor :layout
-
-  def self.setup
-    yield self
+  def self.config_keys
+    [
+      :pages_table_name,
+      :pages_path, :excluded_pages, :layouts_path, :excluded_layouts,
+      :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, :menus, :layout
+    ]
   end
 
-  def self.authorized?(controller, action, resource)
-    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
-
-    return !!authorization_method unless authorization_method.respond_to?(:call)
-    controller = controller.controller if controller.respond_to?(:controller)
-
-    begin
-      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
-    rescue *@_exceptions
-      false
-    end
-  end
-
-  def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
-  end
-
-  # Remove leading and trailing '/' characters
-  #  Will return:  "effective/pages"
-  def self.pages_path=(filepath)
-    filepath = filepath.to_s
-    filepath = filepath[1..-1] if filepath.starts_with?('/')
-    @@pages_path = filepath.chomp('/')
-  end
+  include EffectiveGem
 
   def self.templates
-    ApplicationController.view_paths.map { |path| Dir["#{path}/#{pages_path}/**"] }.flatten.reverse.map do |file|
+    ApplicationController.view_paths.map { |path| Dir[File.join(path, pages_path, '**')] }.flatten.map do |file|
       name = File.basename(file).split('.').first
       next if name.starts_with?('_')
       next if Array(EffectivePages.excluded_pages).map { |str| str.to_s }.include?(name)
       name
-    end.compact
+    end.compact.sort
   end
 
   def self.layouts
-    ApplicationController.view_paths.map { |path| Dir["#{path}/layouts/**"] }.flatten.reverse.map do |file|
+    return [] if layouts_path.blank?
+
+    ApplicationController.view_paths.map { |path| Dir[File.join(path, layouts_path, '**')] }.flatten.map do |file|
       name = File.basename(file).split('.').first
       next if name.starts_with?('_')
       next if name.include?('mailer')
       next if Array(EffectivePages.excluded_layouts).map { |str| str.to_s }.include?(name)
       name
-    end.compact
-  end
-
-  def self.permitted_params
-    @@permitted_params ||= [:title, :meta_description, :draft, :layout, :template, :slug, roles: []]
+    end.compact.sort
   end
 
 end

data/lib/effective_pages/version.rb

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

data/lib/generators/effective_pages/install_generator.rb

@@ -32,7 +32,7 @@ module EffectivePages
       end
 
       def setup_routes
-        inject_into_file 'config/routes.rb', "\n  # if you want EffectivePages to render the home / root page\n  # uncomment the following line and create an Effective::Page with slug == 'home' \n  # root :to => 'Effective::Pages#show', :id => 'home'\n", :before => /root (:?)to.*/
+        inject_into_file 'config/routes.rb', "\n  # if you want EffectivePages to render the home / root page\n  # uncomment the following line and create an Effective::Page with slug == 'home' \n  # root to: 'Effective::Pages#show', id: 'home'\n", :before => /root (:?)to.*/
       end
 
     end

data/lib/generators/templates/example.html.haml

@@ -1,6 +1,5 @@
-%h1
-  = simple_effective_region page, :title do
-    = page.title
+%h1= page.title
 
-= effective_region page, :content do
-  %p this is default content for the page titled #{page.title}
+.row
+  .col-9= page.rich_text_body
+  .col-3= page.rich_text_sidebar

data/lib/tasks/effective_pages_tasks.rake

@@ -1,6 +1,6 @@
 # bundle exec rake effective_pages:seed
 namespace :effective_pages do
-  task :seed => :environment do
+  task seed: :environment do
     include EffectiveMenusHelper
 
     return true if Effective::Menu.find_by_title('main menu').present?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 3.0.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: effective_regions
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_resources
   requirement: !ruby/object:Gem::Requirement
@@ -92,33 +78,20 @@ files:
 - app/controllers/admin/menus_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/effective/pages_controller.rb
-- app/datatables/effective_menus_datatable.rb
 - app/datatables/effective_pages_datatable.rb
-- app/helpers/effective_breadcrumbs_helper.rb
-- app/helpers/effective_menus_admin_helper.rb
+- app/datatables/effective_pages_menu_datatable.rb
 - app/helpers/effective_menus_helper.rb
 - app/helpers/effective_pages_helper.rb
-- app/models/effective/access_denied.rb
-- app/models/effective/menu.rb
-- app/models/effective/menu_item.rb
 - app/models/effective/page.rb
-- app/views/admin/menu_items/_actions.html.haml
-- app/views/admin/menu_items/_expand.html.haml
-- app/views/admin/menu_items/_item.html.haml
-- app/views/admin/menu_items/_new.html.haml
-- app/views/admin/menus/_actions.html.haml
-- app/views/admin/menus/_form.html.haml
-- app/views/admin/menus/edit.html.haml
 - app/views/admin/menus/index.html.haml
-- app/views/admin/menus/new.html.haml
-- app/views/admin/menus/show.html.haml
-- app/views/admin/pages/_actions.html.haml
 - app/views/admin/pages/_additional_fields.html.haml
 - app/views/admin/pages/_form.html.haml
-- app/views/admin/pages/_roles.html.haml
-- app/views/admin/pages/edit.html.haml
-- app/views/admin/pages/index.html.haml
-- app/views/admin/pages/new.html.haml
+- app/views/admin/pages/_form_access.html.haml
+- app/views/admin/pages/_form_content.html.haml
+- app/views/admin/pages/_form_menu.html.haml
+- app/views/admin/pages/_form_page.html.haml
+- app/views/admin/pages/_rich_text_areas.html.haml
+- app/views/effective/pages/_menu.html.haml
 - config/effective_pages.rb
 - config/routes.rb
 - db/migrate/01_create_effective_pages.rb.erb

data/app/datatables/effective_menus_datatable.rb

@@ -1,16 +0,0 @@
-class EffectiveMenusDatatable < Effective::Datatable
-
-  datatable do
-    col :id, visible: false
-    col :updated_at, visible: false
-
-    col :title
-
-    actions_col partial: 'admin/menus/actions', partial_as: :menu
-  end
-
-  collection do
-    Effective::Menu.all
-  end
-
-end

data/app/helpers/effective_breadcrumbs_helper.rb

@@ -1,41 +0,0 @@
-module EffectiveBreadcrumbsHelper
-  def render_breadcrumbs(menu, page)
-    menu = Effective::Menu.find_by_title(menu.to_s) if menu.kind_of?(String) || menu.kind_of?(Symbol)
-    return "Menu '#{menu}' does not exist".html_safe unless menu.present?
-
-    return breadcrumbs_fallback(page) if !page.present?
-
-    menu_item = if page.kind_of?(Effective::Page)
-      url = effective_pages.page_path(page)
-      menu.menu_items.find { |item| item.menuable == page || item.title == page.title || item.url == url }
-    elsif page.kind_of?(String)
-      downcased = page.downcase
-      menu.menu_items.find { |item| item.title.downcase == downcased || item.url == downcased }
-    else
-      menu.menu_items.find { |item| item.menuable == page || item.title == page || item.url == page }
-    end
-
-    return breadcrumbs_fallback(page) unless menu_item.present?
-
-    parents = menu.menu_items.select { |item| item.lft < menu_item.lft && item.rgt > menu_item.rgt }
-
-    content_tag(:ol, class: 'breadcrumb') do
-      (
-        parents.map { |parent| content_tag(:li, link_to(parent.title, parent.url.presence || '#', title: parent.title)) } +
-        [content_tag(:li, page.try(:title) || page, class: 'active')]
-      ).join().html_safe
-    end
-  end
-
-  alias_method :render_breadcrumb, :render_breadcrumbs
-
-  def breadcrumbs_fallback(page = nil, root: 'Home')
-    content_tag(:ol, class: 'breadcrumb') do
-      [
-        content_tag(:li, link_to(root, root_path, title: root)),
-        content_tag(:li, ((page.title if page.respond_to?(:title)) || page || @page_title || 'Here'), class: 'active')
-      ].join().html_safe
-    end
-  end
-
-end