effective_posts 1.1.6 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e22a8b5820e9247c7706dc4b865b5594716a77735287df3db5c9b024d84548
-  data.tar.gz: 22015e1dff80275f1b947856491906ce49b86f394492ff4c864ae67f5c8f1fd9
+  metadata.gz: 15619ebf6addfa716f58d0fb7869856a7767d3ce2b330e215965f2597d6dc2d2
+  data.tar.gz: a9b86d1453132f0aa42a14118f7f6b8c2d20efe2ea9bb7a216422329cde031e2
 SHA512:
-  metadata.gz: 11170221b45aff9ce7760151ae2c8acd5fc66ac96e9d9ad569b7681b9fc141679918d46c934346d2e5f1c8263def85c5c04256f541293fd54d2f2de5176adabc
-  data.tar.gz: 22e3ab7afd761b286364594ef05556b0df0e895520f9495deff680b883a37a0e8b887d83fa2e4d4e6016027d500292a8502ee9661c6c334ea702d7be7f4f4f8d
+  metadata.gz: 4f8cef5af970f766636881e7e2ac17ff6d41e23b11b97e24695dd0dab6311c427e1247cb9712dbf1acca7b273a1ec73ab7c9abacdc91ae162078076aa654e4e0
+  data.tar.gz: 18f8c7ec44d83352c57486ff6f33d6b68288dff8ab27fb1e6cb1322129cb74e76ac9ee808468d9e97499e4a6385650797c21fc035497770725ff5ef7bfd72330

data/app/controllers/effective/posts_controller.rb

@@ -25,21 +25,14 @@ module Effective
 
       EffectivePosts.authorize!(self, :index, Effective::Post)
 
-      if params[:page]
-        @page_title ||= ((params[:category].presence || 'Blog').titleize + " - Page #{params[:page].to_s}")
-        @canonical_url ||= effective_posts.posts_url(page: params[:page])
-      else
-        @page_title ||= (params[:category].presence || 'Blog').titleize
-        @canonical_url ||= effective_posts.posts_url
-      end
-
+      @page_title ||= [(params[:category] || 'Blog').to_s.titleize, (" - Page #{params[:page]}" if params[:page])].compact.join
+      @canonical_url ||= helpers.effective_post_category_url(params[:category], page: params[:page])
     end
 
     def show
       @posts ||= Effective::Post.posts(user: current_user, category: params[:category], unpublished: EffectivePosts.authorized?(self, :admin, :effective_posts))
       @post = @posts.find(params[:id])
 
-
       if @post.respond_to?(:roles_permit?)
         raise Effective::AccessDenied.new('Access Denied', :show, @post) unless @post.roles_permit?(current_user)
       end
@@ -51,7 +44,7 @@ module Effective
           'Hi Admin!',
           ('You are viewing a hidden post.' unless @post.published?),
           'Click here to',
-          ("<a href='#{effective_regions.edit_path(effective_posts.post_path(@post, exit: effective_posts.post_path(@post)))}' class='alert-link'>edit post content</a> or" unless admin_edit?),
+          ("<a href='#{effective_regions.edit_path(effective_posts.post_path(@post, exit: effective_posts.post_path(@post)))}' class='alert-link' data-no-turbolink='true' data-turbolinks='false'>edit post content</a> or" unless admin_edit?),
           ("<a href='#{effective_posts.edit_admin_post_path(@post)}' class='alert-link'>edit post settings</a>.")
         ].compact.join(' ')
       end

data/app/helpers/effective_posts_helper.rb

@@ -29,20 +29,25 @@ module EffectivePostsHelper
   end
 
   def effective_post_category_path(category, opts = nil)
-    return effective_posts.posts_path unless category.present?
+    return effective_posts.posts_path(opts || {}) unless category.present?
 
     category = category.to_s.downcase
-    opts ||= {}
+    opts = (opts || {}).compact
+    query = ('?' + opts.to_query) if opts.present?
 
     if EffectivePosts.use_blog_routes
-      "/blog/category/#{category}"
+      "/blog/category/#{category}#{query}"
     elsif EffectivePosts.use_category_routes
-      "/#{category}"
+      "/#{category}#{query}"
     else
-      effective_posts.posts_path(opts.merge(category: category))
+      effective_posts.posts_path(opts.merge(category: category.presence).compact)
     end
   end
 
+  def effective_post_category_url(category, opts = nil)
+    root_url.to_s.chomp('/') + effective_post_category_path(category, opts)
+  end
+
   def link_to_post_category(category, options = {})
     category = category.to_s.downcase
     link_to(category.to_s.titleize, effective_post_category_path(category), title: category.to_s.titleize)

data/app/models/effective/post.rb

@@ -13,7 +13,7 @@ module Effective
 
     self.table_name = EffectivePosts.posts_table_name.to_s
 
-    belongs_to :user
+    belongs_to :user, optional: true
 
     # Attributes
     # title             :string

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

@@ -5,7 +5,7 @@
 
     = 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'
+      = 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'
 

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/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '1.1.6'.freeze
+  VERSION = '1.1.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.11
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,7 +143,6 @@ files:
 - 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
@@ -183,7 +182,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 +197,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/models/effective/datatables/posts.rb

@@ -1,40 +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
-          col :slug, visible: false
-          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