effective_pages 3.11.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f608a5aa1318fab93ca116d9edea04aeb3a2077ecbcd41378dad81b3fb3018a5
-  data.tar.gz: 803a6fbc21a969464faf8d149b724d1a65b1b970e2a4b2e5ac57ddd17cf02e87
+  metadata.gz: a415e3b0c2a07052c1c2be02f5444637ce620debf117d680939a0ed57dffc4c0
+  data.tar.gz: aa71beffd9b9b95c841a329c19e6813d6f860dad393e6a0dfddd1150420c7de8
 SHA512:
-  metadata.gz: 482a07502489d6b6e6494bc6bf17f5b17c82ee05a68f500b85a33d380b71abc49074c371f556816b60142f131d523f46a3f66271c0ea69094dda69fb147523aa
-  data.tar.gz: dd26dfe9186dc3d1e8408f42967431a3e94d8db2882d8c96f7d53deb9103bb8af0888ccbd5bd247c52a5ba99ff9f0caf8d141caa037d478d5cb5aa98fee64e0b
+  metadata.gz: a93466db870f0d256d864c49ca2cec4f21e644198c05959490b6918a45ecfc83da350a94d68f669dc94cdf00e1b7d6a85ecfd769d7904e6a4f1d2cb070e16654
+  data.tar.gz: 24407df9909682c9cf3d781625e84b9eb0037b33a5da778541b8b8fed9f5988cd8dec5c2da1300387778d00ace3b36101a7a2548eb4863dc12ce62aad749299f

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/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/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/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

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.11.0'.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.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails