effective_posts 2.0.2 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa5788677bbc314a5bf40d373e1d8fcd3ec888fcff06ceb309dc28b027304db
-  data.tar.gz: bc87d5b89781c026ee5db81ee123aeefbf5de29e8bd65c102e282c362b38ae2b
+  metadata.gz: 64936be0ce130f2c9b5d5fe918d217cf01e77648adfd28440e288d24f45da34e
+  data.tar.gz: cf67a0e59a0f7d11b6d6083d83a8d561009f12716ad249fb7a3072dde2f72232
 SHA512:
-  metadata.gz: 175315b793aa0e096a29a20b66e568c93812ae804156e4c2bd169fa28ad20084041e0058f238fea7c063f87093d7f2e74330a2a15a10e47712470649ee7546b0
-  data.tar.gz: 2dc2137a2e10ec1c63e0cfbcfb63c92ee8b045568f8acb2ac991b7888eba0b4242ed7f9188f1c76cbd1b67ea4c423ada138798c02c85d47af7448bbf9eb98b07
+  metadata.gz: 519ffb8e746373b2473129b55b9fe471fa824e4ed06b89bfca95f34a3908f029526d7d07654ce444bda2175106ae6c5233e200cf747129b086951070e322a94d
+  data.tar.gz: 271fc10da03adfe19b837b8bd0c72e5e8ccc074ecce114a098cde2979411ea0149b1583c999c440d4c303679df6229a3abd3f1dec840d526dab0465fd19ffcae

data/app/assets/config/effective_posts_manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/app/controllers/admin/posts_controller.rb

@@ -5,10 +5,6 @@ module Admin
 
     include Effective::CrudController
 
-    if (config = EffectivePosts.layout)
-      layout(config.kind_of?(Hash) ? config[:admin] : config)
-    end
-
     submit :save, 'Save'
     submit :save, 'Save and Add New', redirect: :new
     submit :save, 'Save and View', redirect: -> { effective_posts.post_path(resource) }

data/app/controllers/effective/posts_controller.rb

@@ -7,10 +7,6 @@ module Effective
 
     include Effective::CrudController
 
-    if (config = EffectivePosts.layout)
-      layout(config.kind_of?(Hash) ? (config[:application] || config[:posts]) : config)
-    end
-
     def index
       @posts ||= Effective::Post.posts(
         user: current_user,
@@ -79,7 +75,7 @@ module Effective
         flash.now[:success] = 'Successfully submitted post'
 
         if EffectivePosts.submissions_require_approval
-          @post.send_post_submitted_to_admin!
+          @post.send_post_submitted!
         end
 
         render :submitted
@@ -104,12 +100,12 @@ module Effective
 
       EffectiveResources.authorize!(self, :update, @post)
 
-      if @post.update_attributes(post_params)
+      if @post.update(post_params)
         @page_title ||= 'Post Submitted'
         flash.now[:success] = 'Successfully re-submitted post'
 
         if EffectivePosts.submissions_require_approval && draft_was != true
-          @post.send_post_submitted_to_admin!
+          @post.send_post_submitted!
         end
 
         render :submitted

data/app/helpers/effective_posts_helper.rb

@@ -3,14 +3,14 @@ require 'cgi'
 module EffectivePostsHelper
 
   def effective_posts_header_tags
-    return unless @post && @post.kind_of?(Effective::Post) && @post.persisted?
+    return unless @post && @post.kind_of?(Effective::Post) && @post.persisted? && @post.published?
 
     @effective_pages_og_type = 'article'
 
     tags = [
       tag(:meta, itemprop: 'author', content: @post.user.to_s),
       tag(:meta, itemprop: 'publisher', content: @post.user.to_s),
-      tag(:meta, itemprop: 'datePublised', content: @post.published_at.strftime('%FT%T%:z')),
+      tag(:meta, itemprop: 'datePublished', content: (@post.published_at || Time.zone.now).strftime('%FT%T%:z')),
       tag(:meta, itemprop: 'headline', content: @post.title)
     ].join("\n").html_safe
   end
@@ -74,7 +74,7 @@ module EffectivePostsHelper
     if 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')}", class: 'badge badge-info')
+      content_tag(:span, "TO BE PUBLISHED AT #{post.published_at&.strftime('%F %H:%M') || 'LATER'}", class: 'badge badge-info')
     end
   end
 

data/app/mailers/effective/posts_mailer.rb

@@ -1,35 +1,18 @@
 module Effective
-  class PostsMailer < ActionMailer::Base
-    helper EffectivePostsHelper
-
-    layout EffectivePosts.mailer[:layout].presence || 'effective_posts_mailer_layout'
+  class PostsMailer < EffectivePosts.parent_mailer_class
+    include EffectiveMailer
 
-    def post_submitted_to_admin(post_param)
-      @post = (post_param.kind_of?(Effective::Post) ? post_param : Effective::Post.find(post_param))
-
-      mail(
-        to: EffectivePosts.mailer[:admin_email],
-        from: EffectivePosts.mailer[:default_from],
-        subject: subject_for_post_submitted_to_admin(@post),
-        tenant: (Tenant.current if defined?(Tenant))
-      )
-    end
-
-    private
+    helper EffectivePostsHelper
 
-    def subject_for_post_submitted_to_admin(post)
-      string_or_callable = EffectivePosts.mailer[:subject_for_post_submitted_to_admin]
+    def post_submitted(resource, opts = {})
+      raise('expected an Effective::Post') unless resource.kind_of?(Effective::Post)
 
-      if string_or_callable.respond_to?(:call) # This is a Proc or a function, not a string
-        string_or_callable = self.instance_exec(post, &string_or_callable)
-      end
+      @post = resource
+      subject = subject_for(__method__, 'Post Submitted', resource, opts)
+      headers = headers_for(resource, opts)
 
-      prefix_subject(string_or_callable.presence || "A new post has been submitted that needs approval")
+      mail(to: mailer_admin, subject: subject, **headers)
     end
 
-    def prefix_subject(text)
-      prefix = (EffectivePosts.mailer[:subject_prefix].to_s rescue '')
-      prefix.present? ? (prefix.chomp(' ') + ' ' + text) : text
-    end
   end
 end

data/app/models/effective/post.rb

@@ -106,9 +106,8 @@ module Effective
       (regions.to_a.sum { |region| (region.content || '').scan(/\w+/).size } / reading_speed).seconds
     end
 
-    def send_post_submitted_to_admin!
-      deliver_method = EffectivePosts.mailer[:deliver_method] || EffectiveResources.deliver_method
-      Effective::PostsMailer.post_submitted_to_admin(to_param).send(deliver_method)
+    def send_post_submitted!
+      EffectivePosts.send_email(:post_submitted, self)
     end
 
     # Returns a duplicated post object, or throws an exception

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

@@ -14,7 +14,7 @@
   - if Array(EffectivePosts.categories).length > 1
     = f.select :category, EffectivePosts.categories
   - else
-    = f.hidden_field :category, (EffectivePosts.categories.first || 'posts')
+    = f.hidden_field :category, value: (EffectivePosts.categories.first || 'posts')
 
   - if EffectivePosts.use_active_storage
     = f.file_field :image, hint: 'An image for your post'

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

@@ -8,7 +8,7 @@
   - if Array(EffectivePosts.categories).length > 1
     = f.select :category, EffectivePosts.categories
   - else
-    = f.hidden_field :category, (EffectivePosts.categories.first || 'posts')
+    = f.hidden_field :category, value: (EffectivePosts.categories.first || 'posts')
 
   - if EffectivePosts.use_active_storage
     = f.file_field :image, hint: 'An image for your post'

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

@@ -7,4 +7,4 @@
 
 %hr
 
-= render file: '/effective/posts/show'
+= render template: 'effective/posts/show'

data/app/views/effective/posts_mailer/{post_submitted_to_admin.html.haml → post_submitted.html.haml}

@@ -1,6 +1,6 @@
 %p A new post has been submitted and needs your approval before it may be displayed on the website:
 
-%p= link_to 'Approve Post', effective_posts.admin_approve_post_path(@post)
+%p= link_to 'Approve Post', effective_posts.approve_admin_post_url(@post)
 
 %hr
 
@@ -19,4 +19,4 @@
 
 %hr
 
-%p= link_to 'Approve Post', effective_posts.admin_approve_post_path(@post)
+%p= link_to 'Approve Post', effective_posts.approve_admin_post_url(@post)

data/config/effective_posts.rb

@@ -3,7 +3,7 @@ EffectivePosts.setup do |config|
 
   # Every post must belong to one or more category.
   # Don't use the category :posts
-  config.categories = [:news, :events]
+  config.categories = [:news]
 
   # Create top level routes for each category
   # Should each of the above categories have a top level route created for it
@@ -49,31 +49,20 @@ EffectivePosts.setup do |config|
   config.submissions_require_approval = true
 
   # The Thank you message when they submit a post
-  config.submissions_note = "News & Event submitted! A confirmation email has been sent to the website owner. When approved, your submission will appear on the website."
+  config.submissions_note = "Post submitted! A confirmation email has been sent to the website owner. When approved, your submission will appear on the website."
 
   # Mailer Settings
-  # effective_posts will send the admin an email when a post is submitted
-  # For all the emails, the same :subject_prefix will be prefixed.  Leave as nil / empty string if you don't want any prefix
+  # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
   #
-  # The subject_for_post_submitted_to_admin can be one of:
-  # - nil / empty string to use the built in defaults
-  # - A string with the full subject line for this email
-  # - A Proc to create the subject line based on the email
-  # In all three of these cases, the subject_prefix will still be used.
-
-  # The Procs are the same for admin & buyer receipt, the seller Proc is different
-  # subject_for_post_submitted_to_admin: Proc.new { |post| "Post needs approval"}
-
-  config.mailer = {
-    subject_prefix: '[example]',
-    subject_for_post_submitted_to_admin: '',
-
-    layout: 'effective_posts_mailer_layout',
-
-    default_from: 'info@example.com',
-    admin_email: 'admin@example.com',
-
-    deliver_method: :deliver_now
-  }
-
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Effective::PostsMailer'
+  #
+  # Override effective_resource mailer defaults
+  #
+  # config.parent_mailer = nil      # The parent class responsible for sending emails
+  # config.deliver_method = nil     # The deliver method, deliver_later or deliver_now
+  # config.mailer_layout = nil      # Default mailer layout
+  # config.mailer_sender = nil      # Default From value
+  # config.mailer_admin = nil       # Default To value for Admin correspondence
+  # config.mailer_subject = nil     # Proc.new method used to customize Subject
 end

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.5'.freeze
 end

data/lib/effective_posts.rb

@@ -7,17 +7,21 @@ module EffectivePosts
   def self.config_keys
     [
       :posts_table_name, :layout, :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,
       :per_page, :post_meta_author,
       :submissions_enabled, :submissions_require_current_user,
-      :submissions_require_approval, :submissions_note,
-      :mailer
+      :submissions_require_approval, :submissions_note
     ]
   end
 
   include EffectiveGem
 
+  def self.mailer_class
+    mailer&.constantize || Effective::PostsMailer
+  end
+
   def self.permitted_params
     @permitted_params ||= [
       :title, :excerpt, :description, :draft, :category, :slug, :published_at, :body, :tags, :extra,

data/lib/generators/templates/effective_posts_mailer_preview.rb

@@ -3,8 +3,8 @@
 # to see a preview of the following 3 emails:
 
 class EffectivePostsMailerPreview < ActionMailer::Preview
-  def post_submitted_to_admin
-    Effective::PostsMailer.post_submitted_to_admin(build_preview_post)
+  def post_submitted
+    EffectivePosts.mailer_class.post_submitted(build_preview_post)
   end
 
   protected

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -90,6 +90,7 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - 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
@@ -118,8 +119,7 @@ files:
 - app/views/effective/posts/new.html.haml
 - app/views/effective/posts/show.html.haml
 - app/views/effective/posts/submitted.html.haml
-- app/views/effective/posts_mailer/post_submitted_to_admin.html.haml
-- app/views/layouts/effective_posts_mailer_layout.html.haml
+- app/views/effective/posts_mailer/post_submitted.html.haml
 - config/effective_posts.rb
 - config/routes.rb
 - db/migrate/01_create_effective_posts.rb.erb

data/app/views/layouts/effective_posts_mailer_layout.html.haml

@@ -1,7 +0,0 @@
-!!!
-%html{style: 'background: #fff;'}
-  %head
-    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'}
-
-  %body{style: 'background: #fff;'}
-    = yield