effective_pages 3.4.13 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 370a0872726ab5cc18dca40bf8bdafaef20ac8cfc145600fa1679abe2253059f
-  data.tar.gz: e9e3de8d9fd1e68ee1421a96cf6a0fb15af8014421edf95493e2146d067e8f26
+  metadata.gz: 1a4bbe810bd4f30ca02c101c48465763f4c6f246bb2e89afa70ddb79e117df8b
+  data.tar.gz: a8780dabcf25e0403836da65af42af2497c120cbd6fa9b67388d2f66c24b2e74
 SHA512:
-  metadata.gz: 16f78050a37aa5785fea91281c439dd6ad275377374969569f4e5d9b34b8b287b9d930494eb91b7481f6ac29a57a42e52ea8ededfeb5775928c7e1b32188c034
-  data.tar.gz: cbea464d3c44f65a05b0d20bad91ea2e18d12c40968885f09fcfa9f4d80605148dfee04c3cb3e0364e72b4328de82a332a4f1f1add499278568d9d1ba749edc6
+  metadata.gz: 612e18117979fdc36a5eaf6db3db0041ec2192006a7965d23357efd56fd18f6976cfefb95eeb4159ad16db765e9a275d06abd235abd0d062aab2bd34288123ae
+  data.tar.gz: 301c723e79df66b45159ac505badabea9eac1ea68bd56eda0c57ef57ae4f9d1f6a47418c18bd985c9a75fada67ec20df6317f17a8483d1a0ce8fe96049a7b588

data/README.md

@@ -211,6 +211,10 @@ if user.is?(:admin)
 end
 ```
 
+## Search
+
+If you use `pg_search` then `Effective::Pages` will be also included on its `multisearch` by default, allowing you to search across all pages.
+
 ## License
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)

data/app/controllers/admin/alerts_controller.rb

@@ -0,0 +1,15 @@
+module Admin
+  class AlertsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_pages) }
+
+    include Effective::CrudController
+
+    page_title 'Alerts'
+
+    def permitted_params
+      params.require(:effective_alert).permit!
+    end
+
+  end
+end

data/app/controllers/admin/permalinks_controller.rb

@@ -0,0 +1,15 @@
+module Admin
+  class PermalinksController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_pages) }
+
+    include Effective::CrudController
+
+    page_title 'Permalinks'
+
+    def permitted_params
+      params.require(:effective_permalink).permit!
+    end
+
+  end
+end

data/app/controllers/effective/permalinks_controller.rb

@@ -0,0 +1,21 @@
+module Effective
+  class PermalinksController < ApplicationController
+    def redirect
+      @permalink = Effective::Permalink.find_by! slug: params[:slug]
+
+      authorize! :redirect, @permalink
+
+      redirect_to redirect_path_for(@permalink), allow_other_host: (@permalink.target == :url)
+    end
+
+    private
+
+    def redirect_path_for(permalink)
+      permalink.target == :attachment ? attachment_url(permalink.attachment) : permalink.url
+    end
+
+    def attachment_url(permalink)
+      Rails.application.routes.url_helpers.rails_blob_path(permalink, only_path: true)
+    end
+  end
+end

data/app/datatables/effective_alerts_datatable.rb

@@ -0,0 +1,18 @@
+class EffectiveAlertsDatatable < Effective::Datatable
+
+  datatable do
+    col :id, visible: false
+    col :updated_at, visible: false
+
+    col :enabled
+
+    col :rich_text_body, label: 'Content'
+
+    actions_col
+  end
+
+  collection do
+    Effective::Alert.deep.all
+  end
+
+end

data/app/datatables/effective_permalinks_datatable.rb

@@ -0,0 +1,18 @@
+class EffectivePermalinksDatatable < Effective::Datatable
+
+  datatable do
+    col :id, visible: false
+    col :updated_at, visible: false
+
+    col :title
+    col :slug
+    col :summary
+
+    actions_col
+  end
+
+  collection do
+    Effective::Permalink.deep.all
+  end
+
+end

data/app/helpers/effective_alerts_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module EffectiveAlertsHelper
+
+  def effective_alerts
+    @_effective_alerts ||= Effective::Alert.all.enabled
+  end
+
+  def render_effective_alerts
+    effective_alerts
+      .map { |alert| render 'effective/alerts/alert', alert: alert }
+      .join
+      .html_safe
+  end
+
+end

data/app/helpers/effective_permalinks_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module EffectivePermalinksHelper
+
+  def permalinks
+    @_effective_permalinks ||= Effective::Permalink.deep.order(:id)
+  end
+
+  def permalink_to(permalink_or_slug, options = {})
+    permalink =
+      if permalink_or_slug.kind_of?(String)
+        Effective::Permalink.find_by(slug: slug)
+      else
+        permalink_or_slug
+      end
+
+    link_to permalink, permalink.redirect_path, options
+  end
+
+end

data/app/models/effective/alert.rb

@@ -0,0 +1,25 @@
+module Effective
+  class Alert < ApplicationRecord
+    self.table_name = (EffectivePages.alerts_table_name || :alerts).to_s
+
+    log_changes if respond_to?(:log_changes)
+
+    has_rich_text :body
+
+    effective_resource do
+      enabled         :boolean
+
+      timestamps
+    end
+
+    scope :deep,    -> { with_rich_text_body  }
+    scope :enabled, -> { where(enabled: true) }
+
+    validates :body, presence: true
+
+    def to_s
+      'alert'
+    end
+
+  end
+end

data/app/models/effective/page.rb

@@ -1,5 +1,38 @@
 module Effective
   class Page < ActiveRecord::Base
+    if defined?(PgSearch)
+      include PgSearch::Model
+
+      pg_search_scope :search,
+                      against: [
+                        :title,
+                        :menu_title,
+                        :meta_description,
+                        :slug,
+                      ],
+                      associated_against: {
+                        rich_texts: [:body],
+                      },
+                      using: { tsearch: { highlight: true }, trigram: { word_similarity: true } }
+
+      multisearchable against: [
+                        :title,
+                        :menu_title,
+                        :meta_description,
+                        :slug,
+                      ],
+                      associated_against: {
+                        rich_texts: [:body],
+                      },
+                      using: {
+                        trigram: {},
+                        tsearch: {
+                          highlight: true,
+                        }
+                      },
+                      ranked_by: ":trigram" # Could rank by any column/expression, e.g.: (books.num_pages * :trigram) + (:tsearch / 2.0)
+    end
+
     attr_accessor :current_user
     attr_accessor :menu_root_level
 
@@ -76,6 +109,14 @@ module Effective
       published.where(menu: false).or(published.where(menu: true).where.not(id: menu_root_with_children))
     }
 
+    # Maybe change paginate to be an isolated function instead of a scope, so we can use it with PgSearch::Document when doing a whole app search?
+    scope :paginate, -> (page: nil, per_page: nil) {
+      page = (page || 1).to_i
+      offset = [(page - 1), 0].max * per_page
+
+      limit(per_page).offset(offset)
+    }
+
     before_validation(if: -> { menu? && menu_position.blank? }) do
       self.menu_position = (self.class.where(menu_parent: menu_parent).maximum(:menu_position) || -1) + 1
     end

data/app/models/effective/permalink.rb

@@ -0,0 +1,53 @@
+module Effective
+  class Permalink < ApplicationRecord
+    self.table_name = (EffectivePages.permalinks_table_name || :permalinks).to_s
+
+    has_one_attached :attachment
+    has_one_purgable :attachment
+
+    acts_as_slugged
+
+    log_changes if respond_to?(:log_changes)
+
+    scope :deep, -> { with_attached_attachment }
+
+    effective_resource do
+      title        :string
+      slug         :string
+
+      url          :string
+
+      summary      :text
+
+      timestamps
+    end
+
+    validate  :attachment_and_url_cannot_both_be_present
+
+    validates :title,       presence: true
+    validates :attachment,  presence: true, if: -> { url.blank?          }
+    validates :url,         presence: true, if: -> { attachment.blank?   }, url: true
+
+    public
+
+    def to_s
+      title.presence || model_name.human
+    end
+
+    def redirect_path
+      "/permalinks/#{slug}"
+    end
+
+    def target
+      url.present? ? :url : :attachment
+    end
+
+    private
+
+    def attachment_and_url_cannot_both_be_present
+      if url.present? && (attachment.attached? && !attachment.marked_for_destruction?)
+        self.errors.add(:base, 'Attachment and URL cannot both be present')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+= tabs do
+  = tab 'Alert' do
+    = render '/admin/alerts/form_alert', alert: alert
+
+  - if alert.persisted?
+    = tab 'Logs' do
+      = render_datatable(alert.log_changes_datatable, inline: true, namespace: :admin)

data/app/views/admin/alerts/_form_alert.html.haml

@@ -0,0 +1,9 @@
+= effective_form_with(model: [:admin, alert], engine: true) do |f|
+  = f.check_box :enabled, hint: 'Toggle activation of this alert'
+
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :body, label: 'Content', hint: 'Content to be displayed'
+  - else
+    = f.rich_text_area :body, label: 'Content', hint: 'Content to be displayed'
+
+  = effective_submit(f)

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

@@ -0,0 +1,7 @@
+= tabs do
+  = tab 'Permalink' do
+    = render '/admin/permalinks/form_permalink', permalink: permalink
+
+  - if permalink.persisted?
+    = tab 'Logs' do
+      = render_datatable(permalink.log_changes_datatable, inline: true, namespace: :admin)

data/app/views/admin/permalinks/_form_permalink.html.haml

@@ -0,0 +1,8 @@
+= effective_form_with(model: [:admin, permalink], engine: true) do |f|
+  = f.text_field  :title,      required: true,  hint: 'Title of the permalink to be displayed'
+  = f.text_field  :slug,       required: true,  hint: 'Slug for link of the permalink'
+  = f.text_field  :summary,    required: true,  hint: 'Summary explanation of the permalink not displayed'
+  = f.url_field   :url,        required: false, hint: 'The link if redirecting to a website or specific page'
+  = f.file_field  :attachment, required: false, hint: 'The attachment of the permalink if redirecting to a document, image or other file'
+
+  = effective_submit(f)

data/app/views/effective/alerts/_alert.html.haml

@@ -0,0 +1,4 @@
+%div{class: "alert alert-warning", role: 'alert'}
+  .container
+    .row
+      .col= alert.body

data/config/effective_pages.rb

@@ -3,6 +3,8 @@ EffectivePages.setup do |config|
   config.page_sections_table_name = :page_sections
   config.page_banners_table_name = :page_banners
   config.carousel_items_table_name = :carousel_items
+  config.alerts_table_name = :alerts
+  config.permalinks_table_name = :permalinks
 
   # The menu names a page can belong to
   config.menus = [:main, :footer]

data/config/routes.rb

@@ -2,14 +2,18 @@
 
 EffectivePages::Engine.routes.draw do
   namespace :admin do
-    resources :pages, except: [:show]
-    resources :page_sections, only: [:index, :edit, :update]
-    resources :page_banners, except: [:show]
-    resources :menus, only: [:index]
-    resources :carousel_items, except: [:show]
+    resources :pages,           except: [:show]
+    resources :page_sections,   only:   [:index, :edit, :update]
+    resources :page_banners,    except: [:show]
+    resources :menus,           only:   [:index]
+    resources :carousel_items,  except: [:show]
+    resources :alerts,          except: [:show]
+    resources :permalinks,      except: [:show]
   end
 
   scope module: 'effective' do
+    get '/permalinks/:slug', to: 'permalinks#redirect', as: :permalink_redirect
+
     match '*id', to: 'pages#show', via: :get, as: :page, constraints: lambda { |req|
       Effective::Page.find_by_slug_or_id(req.path_parameters[:id] || '/').present?
     }

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

@@ -75,6 +75,21 @@ class CreateEffectivePages < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
+    create_table <%= @alerts_table_name %>, if_not_exists: true do |t|
+      t.boolean :enabled
+
+      t.timestamps
+    end
+
+    create_table <%= @permalinks_table_name %>, if_not_exists: true do |t|
+      t.string :title
+      t.string :slug
+      t.string :url
+      t.text   :summary
+
+      t.timestamps
+    end
+
   end
 
   def self.down
@@ -82,6 +97,8 @@ class CreateEffectivePages < ActiveRecord::Migration[4.2]
     drop_table <%= @page_banners_table_name %>
     drop_table <%= @page_sections_table_name %>
     drop_table <%= @carousel_items_table_name %>
+    drop_table <%= @alerts_table_name %>
+    drop_table <%= @permalinks_table_name %>
   end
 
 end

data/lib/effective_pages/engine.rb

@@ -11,6 +11,8 @@ module EffectivePages
           helper EffectivePageSectionsHelper
           helper EffectivePageBannersHelper
           helper EffectiveMenusHelper
+          helper EffectiveAlertsHelper
+          helper EffectivePermalinksHelper
         end
       end
     end

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.4.13'.freeze
+  VERSION = '3.6.0'.freeze
 end

data/lib/effective_pages.rb

@@ -7,7 +7,7 @@ require 'effective_pages/version'
 module EffectivePages
   def self.config_keys
     [
-      :pages_table_name, :page_sections_table_name, :page_banners_table_name, :carousel_items_table_name,
+      :pages_table_name, :page_sections_table_name, :page_banners_table_name, :carousel_items_table_name, :alerts_table_name, :permalinks_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, :google_analytics_code,

data/lib/generators/effective_pages/install_generator.rb

@@ -24,6 +24,8 @@ module EffectivePages
         @page_sections_table_name = ':' + EffectivePages.page_sections_table_name.to_s
         @page_banners_table_name = ':' + EffectivePages.page_banners_table_name.to_s
         @carousel_items_table_name = ':' + EffectivePages.carousel_items_table_name.to_s
+        @alerts_table_name = ':' + EffectivePages.alerts_table_name.to_s
+        @permalinks_table_name = ':' + EffectivePages.permalinks_table_name.to_s
 
         migration_template ('../' * 3) + 'db/migrate/01_create_effective_pages.rb.erb', 'db/migrate/create_effective_pages.rb'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.4.13
+  version: 3.6.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,26 +78,37 @@ files:
 - app/assets/config/effective_pages_manifest.js
 - app/assets/javascripts/effective_pages.js
 - app/assets/javascripts/effective_pages/google_analytics.js
+- app/controllers/admin/alerts_controller.rb
 - app/controllers/admin/carousel_items_controller.rb
 - app/controllers/admin/menus_controller.rb
 - app/controllers/admin/page_banners_controller.rb
 - app/controllers/admin/page_sections_controller.rb
 - app/controllers/admin/pages_controller.rb
+- app/controllers/admin/permalinks_controller.rb
 - app/controllers/effective/pages_controller.rb
+- app/controllers/effective/permalinks_controller.rb
+- app/datatables/effective_alerts_datatable.rb
 - app/datatables/effective_carousel_items_datatable.rb
 - app/datatables/effective_page_banners_datatable.rb
 - app/datatables/effective_page_sections_datatable.rb
 - app/datatables/effective_pages_datatable.rb
 - app/datatables/effective_pages_menu_datatable.rb
+- app/datatables/effective_permalinks_datatable.rb
+- app/helpers/effective_alerts_helper.rb
 - app/helpers/effective_carousels_helper.rb
 - app/helpers/effective_menus_helper.rb
 - app/helpers/effective_page_banners_helper.rb
 - app/helpers/effective_page_sections_helper.rb
 - app/helpers/effective_pages_helper.rb
+- app/helpers/effective_permalinks_helper.rb
+- app/models/effective/alert.rb
 - app/models/effective/carousel_item.rb
 - app/models/effective/page.rb
 - app/models/effective/page_banner.rb
 - app/models/effective/page_section.rb
+- app/models/effective/permalink.rb
+- app/views/admin/alerts/_form.html.haml
+- app/views/admin/alerts/_form_alert.html.haml
 - app/views/admin/carousel_items/_form.html.haml
 - app/views/admin/carousel_items/_form_carousel_item.html.haml
 - app/views/admin/carousel_items/index.html.haml
@@ -112,6 +123,9 @@ files:
 - 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/admin/permalinks/_form.html.haml
+- app/views/admin/permalinks/_form_permalink.html.haml
+- app/views/effective/alerts/_alert.html.haml
 - app/views/effective/carousels/_carousel.html.haml
 - app/views/effective/pages/_menu.html.haml
 - app/views/effective/pages/_page_menu.html.haml