effective_pages 3.10.3 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65cee10f754283599ad7b184e91bc8c86be7b9fb9105c8ac73eea21dffb715d2
-  data.tar.gz: aa5392fe1adef1c6938400e10be3c337bacfa418c6d3708a5119c0b1ef4d07f8
+  metadata.gz: a415e3b0c2a07052c1c2be02f5444637ce620debf117d680939a0ed57dffc4c0
+  data.tar.gz: aa71beffd9b9b95c841a329c19e6813d6f860dad393e6a0dfddd1150420c7de8
 SHA512:
-  metadata.gz: 4a3ddad10e69703c863560f5db63815fdcaa9a3f16662e9c7e0890d99c57a33290df385987d7b4f5d219b5e05d3ef4a881787de608405325c5c28c5935260733
-  data.tar.gz: 5175e36de922d314b6010911b88a2102685b8b42105058ed0e3eaf5041bca8aaeb3d7d8d9740b2620ea6579593ce21b10114c78912ef6a44e6cfff5fc43d8ece
+  metadata.gz: a93466db870f0d256d864c49ca2cec4f21e644198c05959490b6918a45ecfc83da350a94d68f669dc94cdf00e1b7d6a85ecfd769d7904e6a4f1d2cb070e16654
+  data.tar.gz: 24407df9909682c9cf3d781625e84b9eb0037b33a5da778541b8b8fed9f5988cd8dec5c2da1300387778d00ace3b36101a7a2548eb4863dc12ce62aad749299f

data/app/controllers/effective/permalinks_controller.rb

@@ -1,9 +1,11 @@
 module Effective
   class PermalinksController < ApplicationController
-    def redirect
+    include Effective::CrudController
+
+    def show
       @permalink = Effective::Permalink.find_by! slug: params[:slug]
 
-      authorize! :redirect, @permalink
+      authorize! :show, @permalink
 
       redirect_to redirect_path_for(@permalink), allow_other_host: (@permalink.target == :url)
     end

data/app/datatables/effective_pages_datatable.rb

@@ -20,7 +20,10 @@ class EffectivePagesDatatable < Effective::Datatable
       link_to(page.slug, effective_pages.page_path(page), target: '_blank')
     end
 
-    col :draft
+    col :draft?, as: :boolean, visible: false
+    col :published?, as: :boolean
+    col :published_start_at
+    col :published_end_at
 
     col :layout, visible: false
     col :tempate, visible: false

data/app/datatables/effective_permalinks_datatable.rb

@@ -5,9 +5,18 @@ class EffectivePermalinksDatatable < Effective::Datatable
     col :updated_at, visible: false
 
     col :title
-    col :slug
+
+    col(:url) do |permalink|
+      url = (root_url + "link/" + permalink.slug)
+      link_to(url, url, target: '_blank')
+    end
+
     col :summary
-    col :tags
+
+    col :slug, visible: false
+    col :tags, visible: false
+
+    col :tracks_count, label: 'Views'
 
     actions_col
   end

data/app/models/effective/page.rb

@@ -19,19 +19,21 @@ module Effective
     has_many :menu_children, -> { Effective::Page.menuable }, class_name: 'Effective::Page',
       foreign_key: :menu_parent_id, inverse_of: :menu_parent
 
-    acts_as_role_restricted
-    acts_as_paginable if respond_to?(:acts_as_paginable) # Effective Resources
+    acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
+    acts_as_paginable
+    acts_as_published
     acts_as_slugged
     acts_as_tagged
     has_many_rich_texts
-
     log_changes if respond_to?(:log_changes)
 
     effective_resource do
       title             :string
       meta_description  :string
 
-      draft             :boolean
+      published_start_at       :datetime
+      published_end_at         :datetime
+      legacy_draft             :boolean       # No longer used. To be removed.
 
       layout            :string
       template          :string
@@ -68,9 +70,6 @@ module Effective
     }
 
     scope :deep_menuable, -> { includes(:menu_parent, menu_children: [:menu_parent, :menu_children]) }
-
-    scope :draft, -> { where(draft: true) }
-    scope :published, -> { where(draft: false) }
     scope :sorted, -> { order(:title) }
 
     scope :on_menu, -> { where(menu: true) }
@@ -154,10 +153,6 @@ module Effective
       rich_text_sidebar
     end
 
-    def published?
-      !draft?
-    end
-
     # Returns a duplicated post object, or throws an exception
     def duplicate
       Page.new(attributes.except('id', 'updated_at', 'created_at')).tap do |page|
@@ -168,7 +163,7 @@ module Effective
           page.send("rich_text_#{rt.name}=", rt.body)
         end
 
-        page.draft = true
+        page.assign_attributes(published_start_at: nil, published_end_at: nil)
       end
     end
 

data/app/models/effective/permalink.rb

@@ -14,6 +14,7 @@ module Effective
     acts_as_tagged
     acts_as_slugged
 
+    acts_as_trackable if respond_to?(:acts_as_trackable)
     log_changes if respond_to?(:log_changes)
 
     scope :deep, -> { 

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

@@ -2,8 +2,15 @@
 
   = f.text_field :title
 
-  = f.check_box :draft,
-    label: 'Save this page as a draft. It will not appear in a menu and can only be accessed by admin users.'
+  -# acts_as_published
+  = f.hide_if(:save_as_draft, true) do
+    .row
+      .col-md-6
+        = f.datetime_field :published_start_at, hint: 'The page will be available starting on this date and time.'
+      .col-md-6
+        = f.datetime_field :published_end_at, hint: 'The page will no longer be available after this date and time. Leave blank for no end date.', date_linked: false
+
+  = f.check_box :save_as_draft, label: "Save as a draft. It will not appear in a menu and can only be accessed by admin users."
 
   = f.text_field :meta_description,
     hint: "150 character summary. Appears on Google search results underneath the page title. ",

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

@@ -3,5 +3,11 @@
     = render '/admin/permalinks/form_permalink', permalink: permalink
 
   - if permalink.persisted?
-    = tab 'Logs' do
-      = render_datatable(permalink.log_changes_datatable, inline: true, namespace: :admin)
+    - if permalink.class.respond_to?(:acts_as_trackable?)
+      = tab 'Tracks' do
+        - datatable = Admin::EffectiveTracksDatatable.new(owner: permalink)
+        = render_datatable(datatable, inline: true, namespace: :admin)
+
+    - if permalink.respond_to?(:log_changes_datatable)
+      = tab 'Logs' do
+        = render_datatable(permalink.log_changes_datatable, inline: true, namespace: :admin)

data/config/routes.rb

@@ -14,7 +14,7 @@ EffectivePages::Engine.routes.draw do
   end
 
   scope module: 'effective' do
-    get '/link/:slug', to: 'permalinks#redirect', as: :permalink_redirect
+    get '/link/:slug', to: 'permalinks#show', 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/101_create_effective_pages.rb

@@ -6,7 +6,9 @@ class CreateEffectivePages < ActiveRecord::Migration[6.0]
       t.string :title
       t.string :meta_description
 
-      t.boolean :draft, default: false
+      t.datetime :published_start_at
+      t.datetime :published_end_at
+      t.boolean :legacy_draft, default: false
 
       t.string :layout, default: 'application'
       t.string :template
@@ -88,6 +90,7 @@ class CreateEffectivePages < ActiveRecord::Migration[6.0]
       t.string :slug
       t.string :url
       t.text   :summary
+      t.integer :tracks_count, default: 0
 
       t.timestamps
     end

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.10.3'.freeze
+  VERSION = '3.12.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.10.3
+  version: 3.12.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails