effective_posts 0.7.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f1437eacfc9cc73589cdb1f9a1477a25a87d49c7eba2c6cbadebb09f7244e96a
-  data.tar.gz: 548e4c3801f7711dd822a031d6e0c3418d9fc965c56e531aa581be3cabc44d50
+SHA1:
+  metadata.gz: c022efd2bcc520c8c917470ed78cfc6d59383a6d
+  data.tar.gz: 7b0e965d6149141d91764bff9405ba0bf5407d17
 SHA512:
-  metadata.gz: 8f63e0bb1fbdc1a9bb24ed01c8c3b8165a6e6c3f73b691f7e2c28c0dd7ce61110c7a8ff2b82a9539e93987fae685f1df33c1f676a59920ff8369fabfa02e4a9d
-  data.tar.gz: 1af93b7d75e8e662e80bc0c160ba1f033168d157fc3aa5307f5d4ab4436750623a4e757f573866ad0217debf2d477371a77361616fb93a8cdf409b32f2e04b93
+  metadata.gz: 0fdd4fe4cbb4e0a5bd4ca0d965464bea38a54075470cd326529d9b3d297626dc1235a14292aa90093b99863d91a5596adc58b27e667c309f883303967fece7ca
+  data.tar.gz: fcc25d31d20948003c2759801034cf981a522a3e5cc8541751e11f46bad4552ecbd9abab7fb769f2317b4464c2b705e36a64bcc0f8c07bf5631574f889fab35b

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Code and Effect Inc.
+Copyright 2018 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

@@ -7,11 +7,19 @@ Built ontop of effective_regions for post content entry and Kaminari for paginat
 Rails 3.2.x and 4.x
 
 
+## effective_posts 1.0
+
+This is the 1.0 series of effective_posts.
+
+This requires Twitter Bootstrap 4 and Rails 5.1+
+
+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 download and install [Twitter Bootstrap3](http://getbootstrap.com)
+Please download and install [Twitter Bootstrap4](http://getbootstrap.com)
 
 Add to your Gemfile:
 

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

@@ -0,0 +1,22 @@
+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/assets/javascripts/effective_posts.js

@@ -1 +1 @@
-//= require effective_posts/additional_fields
+//= require effective_pages/additional_fields

data/app/controllers/admin/posts_controller.rb

@@ -55,7 +55,7 @@ module Admin
 
       authorize_effective_posts!
 
-      if @post.update(post_params)
+      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'
@@ -102,7 +102,7 @@ module Admin
 
       authorize_effective_posts!
 
-      if @post.update(draft: false)
+      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(', ')}"
@@ -121,12 +121,12 @@ module Admin
     private
 
     def authorize_effective_posts!
-      EffectiveResources.authorize!(self, :admin, :effective_posts)
-      EffectiveResources.authorize!(self, action_name.to_sym, @post || Effective::Post)
+      EffectivePosts.authorize!(self, :admin, :effective_posts)
+      EffectivePosts.authorize!(self, action_name.to_sym, @post || Effective::Post)
     end
 
     def post_params
-      params.require(:effective_post).permit!
+      params.require(:effective_post).permit(EffectivePosts.permitted_params)
     end
 
   end

data/app/controllers/effective/posts_controller.rb

@@ -5,8 +5,6 @@ module Effective
     before_action :authenticate_user!, only: [:new, :create, :edit, :update],
       if: -> { EffectivePosts.submissions_require_current_user }
 
-    after_action :monkey_patch_for_kaminari, only: [:index]
-
     def index
       @posts ||= Effective::Post.posts(user: current_user, category: params[:category])
       @posts = @posts.page(params[:page]).per(EffectivePosts.per_page)
@@ -20,7 +18,7 @@ module Effective
         @posts = @posts.where(search) if search.present?
       end
 
-      EffectiveResources.authorize!(self, :index, Effective::Post)
+      EffectivePosts.authorize!(self, :index, Effective::Post)
 
       @page_title = (params[:page_title] || params[:category] || params[:defaults].try(:[], :category) || 'Posts').titleize
     end
@@ -29,7 +27,11 @@ module Effective
       @posts ||= Effective::Post.posts(user: current_user, category: params[:category], drafts: (params[:edit].to_s == 'true' || params[:preview].to_s == 'true'))
       @post = @posts.find(params[:id])
 
-      EffectiveResources.authorize!(self, :show, @post)
+      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)
 
       @page_title = @post.title
     end
@@ -39,7 +41,7 @@ module Effective
       @post ||= Effective::Post.new(published_at: Time.zone.now)
       @page_title = 'New Post'
 
-      EffectiveResources.authorize!(self, :new, @post)
+      EffectivePosts.authorize!(self, :new, @post)
     end
 
     def create
@@ -47,7 +49,7 @@ module Effective
       @post.user = current_user if defined?(current_user)
       @post.draft = (EffectivePosts.submissions_require_approval == true)
 
-      EffectiveResources.authorize!(self, :create, @post)
+      EffectivePosts.authorize!(self, :create, @post)
 
       if @post.save
         @page_title ||= 'Post Submitted'
@@ -69,7 +71,7 @@ module Effective
       @post ||= Effective::Post.find(params[:id])
       @page_title ||= 'Edit Post'
 
-      EffectiveResources.authorize!(self, :edit, @post)
+      EffectivePosts.authorize!(self, :edit, @post)
     end
 
     def update
@@ -77,9 +79,9 @@ module Effective
       draft_was = @post.draft
       @post.draft = (EffectivePosts.submissions_require_approval == true)
 
-      EffectiveResources.authorize!(self, :update, @post)
+      EffectivePosts.authorize!(self, :update, @post)
 
-      if @post.update(post_params)
+      if @post.update_attributes(post_params)
         @page_title ||= 'Post Submitted'
         flash.now[:success] = 'Successfully re-submitted post'
 
@@ -98,7 +100,7 @@ module Effective
     def destroy
       @post ||= Effective::Post.find(params[:id])
 
-      EffectiveResources.authorize!(self, :destroy, @post)
+      EffectivePosts.authorize!(self, :destroy, @post)
 
       if @post.destroy
         flash[:success] = 'Successfully deleted post'
@@ -115,9 +117,5 @@ module Effective
       params.require(:effective_post).permit(EffectivePosts.permitted_params)
     end
 
-    def monkey_patch_for_kaminari
-      @template = @template.tap { |template| template.extend(EffectiveKaminariHelper) }
-    end
-
   end
 end

data/app/helpers/effective_posts_helper.rb

@@ -8,7 +8,20 @@ module EffectivePostsHelper
     if EffectivePosts.use_category_routes
       effective_posts.post_path(post, opts).sub('/posts', "/#{category}")
     else
-      effective_posts.post_path(post, opts)
+      effective_posts.post_path(post, opts.merge(category: category))
+    end
+  end
+
+  def effective_post_category_path(category, opts = nil)
+    return effective_posts.posts_path unless category.present?
+
+    category = category.to_s.downcase
+    opts ||= {}
+
+    if EffectivePosts.use_category_routes
+      "/#{category}"
+    else
+      effective_posts.posts_path(opts.merge(category: category))
     end
   end
 
@@ -16,12 +29,13 @@ module EffectivePostsHelper
     render(partial: 'effective/posts/post', locals: { post: post })
   end
 
-  def post_meta(post)
+  def post_meta(post, date: true, datetime: false, category: true, author: true)
     [
       'Published',
-      "on #{post.published_at.strftime('%B %d, %Y at %l:%M %p')}",
-      ("to #{link_to_post_category(post.category)}" if Array(EffectivePosts.categories).length > 1),
-      ("by #{post.user.to_s.presence || 'Unknown'}" if EffectivePosts.post_meta_author && post.user.present?)
+      ("on #{post.published_at.strftime('%B %d, %Y')}" if date),
+      ("on #{post.published_at.strftime('%B %d, %Y at %l:%M %p')}" if datetime),
+      ("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
 

data/app/mailers/effective/posts_mailer.rb

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

data/app/models/effective/access_denied.rb

@@ -0,0 +1,17 @@
+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/datatables/posts.rb

@@ -0,0 +1,39 @@
+if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+  module Effective
+    module Datatables
+      class Posts < Effective::Datatable
+        datatable do
+          default_order :published_at, :desc
+
+          table_column :published_at
+          table_column :id, visible: false
+
+          table_column :title
+          table_column :category, filter: { type: :select, values: EffectivePosts.categories }
+
+          if EffectivePosts.submissions_enabled
+            table_column :approved, column: 'NOT(draft)', as: :boolean do |post|
+              post.draft ? 'No' : 'Yes'
+            end
+
+            table_column :draft, visible: false
+          else
+            table_column :draft
+          end
+
+          table_column :start_at
+          table_column :end_at, visible: false
+          table_column :location, visible: false
+
+          table_column :created_at, label: 'Submitted at', visible: false
+
+          table_column :actions, sortable: false, filter: false, partial: '/admin/posts/actions'
+        end
+
+        def collection
+          Effective::Post.all
+        end
+      end
+    end
+  end
+end

data/app/models/effective/post.rb

@@ -1,12 +1,11 @@
 module Effective
   class Post < ActiveRecord::Base
-    acts_as_role_restricted if defined?(EffectiveRoles)
-    acts_as_asset_box :image if defined?(EffectiveAssets)
+    acts_as_role_restricted if defined?(EffectiveRoles) && EffectivePosts.use_effective_roles
     acts_as_regionable
 
     self.table_name = EffectivePosts.posts_table_name.to_s
 
-    belongs_to :user, optional: true
+    belongs_to :user
 
     # Attributes
     # title             :string
@@ -33,20 +32,19 @@ module Effective
 
     scope :drafts, -> { where(draft: true) }
     scope :published, -> { where(draft: false).where("#{EffectivePosts.posts_table_name}.published_at < ?", Time.zone.now) }
+    scope :with_category, -> (category) { where(category: category.to_s.downcase) }
 
     scope :posts, -> (user: nil, category: nil, drafts: false) {
-      scope = includes(:regions).order(published_at: :desc)
+      scope = all.includes(:regions).order(published_at: :desc)
 
-      if defined?(EffectiveAssets)
-        scope = scope.includes(attachments: :asset)
-      end
-
-      if user.present? && user.respond_to?(:roles) && defined?(EffectiveRoles)
-        scope = scope.for_role(user.roles)
+      if defined?(EffectiveRoles) && EffectivePosts.use_effective_roles
+        if user.present? && user.respond_to?(:roles)
+          scope = scope.for_role(user.roles)
+        end
       end
 
       if category.present?
-        scope = scope.where(category: category)
+        scope = scope.with_category(category)
       end
 
       if drafts.blank?
@@ -86,7 +84,7 @@ module Effective
     end
 
     def send_post_submitted_to_admin!
-      send_email(:post_submitted_to_admin)
+      send_email(:post_submitted_to_admin, to_param)
     end
 
     # Returns a duplicated post object, or throws an exception
@@ -95,10 +93,6 @@ module Effective
         post.title = post.title + ' (Copy)'
         post.draft = true
 
-        if defined?(EffectiveAssets) && image.present?
-          post.add_to_asset_box(:image, image)
-        end
-
         regions.each do |region|
           post.regions.build(region.attributes.except('id', 'updated_at', 'created_at'))
         end
@@ -109,8 +103,19 @@ module Effective
 
     private
 
-    def send_email(email)
-      EffectivePosts.send_email(email, self)
+    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
     end
 
   end

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

@@ -0,0 +1,9 @@
+module Effective
+  module Snippets
+    class ReadMoreDivider < Snippet
+      TOKEN = "<div style='display: none;'>READ_MORE_DIVIDER</div>"
+
+      attribute :throwaway, String
+    end
+  end
+end

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

@@ -1,16 +1,13 @@
-- if EffectivePosts.submissions_enabled && EffectivePosts.submissions_require_approval && !post.approved?
-  = link_to effective_posts.admin_approve_post_path(post.id), title: 'Approve' do
-    %span.glyphicon.glyphicon-ok
+= 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)
 
-= link_to effective_posts.edit_admin_post_path(post.id), title: 'Settings' do
-  %span.glyphicon.glyphicon-cog
+    = 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, target: '_blank'
 
-= link_to effective_post_path(post, (post.draft? ? {preview: true} : nil)), title: 'View', target: '_blank' do
-  %span.glyphicon.glyphicon-eye-open
+    = dropdown_link_to 'View', effective_post_path(post, preview: true), target: '_blank'
 
-- if EffectivePosts.use_fullscreen_editor
-  = link_to effective_post_path(post, edit: true), title: 'Edit Content', 'data-no-turbolink': true, target: '_blank' do
-    %span.glyphicon.glyphicon-edit
-
-= link_to effective_posts.admin_post_path(post.id), title: 'Delete', data: { method: :delete, confirm: 'Are you sure you want to delete? This cannot be undone.' } do
-  %span.glyphicon.glyphicon-trash
+    = dropdown_link_to "Delete", effective_posts.admin_post_path(post),
+        data: { method: :delete, confirm: "Really delete #{post}?" }

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

@@ -1,36 +1,25 @@
-= simple_form_for(post, (EffectivePosts.admin_simple_form_options || {}).merge(:url => (post.persisted? ? effective_posts.admin_post_path(post.id) : effective_posts.admin_posts_path))) do |f|
-  = f.input :title, hint: 'The title of your post.'
+= effective_form_with(model: post, url: post.persisted? ? effective_posts.admin_post_path(post.id) : effective_posts.admin_posts_path) do |f|
+  = f.text_field :title, hint: 'The title of your post.'
 
   - if Array(EffectivePosts.categories).length > 1
-    = f.input :category,
-      as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
-      collection: EffectivePosts.categories,
-      include_blank: false
+    = f.select :category, EffectivePosts.categories
   - else
-    = f.input :category, as: :hidden, input_html: { value: (EffectivePosts.categories.first || 'posts') }
+    = f.hidden_field :category, (EffectivePosts.categories.first || 'posts')
 
   = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
 
-  = f.input :draft, hint: 'Save this post as a draft.  It will not be accessible on the website.'
+  = f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
 
-  = f.input :published_at,
-    as: (defined?(EffectiveFormInputs) ? :effective_date_time_picker : :datetime),
-    label: 'Publish date',
-    hint: 'When your post will be displayed on the website.'
+  = f.check_box :draft, hint: 'Save this post as a draft. It will not be accessible on the website.'
 
-  = f.input :body,
-    as: (defined?(EffectiveFormInputs) ? :effective_ckeditor_text_area : :text),
-    hint: 'The body of your post.',
-    toolbar: 'full',
-    required: true
+  = f.editor :body, delta: false
 
   - if defined?(EffectiveRoles) and f.object.respond_to?(:roles) && EffectivePosts.use_effective_roles
-    = f.input :roles, collection: EffectiveRoles.roles_collection(f.object), as: :check_boxes, hint: '* leave blank for a regular public post that anyone can view'
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object), hint: '* leave blank for a regular public post that anyone can view'
 
-  .form-actions.effective-post-actions
-    = f.button :submit, 'Save', data: { disable_with: 'Saving...' }, class: 'btn btn-primary'
+  = f.submit do
+    = f.save 'Save'
     - if EffectivePosts.use_fullscreen_editor
-      = f.button :submit, 'Save and Edit Content', data: { disable_with: 'Saving...' }, class: 'btn btn-primary'
-    = f.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }, class: 'btn btn-default'
-    = f.button :submit, 'Save and Duplicate', data: { disable_with: 'Saving...' }, class: 'btn btn-default'
-    = link_to 'Cancel', effective_posts.admin_posts_path
+      = f.save 'Save and Edit Content'
+    = f.save 'Save and Add New'
+    = f.save 'Save and Duplicate'

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

@@ -1,19 +1,17 @@
 -# Adding additional .effective-posts-category-#{category} will correctly show/hide on Posts#new forms
 
 - # Event specific fields
-.effective-post-category-events.well{style: ('display: none' unless f.object.category == 'events')}
-  %h4 Event Information
-  = form.input :start_at, as: (:effective_date_time_picker if defined?(EffectiveFormInputs)),
-    required: false,
-    hint: 'Display a start time for this event.'
+.effective-post-category-events.card.mb-4{style: ('display: none' unless f.object.category == 'events')}
+  .card-body
+    %h5.card-title Event Info
+    = form.datetime_field :start_at, required: false, hint: 'Display a start time for this event.'
 
-  = form.input :end_at, as: (:effective_date_time_picker if defined?(EffectiveFormInputs)),
-    hint: 'Display an end time of this event.'
+    = form.datetime_field :end_at, required: false, hint: 'Display an end time of this event.'
 
-  = form.input :location, required: false, hint: 'Display a location where this event is taking place.'
+    = form.text_field :location, required: false, hint: 'Display a location where this event is taking place.'
 
-  = form.input :website_name, label: 'External website',
-    placeholder: 'Buy Tickets', hint: 'The label of an external website.'
+    = form.text_field :website_name, label: 'External website',
+      placeholder: 'Buy Tickets', hint: 'The label of an external website.'
 
-  = form.input :website_href, label: 'External website address',
-    placeholder: 'http://', hint: 'The address of an external website (start with http:// or https://).'
+    = form.url_field :website_href, label: 'External website address',
+      placeholder: 'http://', hint: 'The address of an external website (start with http:// or https://).'

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

@@ -1,27 +1,21 @@
-= simple_form_for(post, (EffectivePosts.simple_form_options || {}).merge(url: (post.persisted? ? effective_posts.post_path(post.id) : effective_posts.posts_path))) do |f|
-  = f.input :title, hint: 'The title of your post.'
+= effective_form_with(model: post, url: post.persisted? ? effective_posts.post_path(post.id) : effective_posts.posts_path) do |f|
+  = f.text_field :title, hint: 'The title of your post.'
 
   - if Array(EffectivePosts.categories).length > 1
-    = f.input :category,
-      as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
-      collection: EffectivePosts.categories,
-      include_blank: false
+    = f.select :category, EffectivePosts.categories
   - else
-    = f.input :category, as: :hidden, input_html: { value: (EffectivePosts.categories.first || 'posts') }
+    = f.hidden_field :category, (EffectivePosts.categories.first || 'posts')
 
   = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
 
-  = f.input :published_at,
-    as: (defined?(EffectiveFormInputs) ? :effective_date_time_picker : :datetime),
-    label: 'Publish date',
-    hint: 'When should this be displayed on the website.'
+  = f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
 
-  = f.input :body,
-    as: (defined?(EffectiveFormInputs) ? :effective_ckeditor_text_area : :text),
-    hint: 'The body of your post. You can add content here, or with the full screen editor on the next page.',
-    toolbar: 'simple',
-    required: true
+  = f.text_area :body
 
-  .form-actions
-    = f.button :submit, 'Save', data: { disable_with: 'Saving...' }, class: 'btn btn-primary'
-    = link_to 'Cancel', effective_posts.posts_path
+  / = f.input :body,
+  /   as: (defined?(EffectiveFormInputs) ? :effective_ckeditor_text_area : :text),
+  /   hint: 'The body of your post. You can add content here, or with the full screen editor on the next page.',
+  /   toolbar: 'simple',
+  /   required: true
+
+  = f.submit 'Save'

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

@@ -2,9 +2,9 @@
 
 %p= EffectivePosts.submissions_note
 
-- if (EffectivePosts.authorized?(controller, :edit, @post) rescue false)
+- if EffectivePosts.authorized?(controller, :edit, @post)
   %p= link_to 'Edit Post', effective_posts.edit_post_path(@post), class: 'btn btn-primary btn-edit-post'
 
 %hr
 
-= render template: '/effective/posts/show'
+= render file: '/effective/posts/show'

data/app/views/effective/posts_mailer/post_submitted_to_admin.html.haml

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

data/config/effective_posts.rb

@@ -22,6 +22,30 @@ 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 = {
@@ -32,21 +56,6 @@ EffectivePosts.setup do |config|
   # Add additional permitted params
   # config.permitted_params += [:additional_field]
 
-  # SimpleForm Options
-  # This Hash of options will be passed into any client facing simple_form_for() calls
-  config.simple_form_options = {}
-  config.admin_simple_form_options = {}  # For the /admin/posts/new form
-
-  # config.simple_form_options = {
-  #   html: {class: 'form-horizontal'},
-  #   wrapper: :horizontal_form,
-  #   wrapper_mappings: {
-  #     boolean: :horizontal_boolean,
-  #     check_boxes: :horizontal_radio_and_checkboxes,
-  #     radio_buttons: :horizontal_radio_and_checkboxes
-  #   }
-  # }
-
   # Display the effective roles 'choose roles' input when an admin creates a new post
   config.use_effective_roles = true
 
@@ -67,18 +76,29 @@ EffectivePosts.setup do |config|
   config.submissions_note = "News & Event submitted! A confirmation email has been sent to the website owner. When approved, your submission will appear on the website."
 
   # Mailer Settings
-  # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
+  # effective_posts will send the admin an email when a post is submitted
+  # For all the emails, the same :subject_prefix will be prefixed.  Leave as nil / empty string if you don't want any prefix
   #
-  # Configure the class responsible to send e-mails.
-  # config.mailer = 'Effective::PostsMailer'
-  #
-  # Override effective_resource mailer defaults
-  #
-  # config.parent_mailer = nil      # The parent class responsible for sending emails
-  # config.deliver_method = nil     # The deliver method, deliver_later or deliver_now
-  # config.mailer_layout = nil      # Default mailer layout
-  # config.mailer_sender = nil      # Default From value
-  # config.mailer_admin = nil       # Default To value for Admin correspondence
-  # config.mailer_subject = nil     # Proc.new method used to customize Subject
+  # The subject_for_post_submitted_to_admin can be one of:
+  # - nil / empty string to use the built in defaults
+  # - A string with the full subject line for this email
+  # - A Proc to create the subject line based on the email
+  # In all three of these cases, the subject_prefix will still be used.
+
+  # The Procs are the same for admin & buyer receipt, the seller Proc is different
+  # subject_for_post_submitted_to_admin: Proc.new { |post| "Post needs approval"}
+
+  config.mailer = {
+    subject_prefix: '[example]',
+    subject_for_post_submitted_to_admin: '',
+
+    layout: 'effective_posts_mailer_layout',
+
+    default_from: 'info@example.com',
+    admin_email: 'admin@example.com',
+
+    deliver_method: nil,   # :deliver (rails < 4.2), :deliver_now (rails >= 4.2) or :deliver_later
+    delayed_job_deliver: false
+  }
 
 end

data/lib/effective_posts/engine.rb

@@ -4,10 +4,8 @@ module EffectivePosts
 
     # Include Helpers to base application
     initializer 'effective_posts.action_controller' do |app|
-      app.config.to_prepare do
-        ActiveSupport.on_load :action_controller_base do
-          helper EffectivePostsHelper
-        end
+      ActiveSupport.on_load :action_controller do
+        helper EffectivePostsHelper
       end
     end
 
@@ -16,6 +14,5 @@ module EffectivePosts
       # Set up our defaults, as per our initializer template
       eval File.read("#{config.root}/config/effective_posts.rb")
     end
-
   end
 end

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '0.7.1'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/effective_posts.rb

@@ -1,37 +1,62 @@
 require 'kaminari'
 require 'nokogiri'
-require 'effective_resources'
 require 'effective_datatables'
 require 'effective_regions'
 require 'effective_posts/engine'
 require 'effective_posts/version'
 
 module EffectivePosts
+  mattr_accessor :posts_table_name
 
-  def self.config_keys
-    [
-      :posts_table_name, :permitted_params,
-      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
-      :layout, :simple_form_options, :admin_simple_form_options,
+  mattr_accessor :authorization_method
+  mattr_accessor :permitted_params
 
-      :categories, :use_category_routes, :use_effective_roles, :use_fullscreen_editor,
-      :per_page, :post_meta_author,
+  mattr_accessor :layout
+  mattr_accessor :simple_form_options
+  mattr_accessor :admin_simple_form_options
 
-      :submissions_enabled, :submissions_require_current_user, :submissions_require_approval, :submissions_note,
-    ]
+  mattr_accessor :categories
+  mattr_accessor :use_category_routes
+
+  mattr_accessor :use_effective_roles
+  mattr_accessor :use_fullscreen_editor
+
+  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
 
-  include EffectiveGem
+  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
+  end
 
-  def self.mailer_class
-    mailer&.constantize || Effective::PostsMailer
+  def self.authorize!(controller, action, resource)
+    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
   end
 
   def self.permitted_params
     @@permitted_params ||= [
       :title, :draft, :category, :published_at, :body, :tags, :extra,
-      :start_at, :end_at, :location, :website_name, :website_href,
-      (EffectiveAssets.permitted_params if defined?(EffectiveAssets)), roles: []
+      :start_at, :end_at, :location, :website_name, :website_href, roles: []
     ].compact
   end
 

data/lib/generators/effective_posts/install_generator.rb

@@ -11,7 +11,7 @@ module EffectivePosts
         if not ActiveRecord::Base.timestamped_migrations
           Time.new.utc.strftime("%Y%m%d%H%M%S")
         else
-          "%.3d" % (current_migration_number(dirname) + 1)
+          '%.3d' % (current_migration_number(dirname) + 1)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple_form
-  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_ckeditor
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +84,16 @@ dependencies:
   name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: effective_regions
   requirement: !ruby/object:Gem::Requirement
@@ -132,19 +118,20 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile
-- app/assets/config/effective_posts_manifest.js
+- app/assets/javascripts/effective/snippets/read_more_divider.js.coffee
+- app/assets/javascripts/effective_pages/additional_fields.js.coffee
 - app/assets/javascripts/effective_posts.js
-- app/assets/javascripts/effective_posts/additional_fields.js.coffee
 - app/assets/stylesheets/effective_posts.scss
 - app/controllers/admin/posts_controller.rb
 - app/controllers/effective/posts_controller.rb
 - app/datatables/effective_posts_datatable.rb
-- app/helpers/effective_kaminari_helper.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/edit.html.haml
@@ -185,7 +172,7 @@ homepage: https://github.com/code-and-effect/effective_posts
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -200,8 +187,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.2.3
+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.

data/Rakefile

@@ -1,24 +0,0 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-# Our tasks
-load 'lib/tasks/effective_posts_tasks.rake'
-
-# Testing tasks
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-require "bundler/vendored_thor"
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
-
-task :default => :spec

data/app/assets/config/effective_posts_manifest.js

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

data/app/helpers/effective_kaminari_helper.rb

@@ -1,16 +0,0 @@
-# This extends the @template.url_for method to work with Kaminari
-# It is only extended on the posts#index method, for minimal pollution
-
-module EffectiveKaminariHelper
-  def url_for(params)
-    if params.kind_of?(Hash) && params[:controller] == 'effective/posts' && params[:action] == 'index'
-      params.delete(:page) if params[:page].blank?
-      params.delete(:category) if EffectivePosts.use_category_routes
-      params = params.except(:action, :controller, :only_path)
-
-      request.path.to_s + (params.present? ? '?' : '') + params.to_param
-    else
-      super
-    end
-  end
-end