tb_cms 1.3.beta1 → 1.3.5

data/db/migrate/20120912121313_modify_site_id_for_spud_pages.rb

@@ -1,4 +1,4 @@
-class ModifySiteIdForSpudPages < ActiveRecord::Migration
+class ModifySiteIdForSpudPages < ActiveRecord::Migration[4.2]
   def up
     change_column :spud_pages,:site_id,:integer,:default => 0,:null => false
     change_column :spud_templates,:site_id,:integer,:default => 0,:null => false

data/db/migrate/20121016233715_add_content_processed_to_spud_page_partials.rb

@@ -1,4 +1,4 @@
-class AddContentProcessedToSpudPagePartials < ActiveRecord::Migration
+class AddContentProcessedToSpudPagePartials < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_page_partials, :content_processed, :text
   end

data/db/migrate/20121112151110_add_layout_to_spud_pages.rb

@@ -1,4 +1,4 @@
-class AddLayoutToSpudPages < ActiveRecord::Migration
+class AddLayoutToSpudPages < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :layout, :string
 

data/db/migrate/20121119025608_create_spud_snippets.rb

@@ -1,4 +1,4 @@
-class CreateSpudSnippets < ActiveRecord::Migration
+class CreateSpudSnippets < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_snippets do |t|
       t.string :name

data/db/migrate/20150108162839_remove_site_id_from_cms_tables.rb

@@ -1,4 +1,4 @@
-class RemoveSiteIdFromCmsTables < ActiveRecord::Migration
+class RemoveSiteIdFromCmsTables < ActiveRecord::Migration[4.2]
   def up
     remove_column :spud_menus, :site_id
     remove_column :spud_pages, :site_id

data/db/migrate/20150622161403_add_title_tag_to_spud_page.rb

@@ -1,4 +1,4 @@
-class AddTitleTagToSpudPage < ActiveRecord::Migration
+class AddTitleTagToSpudPage < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_pages, :page_title, :string
   end

data/lib/spud_cms/engine.rb

@@ -1,6 +1,5 @@
 require 'tb_core'
 require 'tb_redirects'
-require 'tb_liquid'
 
 module Spud
   module Cms
@@ -12,7 +11,7 @@ module Spud
       end
 
       initializer :admin do
-        Spud::Core.configure do |config|
+        TbCore.configure do |config|
           config.admin_applications += [{ name: 'Pages', thumbnail: 'admin/pages_thumb.png', url: '/admin/pages', order: 0 }]
           if Spud::Cms.menus_enabled
             config.admin_applications += [{ name: 'Menus', thumbnail: 'admin/menus_thumb.png', url: '/admin/menus', order: 2 }]
@@ -24,28 +23,18 @@ module Spud
         end
       end
 
-      initializer :model_overrides_cms do |_config|
-        ActiveRecord::Base.class_eval do
-          include Spud::Searchable
-        end
-      end
-
       initializer :spud_cms_routes do |config|
         config.routes_reloader.paths << File.expand_path('../page_route.rb', __FILE__)
       end
 
       initializer 'tb_cms.assets' do |_config|
-        Spud::Core.append_admin_javascripts('admin/cms/application')
-        Spud::Core.append_admin_stylesheets('admin/cms/application')
+        TbCore.append_admin_javascripts('admin/cms/application')
+        TbCore.append_admin_stylesheets('admin/cms/application')
         Rails.application.config.assets.precompile += ['admin/pages_thumb.png', 'admin/snippets_thumb.png', 'admin/menus_thumb.png']
       end
 
-      initializer :liquid do |_config|
-        Liquid::Template.register_tag('snippet', Spud::Cms::LiquidSnippet)
-      end
-
       initializer :template_parser do |_config|
-        @template_parser = Spud::Cms::TemplateParser.new()
+        @template_parser = Spud::Cms::TemplateParser.new
       end
 
       def template_parser

data/lib/spud_cms/template_parser.rb

@@ -44,7 +44,7 @@ module Spud
             process_directive(header_line, layout)
           end
           layout[:partials] = ['Body'] if layout[:partials].blank?
-          layout[:sites] = [Spud::Core.config.short_name.downcase] if layout[:sites].blank?
+          layout[:sites] = [TbCore.config.short_name.downcase] if layout[:sites].blank?
           if layout[:template_name].blank? == false
             return layout
           else
@@ -58,7 +58,7 @@ module Spud
         default_layout_path = layout_path(Rails.application.root.join('app', 'views', 'layouts', Spud::Cms.default_page_layout))
         # puts(layouts)
         if layouts[default_layout_path].blank?
-          layouts[default_layout_path] = { template_name: 'Default', partials: ['Body'], sites: [Spud::Core.short_name.downcase], default: true }
+          layouts[default_layout_path] = { template_name: 'Default', partials: ['Body'], sites: [TbCore.short_name.downcase], default: true }
         else
           layouts[default_layout_path][:default] = true
         end

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Cms
-    VERSION = '1.3.beta1'.freeze
+    VERSION = '1.3.5'.freeze
   end
 end

data/lib/tb_cms.rb

@@ -2,7 +2,6 @@ module Spud
   module Cms
     require 'spud_cms/configuration'
     require 'spud_cms/template_parser'
-    require 'spud_cms/liquid_snippet'
     require 'spud_cms/engine' if defined?(Rails)
   end
 end

data/spec/controllers/admin/menu_items_controller_spec.rb

@@ -6,12 +6,12 @@ describe Admin::MenuItemsController, type: :controller do
   end
 
   let (:menu) do
-    FactoryGirl.create(:spud_menu)
+    FactoryBot.create(:spud_menu)
   end
 
   describe 'index' do
     it 'should return an array of menus' do
-      2.times { |_x| s = FactoryGirl.create(:spud_menu_item, spud_menu_id: menu.id, parent_id: menu.id) }
+      2.times { |_x| s = FactoryBot.create(:spud_menu_item, spud_menu_id: menu.id, parent_id: menu.id) }
       get :index, params: { menu_id: menu.id }
 
       expect(assigns(:menu_items).count).to be > 1
@@ -33,43 +33,43 @@ describe Admin::MenuItemsController, type: :controller do
   describe 'create' do
     it 'should create a new menu item with a valid form submission' do
       expect do
-        post :create, params: { menu_id: menu.id, spud_menu_item: FactoryGirl.attributes_for(:spud_menu_item, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
+        post :create, params: { menu_id: menu.id, spud_menu_item: FactoryBot.attributes_for(:spud_menu_item, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
       end.to change(SpudMenuItem, :count).by(1)
       expect(response).to be_redirect
     end
 
     it 'should not create a menu item with an invalid form entry' do
-      yamldata = FactoryGirl.attributes_for(:spud_menu_item, name: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id }
+      yamldata = FactoryBot.attributes_for(:spud_menu_item, name: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id }
 
       expect do
-        post :create, params: { menu_id: menu.id, spud_menu_item: FactoryGirl.attributes_for(:spud_menu_item, name: nil, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
+        post :create, params: { menu_id: menu.id, spud_menu_item: FactoryBot.attributes_for(:spud_menu_item, name: nil, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
       end.to_not change(SpudMenuItem, :count)
     end
 
     it 'should autoset order if not specified' do
-      menuitem = FactoryGirl.create(:spud_menu_item, parent_id: menu.id)
+      menuitem = FactoryBot.create(:spud_menu_item, parent_id: menu.id)
 
-      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryGirl.attributes_for(:spud_menu_item, menu_order: nil, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
+      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryBot.attributes_for(:spud_menu_item, menu_order: nil, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
       expect(assigns(:menu_item).menu_order).to eq(1)
     end
 
     it 'should assign the menu name based on page name if left blank' do
-      page = FactoryGirl.create(:spud_page)
-      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryGirl.attributes_for(:spud_menu_item, name: nil, spud_page_id: page.id).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
+      page = FactoryBot.create(:spud_page)
+      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryBot.attributes_for(:spud_menu_item, name: nil, spud_page_id: page.id).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
       expect(assigns(:menu_item).name).to eq(page.name)
     end
 
     it 'should set the parent to a submenu if specified' do
-      menuitem = FactoryGirl.create(:spud_menu_item, parent_id: menu.id)
-      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryGirl.attributes_for(:spud_menu_item, parent_id: menuitem.id).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
+      menuitem = FactoryBot.create(:spud_menu_item, parent_id: menu.id)
+      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryBot.attributes_for(:spud_menu_item, parent_id: menuitem.id).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
       expect(assigns(:menu_item).parent).to eq(menuitem)
     end
   end
 
   describe 'edit' do
     it 'should respond with menu item by id' do
-      menu1 = FactoryGirl.create(:spud_menu_item)
-      menu2 = FactoryGirl.create(:spud_menu_item)
+      menu1 = FactoryBot.create(:spud_menu_item)
+      menu2 = FactoryBot.create(:spud_menu_item)
       get :edit, params: { menu_id: menu.id, id: menu2.id }
       expect(assigns(:menu_item)).to eq(menu2)
     end
@@ -82,7 +82,7 @@ describe Admin::MenuItemsController, type: :controller do
 
   describe 'update' do
     it 'should update the name when the name attribute is changed' do
-      menu_item = FactoryGirl.create(:spud_menu_item)
+      menu_item = FactoryBot.create(:spud_menu_item)
       new_name = 'MyMenu'
       expect do
         put :update, params: { menu_id: menu.id, id: menu_item.id, spud_menu_item: menu_item.attributes.merge!(name: new_name, parent_id: nil).reject { |k, _v| k.to_sym == :spud_menu_id || k == 'id' || k.to_sym == :updated_at || k.to_sym == :created_at } }
@@ -90,8 +90,8 @@ describe Admin::MenuItemsController, type: :controller do
       end.to change(menu_item, :name).to(new_name)
     end
     it 'should assign a menu to a submenu if parentid is defined' do
-      menu_item1 = FactoryGirl.create(:spud_menu_item)
-      menu_item = FactoryGirl.create(:spud_menu_item)
+      menu_item1 = FactoryBot.create(:spud_menu_item)
+      menu_item = FactoryBot.create(:spud_menu_item)
 
       expect do
         put :update, params: { menu_id: menu.id, id: menu_item.id, spud_menu_item: menu_item.attributes.merge!(parent_id: menu_item1.id).reject { |k, _v| k.to_sym == :spud_menu_id || k == 'id' || k.to_sym == :updated_at || k.to_sym == :created_at } }
@@ -102,7 +102,7 @@ describe Admin::MenuItemsController, type: :controller do
 
   describe 'destroy' do
     it 'should destroy the menu item' do
-      menu_item = FactoryGirl.create(:spud_menu_item, parent_id: menu.id)
+      menu_item = FactoryBot.create(:spud_menu_item, parent_id: menu.id)
       expect do
         delete :destroy, params: { menu_id: menu.id, id: menu_item.id }
       end.to change(SpudMenuItem, :count).by(-1)
@@ -113,7 +113,7 @@ describe Admin::MenuItemsController, type: :controller do
     it 'should update all menu items menu_order fields' do
       ordered_arr = Array.new(5)
       ordered_arr.each_with_index do |item, index|
-        item = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, menu_order: index)
+        item = FactoryBot.create(:spud_menu_item, parent_id: menu.id, menu_order: index)
         ordered_arr[index] = item.id.to_s
       end
       new_order_arr = ordered_arr.shuffle

data/spec/controllers/admin/menus_controller_spec.rb

@@ -7,7 +7,7 @@ describe Admin::MenusController, type: :controller do
 
   describe 'index' do
     it 'should return an array of menus' do
-      2.times { FactoryGirl.create(:spud_menu) }
+      2.times { FactoryBot.create(:spud_menu) }
       get :index
 
       expect(assigns(:menus).count).to be > 1
@@ -26,14 +26,14 @@ describe Admin::MenusController, type: :controller do
   describe 'create' do
     it 'should create a new menu with a valid form submission' do
       expect do
-        post :create, params: { spud_menu: FactoryGirl.attributes_for(:spud_menu).reject { |k, _v| k == 'id' } }
+        post :create, params: { spud_menu: FactoryBot.attributes_for(:spud_menu).reject { |k, _v| k == 'id' } }
       end.to change(SpudMenu, :count).by(1)
       expect(response).to be_redirect
     end
 
     it 'should not create a menu with an invalid form entry' do
       expect do
-        post :create, params: { spud_menu: FactoryGirl.attributes_for(:spud_menu, name: nil).reject { |k, _v| k == 'id' } }
+        post :create, params: { spud_menu: FactoryBot.attributes_for(:spud_menu, name: nil).reject { |k, _v| k == 'id' } }
       end.to_not change(SpudMenu, :count)
 
     end
@@ -41,8 +41,8 @@ describe Admin::MenusController, type: :controller do
 
   describe 'edit' do
     it 'should response with menu by id' do
-      menu1 = FactoryGirl.create(:spud_menu)
-      menu2 = FactoryGirl.create(:spud_menu)
+      menu1 = FactoryBot.create(:spud_menu)
+      menu2 = FactoryBot.create(:spud_menu)
       get :edit, params: { id: menu2.id }
       expect(assigns(:menu)).to eq(menu2)
     end
@@ -55,7 +55,7 @@ describe Admin::MenusController, type: :controller do
 
   describe 'update' do
     it 'should update the name when the name attribute is changed' do
-      menu = FactoryGirl.create(:spud_menu)
+      menu = FactoryBot.create(:spud_menu)
       new_name = 'MyMenu'
       expect do
         put :update, params: { id: menu.id, spud_menu: menu.attributes.merge!(name: new_name).reject { |k, _v| k == 'id' } }
@@ -65,7 +65,7 @@ describe Admin::MenusController, type: :controller do
     end
 
     it 'should redirect to the admin menus after a successful update' do
-      menu = FactoryGirl.create(:spud_menu)
+      menu = FactoryBot.create(:spud_menu)
       put :update, params: { id: menu.id, spud_menu: menu.attributes.merge!(name: 'MyMenu').reject { |k, _v| k == 'id' } }
 
       expect(response).to redirect_to(admin_menu_menu_items_url(menu_id: menu.id))
@@ -74,7 +74,7 @@ describe Admin::MenusController, type: :controller do
 
   describe 'destroy' do
     it 'should destroy the menu' do
-      menu = FactoryGirl.create(:spud_menu)
+      menu = FactoryBot.create(:spud_menu)
       expect do
         delete :destroy, params: { id: menu.id }
       end.to change(SpudMenu, :count).by(-1)
@@ -82,7 +82,7 @@ describe Admin::MenusController, type: :controller do
     end
 
     it 'should not destroy the menu with a wrong id' do
-      menu = FactoryGirl.create(:spud_menu)
+      menu = FactoryBot.create(:spud_menu)
       expect do
         delete :destroy, params: { id: '23532' }
       end.to_not change(SpudMenu, :count)

data/spec/controllers/admin/pages_controller_spec.rb

@@ -7,15 +7,15 @@ describe Admin::PagesController, type: :controller do
 
   describe 'index' do
     it 'should return an array of parent pages' do
-      2.times { |_x| s = FactoryGirl.create(:spud_page) }
+      2.times { |_x| s = FactoryBot.create(:spud_page) }
       get :index
 
       expect(assigns(:pages).count).to be > 1
     end
 
     it 'should only return parent pages' do
-      2.times { |_x| FactoryGirl.create(:spud_page) }
-      FactoryGirl.create(:spud_page, spud_page_id: 1)
+      2.times { |_x| FactoryBot.create(:spud_page) }
+      FactoryBot.create(:spud_page, spud_page_id: 1)
 
       get :index
       expect(assigns(:pages).count).to eq(2)
@@ -24,7 +24,7 @@ describe Admin::PagesController, type: :controller do
 
   describe 'show' do
     it 'should respond successfully' do
-      p = FactoryGirl.create(:spud_page)
+      p = FactoryBot.create(:spud_page)
       get :show, params: { id: p.id }
       expect(assigns(:layout)).to render_template(layout: "layouts/#{Spud::Cms.default_page_layout}")
       expect(response).to be_success
@@ -48,7 +48,7 @@ describe Admin::PagesController, type: :controller do
   describe 'edit' do
     context 'HTML format' do
       it 'should load the correct page for the edit form' do
-        page = FactoryGirl.create(:spud_page)
+        page = FactoryBot.create(:spud_page)
         get :edit, params: { id: page.id }
 
         expect(assigns(:page).id).to eq(page.id)
@@ -59,7 +59,7 @@ describe Admin::PagesController, type: :controller do
 
   describe 'update' do
     it 'should update the name when the attribute is changed' do
-      page = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
       new_name = 'Adam'
       expect do
         put :update, params: { id: page.id, spud_page: { name: new_name } }
@@ -68,7 +68,7 @@ describe Admin::PagesController, type: :controller do
     end
 
     it 'should redirect to the page root index after a successful update' do
-      page = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
       new_name = 'Adam'
       put :update, params: { id: page.id, spud_page: page.attributes.merge!(name: new_name).reject { |key, _value| key == 'id' || key == 'created_at' || key == 'updated_at' } }
 
@@ -78,7 +78,7 @@ describe Admin::PagesController, type: :controller do
 
   describe 'destroy' do
     it 'should destroy the page' do
-      page = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
       expect do
         delete :destroy, params: { id: page.id }
       end.to change(SpudPage, :count).by(-1)
@@ -86,7 +86,7 @@ describe Admin::PagesController, type: :controller do
     end
 
     it 'should destroy the user with the wrong id' do
-      page = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
       expect do
         delete :destroy, params: { id: '23532' }
       end.to_not change(SpudPage, :count)

data/spec/controllers/pages_controller_spec.rb

@@ -4,21 +4,21 @@ describe PagesController, type: :controller do
   describe 'show' do
 
     it 'should render a page' do
-      page = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
       get :show, params: { id: page.url_name }
       expect(assigns(:layout)).to render_template(layout: "layouts/#{Spud::Cms.default_page_layout}")
       expect(response).to be_success
     end
 
     it 'should render home page if id is blank' do
-      page = FactoryGirl.create(:spud_page, name: 'home')
+      page = FactoryBot.create(:spud_page, name: 'home')
       get :show
       expect(assigns(:page)).to eq(page)
       expect(response).to be_success
     end
 
     it 'should redirect to new page url from old page url if it was changed' do
-      page = FactoryGirl.create(:spud_page, name: 'about', url_name: 'about')
+      page = FactoryBot.create(:spud_page, name: 'about', url_name: 'about')
       page.update(url_name: 'about-us')
       page.save
       get :show, params: { id: 'about' }
@@ -27,7 +27,7 @@ describe PagesController, type: :controller do
     end
 
     it 'should not allow access to private pages when logged out' do
-      page = FactoryGirl.create(:spud_page, name: 'about', visibility: 1)
+      page = FactoryBot.create(:spud_page, name: 'about', visibility: 1)
 
       get :show, params: { id: 'about' }
       expect(response).to redirect_to login_path(return_to: '/about')
@@ -43,7 +43,7 @@ describe PagesController, type: :controller do
       end
 
       it 'should allow access to private pages when logged in' do
-        page = FactoryGirl.create(:spud_page, name: 'about', visibility: 1)
+        page = FactoryBot.create(:spud_page, name: 'about', visibility: 1)
 
         get :show, params: { id: 'about' }
         expect(response).to be_success

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/application.rb

@@ -8,7 +8,7 @@ require 'tb_cms'
 module Dummy
   class Application < Rails::Application
 
-    Spud::Core.configure do |config|
+    TbCore.configure do |config|
       config.site_name = 'Test Site'
     end
 

data/spec/dummy/config/database.yml

@@ -4,12 +4,9 @@
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
 development:
-  adapter: mysql2
+  adapter: postgresql
   database: spud_cms_development
-  username: root
-  
+
 test:
-  adapter: mysql2
+  adapter: postgresql
   database: spud_cms_test
-  username: root
-

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

@@ -23,11 +23,11 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # 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
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
   config.assets.compress = false