effective_posts 2.0.0 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 850461d12290e86cc451412a56caaac5fccfc469c58d8a8a716f8b1efc1a0d40
-  data.tar.gz: 44069bc3c8563a6e91f467a7a9f1458d1cd0e6a3f79eb039abae1be473b76e7f
+  metadata.gz: 5b14ecbfb59bf639f5a0950fac43873d6cf2ca7c30aa1a1c69d71250bebf769d
+  data.tar.gz: 901c1ceca8dfa718866150dab53c7e5d76b59aa29fa9bd3003b81b1b1cd153af
 SHA512:
-  metadata.gz: 8cac1f40075ce9ad990c53ba9f4b0feb2bb887fe9a3b4931e0ed15b5ee574593537b1da261f728e84c08b588e0a2f68ad51a366f4949a93afd037f36b717ff15
-  data.tar.gz: fd63bde9093980a4f7e41660d6a11f7e317a52fe9ddaaace0b5addda9f6016138ff8feec88771f52ccf76c497b9b2a7715099714ef66ca7c4f8207b30e13930c
+  metadata.gz: 4543b3fcfc8068dd7eeb13002d6d793b200c74065efa960e13ce86f787eb3d2635b4d0e33a359227c5da41d4f9eea9438a147603a0329105b2efff08407d390d
+  data.tar.gz: d51323feaf466cdda3dff70816929228f8875df491af0c7054db1fb682e72816f4910773f79e0f9ceb6a4bef4cfba19259ad33f9d2dc309d459b2d963cb6f67f

data/README.md

@@ -85,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
 
@@ -155,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

@@ -10,6 +10,7 @@ module Admin
     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) }
 

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
@@ -61,8 +61,8 @@ 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
@@ -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/models/effective/post.rb

@@ -47,7 +47,7 @@ module Effective
     validates :title, presence: true, length: { maximum: 255 }
     validates :description, presence: true, length: { maximum: 150 }
     validates :category, presence: true
-    validates :published_at, presence: true
+    validates :published_at, presence: true, unless: -> { draft? }
 
     validates :start_at, presence: true, if: -> { category == 'events' }
 
@@ -107,7 +107,7 @@ module Effective
     end
 
     def send_post_submitted_to_admin!
-      deliver_method = EffectivePosts.mailer[:deliver_method] || raise('expected an EffectivePosts.deliver_method')
+      deliver_method = EffectivePosts.mailer[:deliver_method] || EffectiveResources.deliver_method
       Effective::PostsMailer.post_submitted_to_admin(to_param).send(deliver_method)
     end
 
@@ -118,9 +118,8 @@ module Effective
         post.slug = post.slug + '-copy'
         post.draft = true
 
-        regions.each do |region|
-          post.regions.build(region.attributes.except('id', 'updated_at', 'created_at'))
-        end
+        post.body = body
+        post.excerpt = excerpt
       end
     end
 

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

@@ -4,17 +4,17 @@
   - if f.object.persisted? || f.object.errors.include?(:slug)
     - current_url = effective_posts.post_path(f.object)
 
-  = 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 :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.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, (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'
@@ -32,8 +32,6 @@
 
   = 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/_form.html.haml

@@ -13,7 +13,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.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
 
   = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
@@ -22,7 +22,6 @@
 
   = 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.'
+  = f.rich_text_area :body, hint: 'The main body of your post'
 
   = f.submit 'Save'

data/config/effective_posts.rb

@@ -35,9 +35,6 @@ EffectivePosts.setup do |config|
   # Display the effective roles 'choose roles' input when an admin creates a new post
   config.use_effective_roles = false
 
-  # Hides the Save and Edit Content links from admin. They can just use the textarea input.
-  config.use_fullscreen_editor = true
-
   # Display a file upload field when the admin creates a new post to collect a post.image
   config.use_active_storage = true
 

data/config/routes.rb

@@ -1,38 +1,35 @@
 EffectivePosts::Engine.routes.draw do
   namespace :admin do
     resources :posts, except: [:show] do
-      if EffectivePosts.submissions_enabled && EffectivePosts.submissions_require_approval
-        post :approve, on: :member
-      end
+      post :approve, on: :member
     end
-
-    match 'posts/excerpts', to: 'posts#excerpts', via: :get
   end
 
   scope module: 'effective' do
-    categories = Array(EffectivePosts.categories).map { |cat| cat.to_s unless cat == 'posts'}.compact
-    onlies = ([:index, :show] unless EffectivePosts.submissions_enabled)
+    # Post Routes
+    resources :posts
 
-    if EffectivePosts.use_blog_routes
-      categories.each do |category|
-        match "blog/category/#{category}", to: 'posts#index', via: :get, defaults: { category: category }
-      end
+    # 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)
+    }
 
-      resources :posts, only: onlies, path: 'blog'
-    elsif EffectivePosts.use_category_routes
-      categories.each do |category|
-        match category, to: 'posts#index', via: :get, defaults: { category: category }
-        match "#{category}/:id", to: 'posts#show', via: :get, defaults: { category: category }
-      end
+    resources :posts, only: [:index, :show], path: 'blog', constraints: lambda { |req|
+      EffectivePosts.use_blog_routes
+    }
 
-      resources :posts, only: onlies
-    else
-      resources :posts, only: onlies
-    end
+    # Category routes
+    match ':category', to: 'posts#index', via: :get, constraints: lambda { |req|
+      EffectivePosts.use_category_routes && EffectivePosts.categories.include?(req.params['category'].to_sym)
+    }
+
+    match ":category/:id", to: 'posts#show', via: :get, constraints: lambda { |req|
+      EffectivePosts.use_category_routes && EffectivePosts.categories.include?(req.params['category'].to_sym)
+    }
   end
 
 end
 
 Rails.application.routes.draw do
-  mount EffectivePosts::Engine => '/', :as => 'effective_posts'
+  mount EffectivePosts::Engine => '/', as: 'effective_posts'
 end

data/lib/effective_posts/version.rb

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

data/lib/effective_posts.rb

@@ -1,4 +1,3 @@
-require 'effective_datatables'
 require 'effective_resources'
 require 'effective_posts/engine'
 require 'effective_posts/version'
@@ -9,7 +8,7 @@ module EffectivePosts
     [
       :posts_table_name, :layout, :categories,
       :use_category_routes, :use_blog_routes,
-      :use_effective_roles, :use_fullscreen_editor, :use_active_storage,
+      :use_effective_roles, :use_active_storage,
       :per_page, :post_meta_author,
       :submissions_enabled, :submissions_require_current_user,
       :submissions_require_approval, :submissions_note,
@@ -20,7 +19,7 @@ module EffectivePosts
   include EffectiveGem
 
   def self.permitted_params
-    [
+    @permitted_params ||= [
       :title, :excerpt, :description, :draft, :category, :slug, :published_at, :body, :tags, :extra,
       :image, :start_at, :end_at, :location, :website_name, :website_href, roles: []
     ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails