tb_blog 1.3.5 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70bb8cf7f6dbeee3e6e1f371513b89d10135262c
-  data.tar.gz: e1183d3648505305f4d973e1fe2d005641f10536
+  metadata.gz: 8c8bb8dfa74cf36c2c41159cb5a6aa995a3499a3
+  data.tar.gz: 43a7bc493de1c0a89b8c1d460a3767c9343d789e
 SHA512:
-  metadata.gz: 943ec8e61fb4b5a1d45a2661267492887d36d03b6c5687754efb2afaa52cac020f304bbc749b7c8179baa88908394856791512fba9352f3ab99664a29e6c4ae3
-  data.tar.gz: 4e41738e830ede90f06149f3ca017cd3597ba1510f36cd2ca1e9b7a5f7d0333ac3bdcf3c0347174eb078610d740ae5b8c5f585beccefdadbcb22bc9cf0a03a08
+  metadata.gz: e1f8027428d3d63313405febe56b4ebc7662284199914b313e3d789f485cb024c33df767e33f464b50d44b17a2ba6a428c2752a6e5a68a185e634bd5d252e218
+  data.tar.gz: b31bfe914eda56b33f4f77486865e903fa92a8905afa4d68fed4097ccb21f4c58ce5276a0b782ad600844194a6d1a74f113a14034fa6d0b460d903b0a19927cb

data/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks

data/app/assets/javascripts/admin/blog/posts.js

@@ -120,7 +120,7 @@ var clickedPreviewButton = function(e){
   // Cross site scripting tag
   var csrf = document.createElement('input');
   csrf.name = 'authenticity_token';
-  csrf.value = tb.util.getCsrfToken();
+  csrf.value = Rails.csrfToken();
   $previewForm.append(csrf);
 
   // Submit it

data/app/controllers/admin/post_categories_controller.rb

@@ -15,11 +15,11 @@ class Admin::PostCategoriesController < Admin::ApplicationController
   end
 
   def update
-    if @post_category.update_attributes(category_params)
+    if @post_category.update(category_params)
       flash.now[:notice] = 'Post Category was successfully updated'
       respond_with @post_category, location: admin_post_categories_path
     else
-      render 'new', status: 422
+      render 'new', status: :unprocessable_entity
     end
   end
 
@@ -34,7 +34,7 @@ class Admin::PostCategoriesController < Admin::ApplicationController
       flash.now[:notice] = 'Post Category was successfully created'
       respond_with @post_category, location: admin_post_categories_path
     else
-      render 'new', status: 422
+      render 'new', status: :unprocessable_entity
     end
   end
 

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
@@ -21,9 +21,7 @@ class Admin::PostsController < Admin::ApplicationController
   end
 
   def update
-    if @post.update_attributes(post_params)
-      flash[:notice] = 'Post was successfully updated.'
-    end
+    flash[:notice] = 'Post was successfully updated.' if @post.update(post_params)
     respond_with @post, location: admin_posts_path
   end
 
@@ -51,12 +49,7 @@ class Admin::PostsController < Admin::ApplicationController
               SpudPost.new
             end
     @post.assign_attributes(post_params)
-    @post.postprocess_content()
-    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
@@ -71,9 +64,7 @@ class Admin::PostsController < Admin::ApplicationController
 
   def post_params
     permitted = [:published_at, :title, :content, :spud_user_id, :url_name, :visible, :comments_enabled, :meta_keywords, :meta_description, :content_format, :custom_author, category_ids: []]
-    if Spud::Blog.permitted_attributes.present?
-      permitted += Spud::Blog.permitted_attributes
-    end
+    permitted += Spud::Blog.permitted_attributes if Spud::Blog.permitted_attributes.present?
     p = params.require(:spud_post).permit(permitted)
     p[:updated_at] = DateTime.now
     return p

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,18 +13,18 @@ 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
 
   # The sole purpose of this action is to redirect from a POST to an seo-friendly url
   def filter
-    if !params[:category_url_name].blank? && !params[:archive_date].blank?
+    if params[:category_url_name].present? && params[:archive_date].present?
       redirect_to post_category_archive_path(params[:category_url_name], params[:archive_date])
-    elsif !params[:category_url_name].blank?
+    elsif params[:category_url_name].present?
       redirect_to post_category_path(params[:category_url_name])
-    elsif !params[:archive_date].blank?
+    elsif params[:archive_date].present?
       redirect_to post_archive_path(params[:archive_date])
     else
       redirect_to posts_path
@@ -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
 
@@ -60,7 +60,7 @@ class PostsController < ApplicationController
 
   def find_post
     @post = SpudPost.for_user(current_user).for_blog(params[:blog_key]).where(url_name: params[:id]).first
-    raise Spud::NotFoundError, item: 'post' if @post.blank? || @post.is_private?
+    raise TbCore::NotFoundError, item: 'post' if @post.blank? || @post.is_private?
   end
 
   def load_page_number
@@ -81,8 +81,7 @@ class PostsController < ApplicationController
   def load_blog
     @config = SpudBlogConfig.find(params[:blog_key])
     if @config.blank?
-      raise Spud::NotFoundError(item: 'blog')
-      return false
+      raise TbCore::NotFoundError(item: 'blog')
     else
       self.class.layout(@config.layout)
     end

data/app/helpers/admin/posts_helper.rb

@@ -13,7 +13,7 @@ module Admin::PostsHelper
 
   def link_to_disqus_comment_count(post)
     # TODO: It would be great to link directly to the thread
-    # 	ie: https://myblog.disqus.com/admin/moderate/#/all/search/thread:4584301535
+    #   ie: https://myblog.disqus.com/admin/moderate/#/all/search/thread:4584301535
     #
     # However, we do not know the thread ID at this time. We may be able to fetch it
     # via the Disqus JavaScript API.

data/app/helpers/blog_helper.rb

@@ -19,7 +19,7 @@ module BlogHelper
   end
 
   def spud_blog_rss_link
-    return tag :link, rel: 'alternate', type: 'application/rss+xml', title: "#{Spud::Core.site_name} Blog RSS", href: posts_path(format: :rss)
+    return tag :link, rel: 'alternate', type: 'application/rss+xml', title: "#{TbCore.site_name} Blog RSS", href: posts_path(format: :rss)
   end
 
   def disqus_comment_count_for_post(post)

data/app/models/spud_post.rb

@@ -1,3 +1,3 @@
-class SpudPost < Spud::SpudPostModel
+class SpudPost < TbCore::SpudPostModel
   # Copy this file to your app to extend the base SpudPost model
 end

data/app/models/spud_post_category.rb

@@ -1,5 +1,4 @@
 class SpudPostCategory < ActiveRecord::Base
-  spud_searchable
 
   has_and_belongs_to_many :posts,
     class_name: 'SpudPost',

data/app/models/spud_post_site.rb

@@ -2,7 +2,7 @@ class SpudPostSite < ActiveRecord::Base
   belongs_to :spud_post
 
   def spud_site
-    return Spud::Core.site_config_for_id(spud_site_id)
+    return TbCore.site_config_for_id(spud_site_id)
   end
 
 end

data/app/models/{spud → tb_core}/spud_post_model.rb

@@ -1,10 +1,8 @@
-class Spud::SpudPostModel < ActiveRecord::Base
+class TbCore::SpudPostModel < ActiveRecord::Base
   include TbRedirects::HasRedirects
 
   self.table_name = 'spud_posts'
 
-  spud_searchable
-
   has_many :spud_post_categories_posts, foreign_key: 'spud_post_id'
   has_many :categories,
     class_name: 'SpudPostCategory',
@@ -34,8 +32,6 @@ class Spud::SpudPostModel < ActiveRecord::Base
   before_validation :set_url_name
   before_validation :set_identifier
 
-  acts_as_tb_liquid_content
-
   def self.for_spud_site(_spud_site_id)
     ActiveSupport::Deprecation.warn 'SpudBlog.for_spud_site is deprecated and will be removed in the future'
     return all()
@@ -56,7 +52,7 @@ class Spud::SpudPostModel < ActiveRecord::Base
   def self.from_archive(date_string)
     date = Date.strptime(date_string, '%Y-%b')
     return where(published_at: date..date.end_of_month)
-  rescue
+  rescue StandardError
     logger.debug 'fallback'
     return where('')
   end
@@ -76,18 +72,23 @@ class Spud::SpudPostModel < ActiveRecord::Base
     end
   end
 
-  def postprocess_content
-    template = Liquid::Template.parse(content)
-    self.content_processed = template.render()
-  end
+  # def postprocess_content
+  #   template = Liquid::Template.parse(content)
+  #   self.content_processed = template.render()
+  # end
+  #
+  # def content_processed
+  #   postprocess_content if self[:content_processed].blank?
+  #   self[:content_processed]
+  # end
 
-  def content_processed
-    postprocess_content if self[:content_processed].blank?
-    self[:content_processed]
-  end
+  # def content_processed=(content)
+  #   self[:content_processed] = content
+  # end
 
-  def content_processed=(content)
-    self[:content_processed] = content
+  def content_processed
+    ActiveSupport::Deprecation.warn '#content_processed is deprecated. Use #content instead.'
+    content
   end
 
   def display_date
@@ -109,8 +110,10 @@ class Spud::SpudPostModel < ActiveRecord::Base
   def author_name
     if custom_author.present?
       custom_author
-    else
+    elsif author.present?
       author.full_name
+    else
+      ''
     end
   end
 

data/app/views/posts/index.html.erb

@@ -35,7 +35,7 @@
                 <p><%= disqus_comment_count_for_post(post) %></p>
               <% end %>
               <div class="blog-post-content">
-                <%= truncate_html post.content_processed.html_safe, :length => 250 %>
+                <%= truncate_html post.content.html_safe, :length => 250 %>
               </div>
             </div>
           <% end %>

data/app/views/posts/index.rss.builder

@@ -1,9 +1,9 @@
-xml.instruct! :xml, :version => "1.0"
-xml.rss :version => "2.0" do
+xml.instruct! :xml, version: '1.0'
+xml.rss version: '2.0' do
   xml.channel do
-    xml.title "#{Spud::Core.site_name} Blog Articles"
-    xml.description "Blog articles for #{Spud::Core.site_name}"
-    xml.link posts_path(:format => :rss)
+    xml.title "#{TbCore.site_name} Blog Articles"
+    xml.description "Blog articles for #{TbCore.site_name}"
+    xml.link posts_path(format: :rss)
 
     for article in @posts
       xml.item do

data/app/views/posts/show.html.erb

@@ -25,7 +25,7 @@
           </p>
         <% end %>
         <div class="blog-post-content">
-          <%= raw @post.content_processed %>
+          <%= raw @post.content %>
         </div>
         <p><%= link_to 'Back to all posts', posts_path %></p>
       </div>

data/lib/generators/spud/blog/random_posts_generator.rb

@@ -35,7 +35,7 @@ class Spud::Blog::RandomPostsGenerator < ::Rails::Generators::Base
 
   def random_word
     chars = 'abcdefghjkmnpqrstuvwxyz'
-    length = rand(8) + 1
+    length = rand(1..8)
     return (1..length).collect { chars[rand(chars.length)] }.join('')
   end
 

data/lib/spud_blog/engine.rb

@@ -1,6 +1,5 @@
 require 'tb_core'
 require 'tb_redirects'
-require 'tb_liquid'
 require 'truncate_html'
 
 module Spud
@@ -46,22 +45,22 @@ module Spud
             url: "admin/#{config.key}",
             thumbnail: 'admin/posts_thumb.png'
           }
-          Spud::Core.config.admin_applications += [blog_app]
+          TbCore.config.admin_applications += [blog_app]
         end
       end
 
       initializer 'tb_blog.assets' do
-        Spud::Core.append_admin_javascripts('admin/blog/application')
-        Spud::Core.append_admin_stylesheets('admin/blog/application')
+        TbCore.append_admin_javascripts('admin/blog/application')
+        TbCore.append_admin_stylesheets('admin/blog/application')
         Rails.application.config.assets.precompile += ['admin/posts_thumb.png', 'admin/news_thumb.png']
       end
 
       # Triggers a I18n.enforce_available_locales deprecation warning. Why?
-      # initializer 'tb_blog.user_association', :after => 'tb_core.model_overrides' do
-      #   SpudUser.class_eval do
-      #     has_many :posts, :class_name => 'SpudPost'
-      #   end
-      # end
+      initializer 'tb_blog.user_association', after: 'tb_core.model_overrides' do
+        SpudUser.class_eval do
+          has_many :posts, class_name: 'SpudPost', dependent: :nullify
+        end
+      end
     end
   end
 end

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Blog
-    VERSION = '1.3.5'.freeze
+    VERSION = '1.4.3'.freeze
   end
 end

data/spec/controllers/admin/posts_controller_spec.rb

@@ -8,18 +8,18 @@ describe Admin::PostsController, type: :controller do
 
   describe '#create_redirect_if_necessary' do
     before(:each) do
-      @post = FactoryGirl.create(:spud_post)
+      @post = FactoryBot.create(:spud_post)
     end
 
     it 'should create a redirect' do
       expect do
-        put :update, id: @post.id, spud_post: { url_name: 'new-url' }, blog_key: 'blog'
+        put :update, params: { id: @post.id, spud_post: { url_name: 'new-url' }, blog_key: 'blog' }
       end.to change(@post.tb_redirects, :count).by(1)
     end
 
     it 'should not create a redirect' do
       expect do
-        put :update, id: @post.id, spud_post: { title: 'Hello World' }, blog_key: 'blog'
+        put :update, params: { id: @post.id, spud_post: { title: 'Hello World' }, blog_key: 'blog' }
       end.to_not change(@post.tb_redirects, :count)
     end
   end
@@ -28,18 +28,15 @@ describe Admin::PostsController, type: :controller do
     context 'with a new post' do
       it 'should set the attributes without saving' do
         expect do
-          post :preview, blog_key: 'blog', post_id: nil, spud_post: { title: 'Hello World' }
+          post :preview, params: { blog_key: 'blog', post_id: nil, spud_post: { title: 'Hello World' } }
         end.to_not change(SpudPost, :count)
       end
     end
     context 'with an existing post' do
       it 'should set the attributes without saving' do
-        @post = FactoryGirl.create(:spud_post)
+        @post = FactoryBot.create(:spud_post)
         expect do
-          post :preview,
-            blog_key: @post.blog_key,
-            post_id: @post.id,
-            spud_post: { title: 'Hello World' }
+          post :preview, params: { blog_key: @post.blog_key, post_id: @post.id, spud_post: { title: 'Hello World' } }
           @post.reload
         end.to_not change(@post, :title)
       end

data/spec/controllers/posts_controller_spec.rb

@@ -8,8 +8,8 @@ describe PostsController, type: :controller do
 
   describe 'index' do
     it 'should display a list of posts' do
-      2.times { |_i| FactoryGirl.create(:spud_post) }
-      get :index, blog_key: 'blog'
+      2.times { |_i| FactoryBot.create(:spud_post) }
+      get :index, params: { blog_key: 'blog' }
       expect(assigns(:posts).count).to be > 1
     end
 
@@ -21,10 +21,18 @@ describe PostsController, type: :controller do
           {}
         end
       }
-      get :index, blog_key: 'blog'
+      get :index, params: { blog_key: 'blog' }
       expect(assigns(:posts).count).to be 0
       Spud::Blog.config.query_for_user = nil
     end
   end
 
+  describe 'show' do
+    it 'renders the post' do
+      post = FactoryBot.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