effective_posts 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaf7679098b16b2853e689c0d78cacf05510f8288c586707434dea3c11b431a5
-  data.tar.gz: 1f8c557e1b97598672a56fb49a80ea8c0164382f2e3bc8716ad158359fdcfe38
+  metadata.gz: b560ca6e8b647ccb668b7c91edf4689995e3c238a639d90f1f8d6c61eb5cab5f
+  data.tar.gz: 6b60247bb9072eec7b7f6fe9b7991db47b305a271d79c5baddbde15db295e462
 SHA512:
-  metadata.gz: af3804cb3d8b710c4589575401a41647dad5ab90204dc64f04a874f983e230763643ba4f97c455d40aabe63361bc1f7c17da007ae1397dd4b8d8d85b46cc5b46
-  data.tar.gz: f072f4473950ffc7c1dc58ae33c94e1cd5cb1b9cd5b8f722d3775a562dd914e393a9a359511bb58821408db076040418d9ddccd5a17248533bd3e6c201595f95
+  metadata.gz: 28412a0ad8153586d93042bc83aaa0c4fd844158e95269a8d76a12927d1ec0de5306a7e0de0295e73f84444269c6b7029d0f2be8c9935310ed281211bcaaebed
+  data.tar.gz: 97014b04d38f48179037a237a6f284c785c10ff1f5c03eabdb7e3d64e861c99109bafd3ff0e8d290d6372b078e665869ab15de4a0a75a24a5a6d65f387f10328

data/app/controllers/effective/posts_controller.rb

@@ -58,7 +58,7 @@ module Effective
       end
 
       @page_title ||= @post.title
-      @meta_description ||= @post.description
+      @meta_description ||= (@post.description.presence || @post.title)
       @canonical_url ||= effective_posts.post_url(@post)
     end
 

data/app/datatables/effective_posts_datatable.rb

@@ -31,7 +31,7 @@ class EffectivePostsDatatable < Effective::Datatable
 
     col :archived
 
-    col :start_at
+    col :start_at, visible: EffectivePosts.categories.include?('Events')
     col :end_at, visible: false
     col :location, visible: false
     col :created_at, label: 'Submitted at', visible: false

data/app/helpers/effective_posts_helper.rb

@@ -82,7 +82,8 @@ module EffectivePostsHelper
 
   # All other options are passed to the link_to 'Read more'
   def post_excerpt(post, label: 'Continue reading')
-    (post.excerpt.to_s + readmore_link(post, label: label)).html_safe
+    content = post.excerpt.presence || post.body.presence
+    (content.to_s + readmore_link(post, label: label)).html_safe
   end
 
   def read_more_link(post, options = {})

data/app/models/effective/post.rb

@@ -55,8 +55,8 @@ module Effective
       self.user ||= current_user
     end
 
-    validates :title, presence: true, length: { maximum: 255 }
-    validates :description, presence: true, length: { maximum: 150 }
+    validates :title, presence: true
+    validates :description, length: { maximum: 150 }
     validates :category, presence: true
     validates :start_at, presence: true, if: -> { category == 'events' }
 
@@ -85,7 +85,7 @@ module Effective
     }
 
     scope :posts, -> (user: nil, category: nil, unpublished: false, archived: false) {
-      scope = all.deep.order(Arel.sql("published_start_at DESC NULLS LAST"))
+      scope = all.deep.order(arel_table[:published_start_at].desc.nulls_last)
 
       if defined?(EffectiveRoles) && EffectivePosts.use_effective_roles
         if user.present? && user.respond_to?(:roles)

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

@@ -1,42 +1,41 @@
 = effective_form_with(model: [:admin, post], engine: true) do |f|
   = f.text_field :title, hint: 'The title of your post.'
 
+  - if Array(EffectivePosts.categories).length > 1
+    = f.select :category, EffectivePosts.categories
+  - else
+    = f.hidden_field :category, value: (EffectivePosts.categories.first || 'posts')
+
   -# 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.'
+        = f.datetime_field :published_start_at, hint: 'The page will be available starting on this date and time. Leave blank to publish immediately.'
       .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 }
-
+  - # acts_as_slugged
   - if f.object.persisted? || f.object.errors.include?(:slug)
     - current_url = effective_posts.post_path(f.object)
 
     = f.text_field :slug, required: f.object.persisted?,
       hint: "The slug controls this post's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This post is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url && f.object.slug.present? }".html_safe
 
-  - if defined?(EffectiveArticleEditor)
-    = f.article_editor :excerpt, hint: 'Will be used for the post excerpt on index pages.'
-  - else
-    = f.rich_text_area :excerpt, hint: 'Will be used for the post excerpt on index pages.'
-
-  - if Array(EffectivePosts.categories).length > 1
-    = f.select :category, EffectivePosts.categories
-  - else
-    = f.hidden_field :category, value: (EffectivePosts.categories.first || 'posts')
-
-  - if f.object.class.respond_to?(:acts_as_tagged?)
-    = render 'effective/tags/fields', f: f
+  - if EffectivePosts.use_description
+    = f.text_field :description, input_html: { maxlength: 150 },
+      hint: "150 character summary. Appears on Google search results underneath the post title. Leave blank to use post title."
 
   - if EffectivePosts.use_active_storage
     = f.file_field :image, hint: 'An image for your post'
 
+  - if EffectivePosts.use_excerpt
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor :excerpt, hint: 'Will be used for the post excerpt on index pages. Leave blank to use the body instead.'
+    - else
+      = f.rich_text_area :excerpt, hint: 'Will be used for the post excerpt on index pages. Leave blank to use the body instead.'
+
   - if defined?(EffectiveArticleEditor)
     = f.article_editor :body, hint: 'The main body of your post'
   - else

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

@@ -1,30 +1,35 @@
 = effective_form_with(model: post, engine: true) do |f|
   = f.text_field :title, hint: 'The title of your post.'
 
-  - if f.object.persisted? || f.object.errors.include?(:slug)
-    - current_url = effective_posts.post_path(f.object)
-  = f.text_field :slug, hint: "The slug controls this post's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This post is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url && f.object.slug.present? }".html_safe
-
   - if Array(EffectivePosts.categories).length > 1
     = f.select :category, EffectivePosts.categories
   - else
     = f.hidden_field :category, value: (EffectivePosts.categories.first || 'posts')
 
-  - if EffectivePosts.use_active_storage
-    = f.file_field :image, hint: 'An image for your post'
+  - # acts_as_slugged
+  - if f.object.persisted? || f.object.errors.include?(:slug)
+    - current_url = effective_posts.post_path(f.object)
 
-  - if defined?(EffectiveArticleEditor)
-    = f.article_editor :excerpt, hint: 'Will be used for the post excerpt on index pages.'
-  - else
-    = f.rich_text_area :excerpt, hint: 'Will be used for the post excerpt on index pages.'
+    = f.text_field :slug, required: f.object.persisted?,
+      hint: "The slug controls this post's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This post is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url && f.object.slug.present? }".html_safe
 
-  = f.text_field :description, hint: 'The content of the post meta tags.', maxlength: 150
+  - if EffectivePosts.use_description
+    = f.text_field :description, hint: 'The content of the post meta tags.', maxlength: 150
 
-  = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
+  - if EffectivePosts.use_active_storage
+    = f.file_field :image, hint: 'An image for your post'
+
+  - if EffectivePosts.use_excerpt
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor :excerpt, hint: 'Will be used for the post excerpt on index pages.'
+    - else
+      = f.rich_text_area :excerpt, hint: 'Will be used for the post excerpt on index pages.'
 
   - if defined?(EffectiveArticleEditor)
     = f.article_editor :body, hint: 'The main body of your post'
   - else
     = f.rich_text_area :body, hint: 'The main body of your post'
 
+  = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
+
   = f.submit 'Save'

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

@@ -6,4 +6,4 @@
     = admin_post_status_badge(post)
 
   .post-content.post-excerpt
-    = post.excerpt
+    = post.excerpt.presence || post.body

data/config/effective_posts.rb

@@ -41,6 +41,12 @@ EffectivePosts.setup do |config|
   # Display a file upload field when the admin creates a new post to collect a post.image
   config.use_active_storage = true
 
+  # Display the google search results description field on admin form
+  config.use_description = true
+
+  # Display the excerpt field on admin form
+  config.use_excerpt = true
+
   # Submissions
   # Allow users to submit posts (optionally for approval) to display on the website
   config.submissions_enabled = true

data/lib/effective_posts/version.rb

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

data/lib/effective_posts.rb

@@ -10,7 +10,7 @@ module EffectivePosts
       :categories, :event_categories,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
       :use_category_routes, :use_blog_routes,
-      :use_effective_roles, :use_active_storage,
+      :use_effective_roles, :use_active_storage, :use_description, :use_excerpt,
       :per_page, :post_meta_author,
       :submissions_enabled, :submissions_require_current_user,
       :submissions_require_approval, :submissions_note

metadata

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