effective_posts 2.5.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb8b8e024f90c5178e6904396c0f2e565d54e5b4eb0eac92c41e9442089016c3
-  data.tar.gz: bfe539309dbf2538961d899773af1855a54127864f8fcd98f9e375b1500bd452
+  metadata.gz: aaf7679098b16b2853e689c0d78cacf05510f8288c586707434dea3c11b431a5
+  data.tar.gz: 1f8c557e1b97598672a56fb49a80ea8c0164382f2e3bc8716ad158359fdcfe38
 SHA512:
-  metadata.gz: 821dc29782ba4a54c87425c9fec3f993d1febcd5b43c5b256462df60f700afddde1e07eb2bd803af1508c4b359ffda6f7f4e3c956ce8facd70c751d9b9590ba9
-  data.tar.gz: bbf9908b09e91896d285496ef14aa59bf1eab7bd07ef479ae7d528a91801a9705b439a5c78365fa78ee648b25118e46dce7488c053c92b346c33b4bd14311474
+  metadata.gz: af3804cb3d8b710c4589575401a41647dad5ab90204dc64f04a874f983e230763643ba4f97c455d40aabe63361bc1f7c17da007ae1397dd4b8d8d85b46cc5b46
+  data.tar.gz: f072f4473950ffc7c1dc58ae33c94e1cd5cb1b9cd5b8f722d3775a562dd914e393a9a359511bb58821408db076040418d9ddccd5a17248533bd3e6c201595f95

data/app/controllers/effective/posts_controller.rb

@@ -64,7 +64,7 @@ module Effective
 
     # Public user submit a post functionality
     def new
-      @post ||= Effective::Post.new(published_at: Time.zone.now)
+      @post ||= Effective::Post.new
       @page_title = 'New Post'
 
       EffectiveResources.authorize!(self, :new, @post)

data/app/datatables/effective_posts_datatable.rb

@@ -7,33 +7,27 @@ class EffectivePostsDatatable < Effective::Datatable
   filters do
     scope :unarchived, label: 'All'
     scope :published
-    scope :unpublished
+    scope :draft
     scope :news
     scope :events
     scope :archived
   end
 
   datatable do
-    order :published_at, :desc
+    order :published_start_at, :desc
 
     bulk_actions_col
 
-    col :published_at
     col :id, visible: false
 
     col :title
     col :slug, visible: false
     col :category, search: { collection: EffectivePosts.categories }
 
-    if EffectivePosts.submissions_enabled
-      col :approved, sql_column: 'NOT(draft)', as: :boolean do |post|
-        post.draft? ? 'No' : 'Yes'
-      end
-
-      col :draft, visible: false
-    else
-      col :draft
-    end
+    col :draft?, as: :boolean, visible: false
+    col :published?, as: :boolean
+    col :published_start_at
+    col :published_end_at
 
     col :archived
 

data/app/helpers/effective_posts_helper.rb

@@ -10,7 +10,7 @@ module EffectivePostsHelper
     tags = [
       tag(:meta, itemprop: 'author', content: @post.user.to_s),
       tag(:meta, itemprop: 'publisher', content: @post.user.to_s),
-      tag(:meta, itemprop: 'datePublished', content: (@post.published_at || Time.zone.now).strftime('%FT%T%:z')),
+      tag(:meta, itemprop: 'datePublished', content: (@post.published_start_at || Time.zone.now).strftime('%FT%T%:z')),
       tag(:meta, itemprop: 'headline', content: @post.title)
     ].join("\n").html_safe
   end
@@ -61,8 +61,8 @@ module EffectivePostsHelper
   def post_meta(post, date: true, datetime: false, category: true, author: true)
     [
       'Published',
-      ("on #{post.published_at.strftime('%B %d, %Y')}" if date && post.published_at),
-      ("on #{post.published_at.strftime('%B %d, %Y at %l:%M %p')}" if datetime && post.published_at),
+      ("on #{post.published_start_at.strftime('%B %d, %Y')}" if date && post.published_start_at),
+      ("on #{post.published_start_at.strftime('%B %d, %Y at %l:%M %p')}" if datetime && post.published_start_at),
       ("to #{link_to_post_category(post.category)}" if category && Array(EffectivePosts.categories).length > 1),
       ("by #{post.user.to_s.presence || 'Unknown'}" if author && EffectivePosts.post_meta_author && post.user.present?)
     ].compact.join(' ').html_safe
@@ -76,7 +76,7 @@ module EffectivePostsHelper
     elsif post.draft?
       content_tag(:span, 'DRAFT', class: 'badge badge-info')
     elsif post.published? == false
-      content_tag(:span, "TO BE PUBLISHED AT #{post.published_at&.strftime('%F %H:%M') || 'LATER'}", class: 'badge badge-info')
+      content_tag(:span, "TO BE PUBLISHED AT #{post.published_start_at&.strftime('%F %H:%M') || 'LATER'}", class: 'badge badge-info')
     end
   end
 

data/app/models/effective/post.rb

@@ -1,5 +1,7 @@
 module Effective
   class Post < ActiveRecord::Base
+    self.table_name = (EffectivePosts.posts_table_name || :posts).to_s
+
     if defined?(PgSearch)
       include PgSearch::Model
 
@@ -8,22 +10,20 @@ module Effective
 
     attr_accessor :current_user
 
+    belongs_to :user, polymorphic: true, optional: true
+
+    acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
     acts_as_archived
+    acts_as_published
     acts_as_slugged
-
-    log_changes if respond_to?(:log_changes)
     acts_as_tagged if respond_to?(:acts_as_tagged)
-    acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
+    log_changes if respond_to?(:log_changes)
 
     has_one_attached :image
 
     has_rich_text :excerpt
     has_rich_text :body
 
-    self.table_name = (EffectivePosts.posts_table_name || :posts).to_s
-
-    belongs_to :user, polymorphic: true, optional: true
-
     effective_resource do
       title             :string
       description       :string
@@ -31,8 +31,10 @@ module Effective
       category          :string
       slug              :string
 
-      draft             :boolean
-      published_at      :datetime
+      published_start_at       :datetime
+      published_end_at         :datetime
+      legacy_draft             :boolean       # No longer used. To be removed.
+
       tags              :text
 
       roles_mask        :integer
@@ -56,15 +58,12 @@ module Effective
     validates :title, presence: true, length: { maximum: 255 }
     validates :description, presence: true, length: { maximum: 150 }
     validates :category, presence: true
-    validates :published_at, presence: true, unless: -> { draft? }
     validates :start_at, presence: true, if: -> { category == 'events' }
 
     scope :unarchived, -> { where(archived: false) }
     scope :archived, -> { where(archived: true) }
 
-    scope :drafts, -> { unarchived.where(draft: true) }
-    scope :published, -> { unarchived.where(draft: false).where("published_at < ?", Time.zone.now) }
-    scope :unpublished, -> { unarchived.where(draft: true).or(where("published_at > ?", Time.zone.now)) }
+    scope :for_sitemap, -> { published.unarchived }
 
     # Kind of a meta category
     scope :news, -> { unarchived.where(category: EffectivePosts.news_categories) }
@@ -86,7 +85,7 @@ module Effective
     }
 
     scope :posts, -> (user: nil, category: nil, unpublished: false, archived: false) {
-      scope = all.deep.order(published_at: :desc)
+      scope = all.deep.order(Arel.sql("published_start_at DESC NULLS LAST"))
 
       if defined?(EffectiveRoles) && EffectivePosts.use_effective_roles
         if user.present? && user.respond_to?(:roles)
@@ -113,12 +112,8 @@ module Effective
       title.presence || 'New Post'
     end
 
-    def published?
-      !draft? && published_at.present? && published_at < Time.zone.now
-    end
-
     def approved?
-      draft == false
+      published?
     end
 
     def event?
@@ -145,11 +140,12 @@ module Effective
       post.assign_attributes(
         title: post.title + ' (Copy)',
         slug: post.slug + '-copy',
-        draft: true,
         body: body,
         excerpt: excerpt
       )
 
+      post.assign_attributes(published_start_at: nil, published_end_at: nil)
+
       post
     end
 
@@ -158,7 +154,7 @@ module Effective
     end
 
     def approve!
-      update!(draft: false)
+      update!(published_start_at: Time.zone.now)
     end
 
   end

data/app/views/admin/posts/_form_post.html.haml

@@ -1,6 +1,20 @@
 = effective_form_with(model: [:admin, post], engine: true) do |f|
   = f.text_field :title, hint: 'The title of your post.'
 
+  -# 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 on the website and can only be accessed by admin users."
+
+  = f.text_field :description,
+    hint: "150 character summary. Appears on Google search results underneath the post title. ",
+    input_html: { maxlength: 150 }
+
   - if f.object.persisted? || f.object.errors.include?(:slug)
     - current_url = effective_posts.post_path(f.object)
 
@@ -12,8 +26,6 @@
   - else
     = f.rich_text_area :excerpt, hint: 'Will be used for the post excerpt on index pages.'
 
-  = f.text_field :description, hint: 'The content of the post meta tags.', maxlength: 150
-
   - if Array(EffectivePosts.categories).length > 1
     = f.select :category, EffectivePosts.categories
   - else
@@ -32,10 +44,6 @@
 
   = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
 
-  = f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
-
-  = f.check_box :draft, hint: 'Save this post as a draft. It will not be accessible on the website.'
-
   = f.check_box :archived, label: 'Yes, this post is archived. It will not be displayed.'
 
   - if EffectivePosts.use_effective_roles

data/app/views/effective/posts/_form.html.haml

@@ -22,10 +22,6 @@
 
   = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
 
-  = f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
-
-  = f.check_box :draft, hint: 'Save this post as a draft. It will not be accessible on the website.'
-
   - if defined?(EffectiveArticleEditor)
     = f.article_editor :body, hint: 'The main body of your post'
   - else

data/db/migrate/101_create_effective_posts.rb

@@ -10,8 +10,9 @@ class CreateEffectivePosts < ActiveRecord::Migration[6.0]
       t.string :category
       t.string :slug
 
-      t.boolean :draft, default: false
-      t.datetime :published_at
+      t.datetime :published_start_at
+      t.datetime :published_end_at
+      t.boolean :legacy_draft, default: false
 
       t.text :tags
 

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '2.5.0'.freeze
+  VERSION = '2.6.1'.freeze
 end

data/lib/effective_posts.rb

@@ -25,7 +25,7 @@ module EffectivePosts
 
   def self.permitted_params
     @permitted_params ||= [
-      :title, :excerpt, :description, :draft, :category, :slug, :published_at, :body, :tags, :extra,
+      :title, :excerpt, :description, :save_as_draft, :category, :slug, :published_start_at, :published_end_at, :body, :tags, :extra,
       :image, :start_at, :end_at, :location, :website_name, :website_href, roles: []
     ]
   end

data/lib/generators/templates/effective_posts_mailer_preview.rb

@@ -13,8 +13,6 @@ class EffectivePostsMailerPreview < ActionMailer::Preview
     post = Effective::Post.new(
       title: 'An example post',
       category: EffectivePosts.categories.first.presence || 'posts',
-      published_at: Time.zone.now,
-      draft: true,
       body: 'This is a new post that has been submitted by a public user.'
     )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails