effective_pages 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06898ad2ffae38015ec40dbeeefb1a46e468a7df73e933c69c194d06415123cc'
-  data.tar.gz: 74916bd3ca8fe11dbac3b6ac6b6085cc73cc9fd381fdf96aacd46fed82a3ba72
+  metadata.gz: 2620fbfec6b912fd31b7d9821fe5ef73eecbfb4c509063883f8c144a2aa66d30
+  data.tar.gz: d75935c05702f1328e32058f45874999a3b3b3f7f7becab1202c4d18b9dee743
 SHA512:
-  metadata.gz: 27fc19935dabbad5e6710ad06a9ea883d04a983541ae5308d706c62bc5546c295a922a6143fb9778980fd80ec26817c1d68ea7025b32d6950558da8af09290de
-  data.tar.gz: 1789579e269f287c2b4db33748d3039f6bc0b152506a0c597ebcbbbd58c8064f38cb240c2de4f76740bd01b620ffcb64c2dbbbda8eee822a513de5d9ea46c322
+  metadata.gz: 9dd4484e144bbbb2287dc399eb93bbae86b423c05fea8ca0bd0f7d5f716e384ebc1d935eef964166517b6358d1565f539c32894d6a2992e851a3e2d9104a6192
+  data.tar.gz: f1fa33f1bd839164cb281f23a3439f4d624458120061d7aeb7a0c2e16703d7b46d7043ae4abaf4878cea8bbf65e5a8a0710a02c00fbe0c8185f9df28e1e3e46c

data/app/controllers/admin/page_sections_controller.rb

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

data/app/datatables/effective_page_sections_datatable.rb

@@ -0,0 +1,29 @@
+class EffectivePageSectionsDatatable < Effective::Datatable
+
+  datatable do
+    order :name, :asc
+    length :all
+
+    col :id, visible: false
+    col :updated_at, visible: false
+
+    col :name
+    col :hint
+
+    col :title
+    col :rich_text_body
+
+    col :files
+
+    col :link_label, visible: false
+    col :link_url, visible: false
+    col :caption, visible: false
+
+    actions_col
+  end
+
+  collection do
+    Effective::PageSection.deep.all
+  end
+
+end

data/app/helpers/effective_page_sections_helper.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module EffectivePageSectionsHelper
+
+  def effective_page_sections
+    @_effective_page_sections ||= Effective::PageSection.all
+  end
+
+  def render_page_section(name, &block)
+    raise('expected a name') unless name.present?
+
+    name = name.to_s
+
+    page_section = effective_page_sections.find { |ps| ps.name == name }
+    raise("unable to find page section with name #{name}") unless page_section.present?
+
+    if block_given?
+      yield(page_section); nil
+    else
+      page_section.rich_text_body.to_s.html_safe
+    end
+  end
+
+end

data/app/models/effective/page_section.rb

@@ -0,0 +1,49 @@
+module Effective
+  class PageSection < ActiveRecord::Base
+    attr_accessor :current_user
+
+    # Not used
+    belongs_to :owner, polymorphic: true, optional: true
+
+    has_many_rich_texts
+    has_many_attached :files
+
+    log_changes if respond_to?(:log_changes)
+
+    self.table_name = EffectivePages.page_sections_table_name.to_s
+
+    effective_resource do
+      name              :string       # Unique name of this page section
+
+      title             :string
+      caption           :string
+
+      link_label        :string
+      link_url          :string
+
+      hint              :text
+
+      timestamps
+    end
+
+    validates :name, presence: true, uniqueness: true
+    validates :title, presence: true, length: { maximum: 255 }
+
+    validates :link_url, presence: true, if: -> { link_label.present? }
+    validates :link_url, absence: true, if: -> { link_label.blank? }
+
+    scope :deep, -> { with_attached_files.includes(:rich_texts) }
+    scope :sorted, -> { order(:name) }
+
+    def to_s
+      name.presence || 'page section'
+    end
+
+    # As per has_many_rich_texts
+    def body
+      rich_text_body
+    end
+
+  end
+
+end

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

@@ -0,0 +1,7 @@
+= tabs do
+  = tab 'Page Section' do
+    = render '/admin/page_sections/form_page_section', page_section: page_section
+
+  - if page_section.persisted?
+    = tab 'Logs' do
+      = render_datatable(page_section.log_changes_datatable, inline: true, namespace: :admin)

data/app/views/admin/page_sections/_form_page_section.html.haml

@@ -0,0 +1,25 @@
+= effective_form_with(model: [:admin, page_section], engine: true) do |f|
+  - if f.object.new_record?
+    = f.text_field :name, hint: 'The name of this region must be unique'
+  - else
+    = f.static_field :name
+
+  - if f.object.hint.present?
+    .mb-4= f.object.hint.html_safe
+
+  = f.text_field :title
+
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :rich_text_body, label: 'Body', hint: 'The main content'
+  - else
+    = f.rich_text_area :rich_text_body, label: 'Body', hint: 'The main content'
+
+  .row
+    .col= f.text_field :link_label
+    .col= f.url_field :link_url
+
+  = f.file_field :files, label: 'Attachment'
+
+  = f.text_field :caption
+
+  = effective_submit(f)

data/config/effective_pages.rb

@@ -1,5 +1,6 @@
 EffectivePages.setup do |config|
   config.pages_table_name = :pages
+  config.page_sections_table_name = :page_sections
 
   # The menu names a page can belong to
   config.menus = [:main, :footer]

data/config/routes.rb

@@ -3,6 +3,7 @@
 EffectivePages::Engine.routes.draw do
   namespace :admin do
     resources :pages, except: [:show]
+    resources :page_sections, only: [:index, :edit, :update]
     resources :menus, only: [:index]
   end
 

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

@@ -30,10 +30,31 @@ class CreateEffectivePages < ActiveRecord::Migration[4.2]
     end
 
     add_index <%= @pages_table_name %>, :slug, :unique => true
+
+    create_table <%= @page_sections_table_name %> do |t|
+      t.string :owner_type
+      t.integer :owner_id
+
+      t.string :name
+
+      t.string :title
+      t.string :caption
+
+      t.string :link_label
+      t.string :link_url
+
+      t.text :hint
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
+    add_index <%= @page_sections_table_name %>, :name, :unique => true
   end
 
   def self.down
     drop_table <%= @pages_table_name %>
+    drop_table <%= @page_sections_table_name %>
   end
 
 end

data/lib/effective_pages/engine.rb

@@ -7,6 +7,7 @@ module EffectivePages
       app.config.to_prepare do
         ActiveSupport.on_load :action_controller_base do
           helper EffectivePagesHelper
+          helper EffectivePageSectionsHelper
           helper EffectiveMenusHelper
         end
       end

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.2.0'.freeze
+  VERSION = '3.3.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,
+      :pages_table_name, :page_sections_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,

data/lib/generators/effective_pages/install_generator.rb

@@ -21,6 +21,7 @@ module EffectivePages
 
       def create_migration_file
         @pages_table_name = ':' + EffectivePages.pages_table_name.to_s
+        @page_sections_table_name = ':' + EffectivePages.page_sections_table_name.to_s
         migration_template ('../' * 3) + 'db/migrate/01_create_effective_pages.rb.erb', 'db/migrate/create_effective_pages.rb'
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Code and Effect
@@ -76,14 +76,20 @@ files:
 - MIT-LICENSE
 - README.md
 - app/controllers/admin/menus_controller.rb
+- app/controllers/admin/page_sections_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/effective/pages_controller.rb
+- app/datatables/effective_page_sections_datatable.rb
 - app/datatables/effective_pages_datatable.rb
 - app/datatables/effective_pages_menu_datatable.rb
 - app/helpers/effective_menus_helper.rb
+- app/helpers/effective_page_sections_helper.rb
 - app/helpers/effective_pages_helper.rb
 - app/models/effective/page.rb
+- app/models/effective/page_section.rb
 - app/views/admin/menus/index.html.haml
+- app/views/admin/page_sections/_form.html.haml
+- app/views/admin/page_sections/_form_page_section.html.haml
 - app/views/admin/pages/_additional_fields.html.haml
 - app/views/admin/pages/_form.html.haml
 - app/views/admin/pages/_form_access.html.haml