effective_posts 1.1.9 → 2.0.1

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.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
@@ -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,19 +27,11 @@
 
   = 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?
       = f.save 'Duplicate', class: 'btn btn-info'

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/_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/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/_recent_posts.html.haml

@@ -1,5 +1,2 @@
 .effective-posts-recent-posts
-  - posts.each do |post|
-    .effective-post
-      %p= link_to post, effective_post_path(post)
-
+  = render(posts)

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,46 +29,12 @@ 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
 
-  # 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
 
@@ -107,8 +73,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_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
-   [
+    @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.1.9'.freeze
+  VERSION = '2.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 2.0.1
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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,19 +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/datatables/posts.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
@@ -169,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
@@ -183,7 +132,7 @@ homepage: https://github.com/code-and-effect/effective_posts
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,8 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A blog implementation with WYSIWYG content editing, post scheduling, pagination
   and optional top level routes for each post category.