effective_posts 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7ad03cbc0f6be05bcd4b34bed730615b458bb9ae1438223edcef393fd3c107
-  data.tar.gz: '028a4320fc0ec425c9fc4a2ec13e8cb38408fa63d0b9a8cc652a3fe7c1ba97e6'
+  metadata.gz: 850461d12290e86cc451412a56caaac5fccfc469c58d8a8a716f8b1efc1a0d40
+  data.tar.gz: 44069bc3c8563a6e91f467a7a9f1458d1cd0e6a3f79eb039abae1be473b76e7f
 SHA512:
-  metadata.gz: 7ae7d9d8c4f85394b56e6915e4f8d21d7104753fb917e831f1d55011d74dedb3dafd1d743fdddc19859dd0145945645217aefbd70c53a93a0722a73bd06e0c76
-  data.tar.gz: e3bad110e3c0cbbf0321e76bcd192b092d56318e0ca7bdd2e946793d2a170870a304266b10a38117b4f509864eae1d346d3647de1957bfeff7b92e7324512432
+  metadata.gz: 8cac1f40075ce9ad990c53ba9f4b0feb2bb887fe9a3b4931e0ed15b5ee574593537b1da261f728e84c08b588e0a2f68ad51a366f4949a93afd037f36b717ff15
+  data.tar.gz: fd63bde9093980a4f7e41660d6a11f7e317a52fe9ddaaace0b5addda9f6016138ff8feec88771f52ccf76c497b9b2a7715099714ef66ca7c4f8207b30e13930c

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.

data/app/controllers/admin/posts_controller.rb

@@ -1,136 +1,20 @@
 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 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,7 +3,7 @@ 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?
 
     @effective_pages_og_type = 'article'
 
@@ -69,7 +69,7 @@ module EffectivePostsHelper
   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')
@@ -78,29 +78,9 @@ module EffectivePostsHelper
     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 = {})

data/app/mailers/effective/posts_mailer.rb

@@ -10,7 +10,8 @@ module Effective
       mail(
         to: EffectivePosts.mailer[:admin_email],
         from: EffectivePosts.mailer[:default_from],
-        subject: subject_for_post_submitted_to_admin(@post)
+        subject: subject_for_post_submitted_to_admin(@post),
+        tenant: (Tenant.current if defined?(Tenant))
       )
     end
 

data/app/models/effective/post.rb

@@ -1,55 +1,63 @@
 module Effective
   class Post < ActiveRecord::Base
-    acts_as_regionable
+    attr_accessor :current_user
+
     acts_as_slugged
 
-    if EffectivePosts.use_effective_roles && respond_to?(:acts_as_role_restricted)
-      acts_as_role_restricted
-    end
+    log_changes if respond_to?(:log_changes)
+    acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
 
-    if EffectivePosts.use_active_storage && respond_to?(:has_one_attached)
-      has_one_attached :image
-    end
+    has_one_attached :image
+
+    has_rich_text :excerpt
+    has_rich_text :body
 
     self.table_name = EffectivePosts.posts_table_name.to_s
 
-    belongs_to :user, optional: true
+    belongs_to :user, polymorphic: true, optional: true
+
+    effective_resource do
+      title             :string
+      description       :string
 
-    # Attributes
-    # title             :string
-    # description       :string
+      category          :string
+      slug              :string
 
-    # slug              :string
+      draft             :boolean
+      published_at      :datetime
+      tags              :text
 
-    # category          :string
+      roles_mask        :integer
 
-    # draft             :boolean
-    # published_at      :datetime
-    # tags              :text
+      # Event Fields
+      start_at          :datetime
+      end_at            :datetime
 
-    # roles_mask        :integer
+      location          :string
+      website_name      :string
+      website_href      :string
 
-    # Event Fields
-    # start_at          :datetime
-    # end_at            :datetime
-    # location          :string
-    # website_name      :website_name
-    # website_href      :website_href
+      timestamps
+    end
 
-    # timestamps
+    before_validation(if: -> { current_user.present? }) do
+      self.user ||= current_user
+    end
 
     validates :title, presence: true, length: { maximum: 255 }
     validates :description, presence: true, length: { maximum: 150 }
     validates :category, presence: true
     validates :published_at, presence: true
 
-    validates :start_at, presence: true, if: -> { category == 'events'}
+    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 :deep, -> { with_rich_text_excerpt_and_embeds.with_rich_text_body_and_embeds }
+
     scope :paginate, -> (page: nil, per_page: EffectivePosts.per_page) {
       page = (page || 1).to_i
       offset = [(page - 1), 0].max * per_page
@@ -58,7 +66,7 @@ module Effective
     }
 
     scope :posts, -> (user: nil, category: nil, unpublished: false) {
-      scope = all.includes(:regions).order(published_at: :desc)
+      scope = all.deep.order(published_at: :desc)
 
       if defined?(EffectiveRoles) && EffectivePosts.use_effective_roles
         if user.present? && user.respond_to?(:roles)
@@ -77,16 +85,12 @@ module Effective
       scope
     }
 
-    def to_param
-      slug.presence || "#{id}-#{title.parameterize}"
-    end
-
     def to_s
       title.presence || 'New Post'
     end
 
     def published?
-      !draft? && published_at < Time.zone.now
+      !draft? && published_at.present? && published_at < Time.zone.now
     end
 
     def approved?
@@ -97,25 +101,18 @@ module Effective
       category == 'events'
     end
 
-    def body
-      region(:body).content
-    end
-
-    def body=(input)
-      region(:body).content = input
-    end
-
     # 3.333 words/second is the default reading speed.
     def time_to_read_in_seconds(reading_speed = 3.333)
       (regions.to_a.sum { |region| (region.content || '').scan(/\w+/).size } / reading_speed).seconds
     end
 
     def send_post_submitted_to_admin!
-      send_email(:post_submitted_to_admin, to_param)
+      deliver_method = EffectivePosts.mailer[:deliver_method] || raise('expected an EffectivePosts.deliver_method')
+      Effective::PostsMailer.post_submitted_to_admin(to_param).send(deliver_method)
     end
 
     # Returns a duplicated post object, or throws an exception
-    def duplicate!
+    def duplicate
       Post.new(attributes.except('id', 'updated_at', 'created_at')).tap do |post|
         post.title = post.title + ' (Copy)'
         post.slug = post.slug + '-copy'
@@ -124,26 +121,15 @@ module Effective
         regions.each do |region|
           post.regions.build(region.attributes.except('id', 'updated_at', 'created_at'))
         end
-
-        post.save!
       end
     end
 
-    private
+    def duplicate!
+      duplicate.tap { |post| post.save! }
+    end
 
-    def send_email(email, *mailer_args)
-      begin
-        if EffectivePosts.mailer[:delayed_job_deliver] && EffectivePosts.mailer[:deliver_method] == :deliver_later
-          Effective::PostsMailer.delay.public_send(email, *mailer_args)
-        elsif EffectivePosts.mailer[:deliver_method].present?
-          Effective::PostsMailer.public_send(email, *mailer_args).public_send(EffectivePosts.mailer[:deliver_method])
-        else
-          Effective::PostsMailer.public_send(email, *mailer_args).deliver_now
-        end
-      rescue => e
-        raise e unless Rails.env.production?
-        return false
-      end
+    def approve!
+      update!(draft: false)
     end
 
   end

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

@@ -3,7 +3,13 @@
 
   - 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
+
+  = 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 Array(EffectivePosts.categories).length > 1
     = f.select :category, EffectivePosts.categories
@@ -13,8 +19,7 @@
   - if EffectivePosts.use_active_storage
     = f.file_field :image, hint: 'An image for your post'
 
-  = f.ck_editor :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
+  = 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 }
 
@@ -22,18 +27,12 @@
 
   = f.check_box :draft, hint: 'Save this post as a draft. It will not be accessible on the website.'
 
-  - unless EffectivePosts.use_fullscreen_editor
-    = f.ck_editor :body, hint: 'The content of your post.'
-
   - if defined?(EffectiveRoles) && f.object.respond_to?(:roles) && EffectivePosts.use_effective_roles
     = render partial: '/admin/posts/roles', locals: { post: post, form: f, f: f }
 
   = f.submit do
     = f.save 'Save'
 
-    - if EffectivePosts.use_fullscreen_editor
-      = f.save 'Save and Edit Content', class: 'btn btn-secondary'
-
     = f.save 'Save and View', class: 'btn btn-secondary'
 
     - if f.object.persisted?

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

@@ -6,10 +6,10 @@
       %h2.post-title= link_to post, effective_post_path(post)
   .row
     .col-sm-6
-      %pre= effective_region(post, :body, editable: false)
+      %pre= post.body
 
     .col-sm-6
-      %pre= post_excerpt(post)
+      %pre= post.excerpt
 
   .row
     .col-sm-12

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

@@ -6,4 +6,4 @@
     = admin_post_status_badge(post)
 
   .post-content.post-excerpt
-    = post_excerpt(post)
+    = post.excerpt

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

@@ -18,11 +18,10 @@
   - if posts.length == 0
     %li= link_to 'None', effective_posts.posts_path, class: 'disabled'
 
-- if EffectivePosts.authorized?(self, :admin, :effective_posts)
+- if EffectiveResources.authorized?(self, :admin, :effective_posts)
   %h4.dashboard-title Admin
   %ul.list-unstyled
     %li= link_to 'All Posts', effective_posts.admin_posts_path
 
     - if @post.present?
-      %li= link_to 'Edit Post Content', effective_regions.edit_path(effective_posts.post_path(@post, exit: effective_posts.post_path(@post)))
       %li= link_to 'Edit Post Settings', effective_posts.edit_admin_post_path(@post)

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

@@ -9,5 +9,4 @@
     = render 'effective/posts/event', post: @post
 
     .post-body.post-content
-      = effective_region @post, :body do
-        %p Default content
+      = @post.body

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

@@ -2,7 +2,7 @@
 
 %p= EffectivePosts.submissions_note
 
-- if EffectivePosts.authorized?(controller, :edit, @post)
+- if EffectiveResources.authorized?(controller, :edit, @post)
   %p= link_to 'Edit Post', effective_posts.edit_post_path(@post), class: 'btn btn-primary btn-edit-post'
 
 %hr

data/config/effective_posts.rb

@@ -29,39 +29,8 @@ EffectivePosts.setup do |config|
   # The author is the user that created the Effective::Post object
   config.post_meta_author = true
 
-  # Authorization Method
-  #
-  # This method is called by all controller actions with the appropriate action and resource
-  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
-  #
-  # Use via Proc (and with CanCan):
-  # config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) }
-  #
-  # Use via custom method:
-  # config.authorization_method = :my_authorization_method
-  #
-  # And then in your application_controller.rb:
-  #
-  # def my_authorization_method(action, resource)
-  #   current_user.is?(:admin)
-  # end
-  #
-  # Or disable the check completely:
-  # config.authorization_method = false
-  config.authorization_method = Proc.new do |controller, action, resource|
-    authorize!(action, resource)
-    resource.respond_to?(:roles_permit?) ? resource.roles_permit?(current_user) : true
-  end
-
   # Layout Settings
-  # Configure the Layout per controller, or all at once
-  config.layout = {
-    posts: 'application',
-    admin: 'admin'
-  }
-
-  # Add additional permitted params
-  # config.permitted_params += [:additional_field]
+  # config.layout = { application: 'application', admin: 'admin' }
 
   # Display the effective roles 'choose roles' input when an admin creates a new post
   config.use_effective_roles = false
@@ -107,8 +76,7 @@ EffectivePosts.setup do |config|
     default_from: 'info@example.com',
     admin_email: 'admin@example.com',
 
-    deliver_method: nil,   # :deliver (rails < 4.2), :deliver_now (rails >= 4.2) or :deliver_later
-    delayed_job_deliver: false
+    deliver_method: :deliver_now
   }
 
 end

data/config/routes.rb

@@ -1,15 +1,15 @@
 EffectivePosts::Engine.routes.draw do
   namespace :admin do
-    resources :posts, except: [:show]
-
-    if EffectivePosts.submissions_enabled && EffectivePosts.submissions_require_approval
-      match 'posts/:id/approve', to: 'posts#approve', via: :get, as: :approve_post
+    resources :posts, except: [:show] do
+      if EffectivePosts.submissions_enabled && EffectivePosts.submissions_require_approval
+        post :approve, on: :member
+      end
     end
 
     match 'posts/excerpts', to: 'posts#excerpts', via: :get
   end
 
-  scope :module => 'effective' do
+  scope module: 'effective' do
     categories = Array(EffectivePosts.categories).map { |cat| cat.to_s unless cat == 'posts'}.compact
     onlies = ([:index, :show] unless EffectivePosts.submissions_enabled)
 
@@ -33,9 +33,6 @@ EffectivePosts::Engine.routes.draw do
 
 end
 
-# Automatically mount the engine as an append
-Rails.application.routes.append do
-  unless Rails.application.routes.routes.find { |r| r.name == 'effective_posts' }
-    mount EffectivePosts::Engine => '/', :as => 'effective_posts'
-  end
+Rails.application.routes.draw do
+  mount EffectivePosts::Engine => '/', :as => 'effective_posts'
 end

data/db/migrate/01_create_effective_posts.rb.erb

@@ -2,10 +2,9 @@ class CreateEffectivePosts < ActiveRecord::Migration[4.2]
   def self.up
     create_table <%= @posts_table_name %> do |t|
       t.integer :user_id
+      t.string :user_type
 
       t.string :title
-      t.text :excerpt
-
       t.string :description
 
       t.string :category

data/lib/effective_posts.rb

@@ -1,64 +1,29 @@
-require 'nokogiri'
 require 'effective_datatables'
-require 'effective_regions'
+require 'effective_resources'
 require 'effective_posts/engine'
 require 'effective_posts/version'
 
 module EffectivePosts
-  mattr_accessor :posts_table_name
 
-  mattr_accessor :authorization_method
-  mattr_accessor :permitted_params
-
-  mattr_accessor :layout
-  mattr_accessor :simple_form_options
-  mattr_accessor :admin_simple_form_options
-
-  mattr_accessor :categories
-  mattr_accessor :use_category_routes
-  mattr_accessor :use_blog_routes
-
-  mattr_accessor :use_effective_roles
-  mattr_accessor :use_fullscreen_editor
-  mattr_accessor :use_active_storage
-
-  mattr_accessor :per_page
-  mattr_accessor :post_meta_author
-
-  mattr_accessor :submissions_enabled
-  mattr_accessor :submissions_require_current_user
-  mattr_accessor :submissions_require_approval
-  mattr_accessor :submissions_note
-
-  # These are hashes of configs
-  mattr_accessor :mailer
-
-  def self.setup
-    yield self
-  end
-
-  def self.authorized?(controller, action, resource)
-    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
-
-    return !!authorization_method unless authorization_method.respond_to?(:call)
-    controller = controller.controller if controller.respond_to?(:controller)
-
-    begin
-      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
-    rescue *@_exceptions
-      false
-    end
+  def self.config_keys
+    [
+      :posts_table_name, :layout, :categories,
+      :use_category_routes, :use_blog_routes,
+      :use_effective_roles, :use_fullscreen_editor, :use_active_storage,
+      :per_page, :post_meta_author,
+      :submissions_enabled, :submissions_require_current_user,
+      :submissions_require_approval, :submissions_note,
+      :mailer
+    ]
   end
 
-  def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
-  end
+  include EffectiveGem
 
   def self.permitted_params
-   [
+    [
       :title, :excerpt, :description, :draft, :category, :slug, :published_at, :body, :tags, :extra,
       :image, :start_at, :end_at, :location, :website_name, :website_href, roles: []
-    ].compact
+    ]
   end
 
 end

data/lib/effective_posts/engine.rb

@@ -10,7 +10,7 @@ module EffectivePosts
     end
 
     # Set up our default configuration options.
-    initializer "effective_posts.defaults", :before => :load_config_initializers do |app|
+    initializer "effective_posts.defaults", before: :load_config_initializers do |app|
       # Set up our defaults, as per our initializer template
       eval File.read("#{config.root}/config/effective_posts.rb")
     end

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '1.2.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Code and Effect
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_ckeditor
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,34 +68,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_datatables
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: effective_regions
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,7 +90,6 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- app/assets/javascripts/effective/snippets/read_more_divider.js.coffee
 - app/assets/javascripts/effective_posts.js
 - app/assets/javascripts/effective_posts/additional_fields.js.coffee
 - app/assets/stylesheets/effective_posts.scss
@@ -140,18 +97,12 @@ files:
 - app/controllers/effective/posts_controller.rb
 - app/datatables/effective_posts_datatable.rb
 - app/helpers/effective_posts_helper.rb
-- app/helpers/effective_truncate_html_helper.rb
 - app/mailers/effective/posts_mailer.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/post.rb
-- app/models/effective/snippets/read_more_divider.rb
-- app/views/admin/posts/_actions.html.haml
 - app/views/admin/posts/_form.html.haml
 - app/views/admin/posts/_roles.html.haml
-- app/views/admin/posts/edit.html.haml
 - app/views/admin/posts/excerpts.html.haml
 - app/views/admin/posts/index.html.haml
-- app/views/admin/posts/new.html.haml
 - app/views/effective/posts/_additional_fields.html.haml
 - app/views/effective/posts/_categories.html.haml
 - app/views/effective/posts/_event.html.haml
@@ -168,7 +119,6 @@ files:
 - 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/effective/snippets/_read_more_divider.html.haml
 - app/views/layouts/effective_posts_mailer_layout.html.haml
 - config/effective_posts.rb
 - config/routes.rb

data/app/assets/javascripts/effective/snippets/read_more_divider.js.coffee

@@ -1,22 +0,0 @@
-CKEDITOR.dialog.add 'read_more_divider', (editor) ->  # Must match the class name of the snippet
-  title: 'Read more divider',
-  minWidth: 200,
-  minHeight: 100,
-  contents: [
-    {
-      id: 'read_more_info',    # Just an html id, doesn't really matter what is here
-      elements: [
-        {
-          id: 'throwaway'
-          type: 'html',
-          html: 'Insert a read more divider to separate excerpt content from the full content.',
-          setup: (widget) -> this.setValue(widget.data.throwaway)
-          commit: (widget) -> widget.setData('throwaway', 'throwaway')
-        },
-        {
-          type: 'html',
-          html: 'Anything above the read more divider will be treated as excerpt content<br>and everything below the divider will also be included in the full content.'
-        }
-      ]
-    }
-  ]

data/app/helpers/effective_truncate_html_helper.rb

@@ -1,73 +0,0 @@
-module EffectiveTruncateHtmlHelper
-  # Truncates HTML or text to a certain inner_text character limit.
-  #
-  # If given HTML, the underlying markup may be much longer than length, but the displayed text
-  # will be no longer than (length + omission) characters.
-  def truncate_html(text, length_or_content = 200, omission = '...')
-    doc = Nokogiri::HTML::DocumentFragment.parse(text)
-
-    if length_or_content.kind_of?(String)
-      content = (Nokogiri::HTML::DocumentFragment.parse(length_or_content).children.first.inner_text rescue length_or_content)
-      doc.tap { |doc| _truncate_node_to_content(doc, content, omission) }.inner_html
-    elsif length_or_content.kind_of?(Integer)
-      doc.tap { |doc| _truncate_node_to_length(doc, length_or_content, omission) }.inner_html
-    else
-      raise 'Unsupported datatype passed to second argument of truncate_html.  Expecting integer or string.'
-    end
-  end
-
-  def _truncate_node_to_content(node, content, omission, seen = false)
-    if seen == true
-      node.remove
-    elsif node.children.blank?
-      index = node.content.index(content)
-
-      if index.present?
-        if node.parent.try(:content) == content # If my parent node just has my text in it, remove parent node too
-          node.parent.remove
-        elsif index == 0
-          node.remove
-        else
-          node.content = truncate(node.content, length: index+omission.to_s.length, separator: ' ', omission: omission)
-        end
-
-        seen = true
-      end
-    else
-      node.children.each { |child| seen = _truncate_node_to_content(child, content, omission, seen) }
-    end
-
-    seen
-  end
-
-
-  def _truncate_node_to_length(node, length, omission)
-    if node.inner_text.length <= length
-      # Do nothing, we're already reached base case
-    elsif node.name == 'a'
-      node.remove # I don't want to truncate anything in a link
-    elsif node.children.blank?
-      # I need to truncate myself, and I'm certainly a text node
-      if node.text?
-        node.content = truncate(node.content, length: length+omission.to_s.length, separator: ' ', omission: omission)
-      else
-        node.remove
-      end
-    else # Go through all the children, and delete anything after the length has been reached
-      child_length = 0
-
-      node.children.each do |child|
-        child_length > length ? (child.remove) : (child_length += child.inner_text.length)
-      end
-
-      # We have now removed all nodes after length, but the last node is longer than our length
-      # child_length is the inner_text length of all included nodes
-      # And we only have to truncate the last child to get under length
-
-      child = node.children.last
-      child_max_length = length - (child_length - child.inner_text.length)
-
-      _truncate_node_to_length(child, child_max_length, omission)
-    end
-  end
-end

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end

data/app/models/effective/snippets/read_more_divider.rb

@@ -1,11 +0,0 @@
-module Effective
-  module Snippets
-    class ReadMoreDivider < Snippet
-      TOKEN = "<div style='display: none;'>READ_MORE_DIVIDER</div>"
-
-      def snippet_attributes
-        super + [:throwaway]
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-= dropdown(variation: :dropleft) do
-  - if datatable.admin_namespace?
-    - if EffectivePosts.submissions_enabled && EffectivePosts.submissions_require_approval && !post.approved?
-      = dropdown_link_to 'Approve', effective_posts.admin_approve_post_path(post)
-
-    = dropdown_link_to 'Edit', effective_posts.edit_admin_post_path(post)
-    - if EffectivePosts.use_fullscreen_editor
-      = dropdown_link_to 'Edit Content', effective_post_path(post, edit: true), title: 'Edit Content', 'data-no-turbolink': true, 'data-turbolinks': false, target: '_blank'
-
-    = dropdown_link_to 'View', effective_post_path(post), target: '_blank'
-
-    = dropdown_link_to "Delete", effective_posts.admin_post_path(post),
-        data: { method: :delete, confirm: "Really delete #{post}?" }

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

@@ -1,3 +0,0 @@
-%h1.effective-admin-heading= @page_title
-
-= render partial: 'form', as: :post, object: @post

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

@@ -1,3 +0,0 @@
-%h1.effective-admin-heading= @page_title
-
-= render partial: 'form', as: :post, object: @post

data/app/views/effective/snippets/_read_more_divider.html.haml

@@ -1,9 +0,0 @@
-- if effectively_editting?
-  %p.show-block-adjust{:style => 'border-top: 2px dashed black; text-align: center;', :title => 'anything above this line will be treated as excerpt content'}
-    %span{:style => 'background: #ddd; display: inline-block; padding: 0px 6px 4px 6px; border-radius: 0px 0px 10px 10px;'}
-      Read more...
-- else
-  = Effective::Snippets::ReadMoreDivider::TOKEN.html_safe
-
-
-