effective_posts 2.2.4 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 747172ede1bd476cba7fc584e38368332d6b6d762b201a1a654f93da03a42a5e
-  data.tar.gz: c3ec95126b30ea18c2c3f70ebbd13d4551185c548385f95c799f4733a43cf71b
+  metadata.gz: 2750f7ec2bf649ff20b632267b64ed2173123bc06953ed7e8014210120d03353
+  data.tar.gz: 4fb1ddca7088963dc0d9d67747adfa0da0a64ffd494677fca4abe6ba1060ae0f
 SHA512:
-  metadata.gz: 277cb171ce914d5000d489cb755ba767143529966c1044f86489ca8a790a4b24530162edec364c04c76a893566bc9384fe788a1ac64e7f84034a15100c2b8fc4
-  data.tar.gz: f442aca9a9727ca2a6bced567b3cd9b8770c10deb4da0838801d689e4712315956e35ad37c3cbc9d5bd029996cb145b97939200f2f534187fc909e06dab5779c
+  metadata.gz: 6b09dbfaa87390d7aec4d4e7ad43c2ef65815185d364a7098a4a1fb3b7ef9953ae066e5de870ac4a4cf902bbc75bd4e28cab58159b54fc885e0bd22b0375bcdd
+  data.tar.gz: 6749de2bdbc0cd3c48bc3103078146d8a57ca7d805302be7636aac6b68256940fe1b2b6f549a963aa1d5b2f84b28af1505a7781199c44d45e9dad15b5159825e

data/app/assets/javascripts/effective_posts.js

@@ -1 +0,0 @@
-//= require effective_posts/additional_fields

data/app/controllers/effective/posts_controller.rb

@@ -8,15 +8,17 @@ module Effective
     include Effective::CrudController
 
     def index
+      @category = EffectivePosts.category(params[:category])
+
       @posts ||= Effective::Post.posts(
         user: current_user,
-        category: params[:category],
+        category: @category,
         unpublished: EffectiveResources.authorized?(self, :admin, :effective_posts)
       )
 
       @posts = @posts.paginate(page: params[:page])
 
-      if params[:category] == 'events'
+      if EffectivePosts.event_categories.include?(@category)
         @posts = @posts.reorder(:start_at).where('start_at > ?', Time.zone.now)
       end
 
@@ -27,12 +29,14 @@ module Effective
 
       EffectiveResources.authorize!(self, :index, Effective::Post)
 
-      @page_title ||= [(params[:category] || 'Blog').to_s.titleize, (" - Page #{params[:page]}" if params[:page])].compact.join
+      @page_title ||= [(@category || 'Blog').to_s.titleize, (" - Page #{params[:page]}" if params[:page])].compact.join
       @canonical_url ||= helpers.effective_post_category_url(params[:category], page: params[:page])
     end
 
     def show
-      @posts ||= Effective::Post.posts(user: current_user, category: params[:category], unpublished: EffectiveResources.authorized?(self, :admin, :effective_posts))
+      @category = EffectivePosts.category(params[:category])
+
+      @posts ||= Effective::Post.posts(user: current_user, unpublished: EffectiveResources.authorized?(self, :admin, :effective_posts))
       @post = @posts.find(params[:id])
 
       if @post.respond_to?(:roles_permit?)

data/app/datatables/effective_posts_datatable.rb

@@ -1,4 +1,12 @@
 class EffectivePostsDatatable < Effective::Datatable
+  filters do
+    scope :all
+    scope :published
+    scope :unpublished
+    scope :news
+    scope :events
+  end
+
   datatable do
     order :published_at, :desc
 
@@ -22,7 +30,6 @@ class EffectivePostsDatatable < Effective::Datatable
     col :start_at
     col :end_at, visible: false
     col :location, visible: false
-
     col :created_at, label: 'Submitted at', visible: false
 
     actions_col do |post|

data/app/helpers/effective_posts_helper.rb

@@ -16,7 +16,7 @@ module EffectivePostsHelper
   end
 
   def effective_post_path(post, opts = nil)
-    category = post.category.to_s.downcase
+    category = post.category.to_s.downcase.parameterize
     opts ||= {}
 
     if EffectivePosts.use_blog_routes

data/app/models/effective/post.rb

@@ -9,7 +9,6 @@ module Effective
     attr_accessor :current_user
 
     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)
@@ -19,7 +18,7 @@ module Effective
     has_rich_text :excerpt
     has_rich_text :body
 
-    self.table_name = EffectivePosts.posts_table_name.to_s
+    self.table_name = (EffectivePosts.posts_table_name || :posts).to_s
 
     belongs_to :user, polymorphic: true, optional: true
 
@@ -55,13 +54,16 @@ module Effective
     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("#{EffectivePosts.posts_table_name}.published_at < ?", Time.zone.now) }
     scope :unpublished, -> { where(draft: true).or(where("#{EffectivePosts.posts_table_name}.published_at > ?", Time.zone.now)) }
-    scope :with_category, -> (category) { where(category: category.to_s.downcase) }
+    scope :with_category, -> (category) { where(category: category) }
+
+    # Kind of a meta category
+    scope :news, -> { where(category: EffectivePosts.news_categories) }
+    scope :events, -> { where(category: EffectivePosts.event_categories) }
 
     scope :deep, -> { with_rich_text_excerpt_and_embeds.with_rich_text_body_and_embeds }
 
@@ -105,7 +107,7 @@ module Effective
     end
 
     def event?
-      category == 'events'
+      EffectivePosts.event_categories.include?(EffectivePosts.category(category))
     end
 
     def start_time

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

@@ -1,49 +1,7 @@
-= effective_form_with(model: [:admin, post], engine: true) do |f|
-  = tabs do
-    = tab "Post" do
-      = f.text_field :title, hint: 'The title of your post.'
+= tabs do
+  = tab "Post" do
+    = render 'admin/posts/form_post', post: post
 
-      - 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.'
-
-      = 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
-        = f.hidden_field :category, value: (EffectivePosts.categories.first || 'posts')
-
-      - if EffectivePosts.use_active_storage
-        = f.file_field :image, hint: 'An image for your post'
-
-      - 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.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?(EffectiveRoles) && f.object.respond_to?(:roles) && EffectivePosts.use_effective_roles
-        = render partial: '/admin/posts/roles', locals: { post: post, form: f, f: f }
-
-    - if f.object.class.respond_to?(:acts_as_tagged?)
-      = tab "Tags" do
-        = render 'effective/tags/fields', f: f
-
-  = f.submit do
-    = f.save 'Save'
-    = f.save 'Save and View', class: 'btn btn-secondary'
-    - if f.object.persisted?
-      = f.save 'Duplicate', class: 'btn btn-info'
+    - if post.persisted? && post.respond_to?(:log_changes_datatable)
+      = tab "Logs" do
+        = render_inline_datatable(post.log_changes_datatable)

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

@@ -0,0 +1,46 @@
+= effective_form_with(model: [:admin, 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, 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.'
+
+  = 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
+    = 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_active_storage
+    = f.file_field :image, hint: 'An image for your post'
+
+  - 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.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 EffectivePosts.use_effective_roles
+    = render partial: '/admin/posts/roles', locals: { post: post, form: f, f: f }
+
+  = f.submit do
+    = f.save 'Save'
+    = f.save 'Save and View', class: 'btn btn-secondary'
+    - if f.object.persisted?
+      = f.save 'Duplicate', class: 'btn btn-info'

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

@@ -1,17 +1,14 @@
--# Adding additional .effective-posts-category-#{category} will correctly show/hide on Posts#new forms
-
 - # Event specific fields
-.effective-post-category-events.card.mb-4{style: ('display: none' unless f.object.category == 'events')}
-  .card-body
-    %h5.card-title Event Info
-    = form.datetime_field :start_at, required: false, hint: 'Display a start time for this event.'
+= f.show_if_any(:category, EffectivePosts.event_categories) do
+  = card('Event Info') do
+    = f.datetime_field :start_at, required: false, hint: 'Display a start time for this event.'
 
-    = form.datetime_field :end_at, required: false, hint: 'Display an end time of this event.'
+    = f.datetime_field :end_at, required: false, hint: 'Display an end time of this event.'
 
-    = form.text_field :location, required: false, hint: 'Display a location where this event is taking place.'
+    = f.text_field :location, required: false, hint: 'Display a location where this event is taking place.'
 
-    = form.text_field :website_name, label: 'External website',
+    = f.text_field :website_name, label: 'External website',
       placeholder: 'Buy Tickets', hint: 'The label of an external website.'
 
-    = form.url_field :website_href, label: 'External website address',
+    = f.url_field :website_href, label: 'External website address',
       placeholder: 'http://', hint: 'The address of an external website (start with http:// or https://).'

data/config/effective_posts.rb

@@ -1,9 +1,14 @@
 EffectivePosts.setup do |config|
   config.posts_table_name = :posts
 
-  # Every post must belong to one or more category.
-  # Don't use the category :posts
-  config.categories = [:news]
+  # Every post must have a category
+  # Each of these categories parameterized value will be a top level route
+  config.categories = ['News', 'Events']
+
+  # Which of the above categories will be considered post.event? 
+  # Used to select the fields on the Admin form
+  # Can't be unique. Must be subset of config.categories
+  config.event_categories = ['Events']
 
   # Create top level routes for each category
   # Should each of the above categories have a top level route created for it

data/config/routes.rb

@@ -11,7 +11,7 @@ EffectivePosts::Engine.routes.draw do
 
     # Blog Routes
     match 'blog/category/:category', to: 'posts#index', via: :get, constraints: lambda { |req|
-      EffectivePosts.use_blog_routes && EffectivePosts.categories.include?(req.params['category'].to_sym)
+      EffectivePosts.use_blog_routes && EffectivePosts.category(req.params['category']).present?
     }
 
     resources :posts, only: [:index, :show], path: 'blog', constraints: lambda { |req|
@@ -20,11 +20,11 @@ EffectivePosts::Engine.routes.draw do
 
     # Category routes
     match ':category', to: 'posts#index', via: :get, constraints: lambda { |req|
-      EffectivePosts.use_category_routes && EffectivePosts.categories.include?(req.params['category'].to_sym)
+      EffectivePosts.use_category_routes && EffectivePosts.category(req.params['category']).present?
     }
 
     match ":category/:id", to: 'posts#show', via: :get, constraints: lambda { |req|
-      EffectivePosts.use_category_routes && EffectivePosts.categories.include?(req.params['category'].to_sym)
+      EffectivePosts.use_category_routes && EffectivePosts.category(req.params['category']).present?
     }
   end
 

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '2.2.4'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/lib/effective_posts.rb

@@ -6,7 +6,8 @@ module EffectivePosts
 
   def self.config_keys
     [
-      :posts_table_name, :layout, :categories,
+      :posts_table_name, :layout, 
+      :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,
@@ -29,4 +30,33 @@ module EffectivePosts
     ]
   end
 
+  # Normalize and return the category that matches this value
+  def self.category(value, safe: true)
+    values = [value, value.to_s, value.to_s.downcase, value.to_s.downcase.parameterize, value.to_s.parameterize]
+
+    category = categories.find do |cat|
+      (values & [cat, cat.to_s, cat.to_s.downcase, cat.to_s.downcase.parameterize, cat.to_s.parameterize]).present?
+    end
+
+    raise("Unable to find EffectivePosts.category for value '#{value.presence || 'nil'}'") unless safe
+
+    category
+  end
+
+  def self.categories
+    Array(config[:categories])
+  end
+
+  def self.event_categories
+    Array(config[:event_categories])
+  end
+
+  def self.not_event_categories
+    categories - event_categories
+  end
+
+  def self.news_categories
+    categories - event_categories
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-26 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,7 +92,6 @@ files:
 - README.md
 - app/assets/config/effective_posts_manifest.js
 - app/assets/javascripts/effective_posts.js
-- app/assets/javascripts/effective_posts/additional_fields.js.coffee
 - app/assets/stylesheets/effective_posts.scss
 - app/controllers/admin/posts_controller.rb
 - app/controllers/effective/posts_controller.rb
@@ -101,6 +100,7 @@ files:
 - app/mailers/effective/posts_mailer.rb
 - app/models/effective/post.rb
 - app/views/admin/posts/_form.html.haml
+- app/views/admin/posts/_form_post.html.haml
 - app/views/admin/posts/_roles.html.haml
 - app/views/admin/posts/excerpts.html.haml
 - app/views/admin/posts/index.html.haml

data/app/assets/javascripts/effective_posts/additional_fields.js.coffee

@@ -1,8 +0,0 @@
-# Show/hide the Event fields on admin/posts form
-
-$(document).on 'change', "select[name='effective_post[category]']", (event) ->
-  obj = $(event.currentTarget)
-
-  obj.closest('form').find("[class^='effective-post-category-']").hide()
-  obj.closest('form').find(".effective-post-category-#{obj.val()}").show()
-