effective_posts 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e22a8b5820e9247c7706dc4b865b5594716a77735287df3db5c9b024d84548
-  data.tar.gz: 22015e1dff80275f1b947856491906ce49b86f394492ff4c864ae67f5c8f1fd9
+  metadata.gz: 9c81635c7e56d5facbc3813276bb811a474df76044f0f58e75f4ecbce9e3c535
+  data.tar.gz: 87acdee49f9b8d8ae2d364d477bae82bb2a41acbcb4ffc7795578dac36191f19
 SHA512:
-  metadata.gz: 11170221b45aff9ce7760151ae2c8acd5fc66ac96e9d9ad569b7681b9fc141679918d46c934346d2e5f1c8263def85c5c04256f541293fd54d2f2de5176adabc
-  data.tar.gz: 22e3ab7afd761b286364594ef05556b0df0e895520f9495deff680b883a37a0e8b887d83fa2e4d4e6016027d500292a8502ee9661c6c334ea702d7be7f4f4f8d
+  metadata.gz: 345527391a44291733d2c714a4d848a209f0cee44bc98d4ceeffefb7c6ae2216d648690e955ca82e49087f49c4d5bc53a54e480a0c81db652d066184d0474fbc
+  data.tar.gz: 178b671b010fe6eacc41de115f533a7b97ddc5dc18756e75ebb73a9e5925c88e7c9123b6e9438494c2cc910508f4a09896154beef0ff9a64c189da2ef6e9768f

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

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

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '1.1.6'.freeze
+  VERSION = '1.1.7'.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.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails