effective_posts 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0ef37ecec36ad5e970fbf822f04bba0b3467a5e742bf9e58e50848ed245dee
-  data.tar.gz: 7161bb9f8b1fffd7cbdc371dca5d6f116b25fcbb50003ba23c424d0b9b6fe1ba
+  metadata.gz: 5105b8f4cd7c534450c0e096d48411dae0376e38cc9a18ddd2c15a2a672ee2ab
+  data.tar.gz: e84688eb0d998f84a99bd04694999893326a15973f17f3bf8e75f2ca6b96ad07
 SHA512:
-  metadata.gz: 63c223415032de3e6e7ab000c9f5be639dcb2c449ca7ced5e0ef4a6474afc0562b63d3e9a29c3ddb57900804f0443a0c12bd55d70551d360db8ebfdbcb0b31bf
-  data.tar.gz: 8d858bd780ccb72acaf7c7c2f085590bab412e3f7bbb84133f9121c0015877c69317cebebb401103b3ab6306b42563bc7a1a9701c6c9704da2d2940a88af3f8c
+  metadata.gz: fc6d24ab9e3e7fdacb225d0fce839b3eca60c5ad5a4b7c990898e5063275e32075bf3e5d636ed58888349a38adb4b296590511dd152a97dc8b6eaf20eafdd20d
+  data.tar.gz: 124ae97fb1073610667bc5a35b345b46edc95c9635baa53f23dd01beff4f5693ada7be3fc2446f9de602ced9f8179d41fd5d8179739a5f716e77d4e6c58501ae

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015 Code and Effect Inc.
+Copyright 2023 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/app/assets/config/effective_posts_manifest.js

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

data/app/assets/javascripts/effective_posts.js

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

data/app/controllers/admin/posts_controller.rb

@@ -6,12 +6,7 @@ module Admin
 
     def index
       @page_title = 'Posts'
-
-      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-        @datatable = Effective::Datatables::Posts.new()
-      else
-        @datatable = EffectivePostsDatatable.new(self)
-      end
+      @datatable = EffectivePostsDatatable.new(self)
 
       authorize_effective_posts!
     end
@@ -126,12 +121,12 @@ module Admin
     private
 
     def authorize_effective_posts!
-      EffectivePosts.authorized?(self, :admin, :effective_posts)
-      EffectivePosts.authorized?(self, action_name.to_sym, @post || Effective::Post)
+      EffectiveResources.authorize!(self, :admin, :effective_posts)
+      EffectiveResources.authorize!(self, action_name.to_sym, @post || Effective::Post)
     end
 
     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

@@ -20,7 +20,7 @@ module Effective
         @posts = @posts.where(search) if search.present?
       end
 
-      EffectivePosts.authorized?(self, :index, Effective::Post)
+      EffectiveResources.authorize!(self, :index, Effective::Post)
 
       @page_title = (params[:page_title] || params[:category] || params[:defaults].try(:[], :category) || 'Posts').titleize
     end
@@ -29,11 +29,7 @@ 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])
 
-      if @post.respond_to?(:roles_permit?)
-        raise Effective::AccessDenied unless @post.roles_permit?(current_user)
-      end
-
-      EffectivePosts.authorized?(self, :show, @post)
+      EffectiveResources.authorize!(self, :show, @post)
 
       @page_title = @post.title
     end
@@ -43,7 +39,7 @@ module Effective
       @post ||= Effective::Post.new(published_at: Time.zone.now)
       @page_title = 'New Post'
 
-      EffectivePosts.authorized?(self, :new, @post)
+      EffectiveResources.authorize!(self, :new, @post)
     end
 
     def create
@@ -51,7 +47,7 @@ module Effective
       @post.user = current_user if defined?(current_user)
       @post.draft = (EffectivePosts.submissions_require_approval == true)
 
-      EffectivePosts.authorized?(self, :create, @post)
+      EffectiveResources.authorize!(self, :create, @post)
 
       if @post.save
         @page_title ||= 'Post Submitted'
@@ -73,7 +69,7 @@ module Effective
       @post ||= Effective::Post.find(params[:id])
       @page_title ||= 'Edit Post'
 
-      EffectivePosts.authorized?(self, :edit, @post)
+      EffectiveResources.authorize!(self, :edit, @post)
     end
 
     def update
@@ -81,7 +77,7 @@ module Effective
       draft_was = @post.draft
       @post.draft = (EffectivePosts.submissions_require_approval == true)
 
-      EffectivePosts.authorized?(self, :update, @post)
+      EffectiveResources.authorize!(self, :update, @post)
 
       if @post.update(post_params)
         @page_title ||= 'Post Submitted'
@@ -102,7 +98,7 @@ module Effective
     def destroy
       @post ||= Effective::Post.find(params[:id])
 
-      EffectivePosts.authorized?(self, :destroy, @post)
+      EffectiveResources.authorize!(self, :destroy, @post)
 
       if @post.destroy
         flash[:success] = 'Successfully deleted post'

data/app/datatables/effective_posts_datatable.rb

@@ -1,35 +1,33 @@
-unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-  class EffectivePostsDatatable < Effective::Datatable
-    datatable do
-      order :published_at, :desc
+class EffectivePostsDatatable < Effective::Datatable
+  datatable do
+    order :published_at, :desc
 
-      col :published_at
-      col :id, visible: false
+    col :published_at
+    col :id, visible: false
 
-      col :title
-      col :category, search: { collection: EffectivePosts.categories }
+    col :title
+    col :category, search: { collection: EffectivePosts.categories }
 
-      if EffectivePosts.submissions_enabled
-        col :approved, sql_column: 'NOT(draft)', as: :boolean do |post|
-          post.draft? ? 'No' : 'Yes'
-        end
-
-        col :draft, visible: false
-      else
-        col :draft
+    if EffectivePosts.submissions_enabled
+      col :approved, sql_column: 'NOT(draft)', as: :boolean do |post|
+        post.draft? ? 'No' : 'Yes'
       end
 
-      col :start_at
-      col :end_at, visible: false
-      col :location, visible: false
+      col :draft, visible: false
+    else
+      col :draft
+    end
 
-      col :created_at, label: 'Submitted at', visible: false
+    col :start_at
+    col :end_at, visible: false
+    col :location, visible: false
 
-      actions_col partial: '/admin/posts/actions', partial_as: :post
-    end
+    col :created_at, label: 'Submitted at', visible: false
 
-    collection do
-      Effective::Post.all
-    end
+    actions_col partial: '/admin/posts/actions', partial_as: :post
+  end
+
+  collection do
+    Effective::Post.all
   end
 end

data/app/mailers/effective/posts_mailer.rb

@@ -1,34 +1,17 @@
 module Effective
-  class PostsMailer < ActionMailer::Base
-    helper EffectivePostsHelper
+  class PostsMailer < EffectivePosts.parent_mailer_class
+    include EffectiveMailer
 
-    layout EffectivePosts.mailer[:layout].presence || 'effective_posts_mailer_layout'
+    helper EffectivePostsHelper
 
-    def post_submitted_to_admin(post_param)
+    def post_submitted_to_admin(post_param, opts = {})
       @post = (post_param.kind_of?(Effective::Post) ? post_param : Effective::Post.find(post_param))
 
-      mail(
-        to: EffectivePosts.mailer[:admin_email],
-        from: EffectivePosts.mailer[:default_from],
-        subject: subject_for_post_submitted_to_admin(@post)
-      )
-    end
-
-    private
+      subject = subject_for(__method__, 'Post Submitted', @post, opts)
+      headers = headers_for(resource, opts)
 
-    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")
+      mail(to: mailer_admin, subject: subject, **headers)
     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/post.rb

@@ -6,7 +6,7 @@ module Effective
 
     self.table_name = EffectivePosts.posts_table_name.to_s
 
-    belongs_to :user
+    belongs_to :user, optional: true
 
     # Attributes
     # title             :string
@@ -35,8 +35,7 @@ module Effective
     scope :published, -> { where(draft: false).where("#{EffectivePosts.posts_table_name}.published_at < ?", Time.zone.now) }
 
     scope :posts, -> (user: nil, category: nil, drafts: false) {
-      scope = (Rails::VERSION::MAJOR > 3 ? all : scoped)
-      scope = scope.includes(:regions).order(published_at: :desc)
+      scope = includes(:regions).order(published_at: :desc)
 
       if defined?(EffectiveAssets)
         scope = scope.includes(attachments: :asset)
@@ -87,7 +86,7 @@ module Effective
     end
 
     def send_post_submitted_to_admin!
-      send_email(:post_submitted_to_admin, to_param)
+      send_email(:post_submitted_to_admin)
     end
 
     # Returns a duplicated post object, or throws an exception
@@ -110,19 +109,8 @@ module Effective
 
     private
 
-    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 send_email(email)
+      EffectivePosts.send_email(email, self)
     end
 
   end

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

@@ -7,4 +7,4 @@
 
 %hr
 
-= render file: '/effective/posts/show'
+= render template: '/effective/posts/show'

data/config/effective_posts.rb

@@ -22,30 +22,6 @@ 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 = {
@@ -91,29 +67,18 @@ 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
-  # 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
+  # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
   #
-  # 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
-  }
+  # 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
 
 end

data/lib/effective_posts/engine.rb

@@ -4,8 +4,10 @@ module EffectivePosts
 
     # Include Helpers to base application
     initializer 'effective_posts.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
-        helper EffectivePostsHelper
+      app.config.to_prepare do
+        ActiveSupport.on_load :action_controller_base do
+          helper EffectivePostsHelper
+        end
       end
     end
 
@@ -14,5 +16,6 @@ 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.6.3'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/effective_posts.rb

@@ -1,46 +1,32 @@
 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
 
-  mattr_accessor :authorization_method
-  mattr_accessor :permitted_params
+  def self.config_keys
+    [
+      :posts_table_name, :permitted_params,
+      :layout, :simple_form_options, :admin_simple_form_options,
 
-  mattr_accessor :layout
-  mattr_accessor :simple_form_options
-  mattr_accessor :admin_simple_form_options
+      :categories, :use_category_routes,
+      :use_effective_roles, :use_fullscreen_editor,
 
-  mattr_accessor :categories
-  mattr_accessor :use_category_routes
+      :per_page, :post_meta_author,
 
-  mattr_accessor :use_effective_roles
-  mattr_accessor :use_fullscreen_editor
+      :submissions_enabled, :submissions_require_current_user, :submissions_require_approval, :submissions_note,
 
-  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)
-    if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
-      raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
-    end
-    true
+  include EffectiveGem
+
+  def self.mailer_class
+    mailer&.constantize || Effective::PostsMailer
   end
 
   def self.permitted_params

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2023-05-26 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: sass-rails
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,42 +86,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: effective_regions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.9
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.9
+        version: '0'
 description: A blog implementation with WYSIWYG content editing, post scheduling,
   pagination and optional top level routes for each post category.
 email:
@@ -133,9 +133,9 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/effective/snippets/read_more_divider.js.coffee
-- app/assets/javascripts/effective_pages/additional_fields.js.coffee
+- app/assets/config/effective_posts_manifest.js
 - 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
@@ -144,10 +144,7 @@ files:
 - 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
@@ -203,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A blog implementation with WYSIWYG content editing, post scheduling, pagination

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/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/datatables/posts.rb

@@ -1,39 +0,0 @@
-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/snippets/read_more_divider.rb

@@ -1,12 +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