tb_blog 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab37b0d808766124759d266757d35eaaea4d359b
-  data.tar.gz: ee83293562e1e9246b8bd2df584c07f1deb7f695
+  metadata.gz: c3f0e49fcb5e713ca2539e045f2ffb5d0e35546d
+  data.tar.gz: 2661478bca463998d924ab06d4c8cdf6684decde
 SHA512:
-  metadata.gz: a641f5ca8ca4c50f518c8dd3636520d07ddc6e5f547e7f7ff4bb3fcb449b3d0a5759a655e33c630f5f2f4828899e785cca31a963afe8e9a2d34346ddb80cd115
-  data.tar.gz: cb498d73cd7db7dc97cfdfebf59ef26788d0e6a92d0da47dc60f83f4bb2f6e3c1ab2bb6dd0310bde5e1b425517435c0c31a97864f89e9449435f905bb7fa5b39
+  metadata.gz: c8b835b9f998af0cffce8387ee034038972f0409dcf86ff1fc27073fb597b003b75f872328b74da4a58376e1f8447591a58fd9da94c15287eb230e9ded245cfe
+  data.tar.gz: 45f3c1bec9ac7dbcf32d3afd332d93b8012c7895dd0786cabe63483f8bb8970871c753010f31b53c30015ce0d6a22f41a511416be8c990eeed77ff52c5a224d8

data/app/controllers/admin/posts_controller.rb

@@ -1,6 +1,6 @@
 class Admin::PostsController < Admin::ApplicationController
   include BlogUrlHelpers
-  include PostViewForAction
+  include RenderPostAction
 
   respond_to :html, :xml, :json
   before_action :load_blog
@@ -51,11 +51,7 @@ class Admin::PostsController < Admin::ApplicationController
               SpudPost.new
             end
     @post.assign_attributes(post_params)
-    render template: post_view_for_action(:show), controller: :posts, layout: @config.layout
-   end
-
-  def render_preview
-    render template: post_view_for_action(:show), controller: :posts, layout: @config.layout
+    render_post_action :show, controller: :posts, layout: @config.layout
   end
 
   private

data/app/controllers/concerns/render_post_action.rb

@@ -0,0 +1,7 @@
+module RenderPostAction
+  extend ActiveSupport::Concern
+
+  def render_post_action(action, args = {})
+    render action, args.merge(prefixes: [@config.key, 'posts'])
+  end
+end

data/app/controllers/posts_controller.rb

@@ -1,6 +1,6 @@
 class PostsController < ApplicationController
   include BlogUrlHelpers
-  include PostViewForAction
+  include RenderPostAction
 
   respond_to :html, :json, :rss
 
@@ -13,7 +13,7 @@ class PostsController < ApplicationController
     @posts = @posts.search(params[:search]) if params[:search]
     respond_with @posts do |format|
       format.html do
-        render post_view_for_action(:index)
+        render_post_action :index
       end
     end
   end
@@ -39,20 +39,20 @@ class PostsController < ApplicationController
       return
     end
     respond_with @posts do |format|
-      format.html { render post_view_for_action :index }
+      format.html { render_post_action :index }
     end
   end
 
   def archive
     @posts = SpudPost.for_user(current_user).visible.for_blog(params[:blog_key]).from_archive(params[:archive_date]).paginate(page: @page_number, per_page: Spud::Blog.config.posts_per_page)
     respond_with @posts do |format|
-      format.html { render post_view_for_action :index }
+      format.html { render_post_action :index }
     end
   end
 
   def show
     respond_with @post do |format|
-      format.html { render post_view_for_action :show }
+      format.html { render_post_action :show }
     end
   end
 
@@ -82,7 +82,6 @@ class PostsController < ApplicationController
     @config = SpudBlogConfig.find(params[:blog_key])
     if @config.blank?
       raise Spud::NotFoundError(item: 'blog')
-      return false
     else
       self.class.layout(@config.layout)
     end

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Blog
-    VERSION = '1.4.0'.freeze
+    VERSION = '1.4.1'.freeze
   end
 end

data/spec/controllers/posts_controller_spec.rb

@@ -27,4 +27,12 @@ describe PostsController, type: :controller do
     end
   end
 
+  describe 'show' do
+    it 'renders the post' do
+      post = FactoryGirl.create(:spud_post)
+      get :show, params: { blog_key: post.blog_key, id: post.url_name }
+      expect(response).to have_http_status(:success)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_blog
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Moser Consulting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -183,7 +183,7 @@ files:
 - app/controllers/admin/post_categories_controller.rb
 - app/controllers/admin/posts_controller.rb
 - app/controllers/concerns/blog_url_helpers.rb
-- app/controllers/concerns/post_view_for_action.rb
+- app/controllers/concerns/render_post_action.rb
 - app/controllers/posts_controller.rb
 - app/helpers/admin/news_posts_helper.rb
 - app/helpers/admin/post_categories_helper.rb

data/app/controllers/concerns/post_view_for_action.rb

@@ -1,11 +0,0 @@
-module PostViewForAction
-  extend ActiveSupport::Concern
-
-  def post_view_for_action(action)
-    if File.exist?(Rails.root.join("app/views/#{@config.key}/#{action}.html.erb"))
-      return "/#{@config.key}/#{action}"
-    else
-      return "/posts/#{action}"
-    end
-  end
-end