tb_blog 1.4.0 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ab37b0d808766124759d266757d35eaaea4d359b
-  data.tar.gz: ee83293562e1e9246b8bd2df584c07f1deb7f695
+SHA256:
+  metadata.gz: 9226a2245883ac42138a159a7085f7fec750ffe32a0047aba6180198475be2b1
+  data.tar.gz: de4ce2858d15e93b737240a2204fe7b2edb444311e7d15dac1a41ec2e77d134c
 SHA512:
-  metadata.gz: a641f5ca8ca4c50f518c8dd3636520d07ddc6e5f547e7f7ff4bb3fcb449b3d0a5759a655e33c630f5f2f4828899e785cca31a963afe8e9a2d34346ddb80cd115
-  data.tar.gz: cb498d73cd7db7dc97cfdfebf59ef26788d0e6a92d0da47dc60f83f4bb2f6e3c1ab2bb6dd0310bde5e1b425517435c0c31a97864f89e9449435f905bb7fa5b39
+  metadata.gz: '0338d759fc7d720db08f7d6c1d9f9d7c1ce9d7313d1137e15586c5f3a183ac050c9c2bafbfca2f0de6bdab9d5857adba62192bfbbda44c7a52671bcfac2010ac'
+  data.tar.gz: 159779f63af0fb9be205e44ebb4f5f0dae255ff819e2b5f1432c046273a3432118876029eb3800a87101ea1766ee3a854296fe6dad83ca0232401eed696b51e4

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/Readme.md

@@ -68,7 +68,7 @@ The `is_news` column is being left on the `SpudPost` model for the time being to
 
 TB Blog offers a mechanism for limitting who can see what posts. Supply a lambda to the `query_for_user` config, which takes a single `user` argument. The value you return will be supplied directly to the `where()` query used to find posts.
 
-The example below is from an application that allows subscribers to view subscriber-only content. 
+The example below is from an application that allows subscribers to view subscriber-only content.
 
 	Spud::Blog.query_for_user = ->(user){
     	if !user.try(:has_paid_subscription?)

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,11 +49,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
@@ -70,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
@@ -33,26 +33,26 @@ class PostsController < ApplicationController
 
   def category
     if @post_category = SpudPostCategory.find_by(url_name: params[:category_url_name])
-      @posts = @post_category.posts.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)
+      @posts = @post_category.posts.for_user(current_user).visible.for_blog(params[:blog_key]).from_archive(params[:archive_date]).ordered.paginate(page: @page_number, per_page: Spud::Blog.config.posts_per_page)
     else
       redirect_to posts_path
       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,10 +1,13 @@
 class SpudPostCategory < ActiveRecord::Base
-  spud_searchable
 
-  has_and_belongs_to_many :posts,
+  has_many :spud_post_categories_posts,
+    foreign_key: :spud_post_category_id,
+    inverse_of: :spud_post_category
+  has_many :posts,
     class_name: 'SpudPost',
-    join_table: 'spud_post_categories_posts',
-    foreign_key: 'spud_post_category_id'
+    through: :spud_post_categories_posts,
+    source: :spud_post,
+    inverse_of: :categories
 
   validates :name, :url_name, presence: true
   validates :name, :url_name, uniqueness: true

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,15 +1,16 @@
-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 :spud_post_categories_posts,
+    foreign_key: :spud_post_id,
+    inverse_of: :spud_post
   has_many :categories,
     class_name: 'SpudPostCategory',
     through: :spud_post_categories_posts,
-    source: :spud_post_category
+    source: :spud_post_category,
+    inverse_of: :posts
 
   belongs_to :author, class_name: 'SpudUser', foreign_key: 'spud_user_id'
 
@@ -54,7 +55,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
@@ -112,8 +113,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.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/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

@@ -45,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.4.0'.freeze
+    VERSION = '1.4.4'.freeze
   end
 end

data/spec/controllers/admin/posts_controller_spec.rb

@@ -8,7 +8,7 @@ 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
@@ -34,7 +34,7 @@ describe Admin::PostsController, type: :controller do
     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, params: { blog_key: @post.blog_key, post_id: @post.id, spud_post: { title: 'Hello World' } }
           @post.reload

data/spec/controllers/posts_controller_spec.rb

@@ -8,7 +8,7 @@ describe PostsController, type: :controller do
 
   describe 'index' do
     it 'should display a list of posts' do
-      2.times { |_i| FactoryGirl.create(:spud_post) }
+      2.times { |_i| FactoryBot.create(:spud_post) }
       get :index, params: { blog_key: 'blog' }
       expect(assigns(:posts).count).to be > 1
     end
@@ -27,4 +27,12 @@ describe PostsController, type: :controller do
     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

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,3 @@
-class ApplicationController < Spud::ApplicationController
+class ApplicationController < TbCore::ApplicationController
   protect_from_forgery
 end

data/spec/dummy/config/environments/development.rb

@@ -22,13 +22,6 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 

data/spec/dummy/config/environments/production.rb

@@ -60,8 +60,4 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,5 +4,5 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '3a89d4b95c1fd9c3d43623d8e2b5a907988d00bfdbfb6de2ae26b760a49fcdc86937728b8cdf3301e4df1342c5f44a3d8d83410d857e341f1907c9c467b9bcf4'
+# Dummy::Application.config.secret_token = '3a89d4b95c1fd9c3d43623d8e2b5a907988d00bfdbfb6de2ae26b760a49fcdc86937728b8cdf3301e4df1342c5f44a3d8d83410d857e341f1907c9c467b9bcf4'
 Dummy::Application.config.secret_key_base = '83ed28f1288f2f059bc8f642f2acb0606ed8b46a3490bee501c1223d3acac326c325b2a97f3b984dda20828815aa123c911970579df1faaedefa21613b05630d'

data/spec/dummy/db/migrate/20180730141254_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,26 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :active_storage_blobs do |t|
+      t.string   :key,        null: false
+      t.string   :filename,   null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.bigint   :byte_size,  null: false
+      t.string   :checksum,   null: false
+      t.datetime :created_at, null: false
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false
+      t.references :blob,     null: false
+
+      t.datetime :created_at, null: false
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: "index_active_storage_attachments_uniqueness", unique: true
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,117 +10,138 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161020155452) do
+ActiveRecord::Schema.define(version: 2018_07_30_141254) do
 
-  create_table "spud_permissions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "name",       null: false
-    t.string   "tag",        null: false
+  create_table "active_storage_attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.bigint "blob_id", null: false
+    t.datetime "created_at", null: false
+    t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
+    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
+  end
+
+  create_table "active_storage_blobs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "key", null: false
+    t.string "filename", null: false
+    t.string "content_type"
+    t.text "metadata"
+    t.bigint "byte_size", null: false
+    t.string "checksum", null: false
+    t.datetime "created_at", null: false
+    t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
+  end
+
+  create_table "spud_permissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "tag", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["tag"], name: "index_spud_permissions_on_tag", unique: true, using: :btree
+    t.index ["tag"], name: "index_spud_permissions_on_tag", unique: true
   end
 
-  create_table "spud_post_categories", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "name"
+  create_table "spud_post_categories", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "url_name"
-    t.index ["url_name"], name: "index_spud_post_categories_on_url_name", using: :btree
+    t.string "url_name"
+    t.index ["url_name"], name: "index_spud_post_categories_on_url_name"
   end
 
-  create_table "spud_post_categories_posts", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "spud_post_categories_posts", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.integer "spud_post_id"
     t.integer "spud_post_category_id"
-    t.index ["spud_post_category_id"], name: "index_spud_post_categories_posts_on_spud_post_category_id", using: :btree
+    t.index ["spud_post_category_id"], name: "index_spud_post_categories_posts_on_spud_post_category_id"
   end
 
-  create_table "spud_posts", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.integer  "spud_user_id"
-    t.string   "title"
-    t.text     "content",           limit: 65535
-    t.boolean  "comments_enabled",                default: false
-    t.boolean  "visible",                         default: true
+  create_table "spud_posts", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.integer "spud_user_id"
+    t.string "title"
+    t.text "content"
+    t.boolean "comments_enabled", default: false
+    t.boolean "visible", default: true
     t.datetime "published_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "url_name"
-    t.boolean  "is_news",                         default: false
-    t.string   "meta_keywords"
-    t.text     "meta_description",  limit: 65535
-    t.string   "content_format",                  default: "HTML"
-    t.text     "content_processed", limit: 65535
-    t.string   "blog_key"
-    t.string   "custom_author"
-    t.string   "identifier"
-    t.index ["blog_key"], name: "index_spud_posts_on_blog_key", using: :btree
-    t.index ["identifier"], name: "index_spud_posts_on_identifier", unique: true, using: :btree
-    t.index ["is_news"], name: "index_spud_posts_on_is_news", using: :btree
-    t.index ["spud_user_id"], name: "index_spud_posts_on_spud_user_id", using: :btree
-    t.index ["url_name"], name: "index_spud_posts_on_url_name", using: :btree
-    t.index ["visible"], name: "index_spud_posts_on_visible", using: :btree
+    t.string "url_name"
+    t.boolean "is_news", default: false
+    t.string "meta_keywords"
+    t.text "meta_description"
+    t.string "content_format", default: "HTML"
+    t.text "content_processed"
+    t.string "blog_key"
+    t.string "custom_author"
+    t.string "identifier"
+    t.index ["blog_key"], name: "index_spud_posts_on_blog_key"
+    t.index ["identifier"], name: "index_spud_posts_on_identifier", unique: true
+    t.index ["is_news"], name: "index_spud_posts_on_is_news"
+    t.index ["spud_user_id"], name: "index_spud_posts_on_spud_user_id"
+    t.index ["url_name"], name: "index_spud_posts_on_url_name"
+    t.index ["visible"], name: "index_spud_posts_on_visible"
   end
 
-  create_table "spud_role_permissions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.integer  "spud_role_id",        null: false
-    t.string   "spud_permission_tag", null: false
+  create_table "spud_role_permissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.integer "spud_role_id", null: false
+    t.string "spud_permission_tag", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["spud_permission_tag"], name: "index_spud_role_permissions_on_spud_permission_tag", using: :btree
-    t.index ["spud_role_id"], name: "index_spud_role_permissions_on_spud_role_id", using: :btree
+    t.index ["spud_permission_tag"], name: "index_spud_role_permissions_on_spud_permission_tag"
+    t.index ["spud_role_id"], name: "index_spud_role_permissions_on_spud_role_id"
   end
 
-  create_table "spud_roles", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "name"
+  create_table "spud_roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "spud_user_settings", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.integer  "spud_user_id"
-    t.string   "key"
-    t.string   "value"
+  create_table "spud_user_settings", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.integer "spud_user_id"
+    t.string "key"
+    t.string "value"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "spud_users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "first_name"
-    t.string   "last_name"
-    t.boolean  "super_admin"
-    t.string   "login",                                    null: false
-    t.string   "email",                                    null: false
-    t.string   "crypted_password",                         null: false
-    t.string   "password_salt",                            null: false
-    t.string   "persistence_token",                        null: false
-    t.string   "single_access_token",                      null: false
-    t.string   "perishable_token",                         null: false
-    t.integer  "login_count",              default: 0,     null: false
-    t.integer  "failed_login_count",       default: 0,     null: false
+  create_table "spud_users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "first_name"
+    t.string "last_name"
+    t.boolean "super_admin"
+    t.string "login", null: false
+    t.string "email", null: false
+    t.string "crypted_password", null: false
+    t.string "password_salt", null: false
+    t.string "persistence_token", null: false
+    t.string "single_access_token", null: false
+    t.string "perishable_token", null: false
+    t.integer "login_count", default: 0, null: false
+    t.integer "failed_login_count", default: 0, null: false
     t.datetime "last_request_at"
     t.datetime "current_login_at"
     t.datetime "last_login_at"
-    t.string   "current_login_ip"
-    t.string   "last_login_ip"
+    t.string "current_login_ip"
+    t.string "last_login_ip"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "time_zone"
-    t.integer  "spud_role_id"
-    t.boolean  "requires_password_change", default: false
-    t.index ["email"], name: "index_spud_users_on_email", using: :btree
-    t.index ["login"], name: "index_spud_users_on_login", using: :btree
-    t.index ["spud_role_id"], name: "index_spud_users_on_spud_role_id", using: :btree
+    t.string "time_zone"
+    t.integer "spud_role_id"
+    t.boolean "requires_password_change", default: false
+    t.index ["email"], name: "index_spud_users_on_email"
+    t.index ["login"], name: "index_spud_users_on_login"
+    t.index ["spud_role_id"], name: "index_spud_users_on_spud_role_id"
   end
 
-  create_table "tb_redirects", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.string   "source",      null: false
-    t.string   "destination", null: false
-    t.string   "created_by"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
-    t.index ["owner_type", "owner_id"], name: "index_tb_redirects_on_owner_type_and_owner_id", using: :btree
-    t.index ["source"], name: "index_tb_redirects_on_source", unique: true, using: :btree
+  create_table "tb_redirects", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "owner_type"
+    t.integer "owner_id"
+    t.string "source", null: false
+    t.string "destination", null: false
+    t.string "created_by"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["owner_type", "owner_id"], name: "index_tb_redirects_on_owner_type_and_owner_id"
+    t.index ["source"], name: "index_tb_redirects_on_source", unique: true
   end
 
 end

data/spec/factories/spud_post_factories.rb

@@ -1,12 +1,12 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   sequence :spud_post_title do |n|
     "Test Blog Post #{n}"
   end
 
   factory :spud_post do
-    author { FactoryGirl.create(:spud_user) }
-    title { FactoryGirl.generate(:spud_post_title) }
+    author { FactoryBot.create(:spud_user) }
+    title { FactoryBot.generate(:spud_post_title) }
     content 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
     comments_enabled true
     visible true

data/spec/helpers/admin/posts_helper_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Admin::PostsHelper, type: :helper do
 
   describe '#link_to_disqus_comment_count' do
     it 'should return a link with the disqus identifier' do
-      post = FactoryGirl.create(:spud_post)
+      post = FactoryBot.create(:spud_post)
       result = helper.link_to_disqus_comment_count(post)
 
       expect(result).to include("data-disqus-identifier=\"#{post.identifier}\"")

data/spec/helpers/blog_helper_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe BlogHelper, type: :helper do
 
   describe '#disqus_comment_count_for_post' do
     it 'should return a tag with the disqus identifier' do
-      post = FactoryGirl.create(:spud_post)
+      post = FactoryBot.create(:spud_post)
       result = helper.disqus_comment_count_for_post(post)
       expect(result).to include("data-disqus-identifier=\"#{post.identifier}\"")
     end

data/spec/models/spud_post_spec.rb

@@ -4,14 +4,14 @@ RSpec.describe SpudPost, type: :model do
 
   describe '#display_date' do
     it 'should return a date string' do
-      post = FactoryGirl.create(:spud_post)
+      post = FactoryBot.create(:spud_post)
       expect(post.display_date).to eq(post.published_at.strftime('%b %d, %Y'))
     end
   end
 
   describe '#set_identifier' do
     it 'should set a random identifier' do
-      post = FactoryGirl.create(:spud_post, identifier: nil)
+      post = FactoryBot.create(:spud_post, identifier: nil)
       expect(post.identifier).to be_a(String)
     end
   end

data/spec/rails_helper.rb

@@ -1,17 +1,14 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
 
-require File.expand_path('../dummy/config/environment.rb', __FILE__)
+require File.expand_path('dummy/config/environment.rb', __dir__)
 require 'spec_helper'
 require 'rspec/rails'
 require 'rails-controller-testing'
 require 'database_cleaner'
-require 'simplecov'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'tb_core/test_helper'
 
-SimpleCov.start 'rails'
-
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_blog
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.4
 platform: ruby
 authors:
 - Moser Consulting
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.beta2
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.beta2
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: tb_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.beta1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.beta1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: truncate_html
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,35 +95,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '0.18'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -183,7 +175,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
@@ -191,12 +183,12 @@ files:
 - app/helpers/blog/sitemaps_helper.rb
 - app/helpers/blog_helper.rb
 - app/helpers/news_helper.rb
-- app/models/spud/spud_post_model.rb
 - app/models/spud_blog_config.rb
 - app/models/spud_post.rb
 - app/models/spud_post_categories_post.rb
 - app/models/spud_post_category.rb
 - app/models/spud_post_site.rb
+- app/models/tb_core/spud_post_model.rb
 - app/views/admin/post_categories/_category.html.erb
 - app/views/admin/post_categories/_form.html.erb
 - app/views/admin/post_categories/edit.html.erb
@@ -294,6 +286,7 @@ files:
 - spec/dummy/db/migrate/20161020155450_drop_spud_post_sites.tb_blog.rb
 - spec/dummy/db/migrate/20161020155451_add_custom_author_to_post.tb_blog.rb
 - spec/dummy/db/migrate/20161020155452_add_identifier_to_spud_posts.tb_blog.rb
+- spec/dummy/db/migrate/20180730141254_create_active_storage_tables.active_storage.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -309,7 +302,7 @@ files:
 homepage: http://bitbucket.org/moser-inc/tb_blog
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -324,74 +317,74 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Twice Baked Blog Engine.
 test_files:
-- spec/authlogic_helper.rb
-- spec/controllers/admin/posts_controller_spec.rb
-- spec/controllers/posts_controller_spec.rb
+- spec/spec_helper.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
-- spec/dummy/db/migrate/20161020155425_create_spud_admin_permissions.tb_core.rb
-- spec/dummy/db/migrate/20161020155426_create_spud_users.tb_core.rb
-- spec/dummy/db/migrate/20161020155427_add_time_zone_to_spud_user.tb_core.rb
-- spec/dummy/db/migrate/20161020155428_add_scope_to_spud_admin_permissions.tb_core.rb
-- spec/dummy/db/migrate/20161020155429_create_spud_user_settings.tb_core.rb
-- spec/dummy/db/migrate/20161020155430_create_spud_roles.tb_core.rb
+- spec/dummy/script/rails
+- spec/dummy/Rakefile
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/404.html
+- spec/dummy/db/schema.rb
 - spec/dummy/db/migrate/20161020155431_create_spud_permissions.tb_core.rb
-- spec/dummy/db/migrate/20161020155432_create_spud_role_permissions.tb_core.rb
-- spec/dummy/db/migrate/20161020155433_drop_spud_admin_permissions.tb_core.rb
-- spec/dummy/db/migrate/20161020155434_add_requires_password_change_to_spud_users.tb_core.rb
 - spec/dummy/db/migrate/20161020155435_create_tb_redirects.tb_redirects.rb
+- spec/dummy/db/migrate/20161020155425_create_spud_admin_permissions.tb_core.rb
+- spec/dummy/db/migrate/20161020155442_add_meta_to_posts.tb_blog.rb
+- spec/dummy/db/migrate/20161020155428_add_scope_to_spud_admin_permissions.tb_core.rb
 - spec/dummy/db/migrate/20161020155437_create_spud_posts.tb_blog.rb
 - spec/dummy/db/migrate/20161020155438_create_spud_post_categories.tb_blog.rb
-- spec/dummy/db/migrate/20161020155439_add_url_to_spud_posts.tb_blog.rb
-- spec/dummy/db/migrate/20161020155440_add_url_to_spud_post_categories.tb_blog.rb
-- spec/dummy/db/migrate/20161020155441_add_is_news_to_spud_posts.tb_blog.rb
-- spec/dummy/db/migrate/20161020155442_add_meta_to_posts.tb_blog.rb
-- spec/dummy/db/migrate/20161020155443_create_spud_post_sites.tb_blog.rb
-- spec/dummy/db/migrate/20161020155444_add_nested_set_to_post_categories.tb_blog.rb
 - spec/dummy/db/migrate/20161020155445_add_content_format_to_spud_posts.tb_blog.rb
-- spec/dummy/db/migrate/20161020155446_add_content_processed_to_spud_post.tb_blog.rb
-- spec/dummy/db/migrate/20161020155447_add_primary_key_to_spud_post_categories_posts.tb_blog.rb
-- spec/dummy/db/migrate/20161020155448_remove_awesome_nested_set_columns_from_spud_post_categories.tb_blog.rb
+- spec/dummy/db/migrate/20180730141254_create_active_storage_tables.active_storage.rb
+- spec/dummy/db/migrate/20161020155433_drop_spud_admin_permissions.tb_core.rb
 - spec/dummy/db/migrate/20161020155449_add_blog_key_to_spud_posts.tb_blog.rb
+- spec/dummy/db/migrate/20161020155432_create_spud_role_permissions.tb_core.rb
 - spec/dummy/db/migrate/20161020155450_drop_spud_post_sites.tb_blog.rb
+- spec/dummy/db/migrate/20161020155427_add_time_zone_to_spud_user.tb_core.rb
+- spec/dummy/db/migrate/20161020155429_create_spud_user_settings.tb_core.rb
 - spec/dummy/db/migrate/20161020155451_add_custom_author_to_post.tb_blog.rb
+- spec/dummy/db/migrate/20161020155440_add_url_to_spud_post_categories.tb_blog.rb
+- spec/dummy/db/migrate/20161020155426_create_spud_users.tb_core.rb
+- spec/dummy/db/migrate/20161020155444_add_nested_set_to_post_categories.tb_blog.rb
+- spec/dummy/db/migrate/20161020155439_add_url_to_spud_posts.tb_blog.rb
+- spec/dummy/db/migrate/20161020155448_remove_awesome_nested_set_columns_from_spud_post_categories.tb_blog.rb
+- spec/dummy/db/migrate/20161020155443_create_spud_post_sites.tb_blog.rb
+- spec/dummy/db/migrate/20161020155430_create_spud_roles.tb_core.rb
+- spec/dummy/db/migrate/20161020155447_add_primary_key_to_spud_post_categories_posts.tb_blog.rb
+- spec/dummy/db/migrate/20161020155441_add_is_news_to_spud_posts.tb_blog.rb
 - spec/dummy/db/migrate/20161020155452_add_identifier_to_spud_posts.tb_blog.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
+- spec/dummy/db/migrate/20161020155446_add_content_processed_to_spud_post.tb_blog.rb
+- spec/dummy/db/migrate/20161020155434_add_requires_password_change_to_spud_users.tb_core.rb
 - spec/dummy/README.rdoc
-- spec/dummy/script/rails
+- spec/models/spud_post_spec.rb
 - spec/factories/spud_post_factories.rb
+- spec/controllers/posts_controller_spec.rb
+- spec/controllers/admin/posts_controller_spec.rb
+- spec/rails_helper.rb
 - spec/helpers/admin/posts_helper_spec.rb
 - spec/helpers/blog_helper_spec.rb
-- spec/models/spud_post_spec.rb
-- spec/rails_helper.rb
-- spec/spec_helper.rb
+- spec/authlogic_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