effective_posts 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f406e0650b91463c3e1b876f9001bdafbf683563d9bf943512b7d87f8c00f9e
-  data.tar.gz: 1241584d8be8da46c3fa6f44fb765796a34e8ee74e6f137580d1984dc0a0d982
+  metadata.gz: fb8b8e024f90c5178e6904396c0f2e565d54e5b4eb0eac92c41e9442089016c3
+  data.tar.gz: bfe539309dbf2538961d899773af1855a54127864f8fcd98f9e375b1500bd452
 SHA512:
-  metadata.gz: 9eade43433c5c0da6e64816a25c5cc8857702a2af369b1f7027c4cbe44b8f78370e4ad853f40555a9ce7f1f9428a72f330ec09e530b0f956f74bdcb775d157eb
-  data.tar.gz: d8107969ffb90e822afe14507044e8a040d65cb97e7c3a9444a648b90768cf9637c67a88ee2dbc07aacdeafea6a585895ac3f94f286f24275de9c2b8c466614a
+  metadata.gz: 821dc29782ba4a54c87425c9fec3f993d1febcd5b43c5b256462df60f700afddde1e07eb2bd803af1508c4b359ffda6f7f4e3c956ce8facd70c751d9b9590ba9
+  data.tar.gz: bbf9908b09e91896d285496ef14aa59bf1eab7bd07ef479ae7d528a91801a9705b439a5c78365fa78ee648b25118e46dce7488c053c92b346c33b4bd14311474

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(' ')

data/app/datatables/effective_posts_datatable.rb

@@ -1,15 +1,23 @@
 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 :news
     scope :events
+    scope :archived
   end
 
   datatable do
     order :published_at, :desc
 
+    bulk_actions_col
+
     col :published_at
     col :id, visible: false
 
@@ -27,6 +35,8 @@ class EffectivePostsDatatable < Effective::Datatable
       col :draft
     end
 
+    col :archived
+
     col :start_at
     col :end_at, visible: false
     col :location, visible: false

data/app/helpers/effective_posts_helper.rb

@@ -71,7 +71,9 @@ 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')

data/app/models/effective/post.rb

@@ -8,7 +8,9 @@ module Effective
 
     attr_accessor :current_user
 
+    acts_as_archived
     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)
@@ -34,6 +36,7 @@ module Effective
       tags              :text
 
       roles_mask        :integer
+      archived          :boolean
 
       # Event Fields
       start_at          :datetime
@@ -56,16 +59,24 @@ module Effective
     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 :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)) }
 
     # 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, -> { with_rich_text_excerpt_and_embeds.with_rich_text_body_and_embeds }
+    scope :deep, -> { 
+      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
+    }
 
     scope :paginate, -> (page: nil, per_page: EffectivePosts.per_page) {
       page = (page || 1).to_i
@@ -74,7 +85,7 @@ module Effective
       limit(per_page).offset(offset)
     }
 
-    scope :posts, -> (user: nil, category: nil, unpublished: false) {
+    scope :posts, -> (user: nil, category: nil, unpublished: false, archived: false) {
       scope = all.deep.order(published_at: :desc)
 
       if defined?(EffectiveRoles) && EffectivePosts.use_effective_roles
@@ -91,6 +102,10 @@ module Effective
         scope = scope.published
       end
 
+      unless archived
+        scope = scope.unarchived
+      end
+
       scope
     }
 

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

@@ -36,6 +36,8 @@
 
   = 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/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,13 @@ class CreateEffectivePosts < ActiveRecord::Migration[6.0]
       t.string :category
       t.string :slug
 
-      t.boolean :draft, :default => false
+      t.boolean :draft, default: false
       t.datetime :published_at
 
       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.1'.freeze
+  VERSION = '2.5.0'.freeze
 end

metadata

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