effective_posts 1.1.11 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15619ebf6addfa716f58d0fb7869856a7767d3ce2b330e215965f2597d6dc2d2
-  data.tar.gz: a9b86d1453132f0aa42a14118f7f6b8c2d20efe2ea9bb7a216422329cde031e2
+  metadata.gz: 007be2e2a5fb606693f2e10afe0c735cbdd441c0f5d186361e7f64f144a8b503
+  data.tar.gz: 78f5fc983964c4ada845f37d4d248bb5bae08843ddc13772cb75351c12753297
 SHA512:
-  metadata.gz: 4f8cef5af970f766636881e7e2ac17ff6d41e23b11b97e24695dd0dab6311c427e1247cb9712dbf1acca7b273a1ec73ab7c9abacdc91ae162078076aa654e4e0
-  data.tar.gz: 18f8c7ec44d83352c57486ff6f33d6b68288dff8ab27fb1e6cb1322129cb74e76ac9ee808468d9e97499e4a6385650797c21fc035497770725ff5ef7bfd72330
+  metadata.gz: 2039fb90e755306075db5f39fa225bbb2960acc1a0d50881cec51b49a5a27709ccd948188f90e78ce38696eda48417327a01690e577f357eb31294f48b89d9f1
+  data.tar.gz: f4ed4132951108343e9961abe2f40057f21b8edeb5aa513661b636ca8c0bc6798aaf052db80156738393f7f138df05f98747b7135d9bbaf461e64f2a47d2b2f8

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018 Code and Effect Inc.
+Copyright 2021 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,17 +2,17 @@
 
 A blog implementation with WYSIWYG content editing, post scheduling, pagination and optional top level routes for each post category.
 
-## effective_posts 1.0
+## effective_posts 2.0
 
-This is the 1.0 series of effective_posts.
+This is the 2.0 series of effective_posts.
 
-This requires Twitter Bootstrap 4 and Rails 5.1+
+This requires Twitter Bootstrap 4 and Rails 6+
 
 Please check out [Effective Posts 0.x](https://github.com/code-and-effect/effective_posts/tree/bootstrap3) for more information using this gem with Bootstrap 3.
 
 ## Getting Started
 
-Please first install the [effective_regions](https://github.com/code-and-effect/effective_regions) and [effective_datatables](https://github.com/code-and-effect/effective_datatables) gems.
+Please first install the [effective_datatables](https://github.com/code-and-effect/effective_datatables) gem.
 
 Please download and install [Twitter Bootstrap4](http://getbootstrap.com)
 
@@ -64,8 +64,6 @@ You can schedule a post to appear at a later date by setting the published_at va
 
 As well, if you're using the [effective_roles](https://github.com/code-and-effect/effective_roles) gem, you will be able to configure permissions so that only permitted users may view this post.
 
-Once you click `Save and Edit Content` you will be brought into the effective_regions editor where you may enter the content for your post.  Click `Insert Snippet` -> `Read more divider` from the toolbar to place a divider into your post.  Only the content above the Read more divider, the excerpt content, will be displayed on any posts#index screens.  The full content will be displayed on the posts#show screen.
-
 
 ## Category Routes
 
@@ -78,9 +76,6 @@ If disabled, all posts will be available at `/posts`, with posts for a specific
 
 Use `link_to_post_category(:blog)` to display a link to the Blog page.  The helper considers `config.use_category_routes` and puts in the correct url.
 
-Use `post_excerpt(post)` to display the excerpt for a post.  Or `post_excerpt(post, :length => 200)` to truncate it and add a Read more link where appropriate.
-
-
 ## Pagination
 
 The [effective_bootstrap](https://github.com/code-and-effect/effective_bootstrap) gem is used for pagination on all posts#index type screens.
@@ -90,54 +85,7 @@ The per_page for posts may be configured via the `/app/config/initializers/effec
 
 ## Authorization
 
-All authorization checks are handled via the config.authorization_method found in the `app/config/initializers/effective_posts.rb` file.
-
-It is intended for flow through to CanCan or Pundit, but neither of those gems are required.
-
-This method is called by all controller actions with the appropriate action and resource
-
-Action will be one of [:index, :show, :new, :create, :edit, :update, :destroy]
-
-Resource will the appropriate Effective::Post object or class
-
-The authorization method is defined in the initializer file:
-
-```ruby
-# As a Proc (with CanCan)
-config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
-```
-
-```ruby
-# As a Custom Method
-config.authorization_method = :my_authorization_method
-```
-
-and then in your application_controller.rb:
-
-```ruby
-def my_authorization_method(action, resource)
-  current_user.is?(:admin) || EffectivePunditPolicy.new(current_user, resource).send('#{action}?')
-end
-```
-
-or disabled entirely:
-
-```ruby
-config.authorization_method = false
-```
-
-If the method or proc returns false (user is not authorized) an Effective::AccessDenied exception will be raised
-
-You can rescue from this exception by adding the following to your application_controller.rb:
-
-```ruby
-rescue_from Effective::AccessDenied do |exception|
-  respond_to do |format|
-    format.html { render 'static_pages/access_denied', :status => 403 }
-    format.any { render :text => 'Access Denied', :status => 403 }
-  end
-end
-```
+All authorization checks are handled via the effective_resources gem found in the `config/initializers/effective_resources.rb` file.
 
 ### Permissions
 
@@ -160,7 +108,6 @@ There are some obvious additional features that have yet to be implemented:
 - Some kind of helper for displaying a sidebar for the categories
 - Post archives and date filtering
 
-
 ## License
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)

data/app/controllers/admin/posts_controller.rb

@@ -1,136 +1,21 @@
 module Admin
   class PostsController < ApplicationController
-    before_action(:authenticate_user!) # Devise
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_posts) }
 
-    layout (EffectivePosts.layout.kind_of?(Hash) ? EffectivePosts.layout[:admin] : EffectivePosts.layout)
+    include Effective::CrudController
 
-    def index
-      @page_title = 'Posts'
-      @datatable = EffectivePostsDatatable.new(self)
-
-      authorize_effective_posts!
-    end
-
-    def new
-      @post = Effective::Post.new(published_at: Time.zone.now)
-      @page_title = 'New Post'
-
-      authorize_effective_posts!
-    end
-
-    def create
-      @post = Effective::Post.new(post_params)
-      @post.user = current_user if defined?(current_user)
-
-      @page_title = 'New Post'
-
-      authorize_effective_posts!
-
-      if @post.save
-        if params[:commit] == 'Save and Edit Content'
-          redirect_to effective_regions.edit_path(effective_posts.post_path(@post), :exit => effective_posts.edit_admin_post_path(@post))
-        elsif params[:commit] == 'Save and Add New'
-          flash[:success] = 'Successfully created post'
-          redirect_to effective_posts.new_admin_post_path
-        elsif params[:commit] == 'Save and View'
-          redirect_to effective_posts.post_path(@post)
-        else
-          flash[:success] = 'Successfully created post'
-          redirect_to effective_posts.edit_admin_post_path(@post)
-        end
-      else
-        flash.now[:danger] = 'Unable to create post'
-        render :action => :new
-      end
-    end
-
-    def edit
-      @post = Effective::Post.find(params[:id])
-      @page_title = 'Edit Post'
-
-      authorize_effective_posts!
-    end
-
-    def update
-      @post = Effective::Post.find(params[:id])
-      @page_title = 'Edit Post'
-
-      authorize_effective_posts!
-
-      if @post.update_attributes(post_params)
-        if params[:commit] == 'Save and Edit Content'
-          redirect_to effective_regions.edit_path(effective_posts.post_path(@post), :exit => effective_posts.edit_admin_post_path(@post))
-        elsif params[:commit] == 'Save and Add New'
-          flash[:success] = 'Successfully updated post'
-          redirect_to effective_posts.new_admin_post_path
-        elsif params[:commit] == 'Save and View'
-          redirect_to effective_posts.post_path(@post)
-        elsif params[:commit] == 'Duplicate'
-          begin
-            post = @post.duplicate!
-            flash[:success] = 'Successfully saved and duplicated post.'
-            flash[:info] = "You are now editing the duplicated post. This new post has been created as a Draft."
-          rescue => e
-            flash.delete(:success)
-            flash[:danger] = "Unable to duplicate post: #{e.message}"
-          end
-
-          redirect_to effective_posts.edit_admin_post_path(post || @post)
-        else
-          flash[:success] = 'Successfully updated post'
-          redirect_to effective_posts.edit_admin_post_path(@post)
-        end
-      else
-        flash.now[:danger] = 'Unable to update post'
-        render :action => :edit
-      end
-    end
-
-    def destroy
-      @post = Effective::Post.find(params[:id])
-
-      authorize_effective_posts!
-
-      if @post.destroy
-        flash[:success] = 'Successfully deleted post'
-      else
-        flash[:danger] = 'Unable to delete post'
-      end
-
-      redirect_to effective_posts.admin_posts_path
-    end
-
-    def approve
-      @post = Effective::Post.find(params[:id])
-      @page_title = 'Approve Post'
-
-      authorize_effective_posts!
-
-      if @post.update_attributes(draft: false)
-        flash[:success] = 'Successfully approved post.  It is now displayed on the website.'
-      else
-        flash[:danger] = "Unable to approve post: #{@post.errors.full_messages.join(', ')}"
-      end
-
-      redirect_to(:back) rescue redirect_to(effective_posts.admin_posts_path)
-    end
-
-    def excerpts
-      @posts = Effective::Post.includes(:regions)
-      @page_title = 'Post Excerpts'
-
-      authorize_effective_posts!
+    if (config = EffectivePosts.layout)
+      layout(config.kind_of?(Hash) ? config[:admin] : config)
     end
 
-    private
-
-    def authorize_effective_posts!
-      EffectivePosts.authorize!(self, :admin, :effective_posts)
-      EffectivePosts.authorize!(self, action_name.to_sym, @post || Effective::Post)
-    end
+    submit :save, 'Save'
+    submit :save, 'Save and Add New', redirect: :new
+    submit :save, 'Save and View', redirect: -> { effective_posts.post_path(resource) }
+    submit :save, 'Duplicate', redirect: -> { effective_posts.new_admin_post_path(duplicate_id: resource.id) }
 
     def post_params
-      params.require(:effective_post).permit(EffectivePosts.permitted_params)
+      params.require(:effective_post).permit!
     end
 
   end

data/app/controllers/effective/posts_controller.rb

@@ -1,15 +1,21 @@
 module Effective
   class PostsController < ApplicationController
-    layout (EffectivePosts.layout.kind_of?(Hash) ? EffectivePosts.layout[:posts] : EffectivePosts.layout)
+    if defined?(Devise)
+      before_action :authenticate_user!, only: [:new, :create, :edit, :update],
+        if: -> { EffectivePosts.submissions_require_current_user }
+    end
+
+    include Effective::CrudController
 
-    before_action :authenticate_user!, only: [:new, :create, :edit, :update],
-      if: -> { EffectivePosts.submissions_require_current_user }
+    if (config = EffectivePosts.layout)
+      layout(config.kind_of?(Hash) ? (config[:application] || config[:posts]) : config)
+    end
 
     def index
       @posts ||= Effective::Post.posts(
         user: current_user,
         category: params[:category],
-        unpublished: EffectivePosts.authorized?(self, :admin, :effective_posts)
+        unpublished: EffectiveResources.authorized?(self, :admin, :effective_posts)
       )
 
       @posts = @posts.paginate(page: params[:page])
@@ -23,28 +29,27 @@ module Effective
         @posts = @posts.where(search) if search.present?
       end
 
-      EffectivePosts.authorize!(self, :index, Effective::Post)
+      EffectiveResources.authorize!(self, :index, Effective::Post)
 
       @page_title ||= [(params[: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: EffectivePosts.authorized?(self, :admin, :effective_posts))
+      @posts ||= Effective::Post.posts(user: current_user, category: params[:category], unpublished: EffectiveResources.authorized?(self, :admin, :effective_posts))
       @post = @posts.find(params[:id])
 
       if @post.respond_to?(:roles_permit?)
         raise Effective::AccessDenied.new('Access Denied', :show, @post) unless @post.roles_permit?(current_user)
       end
 
-      EffectivePosts.authorize!(self, :show, @post)
+      EffectiveResources.authorize!(self, :show, @post)
 
-      if EffectivePosts.authorized?(self, :admin, :effective_posts)
+      if EffectiveResources.authorized?(self, :admin, :effective_posts)
         flash.now[:warning] = [
           'Hi Admin!',
           ('You are viewing a hidden post.' unless @post.published?),
           'Click here to',
-          ("<a href='#{effective_regions.edit_path(effective_posts.post_path(@post, exit: effective_posts.post_path(@post)))}' class='alert-link' data-no-turbolink='true' data-turbolinks='false'>edit post content</a> or" unless admin_edit?),
           ("<a href='#{effective_posts.edit_admin_post_path(@post)}' class='alert-link'>edit post settings</a>.")
         ].compact.join(' ')
       end
@@ -59,7 +64,7 @@ module Effective
       @post ||= Effective::Post.new(published_at: Time.zone.now)
       @page_title = 'New Post'
 
-      EffectivePosts.authorize!(self, :new, @post)
+      EffectiveResources.authorize!(self, :new, @post)
     end
 
     def create
@@ -67,7 +72,7 @@ module Effective
       @post.user = current_user if defined?(current_user)
       @post.draft = (EffectivePosts.submissions_require_approval == true)
 
-      EffectivePosts.authorize!(self, :create, @post)
+      EffectiveResources.authorize!(self, :create, @post)
 
       if @post.save
         @page_title ||= 'Post Submitted'
@@ -89,7 +94,7 @@ module Effective
       @post ||= Effective::Post.find(params[:id])
       @page_title ||= 'Edit Post'
 
-      EffectivePosts.authorize!(self, :edit, @post)
+      EffectiveResources.authorize!(self, :edit, @post)
     end
 
     def update
@@ -97,7 +102,7 @@ module Effective
       draft_was = @post.draft
       @post.draft = (EffectivePosts.submissions_require_approval == true)
 
-      EffectivePosts.authorize!(self, :update, @post)
+      EffectiveResources.authorize!(self, :update, @post)
 
       if @post.update_attributes(post_params)
         @page_title ||= 'Post Submitted'
@@ -118,7 +123,7 @@ module Effective
     def destroy
       @post ||= Effective::Post.find(params[:id])
 
-      EffectivePosts.authorize!(self, :destroy, @post)
+      EffectiveResources.authorize!(self, :destroy, @post)
 
       if @post.destroy
         flash[:success] = 'Successfully deleted post'
@@ -136,7 +141,7 @@ module Effective
     end
 
     def admin_edit?
-      EffectivePosts.authorized?(self, :admin, :effective_posts) && (params[:edit].to_s == 'true')
+      EffectiveResources.authorized?(self, :admin, :effective_posts) && (params[:edit].to_s == 'true')
     end
 
   end

data/app/datatables/effective_posts_datatable.rb

@@ -25,7 +25,9 @@ class EffectivePostsDatatable < Effective::Datatable
 
     col :created_at, label: 'Submitted at', visible: false
 
-    actions_col partial: '/admin/posts/actions', partial_as: :post
+    actions_col do |post|
+      dropdown_link_to('View', effective_post_path(post), target: '_blank')
+    end
   end
 
   collection do

data/app/helpers/effective_posts_helper.rb

@@ -3,14 +3,14 @@ require 'cgi'
 module EffectivePostsHelper
 
   def effective_posts_header_tags
-    return unless @post.present? && @post.kind_of?(Effective::Post)
+    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
@@ -31,14 +31,15 @@ module EffectivePostsHelper
   def effective_post_category_path(category, opts = nil)
     return effective_posts.posts_path(opts || {}) unless category.present?
 
-    category = category.to_s.downcase
+    category = category.to_s
+    category_path = category.to_s.downcase.parameterize
     opts = (opts || {}).compact
     query = ('?' + opts.to_query) if opts.present?
 
     if EffectivePosts.use_blog_routes
-      "/blog/category/#{category}#{query}"
+      "/blog/category/#{category_path}#{query}"
     elsif EffectivePosts.use_category_routes
-      "/#{category}#{query}"
+      "/#{category_path}#{query}"
     else
       effective_posts.posts_path(opts.merge(category: category.presence).compact)
     end
@@ -60,46 +61,26 @@ 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),
-      ("on #{post.published_at.strftime('%B %d, %Y at %l:%M %p')}" if datetime),
+      ("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),
       ("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
   end
 
   def admin_post_status_badge(post)
-    return nil unless EffectivePosts.authorized?(self, :admin, :effective_posts)
+    return nil unless EffectiveResources.authorized?(self, :admin, :effective_posts)
 
     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
 
-  # Only supported options are:
-  # :label => 'Read more' to set the label of the 'Read More' link
-  # :omission => '...' passed to the final text node's truncate
-  # :length => 200 to set the max inner_text length of the content
   # All other options are passed to the link_to 'Read more'
-  def post_excerpt(post, read_more_link: true, label: 'Continue reading', omission: '...', length: nil)
-    content = effective_region(post, :body, editable: false) { '<p>Default content</p>'.html_safe }
-    divider = content.index(Effective::Snippets::ReadMoreDivider::TOKEN)
-    excerpt = post.excerpt.to_s
-
-    read_more = (read_more_link && label.present?) ? readmore_link(post, label: label) : ''
-
-    html = (
-      if divider.present?
-        truncate_html(content, Effective::Snippets::ReadMoreDivider::TOKEN, '')
-      elsif length.present?
-        truncate_html(excerpt, length, omission)
-      else
-        excerpt
-      end
-    ).html_safe
-
-    (html + read_more).html_safe
+  def post_excerpt(post, label: 'Continue reading')
+    (post.excerpt.to_s + readmore_link(post, label: label)).html_safe
   end
 
   def read_more_link(post, options = {})