effective_posts 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a73d09c2c4fda7417d196c7ce701792f4972a269
-  data.tar.gz: 40bd397f0941f6403819db29b6e5c5a6a0b505c2
+  metadata.gz: b92998992d3bbc6241ed4b3f9069f4bb64534e7c
+  data.tar.gz: d15314fde411d0b8629cb6f37902a839d73eeee6
 SHA512:
-  metadata.gz: 93f00476ee697241229faf88324137ecb167e3677e9f9fe9fcfb0b5f7752204426e4c95caa7d748fb0b745aa1a348edfcc21fa9618ad10cab777e8de5778a4e5
-  data.tar.gz: 1e295bc8f6ba1a1a1059a03d041e3b7b3f913803b5aba5b2f99422d6703c77a9bf34bd8af9092a09bd0a0ad6adabe20f21d09082d195b62c61699fd0604f95cd
+  metadata.gz: 72f48a2d8e10798746146da15a8a3c6a6e855555969871484669c9525f37f1ec0deb52eafff337b24ae293d9085abce1657a1b6e01f945fd7eabac860dc7373f
+  data.tar.gz: 54c499bd42808da6c0950d13cb286cff353e3696c1d71cea1c267162ee41f6fc70ea65104ea58fbc14f0b88d8e8a19e9bee5d4d5c826fb3ec181bba94238ca51

data/app/helpers/effective_posts_helper.rb

@@ -19,7 +19,9 @@ module EffectivePostsHelper
     category = post.category.to_s.downcase
     opts ||= {}
 
-    if EffectivePosts.use_category_routes
+    if EffectivePosts.use_blog_routes
+      effective_posts.post_path(post, opts)
+    elsif EffectivePosts.use_category_routes
       effective_posts.post_path(post, opts).sub('/posts', "/#{category}")
     else
       effective_posts.post_path(post, opts.merge(category: category))
@@ -32,13 +34,20 @@ module EffectivePostsHelper
     category = category.to_s.downcase
     opts ||= {}
 
-    if EffectivePosts.use_category_routes
+    if EffectivePosts.use_blog_routes
+      "/blog/category/#{category}"
+    elsif EffectivePosts.use_category_routes
       "/#{category}"
     else
       effective_posts.posts_path(opts.merge(category: category))
     end
   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)
+  end
+
   def render_post(post)
     render(partial: 'effective/posts/post', locals: { post: post })
   end
@@ -101,12 +110,7 @@ module EffectivePostsHelper
     render(partial: '/effective/posts/categories', locals: { categories: (reverse ? post_categories.reverse : post_categories) })
   end
 
-  def link_to_post_category(category, options = {})
-    category = category.to_s.downcase
 
-    href = EffectivePosts.use_category_routes ? "/#{category}" : effective_posts.posts_path(category: category.to_s)
-    link_to(category.to_s.titleize, href, options)
-  end
 
   ### Recent Posts
 

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

@@ -1,6 +1,9 @@
 .effective-post
-  = render 'effective/posts/header', post: post
-  = render 'effective/posts/event', post: post
+  %h2.post-title= link_to post, effective_post_path(post)
+
+  %p.post-meta.text-muted
+    = post_meta(post, author: false)
+    = admin_post_status_badge(post)
 
   .post-content.post-excerpt
     = post_excerpt(post)

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

@@ -1,6 +1,11 @@
 = render 'layout' do
   .effective-post
-    = render 'effective/posts/header', post: @post
+    %h1.post-title= link_to @post, effective_post_path(@post)
+
+    %p.post-meta.text-muted
+      = post_meta(@post, author: false)
+      = admin_post_status_badge(@post)
+
     = render 'effective/posts/event', post: @post
 
     .post-body.post-content

data/config/effective_posts.rb

@@ -14,6 +14,13 @@ EffectivePosts.setup do |config|
   # Regardless of this setting, posts will always be available via /posts?category=events
   config.use_category_routes = true
 
+  # Create routes for a blog. 
+  # Includes category routes, but they're not top level.
+  # /blog is posts#index
+  # /blog/category/announcements is posts#index?category=announcements
+  # /blog/1-post-title is posts#show
+  config.use_blog_routes = false
+
   # Number of posts displayed per page (Kaminari)
   config.per_page = 10
 

data/config/routes.rb

@@ -10,15 +10,24 @@ EffectivePosts::Engine.routes.draw do
   end
 
   scope :module => 'effective' do
-    resources :posts, only: ([:index, :show] unless EffectivePosts.submissions_enabled)
+    categories = Array(EffectivePosts.categories).map { |cat| cat.to_s unless cat == 'posts'}.compact
+    onlies = ([:index, :show] unless EffectivePosts.submissions_enabled)
 
-    if EffectivePosts.use_category_routes
-      Array(EffectivePosts.categories).map { |category| category.to_s }.each do |category|
-        next if category == 'posts'
+    if EffectivePosts.use_blog_routes
+      categories.each do |category|
+        match "blog/category/#{category}", to: 'posts#index', via: :get, defaults: { category: category }
+      end
 
-        match category, to: 'posts#index', via: :get, defaults: {:category => category }
-        match "#{category}/:id", to: 'posts#show', via: :get, defaults: {:category => category }
+      resources :posts, only: onlies, path: 'blog'
+    elsif EffectivePosts.use_category_routes
+      categories.each do |category|
+        match category, to: 'posts#index', via: :get, defaults: { category: category }
+        match "#{category}/:id", to: 'posts#show', via: :get, defaults: { category: category }
       end
+
+      resources :posts, only: onlies
+    else
+      resources :posts, only: onlies
     end
   end
 

data/lib/effective_posts.rb

@@ -17,6 +17,7 @@ module EffectivePosts
 
   mattr_accessor :categories
   mattr_accessor :use_category_routes
+  mattr_accessor :use_blog_routes
 
   mattr_accessor :use_effective_roles
   mattr_accessor :use_fullscreen_editor

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,7 +156,6 @@ files:
 - app/views/effective/posts/_categories.html.haml
 - app/views/effective/posts/_event.html.haml
 - app/views/effective/posts/_form.html.haml
-- app/views/effective/posts/_header.html.haml
 - app/views/effective/posts/_layout.html.haml
 - app/views/effective/posts/_post.html.haml
 - app/views/effective/posts/_recent_posts.html.haml

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

@@ -1,4 +0,0 @@
-%h2.post-title= link_to post, effective_post_path(post)
-%p.post-meta.text-muted
-  = post_meta(post, author: false)
-  = admin_post_status_badge(post)