effective_posts 2.4.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84c27105c23c603f005a3389dba3e7f04a13c88e9d46f0fe7c135a1b5f40bf07
-  data.tar.gz: d9d1637b7f30a5190455e5337848ad6fcbffe129d943483ccadeb8f611e426b4
+  metadata.gz: 333ef424bbeceb95702ecd079b9f8337fbc9d482ccc27bf545fac284e6cb43fa
+  data.tar.gz: 3ce82e06eac036d8e49a93be1a7dc7509e5f4b2658e0f2949f5ee7159e239de2
 SHA512:
-  metadata.gz: eb22ed3626f8637052610a9d7a12cc9a08ea3bf09589953e3a7d1ee681e1f6ff73c7f250f00eb612ed7e50567f0515667c0a33c817cddcef09fb3f3bf8455266
-  data.tar.gz: 4ea9ec43edfd22c8c37ef8348757d8c2e4ce4208168be17a0cf93b0490df235d2b59a0cba0b679313ce1fb79941b8e4ea1ac36418c7c98b1e8057476fae213b6
+  metadata.gz: 4c8a3a3bee762962cc9570e227eb361f29187a053f80ce9a8e28fee94e0e3c9a4394883d044cc1ed570592e794f3e1d9ddc8970d5975caf6673cdad66352c77d
+  data.tar.gz: cf41cebfc376de36684806d95cfda9dfb4f3fa7ecd2419b02920c9689f18937f23828716cefd48081697176ca601d6b1401296acd9983ad3a3202a2cd1637e54

data/app/controllers/effective/posts_controller.rb

@@ -36,7 +36,9 @@ module Effective
     def show
       @category = EffectivePosts.category(params[:category])
 
-      @posts ||= Effective::Post.posts(user: current_user, unpublished: EffectiveResources.authorized?(self, :admin, :effective_posts))
+      admin = EffectiveResources.authorized?(self, :admin, :effective_posts)
+
+      @posts ||= Effective::Post.posts(user: current_user, unpublished: admin, archived: admin)
       @post = @posts.find(params[:id])
 
       if @post.respond_to?(:roles_permit?)
@@ -45,10 +47,11 @@ module Effective
 
       EffectiveResources.authorize!(self, :show, @post)
 
-      if EffectiveResources.authorized?(self, :admin, :effective_posts)
+      if admin 
         flash.now[:warning] = [
           'Hi Admin!',
           ('You are viewing a hidden post.' unless @post.published?),
+          ('You are viewing an archived post.' if @post.archived?),
           'Click here to',
           ("<a href='#{effective_posts.edit_admin_post_path(@post)}' class='alert-link'>edit post settings</a>.")
         ].compact.join(' ')
@@ -61,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

@@ -1,31 +1,35 @@
 class EffectivePostsDatatable < Effective::Datatable
+  bulk_actions do
+    bulk_action('Archive selected', effective_posts.bulk_archive_admin_posts_path)
+    bulk_action('Unarchive selected', effective_posts.bulk_unarchive_admin_posts_path)
+  end
+
   filters do
-    scope :all
+    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?, as: :boolean, visible: false
+    col :published?, as: :boolean
+    col :published_start_at
+    col :published_end_at
 
-      col :draft, visible: false
-    else
-      col :draft
-    end
+    col :archived
 
     col :start_at
     col :end_at, visible: false

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
@@ -71,10 +71,12 @@ module EffectivePostsHelper
   def admin_post_status_badge(post)
     return nil unless EffectiveResources.authorized?(self, :admin, :effective_posts)
 
-    if post.draft?
+    if post.archived?
+      content_tag(:span, 'ARCHIVED', class: 'badge badge-info')
+    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,20 +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
@@ -29,11 +31,14 @@ 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
+      archived          :boolean
 
       # Event Fields
       start_at          :datetime
@@ -53,20 +58,21 @@ 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 :drafts, -> { where(draft: true) }
-    scope :published, -> { where(draft: false).where("published_at < ?", Time.zone.now) }
-    scope :unpublished, -> { where(draft: true).or(where("published_at > ?", Time.zone.now)) }
-    scope :with_category, -> (category) { where(category: category) }
+    scope :unarchived, -> { where(archived: false) }
+    scope :archived, -> { where(archived: true) }
+
+    scope :for_sitemap, -> { published.unarchived }
 
     # Kind of a meta category
-    scope :news, -> { where(category: EffectivePosts.news_categories) }
-    scope :events, -> { where(category: EffectivePosts.event_categories) }
+    scope :news, -> { unarchived.where(category: EffectivePosts.news_categories) }
+    scope :events, -> { unarchived.where(category: EffectivePosts.event_categories) }
+
+    scope :with_category, -> (category) { where(category: category) } # Don't add unarchived here
 
     scope :deep, -> { 
-      base = with_rich_text_excerpt_and_embeds.with_rich_text_body_and_embeds 
+      base = with_attached_image.with_rich_text_excerpt_and_embeds.with_rich_text_body_and_embeds 
       base = base.includes(:pg_search_document) if defined?(PgSearch)
       base
     }
@@ -78,8 +84,8 @@ module Effective
       limit(per_page).offset(offset)
     }
 
-    scope :posts, -> (user: nil, category: nil, unpublished: false) {
-      scope = all.deep.order(published_at: :desc)
+    scope :posts, -> (user: nil, category: nil, unpublished: false, archived: false) {
+      scope = all.deep.order(published_start_at: :desc)
 
       if defined?(EffectiveRoles) && EffectivePosts.use_effective_roles
         if user.present? && user.respond_to?(:roles)
@@ -95,6 +101,10 @@ module Effective
         scope = scope.published
       end
 
+      unless archived
+        scope = scope.unarchived
+      end
+
       scope
     }
 
@@ -102,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?
@@ -134,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
 
@@ -147,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,9 +44,7 @@
 
   = 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
     = render partial: '/admin/posts/roles', locals: { post: post, form: f, f: f }

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/config/routes.rb

@@ -2,6 +2,11 @@ EffectivePosts::Engine.routes.draw do
   namespace :admin do
     resources :posts, except: [:show] do
       post :approve, on: :member
+
+      post :archive, on: :member
+      post :unarchive, on: :member
+      post :bulk_archive, on: :collection
+      post :bulk_unarchive, on: :collection
     end
   end
 

data/db/migrate/101_create_effective_posts.rb

@@ -10,12 +10,14 @@ 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
 
-      t.integer :roles_mask, :default => 0
+      t.integer :roles_mask, default: 0
+      t.boolean :archived, default: false
 
       # Events fields
       t.datetime :start_at

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '2.4.2'.freeze
+  VERSION = '2.6.0'.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.4.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails