effective_posts 1.1.10 → 2.0.2

data/lib/effective_posts.rb

@@ -1,64 +1,28 @@
-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.10'.freeze
+  VERSION = '2.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 2.0.2
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2021-03-04 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,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
@@ -182,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
@@ -197,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.

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
-
-
-